diff --git a/.depcheckrc.yml b/.depcheckrc.yml
index 2e417fb658c5..7526d977f405 100644
--- a/.depcheckrc.yml
+++ b/.depcheckrc.yml
@@ -38,6 +38,8 @@ ignores:
   # ESBuild is used for AI E2E script compilation
   - 'esbuild'
   - 'esbuild-register'
+  # Used via `node -r @babel/register` in package.json scripts (not an import)
+  - '@babel/register'
   # tsx runs all scripts/tooling/*.ts files directly (CLI wrapper, MCP server, yarn pre/post hooks, report CLI)
   - 'tsx'
   # agent-device is used as a CLI (`yarn agent-device`), not imported
@@ -152,6 +154,9 @@ ignores:
   # Used in Yarn plugin for preview builds
   - '@yarnpkg/core'
 
+  # Consumed by the Yarn plugin and agent hooks, outside of app source
+  - '@metamask/tooling-insight'
+
   # Babel plugins referenced in babel.config.js by their short name (without
   # the `babel-plugin-` prefix). Babel resolves them correctly at build time
   # but depcheck doesn't recognize the indirect reference. See babel.config.js
diff --git a/.detoxrc.js b/.detoxrc.js
index 813928e2a520..2a53a826cd82 100644
--- a/.detoxrc.js
+++ b/.detoxrc.js
@@ -36,15 +36,6 @@ module.exports = {
     retries: process.env.CI ? 1 : 0,
   },
   configurations: {
-    'ios.sim.apiSpecs': {
-      device: 'ios.simulator',
-      app: process.env.CI ? `ios.${process.env.METAMASK_BUILD_TYPE}.release` : 'ios.debug',
-      testRunner: {
-        args: {
-          "$0": "node tests/smoke/api-specs/run-api-spec-tests.js",
-        },
-      },
-    },
     'android.emu.main': {
       device: 'android.emulator',
       app: 'android.debug',
diff --git a/.e2e.env.example b/.e2e.env.example
index 16ffed395632..0c18132bd6d0 100644
--- a/.e2e.env.example
+++ b/.e2e.env.example
@@ -28,6 +28,11 @@ export PREBUILT_ANDROID_TEST_APK_PATH='build/MetaMask-Test.apk'
 # export SKIP_APP_REINSTALL=true
 export SKIP_APP_REINSTALL=false
 
+# Playwright Appium: reuse one WebDriver session per worker (emulator/simulator).
+# Default is on when unset. Set false to force per-test deleteSession (rollback).
+# BrowserStack ignores this and never reuses sessions.
+# export APPIUM_SESSION_REUSE=false
+
 export TEST_SRP_1=
 export TEST_SRP_2=
 export TEST_SRP_3=
diff --git a/.eslintrc.js b/.eslintrc.js
index cb1157a08dee..5a43d2823f0f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -84,8 +84,6 @@ const utilNumberImportBurndownFiles = [
   'app/components/UI/Stake/components/StakingBalance/StakingBanners/ClaimBanner/ClaimBanner.tsx',
   'app/components/UI/Stake/components/StakingConfirmation/TokenValueStack/TokenValueStack.test.tsx',
   'app/components/UI/Stake/components/StakingConfirmation/TokenValueStack/TokenValueStack.tsx',
-  'app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.test.tsx',
-  'app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.tsx',
   'app/components/UI/Stake/hooks/useBalance.ts',
   'app/components/UI/UrlAutocomplete/Result.tsx',
   'app/components/Views/GasEducationCarousel/index.js',
@@ -98,9 +96,7 @@ const utilNumberImportBurndownFiles = [
   'app/components/Views/confirmations/components/info/typed-sign-v3v4/simulation/components/native-value-display/native-value-display.tsx',
   'app/components/Views/confirmations/components/info/typed-sign-v3v4/simulation/components/value-display/value-display.tsx',
   'app/components/Views/confirmations/components/transactions/custom-amount/custom-amount.tsx',
-  'app/components/Views/confirmations/context/send-context/utils.ts',
   'app/components/Views/confirmations/external/staking/hooks/useStakingDetails.ts',
-  'app/components/Views/confirmations/hooks/earn/useCustomAmount.tsx',
   'app/components/Views/confirmations/hooks/gas/useCancelSpeedupGas/useCancelSpeedupGas.ts',
   'app/components/Views/confirmations/hooks/send/useBalance.ts',
   'app/components/Views/confirmations/hooks/send/useCurrencyConversions.ts',
@@ -263,6 +259,55 @@ module.exports = {
         ],
       },
     },
+    // MMQA-2174 / MMQA-2173: re-apply after *.{ts,tsx} override which replaces no-restricted-syntax
+    {
+      files: ['tests/page-objects/**/*.{js,ts}', 'tests/flows/**/*.{js,ts}'],
+      excludedFiles: [
+        'tests/page-objects/**/*.test.ts',
+        'tests/page-objects/**/*.test.js',
+        'tests/flows/**/*.test.ts',
+        'tests/flows/**/*.test.js',
+      ],
+      rules: {
+        // UnifiedGestures Identifier stays out of this error list so legacy PO
+        // usages remain warn-only via no-restricted-imports (MMQA-2174).
+        'no-restricted-syntax': [
+          'error',
+          {
+            selector: 'WithStatement',
+            message: 'With statements are not allowed',
+          },
+          {
+            selector: 'SequenceExpression',
+            message: 'Sequence expressions are not allowed',
+          },
+        ],
+      },
+    },
+    {
+      files: ['tests/smoke-appium/**/*.{js,ts}', 'tests/smoke/**/*.{js,ts}'],
+      excludedFiles: [
+        'tests/smoke-appium/**/*.test.ts',
+        'tests/smoke/**/*.test.ts',
+      ],
+      rules: {
+        'no-restricted-syntax': [
+          'error',
+          {
+            selector: 'WithStatement',
+            message: 'With statements are not allowed',
+          },
+          {
+            selector: 'SequenceExpression',
+            message: 'Sequence expressions are not allowed',
+          },
+          {
+            selector: "Identifier[name='UnifiedGestures']",
+            message: 'Use Gestures instead of UnifiedGestures.',
+          },
+        ],
+      },
+    },
     {
       files: ['*.js', '*.jsx'],
       parser: '@babel/eslint-parser',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 53b75e010e85..42604e4592ca 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -50,7 +50,6 @@ scripts/build.sh                                            @MetaMask/mobile-pla
 fingerprint.config.js                                       @MetaMask/mobile-platform
 builds.yml                                                  @MetaMask/mobile-platform
 .github/workflows/generate-build-version.yml                @MetaMask/mobile-platform
-.github/workflows/commit-build-version.yml                  @MetaMask/mobile-platform
 .github/workflows/push-eas-update.yml                       @MetaMask/mobile-admins
 .github/workflows/build-and-upload-to-testflight.yml        @MetaMask/mobile-admins
 .github/workflows/upload-to-testflight.yml                  @MetaMask/mobile-admins
@@ -373,9 +372,7 @@ tests/websocket/                                                @MetaMask/qa
 .github/workflows/run-appium-smoke-tests-ios.yml                @MetaMask/qa
 .github/workflows/run-e2e-workflow.yml                          @MetaMask/qa
 .github/workflows/run-e2e-api-specs.yml                         @MetaMask/qa
-.github/workflows/run-e2e-smoke-tests-android.yml               @MetaMask/qa
 .github/workflows/run-e2e-smoke-tests-android-flask.yml         @MetaMask/qa
-.github/workflows/run-e2e-smoke-tests-ios.yml                   @MetaMask/qa
 .github/workflows/run-e2e-smoke-tests-ios-flask.yml             @MetaMask/qa
 .github/workflows/rerun-ci-on-skipped-e2e-labels.yml            @MetaMask/qa
 .github/workflows/update-e2e-fixtures.yml                       @MetaMask/qa
@@ -383,8 +380,7 @@ tests/websocket/                                                @MetaMask/qa
 .github/workflows/flaky-test-report.yml                         @MetaMask/qa
 .github/workflows/performance-test-runner.yml                   @MetaMask/qa
 .github/workflows/run-performance-e2e.yml                       @MetaMask/qa
-.github/workflows/run-performance-e2e-experimental.yml          @MetaMask/qa
-.github/workflows/run-performance-e2e-release.yml               @MetaMask/qa
+.github/workflows/run-performance-e2e-manual.yml                @MetaMask/qa
 .github/workflows/run-system-tests.yml                          @MetaMask/qa
 .github/scripts/e2e-*.mjs                                       @MetaMask/qa
 .github/scripts/collect-qa-stats.mjs                            @MetaMask/qa
diff --git a/.github/actions/find-reusable-build/action.yml b/.github/actions/find-reusable-build/action.yml
index 73bd8691b3e7..44321c93fbc7 100644
--- a/.github/actions/find-reusable-build/action.yml
+++ b/.github/actions/find-reusable-build/action.yml
@@ -14,6 +14,12 @@ description: >-
   `event: pull_request` to let the fingerprint itself act as the cross-PR
   deduplication key.
 
+  Each tier is swept once per run status (`success`, `in_progress`, `failure`,
+  then `completed`) so that one crowded page of recent runs cannot consume the
+  candidate window. A donor only needs to have uploaded its artifacts, not to
+  have finished: the native build publishes the app roughly 25-35 minutes before
+  the run completes, since E2E tests keep the run alive well past that point.
+
 inputs:
   fingerprint:
     description: 'The @expo/fingerprint hash the candidate must match'
@@ -44,17 +50,23 @@ inputs:
     required: false
     default: 'build-source-hash'
   max-candidates-per-branch:
-    description: 'How many recent runs to inspect per branch-scoped tier (same-branch, base-branch)'
+    description: >-
+      How many recent runs to inspect per branch-scoped tier (same-branch,
+      base-branch), per conclusion sweep. Because sweeps filter server-side on
+      run conclusion, this budget is spent on terminal runs rather than on
+      in-flight ones — which matters most for the base-branch tier, where `main`
+      CI runs longer than the merge cadence, so a large share of the newest runs
+      are always still building.
     required: false
     default: '10'
   max-candidates-cross-pr:
     description: >-
       How many recent `pull_request`-event runs (across all branches) to inspect
-      in the cross-PR tier. The fingerprint filter is highly discriminating, so
-      the practical cost is one `listCommitStatusesForRef` call per candidate
-      until a run-specific status match is found.
+      in the cross-PR tier, per conclusion sweep. The fingerprint filter is highly
+      discriminating, so the practical cost is one `listCommitStatusesForRef` call
+      per candidate until a run-specific status match is found.
     required: false
-    default: '30'
+    default: '50'
   main-branch-only:
     description: >-
       When true, only search the base branch (typically `main`) for reusable
@@ -147,7 +159,7 @@ runs:
             : requiredArtifacts;
 
           const maxCandidates = Number(MAX_CANDIDATES) || 10;
-          const maxCandidatesCrossPr = Number(MAX_CANDIDATES_CROSS_PR) || 30;
+          const maxCandidatesCrossPr = Number(MAX_CANDIDATES_CROSS_PR) || 50;
           const currentRunId = String(CURRENT_RUN_ID);
 
           // Three-tier discovery:
@@ -248,22 +260,84 @@ runs:
           const seenRunIds = new Set();
           seenRunIds.add(currentRunId);
 
-          for (const tier of tiers) {
-            core.info(`Searching tier: ${tier.label}`);
-            let runs;
+          // Rate-limit accounting. The `/rate_limit` endpoint is itself free, so
+          // reading it before and after the search costs nothing and tells us how
+          // much of the hourly core budget one lookup actually consumes.
+          async function readRateLimit() {
+            try {
+              const { data } = await github.rest.rateLimit.get();
+              return data.resources.core;
+            } catch (err) {
+              core.info(`rateLimit.get failed: ${err.message}`);
+              return null;
+            }
+          }
+
+          const rateLimitBefore = await readRateLimit();
+
+          async function logRateLimit() {
+            const after = await readRateLimit();
+            if (!after) return;
+            const used = rateLimitBefore ? rateLimitBefore.remaining - after.remaining : null;
+            const resetAt = new Date(after.reset * 1000).toISOString();
+            core.info(
+              `Rate limit (core): ${after.remaining}/${after.limit} remaining, ` +
+              `${used === null ? 'unknown' : used} request(s) used by this lookup, resets at ${resetAt}`,
+            );
+            if (after.remaining < after.limit * 0.1) {
+              core.warning(
+                `GitHub API core rate limit is low: ${after.remaining}/${after.limit} remaining until ${resetAt}`,
+              );
+            }
+          }
+
+          // Each tier is swept once per run status below, applied server-side via
+          // the `status` filter so that a single crowded page of recent runs can't
+          // consume a tier's candidate window. On a busy repo the newest runs are
+          // dominated by in-flight runs and by runs that concurrency cancelled
+          // mid-build; sweeping per status keeps each category's budget separate.
+          //
+          // Order matters, and it is deliberately not "terminal states first":
+          //
+          //   success     - a fully green run is the most conservative donor.
+          //   in_progress - a run only needs to have *uploaded* its artifacts to be
+          //                 a valid donor; it does not need to have finished. The
+          //                 native build completes roughly 25-35 minutes before the
+          //                 run itself does, because E2E tests keep the run alive
+          //                 long after the `.app` is published. Skipping these runs
+          //                 discarded a complete, verified build for that entire
+          //                 window - measured at 8 of 18 cold-fingerprint rebuilds,
+          //                 one of them with a donor that had been ready 32 minutes.
+          //                 `hasAllArtifacts` below is what makes this safe: a run
+          //                 mid-upload simply fails that check and is skipped.
+          //   failure     - a run can fail on a job unrelated to the native build
+          //                 while still holding complete artifacts.
+          //   completed   - last resort; picks up cancelled, timed-out and neutral
+          //                 runs, preserving reach.
+          //
+          // `queued` is intentionally not swept: such runs cannot have artifacts yet,
+          // so they would only cost API calls.
+          const statusSweeps = ['success', 'in_progress', 'failure', 'completed'];
+
+          async function listCandidates(tier, status) {
             try {
               const { data } = await github.rest.actions.listWorkflowRuns({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 workflow_id: WORKFLOW_FILE,
+                status,
                 ...tier.params,
               });
-              runs = data.workflow_runs || [];
+              return data.workflow_runs || [];
             } catch (err) {
-              core.warning(`listWorkflowRuns failed for tier "${tier.label}": ${err.message}`);
-              continue;
+              core.warning(
+                `listWorkflowRuns failed for tier "${tier.label}" (status=${status}): ${err.message}`,
+              );
+              return [];
             }
+          }
 
+          async function findMatch(tier, runs) {
             for (const run of runs) {
               const runIdStr = String(run.id);
               if (seenRunIds.has(runIdStr)) continue;
@@ -271,8 +345,9 @@ runs:
 
               if (tier.skipHeadBranch && run.head_branch === tier.skipHeadBranch) continue;
 
-              if (run.status !== 'completed') continue;
-
+              // Deliberately no `run.status === 'completed'` gate: artifact
+              // availability, not run completion, is what makes a donor usable, and
+              // `hasAllArtifacts` verifies that below.
               if (!(await hasRunFingerprintStatus(run.head_sha, run.id))) {
                 core.info(`Run ${run.id} has no run-specific ${STATUS_CONTEXT} status matching fingerprint ${TARGET_FINGERPRINT}`);
                 continue;
@@ -280,16 +355,33 @@ runs:
 
               if (!(await hasAllArtifacts(run.id))) continue;
 
+              return run;
+            }
+            return null;
+          }
+
+          for (const tier of tiers) {
+            core.info(`Searching tier: ${tier.label}`);
+
+            for (const status of statusSweeps) {
+              const runs = await listCandidates(tier, status);
+              core.info(`  sweep status=${status}: ${runs.length} run(s) returned`);
+
+              const match = await findMatch(tier, runs);
+              if (!match) continue;
+
               core.info(
-                `Match: tier="${tier.label}" run=${run.id} sha=${run.head_sha} branch=${run.head_branch} url=${run.html_url}`,
+                `Match: tier="${tier.label}" status=${status} run=${match.id} sha=${match.head_sha} branch=${match.head_branch} url=${match.html_url}`,
               );
               core.setOutput('found', 'true');
-              core.setOutput('run-id', runIdStr);
-              core.setOutput('source-sha', run.head_sha);
-              core.setOutput('source-branch', run.head_branch || '');
+              core.setOutput('run-id', String(match.id));
+              core.setOutput('source-sha', match.head_sha);
+              core.setOutput('source-branch', match.head_branch || '');
+              await logRateLimit();
               return;
             }
           }
 
           core.info('No reusable build found across any tier');
+          await logRateLimit();
           setNotFound();
diff --git a/.github/actions/setup-e2e-env/action.yml b/.github/actions/setup-e2e-env/action.yml
index d45840252717..d6b62cf38485 100644
--- a/.github/actions/setup-e2e-env/action.yml
+++ b/.github/actions/setup-e2e-env/action.yml
@@ -325,12 +325,22 @@ runs:
       if: ${{ inputs.runner_provider != 'namespace' && inputs.runner_provider != 'bitrise' }}
       uses: actions/cache@v4
       with:
+        # NOTE: actions/cache archives directories recursively and does NOT
+        # honour `!` exclusion patterns for directory contents (resolvePaths
+        # runs with implicitDescendants: false). Gradle/CMake intermediates
+        # that Android native builds write inside node_modules (~4-5 GB
+        # uncompressed) are instead deleted by the "Clean native build
+        # intermediates from node_modules" step in build-android-e2e.yml
+        # before the post-job save runs.
         path: |
           node_modules
           .yarn/install-state.gz
-        key: ${{ inputs.cache-prefix }}-yarn-v2-${{ inputs.platform }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+        # v3: bump to drop existing entries polluted with those build
+        # intermediates — a cache hit is never re-saved, so without the bump
+        # the fat archives would keep being served forever.
+        key: ${{ inputs.cache-prefix }}-yarn-v3-${{ inputs.platform }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
         restore-keys: |
-          ${{ inputs.cache-prefix }}-yarn-v2-${{ inputs.platform }}-${{ runner.os }}-
+          ${{ inputs.cache-prefix }}-yarn-v3-${{ inputs.platform }}-${{ runner.os }}-
       continue-on-error: true
 
     - name: Install JavaScript dependencies with retry
diff --git a/.github/actions/smart-e2e-selection/action.yml b/.github/actions/smart-e2e-selection/action.yml
index 26281b8b2660..fc721eacf691 100644
--- a/.github/actions/smart-e2e-selection/action.yml
+++ b/.github/actions/smart-e2e-selection/action.yml
@@ -155,8 +155,8 @@ runs:
           echo "SKIPPED=true" >> "$GITHUB_OUTPUT"
           echo "SKIP_REASON=PR targets a release or stable branch (release/* or stable)" >> "$GITHUB_OUTPUT"
           echo "ai_confidence=100" >> "$GITHUB_OUTPUT"
-          # Release/stable target → the scheduled performance workflow covers these branches.
-          # No need to also trigger the PR performance job.
+          # Release/stable target → performance runs are label-only. Return []
+          # so AI output cannot automatically trigger the PR performance job.
           echo "ai_performance_test_tags=[]" >> "$GITHUB_OUTPUT"
         else
           echo "✅ Running AI analysis for PR #$PR_NUMBER"
diff --git a/.github/guidelines/E2E_DECISION_TREE.md b/.github/guidelines/E2E_DECISION_TREE.md
index c938e6fd1c97..c113d08b02e2 100644
--- a/.github/guidelines/E2E_DECISION_TREE.md
+++ b/.github/guidelines/E2E_DECISION_TREE.md
@@ -61,7 +61,7 @@ Runs only when all of the following are true:
 
 ## (Exceptional) force Appium iOS smoke tests on PRs
 
-Appium iOS smoke tests are skipped on PRs by default (they still run on every `main` push/schedule). To also run them on a PR, add the `run-appium-ios-tests` label. Smart E2E Selection still controls which suites run. CI re-runs automatically when the label is added or removed.
+Appium iOS smoke tests are skipped on PRs by default (they still run on every `main` push/schedule). They also run automatically on a PR when shared smoke infra or Appium specs change (`tests/page-objects/**`, `tests/selectors/**`, `tests/locators/**`, `tests/framework/**`, `tests/smoke-appium/**`). To force them on any other PR, add the `run-appium-ios-tests` label. Smart E2E Selection still controls which suites run. CI re-runs automatically when the label is added or removed.
 
 ## E2E flakiness detection in PRs
 
diff --git a/.github/guidelines/LABELING_GUIDELINES.md b/.github/guidelines/LABELING_GUIDELINES.md
index ba9b080480aa..697de723ea3e 100644
--- a/.github/guidelines/LABELING_GUIDELINES.md
+++ b/.github/guidelines/LABELING_GUIDELINES.md
@@ -45,7 +45,7 @@ Using any of these labels should be exceptional in case of CI friction and urgen
 
 ### Force Appium iOS Smoke Tests
 
-- **run-appium-ios-tests**: Also runs Appium iOS smoke tests on a PR (normally they run only on `main` push/schedule). Uses the same Smart E2E Selection tags as Detox/Appium Android — it does not bypass path filters, build gates, or AI tag selection. Remove `pr-not-ready-for-e2e` when the PR is ready for E2E validation. Adding or removing this label re-triggers CI. Not honored on fork PRs.
+- **run-appium-ios-tests**: Also runs Appium iOS smoke tests on a PR (normally they run on `main` push/schedule, or automatically when `tests/smoke-appium/**` / shared smoke infra paths change). Uses the same Smart E2E Selection tags as Detox/Appium Android — it does not bypass path filters, build gates, or AI tag selection. Remove `pr-not-ready-for-e2e` when the PR is ready for E2E validation. Adding or removing this label re-triggers CI. Not honored on fork PRs.
 
 ### Block merge if any is present
 
diff --git a/.github/rules/filter-rules.yml b/.github/rules/filter-rules.yml
index 231d7a263e85..1f103954f1a5 100644
--- a/.github/rules/filter-rules.yml
+++ b/.github/rules/filter-rules.yml
@@ -129,12 +129,14 @@ ios_or_ignorable:
   - *config_files
   - *ci_files
 
-# Shared smoke test infrastructure whose changes can break Appium iOS smoke tests.
+# Shared smoke / Appium paths whose changes should also run Appium iOS on PRs
+# (Appium Android already runs whenever Android E2E builds succeed).
 e2e_smoke_infra:
   - 'tests/page-objects/**'
   - 'tests/selectors/**'
   - 'tests/locators/**'
   - 'tests/framework/**'
+  - 'tests/smoke-appium/**'
 
 all_changes:
   - '**'
diff --git a/.github/scripts/add-release-label-to-pr-and-linked-issues.ts b/.github/scripts/add-release-label-to-pr-and-linked-issues.ts
index 45fb21cc32c9..5d61de55a2fb 100644
--- a/.github/scripts/add-release-label-to-pr-and-linked-issues.ts
+++ b/.github/scripts/add-release-label-to-pr-and-linked-issues.ts
@@ -8,6 +8,13 @@ import { Labelable, addLabelToLabelable } from './shared/labelable';
 import { retrievePullRequest } from './shared/pull-request';
 import { isValidVersionFormat } from './shared/utils';
 
+// Extracts version from cherry-pick PR titles (e.g., "cp-8.3.0" -> "8.3.0")
+function extractCherryPickVersion(title: string): string | null {
+  const cherryPickPattern = /cp-(\d+\.\d+\.\d+)/i;
+  const match = title.match(cherryPickPattern);
+  return match ? match[1] : null;
+}
+
 main().catch((error: Error): void => {
   console.error(error);
   process.exit(1);
@@ -42,12 +49,31 @@ async function main(): Promise<void> {
     process.exit(1);
   }
 
-  // Release label indicates the next release version number
+  // Use cherry-pick version from PR title if present, otherwise use next release version
+  // CodeQL: user-controlled input is intentional; worst case is mislabeling, caught during release validation
+  const pullRequestTitle = context.payload.pull_request?.title || '';
+  const cherryPickVersion = extractCherryPickVersion(pullRequestTitle);
+
+  let releaseVersionNumber: string;
+  if (cherryPickVersion) {
+    if (!isValidVersionFormat(cherryPickVersion)) {
+      core.setFailed(
+        `Cherry-pick version (${cherryPickVersion}) extracted from PR title is not a valid version format. The expected format is "x.y.z", where "x", "y" and "z" are numbers.`,
+      );
+      process.exit(1);
+    }
+    core.info(`Cherry-pick detected, using release version ${cherryPickVersion}`);
+    releaseVersionNumber = cherryPickVersion;
+  } else {
+    releaseVersionNumber = nextReleaseVersionNumber;
+  }
+
+  // Release label indicates the release version number
   // Example release label: "release-6.5.0"
   const releaseLabel: Label = {
-    name: `release-${nextReleaseVersionNumber}`,
+    name: `release-${releaseVersionNumber}`,
     color: 'EDEDED',
-    description: `Issue or pull request that will be included in release ${nextReleaseVersionNumber}`,
+    description: `Issue or pull request that will be included in release ${releaseVersionNumber}`,
   };
 
   // Initialise octokit, required to call Github GraphQL API
diff --git a/.github/scripts/aggregate-appium-timings.ts b/.github/scripts/aggregate-appium-timings.ts
new file mode 100644
index 000000000000..c27205dd9569
--- /dev/null
+++ b/.github/scripts/aggregate-appium-timings.ts
@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+/* eslint-disable import-x/no-nodejs-modules */
+/**
+ * CLI entry for aggregating Appium phase-timing JSON artifacts.
+ *
+ * Usage:
+ *   yarn appium-smoke:aggregate-timings
+ *   yarn tsx .github/scripts/aggregate-appium-timings.ts [--input <dir>] [--markdown <path>]
+ */
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import {
+  aggregateTimingSuites,
+  collectTimingFiles,
+  DEFAULT_INPUT_DIR,
+  formatTrendMarkdown,
+  loadTimingFile,
+  parseArgs,
+  type TimingSuiteFile,
+} from '../../tests/framework/telemetry/aggregatePhaseTimings.ts';
+
+const repoRoot = join(dirname(fileURLToPath(import.meta.url)), '../..');
+
+function main(argv: string[] = process.argv.slice(2)): void {
+  const opts = parseArgs(argv, resolve(repoRoot, DEFAULT_INPUT_DIR));
+  const files = collectTimingFiles(opts.input);
+  const suites = files
+    .map((f) => loadTimingFile(f))
+    .filter((s): s is TimingSuiteFile => s !== null);
+
+  if (suites.length === 0) {
+    console.error(
+      `No Appium timing JSON found under ${opts.input}. Run smoke tests first or pass --input.`,
+    );
+    process.exitCode = 1;
+    return;
+  }
+
+  const report = aggregateTimingSuites(suites);
+  const markdown = formatTrendMarkdown(report);
+  process.stdout.write(markdown);
+
+  if (opts.markdown) {
+    mkdirSync(dirname(opts.markdown), { recursive: true });
+    writeFileSync(opts.markdown, markdown, 'utf8');
+  }
+}
+
+main();
diff --git a/.github/scripts/run-compute-e2e-platform-flags.cjs b/.github/scripts/run-compute-e2e-platform-flags.cjs
index 1e7fc6fab6fc..abcab735d7da 100644
--- a/.github/scripts/run-compute-e2e-platform-flags.cjs
+++ b/.github/scripts/run-compute-e2e-platform-flags.cjs
@@ -61,7 +61,7 @@ if (
   } else if (readInt(process.env.E2E_SMOKE_INFRA_COUNT) > 0) {
     runAppiumIos = true;
     console.log(
-      '-> RUN_APPIUM_IOS=true due to e2e smoke infra changes (page-objects/selectors/locators/framework)',
+      '-> RUN_APPIUM_IOS=true due to e2e smoke infra changes (page-objects/selectors/locators/framework/smoke-appium)',
     );
   }
 }
diff --git a/.github/workflows/auto-rc-ota-build-core.yml b/.github/workflows/auto-rc-ota-build-core.yml
index 5abd58ba7649..10ee31998d78 100644
--- a/.github/workflows/auto-rc-ota-build-core.yml
+++ b/.github/workflows/auto-rc-ota-build-core.yml
@@ -43,6 +43,11 @@ on:
         required: false
         type: boolean
         default: true
+      build_number:
+        description: 'Build number from generate-build-version.yml to apply locally at build time'
+        required: false
+        type: string
+        default: ''
     outputs:
       semantic_version:
         description: 'package.json version at the built commit (empty when OTA bump skips the build)'
@@ -76,6 +81,7 @@ jobs:
       build_name: ${{ inputs.build_name }}
       platform: ${{ inputs.platform }}
       source_branch: ${{ inputs.source_branch || github.ref_name }}
+      build_number: ${{ inputs.build_number }}
       upload_to_sentry: true
     secrets: inherit
 
diff --git a/.github/workflows/build-android-e2e.yml b/.github/workflows/build-android-e2e.yml
index 237f6b4282f2..f815a082df35 100644
--- a/.github/workflows/build-android-e2e.yml
+++ b/.github/workflows/build-android-e2e.yml
@@ -138,6 +138,14 @@ jobs:
             echo "❌ Error: build_type ${{ inputs.build_type }} is not valid"
             exit 1
           fi
+          # Captured here, pre-setup, so the reuse summary can print the same APK
+          # cache keys the restore steps below actually used. `hashFiles` is
+          # evaluated wherever it is written, and the summary now runs after the
+          # build — by then jetify has rewritten `*.gradle` files under
+          # `node_modules/*/android/`, so an inline `hashFiles` there would render
+          # keys that were never used, in exactly the row someone is reading to
+          # debug a cache miss.
+          echo "gradle-files-hash=${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}" >> "$GITHUB_OUTPUT"
 
       - name: Check Namespace E2E APK cache
         id: namespace-apk-cache
@@ -349,79 +357,6 @@ jobs:
           fi
         shell: bash
 
-      - name: Write Android E2E reuse summary
-        if: ${{ always() }}
-        shell: bash
-        env:
-          SOURCE_FINGERPRINT: ${{ inputs.source-fingerprint }}
-          BUILD_TYPE: ${{ inputs.build_type }}
-          METAMASK_ENVIRONMENT: ${{ inputs.metamask_environment }}
-          REUSABLE_FOUND: ${{ steps.find-reusable-build.outputs.found }}
-          REUSABLE_RUN_ID: ${{ steps.find-reusable-build.outputs.run-id }}
-          METADATA_VALID: ${{ steps.validate-reusable-metadata.outputs.valid }}
-          APK_DOWNLOAD_OUTCOME: ${{ steps.download-reusable-apk.outcome }}
-          TEST_APK_DOWNLOAD_OUTCOME: ${{ steps.download-reusable-test-apk.outcome }}
-          NAMESPACE_CACHE_HIT: ${{ steps.namespace-apk-cache.outputs.cache-hit }}
-          BRANCH_CACHE_HIT: ${{ steps.apk-cache-restore.outputs.cache-hit }}
-          MAIN_CACHE_HIT: ${{ steps.apk-cache-restore-main.outputs.cache-hit }}
-          BRANCH_CACHE_KEY: android-apk-${{ github.ref_name }}-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-${{ inputs.source-fingerprint }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          MAIN_CACHE_KEY: android-apk-main-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-${{ inputs.source-fingerprint }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          NEEDS_NATIVE_BUILD: ${{ steps.gate.outputs.needs-native-build }}
-          REPOSITORY: ${{ github.repository }}
-        run: |
-          value() {
-            if [[ -n "${1:-}" ]]; then
-              printf '%s' "$1"
-            else
-              printf 'n/a'
-            fi
-          }
-
-          yes_no() {
-            case "${1:-}" in
-              true) printf 'yes' ;;
-              *) printf 'no' ;;
-            esac
-          }
-
-          github_candidate="$(yes_no "$REUSABLE_FOUND")"
-          if [[ -n "${REUSABLE_RUN_ID:-}" ]]; then
-            github_candidate="yes ([https://github.com/$REPOSITORY/actions/runs/$REUSABLE_RUN_ID](https://github.com/$REPOSITORY/actions/runs/$REUSABLE_RUN_ID))"
-          fi
-
-          decision="Fresh native build"
-          if [[ "${NAMESPACE_CACHE_HIT:-}" == "true" ]]; then
-            decision="Namespace APK cache"
-          elif [[ "${REUSABLE_FOUND:-}" == "true" && "${METADATA_VALID:-}" == "true" && "${APK_DOWNLOAD_OUTCOME:-}" == "success" && "${TEST_APK_DOWNLOAD_OUTCOME:-}" == "success" ]]; then
-            decision="GitHub artifact reuse"
-          elif [[ "${BRANCH_CACHE_HIT:-}" == "true" || "${MAIN_CACHE_HIT:-}" == "true" ]]; then
-            decision="Cirrus APK cache"
-          elif [[ "${NEEDS_NATIVE_BUILD:-}" == "false" ]]; then
-            decision="reuse/cache hit"
-          fi
-
-          branch_cache="$(yes_no "$BRANCH_CACHE_HIT")"
-          main_cache="$(yes_no "$MAIN_CACHE_HIT")"
-          if [[ "${BRANCH_CACHE_HIT:-}" == "true" ]]; then
-            branch_cache="yes (\`$BRANCH_CACHE_KEY\`)"
-          elif [[ "${MAIN_CACHE_HIT:-}" == "true" ]]; then
-            main_cache="yes (\`$MAIN_CACHE_KEY\`)"
-          fi
-
-          {
-            echo "### Android E2E build reuse"
-            echo ""
-            echo "| Field | Value |"
-            echo "| --- | --- |"
-            echo "| Decision | $decision |"
-            echo "| Native build fingerprint | \`$(value "$SOURCE_FINGERPRINT")\` |"
-            echo "| Build type | \`$(value "$BUILD_TYPE")\` |"
-            echo "| MetaMask environment | \`$(value "$METAMASK_ENVIRONMENT")\` |"
-            echo "| Branch APK cache hit | $branch_cache |"
-            echo "| Main APK cache hit | $main_cache |"
-            echo "| GitHub artifact candidate | $github_candidate |"
-          } >> "$GITHUB_STEP_SUMMARY"
-
       - name: Setup Android Build Environment
         timeout-minutes: 15
         uses: ./.github/actions/setup-e2e-env
@@ -464,6 +399,150 @@ jobs:
             echo "📦 Setting up project (lightweight, skips jetify)..."
             yarn setup:github-ci --no-build-ios --no-build-android
 
+      # Roughly four and a half minutes elapse between the lookup near the top of
+      # this job and the build step below, spent on the Android toolchain and
+      # dependency install. A donor can finish uploading inside that window: the
+      # native build publishes its APKs well before its run ends, so a run that had
+      # nothing to offer at lookup time may have complete artifacts by now. Re-check
+      # before committing to a ~18 minute compile. This costs one lookup on the path
+      # that was about to be the expensive one, and adds no waiting — it only
+      # harvests a donor that appeared while we were busy anyway.
+      #
+      # Deliberately placed *before* the Gradle cache restores rather than directly
+      # before the build, which is where the iOS equivalent sits. "Restore Gradle
+      # dependencies from branch cache" below is `cirruslabs/cache` (not `/restore`),
+      # so it saves at post-job whenever its key missed. Today a miss is always
+      # followed by a compile, so what it saves is populated; if a late reuse could
+      # skip the compile after that step had run, the post-job save would write a
+      # near-empty tree under `gradle-${{ github.ref_name }}-…` — a key that on
+      # `main` is identical to the shared `gradle-main-…` key every other branch
+      # falls back to. Running the re-check first, and gating both restores on it,
+      # removes that possibility and skips the cache download too. The cost is ~27
+      # seconds of harvest window out of ~4.5 minutes.
+      - name: Re-check for a reusable build published since the first lookup
+        id: find-reusable-build-late
+        if: ${{ inputs.runner_provider != 'namespace' && steps.force-builds.outputs.force != 'true' && inputs.source-fingerprint != '' && inputs.include_arm64 == false && steps.gate.outputs.needs-native-build == 'true' }}
+        uses: ./.github/actions/find-reusable-build
+        with:
+          fingerprint: ${{ inputs.source-fingerprint }}
+          artifact-names: '["${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release.apk","${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release-androidTest.apk"]'
+          metadata-artifact-name: ${{ inputs.reuse-main-builds-only != true && env.E2E_BUILD_METADATA_ARTIFACT || '' }}
+          github-token: ${{ github.token }}
+          main-branch-only: ${{ inputs.reuse-main-builds-only }}
+          max-candidates-per-branch: ${{ inputs.reuse-main-builds-only && '30' || '10' }}
+
+      - name: Download late reusable Android build metadata
+        id: download-late-metadata
+        if: ${{ steps.find-reusable-build-late.outputs.found == 'true' }}
+        continue-on-error: true
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.E2E_BUILD_METADATA_ARTIFACT }}
+          path: .e2e-reusable-metadata/android-late
+          github-token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          run-id: ${{ steps.find-reusable-build-late.outputs.run-id }}
+
+      # Same acceptance criteria as the first lookup's validation. A late donor is
+      # held to an identical standard; the only difference is when it was found.
+      # Failures here are logged plainly rather than via `::warning::` — not finding
+      # a late donor is the ordinary outcome and should not annotate the run.
+      - name: Validate late reusable Android build metadata
+        id: validate-late-metadata
+        if: ${{ steps.find-reusable-build-late.outputs.found == 'true' }}
+        shell: bash
+        env:
+          EXPECTED_FINGERPRINT: ${{ inputs.source-fingerprint }}
+          EXPECTED_BUILD_TYPE: ${{ inputs.build_type }}
+          EXPECTED_METAMASK_ENVIRONMENT: ${{ inputs.metamask_environment }}
+          EXPECTED_RUN_ID: ${{ steps.find-reusable-build-late.outputs.run-id }}
+          EXPECTED_HEAD_SHA: ${{ steps.find-reusable-build-late.outputs.source-sha }}
+          EXPECTED_ARTIFACTS: '["${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release.apk","${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release-androidTest.apk"]'
+          METADATA_FILE: .e2e-reusable-metadata/android-late/android.json
+        run: |
+          set -euo pipefail
+          echo "valid=false" >> "$GITHUB_OUTPUT"
+          if [[ "${{ steps.download-late-metadata.outcome }}" != "success" ]]; then
+            echo "Late reusable Android metadata download failed; continuing with the fresh native build."
+            exit 0
+          fi
+          if [[ ! -f "$METADATA_FILE" ]]; then
+            echo "Late reusable Android metadata file missing at $METADATA_FILE; continuing with the fresh native build."
+            exit 0
+          fi
+          if jq -e \
+            --arg fingerprint "$EXPECTED_FINGERPRINT" \
+            --arg buildType "$EXPECTED_BUILD_TYPE" \
+            --arg metamaskEnvironment "$EXPECTED_METAMASK_ENVIRONMENT" \
+            --arg workflowRunId "$EXPECTED_RUN_ID" \
+            --arg headSha "$EXPECTED_HEAD_SHA" \
+            --argjson artifactNames "$EXPECTED_ARTIFACTS" \
+            '.schemaVersion == 1
+              and .fingerprint == $fingerprint
+              and .platform == "android"
+              and .buildType == $buildType
+              and .metamaskEnvironment == $metamaskEnvironment
+              and .workflowRunId == $workflowRunId
+              and .headSha == $headSha
+              and .artifactNames == $artifactNames' "$METADATA_FILE" >/dev/null; then
+            echo "valid=true" >> "$GITHUB_OUTPUT"
+            echo "Late reusable Android metadata is valid."
+          else
+            echo "Late reusable Android metadata did not match current build request; continuing with the fresh native build."
+            cat "$METADATA_FILE"
+          fi
+
+      # Defensive, not load-bearing. The iOS equivalent of this step is required
+      # there because `actions/download-artifact` merges into its destination and the
+      # iOS payload is a `.app` *directory* bundle, so a stale one would blend with
+      # the donor's. An APK is a single file that the extraction overwrites whole.
+      # Nothing on this path should have written these files either: the Cirrus APK
+      # caches above only restore when the first lookup found nothing, and a hit
+      # there forces `needs-native-build=false`, which this step cannot be reached
+      # under. Kept as cheap insurance against a partial restore — if the download
+      # then fails, the compile still runs and regenerates both files.
+      - name: Clear any stale Android APKs before the late download
+        if: ${{ steps.validate-late-metadata.outputs.valid == 'true' }}
+        shell: bash
+        env:
+          APK_TARGET: ${{ steps.determine-target-paths.outputs.apk-target-path }}
+          TEST_APK_TARGET: ${{ steps.determine-target-paths.outputs.test-apk-target-path }}
+          ARTIFACT_NAME: ${{ steps.determine-target-paths.outputs.artifact_name }}
+        run: rm -f "${APK_TARGET}/${ARTIFACT_NAME}.apk" "${TEST_APK_TARGET}/${ARTIFACT_NAME}-androidTest.apk"
+
+      - name: Download late reusable APK
+        id: download-late-apk
+        if: ${{ steps.validate-late-metadata.outputs.valid == 'true' && inputs.include_arm64 == false }}
+        continue-on-error: true
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release.apk
+          path: ${{ steps.determine-target-paths.outputs.apk-target-path }}
+          github-token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          run-id: ${{ steps.find-reusable-build-late.outputs.run-id }}
+
+      - name: Download late reusable androidTest APK
+        id: download-late-test-apk
+        if: ${{ steps.validate-late-metadata.outputs.valid == 'true' && inputs.include_arm64 == false }}
+        continue-on-error: true
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release-androidTest.apk
+          path: ${{ steps.determine-target-paths.outputs.test-apk-target-path }}
+          github-token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          run-id: ${{ steps.find-reusable-build-late.outputs.run-id }}
+
+      - name: Log late-reused Android build source
+        if: ${{ steps.download-late-apk.outcome == 'success' && steps.download-late-test-apk.outcome == 'success' }}
+        shell: bash
+        run: |
+          echo "A reusable Android build appeared while this job was setting up; skipping the native compile."
+          echo "Reusing Android build from run ${{ steps.find-reusable-build-late.outputs.run-id }}"
+          echo "Source SHA: ${{ steps.find-reusable-build-late.outputs.source-sha }}"
+          echo "Source branch: ${{ steps.find-reusable-build-late.outputs.source-branch }}"
+
       # -------------------------------------------------------------------------
       # Gradle caches + native build — only on the full native-build path.
       # -------------------------------------------------------------------------
@@ -476,7 +555,7 @@ jobs:
         id: gradle-cache-restore
         # This action automatically updates the cache at the end of the workflow
         uses: cirruslabs/cache@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
-        if: ${{ inputs.runner_provider != 'namespace' && steps.gate.outputs.needs-native-build == 'true' }}
+        if: ${{ inputs.runner_provider != 'namespace' && steps.gate.outputs.needs-native-build == 'true' && !(steps.download-late-apk.outcome == 'success' && steps.download-late-test-apk.outcome == 'success') }}
         env:
           GRADLE_CACHE_VERSION: 1
         with:
@@ -491,7 +570,7 @@ jobs:
       - name: Restore Gradle dependencies from main cache
         # This will only restore the cache, not update it
         uses: cirruslabs/cache/restore@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
-        if: ${{ inputs.runner_provider != 'namespace' && steps.gate.outputs.needs-native-build == 'true' && steps.gradle-cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
+        if: ${{ inputs.runner_provider != 'namespace' && steps.gate.outputs.needs-native-build == 'true' && steps.gradle-cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main' && !(steps.download-late-apk.outcome == 'success' && steps.download-late-test-apk.outcome == 'success') }}
         env:
           GRADLE_CACHE_VERSION: 1
         with:
@@ -511,8 +590,10 @@ jobs:
           echo "init-script=$RUNNER_TEMP/namespace-gradle-init.gradle" >> "$GITHUB_OUTPUT"
         shell: bash
 
+      # Both downloads must have succeeded to skip the compile — a half-downloaded
+      # donor leaves the job without a test APK, so it falls through to a full build.
       - name: Build Android E2E APKs
-        if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
+        if: ${{ steps.gate.outputs.needs-native-build == 'true' && !(steps.download-late-apk.outcome == 'success' && steps.download-late-test-apk.outcome == 'success') }}
         run: |
           echo "🏗 Building Android E2E APKs..."
           export NODE_OPTIONS="--max-old-space-size=4096"
@@ -582,8 +663,10 @@ jobs:
           printf '%s\n' "${EXPECTED}" > "${CACHE_DIR}/.e2e-apk-cache-marker"
           echo "Namespace APK cache marker + APKs written to ${CACHE_DIR}."
 
+      # A late-reused APK carries the donor's JS bundle, not this branch's, so a late
+      # reuse must repack exactly like an early one.
       - name: Repack APK with JS updates using @expo/repack-app
-        if: ${{ steps.gate.outputs.needs-native-build != 'true' && inputs.reuse-main-builds-only != true }}
+        if: ${{ inputs.reuse-main-builds-only != true && (steps.gate.outputs.needs-native-build != 'true' || (steps.download-late-apk.outcome == 'success' && steps.download-late-test-apk.outcome == 'success')) }}
         run: |
           echo "📦 Repacking APK with updated JavaScript bundle using @expo/repack-app..."
           # Use the optimized repack script which uses @expo/repack-app
@@ -622,6 +705,118 @@ jobs:
           GOOGLE_SERVICES_B64_ANDROID: ${{ secrets.GOOGLE_SERVICES_B64_ANDROID }}
           MM_INFURA_PROJECT_ID: ${{ secrets.MM_INFURA_PROJECT_ID }}
 
+      # Deliberately placed after the build and repack rather than next to the gate,
+      # where it used to sit. The gate is computed before the late re-check exists,
+      # so from up there a late reuse still reported "Fresh native build" — the row
+      # someone reads first when a run looks wrong. Here every input to the decision
+      # is final. `always()` runs on failure and on cancellation, so a failed or
+      # cancelled compile still gets its summary.
+      - name: Write Android E2E reuse summary
+        if: ${{ always() }}
+        shell: bash
+        env:
+          SOURCE_FINGERPRINT: ${{ inputs.source-fingerprint }}
+          BUILD_TYPE: ${{ inputs.build_type }}
+          METAMASK_ENVIRONMENT: ${{ inputs.metamask_environment }}
+          REUSABLE_FOUND: ${{ steps.find-reusable-build.outputs.found }}
+          REUSABLE_RUN_ID: ${{ steps.find-reusable-build.outputs.run-id }}
+          METADATA_VALID: ${{ steps.validate-reusable-metadata.outputs.valid }}
+          APK_DOWNLOAD_OUTCOME: ${{ steps.download-reusable-apk.outcome }}
+          TEST_APK_DOWNLOAD_OUTCOME: ${{ steps.download-reusable-test-apk.outcome }}
+          LATE_LOOKUP_OUTCOME: ${{ steps.find-reusable-build-late.outcome }}
+          LATE_REUSABLE_FOUND: ${{ steps.find-reusable-build-late.outputs.found }}
+          LATE_REUSABLE_RUN_ID: ${{ steps.find-reusable-build-late.outputs.run-id }}
+          LATE_METADATA_VALID: ${{ steps.validate-late-metadata.outputs.valid }}
+          LATE_APK_DOWNLOAD_OUTCOME: ${{ steps.download-late-apk.outcome }}
+          LATE_TEST_APK_DOWNLOAD_OUTCOME: ${{ steps.download-late-test-apk.outcome }}
+          NAMESPACE_CACHE_HIT: ${{ steps.namespace-apk-cache.outputs.cache-hit }}
+          BRANCH_CACHE_HIT: ${{ steps.apk-cache-restore.outputs.cache-hit }}
+          MAIN_CACHE_HIT: ${{ steps.apk-cache-restore-main.outputs.cache-hit }}
+          # Uses the hash captured pre-setup by `determine-target-paths`, not an
+          # inline `hashFiles`: this step now runs after jetify, which rewrites
+          # `*.gradle` files under `node_modules/*/android/`, so an inline call here
+          # would render keys the restore steps never used.
+          BRANCH_CACHE_KEY: android-apk-${{ github.ref_name }}-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-${{ inputs.source-fingerprint }}-${{ steps.determine-target-paths.outputs.gradle-files-hash }}
+          MAIN_CACHE_KEY: android-apk-main-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-${{ inputs.source-fingerprint }}-${{ steps.determine-target-paths.outputs.gradle-files-hash }}
+          NEEDS_NATIVE_BUILD: ${{ steps.gate.outputs.needs-native-build }}
+          REPOSITORY: ${{ github.repository }}
+        run: |
+          value() {
+            if [[ -n "${1:-}" ]]; then
+              printf '%s' "$1"
+            else
+              printf 'n/a'
+            fi
+          }
+
+          yes_no() {
+            case "${1:-}" in
+              true) printf 'yes' ;;
+              *) printf 'no' ;;
+            esac
+          }
+
+          run_link() {
+            printf '[https://github.com/%s/actions/runs/%s](https://github.com/%s/actions/runs/%s)' \
+              "$REPOSITORY" "$1" "$REPOSITORY" "$1"
+          }
+
+          github_candidate="$(yes_no "$REUSABLE_FOUND")"
+          if [[ -n "${REUSABLE_RUN_ID:-}" ]]; then
+            github_candidate="yes ($(run_link "$REUSABLE_RUN_ID"))"
+          fi
+
+          # Three states, so "the re-check never ran" reads differently from "it ran
+          # and found nothing" — the two have very different causes.
+          late_candidate="n/a (not reached)"
+          if [[ -n "${LATE_LOOKUP_OUTCOME:-}" && "${LATE_LOOKUP_OUTCOME}" != "skipped" ]]; then
+            late_candidate="$(yes_no "$LATE_REUSABLE_FOUND")"
+            if [[ -n "${LATE_REUSABLE_RUN_ID:-}" ]]; then
+              late_candidate="yes ($(run_link "$LATE_REUSABLE_RUN_ID"))"
+            fi
+          fi
+
+          # The late branch is checked first: on a late reuse the gate still says
+          # `needs-native-build=true`, because it was computed before the re-check.
+          # A late reuse is mutually exclusive with every other branch below — it
+          # requires a non-Namespace runner and a `true` gate, so no Namespace hit,
+          # no early GitHub reuse and no Cirrus hit can coexist with it.
+          decision="Fresh native build"
+          if [[ "${LATE_APK_DOWNLOAD_OUTCOME:-}" == "success" && "${LATE_TEST_APK_DOWNLOAD_OUTCOME:-}" == "success" ]]; then
+            decision="GitHub artifact reuse (late — donor appeared during setup)"
+          elif [[ "${NAMESPACE_CACHE_HIT:-}" == "true" ]]; then
+            decision="Namespace APK cache"
+          elif [[ "${REUSABLE_FOUND:-}" == "true" && "${METADATA_VALID:-}" == "true" && "${APK_DOWNLOAD_OUTCOME:-}" == "success" && "${TEST_APK_DOWNLOAD_OUTCOME:-}" == "success" ]]; then
+            decision="GitHub artifact reuse"
+          elif [[ "${BRANCH_CACHE_HIT:-}" == "true" || "${MAIN_CACHE_HIT:-}" == "true" ]]; then
+            decision="Cirrus APK cache"
+          elif [[ "${NEEDS_NATIVE_BUILD:-}" == "false" ]]; then
+            decision="reuse/cache hit"
+          fi
+
+          branch_cache="$(yes_no "$BRANCH_CACHE_HIT")"
+          main_cache="$(yes_no "$MAIN_CACHE_HIT")"
+          if [[ "${BRANCH_CACHE_HIT:-}" == "true" ]]; then
+            branch_cache="yes (\`$BRANCH_CACHE_KEY\`)"
+          elif [[ "${MAIN_CACHE_HIT:-}" == "true" ]]; then
+            main_cache="yes (\`$MAIN_CACHE_KEY\`)"
+          fi
+
+          {
+            echo "### Android E2E build reuse"
+            echo ""
+            echo "| Field | Value |"
+            echo "| --- | --- |"
+            echo "| Decision | $decision |"
+            echo "| Native build fingerprint | \`$(value "$SOURCE_FINGERPRINT")\` |"
+            echo "| Build type | \`$(value "$BUILD_TYPE")\` |"
+            echo "| MetaMask environment | \`$(value "$METAMASK_ENVIRONMENT")\` |"
+            echo "| Branch APK cache hit | $branch_cache |"
+            echo "| Main APK cache hit | $main_cache |"
+            echo "| GitHub artifact candidate | $github_candidate |"
+            echo "| Late re-check candidate | $late_candidate |"
+          } >> "$GITHUB_STEP_SUMMARY"
+
       - name: Write Android E2E build metadata
         shell: bash
         env:
@@ -729,3 +924,23 @@ jobs:
           path: ${{ steps.determine-target-paths.outputs.test-apk-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}-androidTest.apk
           retention-days: 7
           if-no-files-found: error
+
+      # Gradle builds every RN library module inside node_modules
+      # (node_modules/<pkg>/android/build) and CMake writes to
+      # node_modules/<pkg>/android/.cxx — ~4-5 GB of intermediates that used
+      # to balloon the post-job yarn cache save (setup-e2e-env) from ~600 MB
+      # to ~1.5 GB, adding ~1 min of cache download to every Android E2E job.
+      # Main steps all run before post-job steps, so deleting the
+      # intermediates here (after the APKs have been uploaded — they live in
+      # android/app/build, not node_modules) means the post-job save archives
+      # a clean tree. Gradle build reuse is handled by the dedicated Gradle
+      # caches, which are correctly keyed on Gradle config files.
+      - name: Clean native build intermediates from node_modules
+        if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
+        continue-on-error: true
+        shell: bash
+        run: |
+          before=$(du -sm node_modules | cut -f1)
+          find node_modules -type d \( -name build -o -name .cxx \) -path '*/android/*' -prune -exec rm -rf {} + 2>/dev/null || true
+          after=$(du -sm node_modules | cut -f1)
+          echo "node_modules: ${before} MB -> ${after} MB (removed $((before - after)) MB of Gradle/CMake intermediates)"
diff --git a/.github/workflows/build-android-upload-to-browserstack.yml b/.github/workflows/build-android-upload-to-browserstack.yml
index f01ac660c35b..bc0d53de2b78 100644
--- a/.github/workflows/build-android-upload-to-browserstack.yml
+++ b/.github/workflows/build-android-upload-to-browserstack.yml
@@ -29,7 +29,11 @@ on:
       branch_name:
         required: false
         type: string
-        description: 'Branch name to use for builds (defaults to github.ref_name)'
+        description: 'Branch label used for BrowserStack build names'
+      source_ref:
+        required: false
+        type: string
+        description: 'Exact branch, tag, or commit to use for native app builds'
       build_variant:
         required: false
         type: string
@@ -170,27 +174,15 @@ jobs:
           main-branch-only: ${{ inputs.main_branch_only }}
           max-candidates-per-branch: ${{ inputs.main_branch_only && '30' || '10' }}
 
-      - name: Find reusable performance APKs on run-performance-e2e-release.yml
-        id: find-release
+      - name: Find reusable performance APKs on run-performance-e2e-manual.yml
+        id: find-manual
         if: ${{ steps.find-ci.outputs.found != 'true' && steps.find-perf.outputs.found != 'true' }}
         uses: ./.github/actions/find-reusable-build
         with:
           fingerprint: ${{ inputs.source_fingerprint }}
           artifact-names: ${{ format('["android-apk-{0}","android-apk-{1}"]', needs.check-builds-needed.outputs.with-srp-build-name, needs.check-builds-needed.outputs.without-srp-build-name) }}
           github-token: ${{ github.token }}
-          workflow-file: run-performance-e2e-release.yml
-          main-branch-only: ${{ inputs.main_branch_only }}
-          max-candidates-per-branch: ${{ inputs.main_branch_only && '30' || '10' }}
-
-      - name: Find reusable performance APKs on run-performance-e2e-experimental.yml
-        id: find-exp
-        if: ${{ steps.find-ci.outputs.found != 'true' && steps.find-perf.outputs.found != 'true' && steps.find-release.outputs.found != 'true' }}
-        uses: ./.github/actions/find-reusable-build
-        with:
-          fingerprint: ${{ inputs.source_fingerprint }}
-          artifact-names: ${{ format('["android-apk-{0}","android-apk-{1}"]', needs.check-builds-needed.outputs.with-srp-build-name, needs.check-builds-needed.outputs.without-srp-build-name) }}
-          github-token: ${{ github.token }}
-          workflow-file: run-performance-e2e-experimental.yml
+          workflow-file: run-performance-e2e-manual.yml
           main-branch-only: ${{ inputs.main_branch_only }}
           max-candidates-per-branch: ${{ inputs.main_branch_only && '30' || '10' }}
 
@@ -217,24 +209,15 @@ jobs:
               echo "source-workflow=run-performance-e2e.yml"
             } >> "$GITHUB_OUTPUT"
             echo "Candidate: run-performance-e2e.yml run ${{ steps.find-perf.outputs.run-id }}"
-          elif [ "${{ steps.find-release.outputs.found }}" = "true" ]; then
+          elif [ "${{ steps.find-manual.outputs.found }}" = "true" ]; then
             {
               echo "found=true"
-              echo "run-id=${{ steps.find-release.outputs.run-id }}"
-              echo "source-sha=${{ steps.find-release.outputs.source-sha }}"
-              echo "source-branch=${{ steps.find-release.outputs.source-branch }}"
-              echo "source-workflow=run-performance-e2e-release.yml"
+              echo "run-id=${{ steps.find-manual.outputs.run-id }}"
+              echo "source-sha=${{ steps.find-manual.outputs.source-sha }}"
+              echo "source-branch=${{ steps.find-manual.outputs.source-branch }}"
+              echo "source-workflow=run-performance-e2e-manual.yml"
             } >> "$GITHUB_OUTPUT"
-            echo "Candidate: run-performance-e2e-release.yml run ${{ steps.find-release.outputs.run-id }}"
-          elif [ "${{ steps.find-exp.outputs.found }}" = "true" ]; then
-            {
-              echo "found=true"
-              echo "run-id=${{ steps.find-exp.outputs.run-id }}"
-              echo "source-sha=${{ steps.find-exp.outputs.source-sha }}"
-              echo "source-branch=${{ steps.find-exp.outputs.source-branch }}"
-              echo "source-workflow=run-performance-e2e-experimental.yml"
-            } >> "$GITHUB_OUTPUT"
-            echo "Candidate: run-performance-e2e-experimental.yml run ${{ steps.find-exp.outputs.run-id }}"
+            echo "Candidate: run-performance-e2e-manual.yml run ${{ steps.find-manual.outputs.run-id }}"
           else
             {
               echo "found=false"
@@ -427,7 +410,7 @@ jobs:
     with:
       build_name: ${{ needs.check-builds-needed.outputs.with-srp-build-name }}
       platform: android
-      source_branch: ${{ inputs.branch_name || github.ref_name }}
+      source_branch: ${{ inputs.source_ref || inputs.branch_name || github.ref_name }}
     secrets: inherit
 
   build-without-srp:
@@ -445,7 +428,7 @@ jobs:
     with:
       build_name: ${{ needs.check-builds-needed.outputs.without-srp-build-name }}
       platform: android
-      source_branch: ${{ inputs.branch_name || github.ref_name }}
+      source_branch: ${{ inputs.source_ref || inputs.branch_name || github.ref_name }}
     secrets: inherit
 
   upload-to-browserstack:
@@ -605,6 +588,24 @@ jobs:
             eval "$(node /tmp/export-profile-secrets.js "$build_name")"
           }
 
+          # Expo export:embed forces resetCache=false when CI=true (see
+          # @expo/cli exportEmbedAsync). Dual with/without-SRP packs therefore
+          # share /tmp/metro-cache and the second pack can reuse babel-inlined
+          # PREDEFINED_PASSWORD / ADDITIONAL_SRP_* from the first. Wipe explicitly.
+          clear_metro_transform_cache() {
+            local label="$1"
+            rm -rf /tmp/metro-cache
+            echo "Cleared /tmp/metro-cache before $label repack (CI disables Metro resetCache)"
+          }
+
+          unset_srp_bake_ins() {
+            unset PREDEFINED_PASSWORD || true
+            local i
+            for i in $(seq 1 20); do
+              unset "ADDITIONAL_SRP_$i" || true
+            done
+          }
+
           repack_profile() {
             local build_name="$1"
             local src_dir="$2"
@@ -623,12 +624,23 @@ jobs:
 
             export_build_env "$build_name"
 
+            # Isolate Metro transform cache keys between with-SRP and without-SRP.
+            export METRO_TRANSFORM_PROFILE="$label"
+
+            # Boolean-only diagnostics — never print secret values.
+            if [ -n "${PREDEFINED_PASSWORD:-}" ] || [ -n "${ADDITIONAL_SRP_1:-}" ]; then
+              echo "Transform bake-ins present=yes (profile=$label)"
+            else
+              echo "Transform bake-ins present=no (profile=$label)"
+            fi
+
             export REPACK_SOURCE_APK="$src_apk"
             export REPACK_OUTPUT_APK="android/app/build/outputs/apk/prod/release/app-prod-release-repack-$label.apk"
             export REPACK_FINAL_APK="$out_dir/app-prod-release.apk"
             export REPACK_WORKING_DIR="android/app/build/repack-working-$label"
             export REPACK_SOURCEMAP_PATH="sourcemaps/android/index.android.bundle.$label.map"
 
+            clear_metro_transform_cache "$label"
             yarn build:repack:android
             echo "✅ Repacked $label → $REPACK_FINAL_APK ($(du -h "$REPACK_FINAL_APK" | cut -f1))"
           }
@@ -636,8 +648,9 @@ jobs:
           # with-SRP first (ADDITIONAL_SRP_1 + PREDEFINED_PASSWORD inlined into JS via metro)
           repack_profile "$WITH_SRP_BUILD_NAME" artifacts/with-srp artifacts/with-srp-repacked with-srp
 
-          # without-SRP: drop with-SRP bake-ins so they are not left in process.env
-          unset ADDITIONAL_SRP_1 PREDEFINED_PASSWORD || true
+          # without-SRP: drop with-SRP bake-ins so they are not left in process.env,
+          # then wipe Metro cache so CI cannot reuse the with-SRP transforms.
+          unset_srp_bake_ins
           repack_profile "$WITHOUT_SRP_BUILD_NAME" artifacts/without-srp artifacts/without-srp-repacked without-srp
 
           # Replace staged dirs so the upload step always reads artifacts/{with,without}-srp
diff --git a/.github/workflows/build-ios-upload-to-browserstack.yml b/.github/workflows/build-ios-upload-to-browserstack.yml
index 432e4f3da95f..3fe61f2373ae 100644
--- a/.github/workflows/build-ios-upload-to-browserstack.yml
+++ b/.github/workflows/build-ios-upload-to-browserstack.yml
@@ -18,7 +18,11 @@ on:
       branch_name:
         required: false
         type: string
-        description: 'Branch name to use for builds (defaults to github.ref_name)'
+        description: 'Branch label used for BrowserStack build names'
+      source_ref:
+        required: false
+        type: string
+        description: 'Exact branch, tag, or commit to use for native app builds'
       build_variant:
         required: false
         type: string
@@ -100,7 +104,7 @@ jobs:
     with:
       build_name: ${{ inputs.build_variant == 'exp' && 'main-exp-with-srp' || inputs.build_variant == 'rc' && 'main-rc-with-srp' || 'main-e2e-bs-with-srp' }}
       platform: ios
-      source_branch: ${{ inputs.branch_name || github.ref_name }}
+      source_branch: ${{ inputs.source_ref || inputs.branch_name || github.ref_name }}
     secrets: inherit
 
   trigger-ios-without-srp-build:
@@ -111,7 +115,7 @@ jobs:
     with:
       build_name: ${{ inputs.build_variant == 'exp' && 'main-exp-without-srp' || inputs.build_variant == 'rc' && 'main-rc-without-srp' || 'main-e2e-bs-without-srp' }}
       platform: ios
-      source_branch: ${{ inputs.branch_name || github.ref_name }}
+      source_branch: ${{ inputs.source_ref || inputs.branch_name || github.ref_name }}
     secrets: inherit
 
   download-and-upload-to-browserstack:
diff --git a/.github/workflows/build-rc-auto.yml b/.github/workflows/build-rc-auto.yml
index 2c9a86d4ff05..1c425fb95464 100644
--- a/.github/workflows/build-rc-auto.yml
+++ b/.github/workflows/build-rc-auto.yml
@@ -7,8 +7,9 @@
 # in-progress run of this workflow for that branch is cancelled (one branch + one
 # workflow at a time).
 #
-# Version bump: generate-build-version → commit-build-version, then iOS and Android
-# builds are triggered in parallel via auto-rc-ota-build-core.yml (bump commit passed as source_branch).
+# Version bump: generate-build-version, then iOS and Android builds are triggered in parallel
+# via auto-rc-ota-build-core.yml with the generated number applied locally at build time.
+# Both platforms pin source_branch to github.sha so they build the same commit.
 #
 # The RC build comment includes an AI-generated test plan (inline with collapsible sections).
 #
@@ -31,8 +32,8 @@ concurrency:
   cancel-in-progress: true
 
 permissions:
-  contents: write
   pull-requests: write
+  contents: read
   actions: write
   id-token: write
 
@@ -116,28 +117,19 @@ jobs:
     needs: validate-and-find-pr
     if: needs.validate-and-find-pr.outputs.has-pr == 'true' && needs.validate-and-find-pr.outputs.rc-frozen != 'true'
 
-  update_rc_build_version:
-    name: Commit RC build version
-    uses: ./.github/workflows/commit-build-version.yml
-    needs: [validate-and-find-pr, generate_rc_build_version]
-    if: needs.validate-and-find-pr.outputs.has-pr == 'true' && needs.validate-and-find-pr.outputs.rc-frozen != 'true'
-    permissions:
-      contents: write
-      id-token: write
-    with:
-      base-branch: ${{ needs.validate-and-find-pr.outputs.branch-name }}
-      build_number: ${{ needs.generate_rc_build_version.outputs.build-version }}
-
   trigger-ios-rc-build:
     name: Trigger iOS RC Build
     uses: ./.github/workflows/auto-rc-ota-build-core.yml
     needs:
       - validate-and-find-pr
-      - update_rc_build_version
+      - generate_rc_build_version
     if: needs.validate-and-find-pr.outputs.has-pr == 'true' && needs.validate-and-find-pr.outputs.rc-frozen != 'true'
     with:
       platform: ios
-      source_branch: ${{ needs.update_rc_build_version.outputs.commit-hash }}
+      # Pin to the triggering commit so iOS and Android build the same SHA even if
+      # cherry-picks land on the release branch while the two jobs are in flight.
+      source_branch: ${{ github.sha }}
+      build_number: ${{ needs.generate_rc_build_version.outputs.build-version }}
       distribute_external: true
     secrets: inherit
 
@@ -146,11 +138,12 @@ jobs:
     uses: ./.github/workflows/auto-rc-ota-build-core.yml
     needs:
       - validate-and-find-pr
-      - update_rc_build_version
+      - generate_rc_build_version
     if: needs.validate-and-find-pr.outputs.has-pr == 'true' && needs.validate-and-find-pr.outputs.rc-frozen != 'true'
     with:
       platform: android
-      source_branch: ${{ needs.update_rc_build_version.outputs.commit-hash }}
+      source_branch: ${{ github.sha }}
+      build_number: ${{ needs.generate_rc_build_version.outputs.build-version }}
     secrets: inherit
 
   post-rc-build-comment:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6b1b13ac8cf0..96ee77b43c74 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,9 +24,7 @@ on:
       build_number:
         description: >-
           Optional (workflow_call only). From generate-build-version.yml. When non-empty, each matrix
-          build runner applies scripts/set-build-version.sh locally before building. Omit when
-          source_branch already contains the desired build number (e.g. commit-hash from
-          commit-build-version.yml).
+          build runner applies scripts/set-build-version.sh locally before building.
         required: false
         type: string
         default: ''
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 13336c7ad36a..f8ad314f37e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1032,7 +1032,7 @@ jobs:
           fi
 
   component-view-tests:
-    name: Component view tests
+    name: Component view tests (${{ matrix.shard }})
     runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     # BITRISE/NAMESPACE-SHADOW: skipped on Bitrise shadow (iOS-only, INFRA-3679); Namespace shadow runs this Linux job only when NAMESPACE_SHADOW_LINUX_AUTO_DISPATCH=true
     if: ${{ !cancelled() && needs.get_requirements.result == 'success' && needs.get_requirements.outputs.skip_everything != 'true' && inputs.runner_provider != 'bitrise' && (inputs.runner_provider != 'namespace' || vars.NAMESPACE_SHADOW_LINUX_AUTO_DISPATCH == 'true') }}
@@ -1041,7 +1041,7 @@ jobs:
       - prepare-ci-js-deps
     strategy:
       matrix:
-        shard: [1, 2]
+        shard: [1, 2, 3]
     steps:
       - uses: namespacelabs/nscloud-checkout-action@938f5d2d403d6224d9a0c0dc559b1dae09c2ede4 # v8.1.1
         if: ${{ inputs.runner_provider == 'namespace' }}
@@ -1067,7 +1067,7 @@ jobs:
         run: mkdir -p tests/results
       - run: |
           yarn test:view:ci \
-            --shard=${{ matrix.shard }}/2 \
+            --shard=${{ matrix.shard }}/3 \
             --json \
             --outputFile=tests/results/cv-test-results-${{ matrix.shard }}.json
         env:
@@ -1214,7 +1214,8 @@ jobs:
     name: 'Run Performance Tests (PR)'
     # Run when:
     # - run-performance-tests label is on the PR (forced run, all tests), OR
-    # - smart-e2e-selection ran and AI selected performance tags.
+    # - the PR targets main and Smart E2E Selection chose performance tags.
+    # PRs targeting release/* or stable only run performance tests via the label.
     # ai_performance_test_tags == '[]'  → AI ran and found no perf-relevant changes: skip.
     # ai_performance_test_tags == ''    → conservative fallback (AI failed) or run-performance-tests label: run all tests.
     # ai_performance_test_tags == '[…]' → specific tags selected: run those tests.
@@ -1228,6 +1229,7 @@ jobs:
         (
           needs.get_requirements.outputs.run_performance == 'true' ||
           (
+            github.event.pull_request.base.ref == 'main' &&
             needs.smart-e2e-selection.result == 'success' &&
             needs.smart-e2e-selection.outputs.ai_performance_test_tags != '[]'
           )
@@ -1240,6 +1242,7 @@ jobs:
       performance_tags_reasoning: ${{ needs.get_requirements.outputs.run_performance == 'true' && 'Forced run via run-performance-tests label on PR' || needs.smart-e2e-selection.outputs.ai_performance_test_reasoning }}
       build_variant: 'e2e'
       branch_name: ${{ github.head_ref }}
+      source_ref: ${{ github.sha }}
       pr_number: ${{ github.event.pull_request.number }}
       reuse_main_builds: ${{ needs.get_requirements.outputs.native_build_needed == 'false' }}
       source_fingerprint: ${{ needs.native-build-fingerprint.outputs.fingerprint }}
@@ -1329,31 +1332,8 @@ jobs:
           # See: https://github.com/MetaMask/metamask-mobile/pull/31217
           retention-days: 30
 
-  e2e-smoke-tests-android:
-    name: 'Android E2E Smoke Tests'
-    # BITRISE/NAMESPACE-SHADOW: skipped on Bitrise shadow (iOS-only, INFRA-3679); Namespace shadow runs this Linux-runner job only when NAMESPACE_SHADOW_LINUX_AUTO_DISPATCH=true
-    if: >-
-      ${{
-        inputs.runner_provider != 'bitrise' &&
-        (inputs.runner_provider != 'namespace' || vars.NAMESPACE_SHADOW_LINUX_AUTO_DISPATCH == 'true') &&
-        !cancelled() &&
-        needs.build-android-apks.result == 'success' &&
-        (needs.prepare-e2e-timings.result == 'success' || needs.prepare-e2e-timings.result == 'failure' || needs.prepare-e2e-timings.result == 'skipped')
-      }}
-    permissions:
-      contents: read
-      id-token: write
-    needs: [get_requirements, build-android-apks, smart-e2e-selection, prepare-e2e-timings]
-    uses: ./.github/workflows/run-e2e-smoke-tests-android.yml
-    with:
-      changed_spec_files: ${{ needs.get_requirements.outputs.changed_spec_files }}
-      selected_tags: >-
-        ${{
-          (fromJSON(needs.smart-e2e-selection.outputs.ai_confidence || '0') >= 85 && needs.smart-e2e-selection.outputs.ai_e2e_test_tags) ||
-          '["ALL"]'
-        }}
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
+  # Detox Android E2E smoke workflow removed — tags fully migrated to Appium
+  # (run-appium-smoke-tests-android.yml).
 
   build-ios-apps:
     name: 'Build iOS Apps'
@@ -1389,28 +1369,8 @@ jobs:
       - name: iOS build complete
         run: echo "Dummy step to better visualize the Android and iOS E2E tests in Github workflow graph"
 
-  e2e-smoke-tests-ios:
-    name: 'iOS E2E Smoke Tests'
-    if: >-
-      ${{
-        !cancelled() &&
-        needs.ios-tests-ready.result == 'success' &&
-        (needs.prepare-e2e-timings.result == 'success' || needs.prepare-e2e-timings.result == 'failure' || needs.prepare-e2e-timings.result == 'skipped')
-      }}
-    permissions:
-      contents: read
-      id-token: write
-    needs: [get_requirements, ios-tests-ready, smart-e2e-selection, prepare-e2e-timings]
-    uses: ./.github/workflows/run-e2e-smoke-tests-ios.yml
-    with:
-      changed_spec_files: ${{ needs.get_requirements.outputs.changed_spec_files }}
-      selected_tags: >-
-        ${{
-          (fromJSON(needs.smart-e2e-selection.outputs.ai_confidence || '0') >= 85 && needs.smart-e2e-selection.outputs.ai_e2e_test_tags) ||
-          '["ALL"]'
-        }}
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
+  # Detox iOS E2E smoke workflow removed — tags fully migrated to Appium
+  # (run-appium-smoke-tests-ios.yml).
 
   appium-smoke-tests-android:
     name: 'Appium Smoke Tests (Android)'
@@ -1446,7 +1406,8 @@ jobs:
   appium-smoke-tests-ios:
     name: 'Appium Smoke Tests (iOS)'
     # Main push/schedule: always run when the iOS build succeeded.
-    # PRs: skipped by default; add run-appium-ios-tests, or change page-objects/selectors/locators/framework
+    # PRs: skipped by default; add run-appium-ios-tests, or change
+    # page-objects/selectors/locators/framework/smoke-appium
     # (same smart-selected tags as other E2E jobs).
     if: >-
       ${{
@@ -1745,8 +1706,6 @@ jobs:
       - sonar-cloud-quality-gate-status
       - build-android-apks
       - build-ios-apps
-      - e2e-smoke-tests-android
-      - e2e-smoke-tests-ios
       - appium-smoke-tests-android
       - appium-smoke-tests-ios
     steps:
@@ -1769,7 +1728,7 @@ jobs:
         with:
           needs-json: ${{ toJSON(needs) }}
           requirement-context-json: ${{ toJSON(needs.get_requirements.outputs) }}
-          e2e-job-regex: '^(build-android-apks|build-ios-apps|e2e-smoke-tests-android|e2e-smoke-tests-ios|appium-smoke-tests-android|appium-smoke-tests-ios)$'
+          e2e-job-regex: '^(build-android-apks|build-ios-apps|appium-smoke-tests-android|appium-smoke-tests-ios)$'
           event-name: ${{ github.event_name }}
           is-fork: ${{ github.event.pull_request.head.repo.fork == true }}
 
diff --git a/.github/workflows/commit-build-version.yml b/.github/workflows/commit-build-version.yml
deleted file mode 100644
index 1621d5752749..000000000000
--- a/.github/workflows/commit-build-version.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-##############################################################################################
-#
-# Commit Build Version (reusable)
-#
-# Applies a caller-supplied build number to version files, commits, and pushes to base-branch.
-# Does not generate the number — use generate-build-version.yml first.
-#
-##############################################################################################
-name: Commit Build Version
-
-on:
-  workflow_call:
-    inputs:
-      base-branch:
-        description: 'Branch, tag, or SHA to checkout and push the version bump to'
-        required: true
-        type: string
-      build_number:
-        description: 'Build number from generate-build-version.yml outputs.build-version'
-        required: true
-        type: string
-    outputs:
-      commit-hash:
-        description: 'Commit SHA with build version bumped'
-        value: ${{ jobs.commit.outputs.commit-hash }}
-
-permissions:
-  id-token: write
-
-jobs:
-  commit:
-    runs-on: ubuntu-latest
-    outputs:
-      commit-hash: ${{ steps.bump-build-version.outputs.commit-hash }}
-    steps:
-      - name: Get token
-        id: get-token
-        uses: MetaMask/github-tools/.github/actions/get-token@v1
-        with:
-          token-exchange-url: ${{ vars.TOKEN_EXCHANGE_URL }}
-          permissions: |
-            contents: write
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: ${{ inputs.base-branch }}
-          token: ${{ steps.get-token.outputs.token }}
-      - name: Bump build version
-        id: bump-build-version
-        shell: bash
-        env:
-          BUILD_NUMBER: ${{ inputs.build_number }}
-          HEAD_REF: ${{ inputs.base-branch }}
-        run: |
-          ./scripts/set-build-version.sh "$BUILD_NUMBER"
-          git diff
-          git config user.name metamaskbot
-          git config user.email metamaskbot@users.noreply.github.com
-          git add package.json
-          git add ios/MetaMask.xcodeproj/project.pbxproj
-          git add android/app/build.gradle
-          git commit -m "[skip ci] Bump version number to ${BUILD_NUMBER}"
-          git push origin HEAD:"$HEAD_REF" --force-with-lease
-          echo "commit-hash=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
index 4b83b603551d..97091d2049d1 100644
--- a/.github/workflows/create-release-pr.yml
+++ b/.github/workflows/create-release-pr.yml
@@ -93,15 +93,9 @@ jobs:
         run: |
           .github/scripts/resolve-previous-ref.sh
 
-  generate-build-version:
-    needs: resolve-bases
-    if: needs.resolve-bases.outputs.is_ota != 'true'
-    uses: ./.github/workflows/generate-build-version.yml
-
   create-release-pr:
-    needs: [resolve-bases, resolve-previous-ref, generate-build-version]
-    # When generate-build-version is skipped (OTA), this job must still run; see https://docs.github.com/en/actions/using-jobs/using-jobs-in-a-workflow#handling-skipped-dependent-jobs
-    if: always() && needs.resolve-bases.result == 'success' && needs.resolve-previous-ref.result == 'success' && (needs.generate-build-version.result == 'success' || needs.generate-build-version.result == 'skipped')
+    needs: [resolve-bases, resolve-previous-ref]
+    if: needs.resolve-bases.result == 'success' && needs.resolve-previous-ref.result == 'success'
     name: Create Release Pull Request using Github Tools
     runs-on: ubuntu-latest
     steps:
@@ -123,6 +117,26 @@ jobs:
             members: read
             workflows: write
 
+      # Read current build number from version files for github-tools (non-OTA only).
+      # Kept in this job to avoid a separate runner just for the metadata read.
+      - name: Checkout repository
+        if: needs.resolve-bases.outputs.is_ota != 'true'
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.resolve-bases.outputs.checkout_base }}
+          fetch-depth: 1
+
+      - name: Setup Node.js
+        if: needs.resolve-bases.outputs.is_ota != 'true'
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Read build number from version files
+        if: needs.resolve-bases.outputs.is_ota != 'true'
+        id: meta
+        run: ./scripts/get-build-metadata.sh --ci
+
       - name: Create Release PR (semver / native version bump)
         if: needs.resolve-bases.outputs.is_ota != 'true'
         uses: MetaMask/github-tools/.github/actions/create-release-pr@v1.16.0
@@ -132,7 +146,10 @@ jobs:
           release-pr-base-branch: ${{ needs.resolve-bases.outputs.release_base }}
           semver-version: ${{ inputs.semver-version }}
           previous-version-ref: ${{ needs.resolve-previous-ref.outputs.previous_ref }}
-          mobile-build-version: ${{ needs.generate-build-version.outputs.build-version }}
+          # github-tools requires this input for mobile, but only bumps semver on the release branch.
+          # Build numbers are applied locally at build time (see build.yml build_number input).
+          # ios_version_code is the shared mobile build number from get-build-metadata.sh.
+          mobile-build-version: ${{ steps.meta.outputs.ios_version_code }}
           github-token: ${{ steps.get-token.outputs.token }}
           google-application-creds-base64: ${{ github.event_name == 'workflow_dispatch' && secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 || secrets.google-application-creds-base64 }}
 
diff --git a/.github/workflows/expo-dev-build.yml b/.github/workflows/expo-dev-build.yml
index 437febcf6f00..f913d2d8d11e 100644
--- a/.github/workflows/expo-dev-build.yml
+++ b/.github/workflows/expo-dev-build.yml
@@ -2,8 +2,15 @@
 #
 # Expo Dev Build.
 #
-# Triggered on every push to main. Builds the main-dev-expo configuration (Debug)
-# for both iOS and Android using the reusable build.yml workflow.
+# Triggered on every push to main, but only actually builds when the @expo/fingerprint
+# hash (plus a hash of builds.yml, which fingerprint doesn't track) differs from the last
+# successful build — i.e. only when native code changed. A weekly cron (and the
+# `force_build` manual dispatch input) forces a fresh build regardless, so the GitHub
+# Actions artifacts consumed by `yarn install:ios:dev` / `yarn install:android:dev` never
+# go stale for longer than a week even if native code hasn't changed.
+#
+# Builds the main-dev-expo configuration (Debug) for both iOS and Android using the
+# reusable build.yml workflow.
 #
 # Produces simulator .app + device IPA (iOS) and APK + test APK (Android).
 # No version bump or TestFlight upload.
@@ -20,6 +27,10 @@ on:
   push:
     branches:
       - main
+  schedule:
+    # Weekly safety-net build (Monday 06:00 UTC) so GitHub Actions artifacts don't expire
+    # and go stale during long stretches with no native-affecting changes on main.
+    - cron: '0 6 * * 1'
   workflow_dispatch:
     inputs:
       runner_provider:
@@ -30,14 +41,199 @@ on:
           - current
           - namespace
         default: current
+      force_build:
+        description: Force a fresh build even if the fingerprint is unchanged
+        required: false
+        type: boolean
+        default: false
 
 permissions:
   contents: write
   id-token: write
+  actions: read
+
+concurrency:
+  # Non-cancelling: a burst of merges to main serializes instead of racing, so a queued
+  # run can find the marker artifact uploaded by the run ahead of it and skip its build.
+  group: expo-dev-build-${{ github.ref }}
+  cancel-in-progress: false
 
 jobs:
+  resolve-dev-build:
+    name: Resolve dev build gate
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    outputs:
+      needs-build: ${{ steps.gate.outputs.needs-build }}
+      gate-key: ${{ steps.gate-key.outputs.gate-key }}
+      reusable-run-id: ${{ steps.gate.outputs.reusable-run-id }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version-file: '.nvmrc'
+          cache: yarn
+
+      - name: Install Yarn dependencies with retry
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          retry_wait_seconds: 30
+          command: yarn install --immutable
+
+      - name: Compute gate key
+        id: gate-key
+        run: |
+          FINGERPRINT="$(yarn fingerprint:generate)"
+          if [[ -z "$FINGERPRINT" ]]; then
+            echo "::error::yarn fingerprint:generate produced an empty hash"
+            exit 1
+          fi
+          # builds.yml isn't tracked by @expo/fingerprint, but the main-dev-expo entry
+          # (signing, CONFIGURATION, IS_DEVICE_BUILD, code_fencing, ...) affects the
+          # binary, so fold a short hash of it into the gate key.
+          BUILDS_HASH="$(sha256sum builds.yml | cut -c1-8)"
+          GATE_KEY="${FINGERPRINT}-${BUILDS_HASH}"
+          echo "gate-key=${GATE_KEY}" >> "$GITHUB_OUTPUT"
+          echo "Fingerprint: ${FINGERPRINT}"
+          echo "builds.yml hash: ${BUILDS_HASH}"
+          echo "Gate key: ${GATE_KEY}"
+
+      - name: Look up reusable dev build
+        id: lookup
+        if: ${{ github.event_name != 'schedule' && inputs.force_build != true }}
+        uses: actions/github-script@v7
+        env:
+          GATE_KEY: ${{ steps.gate-key.outputs.gate-key }}
+          # Scoped to the current branch, not hardcoded to main: `yarn install:*:dev`
+          # resolves artifacts per branch, so a marker from another branch must not
+          # authorize skipping here — a manual dispatch on a feature branch would
+          # otherwise reuse main's marker and leave that branch with no artifacts.
+          GATE_BRANCH: ${{ github.ref_name }}
+        with:
+          script: |
+            const { GATE_KEY, GATE_BRANCH } = process.env;
+            const markerName = `expo-dev-build-key-${GATE_KEY}`;
+            const requiredArtifacts = [
+              'ios-app-main-dev-expo',
+              'ios-ipa-main-dev-expo',
+              'android-apk-main-dev-expo',
+            ];
+
+            const setNotFound = () => {
+              core.setOutput('found', 'false');
+              core.setOutput('run-id', '');
+            };
+
+            let markers;
+            try {
+              markers = await github.paginate(github.rest.actions.listArtifactsForRepo, {
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: markerName,
+                per_page: 100,
+              });
+            } catch (err) {
+              core.warning(`Failed to list marker artifacts: ${err.message}`);
+              setNotFound();
+              return;
+            }
+
+            const candidates = markers
+              .filter((a) => !a.expired && a.workflow_run && a.workflow_run.head_branch === GATE_BRANCH)
+              .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
+
+            if (candidates.length === 0) {
+              core.info(`No live marker artifact named "${markerName}" found on ${GATE_BRANCH}.`);
+              setNotFound();
+              return;
+            }
+
+            const runId = candidates[0].workflow_run.id;
+
+            let runArtifacts;
+            try {
+              runArtifacts = await github.paginate(github.rest.actions.listWorkflowRunArtifacts, {
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: runId,
+                per_page: 100,
+              });
+            } catch (err) {
+              core.warning(`listWorkflowRunArtifacts failed for run ${runId}: ${err.message}`);
+              setNotFound();
+              return;
+            }
+
+            const available = new Set(runArtifacts.filter((a) => !a.expired).map((a) => a.name));
+            const missing = requiredArtifacts.filter((n) => !available.has(n));
+            if (missing.length > 0) {
+              core.info(`Run ${runId} is missing artifacts: ${missing.join(', ')}`);
+              setNotFound();
+              return;
+            }
+
+            core.info(`Reusable dev build found: run ${runId} (gate key ${GATE_KEY})`);
+            core.setOutput('found', 'true');
+            core.setOutput('run-id', String(runId));
+
+      - name: Compute build gate
+        id: gate
+        env:
+          FORCE_BUILD: ${{ github.event_name == 'schedule' || inputs.force_build == true }}
+          LOOKUP_FOUND: ${{ steps.lookup.outputs.found }}
+          LOOKUP_RUN_ID: ${{ steps.lookup.outputs.run-id }}
+        run: |
+          if [[ "$FORCE_BUILD" == "true" ]]; then
+            echo "needs-build=true" >> "$GITHUB_OUTPUT"
+            echo "reusable-run-id=" >> "$GITHUB_OUTPUT"
+            echo "Forcing fresh build (schedule or force_build input)."
+          elif [[ "$LOOKUP_FOUND" == "true" ]]; then
+            echo "needs-build=false" >> "$GITHUB_OUTPUT"
+            echo "reusable-run-id=${LOOKUP_RUN_ID}" >> "$GITHUB_OUTPUT"
+            echo "Reusing dev build from run ${LOOKUP_RUN_ID}; fingerprint unchanged."
+          else
+            echo "needs-build=true" >> "$GITHUB_OUTPUT"
+            echo "reusable-run-id=" >> "$GITHUB_OUTPUT"
+            echo "No reusable dev build found; compiling fresh."
+          fi
+
+      - name: Write dev build gate summary
+        if: ${{ always() }}
+        env:
+          GATE_KEY: ${{ steps.gate-key.outputs.gate-key }}
+          NEEDS_BUILD: ${{ steps.gate.outputs.needs-build }}
+          REUSABLE_RUN_ID: ${{ steps.gate.outputs.reusable-run-id }}
+          REPOSITORY: ${{ github.repository }}
+        run: |
+          # NEEDS_BUILD is empty when an earlier step failed (this step runs on always()),
+          # which must not be reported as a reuse decision.
+          case "$NEEDS_BUILD" in
+            true) decision="Fresh build" ;;
+            false) decision="Reused (fingerprint unchanged)" ;;
+            *) decision="Undetermined (gate did not complete)" ;;
+          esac
+          reused_run="n/a"
+          if [[ -n "${REUSABLE_RUN_ID:-}" ]]; then
+            reused_run="[https://github.com/${REPOSITORY}/actions/runs/${REUSABLE_RUN_ID}](https://github.com/${REPOSITORY}/actions/runs/${REUSABLE_RUN_ID})"
+          fi
+          {
+            echo "### Expo Dev Build gate"
+            echo ""
+            echo "| Field | Value |"
+            echo "| --- | --- |"
+            echo "| Decision | ${decision} |"
+            echo "| Gate key | \`${GATE_KEY}\` |"
+            echo "| Reused run | ${reused_run} |"
+          } >> "$GITHUB_STEP_SUMMARY"
+
   build-dev:
     name: Expo dev build (main-dev-expo)
+    needs: [resolve-dev-build]
+    if: ${{ needs.resolve-dev-build.outputs.needs-build == 'true' }}
     uses: ./.github/workflows/build.yml
     with:
       build_name: main-dev-expo
@@ -45,3 +241,55 @@ jobs:
       source_branch: ${{ github.ref_name }}
       runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
+
+  record-dev-build:
+    name: Record dev build marker
+    needs: [resolve-dev-build, build-dev]
+    # Inherits workflow-level permissions (contents: write, actions: read) - no
+    # job-level override, since actions/upload-artifact's exact permission
+    # requirements aren't documented and the workflow-level set is a safe superset.
+    if: ${{ !cancelled() && needs.build-dev.result == 'success' }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Verify app artifacts and write marker
+        id: verify
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const requiredArtifacts = [
+              'ios-app-main-dev-expo',
+              'ios-ipa-main-dev-expo',
+              'android-apk-main-dev-expo',
+            ];
+
+            const artifacts = await github.paginate(github.rest.actions.listWorkflowRunArtifacts, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: context.runId,
+              per_page: 100,
+            });
+
+            const available = new Set(artifacts.filter((a) => !a.expired).map((a) => a.name));
+            const missing = requiredArtifacts.filter((n) => !available.has(n));
+            if (missing.length > 0) {
+              core.setFailed(`Refusing to write marker: missing artifacts ${missing.join(', ')}`);
+              return;
+            }
+            core.info('All required app artifacts present; marker will be uploaded.');
+
+      - name: Write marker file
+        run: |
+          mkdir -p .expo-dev-build-marker
+          {
+            echo "gate_key=${{ needs.resolve-dev-build.outputs.gate-key }}"
+            echo "run_id=${{ github.run_id }}"
+            echo "head_sha=${{ github.sha }}"
+          } > .expo-dev-build-marker/marker.txt
+
+      - name: Upload marker artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: expo-dev-build-key-${{ needs.resolve-dev-build.outputs.gate-key }}
+          path: .expo-dev-build-marker/marker.txt
+          if-no-files-found: error
diff --git a/.github/workflows/flaky-test-report.yml b/.github/workflows/flaky-test-report.yml
index 54ee9e23ab27..c06ba16addd4 100644
--- a/.github/workflows/flaky-test-report.yml
+++ b/.github/workflows/flaky-test-report.yml
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Generate Playwright test health report
-        uses: MetaMask/github-tools/.github/actions/playwright-test-health-report@4a2ddd75e9a8182261f0f07fbfc332cc856c89a0
+        uses: MetaMask/github-tools/.github/actions/playwright-test-health-report@a4a179a9ad2d02f6acb3c781e1b22a38bbc8dbca
         with:
           repository: ${{ github.event.repository.name }}
           workflow-ids: ci.yml
@@ -57,3 +57,4 @@ jobs:
           lookback-days: ${{ github.event_name == 'workflow_dispatch' && inputs.lookback_days || '1' }}
           top-n: '10'
           report-title: Playwright Test Health Report (Mobile Appium)
+          test-source-prefix: tests/smoke-appium
diff --git a/.github/workflows/get-requirements.yml b/.github/workflows/get-requirements.yml
index a1e716391a59..cf91d932f5f8 100644
--- a/.github/workflows/get-requirements.yml
+++ b/.github/workflows/get-requirements.yml
@@ -30,7 +30,7 @@ on:
         description: 'Whether performance E2E tests should be forced to run via the run-performance-tests PR label'
         value: ${{ jobs.detect-changes.outputs.run_performance }}
       run_appium_ios:
-        description: 'Whether Appium iOS smoke tests should also run on a PR via the run-appium-ios-tests label or e2e smoke infra file changes'
+        description: 'Whether Appium iOS smoke tests should also run on a PR via the run-appium-ios-tests label or e2e smoke infra / smoke-appium file changes'
         value: ${{ jobs.detect-changes.outputs.run_appium_ios }}
       native_build_needed:
         description: 'Whether fresh iOS/Android native E2E builds are required. False when only E2E/performance test files changed — CI reuses main branch builds instead.'
diff --git a/.github/workflows/performance-test-runner.yml b/.github/workflows/performance-test-runner.yml
index c5f5de5df1fa..b46eef0c6f4c 100644
--- a/.github/workflows/performance-test-runner.yml
+++ b/.github/workflows/performance-test-runner.yml
@@ -26,7 +26,7 @@ on:
       branch_name:
         required: true
         type: string
-        description: 'Branch name'
+        description: 'Branch name used for performance observability'
       browserstack_build_name:
         required: true
         type: string
@@ -40,7 +40,7 @@ on:
         required: false
         type: string
         default: e2e
-        description: 'Deprecated for env; kept for workflow_call compatibility. Use feature_flags_environment for client-config API.'
+        description: 'App build variant used for performance observability'
       feature_flags_environment:
         required: false
         type: string
@@ -77,6 +77,7 @@ jobs:
   run-tests:
     name: Run ${{ inputs.build_type }} Tests on ${{ inputs.platform }} - ${{ matrix.device.name }}
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
@@ -86,12 +87,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Restore node_modules cache
-        id: cache
         uses: actions/cache@v4
         with:
           path: |
             node_modules
-            .yarn/cache
             .yarn/install-state.gz
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
@@ -111,18 +110,9 @@ jobs:
           retry_wait_seconds: 30
           command: yarn --immutable
         ## This installs dependencies and creates the node_modules state file
-      - name: Restore .metamask folder
-        id: restore-metamask
-        uses: actions/cache@v4
-        with:
-          path: .metamask
-          key: .metamask-${{ hashFiles('package.json', 'yarn.lock') }}
-
-      - name: Install Foundry if cache missed
-        if: steps.restore-metamask.outputs.cache-hit != 'true'
-        run: yarn install:foundryup
       - name: Setup project
-        run: yarn setup:github-ci
+        # BrowserStack performance projects do not use the local Anvil fixture.
+        run: yarn setup:github-ci --node
         working-directory: '.'
 
       - name: BrowserStack Env Setup
@@ -144,6 +134,8 @@ jobs:
           SELECTED_SENTRY_DSN=""
           SENTRY_ENVIRONMENT="github-actions-performance-e2e"
           FEATURE_FLAGS_ENV="${{ inputs.feature_flags_environment }}"
+          CI_BUILD_VARIANT="${{ inputs.build_variant }}"
+          BRANCH_NAME="${{ inputs.branch_name }}"
           BROWSERSTACK_GEO_LOCATION="${BROWSERSTACK_GEO_LOCATION:-SE}"
 
           if [[ "$FEATURE_FLAGS_ENV" != "rc" && "$FEATURE_FLAGS_ENV" != "exp" && "$FEATURE_FLAGS_ENV" != "test" && "$FEATURE_FLAGS_ENV" != "dev" && "$FEATURE_FLAGS_ENV" != "prod" ]]; then
@@ -177,6 +169,24 @@ jobs:
               ;;
           esac
 
+          # Track-only RC observability: distinct Sentry environment + release
+          # version tag. RELEASE_VERSION is derived from release/* branches for
+          # filtering; the mm-mobile-rc-* Sentry release bucket is only used when
+          # CI_BUILD_VARIANT is actually rc (avoids polluting RC releases when a
+          # non-RC perf run happens on a release branch).
+          RELEASE_VERSION=""
+          if [[ "$BRANCH_NAME" =~ ^release/(.+)$ ]]; then
+            RELEASE_VERSION="${BASH_REMATCH[1]}"
+          fi
+          if [[ "$CI_BUILD_VARIANT" == "rc" ]]; then
+            SENTRY_ENVIRONMENT="${SENTRY_ENVIRONMENT}-rc"
+          fi
+
+          SENTRY_RELEASE="mm-mobile-perf-${CI_BUILD_VARIANT}-${{ github.sha }}"
+          if [[ "$CI_BUILD_VARIANT" == "rc" && -n "$RELEASE_VERSION" ]]; then
+            SENTRY_RELEASE="mm-mobile-rc-${RELEASE_VERSION}"
+          fi
+
           {
             echo "BROWSERSTACK_DEVICE=${{ matrix.device.name }}"
             echo "BROWSERSTACK_OS_VERSION=${{ matrix.device.os_version }}"
@@ -195,8 +205,11 @@ jobs:
             echo "E2E_PASSWORD=${{ secrets.E2E_PASSWORD }}"
             echo "E2E_PERFORMANCE_SENTRY_DSN=$SELECTED_SENTRY_DSN"
             echo "E2E_PERFORMANCE_SENTRY_ENVIRONMENT=$SENTRY_ENVIRONMENT"
-            echo "E2E_PERFORMANCE_SENTRY_RELEASE=${{ github.sha }}"
+            echo "E2E_PERFORMANCE_SENTRY_RELEASE=$SENTRY_RELEASE"
             echo "E2E_PERFORMANCE_BUILD_VARIANT=$FEATURE_FLAGS_ENV"
+            echo "E2E_PERFORMANCE_CI_BUILD_VARIANT=$CI_BUILD_VARIANT"
+            echo "E2E_PERFORMANCE_RELEASE_VERSION=$RELEASE_VERSION"
+            echo "E2E_PERFORMANCE_GITHUB_REF_NAME=$BRANCH_NAME"
             echo "DISABLE_VIDEO_DOWNLOAD=true"
           } >> "$GITHUB_ENV"
 
diff --git a/.github/workflows/publish-slack-release-testing-status.yml b/.github/workflows/publish-slack-release-testing-status.yml
deleted file mode 100644
index 40204e436c5e..000000000000
--- a/.github/workflows/publish-slack-release-testing-status.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Trigger Publish Slack Release Testing Status
-
-on:
-  schedule:
-    - cron: '0 15 * * 1-5'  #M-F at 15:00 UTC
-  workflow_dispatch:  # Allows manual triggering
-
-jobs:
-  call-publish-slack-release-testing-status:
-    name: Publish Slack release testing status
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - name: Get token
-        id: get-token
-        uses: MetaMask/github-tools/.github/actions/get-token@v1
-        with:
-          token-exchange-url: ${{ vars.TOKEN_EXCHANGE_URL }}
-          permissions: |
-            contents: read
-            pull_requests: read
-
-      - name: Publish Slack release testing status
-        uses: MetaMask/github-tools/.github/actions/publish-slack-release-testing-status@v1
-        with:
-          platform: 'mobile'
-          test-only: 'true'
-          google-document-id: '1tsoodlAlyvEUpkkcNcbZ4PM9HuC9cEM80RZeoVv5OCQ'
-          slack-api-key: ${{ secrets.SLACKBOT_RLS_TOKEN }}
-          github-token: ${{ steps.get-token.outputs.token }}
-          google-application-creds-base64: ${{ secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 }}
diff --git a/.github/workflows/run-appium-e2e-workflow.yml b/.github/workflows/run-appium-e2e-workflow.yml
index 2ae87d9e446c..50ed84e12c6c 100644
--- a/.github/workflows/run-appium-e2e-workflow.yml
+++ b/.github/workflows/run-appium-e2e-workflow.yml
@@ -381,6 +381,23 @@ jobs:
           if-no-files-found: ignore
           retention-days: 7
 
+      - name: Upload Appium phase timings (Namespace)
+        if: ${{ always() && inputs.runner_provider == 'namespace' }}
+        uses: namespace-actions/upload-artifact@f6ccaacc655aec41b93af180d1d7eef21af862d2 # v1.0.3
+        with:
+          name: appium-timings-${{ inputs.test-suite-name }}
+          path: tests/test-reports/appium-timings/
+          if-no-files-found: ignore
+          retention-days: 7
+      - name: Upload Appium phase timings (current)
+        if: ${{ always() && inputs.runner_provider != 'namespace' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: appium-timings-${{ inputs.test-suite-name }}
+          path: tests/test-reports/appium-timings/
+          if-no-files-found: ignore
+          retention-days: 7
+
       - name: Upload failure screen recordings (Namespace)
         if: ${{ always() && (steps.run-tests-android.outcome == 'failure' || steps.run-tests-ios.outcome == 'failure') && inputs.runner_provider == 'namespace' }}
         uses: namespace-actions/upload-artifact@f6ccaacc655aec41b93af180d1d7eef21af862d2 # v1.0.3
diff --git a/.github/workflows/run-appium-smoke-tests-android.yml b/.github/workflows/run-appium-smoke-tests-android.yml
index 90dd6399a686..ee58393cc82e 100644
--- a/.github/workflows/run-appium-smoke-tests-android.yml
+++ b/.github/workflows/run-appium-smoke-tests-android.yml
@@ -65,7 +65,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2, 3, 4]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -73,7 +73,8 @@ jobs:
       platform: android
       test_suite_tag: SmokeAccounts
       split_number: ${{ matrix.split }}
-      total_splits: 4
+      total_splits: 2
+      test-timeout-minutes: 25
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
@@ -92,11 +93,12 @@ jobs:
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
-      test-suite-name: appium-perps-android-smoke
+      test-suite-name: appium-perps-android-smoke-${{ matrix.split }}
       platform: android
       test_suite_tag: SmokePerps
       split_number: ${{ matrix.split }}
       total_splits: 2
+      test-timeout-minutes: 25
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
@@ -111,7 +113,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2, 3]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -119,7 +121,7 @@ jobs:
       platform: android
       test_suite_tag: SmokePredictions
       split_number: ${{ matrix.split }}
-      total_splits: 3
+      total_splits: 2
       test-timeout-minutes: 25
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
@@ -135,7 +137,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2, 3, 4]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -143,14 +145,13 @@ jobs:
       platform: android
       test_suite_tag: SmokeSeedlessOnboarding
       split_number: ${{ matrix.split }}
-      total_splits: 4
+      total_splits: 2
       test-timeout-minutes: 25
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
-
   appium-snaps-android-smoke:
     if: >-
       ${{
@@ -160,7 +161,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2, 3, 4, 5, 6, 7, 8]
+        split: [1, 2, 3, 4, 5, 6]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -168,10 +169,9 @@ jobs:
       platform: android
       test_suite_tag: SmokeSnaps
       split_number: ${{ matrix.split }}
-      total_splits: 8
-      # Temporary: full login+install per test makes Android snaps shards slow.
-      # Drop back toward 25 once Appium has reloadReactNative (no full login each test).
-      test-timeout-minutes: 40
+      total_splits: 6
+      # Session reuse + soft reload: denser shards; drop toward 25 after one green main.
+      test-timeout-minutes: 30
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
@@ -186,15 +186,15 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
-      test-suite-name: appium-network-abstractions-android-smoke
+      test-suite-name: appium-network-abstractions-android-smoke-${{ matrix.split }}
       platform: android
       test_suite_tag: SmokeNetworkAbstractions
       split_number: ${{ matrix.split }}
-      total_splits: 1
+      total_splits: 2
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
@@ -209,7 +209,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2, 3, 4]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -217,7 +217,8 @@ jobs:
       platform: android
       test_suite_tag: SmokeWalletPlatform
       split_number: ${{ matrix.split }}
-      total_splits: 4
+      total_splits: 2
+      test-timeout-minutes: 25
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
@@ -232,7 +233,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2]
+        split: [1]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -240,8 +241,8 @@ jobs:
       platform: android
       test_suite_tag: SmokeSwap
       split_number: ${{ matrix.split }}
-      total_splits: 2
-      test-timeout-minutes: 25
+      total_splits: 1
+      test-timeout-minutes: 30
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
@@ -256,7 +257,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2]
+        split: [1]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -264,19 +265,44 @@ jobs:
       platform: android
       test_suite_tag: SmokeStake
       split_number: ${{ matrix.split }}
-      total_splits: 2
+      total_splits: 1
       test-timeout-minutes: 25
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
-  appium-mmconnect-android-smoke:
+  # appium-mmconnect-android-smoke:
+  #   if: >-
+  #     ${{
+  #       !cancelled() &&
+  #       (contains(fromJson(inputs.selected_tags), 'ALL') ||
+  #        contains(fromJson(inputs.selected_tags), 'SmokeMMConnect'))
+  #     }}
+  #   strategy:
+  #     matrix:
+  #       split: [1]
+  #     fail-fast: false
+  #   uses: ./.github/workflows/run-appium-e2e-workflow.yml
+  #   with:
+  #     test-suite-name: appium-mmconnect-android-smoke-${{ matrix.split }}
+  #     platform: android
+  #     test_suite_tag: SmokeMMConnect
+  #     split_number: ${{ matrix.split }}
+  #     total_splits: 1
+  #     test-timeout-minutes: 35
+  #     android-tag: google_apis
+  #     build_type: ${{ inputs.build_type }}
+  #     metamask_environment: ${{ inputs.metamask_environment }}
+  #     runner_provider: ${{ inputs.runner_provider }}
+  #   secrets: inherit
+
+  appium-money-android-smoke:
     if: >-
       ${{
         !cancelled() &&
         (contains(fromJson(inputs.selected_tags), 'ALL') ||
-         contains(fromJson(inputs.selected_tags), 'SmokeMMConnect'))
+         contains(fromJson(inputs.selected_tags), 'SmokeMoney'))
       }}
     strategy:
       matrix:
@@ -284,24 +310,23 @@ jobs:
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
-      test-suite-name: appium-mmconnect-android-smoke-${{ matrix.split }}
+      test-suite-name: appium-money-android-smoke-${{ matrix.split }}
       platform: android
-      test_suite_tag: SmokeMMConnect
+      test_suite_tag: SmokeMoney
       split_number: ${{ matrix.split }}
       total_splits: 1
-      test-timeout-minutes: 35
-      android-tag: google_apis
+      test-timeout-minutes: 25
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
-  appium-money-android-smoke:
+  appium-browser-android-smoke:
     if: >-
       ${{
         !cancelled() &&
         (contains(fromJson(inputs.selected_tags), 'ALL') ||
-         contains(fromJson(inputs.selected_tags), 'SmokeMoney'))
+         contains(fromJson(inputs.selected_tags), 'SmokeBrowser'))
       }}
     strategy:
       matrix:
@@ -309,9 +334,9 @@ jobs:
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
-      test-suite-name: appium-money-android-smoke-${{ matrix.split }}
+      test-suite-name: appium-browser-android-smoke-${{ matrix.split }}
       platform: android
-      test_suite_tag: SmokeMoney
+      test_suite_tag: SmokeBrowser
       split_number: ${{ matrix.split }}
       total_splits: 1
       test-timeout-minutes: 25
@@ -320,49 +345,73 @@ jobs:
       runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
-  appium-browser-android-smoke:
+  appium-confirmations-android-smoke:
     if: >-
       ${{
         !cancelled() &&
         (contains(fromJson(inputs.selected_tags), 'ALL') ||
-         contains(fromJson(inputs.selected_tags), 'SmokeBrowser'))
+         contains(fromJson(inputs.selected_tags), 'SmokeConfirmations'))
       }}
     strategy:
       matrix:
-        split: [1]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
-      test-suite-name: appium-browser-android-smoke-${{ matrix.split }}
+      test-suite-name: appium-confirmations-android-smoke-${{ matrix.split }}
       platform: android
-      test_suite_tag: SmokeBrowser
+      test_suite_tag: SmokeConfirmations
       split_number: ${{ matrix.split }}
-      total_splits: 1
+      total_splits: 2
+      test-timeout-minutes: 35
+      build_type: ${{ inputs.build_type }}
+      metamask_environment: ${{ inputs.metamask_environment }}
+      runner_provider: ${{ inputs.runner_provider }}
+    secrets: inherit
+
+  appium-multichain-api-android-smoke:
+    if: >-
+      ${{
+        !cancelled() &&
+        (contains(fromJson(inputs.selected_tags), 'ALL') ||
+         contains(fromJson(inputs.selected_tags), 'SmokeMultiChainAPI'))
+      }}
+    strategy:
+      matrix:
+        split: [1, 2]
+      fail-fast: false
+    uses: ./.github/workflows/run-appium-e2e-workflow.yml
+    with:
+      test-suite-name: appium-multichain-api-android-smoke-${{ matrix.split }}
+      platform: android
+      test_suite_tag: SmokeMultiChainAPI
+      split_number: ${{ matrix.split }}
+      total_splits: 2
       test-timeout-minutes: 25
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
-  appium-confirmations-android-smoke:
+  appium-network-expansion-android-smoke:
     if: >-
       ${{
         !cancelled() &&
         (contains(fromJson(inputs.selected_tags), 'ALL') ||
-         contains(fromJson(inputs.selected_tags), 'SmokeConfirmations'))
+         contains(fromJson(inputs.selected_tags), 'SmokeNetworkExpansion'))
       }}
     strategy:
       matrix:
-        split: [1]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
-      test-suite-name: appium-confirmations-android-smoke-${{ matrix.split }}
+      test-suite-name: appium-network-expansion-android-smoke-${{ matrix.split }}
       platform: android
-      test_suite_tag: SmokeConfirmations
+      test_suite_tag: SmokeNetworkExpansion
       split_number: ${{ matrix.split }}
-      total_splits: 1
-      test-timeout-minutes: 60
+      total_splits: 2
+      test-timeout-minutes: 25
       build_type: ${{ inputs.build_type }}
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
diff --git a/.github/workflows/run-appium-smoke-tests-ios.yml b/.github/workflows/run-appium-smoke-tests-ios.yml
index 15ddcf0d672d..d55162d3519c 100644
--- a/.github/workflows/run-appium-smoke-tests-ios.yml
+++ b/.github/workflows/run-appium-smoke-tests-ios.yml
@@ -44,7 +44,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2, 3, 4]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -52,7 +52,7 @@ jobs:
       platform: ios
       test_suite_tag: SmokeAccounts
       split_number: ${{ matrix.split }}
-      total_splits: 4
+      total_splits: 2
       test-timeout-minutes: 25
       build_type: ${{ inputs.build_type || 'main' }}
       metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
@@ -72,11 +72,12 @@ jobs:
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
-      test-suite-name: appium-perps-ios-smoke
+      test-suite-name: appium-perps-ios-smoke-${{ matrix.split }}
       platform: ios
       test_suite_tag: SmokePerps
       split_number: ${{ matrix.split }}
       total_splits: 2
+      test-timeout-minutes: 25
       build_type: ${{ inputs.build_type || 'main' }}
       metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
       runner_provider: ${{ inputs.runner_provider || 'current' }}
@@ -91,7 +92,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2, 3]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -99,7 +100,7 @@ jobs:
       platform: ios
       test_suite_tag: SmokePredictions
       split_number: ${{ matrix.split }}
-      total_splits: 3
+      total_splits: 2
       test-timeout-minutes: 25
       build_type: ${{ inputs.build_type || 'main' }}
       metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
@@ -115,7 +116,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2, 3, 4]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -123,7 +124,7 @@ jobs:
       platform: ios
       test_suite_tag: SmokeSeedlessOnboarding
       split_number: ${{ matrix.split }}
-      total_splits: 4
+      total_splits: 2
       test-timeout-minutes: 25
       build_type: ${{ inputs.build_type || 'main' }}
       metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
@@ -140,7 +141,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2, 3, 4, 5, 6, 7, 8]
+        split: [1, 2, 3, 4, 5, 6]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -148,8 +149,9 @@ jobs:
       platform: ios
       test_suite_tag: SmokeSnaps
       split_number: ${{ matrix.split }}
-      total_splits: 8
-      test-timeout-minutes: 25
+      total_splits: 6
+      # Session reuse + denser shards; headroom vs former 25m single-shard load.
+      test-timeout-minutes: 30
       build_type: ${{ inputs.build_type || 'main' }}
       metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
       runner_provider: ${{ inputs.runner_provider || 'current' }}
@@ -164,15 +166,15 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
-      test-suite-name: appium-network-abstractions-ios-smoke
+      test-suite-name: appium-network-abstractions-ios-smoke-${{ matrix.split }}
       platform: ios
       test_suite_tag: SmokeNetworkAbstractions
       split_number: ${{ matrix.split }}
-      total_splits: 1
+      total_splits: 2
       build_type: ${{ inputs.build_type || 'main' }}
       metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
       runner_provider: ${{ inputs.runner_provider || 'current' }}
@@ -187,7 +189,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2, 3, 4]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -195,7 +197,8 @@ jobs:
       platform: ios
       test_suite_tag: SmokeWalletPlatform
       split_number: ${{ matrix.split }}
-      total_splits: 4
+      total_splits: 2
+      test-timeout-minutes: 25
       build_type: ${{ inputs.build_type || 'main' }}
       metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
       runner_provider: ${{ inputs.runner_provider || 'current' }}
@@ -234,7 +237,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1, 2]
+        split: [1]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -242,7 +245,7 @@ jobs:
       platform: ios
       test_suite_tag: SmokeStake
       split_number: ${{ matrix.split }}
-      total_splits: 2
+      total_splits: 1
       test-timeout-minutes: 25
       build_type: ${{ inputs.build_type || 'main' }}
       metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
@@ -306,7 +309,7 @@ jobs:
       }}
     strategy:
       matrix:
-        split: [1]
+        split: [1, 2]
       fail-fast: false
     uses: ./.github/workflows/run-appium-e2e-workflow.yml
     with:
@@ -314,8 +317,56 @@ jobs:
       platform: ios
       test_suite_tag: SmokeConfirmations
       split_number: ${{ matrix.split }}
-      total_splits: 1
-      test-timeout-minutes: 60
+      total_splits: 2
+      test-timeout-minutes: 35
+      build_type: ${{ inputs.build_type || 'main' }}
+      metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
+      runner_provider: ${{ inputs.runner_provider || 'current' }}
+    secrets: inherit
+
+  appium-multichain-api-ios-smoke:
+    if: >-
+      ${{
+        !cancelled() &&
+        (contains(fromJson(inputs.selected_tags || '["ALL"]'), 'ALL') ||
+         contains(fromJson(inputs.selected_tags || '["ALL"]'), 'SmokeMultiChainAPI'))
+      }}
+    strategy:
+      matrix:
+        split: [1, 2]
+      fail-fast: false
+    uses: ./.github/workflows/run-appium-e2e-workflow.yml
+    with:
+      test-suite-name: appium-multichain-api-ios-smoke-${{ matrix.split }}
+      platform: ios
+      test_suite_tag: SmokeMultiChainAPI
+      split_number: ${{ matrix.split }}
+      total_splits: 2
+      test-timeout-minutes: 25
+      build_type: ${{ inputs.build_type || 'main' }}
+      metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
+      runner_provider: ${{ inputs.runner_provider || 'current' }}
+    secrets: inherit
+
+  appium-network-expansion-ios-smoke:
+    if: >-
+      ${{
+        !cancelled() &&
+        (contains(fromJson(inputs.selected_tags || '["ALL"]'), 'ALL') ||
+         contains(fromJson(inputs.selected_tags || '["ALL"]'), 'SmokeNetworkExpansion'))
+      }}
+    strategy:
+      matrix:
+        split: [1, 2]
+      fail-fast: false
+    uses: ./.github/workflows/run-appium-e2e-workflow.yml
+    with:
+      test-suite-name: appium-network-expansion-ios-smoke-${{ matrix.split }}
+      platform: ios
+      test_suite_tag: SmokeNetworkExpansion
+      split_number: ${{ matrix.split }}
+      total_splits: 2
+      test-timeout-minutes: 25
       build_type: ${{ inputs.build_type || 'main' }}
       metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
       runner_provider: ${{ inputs.runner_provider || 'current' }}
diff --git a/.github/workflows/run-e2e-api-specs.yml b/.github/workflows/run-e2e-api-specs.yml
index 82eb15fb9296..5e652eb247b1 100644
--- a/.github/workflows/run-e2e-api-specs.yml
+++ b/.github/workflows/run-e2e-api-specs.yml
@@ -1,5 +1,4 @@
-# This workflow runs API specs tests on iOS simulator.
-# API specs are backend API integration tests that use iOS simulator but don't require mobile app UI.
+# OpenRPC API specs on iOS Appium (dedicated workflow — not Appium smoke tags).
 
 name: API Specs E2E Tests
 
@@ -11,6 +10,11 @@ on:
         required: false
         type: string
         default: current
+      ios_build_run_id:
+        description: Optional GitHub Actions run id that has main-e2e-MetaMask.app
+        required: false
+        type: string
+        default: ''
   workflow_dispatch:
     inputs:
       runner_provider:
@@ -21,6 +25,11 @@ on:
           - current
           - namespace
         default: current
+      ios_build_run_id:
+        description: Optional GitHub Actions run id that has main-e2e-MetaMask.app (else latest successful build on main)
+        required: false
+        type: string
+        default: ''
   pull_request:
     types: [opened, synchronize]
 
@@ -28,11 +37,19 @@ jobs:
   api-specs-ios:
     name: 'api-specs-ios'
     if: false
-    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ios-build' || 'macos-latest-xlarge' }}
     continue-on-error: true
+    permissions:
+      actions: read
+      contents: read
+    runs-on: >-
+      ${{
+        (inputs.runner_provider || 'current') == 'namespace' &&
+        'namespace-profile-metamask-ios-e2e' ||
+        fromJSON('["ghcr.io/cirruslabs/macos-runner:tahoe"]')
+      }}
 
     env:
-      METAMASK_ENVIRONMENT: 'dev'
+      METAMASK_ENVIRONMENT: 'e2e'
       METAMASK_BUILD_TYPE: 'main'
       MM_TEST_WALLET_SRP: ${{ secrets.MM_TEST_WALLET_SRP }}
       SEGMENT_WRITE_KEY_QA: ${{ secrets.SEGMENT_WRITE_KEY_QA }}
@@ -41,145 +58,283 @@ jobs:
       SEGMENT_REGULATIONS_ENDPOINT_QA: ${{ secrets.SEGMENT_REGULATIONS_ENDPOINT_QA }}
       MM_SENTRY_DSN_TEST: ${{ secrets.MM_SENTRY_DSN_TEST }}
       MM_SOLANA_E2E_TEST_SRP: ${{ secrets.MM_SOLANA_E2E_TEST_SRP }}
+      IOS_APP_ARTIFACT_PATH: artifacts/main-e2e-MetaMask.app
 
     steps:
+      - name: Checkout (Namespace)
+        if: ${{ (inputs.runner_provider || 'current') == 'namespace' }}
+        uses: namespacelabs/nscloud-checkout-action@938f5d2d403d6224d9a0c0dc559b1dae09c2ede4 # v8.1.1
+
       - name: Checkout
+        if: ${{ (inputs.runner_provider || 'current') != 'namespace' }}
         uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref || github.ref }}
           clean: true
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - name: Setup E2E environment (iOS)
+        uses: ./.github/actions/setup-e2e-env
         with:
-          node-version: '24.16.0'
-          cache: 'yarn'
-
-      - name: Enable Corepack and setup Yarn
-        run: |
-          corepack enable
-          corepack prepare yarn@4.14.1 --activate
-
-      - name: Install JavaScript dependencies with retry
-        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
-        env:
-          NODE_OPTIONS: --max-old-space-size=4096
+          platform: ios
+          setup-simulator: 'false'
+          configure-keystores: 'false'
+          install-foundry: 'true'
+          skip-pod-install: 'true'
+          install-applesimutils: 'false'
+          runner_provider: ${{ inputs.runner_provider || 'current' }}
+
+      - name: Cache ffmpeg (Homebrew)
+        uses: actions/cache@v4
         with:
-          timeout_minutes: 10
-          max_attempts: 3
-          retry_wait_seconds: 30
-          command: yarn install --immutable
-
-      - name: Verify Detox CLI
-        run: yarn detox --version
-
-      - name: Setup Xcode
-        run: sudo xcode-select -s /Applications/Xcode_26.3.app
+          path: ~/.cache/mms-ffmpeg
+          key: brew-ffmpeg-${{ runner.os }}-v1
+          restore-keys: |
+            brew-ffmpeg-${{ runner.os }}-
 
-      - name: Install applesimutils for iOS simulator control
-        run: |
-          echo "Installing applesimutils for Detox iOS simulator control..."
-          brew tap wix/brew && brew install applesimutils
-          echo "✅ applesimutils installed"
+      - name: Install ffmpeg for XCUITest screen recording
+        run: bash scripts/e2e/ensure-ffmpeg-ci.sh
+        shell: bash
 
-      - name: Build Detox framework cache for API specs
+      - name: Download main-e2e iOS app (self-contained)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ARTIFACT_NAME: main-e2e-MetaMask.app
+          APP_PATH: ${{ env.IOS_APP_ARTIFACT_PATH }}
+          INPUT_RUN_ID: ${{ inputs.ios_build_run_id || '' }}
+          HEAD_REF: ${{ github.head_ref }}
+          REF_NAME: ${{ github.ref_name }}
+          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+          REPOSITORY: ${{ github.repository }}
         run: |
-          echo "🔧 Building Detox framework cache specifically for API specs..."
-
-          # Clean any existing cache first
-          yarn detox clean-framework-cache
-
-          # Build fresh framework cache
-          yarn detox build-framework-cache
-
-          # Verify the framework was built successfully
-          if [[ -d ~/Library/Detox/ios/framework ]]; then
-            echo "✅ Detox framework cache built successfully"
-            find ~/Library/Detox/ios/framework/ -maxdepth 1 -exec ls -la {} \;
-          else
-            echo "❌ Failed to build Detox framework cache"
+          set -euo pipefail
+
+          mkdir -p "$(dirname "$APP_PATH")"
+          rm -rf "$APP_PATH"
+
+          resolve_run_id() {
+            if [ -n "${INPUT_RUN_ID}" ]; then
+              echo "${INPUT_RUN_ID}"
+              return
+            fi
+
+            # Prefer a successful build on the PR head branch when present, else main.
+            BRANCH="${HEAD_REF:-${REF_NAME}}"
+            if [ -z "${BRANCH}" ] || [ "${BRANCH}" = "${DEFAULT_BRANCH}" ]; then
+              BRANCH="main"
+            fi
+
+            echo "Resolving latest successful build workflow run on branch '${BRANCH}'..." >&2
+            RUN_ID="$(
+              gh run list \
+                --repo "${REPOSITORY}" \
+                --workflow build.yml \
+                --branch "${BRANCH}" \
+                --status success \
+                --limit 20 \
+                --json databaseId \
+                --jq '.[].databaseId' \
+              | while read -r id; do
+                  if gh api \
+                    "repos/${REPOSITORY}/actions/runs/${id}/artifacts" \
+                    --jq ".artifacts[] | select(.name == \"${ARTIFACT_NAME}\") | .name" \
+                    | grep -qx "${ARTIFACT_NAME}"; then
+                    echo "${id}"
+                    break
+                  fi
+                done
+            )"
+
+            if [ -z "${RUN_ID}" ] && [ "${BRANCH}" != "main" ]; then
+              echo "No ${ARTIFACT_NAME} on '${BRANCH}'; falling back to main..." >&2
+              RUN_ID="$(
+                gh run list \
+                  --repo "${REPOSITORY}" \
+                  --workflow build.yml \
+                  --branch main \
+                  --status success \
+                  --limit 20 \
+                  --json databaseId \
+                  --jq '.[].databaseId' \
+                | while read -r id; do
+                    if gh api \
+                      "repos/${REPOSITORY}/actions/runs/${id}/artifacts" \
+                      --jq ".artifacts[] | select(.name == \"${ARTIFACT_NAME}\") | .name" \
+                      | grep -qx "${ARTIFACT_NAME}"; then
+                      echo "${id}"
+                      break
+                    fi
+                  done
+              )"
+            fi
+
+            if [ -z "${RUN_ID}" ]; then
+              echo "::error title=main-e2e iOS artifact not found::Could not find a successful build.yml run with artifact ${ARTIFACT_NAME}."
+              exit 1
+            fi
+
+            echo "${RUN_ID}"
+          }
+
+          RUN_ID="$(resolve_run_id)"
+          echo "📥 Downloading ${ARTIFACT_NAME} from run ${RUN_ID}..."
+          echo "Run URL: https://github.com/${REPOSITORY}/actions/runs/${RUN_ID}"
+
+          if ! gh run download "${RUN_ID}" \
+            --repo "${REPOSITORY}" \
+            -n "${ARTIFACT_NAME}" \
+            -D "${APP_PATH}"; then
+            echo "::error title=iOS artifact download failed::Failed to download ${ARTIFACT_NAME} from run ${RUN_ID}."
             exit 1
           fi
 
-      - name: Setup pre-built QA app for API specs
-        run: |
-          echo "🚀 Setting up pre-built QA app for API specs..."
-
-          # Base URL for artifacts  
-          base_url="https://github.com/MetaMask/tmp-bitrise-migration-artifacts/releases/download/test5"
-
-          # Create required directory
-          mkdir -p ios/build/Build/Products/Release-iphonesimulator/
-
-          echo "📥 Downloading iOS QA app..."
-
-          # Download Release-iphonesimulator.zip
-          if curl -L --fail -o /tmp/Release-iphonesimulator.zip "${base_url}/Release-iphonesimulator.zip"; then
-            echo "✅ Downloaded Release-iphonesimulator.zip"
-            echo "📦 Extracting iOS QA app..."
+          if [ ! -f "${APP_PATH}/Info.plist" ]; then
+            # gh sometimes extracts as nested MetaMask.app under the destination
+            NESTED="$(find "${APP_PATH}" -maxdepth 2 -type d -name 'MetaMask.app' | head -1 || true)"
+            if [ -n "${NESTED}" ] && [ -f "${NESTED}/Info.plist" ]; then
+              echo "Normalizing nested bundle ${NESTED} -> ${APP_PATH}"
+              TMP_DIR="$(mktemp -d)"
+              mv "${NESTED}" "${TMP_DIR}/MetaMask.app"
+              rm -rf "${APP_PATH}"
+              mv "${TMP_DIR}/MetaMask.app" "${APP_PATH}"
+              rmdir "${TMP_DIR}" 2>/dev/null || true
+            fi
+          fi
 
-            # Extract preserving directory structure
-            cd ios/build/Build/Products/Release-iphonesimulator/
-            unzip -o /tmp/Release-iphonesimulator.zip "MetaMask-QA.app/*"
-            cd - > /dev/null
+          if [ ! -f "${APP_PATH}/Info.plist" ]; then
+            echo "::error title=Invalid iOS app bundle::Info.plist missing under ${APP_PATH}"
+            find "${APP_PATH}" -maxdepth 2 2>/dev/null || true
+            exit 1
+          fi
 
-            # Set proper permissions for the app bundle
-            chmod -R 755 "ios/build/Build/Products/Release-iphonesimulator/MetaMask-QA.app/" 2>/dev/null || true
+          echo "✅ main-e2e MetaMask.app ready at ${APP_PATH}"
+        shell: bash
 
-          else
-            echo "❌ Failed to download iOS QA app artifacts"
+      - name: Restore iOS bundle executable permissions
+        env:
+          APP_PATH: ${{ env.IOS_APP_ARTIFACT_PATH }}
+        run: |
+          BUNDLE_EXEC=$(/usr/libexec/PlistBuddy -c "Print CFBundleExecutable" "$APP_PATH/Info.plist" 2>/dev/null)
+          if [ -z "$BUNDLE_EXEC" ]; then
+            echo "Could not read CFBundleExecutable from Info.plist"
             exit 1
           fi
 
-          # Verify setup
-          if [[ -f "ios/build/Build/Products/Release-iphonesimulator/MetaMask-QA.app/Info.plist" ]]; then
-            echo "✅ iOS QA app ready for API specs"
-            echo "📋 App bundle contents:"
-            find "ios/build/Build/Products/Release-iphonesimulator/MetaMask-QA.app/" -maxdepth 1 -exec ls -la {} \; | head -10
-          else
-            echo "❌ iOS QA app setup failed - Info.plist not found"
-            echo "📋 Directory contents:"
-            find "ios/build/Build/Products/Release-iphonesimulator/" -maxdepth 1 -exec ls -la {} \; 2>/dev/null || true
+          ACTUAL_PATH=$(find "$APP_PATH" -maxdepth 1 -iname "$BUNDLE_EXEC" -type f | head -1)
+          if [ -z "$ACTUAL_PATH" ]; then
+            echo "Bundle executable not found: $BUNDLE_EXEC"
             exit 1
           fi
 
-      - name: Clean environment before API specs
-        run: |
-          echo "🧹 Cleaning environment before API specs tests..."
+          if [ "$(basename "$ACTUAL_PATH")" != "$BUNDLE_EXEC" ]; then
+            mv "$ACTUAL_PATH" "$APP_PATH/${BUNDLE_EXEC}_fix"
+            mv "$APP_PATH/${BUNDLE_EXEC}_fix" "$APP_PATH/$BUNDLE_EXEC"
+          fi
 
-          # Clean up any lock files
-          find . -name "*.lock" -type f -delete 2>/dev/null || true
+          chmod +x "$APP_PATH/$BUNDLE_EXEC"
 
-          # Reset Detox lock file
-          yarn detox reset-lock-file
+          if [ -d "$APP_PATH/Frameworks" ]; then
+            find "$APP_PATH/Frameworks" -type d -name "*.framework" | while IFS= read -r fw; do
+              binary="$fw/$(basename "$fw" .framework)"
+              if [ -f "$binary" ]; then
+                chmod +x "$binary"
+              fi
+            done
+            find "$APP_PATH/Frameworks" -type f -name "*.dylib" -exec chmod +x {} \;
+          fi
+          echo "Restored execute permissions on main binary and all framework binaries"
+        shell: bash
 
-          # Clean any hanging processes
-          pkill -f "Metro\|node\|npm" 2>/dev/null || true
+      - name: Resolve XCUITest driver version for WDA cache key
+        id: xcuitest-version
+        run: echo "version=$(node scripts/e2e/resolve-xcuitest-driver-version.mjs)" >> "$GITHUB_OUTPUT"
 
-          echo "✅ Environment cleaned and ready for API specs"
+      - name: Get Xcode version for WDA cache key
+        id: xcode-version
+        run: echo "version=$(xcodebuild -version 2>/dev/null | head -1 | tr ' ' '-')" >> "$GITHUB_OUTPUT"
 
-      - name: Run API Specs tests
+      - name: Restore WDA DerivedData cache
+        uses: actions/cache@v4
+        with:
+          path: ~/appium-wda
+          key: wda-derived-data-xcuitest-${{ steps.xcuitest-version.outputs.version }}-${{ steps.xcode-version.outputs.version }}-${{ runner.os }}
+          restore-keys: |
+            wda-derived-data-xcuitest-${{ steps.xcuitest-version.outputs.version }}-${{ steps.xcode-version.outputs.version }}-
+
+      - name: Check if WDA is prebuilt
+        id: wda-prebuilt
         run: |
-          echo "🚀 Running API specs tests..."
-          echo "Using Detox configuration: ios.sim.apiSpecs"
+          WDA_APP=$(find ~/appium-wda/Build/Products -name 'WebDriverAgentRunner-Runner.app' -type d 2>/dev/null | head -1 || true)
+          XCTESTRUN=$(find ~/appium-wda/Build/Products -name '*.xctestrun' 2>/dev/null | head -1 || true)
+          if [ -n "$WDA_APP" ] && [ -n "$XCTESTRUN" ]; then
+            echo "ready=true" >> "$GITHUB_OUTPUT"
+            echo "WDA prebuilt artifacts found"
+          else
+            echo "ready=false" >> "$GITHUB_OUTPUT"
+            echo "WDA cache miss — prepare-ios-appium-runner will prebuild after sim boot"
+          fi
+        shell: bash
 
-          # Run API specs with retries
-          yarn test:api-specs --retries 1
+      - name: Prepare iOS Appium runner
+        id: prepare-ios-appium
+        timeout-minutes: 30
+        run: node scripts/e2e/prepare-ios-appium-runner.mjs
+        env:
+          IOS_SIMULATOR_NAME: iPhone 16 Pro
+          IOS_APP_PATH: ${{ env.IOS_APP_ARTIFACT_PATH }}
+          IOS_BUNDLE_ID: io.metamask.MetaMask
+          SKIP_WDA_PREBUILD: ${{ steps.wda-prebuilt.outputs.ready == 'true' && 'true' || 'false' }}
+          IOS_SIMULATOR_POST_BOOT_SETTLE_MS: '30000'
+          IOS_APP_WARM_LAUNCH_SETTLE_MS: '15000'
+
+      - name: Verify Appium runner connectivity (iOS)
+        run: yarn tsx scripts/e2e/verify-appium-runner-connectivity.mjs ios
+        env:
+          IOS_SIMULATOR_UDID: ${{ steps.prepare-ios-appium.outputs.ios-simulator-udid }}
 
-          echo "✅ API specs tests completed"
+      - name: Run API Specs (iOS Appium)
+        timeout-minutes: 60
+        run: yarn test:api-specs
+        env:
+          APPIUM_SMOKE_SUITE_NAME: api-specs-ios
+          APPIUM_SMOKE_JOB_TITLE: API Specs (ios Appium)
+          APPIUM_SMOKE_ARTIFACT_NAME: api-specs-report
+          PLAYWRIGHT_JSON_OUTPUT_FILE: tests/test-reports/playwright-json/playwright-report.json
+          SKIP_APPIUM_STOP: 'true'
+          IOS_APP_PATH: ${{ env.IOS_APP_ARTIFACT_PATH }}
+          IOS_SIMULATOR_NAME: iPhone 16 Pro
+          IOS_SIMULATOR_UDID: ${{ steps.prepare-ios-appium.outputs.ios-simulator-udid }}
+          IOS_WDA_PREINSTALLED: ${{ steps.prepare-ios-appium.outputs.ios-wda-preinstalled }}
+          IOS_WDA_BUNDLE_ID: ${{ steps.prepare-ios-appium.outputs.ios-wda-bundle-id }}
+          SKIP_DEVICE_BOOT: 'true'
+          SKIP_APP_REINSTALL: 'true'
+          USE_PREBUILT_WDA: 'true'
+          IOS_SIMULATOR_POST_BOOT_SETTLE_MS: '30000'
+          IOS_PRE_LAUNCH_SETTLE_MS: '1500'
+          MM_INFURA_PROJECT_ID: ${{ secrets.MM_INFURA_PROJECT_ID }}
+
+      - name: Upload Playwright HTML report (Namespace)
+        if: ${{ always() && (inputs.runner_provider || 'current') == 'namespace' }}
+        uses: namespace-actions/upload-artifact@f6ccaacc655aec41b93af180d1d7eef21af862d2 # v1.0.3
+        with:
+          name: api-specs-report
+          path: tests/test-reports/appium-smoke-report/api-specs-ios/
+          if-no-files-found: ignore
+          retention-days: 7
 
-      - name: Upload API specs test results
-        if: always()
+      - name: Upload Playwright HTML report (current)
+        if: ${{ always() && (inputs.runner_provider || 'current') != 'namespace' }}
         uses: actions/upload-artifact@v4
         with:
-          name: api-specs-test-results
-          path: tests/reports/
+          name: api-specs-report
+          path: tests/test-reports/appium-smoke-report/api-specs-ios/
+          if-no-files-found: ignore
           retention-days: 7
 
-      - name: Upload API specs screenshots
-        if: failure() || cancelled()
+      - name: Upload Playwright JSON report
+        if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: api-specs-screenshots
-          path: tests/artifacts/
+          name: api-specs-playwright-json
+          path: tests/test-reports/playwright-json/
+          if-no-files-found: ignore
           retention-days: 7
diff --git a/.github/workflows/run-e2e-smoke-tests-android.yml b/.github/workflows/run-e2e-smoke-tests-android.yml
deleted file mode 100644
index 77b6bb922ae6..000000000000
--- a/.github/workflows/run-e2e-smoke-tests-android.yml
+++ /dev/null
@@ -1,254 +0,0 @@
-name: Android E2E Smoke Tests
-
-on:
-  workflow_call:
-    inputs:
-      selected_tags:
-        description: 'JSON array of selected tags from Smart E2E selection (e.g., ["SmokeAccounts", "SmokeSwap"])'
-        required: false
-        type: string
-        default: '["ALL"]'
-      changed_spec_files:
-        description: 'Space-separated list of changed E2E spec file paths, used to run modified specs twice for flakiness detection'
-        required: false
-        type: string
-        default: ''
-      runner_provider:
-        description: Runner provider forwarded from the caller
-        required: false
-        type: string
-        default: current
-
-permissions:
-  contents: read
-  id-token: write
-
-jobs:
-  perps-android-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokePerps')
-    strategy:
-      matrix:
-        split: [1]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: perps-android-smoke-${{ matrix.split }}
-      platform: android
-      test_suite_tag: 'SmokePerps'
-      split_number: ${{ matrix.split }}
-      total_splits: 1
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  wallet-platform-android-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeWalletPlatform')
-    strategy:
-      matrix:
-        split: [1, 2]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: wallet-platform-android-smoke-${{ matrix.split }}
-      platform: android
-      test_suite_tag: 'SmokeWalletPlatform'
-      split_number: ${{ matrix.split }}
-      total_splits: 2
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  network-abstraction-android-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeNetworkAbstractions')
-    strategy:
-      matrix:
-        split: [1, 2]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: network-abstraction-android-smoke-${{ matrix.split }}
-      platform: android
-      test_suite_tag: 'SmokeNetworkAbstractions'
-      split_number: ${{ matrix.split }}
-      total_splits: 2
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  network-expansion-android-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeNetworkExpansion')
-    strategy:
-      matrix:
-        split: [1, 2]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: network-expansion-android-smoke-${{ matrix.split }}
-      platform: android
-      test_suite_tag: 'SmokeNetworkExpansion'
-      split_number: ${{ matrix.split }}
-      total_splits: 2
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  confirmations-android-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeConfirmations')
-    strategy:
-      matrix:
-        split: [1, 2, 3, 4]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: confirmations-android-smoke-${{ matrix.split }}
-      platform: android
-      test_suite_tag: 'SmokeConfirmations'
-      split_number: ${{ matrix.split }}
-      total_splits: 4
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  multichain-api-android-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeMultiChainAPI')
-    strategy:
-      matrix:
-        split: [1]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: multichain-api-android-smoke-${{ matrix.split }}
-      platform: android
-      test_suite_tag: 'SmokeMultiChainAPI'
-      split_number: ${{ matrix.split }}
-      total_splits: 1
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  snaps-android-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeSnaps')
-    strategy:
-      matrix:
-        split: [1, 2, 3, 4]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: snaps-android-smoke-${{ matrix.split }}
-      platform: android
-      test_suite_tag: 'SmokeSnaps'
-      split_number: ${{ matrix.split }}
-      total_splits: 4
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  report-android-smoke-tests:
-    name: Report Android Smoke Tests
-    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
-    # Appium migration: skip rollup when every Detox shard is skipped (e.g. AI selects
-    # an Appium-only tag like SmokeAccounts / SmokeSwap / SmokeStake / SmokeBrowser). Non-empty tags still trigger this workflow.
-    if: >-
-      ${{
-        !cancelled() &&
-        (
-          contains(toJSON(needs), '"result":"success"') ||
-          contains(toJSON(needs), '"result":"failure"')
-        )
-      }}
-    needs:
-      - perps-android-smoke
-      - wallet-platform-android-smoke
-      - network-abstraction-android-smoke
-      - network-expansion-android-smoke
-      - confirmations-android-smoke
-      - multichain-api-android-smoke
-      - snaps-android-smoke
-    steps:
-      - name: Checkout (Namespace)
-        uses: namespacelabs/nscloud-checkout-action@938f5d2d403d6224d9a0c0dc559b1dae09c2ede4 # v8.1.1
-        if: ${{ inputs.runner_provider == 'namespace' }}
-
-      - name: Checkout
-        uses: actions/checkout@v6
-        if: ${{ inputs.runner_provider != 'namespace' }}
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Download shards test artifacts (XMLs + Screenshots) (Namespace)
-        if: ${{ inputs.runner_provider == 'namespace' }}
-        uses: namespace-actions/download-artifact@7cbad919e4b0e09f17e9d6311a444ff002992b5b # v2.0.1
-        continue-on-error: true
-        with:
-          path: all-test-artifacts/
-          pattern: 'test-e2e-main-*-android-*'
-      - name: Download shards test artifacts (XMLs + Screenshots) (current)
-        if: ${{ inputs.runner_provider != 'namespace' }}
-        uses: actions/download-artifact@v4
-        continue-on-error: true
-        with:
-          path: all-test-artifacts/
-          pattern: 'test-e2e-main-*-android-*'
-
-      - name: Post Test Report
-        uses: dorny/test-reporter@dc3a92680fcc15842eef52e8c4606ea7ce6bd3f3
-        with:
-          name: 'Android E2E Smoke Test Results'
-          path: 'all-test-artifacts/**/junit.xml'
-          reporter: 'jest-junit'
-          fail-on-error: false
-          list-suites: 'failed'
-          list-tests: 'failed'
-
-      - name: Upload all test artifacts (XMLs + Screenshots) (Namespace)
-        if: ${{ inputs.runner_provider == 'namespace' }}
-        uses: namespace-actions/upload-artifact@f6ccaacc655aec41b93af180d1d7eef21af862d2 # v1.0.3
-        with:
-          name: e2e-smoke-android-all-test-artifacts
-          path: all-test-artifacts/
-          retention-days: 7
-      - name: Upload all test artifacts (XMLs + Screenshots) (current)
-        if: ${{ inputs.runner_provider != 'namespace' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: e2e-smoke-android-all-test-artifacts
-          path: all-test-artifacts/
-          retention-days: 7
-
-      - name: Install CI script dependencies
-        continue-on-error: true
-        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          retry_wait_seconds: 30
-          command: cd .github/scripts && yarn --immutable
-
-      - name: Create mobile JSON test report
-        id: create-json-report
-        continue-on-error: true
-        run: |
-          TEST_RESULTS_PATH=all-test-artifacts \
-          TEST_RUNS_PATH=test/test-results/test-runs-android.json \
-          RUN_ID=${{ github.run_id }} \
-          PR_NUMBER=${{ github.event.pull_request.number || '0' }} \
-          GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} \
-          node .github/scripts/e2e-create-json-test-report.mjs
-
-      - name: Upload JSON test report (Namespace)
-        if: ${{ steps.create-json-report.outcome == 'success' && inputs.runner_provider == 'namespace' }}
-        uses: namespace-actions/upload-artifact@f6ccaacc655aec41b93af180d1d7eef21af862d2 # v1.0.3
-        with:
-          name: test-e2e-android-json-report
-          path: test/test-results/test-runs-android.json
-          retention-days: 7
-      - name: Upload JSON test report (current)
-        if: ${{ steps.create-json-report.outcome == 'success' && inputs.runner_provider != 'namespace' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-e2e-android-json-report
-          path: test/test-results/test-runs-android.json
-          retention-days: 7
diff --git a/.github/workflows/run-e2e-smoke-tests-ios.yml b/.github/workflows/run-e2e-smoke-tests-ios.yml
deleted file mode 100644
index 835c98529279..000000000000
--- a/.github/workflows/run-e2e-smoke-tests-ios.yml
+++ /dev/null
@@ -1,262 +0,0 @@
-name: iOS E2E Smoke Tests
-
-on:
-  workflow_call:
-    inputs:
-      selected_tags:
-        description: 'JSON array of selected tags from Smart E2E selection (e.g., ["SmokeAccounts", "SmokeSwap"])'
-        required: false
-        type: string
-        default: '["ALL"]'
-      changed_spec_files:
-        description: 'Space-separated list of changed E2E spec file paths, used to run modified specs twice for flakiness detection'
-        required: false
-        type: string
-        default: ''
-      runner_provider:
-        description: Runner provider forwarded from the caller
-        required: false
-        type: string
-        default: current
-
-permissions:
-  contents: read
-  id-token: write
-
-jobs:
-  confirmations-ios-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeConfirmations')
-    strategy:
-      matrix:
-        split: [1, 2, 3, 4]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: confirmations-ios-smoke-${{ matrix.split }}
-      platform: ios
-      test_suite_tag: 'SmokeConfirmations'
-      split_number: ${{ matrix.split }}
-      total_splits: 4
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      build_type: 'main'
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  perps-ios-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokePerps')
-    strategy:
-      matrix:
-        split: [1]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: perps-ios-smoke-${{ matrix.split }}
-      platform: ios
-      test_suite_tag: 'SmokePerps'
-      split_number: ${{ matrix.split }}
-      total_splits: 1
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      build_type: 'main'
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  wallet-platform-ios-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeWalletPlatform')
-    strategy:
-      matrix:
-        split: [1, 2]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: wallet-platform-ios-smoke-${{ matrix.split }}
-      platform: ios
-      test_suite_tag: 'SmokeWalletPlatform'
-      split_number: ${{ matrix.split }}
-      total_splits: 2
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      build_type: 'main'
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  network-abstraction-ios-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeNetworkAbstractions')
-    strategy:
-      matrix:
-        split: [1, 2]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: network-abstraction-ios-smoke-${{ matrix.split }}
-      platform: ios
-      test_suite_tag: 'SmokeNetworkAbstractions'
-      split_number: ${{ matrix.split }}
-      total_splits: 2
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      build_type: 'main'
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  network-expansion-ios-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeNetworkExpansion')
-    strategy:
-      matrix:
-        split: [1, 2]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: network-expansion-ios-smoke-${{ matrix.split }}
-      platform: ios
-      test_suite_tag: 'SmokeNetworkExpansion'
-      split_number: ${{ matrix.split }}
-      total_splits: 2
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      build_type: 'main'
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  multichain-api-ios-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeMultiChainAPI')
-    strategy:
-      matrix:
-        split: [1]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: multichain-api-ios-smoke-${{ matrix.split }}
-      platform: ios
-      test_suite_tag: 'SmokeMultiChainAPI'
-      split_number: ${{ matrix.split }}
-      total_splits: 1
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      build_type: 'main'
-      runner_provider: ${{ inputs.runner_provider }}
-    secrets: inherit
-
-  snaps-ios-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeSnaps')
-    strategy:
-      matrix:
-        split: [1, 2, 3, 4]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: snaps-ios-smoke-${{ matrix.split }}
-      platform: ios
-      test_suite_tag: 'SmokeSnaps'
-      split_number: ${{ matrix.split }}
-      total_splits: 4
-      changed_spec_files: ${{ inputs.changed_spec_files }}
-      build_type: 'main'
-      runner_provider: ${{ inputs.runner_provider }}
-      bitrise_machine_type: ${{ inputs.runner_provider == 'bitrise' && matrix.split == 1 && vars.BITRISE_E2E_HEAVY_MACHINE_TYPE || '' }}
-    secrets: inherit
-
-  report-ios-smoke-tests:
-    name: Report iOS Smoke Tests
-    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
-    # Appium migration: skip rollup when every Detox shard is skipped (e.g. AI selects
-    # an Appium-only tag like SmokeAccounts / SmokeSwap / SmokeStake / SmokeBrowser). Non-empty tags still trigger this workflow.
-    if: >-
-      ${{
-        !cancelled() &&
-        (
-          contains(toJSON(needs), '"result":"success"') ||
-          contains(toJSON(needs), '"result":"failure"')
-        )
-      }}
-    needs:
-      - confirmations-ios-smoke
-      - perps-ios-smoke
-      - wallet-platform-ios-smoke
-      - network-abstraction-ios-smoke
-      - network-expansion-ios-smoke
-      - multichain-api-ios-smoke
-      - snaps-ios-smoke
-    steps:
-      - name: Checkout (Namespace)
-        uses: namespacelabs/nscloud-checkout-action@938f5d2d403d6224d9a0c0dc559b1dae09c2ede4 # v8.1.1
-        if: ${{ inputs.runner_provider == 'namespace' }}
-
-      - name: Checkout
-        uses: actions/checkout@v6
-        if: ${{ inputs.runner_provider != 'namespace' }}
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Download shards test artifacts (XMLs + Screenshots) (Namespace)
-        if: ${{ inputs.runner_provider == 'namespace' }}
-        uses: namespace-actions/download-artifact@7cbad919e4b0e09f17e9d6311a444ff002992b5b # v2.0.1
-        continue-on-error: true
-        with:
-          path: all-test-artifacts/
-          pattern: 'test-e2e-main-*-ios-*'
-      - name: Download shards test artifacts (XMLs + Screenshots) (current)
-        if: ${{ inputs.runner_provider != 'namespace' }}
-        uses: actions/download-artifact@v4
-        continue-on-error: true
-        with:
-          path: all-test-artifacts/
-          pattern: 'test-e2e-main-*-ios-*'
-
-      - name: Post Test Report
-        uses: dorny/test-reporter@dc3a92680fcc15842eef52e8c4606ea7ce6bd3f3
-        with:
-          name: 'iOS E2E Smoke Test Results'
-          path: 'all-test-artifacts/**/junit.xml'
-          reporter: 'jest-junit'
-          fail-on-error: false
-          list-suites: 'failed'
-          list-tests: 'failed'
-
-      - name: Upload all test artifacts (XMLs + Screenshots) (Namespace)
-        if: ${{ inputs.runner_provider == 'namespace' }}
-        uses: namespace-actions/upload-artifact@f6ccaacc655aec41b93af180d1d7eef21af862d2 # v1.0.3
-        with:
-          name: e2e-smoke-ios-all-test-artifacts
-          path: all-test-artifacts/
-          retention-days: 7
-      - name: Upload all test artifacts (XMLs + Screenshots) (current)
-        if: ${{ inputs.runner_provider != 'namespace' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: e2e-smoke-ios-all-test-artifacts
-          path: all-test-artifacts/
-          retention-days: 7
-
-      - name: Install CI script dependencies
-        continue-on-error: true
-        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          retry_wait_seconds: 30
-          command: cd .github/scripts && yarn --immutable
-
-      - name: Create mobile JSON test report
-        id: create-json-report
-        continue-on-error: true
-        run: |
-          TEST_RESULTS_PATH=all-test-artifacts \
-          TEST_RUNS_PATH=test/test-results/test-runs-ios.json \
-          RUN_ID=${{ github.run_id }} \
-          PR_NUMBER=${{ github.event.pull_request.number || '0' }} \
-          GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} \
-          node .github/scripts/e2e-create-json-test-report.mjs
-
-      - name: Upload JSON test report (Namespace)
-        if: ${{ steps.create-json-report.outcome == 'success' && inputs.runner_provider == 'namespace' }}
-        uses: namespace-actions/upload-artifact@f6ccaacc655aec41b93af180d1d7eef21af862d2 # v1.0.3
-        with:
-          name: test-e2e-ios-json-report
-          path: test/test-results/test-runs-ios.json
-          retention-days: 7
-      - name: Upload JSON test report (current)
-        if: ${{ steps.create-json-report.outcome == 'success' && inputs.runner_provider != 'namespace' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-e2e-ios-json-report
-          path: test/test-results/test-runs-ios.json
-          retention-days: 7
diff --git a/.github/workflows/run-performance-e2e-experimental.yml b/.github/workflows/run-performance-e2e-experimental.yml
deleted file mode 100644
index f2d9d942b353..000000000000
--- a/.github/workflows/run-performance-e2e-experimental.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-# Same as run-performance-e2e-release but for experimental builds (main branch, build-exp).
-# Triggers experimental Android/iOS builds and runs performance E2E.
-name: Performance E2E Tests for Experimental Builds
-on:
-  schedule:
-    - cron: '0 */3 * * 1-6' # Every 3 hours, Mon–Fri (aligned with main performance workflow)
-  workflow_dispatch:
-    inputs:
-      sentry_target:
-        description: 'Sentry target for performance events (test or real)'
-        required: false
-        type: choice
-        options:
-          - test
-          - real
-        default: test
-  push:
-    branches:
-      - main
-
-# Must be at least as permissive as the called reusable workflow (run-performance-e2e.yml),
-# which transitively requires contents: write via build-{android,ios}-upload-to-browserstack.yml.
-permissions:
-  contents: write
-  id-token: write
-  actions: write
-  pull-requests: write
-  statuses: write
-
-concurrency:
-  group: performance-e2e-experimental-${{ github.ref }}-${{ github.event_name }}
-  cancel-in-progress: false
-
-jobs:
-  check-experimental-trigger:
-    name: Check if Experimental Performance Tests Should Run
-    runs-on: ubuntu-latest
-    outputs:
-      should-run: ${{ steps.check.outputs.should-run }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Check experimental trigger conditions
-        id: check
-        run: |
-          # Always run for manual dispatch or push to main
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" || ("${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == "main") ]]; then
-            echo "should-run=true" >> "$GITHUB_OUTPUT"
-            echo "Experimental performance tests triggered by ${{ github.event_name }}"
-          # For scheduled runs, always run (periodic performance check on experimental builds)
-          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
-            echo "should-run=true" >> "$GITHUB_OUTPUT"
-            echo "Scheduled run: experimental performance E2E"
-          else
-            echo "should-run=false" >> "$GITHUB_OUTPUT"
-          fi
-
-  run-performance-e2e-experimental:
-    name: Run Performance E2E Tests for Experimental Builds
-    uses: ./.github/workflows/run-performance-e2e.yml
-    needs: [check-experimental-trigger]
-    if: needs.check-experimental-trigger.outputs.should-run == 'true'
-    with:
-      branch_name: main
-      build_variant: exp
-      sentry_target: ${{ inputs.sentry_target || 'test' }}
-    secrets: inherit
diff --git a/.github/workflows/run-performance-e2e-manual.yml b/.github/workflows/run-performance-e2e-manual.yml
new file mode 100644
index 000000000000..1df9864561e1
--- /dev/null
+++ b/.github/workflows/run-performance-e2e-manual.yml
@@ -0,0 +1,100 @@
+name: Run Performance E2E Tests Manually
+
+# Scheduled runs use the e2e build from main:
+# - 00:00, 06:00, 12:00, 18:00 UTC
+on:
+  schedule:
+    - cron: '0 */6 * * 1-6'
+  workflow_dispatch:
+    inputs:
+      build_variant:
+        description: 'BrowserStack build profile'
+        required: false
+        type: choice
+        options:
+          - e2e
+          - exp
+          - rc
+        default: e2e
+      sentry_target:
+        description: 'Sentry target for performance events (test or real)'
+        required: false
+        type: choice
+        options:
+          - test
+          - real
+        default: test
+      browserstack_app_url_android_onboarding:
+        description: 'BrowserStack Android Onboarding App URL (bs://...)'
+        required: false
+        type: string
+      browserstack_app_url_ios_onboarding:
+        description: 'BrowserStack iOS Onboarding App URL (bs://...)'
+        required: false
+        type: string
+      browserstack_app_url_android_imported_wallet:
+        description: 'BrowserStack Android Imported Wallet App URL (bs://...)'
+        required: false
+        type: string
+      browserstack_app_url_ios_imported_wallet:
+        description: 'BrowserStack iOS Imported Wallet App URL (bs://...)'
+        required: false
+        type: string
+      performance_tags:
+        description: 'JSON array of performance tags. Blank runs all; [] skips all.'
+        required: false
+        type: string
+        default: ''
+      reuse_main_builds:
+        description: 'For e2e only, reuse the latest matching Android apps from main CI'
+        required: false
+        type: boolean
+        default: false
+      source_fingerprint:
+        description: 'Optional @expo/fingerprint hash for Android app reuse'
+        required: false
+        type: string
+        default: ''
+
+permissions:
+  contents: write
+  id-token: write
+  actions: write
+  pull-requests: write
+  statuses: write
+
+concurrency:
+  # Manual runs are isolated by ref and variant so they do not block the
+  # scheduled cadence.
+  group: performance-e2e-trigger-${{ github.event_name == 'schedule' && github.event.schedule || github.ref }}-${{ github.event_name == 'schedule' && 'scheduled' || inputs.build_variant }}
+  cancel-in-progress: false
+
+jobs:
+  scheduled-e2e:
+    name: Scheduled Performance E2E (e2e)
+    if: github.event_name == 'schedule' && github.event.schedule == '0 */6 * * 1-6'
+    uses: ./.github/workflows/run-performance-e2e.yml
+    with:
+      branch_name: main
+      source_ref: main
+      build_variant: e2e
+      sentry_target: test
+    secrets: inherit
+
+  manual:
+    name: Manual Performance E2E (${{ inputs.build_variant }})
+    if: github.event_name == 'workflow_dispatch'
+    uses: ./.github/workflows/run-performance-e2e.yml
+    with:
+      branch_name: ${{ github.ref_name }}
+      source_ref: ${{ github.ref_name }}
+      build_variant: ${{ inputs.build_variant }}
+      sentry_target: ${{ inputs.sentry_target }}
+      browserstack_app_url_android_onboarding: ${{ inputs.browserstack_app_url_android_onboarding }}
+      browserstack_app_url_ios_onboarding: ${{ inputs.browserstack_app_url_ios_onboarding }}
+      browserstack_app_url_android_imported_wallet: ${{ inputs.browserstack_app_url_android_imported_wallet }}
+      browserstack_app_url_ios_imported_wallet: ${{ inputs.browserstack_app_url_ios_imported_wallet }}
+      performance_tags: ${{ inputs.performance_tags }}
+      reuse_main_builds: ${{ inputs.build_variant == 'e2e' && inputs.reuse_main_builds }}
+      source_fingerprint: ${{ inputs.source_fingerprint }}
+    secrets: inherit
diff --git a/.github/workflows/run-performance-e2e-release.yml b/.github/workflows/run-performance-e2e-release.yml
deleted file mode 100644
index 386601079fcc..000000000000
--- a/.github/workflows/run-performance-e2e-release.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-name: Performance E2E Tests for Release Builds
-on:
-  schedule:
-    - cron: '*/30 * * * *' # Every 30 minutes to check for metamaskbot commits
-  workflow_dispatch:
-    inputs:
-      sentry_target:
-        description: 'Sentry target for performance events (test or real)'
-        required: false
-        type: choice
-        options:
-          - test
-          - real
-        default: test
-  push:
-    branches:
-      - 'release/*'
-
-# Must be at least as permissive as the called reusable workflow (run-performance-e2e.yml),
-# which transitively requires contents: write via build-{android,ios}-upload-to-browserstack.yml.
-permissions:
-  contents: write
-  id-token: write
-  actions: write
-  pull-requests: write
-  statuses: write
-
-jobs:
-  check-release-trigger:
-    name: Check if Release Performance Tests Should Run
-    runs-on: ubuntu-latest
-    outputs:
-      should-run: ${{ steps.check.outputs.should-run }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Check release trigger conditions
-        id: check
-        run: |
-          # Always run for manual dispatch or release branch pushes
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" || ("${{ github.event_name }}" == "push" && "${{ github.ref_name }}" =~ ^release/) ]]; then
-            echo "should-run=true" >> "$GITHUB_OUTPUT"
-            echo "Performance tests triggered by ${{ github.event_name }}"
-          # For scheduled runs, check for recent metamaskbot version bumps
-          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
-            git fetch --all
-            
-            # Get the most recent metamaskbot version bump commit
-            RECENT_VERSION_BUMP=$(git log --oneline --grep="Bump version number" --author="metamaskbot" --since="2 hours ago" --all | head -1)
-            
-            if [[ -n "$RECENT_VERSION_BUMP" ]]; then
-              # Extract the commit hash
-              COMMIT_HASH=$(echo "$RECENT_VERSION_BUMP" | cut -d' ' -f1)
-              
-              # Check if the commit message contains "Bump version number" (ignore [skip ci])
-              COMMIT_MESSAGE=$(git log -1 --format="%s" "$COMMIT_HASH")
-              if [[ "$COMMIT_MESSAGE" =~ "Bump version number" ]]; then
-                # Check if we've already processed this commit by looking for a workflow run with this commit
-                # We'll use a simple approach: check if the commit is from the last 30 minutes
-                COMMIT_TIME=$(git log -1 --format="%ct" "$COMMIT_HASH")
-                CURRENT_TIME=$(date +%s)
-                TIME_DIFF=$((CURRENT_TIME - COMMIT_TIME))
-                
-                # Only run if the commit is from the last 30 minutes (to avoid re-running the same commit)
-                if [[ $TIME_DIFF -lt 1800 ]]; then
-                  echo "should-run=true" >> "$GITHUB_OUTPUT"
-                  echo "Recent metamaskbot version bump found (within last 30 min): $RECENT_VERSION_BUMP"
-                  echo "Commit message: $COMMIT_MESSAGE"
-                else
-                  echo "should-run=false" >> "$GITHUB_OUTPUT"
-                  echo "Metamaskbot version bump found but older than 30 minutes: $RECENT_VERSION_BUMP"
-                fi
-              else
-                echo "should-run=false" >> "$GITHUB_OUTPUT"
-                echo "Metamaskbot commit found but not a version bump: $RECENT_VERSION_BUMP"
-                echo "Commit message: $COMMIT_MESSAGE"
-              fi
-            else
-              echo "should-run=false" >> "$GITHUB_OUTPUT"
-              echo "No recent metamaskbot version bumps found"
-            fi
-          else
-            echo "should-run=false" >> "$GITHUB_OUTPUT"
-          fi
-
-  run-performance-e2e-release:
-    name: Run Performance E2E Tests for Release Builds
-    uses: ./.github/workflows/run-performance-e2e.yml
-    needs: [check-release-trigger]
-    if: needs.check-release-trigger.outputs.should-run == 'true'
-    with:
-      sentry_target: ${{ inputs.sentry_target || 'test' }}
-      build_variant: 'rc'
-    secrets: inherit
diff --git a/.github/workflows/run-performance-e2e.yml b/.github/workflows/run-performance-e2e.yml
index ed66e5179200..1e24ba99e4d6 100644
--- a/.github/workflows/run-performance-e2e.yml
+++ b/.github/workflows/run-performance-e2e.yml
@@ -1,72 +1,8 @@
-name: Build Apps and Run Performance E2E Tests
-# This workflow runs performance E2E tests every 3 hours during weekdays (Monday-Friday)
-# Schedule: Every 3 hours at the top of the hour (00:00, 03:00, 06:00, 09:00, 12:00, 15:00, 18:00, 21:00)
-# Days: Monday (1) through Friday (6)
-on:
-  schedule:
-    - cron: '0 */3 * * 1-6'
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-    inputs:
-      description:
-        description: 'Optional description for this test run'
-        required: false
-        type: string
-      sentry_target:
-        description: 'Sentry target for performance events (test or real)'
-        required: false
-        type: choice
-        options:
-          - test
-          - real
-        default: test
+name: Run Performance E2E Tests
 
-      browserstack_app_url_android_onboarding:
-        description: 'BrowserStack Android Onboarding App URL (bs://...)'
-        required: false
-        type: string
-      browserstack_app_url_ios_onboarding:
-        description: 'BrowserStack iOS Onboarding App URL (bs://...)'
-        required: false
-        type: string
-      browserstack_app_url_android_imported_wallet:
-        description: 'BrowserStack Android Imported Wallet App URL (bs://...)'
-        required: false
-        type: string
-      browserstack_app_url_ios_imported_wallet:
-        description: 'BrowserStack iOS Imported Wallet App URL (bs://...)'
-        required: false
-        type: string
-      performance_tags:
-        description: 'JSON array of performance tags (e.g. ["@PerformanceLogin","@PerformanceSwaps"]). Omit/blank = run all. "[]" = skip all (PR with no relevant changes).'
-        required: false
-        type: string
-        default: ''
-      reuse_main_builds:
-        description: >-
-          When true, skip fresh Android BrowserStack builds and reuse the latest
-          uploaded apps from main-branch CI instead (same behavior as CI test-only PRs).
-          Falls back to a fresh build if no reusable main apps are found. Ignored when
-          manual browserstack_app_url_* inputs are provided.
-        required: false
-        type: boolean
-        default: false
-      source_fingerprint:
-        description: >-
-          Optional @expo/fingerprint hash. When omitted, the workflow computes and
-          posts build-source-hash so Android BrowserStack dual builds can be reused
-          across runs with matching native sources.
-        required: false
-        type: string
-        default: ''
+on:
   workflow_call:
     inputs:
-      description:
-        description: 'Optional description for this test run'
-        required: false
-        type: string
       sentry_target:
         description: 'Sentry target for performance events (test or real)'
         required: false
@@ -90,11 +26,15 @@ on:
         required: false
         type: string
       branch_name:
-        description: 'Branch name to use for build names (defaults to auto-detection)'
-        required: false
+        description: 'Branch name used for build names and reports'
+        required: true
+        type: string
+      source_ref:
+        description: 'Exact branch, tag, or commit to use for native app builds'
+        required: true
         type: string
       build_variant:
-        description: 'BrowserStack build profile (e2e = build-e2e, works on feature branches; rc = build-rc, release branches only; exp = experimental)'
+        description: 'BrowserStack build profile (e2e = standard E2E, exp = experimental, rc = release candidate)'
         required: false
         type: string
         default: 'e2e'
@@ -115,8 +55,8 @@ on:
         default: ''
       reuse_main_builds:
         description: >-
-          When true, skip fresh Android BrowserStack builds and reuse the latest
-          uploaded apps from main-branch CI instead.
+          For e2e builds only, skip fresh Android BrowserStack builds and reuse
+          the latest uploaded apps from main-branch CI instead.
         required: false
         type: boolean
         default: false
@@ -137,8 +77,8 @@ permissions:
   statuses: write
 
 concurrency:
-  # Include build_variant so e2e, experimental (exp), and release/direct (rc) don't share the same
-  # queue — avoids "Build Apps" (direct/release) and e2e/experimental runs canceling each other.
+  # Include build_variant so scheduled/PR e2e runs and manual exp/rc runs don't
+  # share the same queue — avoids unrelated variants canceling each other's pending run.
   # Note: GitHub allows at most 1 running + 1 pending per group; a 3rd run cancels the pending one.
   group: performance-e2e-${{ github.ref }}-${{ github.event_name }}-${{ inputs.build_variant || 'e2e' }}
   # Do not cancel in-progress runs; pending runs can still be replaced by a newer trigger.
@@ -156,73 +96,129 @@ env:
   DISABLE_VIDEO_DOWNLOAD: true
 
 jobs:
-  determine-branch-name:
-    name: Determine Branch Name
+  prepare:
+    name: Prepare Performance E2E
     runs-on: ubuntu-latest
     outputs:
-      branch_name: ${{ steps.get-branch.outputs.branch_name }}
+      fingerprint: ${{ steps.resolve-fingerprint.outputs.fingerprint }}
+      android_matrix: ${{ steps.read-matrix.outputs.android_matrix }}
+      ios_matrix: ${{ steps.read-matrix.outputs.ios_matrix }}
+      android_build_name: ${{ steps.set-build-names.outputs.android_build_name }}
+      ios_build_name: ${{ steps.set-build-names.outputs.ios_build_name }}
+      run_tests: ${{ steps.select-tests.outputs.run_tests }}
+      grep_pattern: ${{ steps.select-tests.outputs.grep_pattern }}
     steps:
-      - name: Get correct branch name
-        id: get-branch
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Map performance tags to grep pattern
+        id: select-tests
         env:
-          INPUT_BRANCH: ${{ inputs.branch_name }}
-          HEAD_REF: ${{ github.head_ref }}
-          REF_NAME: ${{ github.ref_name }}
-          EVENT_NAME: ${{ github.event_name }}
+          PERF_TAGS: ${{ inputs.performance_tags }}
+          PERF_REASONING: ${{ inputs.performance_tags_reasoning }}
         run: |
-          # Determine the correct branch name for all trigger scenarios:
-          # - workflow_call (from ci.yml): uses INPUT_BRANCH (github.head_ref for PRs, github.ref_name for push)
-          # - pull_request: uses HEAD_REF (source branch, e.g., "feature-branch")
-          # - schedule: uses REF_NAME (typically "main")
-          # - workflow_dispatch: uses INPUT_BRANCH if provided, otherwise REF_NAME
-          # Priority: explicit input > PR head_ref > ref_name
-          if [ -n "$INPUT_BRANCH" ]; then
-            BRANCH_NAME="$INPUT_BRANCH"
-            echo "Using explicit input: $BRANCH_NAME"
-          elif [ "$EVENT_NAME" = "pull_request" ] && [ -n "$HEAD_REF" ]; then
-            BRANCH_NAME="$HEAD_REF"
-            echo "Using PR source branch: $BRANCH_NAME"
+          TAGS="$PERF_TAGS"
+          REASONING="$PERF_REASONING"
+
+          # No input (blank) → schedule/dispatch or label override: run all tests.
+          if [[ -z "$TAGS" ]]; then
+            echo "run_tests=true" >> "$GITHUB_OUTPUT"
+            echo "grep_pattern="  >> "$GITHUB_OUTPUT"
+            echo "▶️  Running all performance tests (no tag filter)"
+            exit 0
+          fi
+
+          # '[]' → no performance-relevant changes: skip tests and native builds.
+          if [[ "$TAGS" == "[]" ]]; then
+            echo "run_tests=false" >> "$GITHUB_OUTPUT"
+            echo "grep_pattern="   >> "$GITHUB_OUTPUT"
+            echo "⏭️  Skipping performance tests — no performance-relevant changes detected"
+            if [[ -n "$REASONING" ]]; then
+              echo "   Reasoning: $REASONING"
+            fi
+            exit 0
+          fi
+
+          GREP=$(echo "$TAGS" | jq -r 'join("|")')
+          echo "run_tests=true"     >> "$GITHUB_OUTPUT"
+          echo "grep_pattern=$GREP" >> "$GITHUB_OUTPUT"
+          echo "⚡ Tags: $TAGS"
+          echo "   Grep pattern: $GREP"
+          if [[ -n "$REASONING" ]]; then
+            echo "   Reasoning: $REASONING"
+          fi
+
+      - name: Read device matrix
+        id: read-matrix
+        env:
+          BRANCH_NAME: ${{ inputs.branch_name }}
+          PR_NUMBER: ${{ inputs.pr_number }}
+        run: |
+          FILE="tests/performance/device-matrix.json"
+
+          # PRs use Android low-profile devices only. Scheduled/manual runs use
+          # the full matrix. iOS runs require manually supplied BrowserStack URLs.
+          if [ -n "$PR_NUMBER" ]; then
+            ANDROID_MATRIX=$(jq '[.android_devices[] | select(.category == "low")]' "$FILE")
+            IOS_MATRIX='[]'
+            echo "PR mode: Android low category devices only (PR: $PR_NUMBER, branch: $BRANCH_NAME)"
           else
-            BRANCH_NAME="$REF_NAME"
-            echo "Using ref_name: $BRANCH_NAME"
+            ANDROID_MATRIX=$(jq ".android_devices" "$FILE")
+            IOS_MATRIX=$(jq ".ios_devices" "$FILE")
+            echo "Full mode: all devices (branch: $BRANCH_NAME)"
           fi
 
-          echo "branch_name=$BRANCH_NAME" >> "$GITHUB_OUTPUT"
-          echo "Branch: $BRANCH_NAME"
+          {
+            echo "android_matrix<<EOF"
+            echo "$ANDROID_MATRIX"
+            echo "EOF"
+            echo "ios_matrix<<EOF"
+            echo "$IOS_MATRIX"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+          echo "Selected: $(echo "$ANDROID_MATRIX" | jq length) Android, $(echo "$IOS_MATRIX" | jq length) iOS"
 
-  # Same contract as ci.yml native-build-fingerprint → build-android-e2e:
-  # fingerprint must resolve for this job to succeed. Empty fingerprint disables
-  # reuse inside build-android-upload-to-browserstack (resolve job is skipped) but
-  # the dual Gradle path still runs. Download-miss fallback lives in that workflow,
-  # matching build-android-e2e.yml's continue-on-error + native-build gate.
-  ensure-fingerprint:
-    name: Ensure native build fingerprint
-    runs-on: ubuntu-latest
-    outputs:
-      fingerprint: ${{ steps.resolve.outputs.fingerprint }}
-    steps:
+      - name: Set BrowserStack build names
+        id: set-build-names
+        env:
+          BRANCH_NAME: ${{ inputs.branch_name }}
+        run: |
+          echo "android_build_name=Android-Performance-$BRANCH_NAME-Branch" >> "$GITHUB_OUTPUT"
+          echo "ios_build_name=iOS-Performance-$BRANCH_NAME-Branch" >> "$GITHUB_OUTPUT"
+
+      # A fingerprint is only needed when tests will run and Android apps were
+      # not supplied. PR CI normally provides it; schedule/manual runs compute it.
       - name: Use caller-provided fingerprint
         id: provided
-        if: ${{ inputs.source_fingerprint }}
+        if: >-
+          steps.select-tests.outputs.run_tests == 'true' &&
+          !inputs.browserstack_app_url_android_onboarding &&
+          !inputs.browserstack_app_url_android_imported_wallet &&
+          inputs.source_fingerprint
         env:
           SOURCE_FINGERPRINT: ${{ inputs.source_fingerprint }}
         run: |
           echo "fingerprint=$SOURCE_FINGERPRINT" >> "$GITHUB_OUTPUT"
           echo "Using caller-provided fingerprint: $SOURCE_FINGERPRINT"
 
-      - name: Checkout
-        if: ${{ !inputs.source_fingerprint }}
-        uses: actions/checkout@v6
-
       - name: Set up Node.js
-        if: ${{ !inputs.source_fingerprint }}
+        if: >-
+          steps.select-tests.outputs.run_tests == 'true' &&
+          !inputs.browserstack_app_url_android_onboarding &&
+          !inputs.browserstack_app_url_android_imported_wallet &&
+          !inputs.source_fingerprint
         uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
           cache: yarn
 
       - name: Install Yarn dependencies with retry
-        if: ${{ !inputs.source_fingerprint }}
+        if: >-
+          steps.select-tests.outputs.run_tests == 'true' &&
+          !inputs.browserstack_app_url_android_onboarding &&
+          !inputs.browserstack_app_url_android_imported_wallet &&
+          !inputs.source_fingerprint
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
         with:
           timeout_minutes: 10
@@ -232,7 +228,11 @@ jobs:
 
       - name: Compute and post build-source-hash
         id: computed
-        if: ${{ !inputs.source_fingerprint }}
+        if: >-
+          steps.select-tests.outputs.run_tests == 'true' &&
+          !inputs.browserstack_app_url_android_onboarding &&
+          !inputs.browserstack_app_url_android_imported_wallet &&
+          !inputs.source_fingerprint
         uses: ./.github/actions/post-build-source-hash
         with:
           github-token: ${{ github.token }}
@@ -240,7 +240,11 @@ jobs:
           target-sha: ${{ github.sha }}
 
       - name: Resolve fingerprint output
-        id: resolve
+        id: resolve-fingerprint
+        if: >-
+          steps.select-tests.outputs.run_tests == 'true' &&
+          !inputs.browserstack_app_url_android_onboarding &&
+          !inputs.browserstack_app_url_android_imported_wallet
         env:
           PROVIDED: ${{ steps.provided.outputs.fingerprint }}
           COMPUTED: ${{ steps.computed.outputs.fingerprint }}
@@ -255,125 +259,14 @@ jobs:
           fi
           echo "Resolved fingerprint: $(grep fingerprint= "$GITHUB_OUTPUT" | tail -1)"
 
-  read-device-matrix:
-    name: Read Device Matrix
-    runs-on: ubuntu-latest
-    needs: [determine-branch-name]
-    outputs:
-      android_matrix: ${{ steps.read-matrix.outputs.android_matrix }}
-      ios_matrix: ${{ steps.read-matrix.outputs.ios_matrix }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Select Devices
-        id: read-matrix
-        env:
-          BRANCH_NAME: ${{ needs.determine-branch-name.outputs.branch_name }}
-          PR_NUMBER: ${{ inputs.pr_number }}
-        run: |
-          FILE="tests/performance/device-matrix.json"
-
-          # PRs: run the AI-selected performance tests on Android low profile only.
-          # Pushes keep the previous low-device behavior to control cost and flakes.
-          # Schedule and workflow_dispatch use the full device matrix.
-          if [ -n "$PR_NUMBER" ]; then
-            ANDROID_MATRIX=$(jq '[.android_devices[] | select(.category == "low")]' "$FILE")
-            IOS_MATRIX='[]'
-            echo "PR mode: Android low category devices only (PR: $PR_NUMBER, branch: $BRANCH_NAME)"
-          elif [ "${{ github.event_name }}" = "push" ]; then
-            ANDROID_MATRIX=$(jq '[.android_devices[] | select(.category == "low")]' "$FILE")
-            IOS_MATRIX=$(jq '[.ios_devices[] | select(.category == "low")]' "$FILE")
-            echo "Push mode: low category devices only (event: ${{ github.event_name }}, branch: $BRANCH_NAME)"
-          else
-            ANDROID_MATRIX=$(jq ".android_devices" "$FILE")
-            IOS_MATRIX=$(jq ".ios_devices" "$FILE")
-            echo "Full mode: All devices (event: ${{ github.event_name }}, branch: $BRANCH_NAME)"
-          fi
-
-          {
-            echo "android_matrix<<EOF"
-            echo "$ANDROID_MATRIX"
-            echo "EOF"
-            echo "ios_matrix<<EOF"
-            echo "$IOS_MATRIX"
-            echo "EOF"
-          } >> "$GITHUB_OUTPUT"
-
-          echo "Selected: $(echo "$ANDROID_MATRIX" | jq length) Android, $(echo "$IOS_MATRIX" | jq length) iOS"
-
-  set-build-names:
-    name: Set Unified BrowserStack Build Names
-    runs-on: ubuntu-latest
-    needs: [determine-branch-name]
-    outputs:
-      android_build_name: ${{ steps.set-builds.outputs.android_build_name }}
-      ios_build_name: ${{ steps.set-builds.outputs.ios_build_name }}
-    steps:
-      - name: Set unified build names
-        id: set-builds
-        run: |
-          BRANCH_NAME="${{ needs.determine-branch-name.outputs.branch_name }}"
-          echo "android_build_name=Android-Performance-$BRANCH_NAME-Branch" >> "$GITHUB_OUTPUT"
-          echo "ios_build_name=iOS-Performance-$BRANCH_NAME-Branch" >> "$GITHUB_OUTPUT"
-          echo "Set unified build names:"
-          echo "  Android: Android-Performance-$BRANCH_NAME-Branch"
-          echo "  iOS: iOS-Performance-$BRANCH_NAME-Branch"
-
-  compute-test-selection:
-    name: Compute Performance Test Selection
-    runs-on: ubuntu-latest
-    outputs:
-      run_tests: ${{ steps.map.outputs.run_tests }}
-      grep_pattern: ${{ steps.map.outputs.grep_pattern }}
-    steps:
-      - name: Map performance tags to grep pattern
-        id: map
-        env:
-          PERF_REASONING: ${{ inputs.performance_tags_reasoning }}
-        run: |
-          TAGS='${{ inputs.performance_tags }}'
-          REASONING="$PERF_REASONING"
-
-          # No input (blank) → schedule/dispatch: run all tests with no grep filter
-          if [[ -z "$TAGS" ]]; then
-            echo "run_tests=true" >> "$GITHUB_OUTPUT"
-            echo "grep_pattern="  >> "$GITHUB_OUTPUT"
-            echo "▶️  Running all performance tests (schedule/dispatch mode — no tag filter)"
-            exit 0
-          fi
-
-          # '[]' → PR with no performance-relevant changes: skip all tests
-          if [[ "$TAGS" == "[]" ]]; then
-            echo "run_tests=false" >> "$GITHUB_OUTPUT"
-            echo "grep_pattern="   >> "$GITHUB_OUTPUT"
-            echo "⏭️  Skipping performance tests — no performance-relevant changes detected in this PR"
-            if [[ -n "$REASONING" ]]; then
-              echo "   Reasoning: $REASONING"
-            fi
-            exit 0
-          fi
-
-          # Build OR-pattern for playwright --grep (e.g. "@PerformanceSwaps|@PerformanceLogin")
-          # Playwright matches against the full test name (describe + test title), so each tag
-          # selects only the individual tests that use it in their describe block.
-          GREP=$(echo "$TAGS" | jq -r 'join("|")')
-
-          echo "run_tests=true"      >> "$GITHUB_OUTPUT"
-          echo "grep_pattern=$GREP"  >> "$GITHUB_OUTPUT"
-
-          echo "⚡ Performance test selection:"
-          echo "   Tags: $TAGS"
-          echo "   Grep pattern: $GREP"
-          if [[ -n "$REASONING" ]]; then
-            echo "   Reasoning: $REASONING"
-          fi
-
   resolve-main-browserstack-urls:
     name: Resolve main-branch BrowserStack Android apps
     runs-on: ubuntu-latest
+    needs: [prepare]
     if: >-
+      needs.prepare.outputs.run_tests == 'true' &&
       inputs.reuse_main_builds &&
+      inputs.build_variant == 'e2e' &&
       !inputs.browserstack_app_url_android_onboarding &&
       !inputs.browserstack_app_url_android_imported_wallet
     outputs:
@@ -401,57 +294,45 @@ jobs:
   trigger-android-dual-versions:
     name: Trigger Android Dual Versions and Extract BrowserStack URLs
     uses: ./.github/workflows/build-android-upload-to-browserstack.yml
-    needs: [determine-branch-name, resolve-main-browserstack-urls, ensure-fingerprint]
+    needs: [prepare, resolve-main-browserstack-urls]
     # Build/upload when not reusing main, or when main reuse lookup found nothing.
     # Fingerprint job must succeed (same as ci.yml native-build-fingerprint → E2E).
     # Download-miss → fresh dual Gradle fallback is inside build-android-upload-to-browserstack.
     if: >-
       always() &&
       !cancelled() &&
+      needs.prepare.result == 'success' &&
+      needs.prepare.outputs.run_tests == 'true' &&
       (needs.resolve-main-browserstack-urls.result == 'skipped' || needs.resolve-main-browserstack-urls.result == 'success') &&
-      needs.ensure-fingerprint.result == 'success' &&
       (!inputs.browserstack_app_url_android_onboarding && !inputs.browserstack_app_url_android_imported_wallet) &&
       (
         !inputs.reuse_main_builds ||
+        inputs.build_variant != 'e2e' ||
         needs.resolve-main-browserstack-urls.outputs.found != 'true'
       )
     with:
-      branch_name: ${{ needs.determine-branch-name.outputs.branch_name }}
-      build_variant: ${{ inputs.build_variant || 'e2e' }}
-      source_fingerprint: ${{ needs.ensure-fingerprint.outputs.fingerprint }}
-      main_branch_only: ${{ inputs.reuse_main_builds }}
-    secrets: inherit
-
-  trigger-ios-dual-versions:
-    name: Trigger iOS Dual Versions and Extract BrowserStack URLs
-    uses: ./.github/workflows/build-ios-upload-to-browserstack.yml
-    needs: [determine-branch-name]
-    if: false # temporarily disabled — iOS tests not yet active
-    # if: (!inputs.browserstack_app_url_ios_onboarding && !inputs.browserstack_app_url_ios_imported_wallet)
-    with:
-      branch_name: ${{ needs.determine-branch-name.outputs.branch_name }}
+      branch_name: ${{ inputs.branch_name }}
+      source_ref: ${{ inputs.source_ref }}
       build_variant: ${{ inputs.build_variant || 'e2e' }}
+      source_fingerprint: ${{ needs.prepare.outputs.fingerprint }}
+      # Coerce to a real boolean. On schedule/push, workflow_dispatch inputs are
+      # unset; passing a blank value into this boolean workflow_call input makes
+      # the reusable Android build job fail to start.
+      main_branch_only: ${{ inputs.reuse_main_builds == true && inputs.build_variant == 'e2e' }}
     secrets: inherit
 
   # =============================================================================
-  # PHASE 1: ONBOARDING TESTS (Run First)
+  # ONBOARDING TESTS
   # =============================================================================
 
   run-android-onboarding-tests:
     name: Performance Test Android (Onboarding)
     uses: ./.github/workflows/performance-test-runner.yml
     needs:
-      [
-        read-device-matrix,
-        trigger-android-dual-versions,
-        resolve-main-browserstack-urls,
-        set-build-names,
-        determine-branch-name,
-        compute-test-selection,
-      ]
+      [prepare, trigger-android-dual-versions, resolve-main-browserstack-urls]
     if: >-
       always() && !failure() && !cancelled() &&
-      needs.compute-test-selection.outputs.run_tests == 'true' &&
+      needs.prepare.outputs.run_tests == 'true' &&
       (
         needs.trigger-android-dual-versions.result == 'skipped' ||
         needs.trigger-android-dual-versions.result == 'success'
@@ -470,70 +351,47 @@ jobs:
       build_type: onboarding
       sentry_target: ${{ inputs.sentry_target || 'test' }}
       build_variant: ${{ inputs.build_variant || 'e2e' }}
-      device_matrix: ${{ needs.read-device-matrix.outputs.android_matrix }}
-      browserstack_app_url: ${{ needs.resolve-main-browserstack-urls.outputs.without-srp-browserstack-url || needs.trigger-android-dual-versions.outputs.without-srp-browserstack-url || inputs.browserstack_app_url_android_onboarding }}
-      app_version: ${{ needs.resolve-main-browserstack-urls.outputs.without-srp-version || needs.trigger-android-dual-versions.outputs.without-srp-version || 'Manual-Input' }}
-      branch_name: ${{ needs.determine-branch-name.outputs.branch_name }}
-      browserstack_build_name: ${{ needs.set-build-names.outputs.android_build_name }}
-      grep_tags: ${{ needs.compute-test-selection.outputs.grep_pattern }}
+      branch_name: ${{ inputs.branch_name }}
+      device_matrix: ${{ needs.prepare.outputs.android_matrix }}
+      # Prefer an explicitly supplied or freshly uploaded app. Reused main
+      # URLs are only a fallback so onboarding cannot receive a stale variant.
+      browserstack_app_url: ${{ inputs.browserstack_app_url_android_onboarding || needs.trigger-android-dual-versions.outputs.without-srp-browserstack-url || needs.resolve-main-browserstack-urls.outputs.without-srp-browserstack-url }}
+      app_version: ${{ needs.trigger-android-dual-versions.outputs.without-srp-version || needs.resolve-main-browserstack-urls.outputs.without-srp-version || 'Manual-Input' }}
+      browserstack_build_name: ${{ needs.prepare.outputs.android_build_name }}
+      grep_tags: ${{ needs.prepare.outputs.grep_pattern }}
     secrets: inherit
 
   run-ios-onboarding-tests:
     name: Performance Test iOS (Onboarding)
     uses: ./.github/workflows/performance-test-runner.yml
     needs:
-      [
-        read-device-matrix,
-        trigger-ios-dual-versions,
-        set-build-names,
-        determine-branch-name,
-        compute-test-selection,
-      ]
-    if: always() && !failure() && !cancelled() && needs.compute-test-selection.outputs.run_tests == 'true' && (needs.trigger-ios-dual-versions.result == 'skipped' || needs.trigger-ios-dual-versions.result == 'success') && (inputs.browserstack_app_url_ios_onboarding != '' || needs.trigger-ios-dual-versions.outputs.without-srp-browserstack-url != '')
+      - prepare
+    if: always() && !failure() && !cancelled() && needs.prepare.outputs.run_tests == 'true' && inputs.browserstack_app_url_ios_onboarding != ''
     with:
       platform: ios
       build_type: onboarding
       sentry_target: ${{ inputs.sentry_target || 'test' }}
       build_variant: ${{ inputs.build_variant || 'e2e' }}
-      device_matrix: ${{ needs.read-device-matrix.outputs.ios_matrix }}
-      browserstack_app_url: ${{ needs.trigger-ios-dual-versions.outputs.without-srp-browserstack-url || inputs.browserstack_app_url_ios_onboarding }}
-      app_version: ${{ needs.trigger-ios-dual-versions.outputs.without-srp-version || 'Manual-Input' }}
-      branch_name: ${{ needs.determine-branch-name.outputs.branch_name }}
-      browserstack_build_name: ${{ needs.set-build-names.outputs.ios_build_name }}
-      grep_tags: ${{ needs.compute-test-selection.outputs.grep_pattern }}
+      branch_name: ${{ inputs.branch_name }}
+      device_matrix: ${{ needs.prepare.outputs.ios_matrix }}
+      browserstack_app_url: ${{ inputs.browserstack_app_url_ios_onboarding }}
+      app_version: Manual-Input
+      browserstack_build_name: ${{ needs.prepare.outputs.ios_build_name }}
+      grep_tags: ${{ needs.prepare.outputs.grep_pattern }}
     secrets: inherit
 
   # =============================================================================
-  # PHASE 2: IMPORTED WALLET TESTS (Run After Onboarding Complete)
+  # IMPORTED WALLET TESTS (Run in Parallel with Onboarding)
   # =============================================================================
 
-  wait-for-onboarding-completion:
-    name: Wait for Onboarding Completion
-    runs-on: ubuntu-latest
-    needs: [run-android-onboarding-tests, run-ios-onboarding-tests]
-    if: always()
-    steps:
-      - name: Wait for onboarding tests to complete
-        run: |
-          echo "Onboarding tests have completed (success or failure)"
-          echo "Proceeding with imported wallet tests..."
-
   run-android-imported-wallet-tests:
     name: Performance Test Android (Imported Wallet)
     uses: ./.github/workflows/performance-test-runner.yml
     needs:
-      [
-        read-device-matrix,
-        trigger-android-dual-versions,
-        resolve-main-browserstack-urls,
-        wait-for-onboarding-completion,
-        set-build-names,
-        determine-branch-name,
-        compute-test-selection,
-      ]
+      [prepare, trigger-android-dual-versions, resolve-main-browserstack-urls]
     if: >-
       always() && !cancelled() &&
-      needs.compute-test-selection.outputs.run_tests == 'true' &&
+      needs.prepare.outputs.run_tests == 'true' &&
       (
         needs.trigger-android-dual-versions.result == 'skipped' ||
         needs.trigger-android-dual-versions.result == 'success'
@@ -552,38 +410,31 @@ jobs:
       build_type: imported-wallet
       sentry_target: ${{ inputs.sentry_target || 'test' }}
       build_variant: ${{ inputs.build_variant || 'e2e' }}
-      device_matrix: ${{ needs.read-device-matrix.outputs.android_matrix }}
-      browserstack_app_url: ${{ needs.resolve-main-browserstack-urls.outputs.with-srp-browserstack-url || needs.trigger-android-dual-versions.outputs.with-srp-browserstack-url || inputs.browserstack_app_url_android_imported_wallet }}
-      app_version: ${{ needs.resolve-main-browserstack-urls.outputs.with-srp-version || needs.trigger-android-dual-versions.outputs.with-srp-version || 'Manual-Input' }}
-      branch_name: ${{ needs.determine-branch-name.outputs.branch_name }}
-      browserstack_build_name: ${{ needs.set-build-names.outputs.android_build_name }}
-      grep_tags: ${{ needs.compute-test-selection.outputs.grep_pattern }}
+      branch_name: ${{ inputs.branch_name }}
+      device_matrix: ${{ needs.prepare.outputs.android_matrix }}
+      browserstack_app_url: ${{ inputs.browserstack_app_url_android_imported_wallet || needs.trigger-android-dual-versions.outputs.with-srp-browserstack-url || needs.resolve-main-browserstack-urls.outputs.with-srp-browserstack-url }}
+      app_version: ${{ needs.trigger-android-dual-versions.outputs.with-srp-version || needs.resolve-main-browserstack-urls.outputs.with-srp-version || 'Manual-Input' }}
+      browserstack_build_name: ${{ needs.prepare.outputs.android_build_name }}
+      grep_tags: ${{ needs.prepare.outputs.grep_pattern }}
     secrets: inherit
 
   run-ios-imported-wallet-tests:
     name: Performance Test iOS (Imported Wallet)
     uses: ./.github/workflows/performance-test-runner.yml
     needs:
-      [
-        read-device-matrix,
-        trigger-ios-dual-versions,
-        wait-for-onboarding-completion,
-        set-build-names,
-        determine-branch-name,
-        compute-test-selection,
-      ]
-    if: always() && !cancelled() && needs.compute-test-selection.outputs.run_tests == 'true' && (needs.trigger-ios-dual-versions.result == 'skipped' || needs.trigger-ios-dual-versions.result == 'success') && (inputs.browserstack_app_url_ios_imported_wallet != '' || needs.trigger-ios-dual-versions.outputs.with-srp-browserstack-url != '')
+      - prepare
+    if: always() && !cancelled() && needs.prepare.outputs.run_tests == 'true' && inputs.browserstack_app_url_ios_imported_wallet != ''
     with:
       platform: ios
       build_type: imported-wallet
       sentry_target: ${{ inputs.sentry_target || 'test' }}
       build_variant: ${{ inputs.build_variant || 'e2e' }}
-      device_matrix: ${{ needs.read-device-matrix.outputs.ios_matrix }}
-      browserstack_app_url: ${{ needs.trigger-ios-dual-versions.outputs.with-srp-browserstack-url || inputs.browserstack_app_url_ios_imported_wallet }}
-      app_version: ${{ needs.trigger-ios-dual-versions.outputs.with-srp-version || 'Manual-Input' }}
-      branch_name: ${{ needs.determine-branch-name.outputs.branch_name }}
-      browserstack_build_name: ${{ needs.set-build-names.outputs.ios_build_name }}
-      grep_tags: ${{ needs.compute-test-selection.outputs.grep_pattern }}
+      branch_name: ${{ inputs.branch_name }}
+      device_matrix: ${{ needs.prepare.outputs.ios_matrix }}
+      browserstack_app_url: ${{ inputs.browserstack_app_url_ios_imported_wallet }}
+      app_version: Manual-Input
+      browserstack_build_name: ${{ needs.prepare.outputs.ios_build_name }}
+      grep_tags: ${{ needs.prepare.outputs.grep_pattern }}
     secrets: inherit
 
   aggregate-results:
@@ -591,14 +442,13 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       [
+        prepare,
         run-android-imported-wallet-tests,
         run-android-onboarding-tests,
         run-ios-imported-wallet-tests,
         run-ios-onboarding-tests,
-        wait-for-onboarding-completion,
-        determine-branch-name,
       ]
-    if: always()
+    if: always() && needs.prepare.outputs.run_tests == 'true'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -612,7 +462,7 @@ jobs:
 
       - name: Run aggregation script
         env:
-          BRANCH_NAME: ${{ needs.determine-branch-name.outputs.branch_name }}
+          BRANCH_NAME: ${{ inputs.branch_name }}
           BUILD_VARIANT: ${{ inputs.build_variant || 'e2e' }}
         run: |
           echo "Processing all test results..."
@@ -632,9 +482,9 @@ jobs:
   post-pr-comment:
     name: Post Performance Results to PR
     runs-on: ubuntu-latest
-    needs: [aggregate-results, determine-branch-name]
+    needs: [aggregate-results]
     # Only runs when triggered from a PR via workflow_call with a pr_number
-    if: always() && !cancelled() && inputs.pr_number != ''
+    if: always() && !cancelled() && needs.aggregate-results.result != 'skipped' && inputs.pr_number != ''
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -694,9 +544,8 @@ jobs:
         run-ios-imported-wallet-tests,
         run-ios-onboarding-tests,
         aggregate-results,
-        determine-branch-name,
       ]
-    if: always()
+    if: always() && needs.aggregate-results.result != 'skipped'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -711,7 +560,7 @@ jobs:
         id: summary
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH_NAME: ${{ needs.determine-branch-name.outputs.branch_name }}
+          BRANCH_NAME: ${{ inputs.branch_name }}
         run: |
           {
             echo "summary<<EOF"
diff --git a/.github/workflows/runway-production-builds.yml b/.github/workflows/runway-production-builds.yml
index 37ed85b82861..d5932cb0ad7b 100644
--- a/.github/workflows/runway-production-builds.yml
+++ b/.github/workflows/runway-production-builds.yml
@@ -3,9 +3,9 @@
 # Runway Production Builds
 #
 # Triggered from Runway to build the production iOS + Android binaries in one run.
-# Bumps the build version once, then dispatches build.yml with platform: both so iOS and Android
-# build in parallel against the same bumped commit. Finishes by uploading the iOS IPA to
-# TestFlight.
+# Generates the build number once, then dispatches build.yml with platform: both so iOS and Android
+# apply the same number locally at build time (no version-bump commit). Finishes by uploading the
+# iOS IPA to TestFlight.
 #
 # This workflow only produces fresh native binaries — OTA updates are handled by the separate
 # runway-ota-production.yml workflow.
@@ -24,7 +24,7 @@ on:
         type: string
 
 permissions:
-  contents: write # required by commit-build-version.yml
+  contents: read
   pull-requests: read
   actions: write
   id-token: write # required by build.yml
@@ -34,24 +34,17 @@ jobs:
     name: Generate build version
     uses: ./.github/workflows/generate-build-version.yml
 
-  commit-build-version:
-    name: Commit build version
-    needs: generate-build-version
-    uses: ./.github/workflows/commit-build-version.yml
-    permissions:
-      id-token: write
-    with:
-      base-branch: ${{ inputs.source_branch || github.ref_name }}
-      build_number: ${{ needs.generate-build-version.outputs.build-version }}
-
   build:
     name: Build iOS + Android (main-prod)
-    needs: commit-build-version
+    needs: generate-build-version
     uses: ./.github/workflows/build.yml
     with:
       build_name: main-prod
       platform: both
-      source_branch: ${{ needs.commit-build-version.outputs.commit-hash }}
+      # Prefer an explicit input; otherwise pin to the dispatch SHA so iOS and
+      # Android do not race a moving branch tip under one build number.
+      source_branch: ${{ inputs.source_branch || github.sha }}
+      build_number: ${{ needs.generate-build-version.outputs.build-version }}
       upload_to_sentry: true
     secrets: inherit
 
diff --git a/.github/workflows/runway-rc-builds.yml b/.github/workflows/runway-rc-builds.yml
index 939448bc317f..9d5b1a923d0e 100644
--- a/.github/workflows/runway-rc-builds.yml
+++ b/.github/workflows/runway-rc-builds.yml
@@ -3,9 +3,9 @@
 # Runway RC Builds
 #
 # Triggered from Runway to build the release-candidate iOS + Android binaries in one run.
-# Bumps the build version once, then dispatches build.yml with platform: both so iOS and Android
-# build in parallel against the same bumped commit. Uploads the iOS IPA to TestFlight and posts
-# a Slack notification with the resulting build numbers.
+# Generates the build number once, then dispatches build.yml with platform: both so iOS and Android
+# apply the same number locally at build time (no version-bump commit). Uploads the iOS IPA to
+# TestFlight and posts a Slack notification with the resulting build numbers.
 #
 # This workflow only produces fresh native binaries — OTA updates are handled by the separate
 # runway-ota-rc.yml workflow.
@@ -24,7 +24,7 @@ on:
         type: string
 
 permissions:
-  contents: write # required by commit-build-version.yml
+  contents: read
   pull-requests: read
   actions: write
   id-token: write # required by build.yml
@@ -34,24 +34,17 @@ jobs:
     name: Generate build version
     uses: ./.github/workflows/generate-build-version.yml
 
-  commit-build-version:
-    name: Commit build version
-    needs: generate-build-version
-    uses: ./.github/workflows/commit-build-version.yml
-    permissions:
-      id-token: write
-    with:
-      base-branch: ${{ inputs.source_branch || github.ref_name }}
-      build_number: ${{ needs.generate-build-version.outputs.build-version }}
-
   build:
     name: Build iOS + Android (main-rc)
-    needs: commit-build-version
+    needs: generate-build-version
     uses: ./.github/workflows/build.yml
     with:
       build_name: main-rc
       platform: both
-      source_branch: ${{ needs.commit-build-version.outputs.commit-hash }}
+      # Prefer an explicit input; otherwise pin to the dispatch SHA so iOS and
+      # Android do not race a moving branch tip under one build number.
+      source_branch: ${{ inputs.source_branch || github.sha }}
+      build_number: ${{ needs.generate-build-version.outputs.build-version }}
       upload_to_sentry: true
     secrets: inherit
 
diff --git a/.github/workflows/stable-branch-sync.yml b/.github/workflows/stable-branch-sync.yml
index 600b04844a6e..2225bfec040f 100644
--- a/.github/workflows/stable-branch-sync.yml
+++ b/.github/workflows/stable-branch-sync.yml
@@ -8,7 +8,7 @@ permissions:
 on:
   push:
     branches:
-        - stable
+      - stable
 
 jobs:
   get-stable-version:
@@ -18,18 +18,18 @@ jobs:
     outputs:
       stable-version: ${{ steps.resolve-stable-version.outputs.stable_version }}
     steps:
-        - name: Checkout
-          uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
-        - 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: 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 stable release version
-          id: resolve-stable-version
-          run: ./get-stable-released-version.sh
-          working-directory: '.github/scripts'
+      - 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
@@ -48,7 +48,7 @@ jobs:
             pull_requests: write
             workflows: write
       - name: Run stable branch sync
-        uses: MetaMask/github-tools/.github/actions/stable-sync@v1.16.0
+        uses: MetaMask/github-tools/.github/actions/stable-sync@v1
         with:
           semver-version: ${{ needs['get-stable-version'].outputs['stable-version'] }}
           repo-type: 'mobile'
diff --git a/.gitignore b/.gitignore
index ae609965dbb0..36b1166d0d54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,9 +141,6 @@ scripts/reports/
 # PR description files (temporary, not to be committed)
 PR_DESC.md
 
-# Performance test results
-tests/smoke/performance/reports/*-performance-results.json
-
 # appwright
 appwright/report
 playwright-report/*
@@ -242,3 +239,8 @@ build-env.json
 .tsccheck.log
 predict_tsc.log
 predict_tsc_summary.txt
+
+# mm CLI daemon
+.mm-server
+.mm-daemon.log
+test-artifacts/
diff --git a/.js.env.example b/.js.env.example
index 38d3ae16e7fc..49c270cf6592 100644
--- a/.js.env.example
+++ b/.js.env.example
@@ -155,6 +155,7 @@ export MM_MONEY_ENABLE_ACTIVITY_DETAILS_BLOCKEXPLORER_LINK="true"
 export MM_MONEY_FIRST_TIME_DEPOSIT_ANIMATION_ENABLED="true"
 export MM_MONEY_PARALLAX_ANIMATION_ENABLED="true"
 export MM_MONEY_CARD_FLIP_ANIMATION_ENABLED="true"
+export MM_MONEY_CARD_TILT_ANIMATION_ENABLED="true"
 
 # Activates remote feature flag override mode.
 # Remote feature flag values won't be updated,
diff --git a/.yarn/plugins/plugin-usage-tracking.cjs b/.yarn/plugins/plugin-usage-tracking.cjs
index 0abb70f0cf65..0ddaa68ca498 100644
--- a/.yarn/plugins/plugin-usage-tracking.cjs
+++ b/.yarn/plugins/plugin-usage-tracking.cjs
@@ -1,20 +1,141 @@
-// Yarn Berry plugin — records every yarn script execution to the local CSV
-// events log (defaults to ~/.tool-usage-collection/metamask-mobile-events.log).
+// Yarn Berry plugin — records directly user-invoked yarn script executions to
+// the local CSV events log (defaults to
+// ~/.tool-usage-collection/metamask-mobile-events.log).
 //
 // Appends one CSV line per event directly via fs.appendFileSync.
 //
-// NOTE: `yarn install` (and other built-in Yarn commands) are NOT tracked.
-// The `wrapScriptExecution` hook only fires for scripts defined in package.json,
-// not for Yarn's own built-in commands. This is a Yarn Berry limitation — no
-// plugin hook exists that wraps built-in command execution.
+// Root-only tracking: a script spawned as a dependency of another script
+// (e.g. `yarn build` shelling out to `yarn build:ios`) runs as a brand new
+// `yarn` CLI process that inherits a marker env var from its parent and is
+// skipped, so only the outermost script a user typed themselves produces log
+// rows. See PARENT_MARKER_ENV_VAR below.
+//
+// IMPORTANT: the marker is set as soon as the plugin factory runs (module
+// load / Yarn configuration bootstrap), NOT inside wrapScriptExecution. Yarn
+// computes the env object passed to a script's spawned child process (via
+// makeScriptEnv) BEFORE invoking the wrapScriptExecution hook — the executor
+// closure already captures that env snapshot, so mutating process.env from
+// inside the hook body is too late to affect it. Setting the marker at
+// factory time guarantees it is present in process.env before Yarn builds
+// that snapshot for any script this process goes on to run.
+//
+// NOTE: `yarn install` itself (the fetch/link steps) is NOT tracked — no
+// plugin hook exists that wraps built-in command execution. However, the
+// `preinstall`/`install`/`postinstall` lifecycle scripts a package.json can
+// define ARE run through this same `wrapScriptExecution` hook, automatically,
+// as part of `yarn install`. The user never types `yarn postinstall`
+// themselves, so those script names are excluded unconditionally below (see
+// LIFECYCLE_SCRIPT_NAMES), regardless of root/nested status.
 
 'use strict';
 
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
+const childProcess = require('child_process');
 
 const PLUGIN_NAME = 'plugin-usage-tracking';
+const TWENTY_FOUR_HOURS_MS = 24 * 60 * 60 * 1000;
+
+// npm/Yarn install lifecycle scripts — Yarn runs these automatically as part
+// of `yarn install` via the same wrapScriptExecution hook as any other
+// package.json script, but a user never types `yarn postinstall` themselves.
+const LIFECYCLE_SCRIPT_NAMES = new Set(['preinstall', 'install', 'postinstall']);
+
+// Standard POSIX "128 + signal number" exit codes for the signals a Ctrl+C
+// (or similar interruption) is realistically delivered as. Which exact
+// signal a script's process receives when interrupted depends on how it was
+// invoked — e.g. a single directly-spawned command may die from SIGHUP
+// (129) while a chained script (`cmd1 && cmd2`) or one shelling out to a
+// nested `yarn <script>` may die from SIGINT (130) instead — so all of them
+// must be treated as "interrupted", not just 129.
+const INTERRUPTED_EXIT_CODES = new Set([
+  129, // SIGHUP
+  130, // SIGINT
+  131, // SIGQUIT
+  137, // SIGKILL
+  143, // SIGTERM
+]);
+
+// Set on process.env as soon as this process starts so any nested
+// `yarn <script>` child process it later spawns (which inherits process.env)
+// can tell it was launched by another script rather than typed by the user.
+const PARENT_MARKER_ENV_VAR = 'MM_TOOL_USAGE_PARENT';
+
+// Computed once at module-evaluation time (top-level code in a CJS module
+// only runs once per process, even though Yarn calls the exported `factory()`
+// more than once per process while resolving configuration/running a
+// script). Checking and setting the marker inside factory() instead would
+// make the second factory() call see the marker the first call just set,
+// producing a false "dependent" reading for a genuinely root process.
+const isRootProcess = process.env[PARENT_MARKER_ENV_VAR] == null;
+// Idempotent: marks this process's env (root case) or leaves an already-set
+// marker in place (nested case), so Yarn's env snapshot for any script run
+// in this process — and therefore any nested `yarn` child it spawns —
+// carries the marker forward.
+process.env[PARENT_MARKER_ENV_VAR] = '1';
+
+// Opportunistic once-a-day trigger: the first non-CI yarn script run after the
+// 24h window spawns the anonymizer detached (non-blocking). The gate is the
+// `last_run_at` field in anonymizer-state.json — the anonymizer re-checks and
+// claims it, so concurrent spawns are harmless.
+function maybeTriggerAnonymizer(repoRoot) {
+  try {
+    if (process.env.CI || process.env.TOOL_USAGE_COLLECTION_OPT_IN === 'false') {
+      return;
+    }
+
+    const statePath = path.join(
+      os.homedir(),
+      '.tool-usage-collection',
+      'anonymizer-state.json',
+    );
+    let lastRunAt = null;
+    if (fs.existsSync(statePath)) {
+      const parsed = JSON.parse(fs.readFileSync(statePath, 'utf8'));
+      lastRunAt = parsed.last_run_at ?? null;
+    }
+
+    const nowMs = Date.now();
+    if (lastRunAt) {
+      const lastMs = Date.parse(lastRunAt);
+      if (!Number.isNaN(lastMs) && nowMs - lastMs < TWENTY_FOUR_HOURS_MS) {
+        return;
+      }
+    }
+
+    const binPath = path.join(
+      repoRoot,
+      'node_modules',
+      '@metamask',
+      'tooling-insight',
+      'dist',
+      'daily-anonymizer.mjs',
+    );
+    if (!fs.existsSync(binPath)) {
+      return;
+    }
+    childProcess.spawn(process.execPath, [binPath], {
+      detached: true,
+      stdio: 'ignore',
+    }).unref();
+  } catch (error) {
+    // Best-effort trigger — never throw into the yarn hot path.
+    try {
+      const logPath = path.join(os.homedir(), '.tool-usage-collection', 'anonymizer.log');
+      const entry = JSON.stringify({
+        ts: new Date().toISOString(),
+        cli: PLUGIN_NAME,
+        level: 'error',
+        message: 'maybeTriggerAnonymizer failed',
+        extra: { error: error instanceof Error ? error.message : String(error) },
+      });
+      fs.appendFileSync(logPath, `${entry}\n`);
+    } catch {
+      // Logging failed — nothing more we can do.
+    }
+  }
+}
 
 function makeTrackingPlugin() {
   const LOG_FILE =
@@ -54,23 +175,63 @@ function makeTrackingPlugin() {
       // wrapScriptExecution signature:
       //   (executor, project, locator, scriptName, extra) => Promise<() => Promise<number>>
       // The outer async resolves before the script runs; the inner async IS the script run.
-      wrapScriptExecution: (executor, _project, _locator, scriptName) =>
+      wrapScriptExecution: (executor, project, _locator, scriptName) =>
         Promise.resolve(async () => {
-          appendEvent(scriptName, 'start');
+          const shouldLog = isRootProcess && !LIFECYCLE_SCRIPT_NAMES.has(scriptName);
+
+          if (shouldLog) {
+            appendEvent(scriptName, 'start');
+          }
+
+          // For a single directly-spawned command, an interrupted script
+          // reliably resolves to a signal-based exit code (see
+          // INTERRUPTED_EXIT_CODES). For a chained script (`cmd1 && cmd2`) or
+          // one shelling out to a nested `yarn <script>`, the interrupted
+          // sub-step's own signal-death can race with — and resolve before —
+          // Yarn's own interrupt handling, so the whole script can end up
+          // resolving with an ordinary-looking failure code (e.g. 1) that's
+          // indistinguishable from a genuine failure by exit code alone.
+          // Observing the signal directly closes that gap. This listener is
+          // additive: Node only auto-terminates a process on these signals
+          // when it has zero listeners, and Yarn's own process-level signal
+          // handling already exists (see INTERRUPTED_EXIT_CODES's 129
+          // observed for single-command scripts) — this listener never calls
+          // process.exit() itself, so it doesn't change that behavior.
+          let receivedInterruptSignal = false;
+          const onInterruptSignal = () => {
+            receivedInterruptSignal = true;
+          };
+          const interruptSignals = ['SIGINT', 'SIGHUP', 'SIGTERM'];
+          if (shouldLog) {
+            for (const signal of interruptSignals) {
+              process.on(signal, onInterruptSignal);
+            }
+          }
 
           const start = Date.now();
           let exitCode;
           try {
             exitCode = await executor();
           } finally {
-            // exitCode 129 = SIGHUP (Yarn terminates the child via SIGHUP when
-            // the user presses Ctrl+C). Record as 'interrupted' so the report can
-            // distinguish abandoned sessions from genuine failures (success=0).
-            const eventType = exitCode === 129 ? 'interrupted' : 'end';
-            appendEvent(scriptName, eventType, {
-              success: exitCode === 129 ? undefined : exitCode === 0,
-              duration_ms: Date.now() - start,
-            });
+            if (shouldLog) {
+              for (const signal of interruptSignals) {
+                process.off(signal, onInterruptSignal);
+              }
+
+              // Record as 'interrupted' so the report can distinguish
+              // abandoned sessions from genuine failures (success=0).
+              const interrupted =
+                receivedInterruptSignal || INTERRUPTED_EXIT_CODES.has(exitCode);
+              const eventType = interrupted ? 'interrupted' : 'end';
+              appendEvent(scriptName, eventType, {
+                success: interrupted ? undefined : exitCode === 0,
+                duration_ms: Date.now() - start,
+              });
+              // Yarn's own project root, not process.cwd(): a script invoked
+              // from a subdirectory must still resolve the anonymizer binary
+              // from the project-root node_modules where it is installed.
+              maybeTriggerAnonymizer(project?.cwd ?? process.cwd());
+            }
           }
 
           return exitCode;
diff --git a/.yarn/plugins/plugin-usage-tracking.test.ts b/.yarn/plugins/plugin-usage-tracking.test.ts
index a694358d03fb..de2e505923db 100644
--- a/.yarn/plugins/plugin-usage-tracking.test.ts
+++ b/.yarn/plugins/plugin-usage-tracking.test.ts
@@ -1,4 +1,14 @@
-import { existsSync, mkdtempSync, readFileSync, rmSync } from 'fs';
+import {
+  existsSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  writeFileSync,
+  mkdirSync,
+} from 'fs';
+import { spawn } from 'child_process';
+import { homedir, tmpdir } from 'os';
+import { join } from 'path';
 
 /** Return only the data rows from the log file (skip the CSV header). */
 function dataLines(file: string): string[] {
@@ -7,15 +17,8 @@ function dataLines(file: string): string[] {
     .split('\n')
     .filter((l) => !l.startsWith('tool_name,'));
 }
-import { tmpdir } from 'os';
-import { join } from 'path';
-
-// Disable tracking globally at module load time so no accidental writes can
-// reach the real log file before beforeEach sets up the temp path.
-process.env.CI = 'jest';
-delete process.env.TOOL_USAGE_COLLECTION_LOG_PATH;
 
-const plugin = require('../plugins/plugin-usage-tracking.cjs') as {
+type Plugin = {
   name: string;
   factory: () => {
     hooks?: {
@@ -29,11 +32,25 @@ const plugin = require('../plugins/plugin-usage-tracking.cjs') as {
   };
 };
 
+/**
+ * Loads a fresh instance of the plugin module, re-executing its top-level
+ * code against the current process.env. This mirrors how a real
+ * `yarn <script>` invocation is a brand new OS process: the module's
+ * root/marker detection runs exactly once per process, at module-evaluation
+ * time, not on every `factory()` call (Yarn calls `factory()` more than once
+ * within a single process while resolving configuration).
+ */
+function loadPlugin(): Plugin {
+  jest.resetModules();
+  return require('../plugins/plugin-usage-tracking.cjs');
+}
+
 describe('plugin-usage-tracking', () => {
   let logDir: string;
   let logFile: string;
   let savedCI: string | undefined;
   let savedOptIn: string | undefined;
+  let savedParentMarker: string | undefined;
 
   beforeEach(() => {
     logDir = mkdtempSync(join(tmpdir(), 'plugin-test-'));
@@ -41,9 +58,11 @@ describe('plugin-usage-tracking', () => {
 
     savedCI = process.env.CI;
     savedOptIn = process.env.TOOL_USAGE_COLLECTION_OPT_IN;
+    savedParentMarker = process.env.MM_TOOL_USAGE_PARENT;
 
     delete process.env.CI;
     delete process.env.TOOL_USAGE_COLLECTION_OPT_IN;
+    delete process.env.MM_TOOL_USAGE_PARENT;
     process.env.TOOL_USAGE_COLLECTION_LOG_PATH = logFile;
   });
 
@@ -57,22 +76,26 @@ describe('plugin-usage-tracking', () => {
       delete process.env.TOOL_USAGE_COLLECTION_OPT_IN;
     else process.env.TOOL_USAGE_COLLECTION_OPT_IN = savedOptIn;
 
+    if (savedParentMarker === undefined)
+      delete process.env.MM_TOOL_USAGE_PARENT;
+    else process.env.MM_TOOL_USAGE_PARENT = savedParentMarker;
+
     delete process.env.TOOL_USAGE_COLLECTION_LOG_PATH;
   });
 
   describe('CI / opt-out guard', () => {
     it('registers no hooks when CI is set', () => {
       process.env.CI = '1';
-      expect(plugin.factory()).toEqual({});
+      expect(loadPlugin().factory()).toEqual({});
     });
 
     it('registers no hooks when TOOL_USAGE_COLLECTION_OPT_IN is false', () => {
       process.env.TOOL_USAGE_COLLECTION_OPT_IN = 'false';
-      expect(plugin.factory()).toEqual({});
+      expect(loadPlugin().factory()).toEqual({});
     });
 
     it('registers hooks when neither CI nor opt-out is set', () => {
-      const result = plugin.factory();
+      const result = loadPlugin().factory();
       expect(result.hooks).toBeDefined();
       expect(typeof result.hooks?.wrapScriptExecution).toBe('function');
     });
@@ -82,6 +105,7 @@ describe('plugin-usage-tracking', () => {
     async function runScript(
       scriptName: string,
       exitCode: number,
+      plugin: Plugin = loadPlugin(),
     ): Promise<void> {
       const { hooks } = plugin.factory();
       const executor = jest.fn().mockResolvedValue(exitCode);
@@ -122,8 +146,19 @@ describe('plugin-usage-tracking', () => {
       expect(endLine).toMatch(/^yarn:lint,yarn_script,end,,,false,\d+,.+Z$/);
     });
 
-    it('appends an interrupted row for exit code 129 (SIGHUP)', async () => {
-      await runScript('build', 129);
+    // Which signal a script's process actually dies from when interrupted
+    // (e.g. via Ctrl+C) depends on how it was invoked — a single
+    // directly-spawned command may see SIGHUP (129), while a chained script
+    // or one shelling out to a nested `yarn <script>` may see SIGINT (130)
+    // or another terminating signal instead. All must map to 'interrupted'.
+    it.each([
+      [129, 'SIGHUP'],
+      [130, 'SIGINT'],
+      [131, 'SIGQUIT'],
+      [137, 'SIGKILL'],
+      [143, 'SIGTERM'],
+    ])('appends an interrupted row for exit code %i (%s)', async (exitCode) => {
+      await runScript('build', exitCode);
 
       const lines = dataLines(logFile);
       expect(lines).toHaveLength(2);
@@ -135,8 +170,58 @@ describe('plugin-usage-tracking', () => {
       );
     });
 
+    // A chained script (`cmd1 && cmd2`) or one shelling out to a nested
+    // `yarn <script>` can resolve with an ordinary-looking exit code (e.g. 1)
+    // even when the process was genuinely interrupted, because the
+    // interrupted sub-step's own signal-death can race with, and resolve
+    // before, Yarn's own interrupt handling. Observing the signal directly
+    // must classify this as 'interrupted' regardless of the resolved code.
+    it.each(['SIGINT', 'SIGHUP', 'SIGTERM'])(
+      'appends an interrupted row when %s is received during the script, even if the executor resolves with a non-signal exit code',
+      async (signal) => {
+        const plugin = loadPlugin();
+        const { hooks } = plugin.factory();
+        const executor = jest.fn().mockImplementation(async () => {
+          process.emit(signal);
+          return 1; // ordinary failure code, not a signal-based one
+        });
+        const wrappedFactory = await hooks!.wrapScriptExecution(
+          executor,
+          null,
+          null,
+          'clean',
+        );
+        await wrappedFactory();
+
+        const lines = dataLines(logFile);
+        expect(lines).toHaveLength(2);
+        expect(lines[1]).toMatch(
+          /^yarn:clean,yarn_script,interrupted,,,,\d+,.+Z$/,
+        );
+      },
+    );
+
+    it('does not leak its interrupt-signal listeners after the script finishes', async () => {
+      const before = {
+        SIGINT: process.listenerCount('SIGINT'),
+        SIGHUP: process.listenerCount('SIGHUP'),
+        SIGTERM: process.listenerCount('SIGTERM'),
+      };
+
+      await runScript('test:unit', 0);
+
+      expect(process.listenerCount('SIGINT')).toBe(before.SIGINT);
+      expect(process.listenerCount('SIGHUP')).toBe(before.SIGHUP);
+      expect(process.listenerCount('SIGTERM')).toBe(before.SIGTERM);
+    });
+
     it('accumulates rows across multiple script runs', async () => {
+      // Each `yarn <script>` a user types is its own OS process with a fresh
+      // (unmarked) env — simulate that by loading a brand new plugin
+      // instance and clearing the marker the first run set, since real
+      // processes never share process.env with one another.
       await runScript('test:unit', 0);
+      delete process.env.MM_TOOL_USAGE_PARENT;
       await runScript('lint', 0);
 
       const lines = dataLines(logFile);
@@ -148,8 +233,201 @@ describe('plugin-usage-tracking', () => {
 
     it('does not write to the log when CI is set', async () => {
       process.env.CI = '1';
-      plugin.factory(); // returns {} when CI is set — no filesystem access
+      loadPlugin().factory(); // returns {} when CI is set — no filesystem access
       expect(existsSync(logFile)).toBe(false);
     });
+
+    it('logs a root script run (no parent marker set)', async () => {
+      await runScript('test:unit', 0);
+
+      const lines = dataLines(logFile);
+      expect(lines).toHaveLength(2);
+      expect(lines[0]).toMatch(/^yarn:test:unit,yarn_script,start,/);
+    });
+
+    it('does not log a dependent script run (parent marker already set)', async () => {
+      process.env.MM_TOOL_USAGE_PARENT = '1';
+      await runScript('test:unit', 0);
+
+      expect(existsSync(logFile)).toBe(false);
+    });
+
+    // preinstall/install/postinstall are run automatically by `yarn install`
+    // through the same wrapScriptExecution hook, even for a genuinely root
+    // process — the user never types `yarn postinstall` themselves.
+    it.each(['preinstall', 'install', 'postinstall'])(
+      'does not log the %s lifecycle script even for a root process',
+      async (scriptName) => {
+        await runScript(scriptName, 0);
+
+        expect(existsSync(logFile)).toBe(false);
+      },
+    );
+
+    // Yarn computes the env object it hands to a script's spawned child
+    // process (and therefore to any nested `yarn` process it shells out to)
+    // BEFORE invoking wrapScriptExecution — mutating process.env from inside
+    // the hook would be too late. The marker must already be present on
+    // process.env as soon as the module's top-level code runs.
+    it('sets the parent marker on process.env as soon as the module loads, before any script executes', () => {
+      expect(process.env.MM_TOOL_USAGE_PARENT).toBeUndefined();
+
+      loadPlugin();
+
+      expect(process.env.MM_TOOL_USAGE_PARENT).toBe('1');
+    });
+
+    it('leaves the parent marker set once a root script has finished running (no restore)', async () => {
+      expect(process.env.MM_TOOL_USAGE_PARENT).toBeUndefined();
+      await runScript('test:unit', 0);
+      expect(process.env.MM_TOOL_USAGE_PARENT).toBe('1');
+    });
+
+    it('leaves an already-set parent marker untouched once a dependent script has finished running', async () => {
+      process.env.MM_TOOL_USAGE_PARENT = '1';
+      await runScript('test:unit', 0);
+      expect(process.env.MM_TOOL_USAGE_PARENT).toBe('1');
+    });
+
+    // Regression test: Yarn calls the exported factory() more than once
+    // within a single process while resolving configuration/running a
+    // script. Root/marker detection must happen once at module-evaluation
+    // time so a later factory() call in the same process doesn't see the
+    // marker the first factory() call already set and misreport itself as
+    // a dependent (nested) run.
+    it('treats every factory() call within the same process as root when the process itself is root', async () => {
+      const plugin = loadPlugin();
+
+      plugin.factory(); // simulates Yarn's first, earlier factory() call
+      const { hooks } = plugin.factory(); // the instance Yarn actually uses
+
+      const executor = jest.fn().mockResolvedValue(0);
+      const wrappedFactory = await hooks!.wrapScriptExecution(
+        executor,
+        null,
+        null,
+        'clean:ios',
+      );
+      await wrappedFactory();
+
+      const lines = dataLines(logFile);
+      expect(lines).toHaveLength(2);
+      expect(lines[0]).toMatch(/^yarn:clean:ios,yarn_script,start,/);
+    });
+  });
+
+  describe('maybeTriggerAnonymizer guard', () => {
+    let homeDir: string;
+    let spawnSpy: jest.SpiedFunction<typeof spawn>;
+    let homedirSpy: jest.SpiedFunction<typeof homedir>;
+
+    beforeEach(() => {
+      spawnSpy = jest
+        .spyOn(require('child_process'), 'spawn')
+        .mockImplementation(
+          () => ({ unref: jest.fn() }) as ReturnType<typeof spawn>,
+        );
+      homeDir = mkdtempSync(join(tmpdir(), 'plugin-trigger-home-'));
+      // os.homedir() resolves against the real OS environment, which Jest's
+      // per-test copy of process.env cannot influence — without this spy the
+      // guard would read the developer's own state file.
+      homedirSpy = jest
+        .spyOn(require('os'), 'homedir')
+        .mockReturnValue(homeDir);
+      delete process.env.CI;
+      mkdirSync(join(homeDir, '.tool-usage-collection'), { recursive: true });
+    });
+
+    afterEach(() => {
+      spawnSpy.mockRestore();
+      homedirSpy.mockRestore();
+      rmSync(homeDir, { recursive: true, force: true });
+    });
+
+    async function runScript(
+      scriptName: string,
+      project: unknown = null,
+    ): Promise<void> {
+      const { hooks } = loadPlugin().factory();
+      const executor = jest.fn().mockResolvedValue(0);
+      const wrappedFactory = await hooks!.wrapScriptExecution(
+        executor,
+        project,
+        null,
+        scriptName,
+      );
+      await wrappedFactory();
+    }
+
+    it('does not spawn when last_run_at is within 24h', async () => {
+      writeFileSync(
+        join(homeDir, '.tool-usage-collection', 'anonymizer-state.json'),
+        JSON.stringify({
+          version: 1,
+          instance_uuid: 'uuid',
+          last_run_at: new Date().toISOString(),
+          last_pushed_day: null,
+        }),
+      );
+      await runScript('test:unit');
+      expect(spawnSpy).not.toHaveBeenCalled();
+    });
+
+    it('does not spawn when CI is set', () => {
+      process.env.CI = '1';
+      expect(loadPlugin().factory()).toEqual({});
+      expect(spawnSpy).not.toHaveBeenCalled();
+    });
+
+    it('does not spawn for a dependent script run (parent marker already set)', async () => {
+      process.env.MM_TOOL_USAGE_PARENT = '1';
+      await runScript('test:unit');
+      expect(spawnSpy).not.toHaveBeenCalled();
+    });
+
+    it('does not spawn for a root postinstall lifecycle script', async () => {
+      await runScript('postinstall');
+      expect(spawnSpy).not.toHaveBeenCalled();
+    });
+
+    // A `yarn <script>` typed in a subdirectory has a process.cwd() below the
+    // project root, but the binary only exists in the project-root
+    // node_modules — so the path must come from Yarn's project.cwd.
+    it('spawns the binary resolved from the Yarn project root rather than process.cwd()', async () => {
+      const projectRoot = mkdtempSync(join(tmpdir(), 'plugin-project-'));
+      const binPath = join(
+        projectRoot,
+        'node_modules',
+        '@metamask',
+        'tooling-insight',
+        'dist',
+        'daily-anonymizer.mjs',
+      );
+      mkdirSync(join(binPath, '..'), { recursive: true });
+      writeFileSync(binPath, '');
+
+      try {
+        await runScript('test:unit', { cwd: projectRoot });
+
+        expect(spawnSpy).toHaveBeenCalledWith(process.execPath, [binPath], {
+          detached: true,
+          stdio: 'ignore',
+        });
+      } finally {
+        rmSync(projectRoot, { recursive: true, force: true });
+      }
+    });
+
+    it('does not spawn when the binary is missing from the Yarn project root', async () => {
+      const projectRoot = mkdtempSync(join(tmpdir(), 'plugin-project-empty-'));
+
+      try {
+        await runScript('test:unit', { cwd: projectRoot });
+
+        expect(spawnSpy).not.toHaveBeenCalled();
+      } finally {
+        rmSync(projectRoot, { recursive: true, force: true });
+      }
+    });
   });
 });
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25e35a40a840..4d466a09731a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,118 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [8.7.0]
+
+### Added
+
+- Added a Lite/Pro mode selection sheet for Perps and routed Trade entry and header toggles through it (#34395)
+- Added an experiment for the Swap confirmation button color (#34306)
+- Added a market filter toggle to the Perps Pro Orders tab so users can view orders for a single market (#34351)
+- Added support for Somnia (#34146)
+- Added region-specific Immersve legal documents to Card SignUp and Card Home (#34220)
+- Added a search icon to the wallet home header so search can be opened directly, and changed the Explore tab icon to a trend arrow (#34296)
+- Added in-place price and size editing for open Perps Pro limit orders (#34342)
+- Added a DeFi section powered by a new API behind a feature flag (#33488)
+- Added the ability to switch the displayed market by tapping a position or order in the Perps Pro Positions and Orders tabs (#34181)
+- Added a parallax tilt animation to MetaMask Card images on the Money tab that responds to device motion (#33808)
+- Added a homepage portfolio balance breakdown experiment (#33981)
+- Added position and order actions, sorting, and side filtering to the Perps Pro market view positions panel (#34112)
+- Added an About section on Perps market details so users can read a short description of the underlying asset (#33999)
+- Added an account balance bottom sheet to the Perps Pro market screen and updated its header, order form, and order book and chart animations (#34081)
+- Added curated Predict game pages for more soccer, baseball, hockey, and football leagues (#33943)
+- Added watchlist synchronization with Price Alerts when tokens are added or removed (#34343)
+- Added support for Perps and Predict withdrawals to Money Account and maximum-amount Money Account deposits through the post-Relay sponsored deposit flow (#33489)
+- Added Monad to the Explore and Trending supported network list so Monad assets appear in token search results (#33614)
+
+### Changed
+
+- Updated the money deposit call to action to fit longer APY copy (#34380)
+- Updated notification settings section titles and descriptions (#34491)
+- Updated the Monthly and Lifetime earnings tooltip sheets to remove the close button, add spacing above the home indicator, and use gray description text (#34336)
+- Improved the Perps market picker so it slides up from the market detail header (#34282)
+- Updated Agent CLI pairing copy (#34174)
+- Updated the Perps leverage selector to use the design-system slider layout with clearer liquidation messaging (#34094)
+- Updated Android push screen transitions to use an iOS-style slide-from-right animation (#34234)
+- Updated the Perps Add/Remove Margin screen to use the design system slider, validation help text, and summary rows (#34093)
+- Improved Money Account deposit quote loading responsiveness (#33512)
+- Improved Predict sports feed filters to match the active sport tab (#33714)
+- Improved Perps Pro order form layout alignment and added available balance under size (#34115)
+- Updated Quick Buy to always use the numeric keyboard for amount entry (#34073)
+- Updated Stellar asset components across asset details, rows, and buttons (#34048)
+- Updated the Money Account balance service (#34084)
+- Polished the Perps Pro market interface, including the margin mode sheet, position panel filters, stats bar colors, column divider, and order form size input behavior (#34398)
+- Renamed the Perps activity filters to “Orders” and “Funding payments” for consistency with the Perps market page (#34311)
+- Recorded token identifiers when tokens are added to the watchlist (#34262)
+- Updated notification handling so tapping a foreground notification opens its deep link (#33662)
+- Moved the Perps market About section below Stats on the market details screen (#34252)
+- Migrated Secret Recovery Phrase wallet import to TypeScript (#33812)
+- Improved state initialization and handler stability (#34105)
+- Integrated updated Money utilities (#33849)
+- Connected the Perps Pro order form to order-submission state and hooks (#33950)
+- Hid the Money card on the wallet home screen while the onboarding checklist is shown, giving new users a single next step (#34029)
+
+### Removed
+
+- Removed temporary Immersve card program selector from Card sign-up (#34141)
+- Removed the expired dedicated World Cup Predict feed and promotional entry points (#33625)
+
+### Fixed
+
+- Fixed Perps Pro Reduce Only validation so invalid orders show clear warnings before submission, and improved validation banner layout (#34485)
+- Fixed wallet activity push notifications so they are only hidden in the foreground and still appear when the app is backgrounded or closed (#34465)
+- Fixed truncated market names in Perps market lists and headers, and improved Pro order summary fee layout (#34489)
+- Fixed the Network row in Activity details for Perps and Predict funding: deposits no longer show a network, and other funding activity now names the payment’s actual network (#34313)
+- Fixed the Activity details screen showing a misleading “Swap again” button on stablecoin lending deposits and withdrawals. Deposits now offer “Lend again,” which reopens the earn flow with the deposited token (#34310)
+- Fixed cross-chain bridge Activity details showing two identical block explorer buttons instead of one that opens the network picker (#34373)
+- Fixed the Predict betslip defaulting to the Predict balance on reopen when its balance is below $1 instead of selecting the highest-balance token (#34371)
+- Fixed a bug where turning off wallet activity notifications for all accounts and then re-enabling a single account turned notifications back on for every account (#34247)
+- Fixed bottom sheet rendering for FlashList content (#34407)
+- Fixed Quick Buy quick-amount buttons showing truncated amounts, such as “$10” instead of “$10K,” on devices with a large system font size (#34393)
+- Fixed Perps Pro order book prices collapsing into identical values for low-priced assets, and abbreviated large size values so they no longer crowd the spread (#34330)
+- Fixed the “no pay token quotes” error appearing on deposit confirmations before an amount was entered (#34388)
+- Fixed a Money Account being linkable to two MetaMask Cards on separate devices by blocking a second link when the account is already delegated on-chain to another card (#34294)
+- Fixed Money Account header spacing to align with the Home page header when switching between the two screens (#34344)
+- Fixed several input and layout issues in the Perps Pro order form (#34227)
+- Fixed Perps navigation so returning from another screen keeps the selected mode, the market switcher moves forward, and Long or Short from a token screen opens the Pro order form in Pro mode (#34326)
+- Fixed Secret Recovery Phrase backspace so the cursor stays at the end of the previous word (#34383)
+- Fixed an uninformative error when signing V3 typed data with a Ledger device. The app now explains that Ledger supports only V4 typed data signatures (#31677)
+- Fixed redundant token selection when re-selecting the active payment token in the Pay With sheet (#34337)
+- Fixed an issue that incorrectly blocked Predict purchases paid directly with pUSD (#34350)
+- Fixed the gas sponsorship reserve-balance warning appearing incorrectly on MetaMask Pay confirmations (#34352)
+- Fixed a bug where the first dapp connection approval screen could show the wrong domain after a prior WalletConnect session from an external browser (#33308)
+- Fixed the last option in Feed and leaderboard filter menus being hidden behind the Android navigation bar (#34285)
+- Fixed the What’s Happening header shifting down after the screen opened (#34260)
+- Fixed Perps markets incorrectly showing that an asset was not tradable while the connection was loading (#34256)
+- Fixed swaps and bridges missing or rendering incorrectly on token detail pages (#34224)
+- Fixed incorrect copy in Perps Pro for size label, order type pills, and positions side filter (#34267)
+- Fixed the header shifting down after the Top Traders, Trader Profile, and Trader Position screens opened (#34278)
+- Fixed the Money card animation so the card tilts on both axes as the device moves, instead of only swivelling sideways (#34259)
+- Fixed token search results requiring a second tap when the keyboard was open (#34212)
+- Fixed the Pay with and Account rows becoming unresponsive while Money Account deposit quotes loaded (#34244)
+- Fixed Perps withdrawals for accounts delegated to non-MetaMask EIP-7702 contracts (#34250)
+- Fixed the “Contact support” option in the Money menu not opening support (#34248)
+- Fixed Pro mode order book behavior so tapping a bid or ask switches the order form to a Limit order and pre-fills the selected price (#34202)
+- Fixed the Add Device back button sitting under the iOS status bar (#34185)
+- Fixed configuration validation so missing required secrets fail immediately (#34222)
+- Fixed address-poisoning detection so lookalikes of the transfer recipient are flagged and lookalikes of the token contract address are not (#34158)
+- Fixed hardware wallet bridge swaps not opening the post-trade modal after completion (#33865)
+- Fixed Perps Add funds Activity details to show transaction, bridge, and total fees, and open the redesigned details screen from the funding notification (#34085)
+- Fixed duplicate Predict order submissions when confirming an order more than once (#33079)
+- Fixed MetaMask Card making unnecessary home-data requests on unlock and showing a false pending-verification warning while card data loaded (#34021)
+- Fixed the wallet home onboarding checklist asking about notifications again after the user had already responded to the notification permission request (#34086)
+- Fixed the Card dashboard showing a redundant Change asset action for linked Money Accounts (#34187)
+- Fixed Stellar spendable amounts when privacy mode is enabled (#34171)
+- Fixed MetaMask Mobile cancellation during QR CLI login so the terminal stops waiting immediately (#33964)
+- Fixed clipped APY text in the Money Home balance header (#34167)
+- Fixed in-app browser navigation opening associated native apps instead of staying in MetaMask (#33879)
+- Fixed Blockaid false-positive reports to include the actual network name (#34078)
+- Fixed browser back navigation from Market Insights news returning to Explore instead of Market Insights (#34134)
+- Fixed missing token logos in the network fee token dropdown when paying with a token such as mUSD (#34040)
+- Fixed Predict Add funds Activity details to show network, bridge, and total fees, and open the redesigned details screen from the funding notification (#34026)
+- Fixed Swap so the native ARC token is not preselected (#32212)
+- Fixed MetaMask Pay confirmation buttons remaining disabled until the required payment amount is ready and quotes can load (#33983)
+- Fixed the reduced native-token amount shown after selecting Send Max (#34150)
+
 ## [8.6.0]
 
 ### Added
@@ -216,6 +328,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed `useTokenFiatRates` returning an incorrect fiat amount (using conversion rate × 1) when a token price is unavailable — now returns `undefined` instead (#33461)
 - Fixed `useActivityBlockExplorer` returning an incorrect URL for non-EVM networks (#33396)
 
+## [8.4.2]
+
+### Fixed
+
+- Fixed Arc incorrectly appearing as an added/enabled network for some users after an earlier migration added it by default before release (#34445)
+
+## [8.4.1]
+
+### Fixed
+
+- Perps: orders funded with a custom pay token no longer fail when placing the order — placement is now blocked until the pay amount reaches the controller (#33822)
+- WalletConnect: dapp connections are more reliable, with the relay now routed through the built-in WebSocket (#33871)
+
 ## [8.4.0]
 
 ### Added
@@ -13167,9 +13292,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#957](https://github.com/MetaMask/metamask-mobile/pull/957): fix timeouts (#957)
 - [#954](https://github.com/MetaMask/metamask-mobile/pull/954): Bugfix: onboarding navigation (#954)
 
-[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v8.6.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v8.7.0...HEAD
+[8.7.0]: https://github.com/MetaMask/metamask-mobile/compare/v8.6.0...v8.7.0
 [8.6.0]: https://github.com/MetaMask/metamask-mobile/compare/v8.5.0...v8.6.0
-[8.5.0]: https://github.com/MetaMask/metamask-mobile/compare/v8.4.0...v8.5.0
+[8.5.0]: https://github.com/MetaMask/metamask-mobile/compare/v8.4.2...v8.5.0
+[8.4.2]: https://github.com/MetaMask/metamask-mobile/compare/v8.4.1...v8.4.2
+[8.4.1]: https://github.com/MetaMask/metamask-mobile/compare/v8.4.0...v8.4.1
 [8.4.0]: https://github.com/MetaMask/metamask-mobile/compare/v8.3.0...v8.4.0
 [8.3.0]: https://github.com/MetaMask/metamask-mobile/compare/v8.2.1...v8.3.0
 [8.2.1]: https://github.com/MetaMask/metamask-mobile/compare/v8.2.0...v8.2.1
diff --git a/README.md b/README.md
index c9f865517db1..e6c5485f75c7 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ yarn watch
 
 #### Download and install the development build
 
-Expo development builds are produced by the [`Expo Dev Build`](https://github.com/MetaMask/metamask-mobile/actions/workflows/expo-dev-build.yml) GitHub Actions workflow on every push to `main`. Artifacts are stored as GitHub Actions artifacts (not Runway buckets).
+Expo development builds are produced by the [`Expo Dev Build`](https://github.com/MetaMask/metamask-mobile/actions/workflows/expo-dev-build.yml) GitHub Actions workflow. It runs on every push to `main`, but only actually compiles iOS/Android when the `@expo/fingerprint` hash of native code changed since the last build (plus a weekly Monday refresh so artifacts never go stale) — most pushes just reuse the existing build. This means the resolved run may be older than `main` HEAD; that's expected. Artifacts are stored as GitHub Actions artifacts (not Runway buckets).
 
 **Prerequisites:** [GitHub CLI](https://cli.github.com/) (`gh`) authenticated with access to this repository (`gh auth login`).
 
@@ -113,6 +113,8 @@ Artifacts land under `build/` (`MetaMask.app` on iOS, `metamask-dev.apk` on Andr
 
 **Manual download from GitHub Actions:**
 
+Note: since most runs skip the actual build (fingerprint unchanged), the most recent successful run may not have build artifacts attached — open the run and check for a `build-dev` job (skipped runs only have `resolve-dev-build`).
+
 ```bash
 # List recent successful Expo Dev Build runs on main
 gh run list --repo MetaMask/metamask-mobile --workflow expo-dev-build.yml --branch main --status success --limit 5
diff --git a/android/app/build.gradle b/android/app/build.gradle
index a42f7afbe924..96893e355aca 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -201,8 +201,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionName "8.6.0"
-        versionCode 6401
+        versionName "8.7.0"
+        versionCode 6442
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         missingDimensionStrategy 'detox', 'full'
diff --git a/android/app/src/main/java/io/metamask/nativeModules/NotificationModule.kt b/android/app/src/main/java/io/metamask/nativeModules/NotificationModule.kt
index 8d947a89715d..ee70960e87c5 100644
--- a/android/app/src/main/java/io/metamask/nativeModules/NotificationModule.kt
+++ b/android/app/src/main/java/io/metamask/nativeModules/NotificationModule.kt
@@ -2,16 +2,20 @@ package io.metamask.nativeModules
 
 import android.content.Intent
 import android.os.Bundle
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.WritableNativeMap
+import java.lang.ref.WeakReference
 
 class NotificationModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(context) {
 
   companion object {
+    private const val NOTIFICATION_OPENED_EVENT = "metamask.notification_opened"
     private var savedNotificationData: Bundle? = null
+    private var moduleReference: WeakReference<NotificationModule>? = null
 
     private val FCM_KEYS = setOf(
       "google.message_id", "google.sent_time", "google.ttl",
@@ -26,6 +30,11 @@ class NotificationModule(context: ReactApplicationContext) : ReactContextBaseJav
       "gcm.notification.click_action"
     )
 
+    internal fun shouldEmitNotificationOpened(extras: Bundle): Boolean =
+      extras.containsKey("google.message_id") ||
+        extras.containsKey("message_id") ||
+        extras.getBundle("notification")?.getBundle("data") != null
+
     fun saveNotificationIntent(intent: Intent?) {
       intent?.extras?.let { extras ->
         val hasFCMData = extras.keySet().any { key ->
@@ -37,11 +46,18 @@ class NotificationModule(context: ReactApplicationContext) : ReactContextBaseJav
 
         if (hasFCMData) {
           savedNotificationData = Bundle(extras)
+          if (shouldEmitNotificationOpened(extras)) {
+            moduleReference?.get()?.emitNotificationOpened(extras)
+          }
         }
       }
     }
   }
 
+  init {
+    moduleReference = WeakReference(this)
+  }
+
   override fun getName(): String = "NotificationModule"
 
   @ReactMethod
@@ -58,11 +74,25 @@ class NotificationModule(context: ReactApplicationContext) : ReactContextBaseJav
     }
   }
 
+  private fun emitNotificationOpened(data: Bundle) {
+    if (reactApplicationContext.hasActiveReactInstance()) {
+      reactApplicationContext.emitDeviceEvent(
+        NOTIFICATION_OPENED_EVENT,
+        createRemoteMessageStructure(data),
+      )
+    }
+  }
+
   private fun createRemoteMessageStructure(data: Bundle): WritableNativeMap {
     val result = WritableNativeMap()
     val dataMap = WritableNativeMap()
     val notificationMap = WritableNativeMap()
 
+    data.getBundle("notification")?.getBundle("data")?.let {
+      result.putMap("data", Arguments.fromBundle(it))
+      return result
+    }
+
     data.keySet()
       .filterNot { it == "profile" || it.contains("UserHandle") }
       .forEach { key ->
diff --git a/app/actions/onboarding/index.test.ts b/app/actions/onboarding/index.test.ts
index a910c7071376..fa2f17a22c4c 100644
--- a/app/actions/onboarding/index.test.ts
+++ b/app/actions/onboarding/index.test.ts
@@ -19,6 +19,8 @@ import {
   SET_WALLET_HOME_ONBOARDING_STEPS_STEP,
   suppressWalletHomeOnboardingSteps,
   SUPPRESS_WALLET_HOME_ONBOARDING_STEPS,
+  markPushNotificationOsPromptRequested,
+  MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED,
 } from '.';
 import { ITrackingEvent } from '../../core/Analytics/MetaMetrics.types';
 import { AccountType } from '../../constants/onboarding';
@@ -161,4 +163,12 @@ describe('Onboarding actions', () => {
       });
     });
   });
+
+  describe('markPushNotificationOsPromptRequested', () => {
+    it('creates the OS push prompt requested action', () => {
+      expect(markPushNotificationOsPromptRequested()).toEqual({
+        type: MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED,
+      });
+    });
+  });
 });
diff --git a/app/actions/onboarding/index.ts b/app/actions/onboarding/index.ts
index d15d1fc42f1b..936f110096d9 100644
--- a/app/actions/onboarding/index.ts
+++ b/app/actions/onboarding/index.ts
@@ -23,6 +23,8 @@ export const SET_WALLET_HOME_ONBOARDING_STEPS_STEP =
   'SET_WALLET_HOME_ONBOARDING_STEPS_STEP';
 export const SUPPRESS_WALLET_HOME_ONBOARDING_STEPS =
   'SUPPRESS_WALLET_HOME_ONBOARDING_STEPS';
+export const MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED =
+  'MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED';
 
 interface SaveEventAction {
   type: typeof SAVE_EVENT;
@@ -96,6 +98,10 @@ export interface SuppressWalletHomeOnboardingStepsAction {
   reason: WalletHomeOnboardingStepsSuppressedReason;
 }
 
+export interface MarkPushNotificationOsPromptRequestedAction {
+  type: typeof MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED;
+}
+
 export type OnboardingActionTypes =
   | SaveEventAction
   | ClearEventsAction
@@ -110,7 +116,8 @@ export type OnboardingActionTypes =
   | SetWalletHomeOnboardingStepsEligibleAction
   | ResetWalletHomeOnboardingStepsAction
   | SetWalletHomeOnboardingStepsStepAction
-  | SuppressWalletHomeOnboardingStepsAction;
+  | SuppressWalletHomeOnboardingStepsAction
+  | MarkPushNotificationOsPromptRequestedAction;
 
 export function saveOnboardingEvent(
   eventArgs: [ITrackingEvent],
@@ -235,3 +242,9 @@ export function suppressWalletHomeOnboardingSteps(
     reason,
   };
 }
+
+export function markPushNotificationOsPromptRequested(): MarkPushNotificationOsPromptRequestedAction {
+  return {
+    type: MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED,
+  };
+}
diff --git a/app/actions/sdk/state.ts b/app/actions/sdk/state.ts
index d527763969c5..440b469bbf97 100644
--- a/app/actions/sdk/state.ts
+++ b/app/actions/sdk/state.ts
@@ -23,6 +23,7 @@ export interface WC2VerifyContext {
 }
 
 export interface WC2Metadata {
+  /** WalletConnect pairing topic used as the permission-system origin. */
   id: string;
   url: string;
   name: string;
diff --git a/app/animations/card_tilt_v1.2.riv b/app/animations/card_tilt_v1.3.riv
similarity index 87%
rename from app/animations/card_tilt_v1.2.riv
rename to app/animations/card_tilt_v1.3.riv
index 73391fa63c28..206a9ddd26da 100644
Binary files a/app/animations/card_tilt_v1.2.riv and b/app/animations/card_tilt_v1.3.riv differ
diff --git a/app/animations/card_tilt_v1.4.riv b/app/animations/card_tilt_v1.4.riv
new file mode 100644
index 000000000000..de017c0a1485
Binary files /dev/null and b/app/animations/card_tilt_v1.4.riv differ
diff --git a/app/component-library/components-temp/BaseNotification/index.test.tsx b/app/component-library/components-temp/BaseNotification/index.test.tsx
index b476103037bf..6393dcbcfc66 100644
--- a/app/component-library/components-temp/BaseNotification/index.test.tsx
+++ b/app/component-library/components-temp/BaseNotification/index.test.tsx
@@ -142,6 +142,17 @@ describe('BaseNotification', () => {
     },
   );
 
+  it('does not fall back when an empty description is provided', () => {
+    const { queryByText } = renderWithProvider(
+      <BaseNotification
+        status="success"
+        data={{ title: 'Agent CLI successfully linked', description: '' }}
+      />,
+    );
+
+    expect(queryByText(getDescription('success', {}))).toBeNull();
+  });
+
   it('does not crash when data is undefined', () => {
     const { getByTestId } = renderWithProvider(
       <BaseNotification status="success" />,
diff --git a/app/component-library/components-temp/BaseNotification/index.tsx b/app/component-library/components-temp/BaseNotification/index.tsx
index 3ffb3be8a9fc..a377b5906f83 100644
--- a/app/component-library/components-temp/BaseNotification/index.tsx
+++ b/app/component-library/components-temp/BaseNotification/index.tsx
@@ -199,9 +199,7 @@ const BaseNotification: React.FC<BaseNotificationProps> = ({
   const dismissDurationMs = dismissDuration ?? NOTIFICATION_VISIBILITY_DURATION;
 
   const hasCloseIconButton = autoDismiss;
-  const resolvedDescription = !description
-    ? getDescription(status, safeData)
-    : description;
+  const resolvedDescription = description ?? getDescription(status, safeData);
   const hasDescription = resolvedDescription.length > 0;
   const shouldTopAlign =
     (titleLineCount !== null && titleLineCount > 1 && hasDescription) ||
diff --git a/app/component-library/components/Form/HelpText/HelpText.tsx b/app/component-library/components/Form/HelpText/HelpText.tsx
index 0bf305fc78dd..24f145950c04 100644
--- a/app/component-library/components/Form/HelpText/HelpText.tsx
+++ b/app/component-library/components/Form/HelpText/HelpText.tsx
@@ -15,6 +15,11 @@ import {
   TEXT_COLOR_BY_HELPTEXT_SEVERITY,
 } from './HelpText.constants';
 
+/**
+ * @deprecated This component is deprecated and will be removed in a future release.
+ * Please use the HelpText component from @metamask/design-system-react-native instead.
+ * @see {@link https://github.com/MetaMask/metamask-design-system/tree/main/packages/design-system-react-native/src/components/HelpText | Component Source}
+ */
 const HelpText: React.FC<HelpTextProps> = ({
   severity = DEFAULT_HELPTEXT_SEVERITY,
   ...props
diff --git a/app/component-library/components/Navigation/TabBar/TabBar.constants.ts b/app/component-library/components/Navigation/TabBar/TabBar.constants.ts
index 6faa1e92b11d..e6d99e1ab217 100644
--- a/app/component-library/components/Navigation/TabBar/TabBar.constants.ts
+++ b/app/component-library/components/Navigation/TabBar/TabBar.constants.ts
@@ -13,7 +13,7 @@ export const ICON_BY_TAB_BAR_ICON_KEY: IconByTabBarIconKey = {
   [TabBarIconKey.Activity]: IconName.Activity,
   [TabBarIconKey.Setting]: IconName.Setting,
   [TabBarIconKey.Rewards]: IconName.MetamaskFoxOutline,
-  [TabBarIconKey.Trending]: IconName.Search,
+  [TabBarIconKey.Trending]: IconName.TrendUp,
   [TabBarIconKey.Money]: IconName.Musd,
 };
 
diff --git a/app/component-library/components/Navigation/TabBar/TabBar.tsx b/app/component-library/components/Navigation/TabBar/TabBar.tsx
index c54555791d58..c0c6a3febc30 100644
--- a/app/component-library/components/Navigation/TabBar/TabBar.tsx
+++ b/app/component-library/components/Navigation/TabBar/TabBar.tsx
@@ -33,7 +33,6 @@ import { useMoneyNavigation } from '../../../../components/UI/Money/hooks/useMon
 const FILLED_ICONS: Partial<Record<TabBarIconKey, IconName>> = {
   [TabBarIconKey.Wallet]: IconName.HomeFilled,
   [TabBarIconKey.Activity]: IconName.ClockFilled,
-  [TabBarIconKey.Trending]: IconName.Search,
   [TabBarIconKey.Rewards]: IconName.MetamaskFoxFilled,
   [TabBarIconKey.Money]: IconName.MusdFilled,
 };
diff --git a/app/component-library/components/Navigation/TabBar/TabBar.types.ts b/app/component-library/components/Navigation/TabBar/TabBar.types.ts
index d9b441b78a26..bca930237c73 100644
--- a/app/component-library/components/Navigation/TabBar/TabBar.types.ts
+++ b/app/component-library/components/Navigation/TabBar/TabBar.types.ts
@@ -1,6 +1,8 @@
 // Third party dependencies.
-import { BottomTabBarProps } from '@react-navigation/bottom-tabs';
-import { BottomTabNavigationOptions } from '@react-navigation/bottom-tabs/lib/typescript/src/types';
+import {
+  BottomTabBarProps,
+  BottomTabNavigationOptions,
+} from '@react-navigation/bottom-tabs';
 import { TabNavigationState, ParamListBase } from '@react-navigation/native';
 
 // External dependencies.
diff --git a/app/components/Base/Keypad/normalizeNumericTextInput.test.ts b/app/components/Base/Keypad/normalizeNumericTextInput.test.ts
new file mode 100644
index 000000000000..62a97afeb348
--- /dev/null
+++ b/app/components/Base/Keypad/normalizeNumericTextInput.test.ts
@@ -0,0 +1,144 @@
+import {
+  finalizeNumericTextInput,
+  normalizeNumericTextInput,
+} from './normalizeNumericTextInput';
+
+describe('normalizeNumericTextInput', () => {
+  it.each([
+    ['012', '12'],
+    ['00.5', '0.5'],
+    ['.', '0.'],
+    ['12.', '12.'],
+    ['000', '0'],
+    ['0000000001', '1'],
+  ])('normalizes %s to %s', (text, expectedValue) => {
+    const previousValue = '7';
+
+    const result = normalizeNumericTextInput(text, previousValue);
+
+    expect(result).toEqual({ value: expectedValue, ok: true });
+  });
+
+  it('accepts an empty native input value', () => {
+    const previousValue = '1';
+
+    const result = normalizeNumericTextInput('', previousValue);
+
+    expect(result).toEqual({ value: '', ok: true });
+  });
+
+  it.each(['1.2.3', '1..2', '..1'])(
+    'rejects repeated decimal separators in %s',
+    (text) => {
+      const previousValue = '1.2';
+
+      const result = normalizeNumericTextInput(text, previousValue);
+
+      expect(result).toEqual({ value: previousValue, ok: false });
+    },
+  );
+
+  it('rejects repeated configured decimal separators', () => {
+    const previousValue = '1,2';
+
+    const result = normalizeNumericTextInput('1,2,3', previousValue, {
+      decimalSeparator: ',',
+    });
+
+    expect(result).toEqual({ value: previousValue, ok: false });
+  });
+
+  it('rejects text containing non-numeric characters', () => {
+    const previousValue = '12';
+
+    const result = normalizeNumericTextInput('12a', previousValue);
+
+    expect(result).toEqual({ value: previousValue, ok: false });
+  });
+
+  it('rejects edits exceeding the default digit limit', () => {
+    const previousValue = '123456789';
+
+    const result = normalizeNumericTextInput('1234567890', previousValue);
+
+    expect(result).toEqual({ value: previousValue, ok: false });
+  });
+
+  it('accepts edits at a configured digit limit', () => {
+    const previousValue = '';
+
+    const result = normalizeNumericTextInput('1234.56', previousValue, {
+      maxDigits: 6,
+    });
+
+    expect(result).toEqual({ value: '1234.56', ok: true });
+  });
+
+  it('rejects edits exceeding the fractional digit limit', () => {
+    const previousValue = '1.23';
+
+    const result = normalizeNumericTextInput('1.234', previousValue, {
+      maxDecimalPlaces: 2,
+    });
+
+    expect(result).toEqual({ value: previousValue, ok: false });
+  });
+
+  it('rejects a decimal separator when fractional digits are disabled', () => {
+    const previousValue = '1';
+
+    const result = normalizeNumericTextInput('1.', previousValue, {
+      maxDecimalPlaces: 0,
+    });
+
+    expect(result).toEqual({ value: previousValue, ok: false });
+  });
+
+  it('normalizes input with a configured decimal separator', () => {
+    const previousValue = '';
+
+    const result = normalizeNumericTextInput('00,5', previousValue, {
+      decimalSeparator: ',',
+    });
+
+    expect(result).toEqual({ value: '0,5', ok: true });
+  });
+
+  it('normalizes an accepted decimal alias to the canonical separator', () => {
+    const previousValue = '';
+
+    const result = normalizeNumericTextInput('00,5', previousValue, {
+      acceptedDecimalSeparators: ['.', ','],
+    });
+
+    expect(result).toEqual({ value: '0.5', ok: true });
+  });
+
+  it.each(['1,2,3', '1,2.3'])(
+    'rejects repeated or mixed accepted decimal separators in %s',
+    (text) => {
+      const previousValue = '1.2';
+
+      const result = normalizeNumericTextInput(text, previousValue, {
+        acceptedDecimalSeparators: ['.', ','],
+      });
+
+      expect(result).toEqual({ value: previousValue, ok: false });
+    },
+  );
+});
+
+describe('finalizeNumericTextInput', () => {
+  it.each([
+    ['12.', '12'],
+    ['0.', '0'],
+    ['', ''],
+    ['12.3', '12.3'],
+  ])('finalizes %s to %s', (value, expectedValue) => {
+    const decimalSeparator = '.';
+
+    const result = finalizeNumericTextInput(value, decimalSeparator);
+
+    expect(result).toBe(expectedValue);
+  });
+});
diff --git a/app/components/Base/Keypad/normalizeNumericTextInput.ts b/app/components/Base/Keypad/normalizeNumericTextInput.ts
new file mode 100644
index 000000000000..cd76284ed302
--- /dev/null
+++ b/app/components/Base/Keypad/normalizeNumericTextInput.ts
@@ -0,0 +1,198 @@
+export const DEFAULT_MAX_NUMERIC_INPUT_DIGITS = 9;
+
+export interface NormalizeNumericTextInputOptions {
+  /** Maximum number of digits across the integer and fractional parts. */
+  maxDigits?: number;
+  /** Maximum number of digits after the decimal separator. */
+  maxDecimalPlaces?: number;
+  /** Canonical single-character separator used in the normalized output. */
+  decimalSeparator?: string;
+  /** Single-character separators accepted from the native input. */
+  acceptedDecimalSeparators?: readonly string[];
+}
+
+export interface NormalizeNumericTextInputResult {
+  value: string;
+  ok: boolean;
+}
+
+interface ParsedNumericTextParts {
+  integerPart: string;
+  fractionalPart: string;
+  hasDecimalSeparator: boolean;
+}
+
+const isNonNegativeInteger = (value: number) =>
+  Number.isInteger(value) && value >= 0;
+
+const areNormalizeOptionsValid = ({
+  maxDigits,
+  maxDecimalPlaces,
+  decimalSeparator,
+  acceptedDecimalSeparators,
+}: {
+  maxDigits: number;
+  maxDecimalPlaces?: number;
+  decimalSeparator: string;
+  acceptedDecimalSeparators: readonly string[];
+}): boolean =>
+  decimalSeparator.length === 1 &&
+  !/\d/.test(decimalSeparator) &&
+  acceptedDecimalSeparators.length > 0 &&
+  acceptedDecimalSeparators.every(
+    (separator) => separator.length === 1 && !/\d/.test(separator),
+  ) &&
+  isNonNegativeInteger(maxDigits) &&
+  (maxDecimalPlaces === undefined || isNonNegativeInteger(maxDecimalPlaces));
+
+const parseNumericTextParts = (
+  text: string,
+  acceptedDecimalSeparators: readonly string[],
+): ParsedNumericTextParts | null => {
+  let integerPart = '';
+  let fractionalPart = '';
+  let hasDecimalSeparator = false;
+
+  for (const character of text) {
+    if (/\d/.test(character)) {
+      if (hasDecimalSeparator) {
+        fractionalPart += character;
+      } else {
+        integerPart += character;
+      }
+      continue;
+    }
+
+    if (acceptedDecimalSeparators.includes(character)) {
+      if (hasDecimalSeparator) {
+        return null;
+      }
+      hasDecimalSeparator = true;
+      continue;
+    }
+
+    return null;
+  }
+
+  if (!integerPart && !fractionalPart && !hasDecimalSeparator) {
+    return null;
+  }
+
+  return { integerPart, fractionalPart, hasDecimalSeparator };
+};
+
+const exceedsNumericLimits = ({
+  normalizedIntegerPart,
+  fractionalPart,
+  hasDecimalSeparator,
+  maxDigits,
+  maxDecimalPlaces,
+}: {
+  normalizedIntegerPart: string;
+  fractionalPart: string;
+  hasDecimalSeparator: boolean;
+  maxDigits: number;
+  maxDecimalPlaces?: number;
+}): boolean =>
+  normalizedIntegerPart.length + fractionalPart.length > maxDigits ||
+  (maxDecimalPlaces !== undefined &&
+    fractionalPart.length > maxDecimalPlaces) ||
+  (maxDecimalPlaces === 0 && hasDecimalSeparator);
+
+const formatNormalizedNumericValue = ({
+  normalizedIntegerPart,
+  fractionalPart,
+  hasDecimalSeparator,
+  decimalSeparator,
+}: {
+  normalizedIntegerPart: string;
+  fractionalPart: string;
+  hasDecimalSeparator: boolean;
+  decimalSeparator: string;
+}): string =>
+  hasDecimalSeparator
+    ? `${normalizedIntegerPart}${decimalSeparator}${fractionalPart}`
+    : normalizedIntegerPart;
+
+/**
+ * Normalizes a complete native numeric-input edit while preserving editable
+ * states such as an empty value and a trailing decimal separator.
+ *
+ * Invalid edits return the previous value so controlled inputs never expose
+ * malformed or over-limit text.
+ *
+ * @param text - Full text emitted by the native input.
+ * @param previousValue - Last accepted input value.
+ * @param options - Digit, decimal-place, and separator constraints.
+ * @returns The normalized value and whether the edit was accepted.
+ */
+export const normalizeNumericTextInput = (
+  text: string,
+  previousValue: string,
+  {
+    maxDigits = DEFAULT_MAX_NUMERIC_INPUT_DIGITS,
+    maxDecimalPlaces,
+    decimalSeparator = '.',
+    acceptedDecimalSeparators = [decimalSeparator],
+  }: NormalizeNumericTextInputOptions = {},
+): NormalizeNumericTextInputResult => {
+  if (
+    !areNormalizeOptionsValid({
+      maxDigits,
+      maxDecimalPlaces,
+      decimalSeparator,
+      acceptedDecimalSeparators,
+    })
+  ) {
+    return { value: previousValue, ok: false };
+  }
+
+  if (text === '') {
+    return { value: '', ok: true };
+  }
+
+  const parsed = parseNumericTextParts(text, acceptedDecimalSeparators);
+  if (!parsed) {
+    return { value: previousValue, ok: false };
+  }
+
+  const normalizedIntegerPart =
+    parsed.integerPart.replace(/^0+(?=\d)/, '') || '0';
+
+  if (
+    exceedsNumericLimits({
+      normalizedIntegerPart,
+      fractionalPart: parsed.fractionalPart,
+      hasDecimalSeparator: parsed.hasDecimalSeparator,
+      maxDigits,
+      maxDecimalPlaces,
+    })
+  ) {
+    return { value: previousValue, ok: false };
+  }
+
+  return {
+    value: formatNormalizedNumericValue({
+      normalizedIntegerPart,
+      fractionalPart: parsed.fractionalPart,
+      hasDecimalSeparator: parsed.hasDecimalSeparator,
+      decimalSeparator,
+    }),
+    ok: true,
+  };
+};
+
+/**
+ * Removes a trailing decimal separator when input editing ends.
+ *
+ * @param value - Last accepted numeric input value.
+ * @param decimalSeparator - Single-character decimal separator.
+ * @returns A finalized numeric value; empty input remains empty.
+ */
+export const finalizeNumericTextInput = (
+  value: string,
+  decimalSeparator = '.',
+): string =>
+  value.endsWith(decimalSeparator)
+    ? value.slice(0, -decimalSeparator.length)
+    : value;
diff --git a/app/components/Nav/App/App.tsx b/app/components/Nav/App/App.tsx
index ead95f23072f..3504a0ad2c17 100644
--- a/app/components/Nav/App/App.tsx
+++ b/app/components/Nav/App/App.tsx
@@ -39,6 +39,7 @@ import {
   addDeviceVerificationCodeScreenOptions,
   clearNativeStackNavigatorOptions,
   slideFromRightNativeOptions,
+  transparentModalScreenOptions,
 } from '../../../constants/navigation/clearStackNavigatorOptions';
 import ModalConfirmation from '../../../component-library/components/Modals/ModalConfirmation';
 import Toast, {
@@ -50,7 +51,6 @@ import PerpsWebSocketHealthToast, {
   WebSocketHealthToastProvider,
 } from '../../UI/Perps/components/PerpsWebSocketHealthToast';
 import { ControllerEventToastBridge } from './ControllerEventToastBridge';
-import { CliLoginPushNudgeListener } from '../../UI/CliLoginPushNudge';
 import { usePredictToastRegistrations } from '../../UI/Predict/hooks/usePredictToastRegistrations';
 import { usePerpsWithdrawToastRegistrations } from '../../UI/Perps/hooks/usePerpsWithdrawToastRegistrations';
 import { useQuickBuyToastRegistrations } from '../../Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyToastRegistrations';
@@ -200,6 +200,7 @@ const addWalletTransitionOptions: NativeStackNavigationOptions = {
 };
 
 const tradeWalletActionsRootModalOptions: NativeStackNavigationOptions = {
+  presentation: 'transparentModal',
   animation: 'none',
   contentStyle: { backgroundColor: importedColors.transparent },
   gestureEnabled: false,
@@ -492,7 +493,12 @@ interface RootModalFlowProps {
 }
 const RootModalFlow = (props: RootModalFlowProps) => (
   <NativeStack.Navigator
-    screenOptions={{ ...clearNativeStackNavigatorOptions }}
+    // Explicit presentation so nested pushes stay overlays on RN v7
+    // (parent RootModalFlow is already transparentModal; screens must opt in too).
+    screenOptions={{
+      ...clearNativeStackNavigatorOptions,
+      ...transparentModalScreenOptions,
+    }}
   >
     <NativeStack.Screen
       name={Routes.MODAL.WALLET_ACTIONS}
@@ -1495,7 +1501,6 @@ const App: React.FC = () => {
         <PerpsWebSocketHealthToast />
         {__DEV__ && <AgentStepHud />}
         <ControllerEventToastBridge registrations={toastRegistrations} />
-        <CliLoginPushNudgeListener />
         <ProfilerManager />
         {/* Dev/QA-only visual inspector — no-op unless DESIGNER_MODE=true (see docs/designer-mode.md) */}
         <DesignerModeOverlay />
diff --git a/app/components/Nav/Main/MainNavigator.js b/app/components/Nav/Main/MainNavigator.js
index 206d9c62676f..e0f05a39efd5 100644
--- a/app/components/Nav/Main/MainNavigator.js
+++ b/app/components/Nav/Main/MainNavigator.js
@@ -163,7 +163,7 @@ import PerpsPositionTransactionView from '../../UI/Perps/Views/PerpsTransactions
 import PerpsOrderTransactionView from '../../UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView';
 import PerpsFundingTransactionView from '../../UI/Perps/Views/PerpsTransactionsView/PerpsFundingTransactionView';
 import DeFiProtocolPositionDetails from '../../UI/DeFiPositions/DeFiProtocolPositionDetails';
-import UnmountOnBlur from '../../Views/UnmountOnBlur';
+import { withUnmountOnTabBlur } from '../../Views/UnmountOnBlur/UnmountOnTabBlur';
 ///: BEGIN:ONLY_INCLUDE_IF(sample-feature)
 import SampleFeature from '../../../features/SampleFeature/components/views/SampleFeature';
 ///: END:ONLY_INCLUDE_IF
@@ -576,9 +576,10 @@ const SettingsFlow = () => {
   );
 };
 
-const UnmountOnBlurComponent = (children) => (
-  <UnmountOnBlur>{children}</UnmountOnBlur>
-);
+// Replaces `unmountOnBlur` (removed in React Navigation v7).
+const BrowserFlowUnmountOnTabBlur = withUnmountOnTabBlur(BrowserFlow);
+const TransactionsHomeUnmountOnTabBlur = withUnmountOnTabBlur(TransactionsHome);
+const RewardsHomeUnmountOnTabBlur = withUnmountOnTabBlur(RewardsHome);
 
 const HomeTabs = () => {
   const { trackEvent, createEventBuilder } = useAnalytics();
@@ -642,7 +643,8 @@ const HomeTabs = () => {
         );
       },
       rootScreenName: Routes.BROWSER_VIEW,
-      unmountOnBlur: true,
+      // Required with `withUnmountOnTabBlur` — freezing blocks the unmount.
+      freezeOnBlur: false,
     },
     activity: {
       tabBarIconKey: TabBarIconKey.Activity,
@@ -654,7 +656,7 @@ const HomeTabs = () => {
         );
       },
       rootScreenName: Routes.TRANSACTIONS_VIEW,
-      unmountOnBlur: true,
+      freezeOnBlur: false,
     },
     money: {
       tabBarIconKey: TabBarIconKey.Money,
@@ -671,7 +673,7 @@ const HomeTabs = () => {
         );
       },
       rootScreenName: Routes.REWARDS_VIEW,
-      unmountOnBlur: true,
+      freezeOnBlur: false,
     },
     trending: {
       tabBarIconKey: TabBarIconKey.Trending,
@@ -691,12 +693,12 @@ const HomeTabs = () => {
       onLeave: () => {
         // End trending session when user switches to another tab
         TrendingFeedSessionManager.getInstance().endSession();
-        // Disable AppState listener to prevent phantom sessions when app backgrounds/foregrounds
-        // while user is on a different tab (since TrendingView stays mounted with unmountOnBlur: false)
+        // Disable AppState listener to prevent phantom sessions when app
+        // backgrounds/foregrounds while user is on a different tab (Explore
+        // stays mounted; Browser/Activity/Rewards use UnmountOnBlur layout).
         TrendingFeedSessionManager.getInstance().disableAppStateListener();
       },
       rootScreenName: Routes.TRENDING_VIEW,
-      unmountOnBlur: false,
     },
     settings: {
       tabBarIconKey: TabBarIconKey.Setting,
@@ -708,7 +710,6 @@ const HomeTabs = () => {
         );
       },
       rootScreenName: Routes.SETTINGS_VIEW,
-      unmountOnBlur: true,
     },
   };
 
@@ -821,8 +822,7 @@ const HomeTabs = () => {
               ...options.browser,
               isHidden: true,
             }}
-            component={BrowserFlow}
-            layout={({ children }) => <UnmountOnBlur>{children}</UnmountOnBlur>}
+            component={BrowserFlowUnmountOnTabBlur}
           />
         </>
 
@@ -844,8 +844,7 @@ const HomeTabs = () => {
           <Tab.Screen
             name={Routes.TRANSACTIONS_VIEW}
             options={options.activity}
-            component={TransactionsHome}
-            layout={({ children }) => <UnmountOnBlur>{children}</UnmountOnBlur>}
+            component={TransactionsHomeUnmountOnTabBlur}
           />
         )}
 
@@ -853,8 +852,7 @@ const HomeTabs = () => {
         <Tab.Screen
           name={Routes.REWARDS_VIEW}
           options={options.rewards}
-          component={RewardsHome}
-          layout={({ children }) => UnmountOnBlurComponent(children)}
+          component={RewardsHomeUnmountOnTabBlur}
         />
       </Tab.Navigator>
     </PredictPreviewSheetProvider>
diff --git a/app/components/Nav/Main/MainNavigator.test.tsx b/app/components/Nav/Main/MainNavigator.test.tsx
index 703ddb8587e3..4947548f6c3e 100644
--- a/app/components/Nav/Main/MainNavigator.test.tsx
+++ b/app/components/Nav/Main/MainNavigator.test.tsx
@@ -224,6 +224,33 @@ describe('MainNavigator', () => {
       );
     });
 
+    it.each([
+      Routes.BROWSER.HOME,
+      Routes.TRANSACTIONS_VIEW,
+      Routes.REWARDS_VIEW,
+    ])(
+      'opts %s out of freeze-on-blur so its unmount-on-blur wrapper can commit',
+      (tabName) => {
+        // Given HomeTabs is rendered
+        const HomeTabs = getHomeTabsComponent();
+
+        // When the tab screens are inspected
+        const { root: homeRoot } = renderWithProvider(
+          <HomeTabs route={{ params: {} }} />,
+          { state: initialRootState },
+        );
+        const tabScreen = homeRoot.findAll(
+          (node: ReactTestInstance) =>
+            node.type?.toString?.() === 'TabScreen' &&
+            node.props?.name === tabName,
+        )[0];
+
+        // Then tabs wrapped with withUnmountOnTabBlur are never frozen, since a
+        // frozen subtree suspends the wrapper's unmount and keeps the tab alive
+        expect(tabScreen?.props?.options?.freezeOnBlur).toBe(false);
+      },
+    );
+
     describe('Rewards sub-page tab bar visibility', () => {
       // rewardsViewRoute is found via .find(r => r.name === Routes.REWARDS_VIEW),
       // so the inner route that wraps the nested nav state must carry that name.
@@ -978,7 +1005,7 @@ describe('MainNavigator', () => {
 
       expect(screen).toBeDefined();
       expect(screen?.options?.headerShown).toBe(false);
-      expect(screen?.options?.animation).toBe('slide_from_right');
+      expect(screen?.options?.animation).toBe('ios_from_right');
     });
 
     it('includes StakeScreens route', () => {
@@ -1063,7 +1090,7 @@ describe('MainNavigator', () => {
 
       expect(screen).toBeDefined();
       expect(screen?.options?.headerShown).toBe(false);
-      expect(screen?.options?.animation).toBe('slide_from_right');
+      expect(screen?.options?.animation).toBe('ios_from_right');
     });
 
     it('includes Asset screen', () => {
@@ -1176,7 +1203,7 @@ describe('MainNavigator', () => {
 
       expect(screen).toBeDefined();
       expect(screen?.options?.headerShown).toBe(false);
-      expect(screen?.options?.animation).toBe('slide_from_right');
+      expect(screen?.options?.animation).toBe('ios_from_right');
     });
 
     it('includes Benefit detail full view route', () => {
@@ -1191,7 +1218,7 @@ describe('MainNavigator', () => {
 
       expect(screen).toBeDefined();
       expect(screen?.options?.headerShown).toBe(false);
-      expect(screen?.options?.animation).toBe('slide_from_right');
+      expect(screen?.options?.animation).toBe('ios_from_right');
     });
   });
 
diff --git a/app/components/Nav/Main/index.js b/app/components/Nav/Main/index.js
index 49a02bef5d9a..6842f465efec 100644
--- a/app/components/Nav/Main/index.js
+++ b/app/components/Nav/Main/index.js
@@ -34,6 +34,7 @@ import {
 
 import ProtectYourWalletModal from '../../UI/ProtectYourWalletModal';
 import PushNotificationOnboardingRoot from '../../Views/Notifications/PushNotificationOnboarding/PushNotificationOnboardingRoot';
+import { CliLoginPushNudgeListener } from '../../UI/CliLoginPushNudge';
 import MainNavigator from './MainNavigator';
 import { query } from '@metamask/controller-utils';
 import EarnTransactionMonitor from '../../UI/Earn/components/EarnTransactionMonitor';
@@ -415,6 +416,7 @@ const Main = (props) => {
         <RootRPCMethodsUI navigation={props.navigation} />
         <ProtectWalletMandatoryModal />
         <PushNotificationOnboardingRoot />
+        <CliLoginPushNudgeListener />
       </View>
     </React.Fragment>
   );
diff --git a/app/components/Nav/Main/index.test.tsx b/app/components/Nav/Main/index.test.tsx
index e2f71a485582..57ae67a66252 100644
--- a/app/components/Nav/Main/index.test.tsx
+++ b/app/components/Nav/Main/index.test.tsx
@@ -89,6 +89,11 @@ jest.mock(
   }),
 );
 
+jest.mock('../../UI/CliLoginPushNudge', () => ({
+  CliLoginPushNudgeListener: () =>
+    mockReact.createElement('CliLoginPushNudgeListenerMock'),
+}));
+
 jest.mock('../../UI/ReviewModal', () => ({
   __esModule: true,
   default: () => mockReact.createElement('ReviewModalMock'),
diff --git a/app/components/Nav/NavigationProvider/NavigationProvider.test.tsx b/app/components/Nav/NavigationProvider/NavigationProvider.test.tsx
index 4c3269af8a22..062a3f55fb89 100644
--- a/app/components/Nav/NavigationProvider/NavigationProvider.test.tsx
+++ b/app/components/Nav/NavigationProvider/NavigationProvider.test.tsx
@@ -6,15 +6,13 @@ import { View, Text } from 'react-native';
 import { onNavigationReady } from '../../../actions/navigation';
 import NavigationService from '../../../core/NavigationService';
 import {
+  DefaultTheme,
+  NavigationContainer,
   NavigationContainerRef,
   ParamListBase,
 } from '@react-navigation/native';
 import { endTrace, trace, TraceName } from '../../../util/trace';
 
-const navigationContainerThemeCapture: {
-  theme?: { colors?: { background?: string } };
-} = {};
-
 jest.mock('../../../util/trace', () => {
   const actual = jest.requireActual('../../../util/trace');
   return {
@@ -47,7 +45,6 @@ describe('NavigationProvider', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
-    navigationContainerThemeCapture.theme = undefined;
     NavigationService.navigation =
       undefined as unknown as NavigationContainerRef<ParamListBase>;
     (useDispatch as jest.Mock).mockReturnValue(mockDispatch);
@@ -87,6 +84,24 @@ describe('NavigationProvider', () => {
     expect(NavigationService.navigation).toHaveProperty('navigate');
   });
 
+  it('uses DefaultTheme with a transparent background', () => {
+    const { UNSAFE_getByType } = render(
+      <NavigationProvider>
+        <View />
+      </NavigationProvider>,
+    );
+
+    const container = UNSAFE_getByType(NavigationContainer);
+
+    expect(container.props.theme).toEqual({
+      ...DefaultTheme,
+      colors: {
+        ...DefaultTheme.colors,
+        background: 'transparent',
+      },
+    });
+  });
+
   it('Measures performance trace order when navigation provider is initialized', () => {
     // Track calls in array to test for correct order
     const traceCalls: { functionName: string; name: string }[] = [];
diff --git a/app/components/Nav/NavigationProvider/NavigationProvider.tsx b/app/components/Nav/NavigationProvider/NavigationProvider.tsx
index 904e5de18406..b43a25d41037 100644
--- a/app/components/Nav/NavigationProvider/NavigationProvider.tsx
+++ b/app/components/Nav/NavigationProvider/NavigationProvider.tsx
@@ -1,9 +1,9 @@
 import React, { useState } from 'react';
 import {
+  DefaultTheme,
   NavigationContainer,
   NavigationContainerRef,
   ParamListBase,
-  Theme,
 } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { onNavigationReady } from '../../../actions/navigation';
@@ -66,8 +66,16 @@ const NavigationProvider: React.FC<NavigationProviderProps> = ({
   return (
     <NavigationContainer
       // Using transparent background to support transparent modals
-      // The actual app background is handled by individual screens
-      theme={{ colors: { background: 'transparent' } } as Theme}
+      // The actual app background is handled by individual screens.
+      // Spread DefaultTheme so required fields (e.g. fonts in v7) stay defined —
+      // casting a partial object as Theme would hide that at compile time.
+      theme={{
+        ...DefaultTheme,
+        colors: {
+          ...DefaultTheme.colors,
+          background: 'transparent',
+        },
+      }}
       onReady={onReady}
       ref={setNavigationRef}
     >
diff --git a/app/components/Snaps/SnapDialogApproval/SnapDialogApproval.test.tsx b/app/components/Snaps/SnapDialogApproval/SnapDialogApproval.test.tsx
index 734a015cb5c2..299890748b9f 100644
--- a/app/components/Snaps/SnapDialogApproval/SnapDialogApproval.test.tsx
+++ b/app/components/Snaps/SnapDialogApproval/SnapDialogApproval.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { fireEvent, render } from '@testing-library/react-native';
 import { Provider } from 'react-redux';
 import configureMockStore from 'redux-mock-store';
-import SnapDialogApproval from './index';
+import SnapDialogApproval from './SnapDialogApproval';
 import Engine from '../../../core/Engine';
 import useApprovalRequest from '../../Views/confirmations/hooks/useApprovalRequest';
 import { DIALOG_APPROVAL_TYPES } from '@metamask/snaps-rpc-methods';
diff --git a/app/components/Snaps/SnapDialogApproval/index.ts b/app/components/Snaps/SnapDialogApproval/index.ts
deleted file mode 100644
index a74d3c5f2c41..000000000000
--- a/app/components/Snaps/SnapDialogApproval/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-///: BEGIN:ONLY_INCLUDE_IF(snaps)
-export { default } from './SnapDialogApproval';
-///: END:ONLY_INCLUDE_IF
diff --git a/app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.ts.snap b/app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.ts.snap
index 53eb15bfafd7..a17c808fc6fe 100644
--- a/app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.ts.snap
+++ b/app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.ts.snap
@@ -74,29 +74,35 @@ exports[`SnapUIRenderer adds a footer if required 1`] = `
             <Text
               accessibilityRole="text"
               style={
-                {
-                  "color": "#131416",
-                  "fontFamily": "Geist-Regular",
-                  "fontSize": 16,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 24,
-                  "textAlign": "left",
-                }
-              }
-            >
-              <Text
-                accessibilityRole="text"
-                style={
+                [
                   {
                     "color": "#131416",
                     "fontFamily": "Geist-Regular",
                     "fontSize": 16,
-                    "fontWeight": "400",
                     "letterSpacing": 0,
                     "lineHeight": 24,
+                  },
+                  {
                     "textAlign": "left",
-                  }
+                  },
+                ]
+              }
+            >
+              <Text
+                accessibilityRole="text"
+                style={
+                  [
+                    {
+                      "color": "#131416",
+                      "fontFamily": "Geist-Regular",
+                      "fontSize": 16,
+                      "letterSpacing": 0,
+                      "lineHeight": 24,
+                    },
+                    {
+                      "textAlign": "left",
+                    },
+                  ]
                 }
               >
                 Hello world!
@@ -1062,29 +1068,35 @@ exports[`SnapUIRenderer renders basic UI 1`] = `
             <Text
               accessibilityRole="text"
               style={
-                {
-                  "color": "#131416",
-                  "fontFamily": "Geist-Regular",
-                  "fontSize": 16,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 24,
-                  "textAlign": "left",
-                }
-              }
-            >
-              <Text
-                accessibilityRole="text"
-                style={
+                [
                   {
                     "color": "#131416",
                     "fontFamily": "Geist-Regular",
                     "fontSize": 16,
-                    "fontWeight": "400",
                     "letterSpacing": 0,
                     "lineHeight": 24,
+                  },
+                  {
                     "textAlign": "left",
-                  }
+                  },
+                ]
+              }
+            >
+              <Text
+                accessibilityRole="text"
+                style={
+                  [
+                    {
+                      "color": "#131416",
+                      "fontFamily": "Geist-Regular",
+                      "fontSize": 16,
+                      "letterSpacing": 0,
+                      "lineHeight": 24,
+                    },
+                    {
+                      "textAlign": "left",
+                    },
+                  ]
                 }
               >
                 Hello world!
@@ -1791,15 +1803,17 @@ exports[`SnapUIRenderer renders complex nested components 1`] = `
               <Text
                 accessibilityRole="text"
                 style={
-                  {
-                    "color": "inherit",
-                    "fontFamily": "Geist-Regular",
-                    "fontSize": 16,
-                    "fontWeight": undefined,
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                    "textAlign": undefined,
-                  }
+                  [
+                    {
+                      "fontFamily": "Geist-Regular",
+                      "fontSize": 16,
+                      "letterSpacing": 0,
+                      "lineHeight": 24,
+                    },
+                    {
+                      "textAlign": undefined,
+                    },
+                  ]
                 }
               >
                 Foo
@@ -1891,29 +1905,35 @@ exports[`SnapUIRenderer renders footers 1`] = `
             <Text
               accessibilityRole="text"
               style={
-                {
-                  "color": "#131416",
-                  "fontFamily": "Geist-Regular",
-                  "fontSize": 16,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 24,
-                  "textAlign": "left",
-                }
-              }
-            >
-              <Text
-                accessibilityRole="text"
-                style={
+                [
                   {
                     "color": "#131416",
                     "fontFamily": "Geist-Regular",
                     "fontSize": 16,
-                    "fontWeight": "400",
                     "letterSpacing": 0,
                     "lineHeight": 24,
+                  },
+                  {
                     "textAlign": "left",
-                  }
+                  },
+                ]
+              }
+            >
+              <Text
+                accessibilityRole="text"
+                style={
+                  [
+                    {
+                      "color": "#131416",
+                      "fontFamily": "Geist-Regular",
+                      "fontSize": 16,
+                      "letterSpacing": 0,
+                      "lineHeight": 24,
+                    },
+                    {
+                      "textAlign": "left",
+                    },
+                  ]
                 }
               >
                 Hello world!
@@ -2240,15 +2260,17 @@ exports[`SnapUIRenderer renders footers 1`] = `
               <Text
                 accessibilityRole="text"
                 style={
-                  {
-                    "color": "inherit",
-                    "fontFamily": "Geist-Regular",
-                    "fontSize": 16,
-                    "fontWeight": undefined,
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                    "textAlign": undefined,
-                  }
+                  [
+                    {
+                      "fontFamily": "Geist-Regular",
+                      "fontSize": 16,
+                      "letterSpacing": 0,
+                      "lineHeight": 24,
+                    },
+                    {
+                      "textAlign": undefined,
+                    },
+                  ]
                 }
               >
                 Foo
@@ -2606,15 +2628,18 @@ exports[`SnapUIRenderer supports fields with multiple components 1`] = `
                       <Text
                         accessibilityRole="text"
                         style={
-                          {
-                            "color": "#4459ff",
-                            "fontFamily": "Geist-Medium",
-                            "fontSize": 16,
-                            "fontWeight": undefined,
-                            "letterSpacing": 0,
-                            "lineHeight": 24,
-                            "textAlign": undefined,
-                          }
+                          [
+                            {
+                              "color": "#4459ff",
+                              "fontFamily": "Geist-Medium",
+                              "fontSize": 16,
+                              "letterSpacing": 0,
+                              "lineHeight": 24,
+                            },
+                            {
+                              "textAlign": undefined,
+                            },
+                          ]
                         }
                       >
                         Submit
@@ -2887,29 +2912,35 @@ exports[`SnapUIRenderer supports the onCancel prop 1`] = `
             <Text
               accessibilityRole="text"
               style={
-                {
-                  "color": "#131416",
-                  "fontFamily": "Geist-Regular",
-                  "fontSize": 16,
-                  "fontWeight": "400",
-                  "letterSpacing": 0,
-                  "lineHeight": 24,
-                  "textAlign": "left",
-                }
-              }
-            >
-              <Text
-                accessibilityRole="text"
-                style={
+                [
                   {
                     "color": "#131416",
                     "fontFamily": "Geist-Regular",
                     "fontSize": 16,
-                    "fontWeight": "400",
                     "letterSpacing": 0,
                     "lineHeight": 24,
+                  },
+                  {
                     "textAlign": "left",
-                  }
+                  },
+                ]
+              }
+            >
+              <Text
+                accessibilityRole="text"
+                style={
+                  [
+                    {
+                      "color": "#131416",
+                      "fontFamily": "Geist-Regular",
+                      "fontSize": 16,
+                      "letterSpacing": 0,
+                      "lineHeight": 24,
+                    },
+                    {
+                      "textAlign": "left",
+                    },
+                  ]
                 }
               >
                 Hello world!
@@ -3236,15 +3267,17 @@ exports[`SnapUIRenderer supports the onCancel prop 1`] = `
               <Text
                 accessibilityRole="text"
                 style={
-                  {
-                    "color": "inherit",
-                    "fontFamily": "Geist-Regular",
-                    "fontSize": 16,
-                    "fontWeight": undefined,
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                    "textAlign": undefined,
-                  }
+                  [
+                    {
+                      "fontFamily": "Geist-Regular",
+                      "fontSize": 16,
+                      "letterSpacing": 0,
+                      "lineHeight": 24,
+                    },
+                    {
+                      "textAlign": undefined,
+                    },
+                  ]
                 }
               >
                 Foo
diff --git a/app/components/Snaps/SnapUIRenderer/components/__snapshots__/form.test.ts.snap b/app/components/Snaps/SnapUIRenderer/components/__snapshots__/form.test.ts.snap
index 01bb12a1ec30..469fccb995f7 100644
--- a/app/components/Snaps/SnapUIRenderer/components/__snapshots__/form.test.ts.snap
+++ b/app/components/Snaps/SnapUIRenderer/components/__snapshots__/form.test.ts.snap
@@ -218,15 +218,18 @@ exports[`SnapUIForm will render 1`] = `
                 <Text
                   accessibilityRole="text"
                   style={
-                    {
-                      "color": "#4459ff",
-                      "fontFamily": "Geist-Medium",
-                      "fontSize": 16,
-                      "fontWeight": undefined,
-                      "letterSpacing": 0,
-                      "lineHeight": 24,
-                      "textAlign": undefined,
-                    }
+                    [
+                      {
+                        "color": "#4459ff",
+                        "fontFamily": "Geist-Medium",
+                        "fontSize": 16,
+                        "letterSpacing": 0,
+                        "lineHeight": 24,
+                      },
+                      {
+                        "textAlign": undefined,
+                      },
+                    ]
                   }
                 >
                   Submit
@@ -1211,15 +1214,18 @@ exports[`SnapUIForm will render with fields 1`] = `
                 <Text
                   accessibilityRole="text"
                   style={
-                    {
-                      "color": "#4459ff",
-                      "fontFamily": "Geist-Medium",
-                      "fontSize": 16,
-                      "fontWeight": undefined,
-                      "letterSpacing": 0,
-                      "lineHeight": 24,
-                      "textAlign": undefined,
-                    }
+                    [
+                      {
+                        "color": "#4459ff",
+                        "fontFamily": "Geist-Medium",
+                        "fontSize": 16,
+                        "letterSpacing": 0,
+                        "lineHeight": 24,
+                      },
+                      {
+                        "textAlign": undefined,
+                      },
+                    ]
                   }
                 >
                   Submit
diff --git a/app/components/Snaps/SnapUIRenderer/components/banner.test.ts b/app/components/Snaps/SnapUIRenderer/components/banner.test.ts
index 5c2118ae73fe..8c932d77e37a 100644
--- a/app/components/Snaps/SnapUIRenderer/components/banner.test.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/banner.test.ts
@@ -42,9 +42,9 @@ describe('banner component', () => {
               element: 'Text',
               props: {
                 color: undefined,
-                variant: 'sBodyMD',
+                variant: 'body-md',
+                fontWeight: 'regular',
                 style: {
-                  fontWeight: '400',
                   textAlign: 'left',
                 },
               },
@@ -53,11 +53,11 @@ describe('banner component', () => {
           ],
           props: {
             color: undefined,
+            fontWeight: 'regular',
             style: {
-              fontWeight: '400',
               textAlign: 'left',
             },
-            variant: 'sBodyMD',
+            variant: 'body-md',
           },
         },
       ],
@@ -93,9 +93,9 @@ describe('banner component', () => {
               element: 'Text',
               props: {
                 color: undefined,
-                variant: 'sBodyMD',
+                variant: 'body-md',
+                fontWeight: 'regular',
                 style: {
-                  fontWeight: '400',
                   textAlign: 'left',
                 },
               },
@@ -104,11 +104,11 @@ describe('banner component', () => {
           ],
           props: {
             color: undefined,
+            fontWeight: 'regular',
             style: {
-              fontWeight: '400',
               textAlign: 'left',
             },
-            variant: 'sBodyMD',
+            variant: 'body-md',
           },
         },
       ],
@@ -144,9 +144,9 @@ describe('banner component', () => {
               element: 'Text',
               props: {
                 color: undefined,
-                variant: 'sBodyMD',
+                variant: 'body-md',
+                fontWeight: 'regular',
                 style: {
-                  fontWeight: '400',
                   textAlign: 'left',
                 },
               },
@@ -155,9 +155,9 @@ describe('banner component', () => {
           ],
           props: {
             color: undefined,
-            variant: 'sBodyMD',
+            variant: 'body-md',
+            fontWeight: 'regular',
             style: {
-              fontWeight: '400',
               textAlign: 'left',
             },
           },
diff --git a/app/components/Snaps/SnapUIRenderer/components/bold.ts b/app/components/Snaps/SnapUIRenderer/components/bold.ts
index 0ebd5358610d..40c23c812092 100644
--- a/app/components/Snaps/SnapUIRenderer/components/bold.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/bold.ts
@@ -1,9 +1,9 @@
 import { BoldElement, JSXElement } from '@metamask/snaps-sdk/jsx';
 import { getJsxChildren } from '@metamask/snaps-utils';
 import { NonEmptyArray } from '@metamask/utils';
+import { FontWeight, TextVariant } from '@metamask/design-system-react-native';
 import { mapTextToTemplate } from '../utils';
 import { UIComponentFactory } from './types';
-import { TextVariant } from '../../../../component-library/components/Texts/Text';
 
 export const bold: UIComponentFactory<BoldElement> = ({
   element: e,
@@ -12,10 +12,11 @@ export const bold: UIComponentFactory<BoldElement> = ({
   element: 'Text',
   children: mapTextToTemplate(
     getJsxChildren(e) as NonEmptyArray<string | JSXElement>,
-    params,
+    { ...params, textFontWeight: FontWeight.Bold },
   ),
   props: {
-    variant: TextVariant.BodyMDBold,
+    variant: TextVariant.BodyMd,
+    fontWeight: FontWeight.Bold,
     color: params.textColor,
     numberOfLines: 0,
     flexWrap: 'wrap',
diff --git a/app/components/Snaps/SnapUIRenderer/components/box.test.ts b/app/components/Snaps/SnapUIRenderer/components/box.test.ts
index 70a64f18c69c..8a8e173c00a3 100644
--- a/app/components/Snaps/SnapUIRenderer/components/box.test.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/box.test.ts
@@ -44,9 +44,9 @@ describe('box UIComponentFactory', () => {
               children: 'Test content',
               props: {
                 color: undefined,
-                variant: 'sBodyMD',
+                variant: 'body-md',
+                fontWeight: 'regular',
                 style: {
-                  fontWeight: '400',
                   textAlign: 'left',
                 },
               },
@@ -54,11 +54,11 @@ describe('box UIComponentFactory', () => {
           ],
           props: {
             color: undefined,
+            fontWeight: 'regular',
             style: {
-              fontWeight: '400',
               textAlign: 'left',
             },
-            variant: 'sBodyMD',
+            variant: 'body-md',
           },
         },
       ],
diff --git a/app/components/Snaps/SnapUIRenderer/components/button.ts b/app/components/Snaps/SnapUIRenderer/components/button.ts
index a8e7acfc964e..2fc2c637a385 100644
--- a/app/components/Snaps/SnapUIRenderer/components/button.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/button.ts
@@ -1,22 +1,25 @@
 import { ButtonElement, JSXElement } from '@metamask/snaps-sdk/jsx';
 import { getJsxChildren } from '@metamask/snaps-utils';
 import { NonEmptyArray } from '@metamask/utils';
+import {
+  FontWeight,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
 import { mapTextToTemplate } from '../utils';
 import { UIComponentFactory } from './types';
-import { TextVariant } from '../../../../component-library/components/Texts/Text';
-import { Theme } from '../../../../util/theme/models';
 
-function getTextColor(theme: Theme, props: ButtonElement['props']) {
+function getTextColor(props: ButtonElement['props']) {
   if (props.disabled) {
-    return theme.colors.text.muted;
+    return TextColor.TextMuted;
   }
 
   switch (props.variant) {
     case 'destructive':
-      return theme.colors.error.default;
-    default:
+      return TextColor.ErrorDefault;
     case 'primary':
-      return theme.colors.info.default;
+    default:
+      return TextColor.PrimaryDefault;
   }
 }
 
@@ -38,11 +41,10 @@ export const button: UIComponentFactory<ButtonElement> = ({
     getJsxChildren(e) as NonEmptyArray<string | JSXElement>,
     {
       ...params,
-      textColor: getTextColor(params.theme, e.props),
+      textColor: getTextColor(e.props),
       textVariant:
-        e.props.size === 'sm'
-          ? TextVariant.BodySMMedium
-          : TextVariant.BodyMDMedium,
+        e.props.size === 'sm' ? TextVariant.BodySm : TextVariant.BodyMd,
+      textFontWeight: FontWeight.Medium,
     },
   ),
 });
diff --git a/app/components/Snaps/SnapUIRenderer/components/footer.test.ts b/app/components/Snaps/SnapUIRenderer/components/footer.test.ts
index 415d4b760080..0fe751e4b731 100644
--- a/app/components/Snaps/SnapUIRenderer/components/footer.test.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/footer.test.ts
@@ -69,8 +69,8 @@ describe('footer', () => {
               children: 'Button',
               props: {
                 color: 'inherit',
+                fontWeight: undefined,
                 style: {
-                  fontWeight: undefined,
                   textAlign: undefined,
                 },
               },
diff --git a/app/components/Snaps/SnapUIRenderer/components/heading.test.ts b/app/components/Snaps/SnapUIRenderer/components/heading.test.ts
index 13582bcad2ac..492d243f109a 100644
--- a/app/components/Snaps/SnapUIRenderer/components/heading.test.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/heading.test.ts
@@ -1,8 +1,8 @@
 import { HeadingElement } from '@metamask/snaps-sdk/jsx';
-import { heading } from './heading';
-import { TextVariant } from '../../../../component-library/components/Texts/Text';
+import { TextVariant } from '@metamask/design-system-react-native';
 import { FlexWrap } from '../../../UI/Box/box.types';
 import { mockTheme } from '../../../../util/theme';
+import { heading } from './heading';
 
 describe('heading UIComponentFactory', () => {
   it('transform HeadingElement into Text format with default size', () => {
@@ -25,7 +25,7 @@ describe('heading UIComponentFactory', () => {
       element: 'Text',
       children: 'Test Heading',
       props: {
-        variant: TextVariant.HeadingSM,
+        variant: TextVariant.HeadingSm,
         numberOfLines: 0,
         flexWrap: FlexWrap.Wrap,
       },
@@ -51,7 +51,7 @@ describe('heading UIComponentFactory', () => {
       element: 'Text',
       children: '',
       props: {
-        variant: TextVariant.HeadingSM,
+        variant: TextVariant.HeadingSm,
         numberOfLines: 0,
         flexWrap: FlexWrap.Wrap,
       },
@@ -77,7 +77,7 @@ describe('heading UIComponentFactory', () => {
       element: 'Text',
       children: ['Multiple ', 'Text ', 'Nodes'],
       props: {
-        variant: TextVariant.HeadingSM,
+        variant: TextVariant.HeadingSm,
         numberOfLines: 0,
         flexWrap: FlexWrap.Wrap,
       },
@@ -87,9 +87,9 @@ describe('heading UIComponentFactory', () => {
   it('handle different heading sizes', () => {
     const sizes = ['sm', 'md', 'lg'] as const;
     const expectedVariants = {
-      sm: TextVariant.HeadingSM,
-      md: TextVariant.HeadingMD,
-      lg: TextVariant.HeadingLG,
+      sm: TextVariant.HeadingSm,
+      md: TextVariant.HeadingMd,
+      lg: TextVariant.HeadingLg,
     };
 
     sizes.forEach((size) => {
diff --git a/app/components/Snaps/SnapUIRenderer/components/heading.ts b/app/components/Snaps/SnapUIRenderer/components/heading.ts
index 69468f4f672b..5f023ff7ad34 100644
--- a/app/components/Snaps/SnapUIRenderer/components/heading.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/heading.ts
@@ -1,17 +1,17 @@
 import { HeadingElement } from '@metamask/snaps-sdk/jsx';
+import { TextVariant } from '@metamask/design-system-react-native';
 import { UIComponentFactory } from './types';
-import { TextVariant } from '../../../../component-library/components/Texts/Text';
 
 export const generateSize = (size: HeadingElement['props']['size']) => {
   switch (size) {
     case 'sm':
-      return TextVariant.HeadingSM;
+      return TextVariant.HeadingSm;
     case 'md':
-      return TextVariant.HeadingMD;
+      return TextVariant.HeadingMd;
     case 'lg':
-      return TextVariant.HeadingLG;
+      return TextVariant.HeadingLg;
     default:
-      return TextVariant.HeadingSM;
+      return TextVariant.HeadingSm;
   }
 };
 
diff --git a/app/components/Snaps/SnapUIRenderer/components/italic.ts b/app/components/Snaps/SnapUIRenderer/components/italic.ts
index 27f3a9038fdf..e523b4607770 100644
--- a/app/components/Snaps/SnapUIRenderer/components/italic.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/italic.ts
@@ -1,9 +1,9 @@
 import { ItalicElement, JSXElement } from '@metamask/snaps-sdk/jsx';
 import { getJsxChildren } from '@metamask/snaps-utils';
 import { NonEmptyArray } from '@metamask/utils';
+import { TextVariant } from '@metamask/design-system-react-native';
 import { mapTextToTemplate } from '../utils';
 import { UIComponentFactory } from './types';
-import { TextVariant } from '../../../../component-library/components/Texts/Text';
 
 export const italic: UIComponentFactory<ItalicElement> = ({
   element: e,
@@ -15,7 +15,7 @@ export const italic: UIComponentFactory<ItalicElement> = ({
     params,
   ),
   props: {
-    variant: TextVariant.BodyMD,
+    variant: TextVariant.BodyMd,
     color: params.textColor,
     numberOfLines: 0,
     flexWrap: 'wrap',
diff --git a/app/components/Snaps/SnapUIRenderer/components/link.test.ts b/app/components/Snaps/SnapUIRenderer/components/link.test.ts
index dcf0fc7c379b..eaed4f48c26c 100644
--- a/app/components/Snaps/SnapUIRenderer/components/link.test.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/link.test.ts
@@ -1,3 +1,4 @@
+import { TextColor } from '@metamask/design-system-react-native';
 import { link } from './link';
 import { LinkElement } from '@metamask/snaps-sdk/jsx';
 import { mockTheme } from '../../../../util/theme';
@@ -30,9 +31,9 @@ describe('link component', () => {
           children: 'link',
           key: expect.any(String),
           props: {
-            color: mockTheme.colors.info.default,
+            color: TextColor.PrimaryDefault,
+            fontWeight: undefined,
             style: {
-              fontWeight: undefined,
               textAlign: undefined,
             },
             variant: undefined,
@@ -75,9 +76,9 @@ describe('link component', () => {
           children: 'Visit ',
           key: expect.any(String),
           props: {
-            color: mockTheme.colors.info.default,
+            color: TextColor.PrimaryDefault,
+            fontWeight: undefined,
             style: {
-              fontWeight: undefined,
               textAlign: undefined,
             },
             variant: undefined,
@@ -120,9 +121,9 @@ describe('link component', () => {
           children: 'Visit ',
           key: expect.any(String),
           props: {
-            color: mockTheme.colors.info.default,
+            color: TextColor.PrimaryDefault,
+            fontWeight: undefined,
             style: {
-              fontWeight: undefined,
               textAlign: undefined,
             },
             variant: undefined,
@@ -133,9 +134,9 @@ describe('link component', () => {
           children: 'MetaMask',
           key: expect.any(String),
           props: {
-            color: mockTheme.colors.info.default,
+            color: TextColor.PrimaryDefault,
+            fontWeight: undefined,
             style: {
-              fontWeight: undefined,
               textAlign: undefined,
             },
             variant: undefined,
diff --git a/app/components/Snaps/SnapUIRenderer/components/link.ts b/app/components/Snaps/SnapUIRenderer/components/link.ts
index 2230e49430a1..06063fe07e6d 100644
--- a/app/components/Snaps/SnapUIRenderer/components/link.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/link.ts
@@ -1,6 +1,7 @@
 import { LinkElement, JSXElement } from '@metamask/snaps-sdk/jsx';
 import { getJsxChildren } from '@metamask/snaps-utils';
 import { NonEmptyArray } from '@metamask/utils';
+import { TextColor } from '@metamask/design-system-react-native';
 import { mapTextToTemplate } from '../utils';
 import { UIComponentFactory } from './types';
 
@@ -8,8 +9,6 @@ export const link: UIComponentFactory<LinkElement> = ({
   element: e,
   ...params
 }) => {
-  const linkColor = params.theme.colors.info.default;
-
   const processedChildren = getJsxChildren(e).map((child) => {
     if (typeof child === 'string') {
       return child;
@@ -32,7 +31,7 @@ export const link: UIComponentFactory<LinkElement> = ({
     element: 'SnapUILink',
     children: mapTextToTemplate(
       processedChildren as NonEmptyArray<string | JSXElement>,
-      { ...params, textColor: linkColor },
+      { ...params, textColor: TextColor.PrimaryDefault },
     ),
     props: {
       href: e.props.href,
diff --git a/app/components/Snaps/SnapUIRenderer/components/text.test.ts b/app/components/Snaps/SnapUIRenderer/components/text.test.ts
index de82a8c00e3f..138055c77014 100644
--- a/app/components/Snaps/SnapUIRenderer/components/text.test.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/text.test.ts
@@ -1,10 +1,11 @@
-import { text } from './text';
+import { TextElement } from '@metamask/snaps-sdk/jsx';
 import {
+  FontWeight,
   TextColor,
   TextVariant,
-} from '../../../../component-library/components/Texts/Text/Text.types';
-import { TextElement } from '@metamask/snaps-sdk/jsx';
+} from '@metamask/design-system-react-native';
 import { mockTheme } from '../../../../util/theme';
+import { text } from './text';
 
 describe('text component', () => {
   const defaultParams = {
@@ -35,19 +36,19 @@ describe('text component', () => {
           children: 'Hello World',
           props: {
             color: undefined,
-            variant: 'sBodyMD',
+            variant: TextVariant.BodyMd,
+            fontWeight: FontWeight.Regular,
             style: {
-              fontWeight: '400',
               textAlign: 'left',
             },
           },
         },
       ],
       props: {
-        variant: TextVariant.BodyMD,
+        variant: TextVariant.BodyMd,
         color: undefined,
+        fontWeight: FontWeight.Regular,
         style: {
-          fontWeight: '400',
           textAlign: 'left',
         },
       },
@@ -55,18 +56,21 @@ describe('text component', () => {
   });
 
   it('should handle different text colors', () => {
-    const colors: TextElement['props']['color'][] = [
-      'default',
-      'alternative',
-      'muted',
-      'error',
-      'success',
-      'warning',
-    ];
-
-    colors.forEach((color) => {
-      if (!color) return;
+    const colorMap: Record<
+      NonNullable<TextElement['props']['color']>,
+      string
+    > = {
+      default: TextColor.TextDefault,
+      alternative: TextColor.TextAlternative,
+      muted: TextColor.TextMuted,
+      error: TextColor.ErrorDefault,
+      success: TextColor.SuccessDefault,
+      warning: TextColor.WarningDefault,
+    };
 
+    (
+      Object.keys(colorMap) as NonNullable<TextElement['props']['color']>[]
+    ).forEach((color) => {
       const el: TextElement = {
         type: 'Text',
         props: { color, children: ['Test'] },
@@ -74,10 +78,7 @@ describe('text component', () => {
       };
 
       const result = text({ element: el, ...defaultParams });
-      const capitalizedColor = color.charAt(0).toUpperCase() + color.slice(1);
-      expect(result.props?.color).toBe(
-        TextColor[capitalizedColor as keyof typeof TextColor],
-      );
+      expect(result.props?.color).toBe(colorMap[color]);
     });
   });
 
@@ -85,9 +86,9 @@ describe('text component', () => {
     const weights = ['bold', 'medium', 'regular'] as const;
 
     const expectedWeights = {
-      bold: '600',
-      medium: '500',
-      regular: '400',
+      bold: FontWeight.Bold,
+      medium: FontWeight.Medium,
+      regular: FontWeight.Regular,
     };
 
     weights.forEach((weight) => {
@@ -98,10 +99,7 @@ describe('text component', () => {
       };
 
       const result = text({ element: el, ...defaultParams });
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      expect((result.props as any)?.style?.fontWeight).toBe(
-        expectedWeights[weight],
-      );
+      expect(result.props?.fontWeight).toBe(expectedWeights[weight]);
     });
   });
 
@@ -137,6 +135,6 @@ describe('text component', () => {
     };
 
     const result = text({ element: el, ...defaultParams });
-    expect(result.props?.variant).toBe(TextVariant.BodySM);
+    expect(result.props?.variant).toBe(TextVariant.BodySm);
   });
 });
diff --git a/app/components/Snaps/SnapUIRenderer/components/text.ts b/app/components/Snaps/SnapUIRenderer/components/text.ts
index 770477a662bb..23d2b7fee14d 100644
--- a/app/components/Snaps/SnapUIRenderer/components/text.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/text.ts
@@ -1,45 +1,45 @@
 import { JSXElement, TextElement } from '@metamask/snaps-sdk/jsx';
 import { getJsxChildren } from '@metamask/snaps-utils';
 import { NonEmptyArray } from '@metamask/utils';
-import { mapTextToTemplate } from '../utils';
-import { UIComponentFactory } from './types';
 import {
+  FontWeight,
   TextColor,
   TextVariant,
-} from '../../../../component-library/components/Texts/Text/Text.types';
-import { typography } from '@metamask/design-tokens';
+} from '@metamask/design-system-react-native';
+import { mapTextToTemplate } from '../utils';
+import { UIComponentFactory } from './types';
 
 function getTextColor(color: TextElement['props']['color']) {
   switch (color) {
     case 'default':
-      return TextColor.Default;
+      return TextColor.TextDefault;
     case 'alternative':
-      return TextColor.Alternative;
+      return TextColor.TextAlternative;
     case 'muted':
-      return TextColor.Muted;
+      return TextColor.TextMuted;
     case 'error':
-      return TextColor.Error;
+      return TextColor.ErrorDefault;
     case 'success':
-      return TextColor.Success;
+      return TextColor.SuccessDefault;
     case 'warning':
-      return TextColor.Warning;
+      return TextColor.WarningDefault;
     default:
       return null;
   }
 }
 
 function getFontWeight(
-  color: TextElement['props']['fontWeight'],
+  fontWeight: TextElement['props']['fontWeight'],
   inheritedWeight?: string,
 ) {
-  switch (color ?? inheritedWeight) {
-    case 'bold':
-      return typography.sBodyMDBold.fontWeight;
-    case 'medium':
-      return typography.sBodyMDMedium.fontWeight;
-    case 'regular':
+  switch (fontWeight ?? inheritedWeight) {
+    case FontWeight.Bold:
+      return FontWeight.Bold;
+    case FontWeight.Medium:
+      return FontWeight.Medium;
+    case FontWeight.Regular:
     default:
-      return typography.sBodyMD.fontWeight;
+      return FontWeight.Regular;
   }
 }
 
@@ -65,11 +65,11 @@ function getTextVariant(
 ) {
   switch (size) {
     case 'md':
-      return TextVariant.BodyMD;
+      return TextVariant.BodyMd;
     case 'sm':
-      return TextVariant.BodySM;
+      return TextVariant.BodySm;
     default:
-      return inheritedVariant ?? TextVariant.BodyMD;
+      return inheritedVariant ?? TextVariant.BodyMd;
   }
 }
 
@@ -103,8 +103,8 @@ export const text: UIComponentFactory<TextElement> = ({
     props: {
       variant: textVariant,
       color: textColor,
+      fontWeight: textFontWeight,
       style: {
-        fontWeight: textFontWeight,
         textAlign: textAlignment,
       },
     },
diff --git a/app/components/Snaps/SnapUIRenderer/components/tooltip.test.ts b/app/components/Snaps/SnapUIRenderer/components/tooltip.test.ts
index 500136d7c9d7..26dff8115ae0 100644
--- a/app/components/Snaps/SnapUIRenderer/components/tooltip.test.ts
+++ b/app/components/Snaps/SnapUIRenderer/components/tooltip.test.ts
@@ -37,9 +37,9 @@ describe('tooltip component', () => {
               children: 'Hover me',
               props: {
                 color: undefined,
-                variant: 'sBodyMD',
+                variant: 'body-md',
+                fontWeight: 'regular',
                 style: {
-                  fontWeight: '400',
                   textAlign: 'left',
                 },
               },
@@ -48,11 +48,11 @@ describe('tooltip component', () => {
           ],
           props: {
             color: undefined,
+            fontWeight: 'regular',
             style: {
-              fontWeight: '400',
               textAlign: 'left',
             },
-            variant: 'sBodyMD',
+            variant: 'body-md',
           },
           key: expect.any(String),
         },
@@ -66,9 +66,9 @@ describe('tooltip component', () => {
               children: 'Tooltip content',
               props: {
                 color: undefined,
-                variant: 'sBodyMD',
+                variant: 'body-md',
+                fontWeight: 'regular',
                 style: {
-                  fontWeight: '400',
                   textAlign: 'left',
                 },
               },
@@ -77,11 +77,11 @@ describe('tooltip component', () => {
           ],
           props: {
             color: undefined,
+            fontWeight: 'regular',
             style: {
-              fontWeight: '400',
               textAlign: 'left',
             },
-            variant: 'sBodyMD',
+            variant: 'body-md',
           },
           key: expect.any(String),
         },
@@ -115,9 +115,9 @@ describe('tooltip component', () => {
               children: 'Hover me',
               props: {
                 color: undefined,
-                variant: 'sBodyMD',
+                variant: 'body-md',
+                fontWeight: 'regular',
                 style: {
-                  fontWeight: '400',
                   textAlign: 'left',
                 },
               },
@@ -126,11 +126,11 @@ describe('tooltip component', () => {
           ],
           props: {
             color: undefined,
+            fontWeight: 'regular',
             style: {
-              fontWeight: '400',
               textAlign: 'left',
             },
-            variant: 'sBodyMD',
+            variant: 'body-md',
           },
           key: expect.any(String),
         },
@@ -144,9 +144,9 @@ describe('tooltip component', () => {
               children: 'Complex content',
               props: {
                 color: undefined,
-                variant: 'sBodyMD',
+                variant: 'body-md',
+                fontWeight: 'regular',
                 style: {
-                  fontWeight: '400',
                   textAlign: 'left',
                 },
               },
@@ -155,11 +155,11 @@ describe('tooltip component', () => {
           ],
           props: {
             color: undefined,
+            fontWeight: 'regular',
             style: {
-              fontWeight: '400',
               textAlign: 'left',
             },
-            variant: 'sBodyMD',
+            variant: 'body-md',
           },
           key: expect.any(String),
         },
@@ -193,9 +193,9 @@ describe('tooltip component', () => {
               children: 'Nested text',
               props: {
                 color: undefined,
-                variant: 'sBodyMD',
+                variant: 'body-md',
+                fontWeight: 'regular',
                 style: {
-                  fontWeight: '400',
                   textAlign: 'left',
                 },
               },
@@ -204,11 +204,11 @@ describe('tooltip component', () => {
           ],
           props: {
             color: undefined,
+            fontWeight: 'regular',
             style: {
-              fontWeight: '400',
               textAlign: 'left',
             },
-            variant: 'sBodyMD',
+            variant: 'body-md',
           },
           key: expect.any(String),
         },
@@ -222,9 +222,9 @@ describe('tooltip component', () => {
               children: 'Tooltip content',
               props: {
                 color: undefined,
-                variant: 'sBodyMD',
+                variant: 'body-md',
+                fontWeight: 'regular',
                 style: {
-                  fontWeight: '400',
                   textAlign: 'left',
                 },
               },
@@ -233,11 +233,11 @@ describe('tooltip component', () => {
           ],
           props: {
             color: undefined,
+            fontWeight: 'regular',
             style: {
-              fontWeight: '400',
               textAlign: 'left',
             },
-            variant: 'sBodyMD',
+            variant: 'body-md',
           },
           key: expect.any(String),
         },
diff --git a/app/components/Snaps/SnapUIRenderer/utils.test.ts b/app/components/Snaps/SnapUIRenderer/utils.test.ts
index 06d3f502089a..33e5cb4ddd7c 100644
--- a/app/components/Snaps/SnapUIRenderer/utils.test.ts
+++ b/app/components/Snaps/SnapUIRenderer/utils.test.ts
@@ -36,11 +36,11 @@ describe('SnapUIRenderer utils', () => {
               "key": "{"type":"Text","name":null,"children":"Test Content"}_2",
               "props": {
                 "color": undefined,
+                "fontWeight": "regular",
                 "style": {
-                  "fontWeight": "400",
                   "textAlign": "left",
                 },
-                "variant": "sBodyMD",
+                "variant": "body-md",
               },
             },
           ],
@@ -48,11 +48,11 @@ describe('SnapUIRenderer utils', () => {
           "key": "{"type":"Text","name":null,"children":"Test Content"}_1",
           "props": {
             "color": undefined,
+            "fontWeight": "regular",
             "style": {
-              "fontWeight": "400",
               "textAlign": "left",
             },
-            "variant": "sBodyMD",
+            "variant": "body-md",
           },
         }
       `);
diff --git a/app/components/Snaps/SnapUIRenderer/utils.ts b/app/components/Snaps/SnapUIRenderer/utils.ts
index 618131e3ae8a..184544fba0f6 100644
--- a/app/components/Snaps/SnapUIRenderer/utils.ts
+++ b/app/components/Snaps/SnapUIRenderer/utils.ts
@@ -189,8 +189,8 @@ export const mapTextToTemplate = (
         props: {
           variant: params.textVariant,
           color: params.textColor,
+          fontWeight: params.textFontWeight,
           style: {
-            fontWeight: params.textFontWeight,
             textAlign: params.textAlignment,
           },
         },
diff --git a/app/components/UI/AssetActivation/AssetActivateCard.test.tsx b/app/components/UI/AssetActivation/AssetActivateCard.test.tsx
new file mode 100644
index 000000000000..6700a869d1c9
--- /dev/null
+++ b/app/components/UI/AssetActivation/AssetActivateCard.test.tsx
@@ -0,0 +1,133 @@
+import React from 'react';
+import { render, userEvent, act } from '@testing-library/react-native';
+import type { CaipAssetType } from '@metamask/utils';
+
+import { strings } from '../../../../locales/i18n';
+import Routes from '../../../constants/navigation/Routes';
+import NotificationManager from '../../../core/NotificationManager';
+import type { TokenI } from '../Tokens/types';
+import {
+  AssetActivateCard,
+  AssetActivateCardTestIds,
+} from './AssetActivateCard';
+
+const PUBNET_USDC_ASSET =
+  'stellar:pubnet/asset:USDC-GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN' as CaipAssetType;
+
+const mockNavigate = jest.fn();
+const mockActivateAsset = jest.fn();
+
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({
+    navigate: mockNavigate,
+  }),
+}));
+
+jest.mock('../TokenDetails/hooks/useAssetActivation', () => ({
+  useAssetActivation: () => ({
+    activateAsset: mockActivateAsset,
+    isActivating: false,
+  }),
+}));
+
+jest.mock('../../../core/NotificationManager', () => ({
+  showSimpleNotification: jest.fn(),
+}));
+
+const STELLAR_TOKEN = {
+  address: PUBNET_USDC_ASSET,
+  chainId: 'stellar:pubnet',
+  symbol: 'USDC',
+  name: 'USD Coin',
+  decimals: 7,
+  balance: '0',
+  balanceFiat: '$0',
+  logo: '',
+  image: '',
+  isETH: false,
+  hasBalanceError: false,
+  aggregators: [],
+} as TokenI;
+
+describe('AssetActivateCard', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockActivateAsset.mockResolvedValue({
+      success: true,
+      errorMessage: null,
+    });
+  });
+
+  it('renders the activate card with asset and chain details', () => {
+    const { getByTestId, getByText } = render(
+      <AssetActivateCard token={STELLAR_TOKEN} chainName="Stellar" />,
+    );
+
+    expect(getByTestId(AssetActivateCardTestIds.CONTAINER)).toBeOnTheScreen();
+    expect(getByTestId(AssetActivateCardTestIds.BUTTON)).toBeOnTheScreen();
+    expect(
+      getByText(
+        strings('asset_activation.activate_description', {
+          symbol: 'USDC',
+          chainName: 'Stellar',
+        }),
+      ),
+    ).toBeOnTheScreen();
+  });
+
+  it('navigates to transactions view when activation succeeds', async () => {
+    const { getByTestId } = render(
+      <AssetActivateCard token={STELLAR_TOKEN} chainName="Stellar" />,
+    );
+
+    await act(async () => {
+      await userEvent.press(getByTestId(AssetActivateCardTestIds.BUTTON));
+    });
+
+    expect(mockActivateAsset).toHaveBeenCalled();
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.TRANSACTIONS_VIEW);
+    expect(NotificationManager.showSimpleNotification).not.toHaveBeenCalled();
+  });
+
+  it('shows an error notification when activation fails', async () => {
+    mockActivateAsset.mockResolvedValue({
+      success: false,
+      errorMessage: 'activate error',
+    });
+
+    const { getByTestId } = render(
+      <AssetActivateCard token={STELLAR_TOKEN} chainName="Stellar" />,
+    );
+
+    await act(async () => {
+      await userEvent.press(getByTestId(AssetActivateCardTestIds.BUTTON));
+    });
+
+    expect(NotificationManager.showSimpleNotification).toHaveBeenCalledWith({
+      status: 'error',
+      duration: 5000,
+      title: strings('transactions.activity_trustline_activation_failed'),
+      description: 'activate error',
+    });
+    expect(mockNavigate).not.toHaveBeenCalled();
+  });
+
+  it('does not navigate or notify when activation is cancelled', async () => {
+    mockActivateAsset.mockResolvedValue({
+      success: false,
+      errorMessage: null,
+    });
+
+    const { getByTestId } = render(
+      <AssetActivateCard token={STELLAR_TOKEN} chainName="Stellar" />,
+    );
+
+    await act(async () => {
+      await userEvent.press(getByTestId(AssetActivateCardTestIds.BUTTON));
+    });
+
+    expect(mockActivateAsset).toHaveBeenCalled();
+    expect(mockNavigate).not.toHaveBeenCalled();
+    expect(NotificationManager.showSimpleNotification).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/AssetActivation/AssetActivateCard.tsx b/app/components/UI/AssetActivation/AssetActivateCard.tsx
new file mode 100644
index 000000000000..ae4d69f52ea5
--- /dev/null
+++ b/app/components/UI/AssetActivation/AssetActivateCard.tsx
@@ -0,0 +1,96 @@
+import React, { useCallback } from 'react';
+import { useNavigation } from '@react-navigation/native';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import Button, {
+  ButtonSize,
+  ButtonVariants,
+  ButtonWidthTypes,
+} from '../../../component-library/components/Buttons/Button';
+import { strings } from '../../../../locales/i18n';
+import type { TokenI } from '../Tokens/types';
+import { useAssetActivation } from '../TokenDetails/hooks/useAssetActivation';
+import Routes from '../../../constants/navigation/Routes';
+import NotificationManager from '../../../core/NotificationManager';
+
+export const AssetActivateCardTestIds = {
+  CONTAINER: 'asset-activate-card',
+  BUTTON: 'asset-activate-button',
+} as const;
+
+export interface AssetActivateCardProps {
+  token: TokenI;
+  chainName: string;
+}
+
+export const AssetActivateCard = ({
+  token,
+  chainName,
+}: AssetActivateCardProps) => {
+  const navigation = useNavigation();
+  const { activateAsset, isActivating } = useAssetActivation({
+    assetId: token.address,
+    assetSymbol: token.symbol,
+  });
+
+  const handleActivate = useCallback(async () => {
+    const { success, errorMessage } = await activateAsset();
+
+    if (errorMessage) {
+      NotificationManager.showSimpleNotification({
+        status: 'error',
+        duration: 5000,
+        title: strings('transactions.activity_trustline_activation_failed'),
+        description: errorMessage,
+      });
+      return;
+    }
+
+    if (success) {
+      navigation.navigate(Routes.TRANSACTIONS_VIEW);
+    }
+  }, [activateAsset, navigation]);
+
+  return (
+    <Box testID={AssetActivateCardTestIds.CONTAINER} twClassName="px-4 mt-3">
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Start}
+        twClassName="rounded-xl bg-warning-muted p-4 gap-3"
+      >
+        <Icon
+          name={IconName.Danger}
+          size={IconSize.Lg}
+          color={IconColor.WarningDefault}
+        />
+        <Box flexDirection={BoxFlexDirection.Column} twClassName="flex-1 gap-2">
+          <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Regular}>
+            {strings('asset_activation.activate_description', {
+              symbol: token.symbol,
+              chainName,
+            })}
+          </Text>
+          <Button
+            variant={ButtonVariants.Primary}
+            size={ButtonSize.Sm}
+            width={ButtonWidthTypes.Auto}
+            label={strings('asset_activation.activate')}
+            onPress={handleActivate}
+            disabled={isActivating}
+            testID={AssetActivateCardTestIds.BUTTON}
+          />
+        </Box>
+      </Box>
+    </Box>
+  );
+};
diff --git a/app/components/UI/AssetActivation/AssetInactiveBadge.test.tsx b/app/components/UI/AssetActivation/AssetInactiveBadge.test.tsx
new file mode 100644
index 000000000000..6cadafa1a3c8
--- /dev/null
+++ b/app/components/UI/AssetActivation/AssetInactiveBadge.test.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { render } from '@testing-library/react-native';
+import { strings } from '../../../../locales/i18n';
+import {
+  AssetInactiveBadge,
+  AssetInactiveBadgeTestIds,
+} from './AssetInactiveBadge';
+
+describe('AssetInactiveBadge', () => {
+  it('renders the inactive label with warning styling', () => {
+    const { getByTestId, getByText } = render(<AssetInactiveBadge />);
+
+    expect(getByText(strings('asset_activation.inactive'))).toBeOnTheScreen();
+    expect(getByTestId(AssetInactiveBadgeTestIds.BADGE)).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/AssetActivation/AssetInactiveBadge.tsx b/app/components/UI/AssetActivation/AssetInactiveBadge.tsx
new file mode 100644
index 000000000000..e9dc7ab4a8a3
--- /dev/null
+++ b/app/components/UI/AssetActivation/AssetInactiveBadge.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { Tag, TagSeverity } from '@metamask/design-system-react-native';
+import { strings } from '../../../../locales/i18n';
+
+export const AssetInactiveBadgeTestIds = {
+  BADGE: 'asset-inactive-badge',
+} as const;
+
+export const AssetInactiveBadge = () => (
+  <Tag
+    severity={TagSeverity.Warning}
+    twClassName="rounded-full"
+    testID={AssetInactiveBadgeTestIds.BADGE}
+  >
+    {strings('asset_activation.inactive')}
+  </Tag>
+);
diff --git a/app/components/UI/AssetOverview/PriceChart/PriceChart.context.test.tsx b/app/components/UI/AssetOverview/PriceChart/PriceChart.context.test.tsx
new file mode 100644
index 000000000000..11156eace29f
--- /dev/null
+++ b/app/components/UI/AssetOverview/PriceChart/PriceChart.context.test.tsx
@@ -0,0 +1,105 @@
+import React from 'react';
+import { Text, TouchableOpacity } from 'react-native';
+import { render, renderHook, fireEvent } from '@testing-library/react-native';
+import { PriceChartProvider, usePriceChart } from './PriceChart.context';
+
+type PriceChartContextValue = ReturnType<typeof usePriceChart>;
+
+const TOGGLE_TEST_ID = 'toggle-chart-touch';
+
+describe('PriceChart.context', () => {
+  let renderedValues: PriceChartContextValue[] = [];
+
+  const Consumer = () => {
+    const value = usePriceChart();
+    renderedValues.push(value);
+
+    return (
+      <TouchableOpacity
+        testID={TOGGLE_TEST_ID}
+        onPress={() => value.setIsChartBeingTouched(!value.isChartBeingTouched)}
+      >
+        <Text>{value.isChartBeingTouched ? 'touched' : 'idle'}</Text>
+      </TouchableOpacity>
+    );
+  };
+
+  beforeEach(() => {
+    renderedValues = [];
+  });
+
+  describe('usePriceChart without a provider', () => {
+    it('exposes an untouched chart by default', () => {
+      const { result } = renderHook(() => usePriceChart());
+
+      expect(result.current.isChartBeingTouched).toBe(false);
+    });
+
+    it('throws when the setter is called outside of a provider', () => {
+      const { result } = renderHook(() => usePriceChart());
+
+      expect(() => result.current.setIsChartBeingTouched(true)).toThrow(
+        'setIsChartBeingTouched() was called but no PriceChartProvider was found in the component tree.',
+      );
+    });
+  });
+
+  describe('PriceChartProvider', () => {
+    it('renders its children', () => {
+      const { getByText } = render(
+        <PriceChartProvider>
+          <Text>chart</Text>
+        </PriceChartProvider>,
+      );
+
+      expect(getByText('chart')).toBeOnTheScreen();
+    });
+
+    it('keeps the context value reference stable across re-renders with unchanged state', () => {
+      const { rerender } = render(
+        <PriceChartProvider>
+          <Consumer />
+        </PriceChartProvider>,
+      );
+
+      rerender(
+        <PriceChartProvider>
+          <Consumer />
+        </PriceChartProvider>,
+      );
+
+      expect(renderedValues).toHaveLength(2);
+      expect(renderedValues[1]).toBe(renderedValues[0]);
+    });
+
+    it('gives consumers a new context value when the touch state changes', () => {
+      const { getByTestId, getByText } = render(
+        <PriceChartProvider>
+          <Consumer />
+        </PriceChartProvider>,
+      );
+
+      fireEvent.press(getByTestId(TOGGLE_TEST_ID));
+
+      expect(getByText('touched')).toBeOnTheScreen();
+      const latestValue = renderedValues[renderedValues.length - 1];
+      expect(latestValue.isChartBeingTouched).toBe(true);
+      expect(latestValue).not.toBe(renderedValues[0]);
+    });
+
+    it('keeps the setter identity stable when the touch state changes', () => {
+      const { getByTestId } = render(
+        <PriceChartProvider>
+          <Consumer />
+        </PriceChartProvider>,
+      );
+
+      fireEvent.press(getByTestId(TOGGLE_TEST_ID));
+
+      const latestValue = renderedValues[renderedValues.length - 1];
+      expect(latestValue.setIsChartBeingTouched).toBe(
+        renderedValues[0].setIsChartBeingTouched,
+      );
+    });
+  });
+});
diff --git a/app/components/UI/AssetOverview/PriceChart/PriceChart.context.tsx b/app/components/UI/AssetOverview/PriceChart/PriceChart.context.tsx
index 168b4002f19a..30163668c154 100644
--- a/app/components/UI/AssetOverview/PriceChart/PriceChart.context.tsx
+++ b/app/components/UI/AssetOverview/PriceChart/PriceChart.context.tsx
@@ -1,4 +1,4 @@
-import React, { createContext, useContext, useState } from 'react';
+import React, { createContext, useContext, useMemo, useState } from 'react';
 
 interface PriceChartContextType {
   isChartBeingTouched: boolean;
@@ -24,10 +24,15 @@ export const PriceChartProvider = ({ children }: PriceChartProviderProps) => {
   const [isChartBeingTouched, setIsChartBeingTouched] =
     useState<boolean>(false);
 
+  // Keeps the context value identity stable so consumers only re-render when
+  // the touch flag actually flips, not on every provider re-render.
+  const value = useMemo(
+    () => ({ isChartBeingTouched, setIsChartBeingTouched }),
+    [isChartBeingTouched],
+  );
+
   return (
-    <PriceChartContext.Provider
-      value={{ isChartBeingTouched, setIsChartBeingTouched }}
-    >
+    <PriceChartContext.Provider value={value}>
       {children}
     </PriceChartContext.Provider>
   );
diff --git a/app/components/UI/AssetOverview/PriceChart/PriceChart.tsx b/app/components/UI/AssetOverview/PriceChart/PriceChart.tsx
index 9f48a9f8d8da..86d4875229f6 100644
--- a/app/components/UI/AssetOverview/PriceChart/PriceChart.tsx
+++ b/app/components/UI/AssetOverview/PriceChart/PriceChart.tsx
@@ -126,7 +126,12 @@ const PriceChart = ({
     return (width / 750) * size;
   };
 
-  const priceList = prices.map((_: TokenPrice) => _[1]);
+  // Memoize so scrub/gesture re-renders (positionX) do not re-map the series
+  // or invalidate the downstream stablecoin y-axis useMemo via a new array identity.
+  const priceList = useMemo(
+    () => prices.map((p: TokenPrice) => p[1]),
+    [prices],
+  );
 
   const endDotRadius = END_DOT_DIAMETER / 2;
   const endDotInsetRight = endDotRadius + 8;
diff --git a/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListItemV2.test.tsx b/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListItemV2.test.tsx
new file mode 100644
index 000000000000..f222c9b4e250
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListItemV2.test.tsx
@@ -0,0 +1,121 @@
+import React from 'react';
+import { fireEvent } from '@testing-library/react-native';
+import type { DeFiProtocolPositionGroup } from '@metamask/assets-controllers';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import DeFiPositionsListItemV2 from './DeFiPositionsListItemV2';
+import { backgroundState } from '../../../../../util/test/initial-root-state';
+import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import { AnalyticsEventBuilder } from '../../../../../util/analytics/AnalyticsEventBuilder';
+
+const mockNavigate = jest.fn();
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: () => ({
+    navigate: mockNavigate,
+  }),
+}));
+
+const mockTrackEvent = jest.fn();
+jest.mock('../../../../hooks/useAnalytics/useAnalytics', () => {
+  const { AnalyticsEventBuilder: MockAnalyticsEventBuilder } =
+    jest.requireActual('../../../../../util/analytics/AnalyticsEventBuilder');
+  return {
+    useAnalytics: () => ({
+      trackEvent: mockTrackEvent,
+      createEventBuilder: MockAnalyticsEventBuilder.createEventBuilder,
+    }),
+  };
+});
+
+const mockInitialState = {
+  engine: {
+    backgroundState,
+  },
+};
+
+const mockPosition: DeFiProtocolPositionGroup = {
+  protocolId: 'Aave V3',
+  productName: 'Aave V3',
+  protocolIconUrl: 'https://example.com/aave.png',
+  chainId: 'eip155:1',
+  marketValue: 1234.5,
+  iconGroup: [
+    { symbol: 'USDC', avatarValue: 'https://example.com/usdc.png' },
+    { symbol: 'DAI', avatarValue: 'https://example.com/dai.png' },
+  ],
+  sections: [
+    {
+      productName: 'Aave V3 Market',
+      positions: [
+        {
+          assetId: 'eip155:1/erc20:0x1111111111111111111111111111111111111111',
+          chainId: 'eip155:1',
+          symbol: 'USDC',
+          name: 'USD Coin',
+          decimals: 6,
+          balance: '1000',
+          marketValue: 1000,
+          positionType: 'deposit',
+          poolAddress: '0xpool',
+          groupId: 'g1',
+          tokenImage: 'https://example.com/usdc.png',
+        },
+      ],
+    },
+  ],
+};
+
+describe('DeFiPositionsListItemV2', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the protocol title, token summary, and aggregated value', async () => {
+    const { findByText } = renderWithProvider(
+      <DeFiPositionsListItemV2 position={mockPosition} privacyMode={false} />,
+      { state: mockInitialState },
+    );
+
+    expect(await findByText('Aave V3')).toBeOnTheScreen();
+    // Two icon-group entries render the "two_tokens" string.
+    expect(await findByText('USDC +1 other')).toBeOnTheScreen();
+    expect(await findByText('$1,234.50')).toBeOnTheScreen();
+  });
+
+  it('hides the market value in privacy mode', async () => {
+    const { findByText, queryByText } = renderWithProvider(
+      <DeFiPositionsListItemV2 position={mockPosition} privacyMode />,
+      { state: mockInitialState },
+    );
+
+    expect(await findByText('Aave V3')).toBeOnTheScreen();
+    expect(queryByText('$1,234.50')).not.toBeOnTheScreen();
+  });
+
+  it('navigates to the details screen and tracks the event on press', async () => {
+    const { getByText } = renderWithProvider(
+      <DeFiPositionsListItemV2 position={mockPosition} privacyMode={false} />,
+      { state: mockInitialState },
+    );
+
+    fireEvent.press(getByText('Aave V3'));
+
+    expect(mockNavigate).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenCalledWith('DeFiProtocolPositionDetails', {
+      protocolPositionGroup: mockPosition,
+      networkIconAvatar: expect.anything(),
+    });
+
+    expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      AnalyticsEventBuilder.createEventBuilder(
+        MetaMetricsEvents.DEFI_PROTOCOL_DETAILS_OPENED,
+      )
+        .addProperties({
+          chain_id: mockPosition.chainId,
+          protocol_id: mockPosition.protocolId,
+        })
+        .build(),
+    );
+  });
+});
diff --git a/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListItemV2.tsx b/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListItemV2.tsx
new file mode 100644
index 000000000000..df5c307066b8
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListItemV2.tsx
@@ -0,0 +1,155 @@
+import React, { useMemo } from 'react';
+import { TouchableOpacity, View } from 'react-native';
+import type { DeFiProtocolPositionGroup } from '@metamask/assets-controllers';
+import { useNavigation } from '@react-navigation/native';
+import type { Hex } from '@metamask/utils';
+import {
+  Text,
+  TextColor,
+  TextVariant,
+  FontWeight,
+  SensitiveText,
+  SensitiveTextLength,
+  AvatarGroup,
+  AvatarGroupSize,
+  AvatarGroupVariant,
+  type AvatarTokenProps,
+} from '@metamask/design-system-react-native';
+import I18n, { strings } from '../../../../../../locales/i18n';
+import { formatWithThreshold } from '../../../../../util/assets';
+import DeFiAvatarWithBadge from '../../../DeFiPositions/DeFiAvatarWithBadge';
+import styleSheet from '../../../DeFiPositions/DeFiPositionsListItem.styles';
+import { NetworkBadgeSource } from '../../../AssetOverview/Balance/Balance';
+import { useStyles } from '../../../../hooks/useStyles';
+import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
+import { WalletViewSelectorsIDs } from '../../../../Views/Wallet/WalletView.testIds';
+import { getMaybeHexChainId } from '../../../../../util/bridge';
+
+interface DeFiPositionsListItemV2Props {
+  position: DeFiProtocolPositionGroup;
+  privacyMode: boolean;
+}
+
+const DeFiPositionsListItemV2: React.FC<DeFiPositionsListItemV2Props> = ({
+  position,
+  privacyMode,
+}) => {
+  const { styles } = useStyles(styleSheet, undefined);
+  const { trackEvent, createEventBuilder } = useAnalytics();
+  const navigation = useNavigation();
+
+  const hexChainId = useMemo(
+    () => getMaybeHexChainId(position.chainId),
+    [position.chainId],
+  );
+
+  const networkIconAvatar = useMemo(
+    () => NetworkBadgeSource(hexChainId as Hex),
+    [hexChainId],
+  );
+
+  const {
+    tokenAvatars,
+    tokenNames,
+  }: { tokenAvatars: AvatarTokenProps[]; tokenNames: string } = useMemo(() => {
+    const icons = position.iconGroup;
+
+    const getTokenStringFromLength: Record<string, () => string> = {
+      0: () => '',
+      1: () =>
+        strings('defi_positions.single_token', {
+          symbol: icons[0]?.symbol,
+        }),
+      2: () =>
+        strings('defi_positions.two_tokens', {
+          symbol: icons[0]?.symbol,
+        }),
+      multiple: () =>
+        strings('defi_positions.multiple_tokens', {
+          symbol: icons[0]?.symbol,
+          count: icons.length - 1,
+        }),
+    };
+
+    const tokenStr =
+      getTokenStringFromLength[icons.length] ??
+      getTokenStringFromLength.multiple;
+
+    return {
+      tokenAvatars: icons.map((icon) => ({
+        name: icon.symbol,
+        src: icon.avatarValue
+          ? {
+              uri: icon.avatarValue,
+            }
+          : undefined,
+      })),
+      tokenNames: tokenStr(),
+    };
+  }, [position.iconGroup]);
+
+  const title = position.protocolId;
+
+  return (
+    <TouchableOpacity
+      testID={WalletViewSelectorsIDs.DEFI_POSITION_LIST_ITEM(title)}
+      onPress={() => {
+        trackEvent(
+          createEventBuilder(MetaMetricsEvents.DEFI_PROTOCOL_DETAILS_OPENED)
+            .addProperties({
+              chain_id: position.chainId,
+              protocol_id: position.protocolId,
+            })
+            .build(),
+        );
+
+        navigation.navigate('DeFiProtocolPositionDetails', {
+          protocolPositionGroup: position,
+          networkIconAvatar,
+        });
+      }}
+      style={styles.listItemWrapper}
+    >
+      <DeFiAvatarWithBadge
+        networkIconAvatar={networkIconAvatar}
+        avatarName={title}
+        avatarIconUrl={position.protocolIconUrl}
+      />
+
+      <View style={styles.contentWrapper}>
+        <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+          {title}
+        </Text>
+        <Text
+          variant={TextVariant.BodySm}
+          fontWeight={FontWeight.Medium}
+          color={TextColor.TextAlternative}
+        >
+          {tokenNames}
+        </Text>
+      </View>
+
+      <View style={styles.balance}>
+        <SensitiveText
+          variant={TextVariant.BodyMd}
+          fontWeight={FontWeight.Medium}
+          isHidden={privacyMode}
+          length={SensitiveTextLength.Medium}
+        >
+          {formatWithThreshold(position.marketValue, 0.01, I18n.locale, {
+            style: 'currency',
+            currency: 'USD',
+          })}
+        </SensitiveText>
+        <AvatarGroup
+          variant={AvatarGroupVariant.Token}
+          avatarPropsArr={tokenAvatars}
+          size={AvatarGroupSize.Xs}
+        />
+      </View>
+    </TouchableOpacity>
+  );
+};
+
+export default DeFiPositionsListItemV2;
diff --git a/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListV2.test.tsx b/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListV2.test.tsx
new file mode 100644
index 000000000000..7625f29007f9
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListV2.test.tsx
@@ -0,0 +1,410 @@
+import React from 'react';
+import type { DeFiProtocolPositionGroup } from '@metamask/assets-controllers';
+import { act, waitFor } from '@testing-library/react-native';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import { backgroundState } from '../../../../../util/test/initial-root-state';
+import DeFiPositionsListV2 from './DeFiPositionsListV2';
+import type { UseDeFiPositionsV2Result } from '../hooks/useDeFiPositionsV2';
+import { strings } from '../../../../../../locales/i18n';
+import { WalletViewSelectorsIDs } from '../../../../Views/Wallet/WalletView.testIds';
+import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import { AnalyticsEventBuilder } from '../../../../../util/analytics/AnalyticsEventBuilder';
+
+const mockUseDeFiPositionsV2 = jest.fn();
+jest.mock('../hooks/useDeFiPositionsV2', () => ({
+  useDeFiPositionsV2: (opts: unknown) => mockUseDeFiPositionsV2(opts),
+}));
+
+const mockSelectTokenSortConfig = jest.fn();
+const mockSelectPrivacyMode = jest.fn();
+jest.mock('../../../../../selectors/preferencesController', () => ({
+  ...jest.requireActual('../../../../../selectors/preferencesController'),
+  selectTokenSortConfig: () => mockSelectTokenSortConfig(),
+  selectPrivacyMode: () => mockSelectPrivacyMode(),
+}));
+
+const mockSelectEnabledNetworks = jest.fn();
+jest.mock('../../../../../selectors/networkEnablementController', () => ({
+  ...jest.requireActual('../../../../../selectors/networkEnablementController'),
+  selectEnabledNetworksByNamespace: () => mockSelectEnabledNetworks(),
+}));
+
+const mockTrackEvent = jest.fn();
+jest.mock('../../../../hooks/useAnalytics/useAnalytics', () => {
+  const { AnalyticsEventBuilder: MockAnalyticsEventBuilder } =
+    jest.requireActual('../../../../../util/analytics/AnalyticsEventBuilder');
+  return {
+    useAnalytics: () => ({
+      trackEvent: mockTrackEvent,
+      createEventBuilder: MockAnalyticsEventBuilder.createEventBuilder,
+    }),
+  };
+});
+
+jest.mock('../../../DeFiPositions/DeFiPositionsControlBar', () => {
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: () => <View testID="control-bar" />,
+  };
+});
+
+jest.mock('../../../DefiEmptyState', () => {
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    DefiEmptyState: () => <View testID="defi-empty-state" />,
+  };
+});
+
+jest.mock('./DeFiPositionsListItemV2', () => ({
+  __esModule: true,
+  default: ({
+    position,
+    privacyMode,
+  }: {
+    position: DeFiProtocolPositionGroup;
+    privacyMode: boolean;
+  }) => {
+    const { Text: RNText } = jest.requireActual('react-native');
+    return (
+      <RNText testID="list-item">{`${position.protocolId}|${position.marketValue}|${String(
+        privacyMode,
+      )}`}</RNText>
+    );
+  },
+}));
+
+const mockInitialState = { engine: { backgroundState } };
+
+const makePosition = (
+  overrides: Partial<DeFiProtocolPositionGroup>,
+): DeFiProtocolPositionGroup => ({
+  protocolId: 'Aave V3',
+  productName: 'Aave V3',
+  protocolIconUrl: 'https://example.com/aave.png',
+  chainId: 'eip155:1',
+  marketValue: 100,
+  iconGroup: [],
+  sections: [],
+  ...overrides,
+});
+
+const makeHookResult = (
+  overrides: Partial<UseDeFiPositionsV2Result> = {},
+): UseDeFiPositionsV2Result => ({
+  positions: [],
+  isLoading: false,
+  isError: false,
+  hasFetched: true,
+  refresh: jest.fn().mockResolvedValue(undefined),
+  ...overrides,
+});
+
+const renderComponent = (isFullView = true) =>
+  renderWithProvider(<DeFiPositionsListV2 isFullView={isFullView} />, {
+    state: mockInitialState,
+  });
+
+describe('DeFiPositionsListV2', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockSelectTokenSortConfig.mockReturnValue({
+      key: 'tokenFiatAmount',
+      order: 'dsc',
+    });
+    mockSelectPrivacyMode.mockReturnValue(false);
+    mockSelectEnabledNetworks.mockReturnValue({ eip155: { '0x1': true } });
+    mockUseDeFiPositionsV2.mockReturnValue(makeHookResult());
+  });
+
+  it('fetches immediately (isVisible) since the full view is the viewport', () => {
+    renderComponent();
+
+    expect(mockUseDeFiPositionsV2).toHaveBeenCalledWith({
+      enabled: true,
+      isVisible: true,
+    });
+  });
+
+  it('renders the loading message when loading', () => {
+    mockUseDeFiPositionsV2.mockReturnValue(makeHookResult({ isLoading: true }));
+
+    const { getByText, queryByTestId } = renderComponent();
+
+    expect(
+      getByText(strings('defi_positions.loading_positions')),
+    ).toBeOnTheScreen();
+    expect(queryByTestId('control-bar')).toBeNull();
+  });
+
+  it('renders the loading message before the first fetch settles', () => {
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({ hasFetched: false }),
+    );
+
+    const { getByText, queryByTestId } = renderComponent();
+
+    expect(
+      getByText(strings('defi_positions.loading_positions')),
+    ).toBeOnTheScreen();
+    expect(queryByTestId('defi-empty-state')).toBeNull();
+    expect(queryByTestId('control-bar')).toBeNull();
+  });
+
+  it('renders the error messages when in error state', () => {
+    mockUseDeFiPositionsV2.mockReturnValue(makeHookResult({ isError: true }));
+
+    const { getByText } = renderComponent();
+
+    expect(
+      getByText(strings('defi_positions.error_cannot_load_page')),
+    ).toBeOnTheScreen();
+    expect(
+      getByText(strings('defi_positions.error_visit_again')),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the control bar and list items when ready with items', () => {
+    mockSelectPrivacyMode.mockReturnValue(true);
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({
+        positions: [makePosition({ protocolId: 'Aave V3', marketValue: 100 })],
+      }),
+    );
+
+    const { getByTestId, getAllByTestId } = renderComponent();
+
+    expect(getByTestId('control-bar')).toBeOnTheScreen();
+    expect(
+      getByTestId(WalletViewSelectorsIDs.DEFI_POSITIONS_LIST),
+    ).toBeOnTheScreen();
+    const items = getAllByTestId('list-item');
+    expect(items).toHaveLength(1);
+    expect(items[0]).toHaveTextContent('Aave V3|100|true');
+  });
+
+  it('renders the empty state when ready with no items', () => {
+    const { getByTestId, queryByTestId } = renderComponent();
+
+    expect(getByTestId('defi-empty-state')).toBeOnTheScreen();
+    expect(
+      queryByTestId(WalletViewSelectorsIDs.DEFI_POSITIONS_LIST),
+    ).toBeNull();
+  });
+
+  it('filters out positions on disabled EVM networks', () => {
+    mockSelectEnabledNetworks.mockReturnValue({ eip155: { '0x1': true } });
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({
+        positions: [
+          makePosition({ protocolId: 'OnMainnet', chainId: 'eip155:1' }),
+          makePosition({ protocolId: 'OnPolygon', chainId: 'eip155:137' }),
+        ],
+      }),
+    );
+
+    const { getAllByTestId } = renderComponent();
+
+    const items = getAllByTestId('list-item');
+    expect(items).toHaveLength(1);
+    expect(items[0]).toHaveTextContent('OnMainnet|100|false');
+  });
+
+  it('keeps non-EVM positions regardless of the enabled EVM networks', () => {
+    mockSelectEnabledNetworks.mockReturnValue({ eip155: { '0x1': true } });
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({
+        positions: [
+          makePosition({
+            protocolId: 'Solana',
+            chainId:
+              'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' as DeFiProtocolPositionGroup['chainId'],
+          }),
+        ],
+      }),
+    );
+
+    const { getAllByTestId } = renderComponent();
+
+    expect(getAllByTestId('list-item')[0]).toHaveTextContent(
+      'Solana|100|false',
+    );
+  });
+
+  it('sorts by fiat value descending', () => {
+    mockSelectTokenSortConfig.mockReturnValue({
+      key: 'tokenFiatAmount',
+      order: 'dsc',
+    });
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({
+        positions: [
+          makePosition({ protocolId: 'Low', marketValue: 10 }),
+          makePosition({ protocolId: 'High', marketValue: 900 }),
+        ],
+      }),
+    );
+
+    const { getAllByTestId } = renderComponent();
+
+    const items = getAllByTestId('list-item').map((n) => n.props.children);
+    expect(items[0]).toContain('High');
+    expect(items[1]).toContain('Low');
+  });
+
+  it('sorts by fiat value ascending', () => {
+    mockSelectTokenSortConfig.mockReturnValue({
+      key: 'tokenFiatAmount',
+      order: 'asc',
+    });
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({
+        positions: [
+          makePosition({ protocolId: 'High', marketValue: 900 }),
+          makePosition({ protocolId: 'Low', marketValue: 10 }),
+        ],
+      }),
+    );
+
+    const { getAllByTestId } = renderComponent();
+
+    const items = getAllByTestId('list-item').map((n) => n.props.children);
+    expect(items[0]).toContain('Low');
+    expect(items[1]).toContain('High');
+  });
+
+  it('sorts by protocol name when not sorting by fiat value', () => {
+    mockSelectTokenSortConfig.mockReturnValue({ key: 'name', order: 'asc' });
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({
+        positions: [
+          makePosition({ protocolId: 'Zebra', marketValue: 900 }),
+          makePosition({ protocolId: 'Alpha', marketValue: 10 }),
+        ],
+      }),
+    );
+
+    const { getAllByTestId } = renderComponent();
+
+    const items = getAllByTestId('list-item').map((n) => n.props.children);
+    expect(items[0]).toContain('Alpha');
+    expect(items[1]).toContain('Zebra');
+  });
+
+  it('renders a scroll view with pull-to-refresh in full view', () => {
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({
+        positions: [makePosition({})],
+      }),
+    );
+
+    const { getByTestId } = renderComponent(true);
+
+    expect(
+      getByTestId(WalletViewSelectorsIDs.DEFI_POSITIONS_SCROLL_VIEW),
+    ).toBeOnTheScreen();
+  });
+
+  it('calls refresh when pulled to refresh in full view', async () => {
+    const refresh = jest.fn().mockResolvedValue(undefined);
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({
+        positions: [makePosition({})],
+        refresh,
+      }),
+    );
+
+    const { getByTestId } = renderComponent(true);
+
+    const scrollView = getByTestId(
+      WalletViewSelectorsIDs.DEFI_POSITIONS_SCROLL_VIEW,
+    );
+    await act(async () => {
+      await scrollView.props.refreshControl.props.onRefresh();
+    });
+
+    expect(refresh).toHaveBeenCalledTimes(1);
+    await waitFor(() =>
+      expect(
+        getByTestId(WalletViewSelectorsIDs.DEFI_POSITIONS_SCROLL_VIEW).props
+          .refreshControl.props.refreshing,
+      ).toBe(false),
+    );
+  });
+
+  it('tracks the position screen viewed event once when ready in full view', () => {
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({
+        positions: [
+          makePosition({ protocolId: 'A' }),
+          makePosition({ protocolId: 'B' }),
+          makePosition({ protocolId: 'C' }),
+        ],
+      }),
+    );
+
+    renderComponent(true);
+
+    expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      AnalyticsEventBuilder.createEventBuilder(
+        MetaMetricsEvents.POSITION_SCREEN_VIEWED,
+      )
+        .addProperties({
+          item_count: 3,
+          location: 'homepage',
+          is_empty: false,
+          screen_type: 'defi',
+        })
+        .build(),
+    );
+  });
+
+  it('reports is_empty when ready with no items', () => {
+    renderComponent(true);
+
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      AnalyticsEventBuilder.createEventBuilder(
+        MetaMetricsEvents.POSITION_SCREEN_VIEWED,
+      )
+        .addProperties({
+          item_count: 0,
+          location: 'homepage',
+          is_empty: true,
+          screen_type: 'defi',
+        })
+        .build(),
+    );
+  });
+
+  it('does not track the screen viewed event when not in full view', () => {
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({
+        positions: [makePosition({}), makePosition({ protocolId: 'B' })],
+      }),
+    );
+
+    renderComponent(false);
+
+    expect(mockTrackEvent).not.toHaveBeenCalled();
+  });
+
+  it('does not track the screen viewed event while loading', () => {
+    mockUseDeFiPositionsV2.mockReturnValue(makeHookResult({ isLoading: true }));
+
+    renderComponent(true);
+
+    expect(mockTrackEvent).not.toHaveBeenCalled();
+  });
+
+  it('does not track the screen viewed event before the first fetch settles', () => {
+    mockUseDeFiPositionsV2.mockReturnValue(
+      makeHookResult({ hasFetched: false }),
+    );
+
+    renderComponent(true);
+
+    expect(mockTrackEvent).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListV2.tsx b/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListV2.tsx
new file mode 100644
index 000000000000..7038d6e6f91f
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/components/DeFiPositionsListV2.tsx
@@ -0,0 +1,211 @@
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
+import { RefreshControl, ScrollViewProps, View } from 'react-native';
+import { useSelector } from 'react-redux';
+import {
+  Text,
+  TextColor,
+  TextVariant,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import styleSheet from '../../../DeFiPositions/DeFiPositionsList.styles';
+import {
+  selectPrivacyMode,
+  selectTokenSortConfig,
+} from '../../../../../selectors/preferencesController';
+import { selectEnabledNetworksByNamespace } from '../../../../../selectors/networkEnablementController';
+import { useStyles } from '../../../../hooks/useStyles';
+import { WalletViewSelectorsIDs } from '../../../../Views/Wallet/WalletView.testIds';
+import { DefiEmptyState } from '../../../DefiEmptyState';
+import ConditionalScrollView from '../../../../../component-library/components-temp/ConditionalScrollView';
+import DeFiPositionsControlBar from '../../../DeFiPositions/DeFiPositionsControlBar';
+import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
+import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import { useTheme } from '../../../../../util/theme';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import DeFiPositionsListItemV2 from './DeFiPositionsListItemV2';
+import { useDeFiPositionsV2 } from '../hooks/useDeFiPositionsV2';
+import { filterDeFiPositionsByEnabledNetworks } from '../utils/filter-defi-positions-by-enabled-networks';
+
+interface DeFiPositionsListV2Props {
+  isFullView: boolean;
+}
+
+/**
+ * DeFiPositionsListV2 - full view / list backed by the on-demand V2 controller.
+ * Fetches immediately (the full-view surface is the viewport), filters to the
+ * enabled EVM networks, sorts per user preference, and renders the list chrome.
+ */
+const DeFiPositionsListV2: React.FC<DeFiPositionsListV2Props> = ({
+  isFullView,
+}) => {
+  const { styles } = useStyles(styleSheet, undefined);
+  const { trackEvent, createEventBuilder } = useAnalytics();
+  const { colors } = useTheme();
+  const tw = useTailwind();
+  const hasTrackedScreenViewRef = useRef(false);
+
+  const tokenSortConfig = useSelector(selectTokenSortConfig);
+  const privacyMode = useSelector(selectPrivacyMode);
+  const enabledNetworksByNamespace = useSelector(
+    selectEnabledNetworksByNamespace,
+  );
+  const [refreshing, setRefreshing] = useState(false);
+
+  const { positions, isLoading, isError, hasFetched, refresh } =
+    useDeFiPositionsV2({
+      enabled: true,
+      // Full view / list surface is the viewport — fetch immediately when mounted.
+      isVisible: true,
+    });
+
+  const formattedPositions = useMemo(() => {
+    const filtered = filterDeFiPositionsByEnabledNetworks(
+      positions,
+      enabledNetworksByNamespace,
+    );
+
+    return [...filtered].sort((a, b) => {
+      if (tokenSortConfig.key === 'tokenFiatAmount') {
+        return tokenSortConfig.order === 'dsc'
+          ? b.marketValue - a.marketValue
+          : a.marketValue - b.marketValue;
+      }
+      const nameA = a.protocolId.toLowerCase();
+      const nameB = b.protocolId.toLowerCase();
+      return tokenSortConfig.order === 'dsc'
+        ? nameB.localeCompare(nameA)
+        : nameA.localeCompare(nameB);
+    });
+  }, [positions, enabledNetworksByNamespace, tokenSortConfig]);
+
+  const handleDeFiRefresh = useCallback(async () => {
+    setRefreshing(true);
+    try {
+      await refresh();
+    } finally {
+      setRefreshing(false);
+    }
+  }, [refresh]);
+
+  const listLength = formattedPositions.length;
+  // Idle before the deferred first fetch settles looks like loaded-empty
+  // (isLoading false, positions []). Gate on hasFetched like DeFiSectionV2.
+  const isReady = hasFetched && !isLoading && !isError;
+  const showIdlePlaceholder = !hasFetched && !isLoading && !isError;
+
+  const scrollViewProps = useMemo((): ScrollViewProps => {
+    const base: ScrollViewProps = {
+      testID: WalletViewSelectorsIDs.DEFI_POSITIONS_SCROLL_VIEW,
+    };
+    if (!isFullView) {
+      return base;
+    }
+    return {
+      ...base,
+      refreshControl: (
+        <RefreshControl
+          colors={[colors.primary.default]}
+          tintColor={colors.icon.default}
+          refreshing={refreshing}
+          onRefresh={handleDeFiRefresh}
+        />
+      ),
+      ...(listLength === 0 ? { contentContainerStyle: tw`flex-grow` } : {}),
+    };
+  }, [
+    isFullView,
+    listLength,
+    refreshing,
+    handleDeFiRefresh,
+    colors.primary.default,
+    colors.icon.default,
+    tw,
+  ]);
+
+  useEffect(() => {
+    if (!isFullView || !isReady || hasTrackedScreenViewRef.current) {
+      return;
+    }
+    hasTrackedScreenViewRef.current = true;
+    trackEvent(
+      createEventBuilder(MetaMetricsEvents.POSITION_SCREEN_VIEWED)
+        .addProperties({
+          item_count: listLength,
+          location: 'homepage',
+          is_empty: listLength === 0,
+          screen_type: 'defi',
+        })
+        .build(),
+    );
+  }, [isFullView, isReady, listLength, trackEvent, createEventBuilder]);
+
+  if (isLoading || showIdlePlaceholder) {
+    return (
+      <View style={styles.emptyView}>
+        <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+          {strings('defi_positions.loading_positions')}
+        </Text>
+      </View>
+    );
+  }
+
+  if (isError) {
+    return (
+      <View style={styles.emptyView}>
+        <Icon
+          name={IconName.Danger}
+          color={IconColor.IconAlternative}
+          size={IconSize.Md}
+        />
+        <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+          {strings('defi_positions.error_cannot_load_page')}
+        </Text>
+        <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+          {strings('defi_positions.error_visit_again')}
+        </Text>
+      </View>
+    );
+  }
+
+  const listBody =
+    listLength > 0 ? (
+      <View testID={WalletViewSelectorsIDs.DEFI_POSITIONS_LIST}>
+        {formattedPositions.map((position) => (
+          <DeFiPositionsListItemV2
+            key={`${position.chainId}-${position.protocolId}`}
+            position={position}
+            privacyMode={privacyMode}
+          />
+        ))}
+      </View>
+    ) : (
+      <DefiEmptyState twClassName="mx-auto mt-4" />
+    );
+
+  return (
+    <View
+      style={isFullView ? styles.wrapper : undefined}
+      testID={WalletViewSelectorsIDs.DEFI_POSITIONS_CONTAINER}
+    >
+      <DeFiPositionsControlBar />
+      <ConditionalScrollView
+        isScrollEnabled={isFullView}
+        scrollViewProps={isFullView ? scrollViewProps : undefined}
+      >
+        {listBody}
+      </ConditionalScrollView>
+    </View>
+  );
+};
+
+export default DeFiPositionsListV2;
diff --git a/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionDetailsV2.test.tsx b/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionDetailsV2.test.tsx
new file mode 100644
index 000000000000..788c8ab0d67c
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionDetailsV2.test.tsx
@@ -0,0 +1,142 @@
+import React from 'react';
+import type { DeFiProtocolPositionGroup } from '@metamask/assets-controllers';
+import { fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import { backgroundState } from '../../../../../util/test/initial-root-state';
+import DeFiProtocolPositionDetailsV2, {
+  DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID,
+} from './DeFiProtocolPositionDetailsV2';
+import { WalletViewSelectorsIDs } from '../../../../Views/Wallet/WalletView.testIds';
+import { CommonSelectorsIDs } from '../../../../../util/Common.testIds';
+
+const mockUseParams = jest.fn();
+jest.mock('../../../../../util/navigation/navUtils', () => ({
+  ...jest.requireActual('../../../../../util/navigation/navUtils'),
+  useParams: () => mockUseParams(),
+}));
+
+const mockSelectPrivacyMode = jest.fn();
+jest.mock('../../../../../selectors/preferencesController', () => ({
+  ...jest.requireActual('../../../../../selectors/preferencesController'),
+  selectPrivacyMode: () => mockSelectPrivacyMode(),
+}));
+
+const mockPop = jest.fn();
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: () => ({ pop: mockPop }),
+}));
+
+let mockLastGroupsProps: Record<string, unknown> | null = null;
+jest.mock('./DeFiProtocolPositionGroupsV2', () => ({
+  __esModule: true,
+  default: (props: Record<string, unknown>) => {
+    const { View } = jest.requireActual('react-native');
+    mockLastGroupsProps = props;
+    return <View testID="position-groups" />;
+  },
+}));
+
+const mockInitialState = { engine: { backgroundState } };
+
+const mockGroup: DeFiProtocolPositionGroup = {
+  protocolId: 'Aave V3',
+  productName: 'Aave V3',
+  protocolIconUrl: 'https://example.com/aave.png',
+  chainId: 'eip155:1',
+  marketValue: 4100.5,
+  iconGroup: [],
+  sections: [],
+};
+
+const renderWithGroup = (
+  group: DeFiProtocolPositionGroup | undefined = mockGroup,
+  networkIconAvatar: number | undefined = 42,
+) => {
+  mockUseParams.mockReturnValue({
+    protocolPositionGroup: group,
+    networkIconAvatar,
+  });
+  return renderWithProvider(<DeFiProtocolPositionDetailsV2 />, {
+    state: mockInitialState,
+  });
+};
+
+describe('DeFiProtocolPositionDetailsV2', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockLastGroupsProps = null;
+    mockSelectPrivacyMode.mockReturnValue(false);
+  });
+
+  it('renders nothing when no protocol position group is provided', () => {
+    mockUseParams.mockReturnValue({
+      protocolPositionGroup: undefined,
+      networkIconAvatar: undefined,
+    });
+
+    const { queryByTestId } = renderWithProvider(
+      <DeFiProtocolPositionDetailsV2 />,
+      { state: mockInitialState },
+    );
+
+    expect(
+      queryByTestId(WalletViewSelectorsIDs.DEFI_POSITIONS_DETAILS_CONTAINER),
+    ).toBeNull();
+    expect(queryByTestId('position-groups')).toBeNull();
+  });
+
+  it('renders the container, title, formatted market value and groups', () => {
+    const { getByTestId, getByText } = renderWithGroup();
+
+    expect(
+      getByTestId(WalletViewSelectorsIDs.DEFI_POSITIONS_DETAILS_CONTAINER),
+    ).toBeOnTheScreen();
+    expect(getByText('Aave V3')).toBeOnTheScreen();
+    expect(
+      getByTestId(DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID),
+    ).toHaveTextContent('$4,100.50');
+    expect(getByTestId('position-groups')).toBeOnTheScreen();
+  });
+
+  it('formats an undefined market value as zero', () => {
+    const { getByTestId } = renderWithGroup({
+      ...mockGroup,
+      marketValue: undefined as unknown as number,
+    });
+
+    expect(
+      getByTestId(DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID),
+    ).toHaveTextContent('$0.00');
+  });
+
+  it('hides the market value in privacy mode', () => {
+    mockSelectPrivacyMode.mockReturnValue(true);
+
+    const { getByTestId, queryByText } = renderWithGroup();
+
+    expect(queryByText('$4,100.50')).toBeNull();
+    expect(
+      getByTestId(DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID),
+    ).toBeOnTheScreen();
+  });
+
+  it('forwards the group, network avatar and privacy mode to the groups component', () => {
+    mockSelectPrivacyMode.mockReturnValue(true);
+    renderWithGroup();
+
+    expect(mockLastGroupsProps).toMatchObject({
+      protocolPositionGroup: mockGroup,
+      networkIconAvatar: 42,
+      privacyMode: true,
+    });
+  });
+
+  it('navigates back when the back button is pressed', () => {
+    const { getByTestId } = renderWithGroup();
+
+    fireEvent.press(getByTestId(CommonSelectorsIDs.BACK_ARROW_BUTTON));
+
+    expect(mockPop).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionDetailsV2.tsx b/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionDetailsV2.tsx
new file mode 100644
index 000000000000..7eab1d4bac98
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionDetailsV2.tsx
@@ -0,0 +1,111 @@
+import React, { useCallback } from 'react';
+import { type ImageSourcePropType, View } from 'react-native';
+import { SafeAreaView } from 'react-native-safe-area-context';
+import { useNavigation } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import type { DeFiProtocolPositionGroup } from '@metamask/assets-controllers';
+import {
+  HeaderStandard,
+  Text,
+  TextColor,
+  TextVariant,
+  FontWeight,
+  SensitiveText,
+  SensitiveTextLength,
+} from '@metamask/design-system-react-native';
+import type { AppStackNavigationProp } from '../../../../../core/NavigationService/types';
+import { useParams } from '../../../../../util/navigation/navUtils';
+import { selectPrivacyMode } from '../../../../../selectors/preferencesController';
+import styleSheet from '../../../DeFiPositions/DeFiProtocolPositionDetails.styles';
+import { CommonSelectorsIDs } from '../../../../../util/Common.testIds';
+import { formatWithThreshold } from '../../../../../util/assets';
+import I18n from '../../../../../../locales/i18n';
+import DeFiAvatarWithBadge from '../../../DeFiPositions/DeFiAvatarWithBadge';
+import Summary from '../../../../Base/Summary';
+import { useStyles } from '../../../../hooks/useStyles';
+import { WalletViewSelectorsIDs } from '../../../../Views/Wallet/WalletView.testIds';
+import DeFiProtocolPositionGroupsV2 from './DeFiProtocolPositionGroupsV2';
+
+export const DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID =
+  'defi_protocol_position_details_balance';
+
+interface DeFiProtocolPositionDetailsV2Params {
+  protocolPositionGroup?: DeFiProtocolPositionGroup;
+  networkIconAvatar: ImageSourcePropType | undefined;
+}
+
+/**
+ * DeFiProtocolPositionDetailsV2 - details screen for a V2 protocol-per-chain
+ * group, passed via navigation params. Reads the group's embedded sections
+ * (no separate fetch).
+ */
+const DeFiProtocolPositionDetailsV2: React.FC = () => {
+  const { styles } = useStyles(styleSheet, undefined);
+  const navigation = useNavigation<AppStackNavigationProp>();
+  const { protocolPositionGroup, networkIconAvatar } =
+    useParams<DeFiProtocolPositionDetailsV2Params>();
+  const privacyMode = useSelector(selectPrivacyMode);
+
+  const handleBack = useCallback(() => {
+    navigation.pop();
+  }, [navigation]);
+
+  if (!protocolPositionGroup) {
+    return null;
+  }
+
+  const { protocolId, marketValue, protocolIconUrl } = protocolPositionGroup;
+
+  return (
+    <SafeAreaView
+      edges={['left', 'right', 'bottom']}
+      style={styles.protocolPositionDetailsWrapper}
+      testID={WalletViewSelectorsIDs.DEFI_POSITIONS_DETAILS_CONTAINER}
+    >
+      <HeaderStandard
+        title=""
+        onBack={handleBack}
+        includesTopInset
+        backButtonProps={{ testID: CommonSelectorsIDs.BACK_ARROW_BUTTON }}
+      />
+      <View style={styles.protocolPositionDetailsContent}>
+        <View style={styles.detailsWrapper}>
+          <View>
+            <Text variant={TextVariant.DisplayMd}>{protocolId}</Text>
+            <SensitiveText
+              variant={TextVariant.BodyMd}
+              fontWeight={FontWeight.Medium}
+              color={TextColor.TextAlternative}
+              isHidden={privacyMode}
+              length={SensitiveTextLength.Medium}
+              testID={DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID}
+            >
+              {formatWithThreshold(marketValue ?? 0, 0.01, I18n.locale, {
+                style: 'currency',
+                currency: 'USD',
+              })}
+            </SensitiveText>
+          </View>
+
+          <View>
+            <DeFiAvatarWithBadge
+              networkIconAvatar={networkIconAvatar}
+              avatarName={protocolId}
+              avatarIconUrl={protocolIconUrl}
+            />
+          </View>
+        </View>
+        <View style={styles.separatorWrapper}>
+          <Summary.Separator />
+        </View>
+        <DeFiProtocolPositionGroupsV2
+          protocolPositionGroup={protocolPositionGroup}
+          networkIconAvatar={networkIconAvatar}
+          privacyMode={privacyMode}
+        />
+      </View>
+    </SafeAreaView>
+  );
+};
+
+export default DeFiProtocolPositionDetailsV2;
diff --git a/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionGroupsV2.test.tsx b/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionGroupsV2.test.tsx
new file mode 100644
index 000000000000..6a618248b34d
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionGroupsV2.test.tsx
@@ -0,0 +1,99 @@
+import React from 'react';
+import type { DeFiProtocolPositionGroup } from '@metamask/assets-controllers';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import DeFiProtocolPositionGroupsV2 from './DeFiProtocolPositionGroupsV2';
+import { backgroundState } from '../../../../../util/test/initial-root-state';
+
+const mockInitialState = {
+  engine: {
+    backgroundState,
+  },
+};
+
+const mockProtocolPositionGroup: DeFiProtocolPositionGroup = {
+  protocolId: 'Aave V3',
+  productName: 'Aave V3',
+  protocolIconUrl: 'https://example.com/aave.png',
+  chainId: 'eip155:1',
+  marketValue: 4100.5,
+  iconGroup: [{ symbol: 'USDC', avatarValue: 'https://example.com/usdc.png' }],
+  sections: [
+    {
+      productName: 'Aave V3 Market',
+      positions: [
+        {
+          assetId: 'eip155:1/erc20:0x1111111111111111111111111111111111111111',
+          chainId: 'eip155:1',
+          symbol: 'USDC',
+          name: 'USD Coin',
+          decimals: 6,
+          balance: '100.5',
+          marketValue: 100.5,
+          positionType: 'deposit',
+          poolAddress: '0xpool1',
+          groupId: 'g1',
+          tokenImage: 'https://example.com/usdc.png',
+        },
+      ],
+    },
+    {
+      productName: 'Aave V3 Staking',
+      positions: [
+        {
+          assetId: 'eip155:1/erc20:0x2222222222222222222222222222222222222222',
+          chainId: 'eip155:1',
+          symbol: 'stETH',
+          name: 'Staked ETH',
+          decimals: 18,
+          balance: '2',
+          marketValue: 4000,
+          positionType: 'staked',
+          poolAddress: '0xpool2',
+          groupId: 'g2',
+          tokenImage: 'https://example.com/steth.png',
+        },
+      ],
+    },
+  ],
+};
+
+describe('DeFiProtocolPositionGroupsV2', () => {
+  it('renders a section per product with its tokens, balances, and values', async () => {
+    const { findByText } = renderWithProvider(
+      <DeFiProtocolPositionGroupsV2
+        protocolPositionGroup={mockProtocolPositionGroup}
+        networkIconAvatar={10}
+        privacyMode={false}
+      />,
+      { state: mockInitialState },
+    );
+
+    expect(await findByText('Aave V3 Market')).toBeOnTheScreen();
+    expect(await findByText('Aave V3 Staking')).toBeOnTheScreen();
+
+    expect(await findByText('USDC')).toBeOnTheScreen();
+    expect(await findByText('deposit')).toBeOnTheScreen();
+    expect(await findByText('$100.50')).toBeOnTheScreen();
+    expect(await findByText('100.5 USDC')).toBeOnTheScreen();
+
+    expect(await findByText('stETH')).toBeOnTheScreen();
+    expect(await findByText('staked')).toBeOnTheScreen();
+    expect(await findByText('$4,000.00')).toBeOnTheScreen();
+    expect(await findByText('2 stETH')).toBeOnTheScreen();
+  });
+
+  it('hides market values in privacy mode', async () => {
+    const { findByText, queryByText } = renderWithProvider(
+      <DeFiProtocolPositionGroupsV2
+        protocolPositionGroup={mockProtocolPositionGroup}
+        networkIconAvatar={10}
+        privacyMode
+      />,
+      { state: mockInitialState },
+    );
+
+    expect(await findByText('Aave V3 Market')).toBeOnTheScreen();
+    expect(queryByText('$100.50')).not.toBeOnTheScreen();
+    expect(queryByText('$4,000.00')).not.toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionGroupsV2.tsx b/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionGroupsV2.tsx
new file mode 100644
index 000000000000..04964a5b0cd4
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/components/DeFiProtocolPositionGroupsV2.tsx
@@ -0,0 +1,68 @@
+import React, { Fragment, useMemo } from 'react';
+import { FlatList, ImageSourcePropType, View } from 'react-native';
+import type { DeFiProtocolPositionGroup } from '@metamask/assets-controllers';
+import {
+  Text,
+  TextColor,
+  TextVariant,
+  FontWeight,
+} from '@metamask/design-system-react-native';
+import styleSheet from '../../../DeFiPositions/DeFiProtocolPositionGroups.styles';
+import DeFiProtocolPositionGroupTokens from '../../../DeFiPositions/DeFiProtocolPositionGroupTokens';
+import Summary from '../../../../Base/Summary';
+import { useStyles } from '../../../../hooks/useStyles';
+import { mapDefiProtocolDetailsPositionV2ToToken } from '../utils/map-defi-protocol-details-position-v2';
+
+interface DeFiProtocolPositionGroupsV2Props {
+  protocolPositionGroup: DeFiProtocolPositionGroup;
+  networkIconAvatar: ImageSourcePropType | undefined;
+  privacyMode: boolean;
+}
+
+const DeFiProtocolPositionGroupsV2: React.FC<
+  DeFiProtocolPositionGroupsV2Props
+> = ({ protocolPositionGroup, networkIconAvatar, privacyMode }) => {
+  const { styles } = useStyles(styleSheet, undefined);
+
+  const sections = useMemo(
+    () =>
+      protocolPositionGroup.sections.map((section) => ({
+        productName: section.productName,
+        tokens: section.positions.map((position) =>
+          mapDefiProtocolDetailsPositionV2ToToken(position),
+        ),
+      })),
+    [protocolPositionGroup.sections],
+  );
+
+  return (
+    <View style={styles.protocolDetailsPositionsWrapper}>
+      <FlatList
+        data={sections}
+        renderItem={({ item: section, index }) => {
+          const isLast = index === sections.length - 1;
+          return (
+            <Fragment key={section.productName}>
+              <Text
+                variant={TextVariant.BodyMd}
+                fontWeight={FontWeight.Medium}
+                color={TextColor.TextAlternative}
+              >
+                {section.productName}
+              </Text>
+              <DeFiProtocolPositionGroupTokens
+                tokens={section.tokens}
+                networkIconAvatar={networkIconAvatar}
+                privacyMode={privacyMode}
+              />
+              {!isLast && <Summary.Separator />}
+            </Fragment>
+          );
+        }}
+        keyExtractor={(section) => section.productName}
+      />
+    </View>
+  );
+};
+
+export default DeFiProtocolPositionGroupsV2;
diff --git a/app/components/UI/Assets/DeFiPositions/hooks/useDeFiPositionsV2.test.ts b/app/components/UI/Assets/DeFiPositions/hooks/useDeFiPositionsV2.test.ts
new file mode 100644
index 000000000000..416ab09b89f6
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/hooks/useDeFiPositionsV2.test.ts
@@ -0,0 +1,334 @@
+import { act, renderHook } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import Engine from '../../../../../core/Engine';
+import { selectDeFiPositionsV2State } from '../../../../../selectors/defiPositionsControllerV2';
+import { selectIsUnlocked } from '../../../../../selectors/keyringController';
+import {
+  selectSelectedAccountGroupId,
+  selectSelectedAccountGroupInternalAccounts,
+} from '../../../../../selectors/multichainAccounts/accountTreeController';
+import { useDeFiPositionsV2 } from './useDeFiPositionsV2';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../../../core/Engine', () => ({
+  context: {
+    DeFiPositionsControllerV2: {
+      fetchDeFiPositions: jest.fn().mockResolvedValue(undefined),
+    },
+  },
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockFetchDeFiPositions = Engine.context.DeFiPositionsControllerV2
+  .fetchDeFiPositions as jest.MockedFunction<
+  typeof Engine.context.DeFiPositionsControllerV2.fetchDeFiPositions
+>;
+
+describe('useDeFiPositionsV2', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectIsUnlocked) {
+        return true;
+      }
+      if (selector === selectSelectedAccountGroupId) {
+        return 'group-1';
+      }
+      if (selector === selectSelectedAccountGroupInternalAccounts) {
+        return [{ id: 'account-1' }];
+      }
+      if (selector === selectDeFiPositionsV2State) {
+        return {};
+      }
+      return undefined;
+    });
+
+    // Run deferred fetch work synchronously in unit tests.
+    (
+      globalThis as typeof globalThis & {
+        requestIdleCallback: (callback: () => void) => number;
+        cancelIdleCallback: (handle: number) => void;
+      }
+    ).requestIdleCallback = (callback) => {
+      callback({
+        didTimeout: false,
+        timeRemaining: () => 1,
+      });
+      return 0;
+    };
+    (
+      globalThis as typeof globalThis & {
+        cancelIdleCallback: (handle: number) => void;
+      }
+    ).cancelIdleCallback = jest.fn();
+  });
+
+  afterEach(() => {
+    Reflect.deleteProperty(globalThis, 'requestIdleCallback');
+    Reflect.deleteProperty(globalThis, 'cancelIdleCallback');
+  });
+
+  it('does not fetch when disabled', async () => {
+    renderHook(() => useDeFiPositionsV2({ enabled: false, isVisible: true }));
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(mockFetchDeFiPositions).not.toHaveBeenCalled();
+  });
+
+  it('does not fetch when not visible', async () => {
+    renderHook(() => useDeFiPositionsV2({ enabled: true, isVisible: false }));
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(mockFetchDeFiPositions).not.toHaveBeenCalled();
+  });
+
+  it('fetches without forceRefresh when enabled and visible', async () => {
+    renderHook(() => useDeFiPositionsV2({ enabled: true, isVisible: true }));
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(mockFetchDeFiPositions).toHaveBeenCalledTimes(1);
+    expect(mockFetchDeFiPositions).toHaveBeenCalledWith();
+  });
+
+  it('does not fetch when wallet is locked', async () => {
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectIsUnlocked) {
+        return false;
+      }
+      if (selector === selectSelectedAccountGroupId) {
+        return 'group-1';
+      }
+      if (selector === selectSelectedAccountGroupInternalAccounts) {
+        return [{ id: 'account-1' }];
+      }
+      if (selector === selectDeFiPositionsV2State) {
+        return {};
+      }
+      return undefined;
+    });
+
+    renderHook(() => useDeFiPositionsV2({ enabled: true, isVisible: true }));
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(mockFetchDeFiPositions).not.toHaveBeenCalled();
+  });
+
+  it('returns merged positions from state', async () => {
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectIsUnlocked) {
+        return true;
+      }
+      if (selector === selectSelectedAccountGroupId) {
+        return 'group-1';
+      }
+      if (selector === selectSelectedAccountGroupInternalAccounts) {
+        return [{ id: 'account-1' }];
+      }
+      if (selector === selectDeFiPositionsV2State) {
+        return {
+          'account-1': [
+            {
+              protocolId: 'aave',
+              productName: 'Aave',
+              protocolIconUrl: 'aave.png',
+              chainId: 'eip155:1',
+              marketValue: 100,
+              iconGroup: [],
+              sections: [],
+            },
+          ],
+        };
+      }
+      return undefined;
+    });
+
+    const { result } = renderHook(() =>
+      useDeFiPositionsV2({ enabled: true, isVisible: true }),
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(result.current.positions).toHaveLength(1);
+    expect(result.current.positions[0].protocolId).toBe('aave');
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.hasFetched).toBe(true);
+  });
+
+  it('sets isError when fetch rejects', async () => {
+    mockFetchDeFiPositions.mockRejectedValueOnce(new Error('network'));
+
+    const { result } = renderHook(() =>
+      useDeFiPositionsV2({ enabled: true, isVisible: true }),
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(result.current.isError).toBe(true);
+    expect(result.current.hasFetched).toBe(true);
+  });
+
+  it('keeps hasFetched false before the first fetch', () => {
+    const { result } = renderHook(() =>
+      useDeFiPositionsV2({ enabled: true, isVisible: false }),
+    );
+
+    expect(result.current.hasFetched).toBe(false);
+  });
+
+  it('clears isLoading when the section scrolls out of view during a fetch', async () => {
+    let resolveFetch: () => void = () => undefined;
+    mockFetchDeFiPositions.mockImplementationOnce(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveFetch = resolve;
+        }),
+    );
+
+    const { result, rerender } = renderHook(
+      ({ isVisible }) => useDeFiPositionsV2({ enabled: true, isVisible }),
+      { initialProps: { isVisible: true } },
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(result.current.isLoading).toBe(true);
+
+    await act(async () => {
+      rerender({ isVisible: false });
+    });
+
+    expect(result.current.isLoading).toBe(false);
+
+    await act(async () => {
+      resolveFetch();
+      await Promise.resolve();
+    });
+
+    expect(result.current.isLoading).toBe(false);
+  });
+
+  it('does not refetch on scroll-back after a successful fetch for the group', async () => {
+    const { rerender } = renderHook(
+      ({ isVisible }) => useDeFiPositionsV2({ enabled: true, isVisible }),
+      { initialProps: { isVisible: true } },
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(mockFetchDeFiPositions).toHaveBeenCalledTimes(1);
+
+    await act(async () => {
+      rerender({ isVisible: false });
+    });
+    await act(async () => {
+      rerender({ isVisible: true });
+      await Promise.resolve();
+    });
+
+    expect(mockFetchDeFiPositions).toHaveBeenCalledTimes(1);
+  });
+
+  it('retries on scroll-back after a failed fetch', async () => {
+    mockFetchDeFiPositions.mockRejectedValueOnce(new Error('network'));
+
+    const { result, rerender } = renderHook(
+      ({ isVisible }) => useDeFiPositionsV2({ enabled: true, isVisible }),
+      { initialProps: { isVisible: true } },
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(result.current.isError).toBe(true);
+    expect(mockFetchDeFiPositions).toHaveBeenCalledTimes(1);
+
+    await act(async () => {
+      rerender({ isVisible: false });
+    });
+    await act(async () => {
+      rerender({ isVisible: true });
+      await Promise.resolve();
+    });
+
+    expect(mockFetchDeFiPositions).toHaveBeenCalledTimes(2);
+    expect(result.current.isError).toBe(false);
+  });
+
+  it('refetches when the selected account group changes while visible', async () => {
+    let selectedGroupId = 'group-1';
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectIsUnlocked) {
+        return true;
+      }
+      if (selector === selectSelectedAccountGroupId) {
+        return selectedGroupId;
+      }
+      if (selector === selectSelectedAccountGroupInternalAccounts) {
+        return [{ id: 'account-1' }];
+      }
+      if (selector === selectDeFiPositionsV2State) {
+        return {};
+      }
+      return undefined;
+    });
+
+    const { rerender } = renderHook(
+      // Dummy prop forces a re-render so the hook re-reads the updated selector.
+      ({ groupId: _groupId }) =>
+        useDeFiPositionsV2({ enabled: true, isVisible: true }),
+      { initialProps: { groupId: selectedGroupId } },
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(mockFetchDeFiPositions).toHaveBeenCalledTimes(1);
+
+    selectedGroupId = 'group-2';
+    await act(async () => {
+      rerender({ groupId: selectedGroupId });
+      await Promise.resolve();
+    });
+
+    expect(mockFetchDeFiPositions).toHaveBeenCalledTimes(2);
+  });
+
+  it('refresh bypasses visibility and force-refreshes', async () => {
+    const { result } = renderHook(() =>
+      useDeFiPositionsV2({ enabled: true, isVisible: false }),
+    );
+
+    await act(async () => {
+      await result.current.refresh();
+    });
+
+    expect(mockFetchDeFiPositions).toHaveBeenCalledTimes(1);
+    expect(mockFetchDeFiPositions).toHaveBeenCalledWith({ forceRefresh: true });
+  });
+});
diff --git a/app/components/UI/Assets/DeFiPositions/hooks/useDeFiPositionsV2.ts b/app/components/UI/Assets/DeFiPositions/hooks/useDeFiPositionsV2.ts
new file mode 100644
index 000000000000..b619a6e4d67f
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/hooks/useDeFiPositionsV2.ts
@@ -0,0 +1,193 @@
+import { useEffect, useMemo, useState } from 'react';
+import { useSelector } from 'react-redux';
+import {
+  mergePositionsForAccounts,
+  type DeFiProtocolPositionGroup,
+} from '@metamask/assets-controllers';
+import Engine from '../../../../../core/Engine';
+import { selectDeFiPositionsV2State } from '../../../../../selectors/defiPositionsControllerV2';
+import { selectIsUnlocked } from '../../../../../selectors/keyringController';
+import {
+  selectSelectedAccountGroupId,
+  selectSelectedAccountGroupInternalAccounts,
+} from '../../../../../selectors/multichainAccounts/accountTreeController';
+
+interface IdleCallbackGlobals {
+  requestIdleCallback?: (
+    callback: () => void,
+    options?: { timeout?: number },
+  ) => number;
+  cancelIdleCallback?: (handle: number) => void;
+}
+
+const scheduleIdleTask = (task: () => void): (() => void) => {
+  const idleGlobals = globalThis as typeof globalThis & IdleCallbackGlobals;
+
+  if (idleGlobals.requestIdleCallback) {
+    const idleCallbackId = idleGlobals.requestIdleCallback(task);
+    return () => {
+      idleGlobals.cancelIdleCallback?.(idleCallbackId);
+    };
+  }
+
+  const timeoutId = setTimeout(task, 0);
+  return () => {
+    clearTimeout(timeoutId);
+  };
+};
+
+export interface UseDeFiPositionsV2Options {
+  /** Whether V2 DeFi is enabled for this surface. */
+  enabled: boolean;
+  /** Whether the DeFi section is currently in the scroll viewport. */
+  isVisible: boolean;
+}
+
+export interface UseDeFiPositionsV2Result {
+  /** Protocol groups for the selected account group, merged across accounts. */
+  positions: DeFiProtocolPositionGroup[];
+  /** True while the initial fetch is in flight and no positions exist yet. */
+  isLoading: boolean;
+  /** True when the fetch failed. */
+  isError: boolean;
+  /**
+   * True after at least one fetch attempt has settled for the current account
+   * group (success or error). Used to distinguish idle (never fetched) from
+   * loaded-empty.
+   */
+  hasFetched: boolean;
+  /**
+   * Trigger a force-refresh fetch, bypassing the visibility gate and the
+   * apiClient cache (e.g. pull-to-refresh).
+   */
+  refresh: () => Promise<void>;
+}
+
+/**
+ * Drives DeFi V2 surfaces: fetches (without forceRefresh) when the section
+ * first enters the viewport for an account group, and again on account group
+ * change while visible. Successful results are not auto-refetched on
+ * scroll-away/back — pull-to-refresh uses {@link refresh} with
+ * `forceRefresh: true`. Failed fetches still retry when the section becomes
+ * visible again.
+ *
+ * @param options - Enablement and viewport visibility gates.
+ * @returns Merged positions plus loading/error flags and a refresh helper.
+ */
+export function useDeFiPositionsV2({
+  enabled,
+  isVisible,
+}: UseDeFiPositionsV2Options): UseDeFiPositionsV2Result {
+  const isUnlocked = useSelector(selectIsUnlocked);
+  const selectedAccountGroupId = useSelector(selectSelectedAccountGroupId);
+  const groupAccounts = useSelector(selectSelectedAccountGroupInternalAccounts);
+  const positionsByAccount = useSelector(selectDeFiPositionsV2State);
+
+  const accountIds = useMemo(
+    () => groupAccounts.map((account) => account.id),
+    [groupAccounts],
+  );
+
+  const hasPositions = useMemo(
+    () => accountIds.some((id) => positionsByAccount[id] !== undefined),
+    [accountIds, positionsByAccount],
+  );
+
+  const [isFetching, setIsFetching] = useState(false);
+  const [isError, setIsError] = useState(false);
+  const [hasFetched, setHasFetched] = useState(false);
+  const [fetchedForGroupId, setFetchedForGroupId] = useState<string | null>(
+    null,
+  );
+
+  // Re-arm idle/placeholder state when the selected account group changes.
+  const hasFetchedForCurrentGroup =
+    hasFetched && fetchedForGroupId === selectedAccountGroupId;
+
+  const shouldFetch = enabled && isVisible && isUnlocked;
+
+  const refresh = useMemo(
+    () => async () => {
+      if (!enabled || !isUnlocked) {
+        return;
+      }
+
+      setIsFetching(true);
+      setIsError(false);
+
+      try {
+        await Engine.context.DeFiPositionsControllerV2.fetchDeFiPositions({
+          forceRefresh: true,
+        });
+      } catch {
+        setIsError(true);
+      } finally {
+        setIsFetching(false);
+        setHasFetched(true);
+        setFetchedForGroupId(selectedAccountGroupId);
+      }
+    },
+    [enabled, isUnlocked, selectedAccountGroupId],
+  );
+
+  useEffect(() => {
+    if (!shouldFetch) {
+      // Clear loading if the section left the viewport (or unlock/enable
+      // flipped off) while a fetch was in flight — the cancelled finally
+      // path intentionally skips setIsFetching(false) so an older request
+      // cannot clear loading for a newer account-group fetch.
+      setIsFetching(false);
+      return;
+    }
+
+    // Skip scroll-back refetch after a successful fetch for this group.
+    // Errors still retry on re-entry; force refresh stays on pull-to-refresh.
+    // Intentionally read these flags only when shouldFetch / group changes —
+    // do not depend on them or a settled error would immediately re-fetch.
+    if (hasFetchedForCurrentGroup && !isError) {
+      return;
+    }
+
+    let cancelled = false;
+
+    const cancelIdleTask = scheduleIdleTask(() => {
+      setIsFetching(true);
+      setIsError(false);
+
+      Engine.context.DeFiPositionsControllerV2.fetchDeFiPositions()
+        .catch(() => {
+          if (!cancelled) {
+            setIsError(true);
+          }
+        })
+        .finally(() => {
+          if (!cancelled) {
+            setIsFetching(false);
+            setHasFetched(true);
+            setFetchedForGroupId(selectedAccountGroupId);
+          }
+        });
+    });
+
+    return () => {
+      cancelled = true;
+      cancelIdleTask();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- see skip-guard comment above
+  }, [shouldFetch, selectedAccountGroupId]);
+
+  const positions = useMemo(
+    () => mergePositionsForAccounts(positionsByAccount, accountIds),
+    [positionsByAccount, accountIds],
+  );
+
+  return {
+    positions,
+    isLoading: isFetching && !hasPositions,
+    isError,
+    hasFetched: hasFetchedForCurrentGroup,
+    refresh,
+  };
+}
+
+export default useDeFiPositionsV2;
diff --git a/app/components/UI/Assets/DeFiPositions/utils/filter-defi-positions-by-enabled-networks.test.ts b/app/components/UI/Assets/DeFiPositions/utils/filter-defi-positions-by-enabled-networks.test.ts
new file mode 100644
index 000000000000..022e0a590196
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/utils/filter-defi-positions-by-enabled-networks.test.ts
@@ -0,0 +1,68 @@
+import type { DeFiProtocolPositionGroup } from '@metamask/assets-controllers';
+import { filterDeFiPositionsByEnabledNetworks } from './filter-defi-positions-by-enabled-networks';
+
+const makePosition = (
+  overrides: Partial<DeFiProtocolPositionGroup>,
+): DeFiProtocolPositionGroup => ({
+  protocolId: 'Aave V3',
+  productName: 'Aave V3',
+  protocolIconUrl: 'https://example.com/aave.png',
+  chainId: 'eip155:1',
+  marketValue: 100,
+  iconGroup: [],
+  sections: [],
+  ...overrides,
+});
+
+describe('filterDeFiPositionsByEnabledNetworks', () => {
+  it('filters out positions on disabled EVM networks', () => {
+    const positions = [
+      makePosition({ protocolId: 'OnMainnet', chainId: 'eip155:1' }),
+      makePosition({ protocolId: 'OnPolygon', chainId: 'eip155:137' }),
+    ];
+
+    const result = filterDeFiPositionsByEnabledNetworks(positions, {
+      eip155: { '0x1': true },
+    });
+
+    expect(result).toHaveLength(1);
+    expect(result[0].protocolId).toBe('OnMainnet');
+  });
+
+  it('keeps non-EVM positions regardless of enabled EVM networks', () => {
+    const positions = [
+      makePosition({
+        protocolId: 'Solana',
+        chainId:
+          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' as DeFiProtocolPositionGroup['chainId'],
+      }),
+    ];
+
+    const result = filterDeFiPositionsByEnabledNetworks(positions, {
+      eip155: { '0x1': true },
+    });
+
+    expect(result).toHaveLength(1);
+    expect(result[0].protocolId).toBe('Solana');
+  });
+
+  it('returns no EVM positions when enabled network map is empty', () => {
+    const positions = [
+      makePosition({ protocolId: 'OnMainnet', chainId: 'eip155:1' }),
+    ];
+
+    const result = filterDeFiPositionsByEnabledNetworks(positions, {});
+
+    expect(result).toHaveLength(0);
+  });
+
+  it('returns no EVM positions when enabled network map is undefined', () => {
+    const positions = [
+      makePosition({ protocolId: 'OnMainnet', chainId: 'eip155:1' }),
+    ];
+
+    const result = filterDeFiPositionsByEnabledNetworks(positions, undefined);
+
+    expect(result).toHaveLength(0);
+  });
+});
diff --git a/app/components/UI/Assets/DeFiPositions/utils/filter-defi-positions-by-enabled-networks.ts b/app/components/UI/Assets/DeFiPositions/utils/filter-defi-positions-by-enabled-networks.ts
new file mode 100644
index 000000000000..5b0cc66ac30d
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/utils/filter-defi-positions-by-enabled-networks.ts
@@ -0,0 +1,31 @@
+import type { DeFiProtocolPositionGroup } from '@metamask/assets-controllers';
+import type { NetworkEnablementControllerState } from '@metamask/network-enablement-controller';
+import { Hex, KnownCaipNamespace } from '@metamask/utils';
+import { getMaybeHexChainId } from '../../../../../util/bridge';
+
+/**
+ * Filters V2 DeFi protocol position groups to enabled EVM networks.
+ * Non-EVM positions (e.g. Solana) are kept when present in results.
+ */
+export function filterDeFiPositionsByEnabledNetworks(
+  positions: DeFiProtocolPositionGroup[],
+  enabledNetworksByNamespace:
+    | NetworkEnablementControllerState['enabledNetworkMap']
+    | undefined,
+): DeFiProtocolPositionGroup[] {
+  const enabledEvmNetworks =
+    enabledNetworksByNamespace?.[KnownCaipNamespace.Eip155] ?? {};
+  const enabledHexChainIds = new Set(
+    Object.keys(enabledEvmNetworks).filter(
+      (chainId) => enabledEvmNetworks[chainId as Hex],
+    ),
+  );
+
+  return positions.filter((position) => {
+    const hexChainId = getMaybeHexChainId(position.chainId);
+    if (hexChainId) {
+      return enabledHexChainIds.has(hexChainId);
+    }
+    return true;
+  });
+}
diff --git a/app/components/UI/Assets/DeFiPositions/utils/map-defi-protocol-details-position-v2.test.ts b/app/components/UI/Assets/DeFiPositions/utils/map-defi-protocol-details-position-v2.test.ts
new file mode 100644
index 000000000000..ef71ca43776d
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/utils/map-defi-protocol-details-position-v2.test.ts
@@ -0,0 +1,144 @@
+import {
+  getNativeTokenAddress,
+  type DeFiUnderlyingPosition,
+} from '@metamask/assets-controllers';
+import { toChecksumHexAddress } from '@metamask/controller-utils';
+import { mapDefiProtocolDetailsPositionV2ToToken } from './map-defi-protocol-details-position-v2';
+
+describe('mapDefiProtocolDetailsPositionV2ToToken', () => {
+  const position: DeFiUnderlyingPosition = {
+    assetId: 'eip155:59144/erc20:0x1111111111111111111111111111111111111111',
+    chainId: 'eip155:59144',
+    symbol: 'mUSD',
+    name: 'MetaMask USD',
+    balance: '0.00001',
+    decimals: 18,
+    marketValue: 0.00001,
+    positionType: 'deposit',
+    poolAddress: '0xpool',
+    groupId: 'group-musd-1',
+    tokenImage: 'musd.png',
+  };
+
+  it('maps precomputed fiat and converts CAIP chain id to hex', () => {
+    expect(mapDefiProtocolDetailsPositionV2ToToken(position)).toMatchObject({
+      name: 'MetaMask USD',
+      symbol: 'mUSD',
+      marketValue: 0.00001,
+      chainId: '0xe708',
+      iconUrl: 'musd.png',
+      balance: 0.00001,
+      isNative: false,
+      positionType: 'deposit',
+    });
+  });
+
+  it('marks native assets and uses the chain native token address', () => {
+    const nativePosition: DeFiUnderlyingPosition = {
+      ...position,
+      assetId: 'eip155:59144/slip44:60',
+      symbol: 'ETH',
+      name: 'Ethereum',
+    };
+
+    expect(
+      mapDefiProtocolDetailsPositionV2ToToken(nativePosition),
+    ).toMatchObject({
+      name: 'Ethereum',
+      symbol: 'ETH',
+      address: getNativeTokenAddress('0xe708'),
+      isNative: true,
+    });
+  });
+
+  it('uses Polygon native token address for Polygon slip44 assets', () => {
+    const polygonNativePosition: DeFiUnderlyingPosition = {
+      ...position,
+      assetId: 'eip155:137/slip44:966',
+      chainId: 'eip155:137',
+      symbol: 'POL',
+      name: 'Polygon',
+    };
+
+    expect(
+      mapDefiProtocolDetailsPositionV2ToToken(polygonNativePosition),
+    ).toMatchObject({
+      isNative: true,
+      address: getNativeTokenAddress('0x89'),
+      chainId: '0x89',
+    });
+  });
+
+  it('returns a checksummed hex address for an ERC-20 asset', () => {
+    const lowercaseAddress = '0xae7ab96520de3a18e5e111b5eaab095312d7fe84';
+    const erc20Position: DeFiUnderlyingPosition = {
+      ...position,
+      assetId: `eip155:1/erc20:${lowercaseAddress}`,
+      chainId: 'eip155:1',
+    };
+
+    const { address } = mapDefiProtocolDetailsPositionV2ToToken(erc20Position);
+
+    expect(address).toBe(toChecksumHexAddress(lowercaseAddress));
+    expect(address).not.toBe(lowercaseAddress);
+    expect(address).toMatch(/[A-F]/u);
+  });
+
+  it('leaves market value undefined when unavailable', () => {
+    const positionWithoutPrice: DeFiUnderlyingPosition = {
+      ...position,
+      marketValue: undefined,
+    };
+
+    expect(
+      mapDefiProtocolDetailsPositionV2ToToken(positionWithoutPrice),
+    ).toMatchObject({
+      marketValue: undefined,
+    });
+  });
+
+  it('returns 0 balance when the balance string is invalid', () => {
+    const invalidBalancePosition: DeFiUnderlyingPosition = {
+      ...position,
+      balance: 'not-a-number',
+    };
+
+    expect(
+      mapDefiProtocolDetailsPositionV2ToToken(invalidBalancePosition).balance,
+    ).toBe(0);
+  });
+
+  it('passes a non-EVM CAIP chain id and asset id through unchanged', () => {
+    const solanaChainId = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';
+    const solanaAssetId = `${solanaChainId}/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v`;
+    const solanaPosition: DeFiUnderlyingPosition = {
+      ...position,
+      assetId: solanaAssetId,
+      chainId: solanaChainId,
+    };
+
+    expect(
+      mapDefiProtocolDetailsPositionV2ToToken(solanaPosition),
+    ).toMatchObject({
+      chainId: solanaChainId,
+      address: solanaAssetId,
+    });
+  });
+
+  it('returns the asset id unchanged when it is not a CAIP asset type', () => {
+    const rawAssetId = '0xae7ab96520de3a18e5e111b5eaab095312d7fe84';
+    const nonCaipAssetPosition: DeFiUnderlyingPosition = {
+      ...position,
+      assetId: rawAssetId as DeFiUnderlyingPosition['assetId'],
+      chainId: 'eip155:1',
+    };
+
+    expect(
+      mapDefiProtocolDetailsPositionV2ToToken(nonCaipAssetPosition),
+    ).toMatchObject({
+      address: rawAssetId,
+      isNative: false,
+      chainId: '0x1',
+    });
+  });
+});
diff --git a/app/components/UI/Assets/DeFiPositions/utils/map-defi-protocol-details-position-v2.ts b/app/components/UI/Assets/DeFiPositions/utils/map-defi-protocol-details-position-v2.ts
new file mode 100644
index 000000000000..41ca79a38cf5
--- /dev/null
+++ b/app/components/UI/Assets/DeFiPositions/utils/map-defi-protocol-details-position-v2.ts
@@ -0,0 +1,120 @@
+import {
+  getNativeTokenAddress,
+  type DeFiPositionType,
+  type DeFiUnderlyingPosition,
+} from '@metamask/assets-controllers';
+import {
+  formatChainIdToHex,
+  isNonEvmChainId,
+} from '@metamask/bridge-controller';
+import { toChecksumHexAddress } from '@metamask/controller-utils';
+import {
+  isCaipAssetType,
+  isCaipChainId,
+  parseCaipAssetType,
+  type Hex,
+} from '@metamask/utils';
+
+/**
+ * Mobile token cell shape consumed by DeFi protocol details UI.
+ */
+export interface DeFiDetailsPositionTokenV2 {
+  key: string;
+  address: string;
+  name: string;
+  symbol: string;
+  iconUrl: string;
+  balance: number;
+  marketValue: number | undefined;
+  chainId: string;
+  isNative: boolean;
+  /** Position type from protocol metadata (e.g. deposit, staked). */
+  positionType: DeFiPositionType;
+}
+
+function toTokenCellChainId(
+  chainId: DeFiUnderlyingPosition['chainId'],
+): string {
+  if (isCaipChainId(chainId) && !isNonEvmChainId(chainId)) {
+    return formatChainIdToHex(chainId) as Hex;
+  }
+
+  return chainId;
+}
+
+/**
+ * Resolves the token-cell `address` for a DeFi underlying position.
+ *
+ * - Non-EVM: return the CAIP asset id unchanged.
+ * - Non-CAIP asset type: return the asset id unchanged.
+ * - EVM slip44 (native): return the chain's native token address (or zero).
+ * - EVM erc20: return the checksummed contract address.
+ *
+ * @param position - Underlying position from `DeFiPositionsControllerV2` state.
+ * @returns Token cell address appropriate for the chain/asset type.
+ */
+function toTokenCellAddress(position: DeFiUnderlyingPosition): string {
+  if (isNonEvmChainId(position.chainId)) {
+    return position.assetId;
+  }
+
+  if (!isCaipAssetType(position.assetId)) {
+    return position.assetId;
+  }
+
+  const { assetReference, assetNamespace } = parseCaipAssetType(
+    position.assetId,
+  );
+  const hexChainId = toTokenCellChainId(position.chainId) as Hex;
+
+  if (assetNamespace === 'slip44') {
+    return getNativeTokenAddress(hexChainId);
+  }
+
+  if (assetNamespace === 'erc20') {
+    return toChecksumHexAddress(assetReference);
+  }
+
+  return position.assetId;
+}
+
+/**
+ * Returns the human-readable balance for a DeFi underlying position.
+ *
+ * @param position - Underlying position from `DeFiPositionsControllerV2` state.
+ * @returns Parsed balance amount, or 0 when invalid.
+ */
+function getNormalizedBalance(position: DeFiUnderlyingPosition): number {
+  const normalizedBalance = Number.parseFloat(position.balance);
+
+  return Number.isFinite(normalizedBalance) ? normalizedBalance : 0;
+}
+
+/**
+ * Maps a DeFi underlying position (from `DeFiPositionsControllerV2` state) to
+ * the mobile token cell shape used by protocol details.
+ *
+ * @param position - Underlying position from the details-page section.
+ * @returns Token data used by the DeFi details position cell.
+ */
+export function mapDefiProtocolDetailsPositionV2ToToken(
+  position: DeFiUnderlyingPosition,
+): DeFiDetailsPositionTokenV2 {
+  const isNative =
+    isCaipAssetType(position.assetId) &&
+    parseCaipAssetType(position.assetId).assetNamespace === 'slip44';
+  const normalizedBalance = getNormalizedBalance(position);
+
+  return {
+    key: `${position.groupId}-${position.poolAddress}-${position.assetId}-${position.positionType}`,
+    address: toTokenCellAddress(position),
+    name: position.name,
+    symbol: position.symbol,
+    iconUrl: position.tokenImage ?? '',
+    balance: normalizedBalance,
+    marketValue: position.marketValue,
+    chainId: toTokenCellChainId(position.chainId),
+    isNative,
+    positionType: position.positionType,
+  };
+}
diff --git a/app/components/UI/Assets/PriceAlerts/api.test.ts b/app/components/UI/Assets/PriceAlerts/api.test.ts
index b69c2eda9817..9475ec2668bc 100644
--- a/app/components/UI/Assets/PriceAlerts/api.test.ts
+++ b/app/components/UI/Assets/PriceAlerts/api.test.ts
@@ -13,6 +13,8 @@ import {
   updateAlertByType,
   deleteAlertByType,
   fetchSupportedChains,
+  addWatchlistAlerts,
+  removeWatchlistAlerts,
   priceAlertsQueryKey,
   assertOkResponse,
   useSubmitPriceAlert,
@@ -130,6 +132,50 @@ describe('fetchSupportedChains', () => {
   });
 });
 
+const WATCHLIST_URL = `${ALERTS_URL}/watchlist`;
+
+describe('addWatchlistAlerts', () => {
+  it('POSTs assetIds JSON body to /v1/alerts/watchlist', async () => {
+    const assetIds = [
+      'eip155:1/slip44:60',
+      'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:So11111111111111111111111111111111111111112',
+    ];
+    await addWatchlistAlerts(assetIds);
+    expect(mockGetBearerToken).toHaveBeenCalledTimes(1);
+    const [url, init] = mockFetch.mock.calls[0] as [string, RequestInit];
+    expect(url).toBe(WATCHLIST_URL);
+    expect(init.method).toBe('POST');
+    expect(init.body).toBe(JSON.stringify({ assetIds }));
+    expect((init.headers as Record<string, string>)['Content-Type']).toBe(
+      'application/json',
+    );
+  });
+
+  it('preserves Solana mint casing in the request body', async () => {
+    const mint =
+      'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
+    await addWatchlistAlerts([mint]);
+    const [, init] = mockFetch.mock.calls[0] as [string, RequestInit];
+    expect(init.body).toContain(mint);
+    expect(init.body).not.toContain(mint.toLowerCase());
+  });
+});
+
+describe('removeWatchlistAlerts', () => {
+  it('DELETEs with the same assetIds JSON body (not query params)', async () => {
+    const assetIds = ['eip155:1/erc20:0xABCDEF'];
+    await removeWatchlistAlerts(assetIds);
+    expect(mockGetBearerToken).toHaveBeenCalledTimes(1);
+    const [url, init] = mockFetch.mock.calls[0] as [string, RequestInit];
+    expect(url).toBe(WATCHLIST_URL);
+    expect(init.method).toBe('DELETE');
+    expect(init.body).toBe(JSON.stringify({ assetIds }));
+    expect((init.headers as Record<string, string>)['Content-Type']).toBe(
+      'application/json',
+    );
+  });
+});
+
 describe('fetchAlerts', () => {
   it('calls the correct URL with the asset URL-encoded as a query param', async () => {
     await fetchAlerts('eip155:1/slip44:60');
diff --git a/app/components/UI/Assets/PriceAlerts/api.ts b/app/components/UI/Assets/PriceAlerts/api.ts
index e0f2d2fdc8ea..baf6c2726492 100644
--- a/app/components/UI/Assets/PriceAlerts/api.ts
+++ b/app/components/UI/Assets/PriceAlerts/api.ts
@@ -13,6 +13,7 @@ import type {
 
 const ALERTS_URL = `${AppConstants.PRICE_ALERTS_API.URL}/v1/alerts`;
 const PERCENT_ALERTS_URL = `${ALERTS_URL}/percent-change`;
+const WATCHLIST_URL = `${ALERTS_URL}/watchlist`;
 
 export const priceAlertsQueryKey = (assetId: string) =>
   ['priceAlerts', assetId] as const;
@@ -42,6 +43,33 @@ export const fetchSupportedChains = (): Promise<Response> =>
     credentials: 'omit',
   });
 
+/**
+ * Mirrors real-watchlist adds into Price Alerts.
+ * Body: `{ assetIds: string[] }`. Response 200 includes processed/unprocessed.
+ */
+export const addWatchlistAlerts = (assetIds: string[]): Promise<Response> =>
+  authenticatedFetch(WATCHLIST_URL, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ assetIds }),
+  });
+
+/**
+ * Mirrors real-watchlist removes into Price Alerts.
+ * Same JSON body as POST (not query params). Idempotent when already absent.
+ */
+export const removeWatchlistAlerts = (assetIds: string[]): Promise<Response> =>
+  authenticatedFetch(WATCHLIST_URL, {
+    method: 'DELETE',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ assetIds }),
+  });
+
+/** 200 response body from POST/DELETE `/v1/alerts/watchlist`. */
+export interface WatchlistAlertsResult {
+  processedAssetIds: string[];
+  unprocessedAssetIds: string[];
+}
 export const createAlert = (params: SaveAlertParams): Promise<Response> =>
   authenticatedFetch(ALERTS_URL, {
     method: 'POST',
diff --git a/app/components/UI/Assets/PriceAlerts/hooks/useAlertSaveFlow.test.ts b/app/components/UI/Assets/PriceAlerts/hooks/useAlertSaveFlow.test.ts
index fa55cfb99e97..3f2ff7f39c0d 100644
--- a/app/components/UI/Assets/PriceAlerts/hooks/useAlertSaveFlow.test.ts
+++ b/app/components/UI/Assets/PriceAlerts/hooks/useAlertSaveFlow.test.ts
@@ -266,6 +266,7 @@ describe('useAlertSaveFlow', () => {
         .addProperties,
     ).toHaveBeenCalledWith({
       source: WatchlistAnalytics.ADD_SOURCE.PRICE_ALERT_CREATION,
+      asset_id: 'eip155:1/slip44:60',
       asset_type: 'native',
     });
   });
diff --git a/app/components/UI/Assets/PriceAlerts/hooks/useAlertSaveFlow.ts b/app/components/UI/Assets/PriceAlerts/hooks/useAlertSaveFlow.ts
index a9324bc3301d..79a2e118ba09 100644
--- a/app/components/UI/Assets/PriceAlerts/hooks/useAlertSaveFlow.ts
+++ b/app/components/UI/Assets/PriceAlerts/hooks/useAlertSaveFlow.ts
@@ -143,6 +143,7 @@ const useAlertSaveFlow = ({
         if (!editingAlert && shouldAutoWatchlistOnCreate) {
           const watchlistAnalyticsProperties = {
             source: WatchlistAnalytics.ADD_SOURCE.PRICE_ALERT_CREATION,
+            asset_id: assetId,
             asset_type: getWatchlistAssetType(assetId),
           };
 
diff --git a/app/components/UI/Assets/PriceAlerts/syncWatchlistMirror.test.ts b/app/components/UI/Assets/PriceAlerts/syncWatchlistMirror.test.ts
new file mode 100644
index 000000000000..55fb318c3526
--- /dev/null
+++ b/app/components/UI/Assets/PriceAlerts/syncWatchlistMirror.test.ts
@@ -0,0 +1,151 @@
+import Logger from '../../../../util/Logger';
+import { addWatchlistAlerts, removeWatchlistAlerts } from './api';
+import { syncPriceAlertsWatchlistMirror } from './syncWatchlistMirror';
+
+jest.mock('../../../../util/Logger', () => ({
+  __esModule: true,
+  default: {
+    error: jest.fn(),
+    log: jest.fn(),
+  },
+}));
+
+jest.mock('./api', () => ({
+  addWatchlistAlerts: jest.fn(),
+  removeWatchlistAlerts: jest.fn(),
+  assertOkResponse: jest.requireActual('./api').assertOkResponse,
+}));
+
+const mockedAdd = addWatchlistAlerts as jest.MockedFunction<
+  typeof addWatchlistAlerts
+>;
+const mockedRemove = removeWatchlistAlerts as jest.MockedFunction<
+  typeof removeWatchlistAlerts
+>;
+
+const ETH = 'eip155:1/slip44:60';
+const USDC = 'eip155:1/erc20:0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
+const APE = 'eip155:33139/slip44:60';
+const SOLANA_MINT =
+  'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
+
+const makeOkResponse = (body?: unknown, status = 200) =>
+  ({
+    ok: true,
+    status,
+    json: jest
+      .fn()
+      .mockResolvedValue(
+        body ?? { processedAssetIds: [], unprocessedAssetIds: [] },
+      ),
+    text: jest.fn().mockResolvedValue(''),
+  }) as unknown as Response;
+
+const makeErrorResponse = (status: number, bodyText = 'error') =>
+  ({
+    ok: false,
+    status,
+    json: jest.fn().mockResolvedValue({}),
+    text: jest.fn().mockResolvedValue(bodyText),
+  }) as unknown as Response;
+
+beforeEach(() => {
+  jest.clearAllMocks();
+  mockedAdd.mockResolvedValue(
+    makeOkResponse({
+      processedAssetIds: [ETH],
+      unprocessedAssetIds: [],
+    }),
+  );
+  mockedRemove.mockResolvedValue(
+    makeOkResponse({
+      processedAssetIds: [ETH],
+      unprocessedAssetIds: [],
+    }),
+  );
+});
+
+describe('syncPriceAlertsWatchlistMirror', () => {
+  it('POSTs newly added assets as a single assetIds batch', async () => {
+    await syncPriceAlertsWatchlistMirror([], [ETH, USDC]);
+
+    expect(mockedAdd).toHaveBeenCalledTimes(1);
+    expect(mockedAdd).toHaveBeenCalledWith([ETH, USDC]);
+    expect(mockedRemove).not.toHaveBeenCalled();
+  });
+
+  it('DELETEs removed assets as a single assetIds batch', async () => {
+    await syncPriceAlertsWatchlistMirror([ETH, USDC], [ETH]);
+
+    expect(mockedRemove).toHaveBeenCalledTimes(1);
+    expect(mockedRemove).toHaveBeenCalledWith([USDC]);
+    expect(mockedAdd).not.toHaveBeenCalled();
+  });
+
+  it('logs unprocessedAssetIds on 200 without throwing', async () => {
+    mockedAdd.mockResolvedValue(
+      makeOkResponse({
+        processedAssetIds: [ETH],
+        unprocessedAssetIds: [APE],
+      }),
+    );
+
+    await expect(
+      syncPriceAlertsWatchlistMirror([], [ETH, APE]),
+    ).resolves.toBeUndefined();
+
+    expect(mockedAdd).toHaveBeenCalledWith([ETH, APE]);
+    expect(Logger.log).toHaveBeenCalledWith(
+      'Price Alerts watchlist partial processing',
+      expect.objectContaining({
+        action: 'POST',
+        unprocessedAssetIds: [APE],
+        processedAssetIds: [ETH],
+      }),
+    );
+    expect(Logger.error).not.toHaveBeenCalled();
+  });
+
+  it('preserves Solana mint casing when mirroring adds', async () => {
+    mockedAdd.mockResolvedValue(
+      makeOkResponse({
+        processedAssetIds: [SOLANA_MINT],
+        unprocessedAssetIds: [],
+      }),
+    );
+
+    await syncPriceAlertsWatchlistMirror([], [SOLANA_MINT]);
+
+    expect(mockedAdd).toHaveBeenCalledWith([SOLANA_MINT]);
+  });
+
+  it('no-ops when membership is unchanged (reorder only)', async () => {
+    await syncPriceAlertsWatchlistMirror([ETH, USDC], [USDC, ETH]);
+
+    expect(mockedAdd).not.toHaveBeenCalled();
+    expect(mockedRemove).not.toHaveBeenCalled();
+  });
+
+  it.each([400, 401, 500])(
+    'soft-fails POST HTTP %s without throwing',
+    async (status) => {
+      mockedAdd.mockResolvedValue(makeErrorResponse(status, 'failed'));
+
+      await expect(
+        syncPriceAlertsWatchlistMirror([], [ETH]),
+      ).resolves.toBeUndefined();
+
+      expect(Logger.error).toHaveBeenCalled();
+    },
+  );
+
+  it('soft-fails DELETE network errors without throwing', async () => {
+    mockedRemove.mockRejectedValue(new Error('network down'));
+
+    await expect(
+      syncPriceAlertsWatchlistMirror([ETH], []),
+    ).resolves.toBeUndefined();
+
+    expect(Logger.error).toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/Assets/PriceAlerts/syncWatchlistMirror.ts b/app/components/UI/Assets/PriceAlerts/syncWatchlistMirror.ts
new file mode 100644
index 000000000000..447f66f8f601
--- /dev/null
+++ b/app/components/UI/Assets/PriceAlerts/syncWatchlistMirror.ts
@@ -0,0 +1,74 @@
+import Logger from '../../../../util/Logger';
+import {
+  addWatchlistAlerts,
+  assertOkResponse,
+  removeWatchlistAlerts,
+  type WatchlistAlertsResult,
+} from './api';
+
+const softFailBatchMirror = async (
+  action: 'POST' | 'DELETE',
+  assetIds: string[],
+  request: () => Promise<Response>,
+): Promise<void> => {
+  if (assetIds.length === 0) {
+    return;
+  }
+
+  try {
+    const response = await request();
+    await assertOkResponse(response);
+    const body = (await response.json()) as WatchlistAlertsResult;
+    if (body.unprocessedAssetIds?.length) {
+      // Expected for unsupported chains / rejected assets — do not fail UX.
+      Logger.log('Price Alerts watchlist partial processing', {
+        action,
+        unprocessedAssetIds: body.unprocessedAssetIds,
+        processedAssetIds: body.processedAssetIds ?? [],
+      });
+    }
+  } catch (error) {
+    Logger.error(error as Error, {
+      message: `Price Alerts watchlist ${action} soft-fail`,
+      assetIds,
+    });
+  }
+};
+
+/**
+ * After the real token watchlist blob is updated, mirror net membership
+ * changes into Price Alerts as batched POST/DELETE `{ assetIds }`.
+ *
+ * Soft-fails on every Price Alerts error or partial processing — never
+ * throws, never rolls back the real watchlist write. CAIP-19 IDs are sent
+ * with original casing (Solana mint refs must not be lowercased).
+ */
+export async function syncPriceAlertsWatchlistMirror(
+  previousAssets: readonly string[],
+  nextAssets: readonly string[],
+): Promise<void> {
+  // EVM identity is case-insensitive; keep original strings for the request
+  // body so Solana mint casing is preserved when sent.
+  const previousLower = new Set(
+    previousAssets.map((asset) => asset.toLowerCase()),
+  );
+  const nextLower = new Set(nextAssets.map((asset) => asset.toLowerCase()));
+
+  const added = nextAssets.filter(
+    (asset) => !previousLower.has(asset.toLowerCase()),
+  );
+  const removed = previousAssets.filter(
+    (asset) => !nextLower.has(asset.toLowerCase()),
+  );
+
+  if (added.length === 0 && removed.length === 0) {
+    return;
+  }
+
+  await Promise.all([
+    softFailBatchMirror('POST', added, () => addWatchlistAlerts(added)),
+    softFailBatchMirror('DELETE', removed, () =>
+      removeWatchlistAlerts(removed),
+    ),
+  ]);
+}
diff --git a/app/components/UI/Assets/components/AssetLogo/AssetLogo.test.tsx b/app/components/UI/Assets/components/AssetLogo/AssetLogo.test.tsx
index 859ddf735c41..31c21569022b 100644
--- a/app/components/UI/Assets/components/AssetLogo/AssetLogo.test.tsx
+++ b/app/components/UI/Assets/components/AssetLogo/AssetLogo.test.tsx
@@ -127,6 +127,24 @@ describe('AssetLogo', () => {
     );
   });
 
+  it('applies the size and testID overrides callers pass', () => {
+    const { UNSAFE_getByType } = renderWithProvider(
+      <AssetLogo
+        asset={arrangeToken()}
+        size={AvatarTokenSize.Md}
+        testID="earn-token-avatar-TEST"
+      />,
+      { state: mockState },
+    );
+
+    expect(UNSAFE_getByType(AvatarToken).props).toStrictEqual(
+      expect.objectContaining({
+        size: AvatarTokenSize.Md,
+        testID: 'earn-token-avatar-TEST',
+      }),
+    );
+  });
+
   it('renders empty image source when fallback utility returns undefined for unsupported chainId', () => {
     const asset = arrangeToken({
       chainId: '1',
diff --git a/app/components/UI/Assets/components/AssetLogo/AssetLogo.tsx b/app/components/UI/Assets/components/AssetLogo/AssetLogo.tsx
index 3753eccdb446..d08bb2ec354a 100644
--- a/app/components/UI/Assets/components/AssetLogo/AssetLogo.tsx
+++ b/app/components/UI/Assets/components/AssetLogo/AssetLogo.tsx
@@ -10,7 +10,15 @@ import styleSheet from './AssetLogo.styles';
 import { getFallbackAssetImageUrls } from './AssetLogo.utils';
 import { useSmartImageFallback } from './AssetLogo.hook';
 
-const AssetLogo = ({ asset }: { asset: TokenI }) => {
+const AssetLogo = ({
+  asset,
+  size = AvatarTokenSize.Lg,
+  testID,
+}: {
+  asset: TokenI;
+  size?: AvatarTokenSize;
+  testID?: string;
+}) => {
   const { styles } = useStyles(styleSheet, {});
 
   const images = useMemo(
@@ -47,7 +55,8 @@ const AssetLogo = ({ asset }: { asset: TokenI }) => {
       imageOrSvgProps={{
         imageProps: { onError, testID: 'token-avatar-image' },
       }}
-      size={AvatarTokenSize.Lg}
+      size={size}
+      testID={testID}
     />
   );
 };
diff --git a/app/components/UI/Assets/watchlist/Views/WatchlistFullScreenView/useWatchlistEditDraft.test.ts b/app/components/UI/Assets/watchlist/Views/WatchlistFullScreenView/useWatchlistEditDraft.test.ts
index 2db22ff96831..6251737aa431 100644
--- a/app/components/UI/Assets/watchlist/Views/WatchlistFullScreenView/useWatchlistEditDraft.test.ts
+++ b/app/components/UI/Assets/watchlist/Views/WatchlistFullScreenView/useWatchlistEditDraft.test.ts
@@ -67,6 +67,43 @@ describe('useWatchlistEditDraft', () => {
     );
     expect(mockAddProperties).toHaveBeenCalledWith({
       source: WatchlistAnalytics.REMOVE_SOURCE.FULLSCREEN_EDIT,
+      asset_id: 'eip155:1/erc20:0xbtc',
+      asset_type: 'erc20',
+    });
+  });
+
+  it('preserves the original (non-lowercased) asset_id casing on removal', () => {
+    const eth = createToken('eip155:8453/slip44:60', 'Ethereum');
+    const checksummed = createToken(
+      'eip155:1/erc20:0xAbCdEf1234567890ABCDEF1234567890aBcDeF12',
+      'Checksummed',
+    );
+    const queryTokens = [checksummed, eth];
+
+    const mockMutate = jest.fn((_assetIds, options) => {
+      options?.onSuccess?.();
+    });
+
+    const { result } = renderHook(() =>
+      useWatchlistEditDraft({
+        queryTokens,
+        updateListMutation: { mutate: mockMutate },
+      }),
+    );
+
+    act(() => {
+      result.current.handleEditPress();
+    });
+    act(() => {
+      result.current.onRemoveFromDraft(String(checksummed.assetId));
+    });
+    act(() => {
+      result.current.handleDonePress();
+    });
+
+    expect(mockAddProperties).toHaveBeenCalledWith({
+      source: WatchlistAnalytics.REMOVE_SOURCE.FULLSCREEN_EDIT,
+      asset_id: 'eip155:1/erc20:0xAbCdEf1234567890ABCDEF1234567890aBcDeF12',
       asset_type: 'erc20',
     });
   });
diff --git a/app/components/UI/Assets/watchlist/Views/WatchlistFullScreenView/useWatchlistEditDraft.ts b/app/components/UI/Assets/watchlist/Views/WatchlistFullScreenView/useWatchlistEditDraft.ts
index 316257b5517e..4e9b815c367e 100644
--- a/app/components/UI/Assets/watchlist/Views/WatchlistFullScreenView/useWatchlistEditDraft.ts
+++ b/app/components/UI/Assets/watchlist/Views/WatchlistFullScreenView/useWatchlistEditDraft.ts
@@ -52,6 +52,10 @@ export const useWatchlistEditDraft = ({
   const [draft, setDraft] = useState<WatchlistEditDraft | null>(null);
   const [isEditMode, setIsEditMode] = useState(false);
   const baselineOrderRef = useRef<string[]>([]);
+  /** Normalized asset id -> original (un-lowercased) CAIP asset id, for analytics. */
+  const originalAssetIdByNormalizedIdRef = useRef<Map<string, string>>(
+    new Map(),
+  );
 
   const queryAssetIdSet = useMemo(
     () =>
@@ -82,11 +86,17 @@ export const useWatchlistEditDraft = ({
       );
 
       removedAssetIds.forEach((assetId) => {
+        const originalAssetId =
+          originalAssetIdByNormalizedIdRef.current.get(
+            normalizeAssetId(assetId),
+          ) ?? assetId;
+
         trackEvent(
           createEventBuilder(MetaMetricsEvents.WATCHLIST_TOKEN_REMOVED)
             .addProperties({
               source: WatchlistAnalytics.REMOVE_SOURCE.FULLSCREEN_EDIT,
-              asset_type: getWatchlistAssetType(assetId),
+              asset_id: originalAssetId,
+              asset_type: getWatchlistAssetType(originalAssetId),
             })
             .build(),
         );
@@ -137,6 +147,12 @@ export const useWatchlistEditDraft = ({
 
   const handleEditPress = useCallback(() => {
     baselineOrderRef.current = getTokenAssetIdOrder(queryTokens);
+    originalAssetIdByNormalizedIdRef.current = new Map(
+      queryTokens.map((token) => {
+        const assetId = String(token.assetId);
+        return [normalizeAssetId(assetId), assetId];
+      }),
+    );
     setDraft(createDraftFromTokens(queryTokens));
     setIsEditMode(true);
   }, [queryTokens]);
diff --git a/app/components/UI/Assets/watchlist/components/WatchlistEmptyCTA/WatchlistEmptyCTA.tsx b/app/components/UI/Assets/watchlist/components/WatchlistEmptyCTA/WatchlistEmptyCTA.tsx
index d7462d9874bb..cbd4e2f8a188 100644
--- a/app/components/UI/Assets/watchlist/components/WatchlistEmptyCTA/WatchlistEmptyCTA.tsx
+++ b/app/components/UI/Assets/watchlist/components/WatchlistEmptyCTA/WatchlistEmptyCTA.tsx
@@ -124,6 +124,7 @@ const WatchlistEmptyCTA: React.FC<WatchlistEmptyCTAProps> = ({ source }) => {
           createEventBuilder(MetaMetricsEvents.WATCHLIST_TOKEN_ADDED)
             .addProperties({
               source,
+              asset_id: String(token.assetId),
               asset_type: getWatchlistAssetType(String(token.assetId)),
               has_balance: token.isInWallet,
             })
diff --git a/app/components/UI/Assets/watchlist/components/WatchlistStarButton.tsx b/app/components/UI/Assets/watchlist/components/WatchlistStarButton.tsx
index a1bac02f30a5..39e476fff60a 100644
--- a/app/components/UI/Assets/watchlist/components/WatchlistStarButton.tsx
+++ b/app/components/UI/Assets/watchlist/components/WatchlistStarButton.tsx
@@ -72,6 +72,7 @@ const WatchlistStarButton = ({
       createEventBuilder(eventName)
         .addProperties({
           source,
+          asset_id: assetId,
           asset_type: assetType,
           ...(wasWatched ? {} : { has_balance: hasBalance }),
         })
@@ -83,6 +84,7 @@ const WatchlistStarButton = ({
     trackEvent,
     createEventBuilder,
     source,
+    assetId,
     assetType,
     hasBalance,
     theme.colors.success.default,
diff --git a/app/components/UI/Assets/watchlist/components/__tests__/WatchlistStarButton.test.tsx b/app/components/UI/Assets/watchlist/components/__tests__/WatchlistStarButton.test.tsx
index 4d0f35ab64b8..b60f0eebda39 100644
--- a/app/components/UI/Assets/watchlist/components/__tests__/WatchlistStarButton.test.tsx
+++ b/app/components/UI/Assets/watchlist/components/__tests__/WatchlistStarButton.test.tsx
@@ -130,6 +130,7 @@ describe('WatchlistStarButton', () => {
     expect(mockAddProperties).toHaveBeenCalledWith(
       expect.objectContaining({
         source: 'token_details',
+        asset_id: 'eip155:1/erc20:0xabc',
         asset_type: 'erc20',
         has_balance: true,
       }),
@@ -163,6 +164,7 @@ describe('WatchlistStarButton', () => {
     expect(mockAddProperties).toHaveBeenCalledWith(
       expect.objectContaining({
         source: 'token_details',
+        asset_id: 'eip155:1/erc20:0xabc',
         asset_type: 'erc20',
       }),
     );
@@ -189,6 +191,7 @@ describe('WatchlistStarButton', () => {
     expect(mockAddProperties).toHaveBeenCalledWith(
       expect.objectContaining({
         source: 'watchlist_homepage',
+        asset_id: 'eip155:1/slip44:60',
         asset_type: 'native',
       }),
     );
diff --git a/app/components/UI/Assets/watchlist/hooks/useTokenWatchlistMutations.test.tsx b/app/components/UI/Assets/watchlist/hooks/useTokenWatchlistMutations.test.tsx
index 184c6c32c47c..a2045b8bf75f 100644
--- a/app/components/UI/Assets/watchlist/hooks/useTokenWatchlistMutations.test.tsx
+++ b/app/components/UI/Assets/watchlist/hooks/useTokenWatchlistMutations.test.tsx
@@ -22,9 +22,14 @@ import {
   useTokenWatchlistRemoveItemMutation,
   useTokenWatchlistUpdateListMutation,
 } from './useTokenWatchlistMutations';
+import { syncPriceAlertsWatchlistMirror } from '../../PriceAlerts/syncWatchlistMirror';
 
 const drainBatcher = () => tokenWatchlistBatcher.flush();
 
+const mockedSyncMirror = syncPriceAlertsWatchlistMirror as jest.MockedFunction<
+  typeof syncPriceAlertsWatchlistMirror
+>;
+
 // Override React Query's batch notify function to prevent teardown crashes.
 // The default uses react-native's unstable_batchedUpdates which tries to
 // require() internal modules after the Jest environment is torn down.
@@ -51,6 +56,10 @@ jest.mock('../storage', () => ({
   writeToTokenWatchList: jest.fn(),
 }));
 
+jest.mock('../../PriceAlerts/syncWatchlistMirror', () => ({
+  syncPriceAlertsWatchlistMirror: jest.fn().mockResolvedValue(undefined),
+}));
+
 const mockedRead = readFromTokenWatchList as jest.MockedFunction<
   typeof readFromTokenWatchList
 >;
@@ -110,12 +119,20 @@ const readHydratedCache = (queryClient: QueryClient) =>
   );
 
 const baseBeforeEach = (initialStorage: WatchlistBlob = EMPTY_BLOB) => {
+  // Reset any leaked client from a prior test that skipped afterEach (J9).
+  if (activeQueryClient) {
+    activeQueryClient.getMutationCache().clear();
+    activeQueryClient.getQueryCache().clear();
+    activeQueryClient.clear();
+    activeQueryClient = null;
+  }
   jest.clearAllMocks();
   mockedRead.mockResolvedValue(initialStorage);
   mockedWrite.mockResolvedValue(undefined);
 };
 
 const baseAfterEach = async () => {
+  jest.restoreAllMocks();
   // Drain any pending batch left over from the test so it cannot fire
   // against the next test's mocks. `flush()` is a no-op when the queue
   // is empty.
@@ -209,6 +226,10 @@ describe.each(scenarios)('useTokenWatchlist $name mutation', (scenario) => {
       assets: scenario.expectedWrittenAssets,
       version: 1,
     });
+    expect(mockedSyncMirror).toHaveBeenCalledWith(
+      scenario.initialStorage.assets,
+      scenario.expectedWrittenAssets,
+    );
   });
 
   it('optimistically updates the blob cache before the storage write completes', async () => {
diff --git a/app/components/UI/Assets/watchlist/hooks/useTokenWatchlistMutations.ts b/app/components/UI/Assets/watchlist/hooks/useTokenWatchlistMutations.ts
index 3b350532548f..c37531448d1d 100644
--- a/app/components/UI/Assets/watchlist/hooks/useTokenWatchlistMutations.ts
+++ b/app/components/UI/Assets/watchlist/hooks/useTokenWatchlistMutations.ts
@@ -1,6 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import type { CaipAssetType } from '@metamask/utils';
 
+import { syncPriceAlertsWatchlistMirror } from '../../PriceAlerts/syncWatchlistMirror';
 import {
   EMPTY_BLOB,
   readFromTokenWatchList,
@@ -108,13 +109,16 @@ const applyOp = (acc: string[], op: WatchlistOp): string[] => {
 export const tokenWatchlistBatcher = createAsyncBatcher<WatchlistOp>(
   async (ops) => {
     const current = await readFromTokenWatchList();
+    const nextAssets = ops.reduce<string[]>(
+      (acc, op) => applyOp(acc, op),
+      [...current.assets],
+    );
     await writeToTokenWatchList({
       ...current,
-      assets: ops.reduce<string[]>(
-        (acc, op) => applyOp(acc, op),
-        [...current.assets],
-      ),
+      assets: nextAssets,
     });
+    // Soft-fail mirror — never rolls back a successful real-watchlist write.
+    await syncPriceAlertsWatchlistMirror(current.assets, nextAssets);
   },
 );
 
diff --git a/app/components/UI/BalanceEmptyState/BalanceEmptyState.tsx b/app/components/UI/BalanceEmptyState/BalanceEmptyState.tsx
index efc880580f66..a96c9bc4beca 100644
--- a/app/components/UI/BalanceEmptyState/BalanceEmptyState.tsx
+++ b/app/components/UI/BalanceEmptyState/BalanceEmptyState.tsx
@@ -22,6 +22,7 @@ import { getDecimalChainId } from '../../../util/networks';
 import { selectChainId } from '../../../selectors/networkController';
 import { trace, TraceName } from '../../../util/trace';
 import { useRampNavigation } from '../Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../Ramp/constants/rampsBuyCufTags';
 import { BalanceEmptyStateProps } from './BalanceEmptyState.types';
 import bankTransferImage from '../../../images/bank-transfer.png';
 import { getDetectedGeolocation } from '../../../reducers/fiatOrders';
@@ -43,7 +44,7 @@ const BalanceEmptyState: React.FC<BalanceEmptyStateProps> = ({
   const buttonClickData = useRampsButtonClickData();
 
   const handleAction = () => {
-    goToBuy();
+    goToBuy(undefined, { surface: RAMPS_BUY_CUF_SURFACE.EMPTY_STATE });
 
     trackEvent(
       createEventBuilder(MetaMetricsEvents.RAMPS_BUTTON_CLICKED)
diff --git a/app/components/UI/Bridge/_mocks_/initialState.ts b/app/components/UI/Bridge/_mocks_/initialState.ts
index 94b4bf8af4a5..b243d1cf3894 100644
--- a/app/components/UI/Bridge/_mocks_/initialState.ts
+++ b/app/components/UI/Bridge/_mocks_/initialState.ts
@@ -9,6 +9,8 @@ import {
   BtcAccountType,
   TrxScope,
   TrxAccountType,
+  XlmScope,
+  XlmAccountType,
 } from '@metamask/keyring-api';
 import { AccountWalletType, AccountGroupType } from '@metamask/account-api';
 import { ethers } from 'ethers';
@@ -57,6 +59,11 @@ export const trxAccountId = 'trxAccountId';
 export const trxAccountAddress = 'TN3W4Bb1JVHPiWJVm7d9q9qHGXSdoMrMrE';
 export const trxNativeTokenAddress = 'tron:728126428/slip44:195' as CaipAssetId;
 
+export const xlmAccountId = 'xlmAccountId';
+export const xlmAccountAddress =
+  'GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NYMPL5AFHTDXUDT7JOZZYNQLEI';
+export const xlmNativeTokenAddress = 'stellar:pubnet/slip44:148' as CaipAssetId;
+
 export const initialState = {
   engine: {
     backgroundState: {
@@ -109,6 +116,11 @@ export const initialState = {
                 isActiveDest: true,
                 isGaslessSwapEnabled: false,
               },
+              [XlmScope.Pubnet]: {
+                isActiveSrc: true,
+                isActiveDest: true,
+                isGaslessSwapEnabled: false,
+              },
             },
             bip44DefaultPairs: {
               bip122: {
@@ -275,6 +287,9 @@ export const initialState = {
           tron: {
             [TrxScope.Mainnet]: true,
           },
+          stellar: {
+            [XlmScope.Pubnet]: true,
+          },
         },
       },
       MultichainNetworkController: {
@@ -301,6 +316,12 @@ export const initialState = {
             nativeCurrency: 'tron:728126428/slip44:195' as const,
             isEvm: false as const,
           },
+          [XlmScope.Pubnet]: {
+            chainId: XlmScope.Pubnet,
+            name: 'Stellar',
+            nativeCurrency: 'stellar:pubnet/slip44:148' as const,
+            isEvm: false as const,
+          },
         },
       },
       MultichainBalancesController: {
@@ -327,6 +348,12 @@ export const initialState = {
               unit: 'TRX',
             },
           },
+          [xlmAccountId]: {
+            [xlmNativeTokenAddress]: {
+              amount: '250',
+              unit: 'XLM',
+            },
+          },
         },
       },
       MultichainAssetsController: {
@@ -334,6 +361,7 @@ export const initialState = {
           [solanaAccountId]: [solanaNativeTokenAddress, solanaToken2Address],
           [btcAccountId]: [btcNativeTokenAddress],
           [trxAccountId]: [trxNativeTokenAddress],
+          [xlmAccountId]: [xlmNativeTokenAddress],
         },
         assetsMetadata: {
           [btcNativeTokenAddress]: {
@@ -410,6 +438,20 @@ export const initialState = {
               },
             ],
           },
+          [xlmNativeTokenAddress]: {
+            name: 'Stellar',
+            symbol: 'XLM',
+            iconUrl:
+              'https://static.cx.metamask.io/api/v2/tokenIcons/assets/stellar/pubnet/slip44/148.png',
+            fungible: true as const,
+            units: [
+              {
+                name: 'Stellar',
+                symbol: 'XLM',
+                decimals: 7,
+              },
+            ],
+          },
         },
       },
       MultichainAssetsRatesController: {
@@ -430,6 +472,10 @@ export const initialState = {
             rate: '0.10', // 1 TRX = 0.10 USD
             conversionTime: 0,
           },
+          [xlmNativeTokenAddress]: {
+            rate: '0.12', // 1 XLM = 0.12 USD
+            conversionTime: 0,
+          },
         },
       },
       AccountsController: {
@@ -476,6 +522,16 @@ export const initialState = {
                 lastSelected: 0,
               },
             },
+            [xlmAccountId]: {
+              id: xlmAccountId,
+              address: xlmAccountAddress,
+              name: 'Account 5',
+              type: XlmAccountType.Account,
+              scopes: [XlmScope.Pubnet],
+              metadata: {
+                lastSelected: 0,
+              },
+            },
           },
         },
       },
diff --git a/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.test.tsx b/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.test.tsx
index 239355b8c529..79ecc9951d84 100644
--- a/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.test.tsx
+++ b/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.test.tsx
@@ -1151,6 +1151,17 @@ describe('BridgeTokenSelector', () => {
     });
   });
 
+  describe('keyboard interactions', () => {
+    it('forwards handled taps while the search keyboard is open', () => {
+      const { getByTestId } = renderWithReduxProvider(<BridgeTokenSelector />);
+
+      expect(getByTestId('bridge-token-list')).toHaveProp(
+        'keyboardShouldPersistTaps',
+        'handled',
+      );
+    });
+  });
+
   describe('pagination', () => {
     it('disables visible-content position maintenance', () => {
       const { UNSAFE_getByType } = renderWithReduxProvider(
diff --git a/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.tsx b/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.tsx
index 6790937cf66f..e76e2b1d547b 100644
--- a/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.tsx
+++ b/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.tsx
@@ -933,6 +933,7 @@ export const BridgeTokenSelector: React.FC = () => {
           data={displayData}
           renderItem={renderToken}
           keyExtractor={keyExtractor}
+          keyboardShouldPersistTaps="handled"
           showsVerticalScrollIndicator
           showsHorizontalScrollIndicator={false}
           onScroll={handleScroll}
diff --git a/app/components/UI/Bridge/components/SwapsConfirmButton/SwapsConfirmButton.test.tsx b/app/components/UI/Bridge/components/SwapsConfirmButton/SwapsConfirmButton.test.tsx
index 5e8491b247e5..7c0c59a2c0e4 100644
--- a/app/components/UI/Bridge/components/SwapsConfirmButton/SwapsConfirmButton.test.tsx
+++ b/app/components/UI/Bridge/components/SwapsConfirmButton/SwapsConfirmButton.test.tsx
@@ -31,8 +31,15 @@ import {
 } from '@metamask/bridge-controller';
 import { PriceImpactModalType } from '../PriceImpactModal/constants';
 import { TokenWarningModalMode } from '../TokenWarningModal/constants';
-import { SecurityDataType } from '../../types';
+import { SecurityDataType, BridgeViewMode } from '../../types';
 import { useInsufficientNativeReserveError } from '../../hooks/useInsufficientNativeReserveError';
+import { ButtonVariant, TextColor } from '@metamask/design-system-react-native';
+import {
+  SWAPS_CTA_BUTTON_COLOR_AB_KEY,
+  SwapsCtaButtonColorVariant,
+} from './abTestConfig';
+import { createActiveABTestAssignment } from '../../../../../util/analytics/activeABTestAssignments';
+import { LIGHT_MODE_SUCCESS_GREEN } from '../../../../../util/theme';
 // Mock the account-tree-controller file that imports the problematic module
 jest.mock(
   '../../../../../multichain-accounts/controllers/account-tree-controller',
@@ -304,6 +311,33 @@ const mockState: DeepPartial<RootState> = {
   },
 };
 
+function createAbTestState(
+  variantName?: SwapsCtaButtonColorVariant,
+  bridgeViewMode = BridgeViewMode.Unified,
+): DeepPartial<RootState> {
+  return {
+    ...mockState,
+    engine: {
+      ...mockState.engine,
+      backgroundState: {
+        ...mockState.engine?.backgroundState,
+        RemoteFeatureFlagController: {
+          remoteFeatureFlags: {
+            bridgeConfigV2: defaultBridgeConfigV2,
+            ...(variantName && {
+              [SWAPS_CTA_BUTTON_COLOR_AB_KEY]: { name: variantName },
+            }),
+          },
+        },
+      },
+    },
+    bridge: {
+      ...mockState.bridge,
+      bridgeViewMode,
+    },
+  };
+}
+
 describe('SwapsConfirmButton', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -327,6 +361,117 @@ describe('SwapsConfirmButton', () => {
     });
   });
 
+  describe('CTA color A/B test', () => {
+    it('uses Primary when the CTA experiment is unresolved', () => {
+      const { UNSAFE_getByProps } = renderWithProvider(
+        <SwapsConfirmButton
+          latestSourceBalance={mockLatestSourceBalance}
+          location={MetaMetricsSwapsEventSource.MainView}
+        />,
+        { state: createAbTestState() },
+      );
+
+      const button = UNSAFE_getByProps({
+        variant: ButtonVariant.Primary,
+      });
+
+      expect(button.props.variant).toBe(ButtonVariant.Primary);
+      expect(button.props.twClassName).toBeUndefined();
+      expect(button.props.textProps).toBeUndefined();
+    });
+
+    it('uses Primary for the control assignment', () => {
+      const { UNSAFE_getByProps } = renderWithProvider(
+        <SwapsConfirmButton
+          latestSourceBalance={mockLatestSourceBalance}
+          location={MetaMetricsSwapsEventSource.MainView}
+        />,
+        {
+          state: createAbTestState(SwapsCtaButtonColorVariant.Control),
+        },
+      );
+
+      const button = UNSAFE_getByProps({
+        variant: ButtonVariant.Primary,
+      });
+
+      expect(button.props.variant).toBe(ButtonVariant.Primary);
+      expect(button.props.twClassName).toBeUndefined();
+      expect(button.props.textProps).toBeUndefined();
+    });
+
+    it('uses the success color for the treatment assignment', () => {
+      const { UNSAFE_getByProps } = renderWithProvider(
+        <SwapsConfirmButton
+          latestSourceBalance={mockLatestSourceBalance}
+          location={MetaMetricsSwapsEventSource.MainView}
+        />,
+        {
+          state: createAbTestState(SwapsCtaButtonColorVariant.Treatment),
+        },
+      );
+
+      const button = UNSAFE_getByProps({
+        variant: ButtonVariant.Primary,
+      });
+
+      expect(button.props.twClassName).toBe(`bg-[${LIGHT_MODE_SUCCESS_GREEN}]`);
+      expect(button.props.textProps).toEqual({
+        color: TextColor.SuccessInverse,
+      });
+    });
+
+    it('uses the success color outside Unified mode for treatment', () => {
+      const { UNSAFE_getByProps } = renderWithProvider(
+        <SwapsConfirmButton
+          latestSourceBalance={mockLatestSourceBalance}
+          location={MetaMetricsSwapsEventSource.MainView}
+        />,
+        {
+          state: createAbTestState(
+            SwapsCtaButtonColorVariant.Treatment,
+            BridgeViewMode.Swap,
+          ),
+        },
+      );
+
+      const button = UNSAFE_getByProps({
+        variant: ButtonVariant.Primary,
+      });
+
+      expect(button.props.twClassName).toBe(`bg-[${LIGHT_MODE_SUCCESS_GREEN}]`);
+    });
+
+    it('preserves existing transaction attribution when submitting treatment', async () => {
+      const existingAssignment = createActiveABTestAssignment(
+        'existingExperiment',
+        'control',
+      );
+      const { getByTestId } = renderWithProvider(
+        <SwapsConfirmButton
+          latestSourceBalance={mockLatestSourceBalance}
+          location={MetaMetricsSwapsEventSource.MainView}
+          transactionActiveAbTests={[existingAssignment]}
+        />,
+        {
+          state: createAbTestState(SwapsCtaButtonColorVariant.Treatment),
+        },
+      );
+
+      await act(async () => {
+        fireEvent.press(getByTestId(BridgeViewSelectorsIDs.CONFIRM_BUTTON));
+      });
+
+      await waitFor(() => {
+        expect(mockSubmitBridgeTx).toHaveBeenCalledWith({
+          quoteResponse: mockActiveQuote,
+          location: MetaMetricsSwapsEventSource.MainView,
+          transactionActiveAbTests: [existingAssignment],
+        });
+      });
+    });
+  });
+
   describe('Button Label', () => {
     it('displays "Confirm swap" label by default', () => {
       const { getByText } = renderWithProvider(
diff --git a/app/components/UI/Bridge/components/SwapsConfirmButton/abTestConfig.ts b/app/components/UI/Bridge/components/SwapsConfirmButton/abTestConfig.ts
new file mode 100644
index 000000000000..3030aeee0ffa
--- /dev/null
+++ b/app/components/UI/Bridge/components/SwapsConfirmButton/abTestConfig.ts
@@ -0,0 +1,31 @@
+export const SWAPS_CTA_BUTTON_COLOR_AB_KEY =
+  'swapsSWAPS4784AbtestCTAButtonColor';
+
+export enum SwapsCtaButtonColorVariant {
+  Control = 'control',
+  Treatment = 'treatment',
+}
+
+export interface SwapsCtaButtonColorVariantConfig {
+  hasSuccessColor: boolean;
+}
+
+export const SWAPS_CTA_BUTTON_COLOR_VARIANTS: Record<
+  SwapsCtaButtonColorVariant,
+  SwapsCtaButtonColorVariantConfig
+> = {
+  [SwapsCtaButtonColorVariant.Control]: {
+    hasSuccessColor: false,
+  },
+  [SwapsCtaButtonColorVariant.Treatment]: {
+    hasSuccessColor: true,
+  },
+};
+
+export const SWAPS_CTA_BUTTON_COLOR_EXPOSURE_METADATA = {
+  experimentName: 'Swap CTA Button Color',
+  variationNames: {
+    [SwapsCtaButtonColorVariant.Control]: 'Current primary',
+    [SwapsCtaButtonColorVariant.Treatment]: 'Green success',
+  },
+};
diff --git a/app/components/UI/Bridge/components/SwapsConfirmButton/index.tsx b/app/components/UI/Bridge/components/SwapsConfirmButton/index.tsx
index 944bfbfd8030..1c404d14b46a 100644
--- a/app/components/UI/Bridge/components/SwapsConfirmButton/index.tsx
+++ b/app/components/UI/Bridge/components/SwapsConfirmButton/index.tsx
@@ -1,8 +1,9 @@
 import React, { useMemo, useEffect, useRef } from 'react';
 import {
   Button,
-  ButtonVariant,
   ButtonBaseSize,
+  ButtonVariant,
+  TextColor,
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../../../locales/i18n';
 import { BridgeViewSelectorsIDs } from '../../Views/BridgeView/BridgeView.testIds';
@@ -44,6 +45,16 @@ import { TokenWarningModalMode } from '../TokenWarningModal/constants';
 import type { TransactionActiveAbTestEntry } from '../../../../../util/transactions/transaction-active-ab-test-attribution-registry';
 import { useInsufficientNativeReserveError } from '../../hooks/useInsufficientNativeReserveError';
 import { useIsNetworkFeeUnavailable } from '../../hooks/useIsNetworkFeeUnavailable';
+import { useABTest } from '../../../../../hooks';
+import {
+  SWAPS_CTA_BUTTON_COLOR_AB_KEY,
+  SWAPS_CTA_BUTTON_COLOR_EXPOSURE_METADATA,
+  SWAPS_CTA_BUTTON_COLOR_VARIANTS,
+} from './abTestConfig';
+import { LIGHT_MODE_SUCCESS_GREEN, useTheme } from '../../../../../util/theme';
+import { AppThemeKey } from '../../../../../util/theme/models';
+
+const SUCCESS_TEXT_PROPS = { color: TextColor.SuccessInverse } as const;
 
 interface Props {
   latestSourceBalance: ReturnType<typeof useLatestBalance>;
@@ -59,6 +70,16 @@ export const SwapsConfirmButton = ({
   location,
   transactionActiveAbTests,
 }: Props) => {
+  const { variant: ctaButtonColorVariant } = useABTest(
+    SWAPS_CTA_BUTTON_COLOR_AB_KEY,
+    SWAPS_CTA_BUTTON_COLOR_VARIANTS,
+    SWAPS_CTA_BUTTON_COLOR_EXPOSURE_METADATA,
+  );
+  const { themeAppearance } = useTheme();
+  const treatmentBackground =
+    themeAppearance === AppThemeKey.light
+      ? `bg-[${LIGHT_MODE_SUCCESS_GREEN}]`
+      : 'bg-success-default';
   const navigation = useNavigation<AppNavigationProp>();
 
   const bridgeFeatureFlags = useSelector(selectBridgeFeatureFlags);
@@ -297,6 +318,12 @@ export const SwapsConfirmButton = ({
   return (
     <Button
       variant={ButtonVariant.Primary}
+      twClassName={
+        ctaButtonColorVariant.hasSuccessColor ? treatmentBackground : undefined
+      }
+      textProps={
+        ctaButtonColorVariant.hasSuccessColor ? SUCCESS_TEXT_PROPS : undefined
+      }
       size={ButtonBaseSize.Lg}
       isLoading={buttonIsInLoadingState}
       onPress={needsNewQuote ? handleGetNewQuote : handleContinue}
diff --git a/app/components/UI/Bridge/constants/default-swap-dest-tokens.ts b/app/components/UI/Bridge/constants/default-swap-dest-tokens.ts
index 3bf80d88ba4f..f325065e165f 100644
--- a/app/components/UI/Bridge/constants/default-swap-dest-tokens.ts
+++ b/app/components/UI/Bridge/constants/default-swap-dest-tokens.ts
@@ -3,10 +3,16 @@ import {
   CaipChainId,
   SolScope,
   TrxScope,
+  XlmScope,
 } from '@metamask/keyring-api';
 import { BridgeToken } from '../types';
 import { CaipAssetType, Hex } from '@metamask/utils';
 import { NETWORK_CHAIN_ID } from '../../../../util/networks/customNetworks';
+import {
+  ARC_CAIP_CHAIN_ID,
+  ARC_HEX_CHAIN_ID,
+  ARC_USDC_BRIDGE_TOKEN,
+} from '../../../../enablement/assets/arc';
 
 /**
  * Per-chain swap destination configuration.
@@ -27,6 +33,13 @@ interface ChainSwapDestConfig {
   [sourceAddress: Hex | CaipChainId]: BridgeToken;
 }
 
+export const BRIDGE_CHAINID_TO_DEFAULT_SOURCE_TOKEN: {
+  [key: Hex | CaipChainId]: BridgeToken;
+} = {
+  [ARC_HEX_CHAIN_ID]: ARC_USDC_BRIDGE_TOKEN,
+  [ARC_CAIP_CHAIN_ID]: ARC_USDC_BRIDGE_TOKEN,
+};
+
 export const DefaultSwapDestTokens: Partial<
   Record<Hex | CaipChainId, ChainSwapDestConfig>
 > = {
@@ -226,6 +239,18 @@ export const DefaultSwapDestTokens: Partial<
       chainId: TrxScope.Mainnet,
     },
   },
+  [XlmScope.Pubnet]: {
+    '*': {
+      address:
+        'stellar:pubnet/asset:USDC-GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN',
+      symbol: 'USDC',
+      name: 'USD Coin',
+      decimals: 7,
+      image:
+        'https://static.cx.metamask.io/api/v2/tokenIcons/assets/stellar/pubnet/asset/USDC-GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN.png',
+      chainId: XlmScope.Pubnet,
+    },
+  },
 };
 
 export const Bip44TokensForDefaultPairs: Record<CaipAssetType, BridgeToken> = {
@@ -294,4 +319,24 @@ export const Bip44TokensForDefaultPairs: Record<CaipAssetType, BridgeToken> = {
     chainId: TrxScope.Mainnet,
     name: 'Tether USD',
   },
+  'stellar:pubnet/slip44:148': {
+    address: 'stellar:pubnet/slip44:148',
+    symbol: 'XLM',
+    decimals: 7,
+    image:
+      'https://static.cx.metamask.io/api/v2/tokenIcons/assets/stellar/pubnet/slip44/148.png',
+    chainId: XlmScope.Pubnet,
+    name: 'Stellar',
+  },
+  'stellar:pubnet/asset:USDC-GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN':
+    {
+      address:
+        'stellar:pubnet/asset:USDC-GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN',
+      symbol: 'USDC',
+      decimals: 7,
+      image:
+        'https://static.cx.metamask.io/api/v2/tokenIcons/assets/stellar/pubnet/asset/USDC-GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN.png',
+      chainId: XlmScope.Pubnet,
+      name: 'USD Coin',
+    },
 };
diff --git a/app/components/UI/Bridge/hooks/useAutoUpdateDestToken/index.ts b/app/components/UI/Bridge/hooks/useAutoUpdateDestToken/index.ts
index e4e1275e5731..3d4c5fbf4e28 100644
--- a/app/components/UI/Bridge/hooks/useAutoUpdateDestToken/index.ts
+++ b/app/components/UI/Bridge/hooks/useAutoUpdateDestToken/index.ts
@@ -13,6 +13,7 @@ import {
 } from '../../utils/tokenUtils';
 import { areAddressesEqual } from '../../../../../util/address';
 import { BridgeToken } from '../../types';
+import { BRIDGE_CHAINID_TO_DEFAULT_SOURCE_TOKEN } from '../../constants/default-swap-dest-tokens';
 
 /**
  * Hook that provides a function to auto-update the destination token when the source changes.
@@ -79,7 +80,10 @@ export const useAutoUpdateDestToken = () => {
         // Fall back to native token if:
         // 1. No default dest token exists for this chain, OR
         // 2. Default dest equals source token
-        expectedDestToken = nativeToken;
+        // 3. No default "source" token is defined in BRIDGE_CHAINID_TO_DEFAULT_SOURCE_TOKEN.
+        const defaultSourceToken =
+          BRIDGE_CHAINID_TO_DEFAULT_SOURCE_TOKEN[newSourceToken.chainId];
+        expectedDestToken = defaultSourceToken ?? nativeToken;
       }
 
       // Only dispatch if expected dest is different from current dest
diff --git a/app/components/UI/Bridge/hooks/useAutoUpdateDestToken/useAutoUpdateDestToken.test.ts b/app/components/UI/Bridge/hooks/useAutoUpdateDestToken/useAutoUpdateDestToken.test.ts
index 03e497dff2cd..6e0d2d61e78c 100644
--- a/app/components/UI/Bridge/hooks/useAutoUpdateDestToken/useAutoUpdateDestToken.test.ts
+++ b/app/components/UI/Bridge/hooks/useAutoUpdateDestToken/useAutoUpdateDestToken.test.ts
@@ -12,6 +12,7 @@ import { BtcScope, SolScope } from '@metamask/keyring-api';
 import * as bridgeSlice from '../../../../../core/redux/slices/bridge';
 // eslint-disable-next-line import-x/no-namespace
 import * as tokenUtils from '../../utils/tokenUtils';
+import { ARC_HEX_CHAIN_ID } from '../../../../../enablement/assets/arc';
 
 describe('useAutoUpdateDestToken', () => {
   const mockEthToken: BridgeToken = {
@@ -58,6 +59,10 @@ describe('useAutoUpdateDestToken', () => {
     jest.clearAllMocks();
   });
 
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
   describe('when source chain changes and dest was not manually set', () => {
     it('updates dest token to default for new source chain', () => {
       const setDestTokenSpy = jest.spyOn(bridgeSlice, 'setDestToken');
@@ -279,6 +284,55 @@ describe('useAutoUpdateDestToken', () => {
         }),
       );
     });
+
+    it('updates dest to default from token when source changes to match default dest and default from token is defined (ARC)', () => {
+      const setDestTokenSpy = jest.spyOn(bridgeSlice, 'setDestToken');
+
+      // Current dest is the default EURC
+      const eurcTokenOnArc: BridgeToken = {
+        address: '0xbEf5f6d51CB62b58e6A8f77868681825C6fe21c1',
+        symbol: 'EURC',
+        name: 'EURC',
+        decimals: 6,
+        chainId: ARC_HEX_CHAIN_ID,
+      };
+
+      // New source is also EURC (conflicts with dest)
+      const eurcTokenOnArcSource: BridgeToken = {
+        address: '0xbEf5f6d51CB62b58e6A8f77868681825C6fe21c1',
+        symbol: 'EURC',
+        name: 'EURC',
+        decimals: 6,
+        chainId: ARC_HEX_CHAIN_ID,
+      };
+
+      const { result } = renderHookWithProvider(
+        () => useAutoUpdateDestToken(),
+        {
+          state: {
+            ...initialState,
+            bridge: {
+              ...initialState.bridge,
+              destToken: eurcTokenOnArc,
+              isDestTokenManuallySet: false,
+            },
+          },
+        },
+      );
+
+      // Change source to EURC (same as current dest)
+      result.current.autoUpdateDestToken(eurcTokenOnArcSource);
+
+      // Dest should update to native USDC (the ERC20 version) since source now conflicts with default
+      // and a corresponding entry is defined in BRIDGE_CHAINID_TO_DEFAULT_FROM_TOKEN.
+      expect(setDestTokenSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          symbol: 'USDC',
+          chainId: ARC_HEX_CHAIN_ID,
+          address: '0x3600000000000000000000000000000000000000',
+        }),
+      );
+    });
   });
 
   describe('when there is no current dest token', () => {
diff --git a/app/components/UI/Bridge/hooks/useBridgeConfirm/index.ts b/app/components/UI/Bridge/hooks/useBridgeConfirm/index.ts
index 1b040ce8d07c..fe03b9e2c7c8 100644
--- a/app/components/UI/Bridge/hooks/useBridgeConfirm/index.ts
+++ b/app/components/UI/Bridge/hooks/useBridgeConfirm/index.ts
@@ -65,6 +65,12 @@ export const useBridgeConfirm = ({
               quoteResponse: activeQuote,
               location,
               transactionActiveAbTests,
+              postTradeModalParams: {
+                sourceAmount: sourceAmount ?? activeQuote.sentAmount?.amount,
+                destAmount: activeQuote.toTokenAmount?.amount,
+                sourceToken,
+                destToken,
+              },
             },
           },
         });
diff --git a/app/components/UI/Bridge/hooks/useBridgeConfirm/useBridgeConfirm.test.ts b/app/components/UI/Bridge/hooks/useBridgeConfirm/useBridgeConfirm.test.ts
index f17b02ad0fb0..5c3c99ad08b8 100644
--- a/app/components/UI/Bridge/hooks/useBridgeConfirm/useBridgeConfirm.test.ts
+++ b/app/components/UI/Bridge/hooks/useBridgeConfirm/useBridgeConfirm.test.ts
@@ -236,10 +236,24 @@ describe('useBridgeConfirm', () => {
         await result.current();
       });
 
+      const sourceAmount = mockQuoteWithMetadata.sentAmount;
+      const destAmount = mockQuoteWithMetadata.toTokenAmount;
+      if (!sourceAmount || !destAmount) {
+        throw new Error('Mock quote is missing token amounts');
+      }
+
       expect(mockNavigate).toHaveBeenCalledWith(
         Routes.BRIDGE.ROOT,
         expect.objectContaining({
           screen: Routes.BRIDGE.HARDWARE_WALLETS_SWAPS,
+          params: expect.objectContaining({
+            submissionParams: expect.objectContaining({
+              postTradeModalParams: expect.objectContaining({
+                sourceAmount: sourceAmount.amount,
+                destAmount: destAmount.amount,
+              }),
+            }),
+          }),
         }),
       );
       expect(mockNavigate).not.toHaveBeenCalledWith(Routes.TRANSACTIONS_VIEW);
diff --git a/app/components/UI/Bridge/hooks/useBridgeHistoryItemBySrcTxHash/index.ts b/app/components/UI/Bridge/hooks/useBridgeHistoryItemBySrcTxHash/index.ts
index dbec5c5f674f..39de1393c1c0 100644
--- a/app/components/UI/Bridge/hooks/useBridgeHistoryItemBySrcTxHash/index.ts
+++ b/app/components/UI/Bridge/hooks/useBridgeHistoryItemBySrcTxHash/index.ts
@@ -26,27 +26,40 @@ export const findBridgeHistoryItemBySrcTxHash = (
 /**
  * This hook is used to get the bridge history item by source transaction hash.
  * It is used to get the bridge history item for the non EVM transactions.
+ *
+ * Also exposes a destination-hash map: a cross-chain bridge's receiving leg is
+ * a separate on-chain tx whose hash only appears in `status.destChain.txHash`,
+ * so matching by source hash alone can never recognize the fill as a bridge.
  */
 export const useBridgeHistoryItemBySrcTxHash = () => {
   const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
 
-  // Create a lookup map for faster access to bridge history items by source transaction hash.
-  const bridgeHistoryItemsBySrcTxHash: Record<string, BridgeHistoryItem> =
+  // Create lookup maps for faster access to bridge history items by
+  // source/destination transaction hash.
+  const { bridgeHistoryItemsBySrcTxHash, bridgeHistoryItemsByDestTxHash } =
     useMemo(() => {
-      const bridgeHistoryItemsBySrcTxHash_: Record<string, BridgeHistoryItem> =
-        {};
+      const bySrcTxHash: Record<string, BridgeHistoryItem> = {};
+      const byDestTxHash: Record<string, BridgeHistoryItem> = {};
 
       Object.values(bridgeHistory ?? {}).forEach((bridgeTx) => {
-        const txHash = bridgeTx.status?.srcChain?.txHash;
-        if (txHash) {
-          bridgeHistoryItemsBySrcTxHash_[txHash] = bridgeTx;
+        const srcTxHash = bridgeTx.status?.srcChain?.txHash;
+        if (srcTxHash) {
+          bySrcTxHash[srcTxHash] = bridgeTx;
+        }
+        const destTxHash = bridgeTx.status?.destChain?.txHash;
+        if (destTxHash) {
+          byDestTxHash[destTxHash] = bridgeTx;
         }
       });
 
-      return bridgeHistoryItemsBySrcTxHash_;
+      return {
+        bridgeHistoryItemsBySrcTxHash: bySrcTxHash,
+        bridgeHistoryItemsByDestTxHash: byDestTxHash,
+      };
     }, [bridgeHistory]);
 
   return {
     bridgeHistoryItemsBySrcTxHash,
+    bridgeHistoryItemsByDestTxHash,
   };
 };
diff --git a/app/components/UI/Bridge/hooks/useIsNetworkFeeUnavailable/index.test.ts b/app/components/UI/Bridge/hooks/useIsNetworkFeeUnavailable/index.test.ts
index 2a6cf25a7bb5..b21dc714354f 100644
--- a/app/components/UI/Bridge/hooks/useIsNetworkFeeUnavailable/index.test.ts
+++ b/app/components/UI/Bridge/hooks/useIsNetworkFeeUnavailable/index.test.ts
@@ -67,7 +67,7 @@ describe('isQuoteNetworkFeeUnavailable', () => {
     expect(isQuoteNetworkFeeUnavailable(createQuote())).toBe(false);
   });
 
-  it('returns false for a non-BTC/non-Tron quote with zero network fee', () => {
+  it('returns false for a non-BTC/non-Tron/non-Stellar quote with zero network fee', () => {
     expect(
       isQuoteNetworkFeeUnavailable(
         createQuote({
@@ -148,6 +148,70 @@ describe('isQuoteNetworkFeeUnavailable', () => {
     ).toBe(false);
   });
 
+  it('returns true for a Stellar quote with zero network fee', () => {
+    expect(
+      isQuoteNetworkFeeUnavailable(
+        createQuote({
+          quote: {
+            ...mockQuoteWithMetadata.quote,
+            srcChainId: ChainId.STELLAR,
+          },
+          totalNetworkFee: {
+            ...mockQuoteWithMetadata.totalNetworkFee,
+            amount: '0',
+          },
+        }),
+      ),
+    ).toBe(true);
+  });
+
+  it('returns true for a Stellar quote with negative network fee', () => {
+    expect(
+      isQuoteNetworkFeeUnavailable(
+        createQuote({
+          quote: {
+            ...mockQuoteWithMetadata.quote,
+            srcChainId: ChainId.STELLAR,
+          },
+          totalNetworkFee: {
+            ...mockQuoteWithMetadata.totalNetworkFee,
+            amount: '-1',
+          },
+        }),
+      ),
+    ).toBe(true);
+  });
+
+  it('returns true for a Stellar quote with missing network fee amount', () => {
+    expect(
+      isQuoteNetworkFeeUnavailable(
+        createQuote({
+          quote: {
+            ...mockQuoteWithMetadata.quote,
+            srcChainId: ChainId.STELLAR,
+          },
+          totalNetworkFee: {
+            ...mockQuoteWithMetadata.totalNetworkFee,
+            amount: undefined,
+          } as unknown as NonNullable<ActiveQuote>['totalNetworkFee'],
+        }),
+      ),
+    ).toBe(true);
+  });
+
+  it('returns false for a Stellar quote with positive network fee', () => {
+    expect(
+      isQuoteNetworkFeeUnavailable(
+        createQuote({
+          quote: {
+            ...mockQuoteWithMetadata.quote,
+            srcChainId: ChainId.STELLAR,
+          },
+        }),
+      ),
+    ).toBe(false);
+  });
+
   it('returns false when the quote has no source chain', () => {
     expect(
       isQuoteNetworkFeeUnavailable(
diff --git a/app/components/UI/Bridge/hooks/useIsNetworkFeeUnavailable/index.ts b/app/components/UI/Bridge/hooks/useIsNetworkFeeUnavailable/index.ts
index 8cb30b9d0dd1..f58b62722946 100644
--- a/app/components/UI/Bridge/hooks/useIsNetworkFeeUnavailable/index.ts
+++ b/app/components/UI/Bridge/hooks/useIsNetworkFeeUnavailable/index.ts
@@ -1,6 +1,10 @@
 import { useMemo } from 'react';
 import { BigNumber } from 'bignumber.js';
-import { isBitcoinChainId, isTronChainId } from '@metamask/bridge-controller';
+import {
+  isBitcoinChainId,
+  isStellarChainId,
+  isTronChainId,
+} from '@metamask/bridge-controller';
 import { useBridgeQuoteData } from '../useBridgeQuoteData';
 
 type ActiveQuote = ReturnType<typeof useBridgeQuoteData>['activeQuote'];
@@ -12,7 +16,9 @@ export const isQuoteNetworkFeeUnavailable = (
 
   if (
     !sourceChainId ||
-    (!isBitcoinChainId(sourceChainId) && !isTronChainId(sourceChainId))
+    (!isBitcoinChainId(sourceChainId) &&
+      !isTronChainId(sourceChainId) &&
+      !isStellarChainId(sourceChainId))
   ) {
     return false;
   }
diff --git a/app/components/UI/BrowserUrlBar/BrowserUrlBar.test.tsx b/app/components/UI/BrowserUrlBar/BrowserUrlBar.test.tsx
index 613ba15470cd..ee00973974cc 100644
--- a/app/components/UI/BrowserUrlBar/BrowserUrlBar.test.tsx
+++ b/app/components/UI/BrowserUrlBar/BrowserUrlBar.test.tsx
@@ -344,6 +344,33 @@ describe('BrowserUrlBar', () => {
       });
     });
 
+    describe('dismissEditing method', () => {
+      it('unfocuses without calling onCancel', () => {
+        const onCancelMock = jest.fn();
+        const onBlurMock = jest.fn();
+        const setIsUrlBarFocusedMock = jest.fn();
+        const props = {
+          ...defaultProps,
+          onCancel: onCancelMock,
+          onBlur: onBlurMock,
+          setIsUrlBarFocused: setIsUrlBarFocusedMock,
+          isUrlBarFocused: true,
+        };
+
+        renderWithProvider(<BrowserUrlBar {...props} ref={urlBarRef} />, {
+          state: mockInitialState,
+        });
+
+        act(() => {
+          urlBarRef.current?.dismissEditing();
+        });
+
+        expect(setIsUrlBarFocusedMock).toHaveBeenCalledWith(false);
+        expect(onBlurMock).toHaveBeenCalledTimes(1);
+        expect(onCancelMock).not.toHaveBeenCalled();
+      });
+    });
+
     describe('focus method', () => {
       it('exposes focus method through imperative handle', () => {
         // Arrange
diff --git a/app/components/UI/BrowserUrlBar/BrowserUrlBar.tsx b/app/components/UI/BrowserUrlBar/BrowserUrlBar.tsx
index cb78bccd4014..278b3df1303f 100644
--- a/app/components/UI/BrowserUrlBar/BrowserUrlBar.tsx
+++ b/app/components/UI/BrowserUrlBar/BrowserUrlBar.tsx
@@ -195,6 +195,13 @@ const BrowserUrlBar = forwardRef<BrowserUrlBarRef, BrowserUrlBarProps>(
       dappOrigin,
     ]);
 
+    const dismissEditing = useCallback(() => {
+      shouldTriggerBlurCallbackRef.current = false;
+      inputRef?.current?.blur();
+      unfocusInput();
+      onBlur();
+    }, [unfocusInput, onBlur]);
+
     useImperativeHandle(ref, () => ({
       hide: () => onCancelInput(),
       blur: () => inputRef?.current?.blur(),
@@ -207,6 +214,10 @@ const BrowserUrlBar = forwardRef<BrowserUrlBarRef, BrowserUrlBarProps>(
         }
         inputRef?.current?.setNativeProps(props);
       },
+      suppressNextBlur: () => {
+        shouldTriggerBlurCallbackRef.current = false;
+      },
+      dismissEditing,
     }));
 
     /**
diff --git a/app/components/UI/BrowserUrlBar/BrowserUrlBar.types.ts b/app/components/UI/BrowserUrlBar/BrowserUrlBar.types.ts
index 838d2f6010a7..650365a3e482 100644
--- a/app/components/UI/BrowserUrlBar/BrowserUrlBar.types.ts
+++ b/app/components/UI/BrowserUrlBar/BrowserUrlBar.types.ts
@@ -16,6 +16,16 @@ export type BrowserUrlBarRef = {
   blur: () => void;
   focus: () => void;
   setNativeProps: (props: object) => void;
+  /**
+   * Skip the next TextInput blur unfocus. Used when tapping autocomplete
+   * results so onPress still fires after pressIn.
+   */
+  suppressNextBlur: () => void;
+  /**
+   * Leave edit mode without resetting the URL to the previous page
+   * (unlike `hide` / Cancel). Used after submitting a new navigation.
+   */
+  dismissEditing: () => void;
 };
 
 /**
diff --git a/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx b/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx
index c97260f18aa4..0322f57c16f9 100644
--- a/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx
+++ b/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx
@@ -281,7 +281,7 @@ const CardAuthentication = () => {
         });
       } catch (err) {
         Logger.log('CardAuthentication::Login failed', err);
-        // error is displayed via the derived `error` variable above
+        // errors are displayed via the derived `error` variable above
       }
     },
     [
diff --git a/app/components/UI/Card/Views/CardHome/CardHome.test.tsx b/app/components/UI/Card/Views/CardHome/CardHome.test.tsx
index 143a9e57d019..20266ccbadec 100644
--- a/app/components/UI/Card/Views/CardHome/CardHome.test.tsx
+++ b/app/components/UI/Card/Views/CardHome/CardHome.test.tsx
@@ -298,6 +298,18 @@ jest.mock('../../hooks/useCardHomeData', () => ({
   useCardHomeData: jest.fn(),
 }));
 
+jest.mock('../../hooks/useImmersveSupportedRegions', () => ({
+  __esModule: true,
+  default: jest.fn(() => ({
+    region: null,
+    onboardingDocuments: [],
+    permanentDocuments: [],
+    isLoading: false,
+    error: null,
+    refetch: jest.fn(),
+  })),
+}));
+
 const mockResumePendingAction = jest.fn();
 let mockImmersvePendingAction: { type: string } | null = null;
 jest.mock('./hooks/useImmersveCardProvisioning', () => ({
@@ -851,9 +863,6 @@ function setupMockSelectors(
       return config.selectedAccount;
     if (selectorString.includes('selectCardholderAccounts'))
       return config.cardholderAccounts;
-    if (selectorString.includes('selectEvmTokens')) return [mockPriorityToken];
-    if (selectorString.includes('selectEvmTokenFiatBalances'))
-      return ['1000.00'];
 
     return [];
   });
@@ -1548,6 +1557,9 @@ describe('CardHome Component', () => {
       expect(
         screen.getByTestId(CardHomeSelectors.UNLINK_MONEY_ACCOUNT_ITEM),
       ).toBeOnTheScreen();
+      expect(
+        screen.queryByTestId(CardHomeSelectors.CHANGE_ASSET_BUTTON),
+      ).not.toBeOnTheScreen();
       expect(screen.getByText('Unlink Money account')).toBeOnTheScreen();
       expect(
         screen.getByText('Change your Card funding source'),
@@ -1571,6 +1583,9 @@ describe('CardHome Component', () => {
       expect(
         screen.queryByTestId(CardHomeSelectors.UNLINK_MONEY_ACCOUNT_ITEM),
       ).not.toBeOnTheScreen();
+      expect(
+        screen.getByTestId(CardHomeSelectors.CHANGE_ASSET_BUTTON),
+      ).toBeOnTheScreen();
     });
 
     it('hides the unlink row when there is no active primary Money Account', () => {
@@ -2837,14 +2852,16 @@ describe('CardHome Component', () => {
   });
 
   describe('Data refresh on focus', () => {
-    it('calls refetch when the screen gains focus', () => {
-      mockRefetchAllData.mockClear();
+    it('calls fetchCardHomeData when the screen gains focus', () => {
+      const fetchSpy = Engine.context.CardController
+        .fetchCardHomeData as jest.Mock;
+      fetchSpy.mockClear();
 
       jest.mocked(useFocusEffect).mockImplementation((cb) => cb());
 
       render();
 
-      expect(mockRefetchAllData).toHaveBeenCalled();
+      expect(fetchSpy).toHaveBeenCalledWith();
 
       jest.mocked(useFocusEffect).mockImplementation(jest.fn());
     });
diff --git a/app/components/UI/Card/Views/CardHome/CardHome.tsx b/app/components/UI/Card/Views/CardHome/CardHome.tsx
index 59d6aea4848b..75aec214e438 100644
--- a/app/components/UI/Card/Views/CardHome/CardHome.tsx
+++ b/app/components/UI/Card/Views/CardHome/CardHome.tsx
@@ -56,6 +56,7 @@ import {
 import {
   CardStatus,
   FundingAssetStatus,
+  CardProviderIds,
 } from '../../../../../core/Engine/controllers/card-controller/provider-types';
 import { selectMetalCardCheckoutFeatureFlag } from '../../../../../selectors/featureFlagController/card';
 import { useIsSwapEnabledForPriorityToken } from '../../hooks/useIsSwapEnabledForPriorityToken';
@@ -95,6 +96,7 @@ import { useCardHomeActions } from './hooks/useCardHomeActions';
 import { useCardHomeAnalytics } from './hooks/useCardHomeAnalytics';
 import { useCardProvisioning } from './hooks/useCardProvisioning';
 import { useImmersveCardProvisioning } from './hooks/useImmersveCardProvisioning';
+import useImmersveSupportedRegions from '../../hooks/useImmersveSupportedRegions';
 import { CardEntryPoint, CardFlow, CardScreens } from '../../util/metrics';
 
 interface CardHomeRouteParams {
@@ -135,7 +137,23 @@ const CardHome = () => {
   const hasSetupActions = (data?.actions ?? []).some(
     (a) => a.type === 'enable_card',
   );
-  const isImmersve = useSelector(selectCardActiveProviderId) === 'immersve';
+  const isImmersve =
+    useSelector(selectCardActiveProviderId) === CardProviderIds.Immersve;
+  const cardRegionCode = data?.card?.regionCode;
+  const {
+    permanentDocuments: immersveLegalDocuments,
+    isLoading: isImmersveLegalDocsLoading,
+    error: immersveLegalDocsError,
+    refetch: refetchImmersveLegalDocs,
+  } = useImmersveSupportedRegions(cardRegionCode, {
+    enabled: isImmersve && Boolean(cardRegionCode),
+  });
+  const immersveLegalDocsUnavailable = Boolean(
+    isImmersve &&
+      Boolean(cardRegionCode) &&
+      !isImmersveLegalDocsLoading &&
+      (immersveLegalDocsError || immersveLegalDocuments.length === 0),
+  );
   const cardTermsAndConditionsUrl = useMemo(
     () =>
       isImmersve
@@ -224,14 +242,10 @@ const CardHome = () => {
   }, [refetch]);
 
   // --- Refetch card data when the screen regains focus (e.g. after a swap) ---
-  const refetched = useRef(false);
   useFocusEffect(
     useCallback(() => {
-      if (!refetched.current) {
-        refetched.current = true;
-        refetch();
-      }
-    }, [refetch]),
+      Engine.context.CardController.fetchCardHomeData();
+    }, []),
   );
 
   // --- Auth state transition: navigate to auth screen on logout ---
@@ -729,6 +743,22 @@ const CardHome = () => {
           hasAlerts={hasAlertOnlyState}
           hasSetupActions={hasSetupActions}
           supportEmail={supportEmail}
+          legalDocuments={
+            isImmersve && immersveLegalDocuments.length > 0
+              ? immersveLegalDocuments
+              : undefined
+          }
+          hideLegalDocuments={isImmersve && isImmersveLegalDocsLoading}
+          showLegalDocumentsError={immersveLegalDocsUnavailable}
+          onRetryLegalDocuments={
+            immersveLegalDocsUnavailable
+              ? () => {
+                  refetchImmersveLegalDocs().catch(() => {
+                    // Error surfaces via hook state / footer retry UI.
+                  });
+                }
+              : undefined
+          }
           onNavigateToCardTos={actions.navigateToCardTosPage}
           onLogout={actions.logoutAction}
         />
diff --git a/app/components/UI/Card/Views/CardHome/components/CardHomeFooter.test.tsx b/app/components/UI/Card/Views/CardHome/components/CardHomeFooter.test.tsx
new file mode 100644
index 000000000000..d578ccd2e249
--- /dev/null
+++ b/app/components/UI/Card/Views/CardHome/components/CardHomeFooter.test.tsx
@@ -0,0 +1,117 @@
+import React from 'react';
+import { Linking } from 'react-native';
+import { fireEvent, render } from '@testing-library/react-native';
+import CardHomeFooter from './CardHomeFooter';
+import { CardHomeSelectors } from '../CardHome.testIds';
+
+jest.mock('../../../../../../../locales/i18n', () => ({
+  strings: (key: string) => key,
+}));
+
+jest.mock('react-native/Libraries/Linking/Linking', () => ({
+  openURL: jest.fn(() => Promise.resolve()),
+}));
+
+const baseProps = {
+  isAuthenticated: true,
+  isLoading: false,
+  hasAlerts: false,
+  hasSetupActions: false,
+  supportEmail: 'support@example.com',
+  onNavigateToCardTos: jest.fn(),
+  onLogout: jest.fn(),
+};
+
+describe('CardHomeFooter', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders single TOS fallback when legalDocuments are absent', () => {
+    const onNavigateToCardTos = jest.fn();
+
+    const { getByTestId, queryByTestId } = render(
+      <CardHomeFooter
+        {...baseProps}
+        onNavigateToCardTos={onNavigateToCardTos}
+      />,
+    );
+
+    expect(getByTestId(CardHomeSelectors.CARD_TOS_ITEM)).toBeOnTheScreen();
+    fireEvent.press(getByTestId(CardHomeSelectors.CARD_TOS_ITEM));
+
+    expect(onNavigateToCardTos).toHaveBeenCalledTimes(1);
+    expect(
+      queryByTestId(`${CardHomeSelectors.CARD_TOS_ITEM}-generalTermsOfUse`),
+    ).toBeNull();
+  });
+
+  it('renders one row per legal document and opens urls', () => {
+    const { getByTestId, getByText, queryByTestId } = render(
+      <CardHomeFooter
+        {...baseProps}
+        legalDocuments={[
+          {
+            id: 'generalTermsOfUse',
+            title: 'Terms of Use',
+            url: 'https://example.com/terms',
+          },
+          {
+            id: 'privacyPolicy',
+            title: 'Privacy Policy',
+            url: 'https://example.com/privacy',
+          },
+        ]}
+      />,
+    );
+
+    expect(queryByTestId(CardHomeSelectors.CARD_TOS_ITEM)).toBeNull();
+    expect(getByText('Terms of Use')).toBeOnTheScreen();
+    expect(getByText('Privacy Policy')).toBeOnTheScreen();
+
+    fireEvent.press(
+      getByTestId(`${CardHomeSelectors.CARD_TOS_ITEM}-privacyPolicy`),
+    );
+
+    expect(Linking.openURL).toHaveBeenCalledWith('https://example.com/privacy');
+  });
+
+  it('returns null while loading', () => {
+    const { queryByTestId } = render(
+      <CardHomeFooter {...baseProps} isLoading />,
+    );
+
+    expect(queryByTestId(CardHomeSelectors.CARD_TOS_ITEM)).toBeNull();
+    expect(queryByTestId(CardHomeSelectors.CONTACT_SUPPORT_ITEM)).toBeNull();
+  });
+
+  it('hides legal links while Immersve docs are loading without falling back to TOS', () => {
+    const { queryByTestId, getByTestId } = render(
+      <CardHomeFooter {...baseProps} hideLegalDocuments />,
+    );
+
+    expect(queryByTestId(CardHomeSelectors.CARD_TOS_ITEM)).toBeNull();
+    expect(
+      getByTestId(CardHomeSelectors.CONTACT_SUPPORT_ITEM),
+    ).toBeOnTheScreen();
+  });
+
+  it('shows error and retry for Immersve instead of TOS fallback when docs unavailable', () => {
+    const onRetryLegalDocuments = jest.fn();
+
+    const { getByTestId, queryByTestId } = render(
+      <CardHomeFooter
+        {...baseProps}
+        showLegalDocumentsError
+        onRetryLegalDocuments={onRetryLegalDocuments}
+      />,
+    );
+
+    expect(queryByTestId(CardHomeSelectors.CARD_TOS_ITEM)).toBeNull();
+    expect(
+      getByTestId(`${CardHomeSelectors.CARD_TOS_ITEM}-error`),
+    ).toBeOnTheScreen();
+    fireEvent.press(getByTestId(`${CardHomeSelectors.CARD_TOS_ITEM}-retry`));
+    expect(onRetryLegalDocuments).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/app/components/UI/Card/Views/CardHome/components/CardHomeFooter.tsx b/app/components/UI/Card/Views/CardHome/components/CardHomeFooter.tsx
index 58bc701e3348..bb562ac054b9 100644
--- a/app/components/UI/Card/Views/CardHome/components/CardHomeFooter.tsx
+++ b/app/components/UI/Card/Views/CardHome/components/CardHomeFooter.tsx
@@ -5,12 +5,31 @@ import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { strings } from '../../../../../../../locales/i18n';
 import { CardHomeSelectors } from '../CardHome.testIds';
 
+export interface CardHomeLegalDocumentLink {
+  id: string;
+  title: string;
+  url: string;
+}
+
 interface CardHomeFooterProps {
   isAuthenticated: boolean;
   isLoading: boolean;
   hasAlerts: boolean;
   hasSetupActions: boolean;
   supportEmail: string;
+  /** When set (Immersve), render one row per region legal document. */
+  legalDocuments?: CardHomeLegalDocumentLink[];
+  /**
+   * When true (Immersve docs still loading), omit legal links entirely —
+   * do not fall back to the single hardcoded TOS row mid-fetch.
+   */
+  hideLegalDocuments?: boolean;
+  /**
+   * When true (Immersve docs failed or empty after settle), show error + retry
+   * instead of the legacy single TOS fallback.
+   */
+  showLegalDocumentsError?: boolean;
+  onRetryLegalDocuments?: () => void;
   onNavigateToCardTos: () => void;
   onLogout: () => void;
 }
@@ -21,6 +40,10 @@ const CardHomeFooter = ({
   hasAlerts,
   hasSetupActions,
   supportEmail,
+  legalDocuments,
+  hideLegalDocuments = false,
+  showLegalDocumentsError = false,
+  onRetryLegalDocuments,
   onNavigateToCardTos,
   onLogout,
 }: CardHomeFooterProps) => {
@@ -28,24 +51,80 @@ const CardHomeFooter = ({
 
   if (isLoading) return null;
 
-  return (
-    <>
-      <Box
-        twClassName={`h-px mx-4 bg-border-muted ${hasAlerts || hasSetupActions ? 'hidden' : ''}`}
-      />
-      <Box twClassName="gap-6 mt-4">
+  const hasLegalDocuments = Boolean(
+    legalDocuments && legalDocuments.length > 0,
+  );
+
+  const renderLegalSection = () => {
+    if (hideLegalDocuments) {
+      return null;
+    }
+    if (hasLegalDocuments) {
+      return legalDocuments?.map((legalDocument) => (
         <TouchableOpacity
-          onPress={onNavigateToCardTos}
-          testID={CardHomeSelectors.CARD_TOS_ITEM}
+          key={legalDocument.id}
+          onPress={() => {
+            Linking.openURL(legalDocument.url).catch(() => {
+              // Swallow — user can retry via the link.
+            });
+          }}
+          testID={`${CardHomeSelectors.CARD_TOS_ITEM}-${legalDocument.id}`}
           style={tw.style('px-4')}
         >
           <Text
             variant={TextVariant.BodyMd}
             twClassName="text-text-alternative"
           >
-            {strings('card.card_home.manage_card_options.card_tos_title')}
+            {legalDocument.title}
           </Text>
         </TouchableOpacity>
+      ));
+    }
+    if (showLegalDocumentsError) {
+      return (
+        <Box
+          twClassName="px-4 gap-1"
+          testID={`${CardHomeSelectors.CARD_TOS_ITEM}-error`}
+        >
+          <Text variant={TextVariant.BodyMd} twClassName="text-error-default">
+            {strings('card.card_home.manage_card_options.legal_docs_error')}
+          </Text>
+          {onRetryLegalDocuments ? (
+            <TouchableOpacity
+              onPress={onRetryLegalDocuments}
+              testID={`${CardHomeSelectors.CARD_TOS_ITEM}-retry`}
+            >
+              <Text
+                variant={TextVariant.BodyMd}
+                twClassName="text-primary-default"
+              >
+                {strings('card.card_home.try_again')}
+              </Text>
+            </TouchableOpacity>
+          ) : null}
+        </Box>
+      );
+    }
+    return (
+      <TouchableOpacity
+        onPress={onNavigateToCardTos}
+        testID={CardHomeSelectors.CARD_TOS_ITEM}
+        style={tw.style('px-4')}
+      >
+        <Text variant={TextVariant.BodyMd} twClassName="text-text-alternative">
+          {strings('card.card_home.manage_card_options.card_tos_title')}
+        </Text>
+      </TouchableOpacity>
+    );
+  };
+
+  return (
+    <>
+      <Box
+        twClassName={`h-px mx-4 bg-border-muted ${hasAlerts || hasSetupActions ? 'hidden' : ''}`}
+      />
+      <Box twClassName="gap-6 mt-4">
+        {renderLegalSection()}
         <TouchableOpacity
           onPress={() => Linking.openURL(`mailto:${supportEmail}`)}
           testID={CardHomeSelectors.CONTACT_SUPPORT_ITEM}
diff --git a/app/components/UI/Card/Views/CardHome/components/ManageCardOptions.test.tsx b/app/components/UI/Card/Views/CardHome/components/ManageCardOptions.test.tsx
index 4cce3e66bf77..25e1e4ce08a0 100644
--- a/app/components/UI/Card/Views/CardHome/components/ManageCardOptions.test.tsx
+++ b/app/components/UI/Card/Views/CardHome/components/ManageCardOptions.test.tsx
@@ -41,6 +41,7 @@ const buildCapabilities = (
 const renderComponent = (
   capabilities: CardProviderCapabilities,
   cardDetailsVisible = false,
+  showUnlinkMoneyAccount = false,
 ) =>
   render(
     <ManageCardOptions
@@ -62,7 +63,7 @@ const renderComponent = (
       onViewPin={jest.fn()}
       onToggleFreeze={jest.fn()}
       onManageSpendingLimit={jest.fn()}
-      showUnlinkMoneyAccount={false}
+      showUnlinkMoneyAccount={showUnlinkMoneyAccount}
       onUnlinkMoneyAccount={jest.fn()}
       onOrderMetalCard={jest.fn()}
       isSpendingLimitActive
@@ -97,6 +98,22 @@ describe('ManageCardOptions funding-limit gating', () => {
       queryByTestId(CardHomeSelectors.MANAGE_SPENDING_LIMIT_ITEM),
     ).toBeNull();
   });
+
+  it('hides change asset when the Money Account unlink action is available', () => {
+    const { queryByTestId, getByTestId } = renderComponent(
+      buildCapabilities({ supportsFundingLimits: true }),
+      false,
+      true,
+    );
+
+    expect(queryByTestId(CardHomeSelectors.CHANGE_ASSET_BUTTON)).toBeNull();
+    expect(
+      getByTestId(CardHomeSelectors.UNLINK_MONEY_ACCOUNT_ITEM),
+    ).toBeOnTheScreen();
+    expect(
+      getByTestId(CardHomeSelectors.MANAGE_SPENDING_LIMIT_ITEM),
+    ).toBeOnTheScreen();
+  });
 });
 
 describe('ManageCardOptions travel gating', () => {
diff --git a/app/components/UI/Card/Views/CardHome/components/ManageCardOptions.tsx b/app/components/UI/Card/Views/CardHome/components/ManageCardOptions.tsx
index 2a2a0ddb1d2d..9e5e0bbe0d2f 100644
--- a/app/components/UI/Card/Views/CardHome/components/ManageCardOptions.tsx
+++ b/app/components/UI/Card/Views/CardHome/components/ManageCardOptions.tsx
@@ -120,6 +120,7 @@ const ManageCardOptions = ({
           />
         )}
         {capabilities?.supportsFundingLimits &&
+          !showUnlinkMoneyAccount &&
           ((isAuthenticated && !isLoading && card) || showTeaserOptions) && (
             <ManageCardListItem
               title={strings('card.card_home.manage_card_options.change_asset')}
diff --git a/app/components/UI/Card/Views/CardHome/hooks/useImmersveCardProvisioning.test.ts b/app/components/UI/Card/Views/CardHome/hooks/useImmersveCardProvisioning.test.ts
index b4a4b52c7854..17b13b9ac4e8 100644
--- a/app/components/UI/Card/Views/CardHome/hooks/useImmersveCardProvisioning.test.ts
+++ b/app/components/UI/Card/Views/CardHome/hooks/useImmersveCardProvisioning.test.ts
@@ -119,6 +119,9 @@ describe('useImmersveCardProvisioning', () => {
         jest.advanceTimersByTime(10000);
       });
       expect(controller.fetchCardHomeData).toHaveBeenCalledTimes(2);
+      expect(controller.fetchCardHomeData).toHaveBeenCalledWith({
+        force: true,
+      });
       jest.useRealTimers();
     });
 
diff --git a/app/components/UI/Card/Views/CardHome/hooks/useImmersveCardProvisioning.ts b/app/components/UI/Card/Views/CardHome/hooks/useImmersveCardProvisioning.ts
index 6fe841c94775..9a2de849902d 100644
--- a/app/components/UI/Card/Views/CardHome/hooks/useImmersveCardProvisioning.ts
+++ b/app/components/UI/Card/Views/CardHome/hooks/useImmersveCardProvisioning.ts
@@ -69,7 +69,9 @@ export function useImmersveCardProvisioning(
     }
 
     const interval = setInterval(() => {
-      Engine.context.CardController.fetchCardHomeData().catch(() => undefined);
+      Engine.context.CardController.fetchCardHomeData({ force: true }).catch(
+        () => undefined,
+      );
     }, POLL_INTERVAL_MS);
 
     return () => clearInterval(interval);
diff --git a/app/components/UI/Card/components/AddFundsBottomSheet/AddFundsBottomSheet.test.tsx b/app/components/UI/Card/components/AddFundsBottomSheet/AddFundsBottomSheet.test.tsx
index 8fb6fa0c5164..e6612d2141c8 100644
--- a/app/components/UI/Card/components/AddFundsBottomSheet/AddFundsBottomSheet.test.tsx
+++ b/app/components/UI/Card/components/AddFundsBottomSheet/AddFundsBottomSheet.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { fireEvent } from '@testing-library/react-native';
+import { act, fireEvent } from '@testing-library/react-native';
 import AddFundsBottomSheet from './AddFundsBottomSheet';
 import { useOpenSwaps } from '../../hooks/useOpenSwaps';
 import useDepositEnabled from '../../../Ramp/hooks/useDepositEnabled';
@@ -220,10 +220,12 @@ describe('AddFundsBottomSheet', () => {
     expect(getByText('Swap tokens into USDC on Linea')).toBeTruthy();
   });
 
-  it('tracks analytics and trace with UNIFIED_BUY_2 ramp_type when Fund with cash is pressed', () => {
+  it('tracks analytics and trace with UNIFIED_BUY_2 ramp_type when Fund with cash is pressed', async () => {
     const { getByText } = setupComponent();
 
-    fireEvent.press(getByText('Fund with cash'));
+    await act(async () => {
+      fireEvent.press(getByText('Fund with cash'));
+    });
 
     expect(mockCreateEventBuilder).toHaveBeenCalledWith(
       MetaMetricsEvents.CARD_ADD_FUNDS_DEPOSIT_CLICKED,
@@ -248,10 +250,12 @@ describe('AddFundsBottomSheet', () => {
     });
   });
 
-  it('handles swap option press correctly', () => {
+  it('handles swap option press correctly', async () => {
     const { getByText } = setupComponent();
 
-    fireEvent.press(getByText('Fund with crypto'));
+    await act(async () => {
+      fireEvent.press(getByText('Fund with crypto'));
+    });
 
     expect(mockOpenSwaps).toHaveBeenCalledWith({
       beforeNavigate: expect.any(Function),
@@ -317,23 +321,22 @@ describe('AddFundsBottomSheet', () => {
     expect(getByText('Swap tokens into ETH on Linea')).toBeTruthy();
   });
 
-  it('routes Fund with cash through goToBuy (UB2-aware) with the priority token CAIP-19 assetId', () => {
+  it('routes Fund with cash through goToBuy (UB2-aware) with the priority token CAIP-19 assetId', async () => {
     const { getByText } = setupComponent();
 
-    fireEvent.press(getByText('Fund with cash'));
-
-    // goToBuy is the smart router in useRampNavigation; when V2 is enabled
-    // (default for this suite), it dispatches to UB2 (BuildQuote). See
-    // useRampNavigation.test.ts > 'goToBuy > when unified V2 is enabled'.
-    expect(mockGoToBuy).toHaveBeenCalledTimes(1);
-    expect(mockGoToBuy).toHaveBeenCalledWith({
-      assetId: `${mockPriorityToken.caipChainId}/erc20:${mockPriorityToken.address}`,
+    await act(async () => {
+      fireEvent.press(getByText('Fund with cash'));
     });
+
+    expect(mockGoToBuy).toHaveBeenCalledWith(
+      {
+        assetId: `${mockPriorityToken.caipChainId}/erc20:${mockPriorityToken.address}`,
+      },
+      { surface: 'card' },
+    );
   });
 
-  it('falls back to goToBuy() with no intent when the priority token has no address', () => {
-    // No assetId → useRampNavigation routes UB2 to TokenSelection
-    // (see useRampNavigation.ts, 'V2: If no assetId and V2 is enabled').
+  it('falls back to goToBuy() with no intent when the priority token has no address', async () => {
     const tokenWithoutAddress: CardFundingToken = {
       ...mockPriorityToken,
       address: null,
@@ -341,10 +344,11 @@ describe('AddFundsBottomSheet', () => {
 
     const { getByText } = setupComponent(tokenWithoutAddress);
 
-    fireEvent.press(getByText('Fund with cash'));
+    await act(async () => {
+      fireEvent.press(getByText('Fund with cash'));
+    });
 
-    expect(mockGoToBuy).toHaveBeenCalledTimes(1);
-    expect(mockGoToBuy).toHaveBeenCalledWith(undefined);
+    expect(mockGoToBuy).toHaveBeenCalledWith(undefined, { surface: 'card' });
   });
 
   it('renders component correctly', () => {
diff --git a/app/components/UI/Card/components/AddFundsBottomSheet/AddFundsBottomSheet.tsx b/app/components/UI/Card/components/AddFundsBottomSheet/AddFundsBottomSheet.tsx
index 3b1ef11757e4..19e674b3ec9a 100644
--- a/app/components/UI/Card/components/AddFundsBottomSheet/AddFundsBottomSheet.tsx
+++ b/app/components/UI/Card/components/AddFundsBottomSheet/AddFundsBottomSheet.tsx
@@ -32,6 +32,7 @@ import { MetaMetricsEvents } from '../../../../../core/Analytics';
 import { strings } from '../../../../../../locales/i18n';
 import { CardHomeSelectors } from '../../Views/CardHome/CardHome.testIds';
 import { useRampNavigation } from '../../../Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../../Ramp/constants/rampsBuyCufTags';
 import { safeFormatChainIdToHex } from '../../util/safeFormatChainIdToHex';
 import { getDetectedGeolocation } from '../../../../../reducers/fiatOrders';
 import { useRampsButtonClickData } from '../../../Ramp/hooks/useRampsButtonClickData';
@@ -88,7 +89,9 @@ const AddFundsBottomSheet: React.FC = () => {
         : undefined;
 
     closeBottomSheetAndNavigate(() => {
-      goToBuy(assetId ? { assetId } : undefined);
+      goToBuy(assetId ? { assetId } : undefined, {
+        surface: RAMPS_BUY_CUF_SURFACE.CARD,
+      });
     });
     trackEvent(
       createEventBuilder(
diff --git a/app/components/UI/Card/components/Onboarding/ImmersveLegalClickwrap.test.tsx b/app/components/UI/Card/components/Onboarding/ImmersveLegalClickwrap.test.tsx
new file mode 100644
index 000000000000..35a368d1dbf2
--- /dev/null
+++ b/app/components/UI/Card/components/Onboarding/ImmersveLegalClickwrap.test.tsx
@@ -0,0 +1,138 @@
+import React from 'react';
+import { Linking } from 'react-native';
+import { fireEvent, render } from '@testing-library/react-native';
+import ImmersveLegalClickwrap from './ImmersveLegalClickwrap';
+
+jest.mock('../../../../../../locales/i18n', () => ({
+  strings: (key: string) => {
+    const map: Record<string, string> = {
+      'card.card_onboarding.sign_up.clickwrap_prefix':
+        'By pressing "Next", you accept Immersve\'s ',
+      'card.card_onboarding.sign_up.clickwrap_and': ' and ',
+      'card.card_onboarding.sign_up.clickwrap_suffix': '.',
+      'card.card_onboarding.sign_up.legal_docs_error':
+        'Unable to load legal documents.',
+      'card.card_onboarding.retry_button': 'Try again',
+    };
+    return map[key] ?? key;
+  },
+}));
+
+jest.mock('react-native/Libraries/Linking/Linking', () => ({
+  openURL: jest.fn(() => Promise.resolve()),
+}));
+
+const DOCS = [
+  {
+    id: 'generalTermsOfUse',
+    title: 'Terms of Use',
+    url: 'https://example.com/terms',
+  },
+  {
+    id: 'privacyPolicy',
+    title: 'Privacy Policy',
+    url: 'https://example.com/privacy',
+  },
+];
+
+describe('ImmersveLegalClickwrap', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders loading state', () => {
+    const { getByTestId, queryByTestId } = render(
+      <ImmersveLegalClickwrap
+        documents={[]}
+        isLoading
+        error={null}
+        onRetry={jest.fn()}
+      />,
+    );
+
+    expect(getByTestId('signup-immersve-legal-loading')).toBeOnTheScreen();
+    expect(queryByTestId('signup-immersve-legal-clickwrap')).toBeNull();
+  });
+
+  it('renders error state with retry action', () => {
+    const onRetry = jest.fn();
+
+    const { getByTestId } = render(
+      <ImmersveLegalClickwrap
+        documents={[]}
+        isLoading={false}
+        error={new Error('502')}
+        onRetry={onRetry}
+      />,
+    );
+
+    expect(getByTestId('signup-immersve-legal-error')).toBeOnTheScreen();
+    fireEvent.press(getByTestId('signup-immersve-legal-retry'));
+
+    expect(onRetry).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders clickwrap with linked document titles', () => {
+    const { getByTestId, getByText } = render(
+      <ImmersveLegalClickwrap
+        documents={DOCS}
+        isLoading={false}
+        error={null}
+        onRetry={jest.fn()}
+      />,
+    );
+
+    expect(getByTestId('signup-immersve-legal-clickwrap')).toBeOnTheScreen();
+    expect(getByText('Terms of Use')).toBeOnTheScreen();
+    expect(getByText('Privacy Policy')).toBeOnTheScreen();
+  });
+
+  it('opens document url when a linked title is pressed', () => {
+    const { getByTestId } = render(
+      <ImmersveLegalClickwrap
+        documents={DOCS}
+        isLoading={false}
+        error={null}
+        onRetry={jest.fn()}
+      />,
+    );
+
+    fireEvent.press(getByTestId('signup-immersve-legal-link-privacyPolicy'));
+
+    expect(Linking.openURL).toHaveBeenCalledWith('https://example.com/privacy');
+  });
+
+  it('renders error state when documents are empty and treatEmptyAsError is set', () => {
+    const onRetry = jest.fn();
+
+    const { getByTestId } = render(
+      <ImmersveLegalClickwrap
+        documents={[]}
+        isLoading={false}
+        error={null}
+        treatEmptyAsError
+        onRetry={onRetry}
+      />,
+    );
+
+    expect(getByTestId('signup-immersve-legal-error')).toBeOnTheScreen();
+    fireEvent.press(getByTestId('signup-immersve-legal-retry'));
+
+    expect(onRetry).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders nothing when there are no documents and no error', () => {
+    const { queryByTestId } = render(
+      <ImmersveLegalClickwrap
+        documents={[]}
+        isLoading={false}
+        error={null}
+        onRetry={jest.fn()}
+      />,
+    );
+
+    expect(queryByTestId('signup-immersve-legal-clickwrap')).toBeNull();
+    expect(queryByTestId('signup-immersve-legal-loading')).toBeNull();
+    expect(queryByTestId('signup-immersve-legal-error')).toBeNull();
+  });
+});
diff --git a/app/components/UI/Card/components/Onboarding/ImmersveLegalClickwrap.tsx b/app/components/UI/Card/components/Onboarding/ImmersveLegalClickwrap.tsx
new file mode 100644
index 000000000000..086246245eff
--- /dev/null
+++ b/app/components/UI/Card/components/Onboarding/ImmersveLegalClickwrap.tsx
@@ -0,0 +1,118 @@
+import React from 'react';
+import { ActivityIndicator, Linking, TouchableOpacity } from 'react-native';
+import { Box, Text, TextVariant } from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import type { ImmersveLegalDocumentLink } from '../../util/immersveLegalDocuments';
+
+interface ImmersveLegalClickwrapProps {
+  documents: ImmersveLegalDocumentLink[];
+  isLoading: boolean;
+  error: Error | null;
+  onRetry: () => void;
+  /**
+   * When true, an empty document list after a successful load is treated as
+   * an error (retry) instead of rendering nothing and soft-locking SignUp.
+   */
+  treatEmptyAsError?: boolean;
+}
+
+function openDocument(url: string) {
+  Linking.openURL(url).catch(() => {
+    // Swallow — user can retry via the link.
+  });
+}
+
+function getSeparator(index: number, total: number): string {
+  if (index === 0) {
+    return '';
+  }
+  const isLast = index === total - 1;
+  if (!isLast) {
+    return ', ';
+  }
+  // "A and B" vs "A, B, and C"
+  return total > 2
+    ? `,${strings('card.card_onboarding.sign_up.clickwrap_and')}`
+    : strings('card.card_onboarding.sign_up.clickwrap_and');
+}
+
+function LegalDocsError({ onRetry }: { onRetry: () => void }) {
+  return (
+    <Box
+      twClassName="items-center gap-1 py-2"
+      testID="signup-immersve-legal-error"
+    >
+      <Text
+        variant={TextVariant.BodySm}
+        twClassName="text-error-default text-center"
+      >
+        {strings('card.card_onboarding.sign_up.legal_docs_error')}
+      </Text>
+      <TouchableOpacity onPress={onRetry} testID="signup-immersve-legal-retry">
+        <Text
+          variant={TextVariant.BodySm}
+          twClassName="text-primary-default text-center"
+        >
+          {strings('card.card_onboarding.retry_button')}
+        </Text>
+      </TouchableOpacity>
+    </Box>
+  );
+}
+
+/**
+ * Clickwrap copy with tappable legal-document titles.
+ * Continuing the primary CTA constitutes agreement (no checkboxes).
+ */
+const ImmersveLegalClickwrap = ({
+  documents,
+  isLoading,
+  error,
+  onRetry,
+  treatEmptyAsError = false,
+}: ImmersveLegalClickwrapProps) => {
+  if (isLoading) {
+    return (
+      <Box
+        twClassName="items-center py-2"
+        testID="signup-immersve-legal-loading"
+      >
+        <ActivityIndicator />
+      </Box>
+    );
+  }
+
+  if (error || (treatEmptyAsError && documents.length === 0)) {
+    return <LegalDocsError onRetry={onRetry} />;
+  }
+
+  if (documents.length === 0) {
+    return null;
+  }
+
+  return (
+    <Text
+      variant={TextVariant.BodySm}
+      twClassName="text-text-alternative text-center"
+      testID="signup-immersve-legal-clickwrap"
+    >
+      {strings('card.card_onboarding.sign_up.clickwrap_prefix')}
+      {documents.map((legalDocument, index) => (
+        <React.Fragment key={legalDocument.id}>
+          {getSeparator(index, documents.length)}
+          <Text
+            variant={TextVariant.BodySm}
+            twClassName="text-text-alternative underline"
+            onPress={() => openDocument(legalDocument.url)}
+            testID={`signup-immersve-legal-link-${legalDocument.id}`}
+          >
+            {legalDocument.title}
+          </Text>
+        </React.Fragment>
+      ))}
+      {strings('card.card_onboarding.sign_up.clickwrap_suffix')}
+    </Text>
+  );
+};
+
+export default ImmersveLegalClickwrap;
diff --git a/app/components/UI/Card/components/Onboarding/PhysicalAddress.test.tsx b/app/components/UI/Card/components/Onboarding/PhysicalAddress.test.tsx
index 2504237b913a..ea1a50f81a79 100644
--- a/app/components/UI/Card/components/Onboarding/PhysicalAddress.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/PhysicalAddress.test.tsx
@@ -351,7 +351,7 @@ jest.mock('../../../../../../locales/i18n', () => ({
       'card.card_onboarding.physical_address.crb_consent_1':
         'I agree with Cross River Bank ',
       'card.card_onboarding.physical_address.crb_consent_2':
-        'Terms & Conditions',
+        'Terms and Conditions',
       'card.card_onboarding.physical_address.crb_consent_3': ', ',
       'card.card_onboarding.physical_address.crb_consent_4':
         'Account Opening Disclosures',
@@ -1719,14 +1719,14 @@ describe('PhysicalAddress Component', () => {
       expect(Linking.openURL).toHaveBeenCalledWith('https://coinme.com/legal/');
     });
 
-    it('opens CRB Terms & Conditions URL when link is pressed', () => {
+    it('opens CRB Terms and Conditions URL when link is pressed', () => {
       const { getByText } = render(
         <Provider store={store}>
           <PhysicalAddress />
         </Provider>,
       );
 
-      fireEvent.press(getByText('Terms & Conditions'));
+      fireEvent.press(getByText('Terms and Conditions'));
 
       expect(Linking.openURL).toHaveBeenCalledWith(
         'https://baanx-public.s3-eu-west-1.amazonaws.com/Ledger/public-files/BaanxUS_CLCard_TOS.undefined-fddb292f91ce3.pdf',
@@ -1795,7 +1795,7 @@ describe('PhysicalAddress Component', () => {
         </Provider>,
       );
 
-      fireEvent.press(getByText('Terms & Conditions'));
+      fireEvent.press(getByText('Terms and Conditions'));
       expect(Linking.openURL).toHaveBeenCalledWith(
         'https://docs.baanx.us/metamask/terms.pdf',
       );
@@ -1843,7 +1843,7 @@ describe('PhysicalAddress Component', () => {
 
       expect(queryByText('E-Sign Consent Disclosure')).toBeFalsy();
       expect(queryByText('Coinme Terms of Service')).toBeFalsy();
-      expect(queryByText('Terms & Conditions')).toBeFalsy();
+      expect(queryByText('Terms and Conditions')).toBeFalsy();
       expect(queryByText('Account Opening Disclosures')).toBeFalsy();
       expect(queryByText('Notice of Privacy Practices')).toBeFalsy();
       expect(queryByText('CL Privacy Policy')).toBeFalsy();
diff --git a/app/components/UI/Card/components/Onboarding/SignUp.test.tsx b/app/components/UI/Card/components/Onboarding/SignUp.test.tsx
index 800ec1a451e9..0490fa66905a 100644
--- a/app/components/UI/Card/components/Onboarding/SignUp.test.tsx
+++ b/app/components/UI/Card/components/Onboarding/SignUp.test.tsx
@@ -21,6 +21,51 @@ jest.mock('../../hooks/useCardPostAuthRedirect', () => ({
   },
 }));
 
+const mockRefetchLegalDocs = jest.fn();
+const mockUseImmersveSupportedRegions = jest.fn(
+  (
+    _regionCode?: string | null,
+    _options?: { enabled?: boolean },
+  ): {
+    region: null;
+    onboardingDocuments: {
+      id: string;
+      title: string;
+      url: string;
+    }[];
+    permanentDocuments: never[];
+    isLoading: boolean;
+    error: Error | null;
+    refetch: jest.Mock;
+  } => ({
+    region: null,
+    onboardingDocuments: [
+      {
+        id: 'generalTermsOfUse',
+        title: 'Terms of Use',
+        url: 'https://example.com/terms',
+      },
+      {
+        id: 'privacyPolicy',
+        title: 'Privacy Policy',
+        url: 'https://example.com/privacy',
+      },
+    ],
+    permanentDocuments: [],
+    isLoading: false,
+    error: null,
+    refetch: mockRefetchLegalDocs,
+  }),
+);
+
+jest.mock('../../hooks/useImmersveSupportedRegions', () => ({
+  __esModule: true,
+  default: (...args: unknown[]) =>
+    (
+      mockUseImmersveSupportedRegions as unknown as (...a: unknown[]) => unknown
+    )(...args),
+}));
+
 // Mock navigation
 jest.mock('@react-navigation/native', () => ({
   useNavigation: jest.fn(),
@@ -100,7 +145,6 @@ jest.mock('../../util/validatePassword');
 // Mock Engine
 const mockSetUserLocation = jest.fn();
 const mockSetSelectedCountry = jest.fn();
-const mockSetSelectedCardProgramId = jest.fn();
 const mockCreateFundingSource = jest.fn();
 const mockGetFundingSources = jest.fn();
 const mockGetResumeCardInfo = jest.fn();
@@ -112,8 +156,6 @@ jest.mock('../../../../../core/Engine', () => ({
       setUserLocation: (...args: unknown[]) => mockSetUserLocation(...args),
       setSelectedCountry: (...args: unknown[]) =>
         mockSetSelectedCountry(...args),
-      setSelectedCardProgramId: (...args: unknown[]) =>
-        mockSetSelectedCardProgramId(...args),
       createFundingSource: (...args: unknown[]) =>
         mockCreateFundingSource(...args),
       getFundingSources: (...args: unknown[]) => mockGetFundingSources(...args),
@@ -192,19 +234,14 @@ jest.mock('./OnboardingStep', () => {
 // Create test store
 // SignUp reads geoLocation from state.engine.backgroundState.GeolocationController.location
 // via selectGeolocationLocation. Pass { geoLocation: 'US' } etc. to control it.
-// Pass { selectedCardProgramId } to seed CardController override state.
 const createTestStore = (initialState: Record<string, unknown> = {}) => {
-  const { geoLocation, selectedCardProgramId, ...cardState } = initialState;
+  const { geoLocation, ...cardState } = initialState;
   const engineState = {
     backgroundState: {
       GeolocationController:
         typeof geoLocation === 'string' ? { location: geoLocation } : undefined,
       CardController: {
         selectedCountry: null,
-        selectedCardProgramId:
-          typeof selectedCardProgramId === 'string'
-            ? selectedCardProgramId
-            : null,
         activeProviderId: 'baanx',
         isAuthenticated: false,
         cardholderAccounts: [],
@@ -255,6 +292,26 @@ describe('SignUp Component', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockUseCardPostAuthRedirect.mockReturnValue(undefined);
+    mockUseImmersveSupportedRegions.mockReturnValue({
+      region: null,
+      onboardingDocuments: [
+        {
+          id: 'generalTermsOfUse',
+          title: 'Terms of Use',
+          url: 'https://example.com/terms',
+        },
+        {
+          id: 'privacyPolicy',
+          title: 'Privacy Policy',
+          url: 'https://example.com/privacy',
+        },
+      ],
+      permanentDocuments: [],
+      isLoading: false,
+      error: null,
+      refetch: mockRefetchLegalDocs,
+    });
+    mockRefetchLegalDocs.mockResolvedValue(null);
     mockNavigate = jest.fn();
     mockGoBack = jest.fn();
     mockUseNavigation.mockReturnValue({
@@ -659,6 +716,111 @@ describe('SignUp Component', () => {
       );
     };
 
+    it('shows Immersve legal clickwrap for Immersve countries', () => {
+      enableImmersve();
+      const storeWithImmersve = createTestStore({ geoLocation: 'GB' });
+
+      const { getByTestId, queryByTestId } = render(
+        <Provider store={storeWithImmersve}>
+          <SignUp />
+        </Provider>,
+      );
+
+      expect(getByTestId('signup-immersve-legal-clickwrap')).toBeOnTheScreen();
+      expect(queryByTestId('signup-password-input')).not.toBeOnTheScreen();
+      expect(mockUseImmersveSupportedRegions).toHaveBeenCalledWith('GB');
+    });
+
+    it('hides Immersve legal clickwrap for non-Immersve countries', () => {
+      const { selectImmersveOnboardingEnabled } = jest.requireMock(
+        '../../../../../selectors/featureFlagController/card',
+      );
+      (selectImmersveOnboardingEnabled as jest.Mock).mockReturnValue(false);
+
+      const { queryByTestId } = render(
+        <Provider store={store}>
+          <SignUp />
+        </Provider>,
+      );
+
+      expect(queryByTestId('signup-immersve-legal-clickwrap')).toBeNull();
+    });
+
+    it('disables Next while Immersve legal docs are loading', () => {
+      enableImmersve();
+      mockUseImmersveSupportedRegions.mockReturnValue({
+        region: null,
+        onboardingDocuments: [],
+        permanentDocuments: [],
+        isLoading: true,
+        error: null,
+        refetch: mockRefetchLegalDocs,
+      });
+
+      const storeWithImmersve = createTestStore({ geoLocation: 'GB' });
+      const { getByTestId } = render(
+        <Provider store={storeWithImmersve}>
+          <SignUp />
+        </Provider>,
+      );
+
+      fillImmersveForm(getByTestId);
+
+      expect(getByTestId('signup-continue-button')).toBeDisabled();
+      expect(getByTestId('signup-immersve-legal-loading')).toBeOnTheScreen();
+    });
+
+    it('disables Next and shows retry when Immersve legal docs fail to load', () => {
+      enableImmersve();
+      mockUseImmersveSupportedRegions.mockReturnValue({
+        region: null,
+        onboardingDocuments: [],
+        permanentDocuments: [],
+        isLoading: false,
+        error: new Error('502'),
+        refetch: mockRefetchLegalDocs,
+      });
+
+      const storeWithImmersve = createTestStore({ geoLocation: 'GB' });
+      const { getByTestId } = render(
+        <Provider store={storeWithImmersve}>
+          <SignUp />
+        </Provider>,
+      );
+
+      fillImmersveForm(getByTestId);
+
+      expect(getByTestId('signup-continue-button')).toBeDisabled();
+      fireEvent.press(getByTestId('signup-immersve-legal-retry'));
+      expect(mockRefetchLegalDocs).toHaveBeenCalled();
+    });
+
+    it('disables Next and shows retry when Immersve legal docs are empty after load', () => {
+      enableImmersve();
+      mockUseImmersveSupportedRegions.mockReturnValue({
+        region: null,
+        onboardingDocuments: [],
+        permanentDocuments: [],
+        isLoading: false,
+        error: null,
+        refetch: mockRefetchLegalDocs,
+      });
+
+      const storeWithImmersve = createTestStore({ geoLocation: 'GB' });
+      const { getByTestId } = render(
+        <Provider store={storeWithImmersve}>
+          <SignUp />
+        </Provider>,
+      );
+
+      fillImmersveForm(getByTestId);
+
+      expect(getByTestId('signup-continue-button')).toBeDisabled();
+      expect(getByTestId('signup-immersve-legal-error')).toBeOnTheScreen();
+      fireEvent.press(getByTestId('signup-immersve-legal-retry'));
+      expect(mockRefetchLegalDocs).toHaveBeenCalled();
+    });
+
     it('new user: SIWE, creates a funding source, patches contact, then routes', async () => {
       enableImmersve();
       mockImmersveSignIn.mockResolvedValue({ done: true });
@@ -1063,125 +1225,4 @@ describe('SignUp Component', () => {
       expect(mockGoBack).not.toHaveBeenCalled();
     });
   });
-
-  describe('Card program selector (temporary testing)', () => {
-    const PROGRAM_ALPHA = {
-      name: 'Monavate (Alpha)',
-      id: '836aae2080a211f1b5a601a9d64744df',
-    };
-    const PROGRAM_BRAVO = {
-      name: 'Immersve (Bravo)',
-      id: 'ba73e21080a211f1b059af0e8fb8b5f1',
-    };
-
-    const enableImmersve = () => {
-      const { selectImmersveOnboardingEnabled } = jest.requireMock(
-        '../../../../../selectors/featureFlagController/card',
-      );
-      (selectImmersveOnboardingEnabled as jest.Mock).mockReturnValue(true);
-    };
-
-    const setCardProgramFlag = (
-      cardProgramIds?: { name: string; id: string }[],
-      cardProgramId = PROGRAM_ALPHA.id,
-    ) => {
-      const { selectCardFeatureFlag } = jest.requireMock(
-        '../../../../../selectors/featureFlagController/card',
-      );
-      const actual = jest.requireActual(
-        '../../../../../selectors/featureFlagController/card',
-      );
-      (selectCardFeatureFlag as jest.Mock).mockReturnValue({
-        ...actual.defaultCardFeatureFlag,
-        immersve: {
-          ...actual.defaultCardFeatureFlag.immersve,
-          cardProgramId,
-          ...(cardProgramIds ? { cardProgramIds } : {}),
-        },
-      });
-    };
-
-    const renderImmersveSignUp = (extras: Record<string, unknown> = {}) => {
-      enableImmersve();
-      return render(
-        <Provider store={createTestStore({ geoLocation: 'GB', ...extras })}>
-          <SignUp />
-        </Provider>,
-      );
-    };
-
-    it('does not render the selector for non-Immersve countries even with multiple programs', () => {
-      setCardProgramFlag([PROGRAM_ALPHA, PROGRAM_BRAVO], PROGRAM_ALPHA.id);
-
-      const { queryByTestId } = render(
-        <Provider store={createTestStore({ geoLocation: 'US' })}>
-          <SignUp />
-        </Provider>,
-      );
-
-      expect(
-        queryByTestId('signup-card-program-selector'),
-      ).not.toBeOnTheScreen();
-    });
-
-    it('does not render the selector when cardProgramIds is absent', () => {
-      setCardProgramFlag(undefined);
-
-      const { queryByTestId } = renderImmersveSignUp();
-
-      expect(
-        queryByTestId('signup-card-program-selector'),
-      ).not.toBeOnTheScreen();
-    });
-
-    it('does not render the selector when cardProgramIds has a single option', () => {
-      setCardProgramFlag([PROGRAM_ALPHA]);
-
-      const { queryByTestId } = renderImmersveSignUp();
-
-      expect(
-        queryByTestId('signup-card-program-selector'),
-      ).not.toBeOnTheScreen();
-    });
-
-    it('renders the selector and pre-selects the default cardProgramId', () => {
-      setCardProgramFlag([PROGRAM_ALPHA, PROGRAM_BRAVO], PROGRAM_ALPHA.id);
-
-      const { getByTestId, getByText } = renderImmersveSignUp();
-
-      expect(getByTestId('signup-card-program-selector')).toBeOnTheScreen();
-      expect(getByText(PROGRAM_ALPHA.name)).toBeOnTheScreen();
-      expect(getByText(PROGRAM_BRAVO.name)).toBeOnTheScreen();
-      // Default option is checked (component-library RadioButton icon).
-      expect(getByTestId('RadioButton-icon-component')).toBeOnTheScreen();
-    });
-
-    it('persists the selection via setSelectedCardProgramId', () => {
-      setCardProgramFlag([PROGRAM_ALPHA, PROGRAM_BRAVO], PROGRAM_ALPHA.id);
-
-      const { getByTestId } = renderImmersveSignUp();
-
-      fireEvent.press(getByTestId(`signup-card-program-${PROGRAM_BRAVO.id}`));
-
-      expect(mockSetSelectedCardProgramId).toHaveBeenCalledWith(
-        PROGRAM_BRAVO.id,
-      );
-    });
-
-    it('prefers a previously persisted selection over the flag default', () => {
-      setCardProgramFlag([PROGRAM_ALPHA, PROGRAM_BRAVO], PROGRAM_ALPHA.id);
-
-      const { getByTestId } = renderImmersveSignUp({
-        selectedCardProgramId: PROGRAM_BRAVO.id,
-      });
-
-      // Persisted Bravo is pre-checked (only one checked icon rendered).
-      expect(getByTestId('RadioButton-icon-component')).toBeOnTheScreen();
-      // Changing selection writes the new id through to the controller.
-      fireEvent.press(getByTestId(`signup-card-program-${PROGRAM_ALPHA.id}`));
-      expect(mockSetSelectedCardProgramId).toHaveBeenCalledWith(
-        PROGRAM_ALPHA.id,
-      );
-    });
-  });
 });
diff --git a/app/components/UI/Card/components/Onboarding/SignUp.tsx b/app/components/UI/Card/components/Onboarding/SignUp.tsx
index 5f0229ce3b2d..11d763a91f67 100644
--- a/app/components/UI/Card/components/Onboarding/SignUp.tsx
+++ b/app/components/UI/Card/components/Onboarding/SignUp.tsx
@@ -56,10 +56,10 @@ import {
   selectCardFeatureFlag,
   selectImmersveOnboardingEnabled,
 } from '../../../../../selectors/featureFlagController/card';
-import { selectCardSelectedCardProgramId } from '../../../../../selectors/cardController';
-import RadioButton from '../../../../../component-library/components/RadioButton';
 import { HUBSPOT_WAITLIST_URL } from '../../constants';
 import { useCardPostAuthRedirect } from '../../hooks/useCardPostAuthRedirect';
+import useImmersveSupportedRegions from '../../hooks/useImmersveSupportedRegions';
+import ImmersveLegalClickwrap from './ImmersveLegalClickwrap';
 
 const buildWaitlistUrl = (countryName: string, email?: string): string => {
   // country must come first per HubSpot field ordering
@@ -93,14 +93,6 @@ const SignUp = () => {
   const { trackEvent, createEventBuilder } = useAnalytics();
   const postAuthRedirect = useCardPostAuthRedirect();
 
-  // Temporary: multi-program selector for internal Immersve testing.
-  const cardProgramIds = cardFeatureFlag.immersve?.cardProgramIds ?? [];
-  const defaultCardProgramId = cardFeatureFlag.immersve?.cardProgramId;
-  const persistedCardProgramId = useSelector(selectCardSelectedCardProgramId);
-  const [selectedCardProgramId, setSelectedCardProgramId] = useState<
-    string | null
-  >(persistedCardProgramId ?? defaultCardProgramId ?? null);
-
   // Immersve onboarding entry: SIWE binds to the currently-selected EVM account.
   const accountName = useAccountGroupName();
   const selectAccountByScope = useSelector(
@@ -203,9 +195,14 @@ const SignUp = () => {
       (cardFeatureFlag.immersveCountries ?? []).includes(selectedCountry.key),
   );
 
-  // Temporary: only show the program picker for Immersve onboarding.
-  const showCardProgramSelector =
-    isImmersveCountry && cardProgramIds.length > 1;
+  const {
+    onboardingDocuments,
+    isLoading: isLegalDocsLoading,
+    error: legalDocsError,
+    refetch: refetchLegalDocs,
+  } = useImmersveSupportedRegions(
+    isImmersveCountry ? selectedCountry?.key : undefined,
+  );
 
   const isWaitlistMode = Boolean(
     selectedCountry && !selectedCountry.canSignUp && !isImmersveCountry,
@@ -221,8 +218,15 @@ const SignUp = () => {
     }
     if (isImmersveCountry) {
       // Email + phone are collected; SIWE binds to the selected account.
+      // Legal docs must be loaded before Continue (clickwrap agreement).
       return (
-        !email || !isPhoneValid || !immersveAddress || isImmersveSubmitting
+        !email ||
+        !isPhoneValid ||
+        !immersveAddress ||
+        isImmersveSubmitting ||
+        isLegalDocsLoading ||
+        Boolean(legalDocsError) ||
+        onboardingDocuments.length === 0
       );
     }
     return (
@@ -239,6 +243,9 @@ const SignUp = () => {
     isImmersveCountry,
     immersveAddress,
     isImmersveSubmitting,
+    isLegalDocsLoading,
+    legalDocsError,
+    onboardingDocuments.length,
     email,
     isPhoneValid,
     password,
@@ -421,11 +428,6 @@ const SignUp = () => {
     setPhoneNumber(text.replace(/\D/g, ''));
   }, []);
 
-  const handleCardProgramSelect = useCallback((id: string) => {
-    setSelectedCardProgramId(id);
-    Engine.context.CardController.setSelectedCardProgramId(id);
-  }, []);
-
   useEffect(() => () => clearOnValueChange(), []);
 
   const renderFormFields = () => (
@@ -498,24 +500,6 @@ const SignUp = () => {
 
       {isImmersveCountry && (
         <>
-          {showCardProgramSelector ? (
-            <Box testID="signup-card-program-selector">
-              <Label>
-                {strings('card.card_onboarding.sign_up.card_program_label')}
-              </Label>
-              <Box twClassName="gap-2 mt-1">
-                {cardProgramIds.map((program) => (
-                  <RadioButton
-                    key={program.id}
-                    label={program.name}
-                    isChecked={selectedCardProgramId === program.id}
-                    onPress={() => handleCardProgramSelect(program.id)}
-                    testID={`signup-card-program-${program.id}`}
-                  />
-                ))}
-              </Box>
-            </Box>
-          ) : null}
           <Box>
             <Label>
               {strings(
@@ -563,7 +547,7 @@ const SignUp = () => {
           </Box>
           <Box>
             <Label>
-              {strings('card.card_onboarding.sign_up.account_label')}
+              {strings('card.card_onboarding.sign_up.account_label_immersve')}
             </Label>
             <SelectField
               value={accountName ?? undefined}
@@ -574,7 +558,9 @@ const SignUp = () => {
               variant={TextVariant.BodySm}
               twClassName="text-text-alternative mt-1"
             >
-              {strings('card.card_onboarding.sign_up.account_description')}
+              {strings(
+                'card.card_onboarding.sign_up.account_description_immersve',
+              )}
             </Text>
             {immersveError ? (
               <Text
@@ -642,6 +628,19 @@ const SignUp = () => {
 
   const renderActions = () => (
     <>
+      {isImmersveCountry ? (
+        <Box twClassName="mb-6">
+          <ImmersveLegalClickwrap
+            documents={onboardingDocuments}
+            isLoading={isLegalDocsLoading}
+            error={legalDocsError}
+            treatEmptyAsError
+            onRetry={() => {
+              void refetchLegalDocs();
+            }}
+          />
+        </Box>
+      ) : null}
       <Button
         variant={ButtonVariant.Primary}
         size={ButtonSize.Lg}
@@ -672,7 +671,11 @@ const SignUp = () => {
           fontWeight={FontWeight.Medium}
           twClassName="text-default text-center p-4"
         >
-          {strings('card.card_onboarding.sign_up.i_already_have_an_account')}
+          {strings(
+            isImmersveCountry
+              ? 'card.card_onboarding.sign_up.i_already_have_an_account_immersve'
+              : 'card.card_onboarding.sign_up.i_already_have_an_account',
+          )}
         </Text>
       </TouchableOpacity>
     </>
@@ -681,7 +684,11 @@ const SignUp = () => {
   return (
     <OnboardingStep
       title={strings('card.card_onboarding.sign_up.title')}
-      description={strings('card.card_onboarding.sign_up.description')}
+      description={strings(
+        isImmersveCountry
+          ? 'card.card_onboarding.sign_up.description_immersve'
+          : 'card.card_onboarding.sign_up.description',
+      )}
       formFields={renderFormFields()}
       actions={renderActions()}
       headerMode="back"
diff --git a/app/components/UI/Card/hooks/useCardHomeData.test.ts b/app/components/UI/Card/hooks/useCardHomeData.test.ts
index c41af1436efb..7e3eca951e1f 100644
--- a/app/components/UI/Card/hooks/useCardHomeData.test.ts
+++ b/app/components/UI/Card/hooks/useCardHomeData.test.ts
@@ -118,7 +118,7 @@ describe('useCardHomeData', () => {
     mockGetAssetBalanceKey.mockReturnValue('mock-key');
   });
 
-  describe('useEffect safety-net fetch on mount', () => {
+  describe('useEffect status-driven fetch', () => {
     it("triggers fetchCardHomeData when status is 'idle'", () => {
       setupSelectors(null, 'idle');
       renderHook(() => useCardHomeData());
@@ -137,10 +137,21 @@ describe('useCardHomeData', () => {
       expect(mockFetchCardHomeData).not.toHaveBeenCalled();
     });
 
-    it("does NOT trigger fetchCardHomeData when status is 'error'", () => {
+    it("triggers fetchCardHomeData when status is 'error'", () => {
       setupSelectors(null, 'error');
       renderHook(() => useCardHomeData());
+      expect(mockFetchCardHomeData).toHaveBeenCalledTimes(1);
+    });
+
+    it("triggers fetchCardHomeData when status transitions back to 'idle'", () => {
+      setupSelectors({ primaryFundingAsset: null }, 'success');
+      const { rerender } = renderHook(() => useCardHomeData());
       expect(mockFetchCardHomeData).not.toHaveBeenCalled();
+
+      setupSelectors(null, 'idle');
+      rerender();
+
+      expect(mockFetchCardHomeData).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -236,13 +247,14 @@ describe('useCardHomeData', () => {
   });
 
   describe('refetch', () => {
-    it('calls Engine.context.CardController.fetchCardHomeData', () => {
+    it('calls Engine.context.CardController.fetchCardHomeData with force', () => {
       setupSelectors(null, 'success');
       const { result } = renderHook(() => useCardHomeData());
 
       result.current.refetch();
 
       expect(mockFetchCardHomeData).toHaveBeenCalledTimes(1);
+      expect(mockFetchCardHomeData).toHaveBeenCalledWith({ force: true });
     });
   });
 
diff --git a/app/components/UI/Card/hooks/useCardHomeData.ts b/app/components/UI/Card/hooks/useCardHomeData.ts
index 02db807c2968..ba240f0d3217 100644
--- a/app/components/UI/Card/hooks/useCardHomeData.ts
+++ b/app/components/UI/Card/hooks/useCardHomeData.ts
@@ -22,20 +22,14 @@ export const useCardHomeData = () => {
   const fundingTokensRaw = useSelector(selectCardFundingTokens);
   const { ensureNetworkExists } = useEnsureCardNetworkExists();
 
-  // Safety net: if the controller hasn't started a fetch yet (e.g. deep link
-  // before KeyringController:unlock fires), kick one off on mount.
-  // The controller deduplicates concurrent calls so this is safe to call
-  // even when a fetch is already in-flight.
   useEffect(() => {
-    if (status === 'idle') {
+    if (status === 'idle' || status === 'error') {
       Engine.context.CardController.fetchCardHomeData();
     }
-    // eslint-disable-next-line react-compiler/react-compiler
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [status]);
 
   const refetch = useCallback(
-    () => Engine.context.CardController.fetchCardHomeData(),
+    () => Engine.context.CardController.fetchCardHomeData({ force: true }),
     [],
   );
 
diff --git a/app/components/UI/Card/hooks/useImmersveResumeOnboarding.test.ts b/app/components/UI/Card/hooks/useImmersveResumeOnboarding.test.ts
index 7b1711f48b83..1492c884845c 100644
--- a/app/components/UI/Card/hooks/useImmersveResumeOnboarding.test.ts
+++ b/app/components/UI/Card/hooks/useImmersveResumeOnboarding.test.ts
@@ -3,7 +3,6 @@ import { useImmersveResumeOnboarding } from './useImmersveResumeOnboarding';
 import type { CardSpendingPrerequisite } from '../../../../core/Engine/controllers/card-controller/provider-types';
 
 const mockSetSelectedCountry = jest.fn();
-const mockSetSelectedCardProgramId = jest.fn();
 const mockCreateFundingSource = jest.fn();
 const mockGetFundingSources = jest.fn();
 const mockGetResumeCardInfo = jest.fn();
@@ -14,8 +13,6 @@ jest.mock('../../../../core/Engine', () => ({
     CardController: {
       setSelectedCountry: (...args: unknown[]) =>
         mockSetSelectedCountry(...args),
-      setSelectedCardProgramId: (...args: unknown[]) =>
-        mockSetSelectedCardProgramId(...args),
       createFundingSource: (...args: unknown[]) =>
         mockCreateFundingSource(...args),
       getFundingSources: (...args: unknown[]) => mockGetFundingSources(...args),
@@ -323,7 +320,7 @@ describe('useImmersveResumeOnboarding', () => {
     expect(mockRoute).not.toHaveBeenCalled();
   });
 
-  it('uses the existing card program and funding source when present', async () => {
+  it('uses the existing funding source when present', async () => {
     mockGetResumeCardInfo.mockResolvedValue({
       cardProgramId: 'program-arbitrum',
       fundingSourceIds: ['fs-arbitrum'],
@@ -334,9 +331,6 @@ describe('useImmersveResumeOnboarding', () => {
       await result.current(PARAMS);
     });
 
-    expect(mockSetSelectedCardProgramId).toHaveBeenCalledWith(
-      'program-arbitrum',
-    );
     expect(mockGetFundingSources).not.toHaveBeenCalled();
     expect(mockCreateFundingSource).not.toHaveBeenCalled();
     expect(mockDispatch).toHaveBeenCalledWith({
@@ -360,7 +354,6 @@ describe('useImmersveResumeOnboarding', () => {
       await result.current(PARAMS);
     });
 
-    expect(mockSetSelectedCardProgramId).not.toHaveBeenCalled();
     expect(mockGetFundingSources).toHaveBeenCalled();
     expect(mockDispatch).toHaveBeenCalledWith({
       type: 'card/setImmersveFundingSourceId',
diff --git a/app/components/UI/Card/hooks/useImmersveResumeOnboarding.ts b/app/components/UI/Card/hooks/useImmersveResumeOnboarding.ts
index fa3e6a1db656..9a9bb1f57926 100644
--- a/app/components/UI/Card/hooks/useImmersveResumeOnboarding.ts
+++ b/app/components/UI/Card/hooks/useImmersveResumeOnboarding.ts
@@ -40,9 +40,6 @@ export const useImmersveResumeOnboarding = () => {
       await signIn({ country, address });
 
       const resume = await controller.getResumeCardInfo();
-      if (resume?.cardProgramId) {
-        controller.setSelectedCardProgramId(resume.cardProgramId);
-      }
 
       const id = await resolveImmersveFundingSourceId({
         fundingChannelId: cardFeatureFlag.immersve?.fundingChannelId,
diff --git a/app/components/UI/Card/hooks/useImmersveSupportedRegions.test.ts b/app/components/UI/Card/hooks/useImmersveSupportedRegions.test.ts
new file mode 100644
index 000000000000..bf4a9c80e585
--- /dev/null
+++ b/app/components/UI/Card/hooks/useImmersveSupportedRegions.test.ts
@@ -0,0 +1,276 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import { useSelector } from 'react-redux';
+import useImmersveSupportedRegions from './useImmersveSupportedRegions';
+import Engine from '../../../../core/Engine';
+import type { CardApiSupportedRegionsResponse } from '../../../../core/Engine/controllers/card-controller/services/card-supported-regions.types';
+import {
+  selectImmersveOnboardingEnabled,
+  selectCardFeatureFlag,
+} from '../../../../selectors/featureFlagController/card';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+const mockGetSupportedRegions = jest.fn();
+
+jest.mock('../../../../core/Engine', () => ({
+  context: {
+    CardController: {
+      getSupportedRegions: jest.fn(),
+    },
+  },
+}));
+
+const mockRefetch = jest.fn();
+let mockQueryFn: (() => Promise<unknown>) | undefined;
+let lastUseQueryArgs: { enabled?: boolean; queryKey?: unknown } | undefined;
+let mockQueryReturn: {
+  data: unknown;
+  isLoading: boolean;
+  error: Error | null;
+  refetch: jest.Mock;
+} = {
+  data: undefined,
+  isLoading: false,
+  error: null,
+  refetch: mockRefetch,
+};
+
+jest.mock('@tanstack/react-query', () => ({
+  useQuery: jest.fn().mockImplementation((args) => {
+    lastUseQueryArgs = args;
+    mockQueryFn = args.queryFn;
+    return mockQueryReturn;
+  }),
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+
+const RESPONSE: CardApiSupportedRegionsResponse = {
+  provider: 'immersve',
+  regions: [
+    {
+      code: 'GB',
+      name: 'United Kingdom',
+      isAvailable: true,
+      unstructuredAddressAllowed: false,
+      documents: {
+        generalTermsOfUse: {
+          title: 'Terms',
+          url: 'https://example.com/gb/terms',
+        },
+        privacyPolicy: {
+          title: 'Privacy',
+          url: 'https://example.com/gb/privacy',
+        },
+        disclosures: [],
+        marketCompliance: [
+          {
+            title: 'Market',
+            url: 'https://example.com/gb/market',
+          },
+        ],
+      },
+    },
+    {
+      code: 'AU',
+      name: 'Australia',
+      isAvailable: true,
+      unstructuredAddressAllowed: false,
+      documents: {
+        generalTermsOfUse: {
+          title: 'AU Terms',
+          url: 'https://example.com/au/terms',
+        },
+        privacyPolicy: {
+          title: 'AU Privacy',
+          url: 'https://example.com/au/privacy',
+        },
+        disclosures: [],
+        marketCompliance: [],
+      },
+    },
+  ],
+};
+
+function mockImmersveSelectors({
+  immersveEnabled = true,
+  immersveCountries = ['GB', 'AU'],
+}: {
+  immersveEnabled?: boolean;
+  immersveCountries?: string[];
+} = {}) {
+  mockUseSelector.mockImplementation((selector) => {
+    if (selector === selectImmersveOnboardingEnabled) {
+      return immersveEnabled;
+    }
+    if (selector === selectCardFeatureFlag) {
+      return { immersveCountries };
+    }
+    return undefined;
+  });
+}
+
+describe('useImmersveSupportedRegions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    lastUseQueryArgs = undefined;
+    mockQueryFn = undefined;
+    mockQueryReturn = {
+      data: undefined,
+      isLoading: false,
+      error: null,
+      refetch: mockRefetch,
+    };
+    mockRefetch.mockResolvedValue({ data: null });
+
+    (
+      Engine.context.CardController.getSupportedRegions as jest.Mock
+    ).mockImplementation(mockGetSupportedRegions);
+    mockGetSupportedRegions.mockResolvedValue(RESPONSE);
+  });
+
+  it('uses full-list query key without regionCode and 5m staleTime', () => {
+    mockImmersveSelectors();
+
+    renderHook(() => useImmersveSupportedRegions('GB'));
+
+    expect(lastUseQueryArgs).toEqual(
+      expect.objectContaining({
+        queryKey: ['card', 'dashboard', 'immersveSupportedRegions'],
+        staleTime: 5 * 60 * 1000,
+        enabled: true,
+      }),
+    );
+  });
+
+  it('disables query for non-Immersve countries', () => {
+    mockImmersveSelectors({ immersveCountries: ['GB'] });
+
+    renderHook(() => useImmersveSupportedRegions('US'));
+
+    expect(lastUseQueryArgs).toEqual(
+      expect.objectContaining({ enabled: false }),
+    );
+  });
+
+  it('disables query when Immersve onboarding flag is off', () => {
+    mockImmersveSelectors({ immersveEnabled: false });
+
+    renderHook(() => useImmersveSupportedRegions('GB'));
+
+    expect(lastUseQueryArgs).toEqual(
+      expect.objectContaining({ enabled: false }),
+    );
+  });
+
+  it('honors explicit enabled override for Card Home', () => {
+    mockImmersveSelectors({ immersveEnabled: false });
+
+    renderHook(() => useImmersveSupportedRegions('GB', { enabled: true }));
+
+    expect(lastUseQueryArgs).toEqual(
+      expect.objectContaining({ enabled: true }),
+    );
+  });
+
+  it('calls CardController.getSupportedRegions(CardProviderIds.Immersve) from queryFn', async () => {
+    mockImmersveSelectors();
+
+    renderHook(() => useImmersveSupportedRegions('GB'));
+
+    const result = await mockQueryFn?.();
+
+    expect(result).toStrictEqual(RESPONSE);
+    expect(mockGetSupportedRegions).toHaveBeenCalledTimes(1);
+    expect(mockGetSupportedRegions).toHaveBeenCalledWith('immersve');
+  });
+
+  it('derives region docs from cached full list when regionCode changes', () => {
+    mockImmersveSelectors();
+    mockQueryReturn = {
+      ...mockQueryReturn,
+      data: RESPONSE,
+    };
+
+    const { result, rerender } = renderHook(
+      ({ code }) => useImmersveSupportedRegions(code),
+      { initialProps: { code: 'GB' } },
+    );
+
+    expect(result.current.region?.code).toBe('GB');
+    expect(result.current.onboardingDocuments).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ id: 'generalTermsOfUse' }),
+        expect.objectContaining({ id: 'privacyPolicy' }),
+      ]),
+    );
+    expect(result.current.onboardingDocuments.map((d) => d.id)).not.toContain(
+      'marketCompliance-0',
+    );
+    expect(result.current.permanentDocuments.map((d) => d.id)).toContain(
+      'marketCompliance-0',
+    );
+
+    const keyBefore = lastUseQueryArgs?.queryKey;
+    rerender({ code: 'AU' });
+
+    expect(result.current.region?.code).toBe('AU');
+    expect(result.current.onboardingDocuments[0]?.url).toBe(
+      'https://example.com/au/terms',
+    );
+    expect(lastUseQueryArgs?.queryKey).toStrictEqual(keyBefore);
+  });
+
+  it('exposes refetch that calls react-query refetch', async () => {
+    mockImmersveSelectors();
+    mockRefetch.mockResolvedValue({ data: RESPONSE });
+
+    const { result } = renderHook(() => useImmersveSupportedRegions('GB'));
+
+    let fetchResult: unknown;
+    await act(async () => {
+      fetchResult = await result.current.refetch();
+    });
+
+    expect(mockRefetch).toHaveBeenCalled();
+    expect(fetchResult).toStrictEqual(RESPONSE);
+  });
+
+  it('returns error from useQuery', () => {
+    mockImmersveSelectors();
+    mockQueryReturn = {
+      ...mockQueryReturn,
+      error: new Error('502 upstream'),
+    };
+
+    const { result } = renderHook(() => useImmersveSupportedRegions('GB'));
+
+    expect(result.current.error).toEqual(new Error('502 upstream'));
+  });
+
+  it('keeps isLoading true while first fetch is paused (isLoading without isFetching)', () => {
+    mockImmersveSelectors();
+    mockQueryReturn = {
+      ...mockQueryReturn,
+      isLoading: true,
+    };
+
+    const { result } = renderHook(() => useImmersveSupportedRegions('GB'));
+
+    expect(result.current.isLoading).toBe(true);
+  });
+
+  it('exposes isLoading false when query is disabled', () => {
+    mockImmersveSelectors({ immersveEnabled: false });
+    mockQueryReturn = {
+      ...mockQueryReturn,
+      isLoading: true,
+    };
+
+    const { result } = renderHook(() => useImmersveSupportedRegions('GB'));
+
+    expect(result.current.isLoading).toBe(false);
+  });
+});
diff --git a/app/components/UI/Card/hooks/useImmersveSupportedRegions.ts b/app/components/UI/Card/hooks/useImmersveSupportedRegions.ts
new file mode 100644
index 000000000000..b2d608c9af26
--- /dev/null
+++ b/app/components/UI/Card/hooks/useImmersveSupportedRegions.ts
@@ -0,0 +1,82 @@
+import { useQuery } from '@tanstack/react-query';
+import { useSelector } from 'react-redux';
+import Engine from '../../../../core/Engine';
+import { CardProviderIds } from '../../../../core/Engine/controllers/card-controller/provider-types';
+import {
+  selectCardFeatureFlag,
+  selectImmersveOnboardingEnabled,
+} from '../../../../selectors/featureFlagController/card';
+import { cardQueries } from '../queries';
+import {
+  getOnboardingLegalDocuments,
+  getPermanentLegalDocuments,
+  getRegionByCode,
+} from '../util/immersveLegalDocuments';
+
+export interface UseImmersveSupportedRegionsOptions {
+  /**
+   * When provided, overrides the default Immersve FF + country gate.
+   * Use on Card Home when the active provider is already Immersve.
+   */
+  enabled?: boolean;
+}
+
+function getController() {
+  const controller = Engine.context?.CardController;
+  if (!controller) {
+    throw new Error('CardController not initialized');
+  }
+  return controller;
+}
+
+/**
+ * Fetches Immersve supported-regions (full list) via CardController / Card API,
+ * caches for 5 minutes, and derives region docs by filtering locally.
+ */
+const useImmersveSupportedRegions = (
+  regionCode: string | null | undefined,
+  options: UseImmersveSupportedRegionsOptions = {},
+) => {
+  const immersveOnboardingEnabled = useSelector(
+    selectImmersveOnboardingEnabled,
+  );
+  const cardFeatureFlag = useSelector(selectCardFeatureFlag);
+
+  const isImmersveCountry = Boolean(
+    immersveOnboardingEnabled &&
+      regionCode &&
+      (cardFeatureFlag.immersveCountries ?? []).includes(regionCode),
+  );
+
+  const queryEnabled =
+    options.enabled !== undefined ? options.enabled : isImmersveCountry;
+
+  const { data, isLoading, error, refetch } = useQuery({
+    queryKey: cardQueries.dashboard.keys.immersveSupportedRegions(),
+    queryFn: () =>
+      getController().getSupportedRegions(CardProviderIds.Immersve),
+    enabled: queryEnabled,
+    staleTime: 5 * 60 * 1000,
+  });
+
+  const region = getRegionByCode(data, regionCode);
+  const onboardingDocuments = getOnboardingLegalDocuments(region?.documents);
+  const permanentDocuments = getPermanentLegalDocuments(region?.documents);
+
+  return {
+    region,
+    onboardingDocuments,
+    permanentDocuments,
+    // RQ v4: isLoading is status==='loading' (true even when fetchStatus is
+    // 'paused'). Do not AND with isFetching — that is isInitialLoading and
+    // hides the loading state while the first fetch is paused offline.
+    isLoading: Boolean(queryEnabled && isLoading),
+    error: (error as Error | null) ?? null,
+    refetch: async () => {
+      const result = await refetch();
+      return result.data ?? null;
+    },
+  };
+};
+
+export default useImmersveSupportedRegions;
diff --git a/app/components/UI/Card/hooks/useMoneyAccountCardLinkage.test.tsx b/app/components/UI/Card/hooks/useMoneyAccountCardLinkage.test.tsx
index 65380d51c062..b9516b054612 100644
--- a/app/components/UI/Card/hooks/useMoneyAccountCardLinkage.test.tsx
+++ b/app/components/UI/Card/hooks/useMoneyAccountCardLinkage.test.tsx
@@ -81,6 +81,9 @@ jest.mock('./useCardDelegation', () => {
 jest.mock(
   '../../../../core/Engine/controllers/card-controller/provider-types',
   () => {
+    const actual = jest.requireActual(
+      '../../../../core/Engine/controllers/card-controller/provider-types',
+    );
     class MockCardLinkageInProgressError extends Error {
       constructor(
         message = 'A Money Account to Card linkage is already in progress',
@@ -89,7 +92,10 @@ jest.mock(
         this.name = 'CardLinkageInProgressError';
       }
     }
-    return { CardLinkageInProgressError: MockCardLinkageInProgressError };
+    return {
+      ...actual,
+      CardLinkageInProgressError: MockCardLinkageInProgressError,
+    };
   },
 );
 
@@ -1317,6 +1323,39 @@ describe('useMoneyAccountCardLinkage', () => {
       });
     });
 
+    it('shows the different-card conflict toast when the controller rejects with MoneyAccountLinkedToDifferentCard', async () => {
+      const { CardProviderError: MockedCardProviderError } = jest.requireMock(
+        '../../../../core/Engine/controllers/card-controller/provider-types',
+      );
+      mockLinkMoneyAccountCard.mockRejectedValueOnce(
+        new MockedCardProviderError(
+          'money_account_linked_to_different_card',
+          'Money Account is already linked to a different card account',
+        ),
+      );
+
+      const { result } = renderLinkageHook();
+
+      let returned: boolean | undefined;
+      await act(async () => {
+        returned = await result.current.confirmLinkInBackground();
+      });
+
+      expect(returned).toBe(false);
+      expect(result.current.status).toBe('error');
+      expect(mockShowToast).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          labelOptions: [
+            {
+              label:
+                'This wallet is already linked to a different MetaMask Card',
+            },
+          ],
+          hasNoTimeout: false,
+        }),
+      );
+    });
+
     it('sets status=cancelled and shows NO error toast on UserCancelledError', async () => {
       const { UserCancelledError } = jest.requireMock('./useCardDelegation');
       mockLinkMoneyAccountCard.mockRejectedValueOnce(
diff --git a/app/components/UI/Card/hooks/useMoneyAccountCardLinkage.tsx b/app/components/UI/Card/hooks/useMoneyAccountCardLinkage.tsx
index 028d1ad0102f..a6a23178ab74 100644
--- a/app/components/UI/Card/hooks/useMoneyAccountCardLinkage.tsx
+++ b/app/components/UI/Card/hooks/useMoneyAccountCardLinkage.tsx
@@ -50,7 +50,11 @@ import {
   hasMoneyAccountCardRequirements,
   resolveMoneyAccountCardToken,
 } from '../../../../core/Engine/controllers/card-controller/utils/moneyAccountCardToken';
-import { CardLinkageInProgressError } from '../../../../core/Engine/controllers/card-controller/provider-types';
+import {
+  CardLinkageInProgressError,
+  CardProviderError,
+  CardProviderErrorCode,
+} from '../../../../core/Engine/controllers/card-controller/provider-types';
 import { BAANX_MAX_LIMIT } from '../constants';
 import { isMoneyAccountCardTokenAllowlisted } from '../util/vedaToken';
 import { CardFundingToken } from '../types';
@@ -260,12 +264,12 @@ export const useMoneyAccountCardLinkage =
     );
 
     const showErrorToast = useCallback(
-      (action: LinkageAction = 'link') => {
+      (action: LinkageAction = 'link', labelKey?: string) => {
         toastRef?.current?.showToast({
           variant: ToastVariants.Icon,
           labelOptions: [
             {
-              label: strings(ERROR_TITLE_BY_ACTION[action]),
+              label: strings(labelKey ?? ERROR_TITLE_BY_ACTION[action]),
             },
           ],
           iconName: IconName.Error,
@@ -614,7 +618,19 @@ export const useMoneyAccountCardLinkage =
           Logger.error(linkageError, 'useMoneyAccountCardLinkage failed');
           setError(linkageError);
           setStatus('error');
-          showErrorToast(action);
+          // Cross-device conflict: the Money Account is already delegated to
+          // another card account, so the generic "something went wrong" copy
+          // would mislead — name the actual reason.
+          const isLinkedToDifferentCard =
+            linkageError instanceof CardProviderError &&
+            linkageError.code ===
+              CardProviderErrorCode.MoneyAccountLinkedToDifferentCard;
+          showErrorToast(
+            action,
+            isLinkedToDifferentCard
+              ? 'money.metamask_card.link_error_different_card'
+              : undefined,
+          );
           return false;
         }
       },
diff --git a/app/components/UI/Card/hooks/useOpenSwaps.test.ts b/app/components/UI/Card/hooks/useOpenSwaps.test.ts
index 49fabaaec71f..de72c8036d37 100644
--- a/app/components/UI/Card/hooks/useOpenSwaps.test.ts
+++ b/app/components/UI/Card/hooks/useOpenSwaps.test.ts
@@ -39,11 +39,6 @@ jest.mock('../../../../core/redux/slices/bridge', () => ({
   selectSelectedSourceChainIds: jest.fn(),
 }));
 
-jest.mock('../../../../selectors/multichain', () => ({
-  selectEvmTokens: jest.fn(),
-  selectEvmTokenFiatBalances: jest.fn(),
-}));
-
 jest.mock('../../../../selectors/networkController', () => ({
   selectAllPopularNetworkConfigurations: jest.fn(),
 }));
diff --git a/app/components/UI/Card/hooks/useSpendingLimit.ts b/app/components/UI/Card/hooks/useSpendingLimit.ts
index d6fb069e4205..3d73c6acc829 100644
--- a/app/components/UI/Card/hooks/useSpendingLimit.ts
+++ b/app/components/UI/Card/hooks/useSpendingLimit.ts
@@ -616,7 +616,9 @@ const useSpendingLimit = ({
         });
         if (success) {
           try {
-            await Engine.context.CardController.fetchCardHomeData();
+            await Engine.context.CardController.fetchCardHomeData({
+              force: true,
+            });
           } catch (error) {
             Logger.error(
               error as Error,
@@ -672,7 +674,7 @@ const useSpendingLimit = ({
 
       // Wait for backend to process, then refresh card home data
       await new Promise((resolve) => setTimeout(resolve, 3000));
-      await Engine.context.CardController.fetchCardHomeData();
+      await Engine.context.CardController.fetchCardHomeData({ force: true });
 
       if (!isOnboardingFlow) {
         showSuccessToast();
diff --git a/app/components/UI/Card/queries/dashboard.ts b/app/components/UI/Card/queries/dashboard.ts
index ec45a2cac515..5555f935aa24 100644
--- a/app/components/UI/Card/queries/dashboard.ts
+++ b/app/components/UI/Card/queries/dashboard.ts
@@ -30,4 +30,7 @@ export const dashboardKeys = {
     [...dashboardKeys.all(), 'registrationStatus', onboardingId] as const,
   consentSet: (onboardingId: string) =>
     [...dashboardKeys.all(), 'consentSet', onboardingId] as const,
+  /** Full Immersve supported-regions list (no regionCode — filter client-side). */
+  immersveSupportedRegions: () =>
+    [...dashboardKeys.all(), 'immersveSupportedRegions'] as const,
 };
diff --git a/app/components/UI/Card/util/getCardProviderErrorMessage.test.ts b/app/components/UI/Card/util/getCardProviderErrorMessage.test.ts
index 02c7be2b36b8..210af6e5c05e 100644
--- a/app/components/UI/Card/util/getCardProviderErrorMessage.test.ts
+++ b/app/components/UI/Card/util/getCardProviderErrorMessage.test.ts
@@ -50,6 +50,12 @@ describe('getCardProviderErrorMessage', () => {
         expectedStringKey: 'card.card_authentication.errors.unknown_error',
         description: 'Unknown',
       },
+      {
+        code: CardProviderErrorCode.MoneyAccountLinkedToDifferentCard,
+        expectedStringKey:
+          'card.card_authentication.errors.money_account_linked_to_different_card',
+        description: 'MoneyAccountLinkedToDifferentCard',
+      },
     ] as const;
 
     it.each(cardProviderErrorTestCases)(
diff --git a/app/components/UI/Card/util/getCardProviderErrorMessage.ts b/app/components/UI/Card/util/getCardProviderErrorMessage.ts
index 832410192d4d..5fcede44bb5d 100644
--- a/app/components/UI/Card/util/getCardProviderErrorMessage.ts
+++ b/app/components/UI/Card/util/getCardProviderErrorMessage.ts
@@ -25,6 +25,10 @@ export function getCardProviderErrorMessage(err: unknown): string {
         return withCode(
           strings('card.card_authentication.errors.forbidden_error'),
         );
+      case CardProviderErrorCode.MoneyAccountLinkedToDifferentCard:
+        return strings(
+          'card.card_authentication.errors.money_account_linked_to_different_card',
+        );
       default:
         return withCode(
           strings('card.card_authentication.errors.unknown_error'),
diff --git a/app/components/UI/Card/util/immersveLegalDocuments.test.ts b/app/components/UI/Card/util/immersveLegalDocuments.test.ts
new file mode 100644
index 000000000000..ac5dcc6a55a5
--- /dev/null
+++ b/app/components/UI/Card/util/immersveLegalDocuments.test.ts
@@ -0,0 +1,158 @@
+import {
+  getOnboardingLegalDocuments,
+  getPermanentLegalDocuments,
+  getRegionByCode,
+} from './immersveLegalDocuments';
+import type { CardApiSupportedRegionsResponse } from '../../../../core/Engine/controllers/card-controller/services/card-supported-regions.types';
+
+const GB_DOCUMENTS = {
+  generalTermsOfUse: {
+    title: 'General Terms of Use',
+    url: 'https://example.com/gb/terms',
+  },
+  privacyPolicy: {
+    title: 'Privacy Policy',
+    url: 'https://example.com/gb/privacy',
+  },
+  disclosures: [
+    {
+      title: 'Product Disclosure',
+      url: 'https://example.com/gb/disclosure-0',
+    },
+  ],
+  marketCompliance: [
+    {
+      title: 'Market Compliance',
+      url: 'https://example.com/gb/market-0',
+    },
+  ],
+};
+
+const RESPONSE: CardApiSupportedRegionsResponse = {
+  provider: 'immersve',
+  regions: [
+    {
+      code: 'GB',
+      name: 'United Kingdom',
+      isAvailable: true,
+      unstructuredAddressAllowed: false,
+      documents: GB_DOCUMENTS,
+    },
+    {
+      code: 'AU',
+      name: 'Australia',
+      isAvailable: true,
+      unstructuredAddressAllowed: false,
+      documents: {
+        generalTermsOfUse: {
+          title: 'AU Terms',
+          url: 'https://example.com/au/terms',
+        },
+        privacyPolicy: {
+          title: 'AU Privacy',
+          url: 'https://example.com/au/privacy',
+        },
+        disclosures: [],
+        marketCompliance: [],
+      },
+    },
+  ],
+};
+
+describe('getRegionByCode', () => {
+  it('returns region matching code case-insensitively', () => {
+    expect(getRegionByCode(RESPONSE, 'gb')?.code).toBe('GB');
+    expect(getRegionByCode(RESPONSE, 'AU')?.name).toBe('Australia');
+  });
+
+  it('returns null when code is missing from response', () => {
+    expect(getRegionByCode(RESPONSE, 'US')).toBeNull();
+  });
+
+  it('returns null when response or code is empty', () => {
+    expect(getRegionByCode(null, 'GB')).toBeNull();
+    expect(getRegionByCode(RESPONSE, null)).toBeNull();
+    expect(getRegionByCode(RESPONSE, '')).toBeNull();
+  });
+});
+
+describe('getOnboardingLegalDocuments', () => {
+  it('returns terms, privacy, and disclosures in order', () => {
+    expect(getOnboardingLegalDocuments(GB_DOCUMENTS)).toStrictEqual([
+      {
+        id: 'generalTermsOfUse',
+        title: 'General Terms of Use',
+        url: 'https://example.com/gb/terms',
+      },
+      {
+        id: 'privacyPolicy',
+        title: 'Privacy Policy',
+        url: 'https://example.com/gb/privacy',
+      },
+      {
+        id: 'disclosure-0',
+        title: 'Product Disclosure',
+        url: 'https://example.com/gb/disclosure-0',
+      },
+    ]);
+  });
+
+  it('excludes marketCompliance from onboarding set', () => {
+    const ids = getOnboardingLegalDocuments(GB_DOCUMENTS).map((d) => d.id);
+
+    expect(ids).not.toContain('marketCompliance-0');
+  });
+
+  it('skips documents missing title or url', () => {
+    expect(
+      getOnboardingLegalDocuments({
+        generalTermsOfUse: { title: '', url: 'https://example.com/t' },
+        privacyPolicy: { title: 'Privacy', url: '' },
+        disclosures: [{ title: 'Ok', url: 'https://example.com/d' }],
+        marketCompliance: [],
+      }),
+    ).toStrictEqual([
+      {
+        id: 'disclosure-0',
+        title: 'Ok',
+        url: 'https://example.com/d',
+      },
+    ]);
+  });
+
+  it('returns empty array when documents are missing', () => {
+    expect(getOnboardingLegalDocuments(undefined)).toStrictEqual([]);
+    expect(getOnboardingLegalDocuments(null)).toStrictEqual([]);
+  });
+});
+
+describe('getPermanentLegalDocuments', () => {
+  it('returns onboarding docs plus marketCompliance', () => {
+    expect(getPermanentLegalDocuments(GB_DOCUMENTS)).toStrictEqual([
+      {
+        id: 'generalTermsOfUse',
+        title: 'General Terms of Use',
+        url: 'https://example.com/gb/terms',
+      },
+      {
+        id: 'privacyPolicy',
+        title: 'Privacy Policy',
+        url: 'https://example.com/gb/privacy',
+      },
+      {
+        id: 'disclosure-0',
+        title: 'Product Disclosure',
+        url: 'https://example.com/gb/disclosure-0',
+      },
+      {
+        id: 'marketCompliance-0',
+        title: 'Market Compliance',
+        url: 'https://example.com/gb/market-0',
+      },
+    ]);
+  });
+
+  it('returns empty array when documents are missing', () => {
+    expect(getPermanentLegalDocuments(undefined)).toStrictEqual([]);
+  });
+});
diff --git a/app/components/UI/Card/util/immersveLegalDocuments.ts b/app/components/UI/Card/util/immersveLegalDocuments.ts
new file mode 100644
index 000000000000..75c29ec471ac
--- /dev/null
+++ b/app/components/UI/Card/util/immersveLegalDocuments.ts
@@ -0,0 +1,84 @@
+import type {
+  CardApiLegalDocument,
+  CardApiRegionDocuments,
+  CardApiSupportedRegion,
+  CardApiSupportedRegionsResponse,
+} from '../../../../core/Engine/controllers/card-controller/services/card-supported-regions.types';
+
+export interface ImmersveLegalDocumentLink {
+  id: string;
+  title: string;
+  url: string;
+}
+
+function toLink(
+  id: string,
+  legalDocument: CardApiLegalDocument | undefined,
+): ImmersveLegalDocumentLink | null {
+  if (!legalDocument?.url || !legalDocument.title) {
+    return null;
+  }
+  return { id, title: legalDocument.title, url: legalDocument.url };
+}
+
+function mapDocumentList(
+  prefix: string,
+  documents: CardApiLegalDocument[] | undefined,
+): ImmersveLegalDocumentLink[] {
+  if (!documents?.length) {
+    return [];
+  }
+  return documents.flatMap((legalDocument, index) => {
+    const link = toLink(`${prefix}-${index}`, legalDocument);
+    return link ? [link] : [];
+  });
+}
+
+/**
+ * Finds a region in the Card API supported-regions response by ISO code.
+ */
+export function getRegionByCode(
+  response: CardApiSupportedRegionsResponse | null | undefined,
+  code: string | null | undefined,
+): CardApiSupportedRegion | null {
+  if (!response?.regions?.length || !code) {
+    return null;
+  }
+  return (
+    response.regions.find(
+      (region) => region.code.toUpperCase() === code.toUpperCase(),
+    ) ?? null
+  );
+}
+
+/**
+ * Onboarding / SignUp clickwrap docs: terms, privacy, disclosures.
+ * Excludes marketCompliance (permanent-access only).
+ */
+export function getOnboardingLegalDocuments(
+  documents: CardApiRegionDocuments | null | undefined,
+): ImmersveLegalDocumentLink[] {
+  if (!documents) {
+    return [];
+  }
+  return [
+    toLink('generalTermsOfUse', documents.generalTermsOfUse),
+    toLink('privacyPolicy', documents.privacyPolicy),
+    ...mapDocumentList('disclosure', documents.disclosures),
+  ].filter((link): link is ImmersveLegalDocumentLink => link !== null);
+}
+
+/**
+ * Permanent / Card Home docs: onboarding set plus marketCompliance.
+ */
+export function getPermanentLegalDocuments(
+  documents: CardApiRegionDocuments | null | undefined,
+): ImmersveLegalDocumentLink[] {
+  if (!documents) {
+    return [];
+  }
+  return [
+    ...getOnboardingLegalDocuments(documents),
+    ...mapDocumentList('marketCompliance', documents.marketCompliance),
+  ];
+}
diff --git a/app/components/UI/Card/util/mapCardApiUrl.test.ts b/app/components/UI/Card/util/mapCardApiUrl.test.ts
new file mode 100644
index 000000000000..ffbb971f9611
--- /dev/null
+++ b/app/components/UI/Card/util/mapCardApiUrl.test.ts
@@ -0,0 +1,96 @@
+import AppConstants from '../../../../core/AppConstants';
+import { getDefaultCardApiBaseUrlForMetaMaskEnv } from './mapCardApiUrl';
+
+describe('getDefaultCardApiBaseUrlForMetaMaskEnv', () => {
+  const originalCardApiUrl = process.env.CARD_API_URL;
+
+  afterEach(() => {
+    if (originalCardApiUrl !== undefined) {
+      process.env.CARD_API_URL = originalCardApiUrl;
+    } else {
+      delete process.env.CARD_API_URL;
+    }
+  });
+
+  describe('when CARD_API_URL is set (builds.yml path)', () => {
+    it('returns CARD_API_URL from environment when set', () => {
+      process.env.CARD_API_URL = 'https://test.api';
+
+      expect(getDefaultCardApiBaseUrlForMetaMaskEnv('any-env')).toBe(
+        'https://test.api',
+      );
+    });
+
+    it('ignores metaMaskEnv parameter when URL is set at build time', () => {
+      process.env.CARD_API_URL = 'https://custom.api';
+
+      expect(getDefaultCardApiBaseUrlForMetaMaskEnv('dev')).toBe(
+        'https://custom.api',
+      );
+      expect(getDefaultCardApiBaseUrlForMetaMaskEnv('production')).toBe(
+        'https://custom.api',
+      );
+    });
+
+    it('produces same output for same input', () => {
+      process.env.CARD_API_URL = 'https://test.api';
+
+      const result1 = getDefaultCardApiBaseUrlForMetaMaskEnv('production');
+      const result2 = getDefaultCardApiBaseUrlForMetaMaskEnv('production');
+
+      expect(result1).toBe(result2);
+    });
+  });
+
+  describe('when CARD_API_URL is not set (fallback path)', () => {
+    beforeEach(() => {
+      delete process.env.CARD_API_URL;
+    });
+
+    it('returns AppConstants.CARD_API_URL.PRD for production/rc', () => {
+      expect(getDefaultCardApiBaseUrlForMetaMaskEnv('production')).toBe(
+        AppConstants.CARD_API_URL.PRD,
+      );
+      expect(getDefaultCardApiBaseUrlForMetaMaskEnv('rc')).toBe(
+        AppConstants.CARD_API_URL.PRD,
+      );
+    });
+
+    it('returns AppConstants.CARD_API_URL.UAT for pre-release/exp/beta', () => {
+      expect(getDefaultCardApiBaseUrlForMetaMaskEnv('pre-release')).toBe(
+        AppConstants.CARD_API_URL.UAT,
+      );
+      expect(getDefaultCardApiBaseUrlForMetaMaskEnv('exp')).toBe(
+        AppConstants.CARD_API_URL.UAT,
+      );
+      expect(getDefaultCardApiBaseUrlForMetaMaskEnv('beta')).toBe(
+        AppConstants.CARD_API_URL.UAT,
+      );
+    });
+
+    it('returns AppConstants.CARD_API_URL.DEV for dev/e2e/local', () => {
+      expect(getDefaultCardApiBaseUrlForMetaMaskEnv('dev')).toBe(
+        AppConstants.CARD_API_URL.DEV,
+      );
+      expect(getDefaultCardApiBaseUrlForMetaMaskEnv('e2e')).toBe(
+        AppConstants.CARD_API_URL.DEV,
+      );
+      expect(getDefaultCardApiBaseUrlForMetaMaskEnv('local')).toBe(
+        AppConstants.CARD_API_URL.DEV,
+      );
+    });
+
+    it('returns a non-empty string for all inputs', () => {
+      const testCases = ['production', 'dev', undefined, null, '', 'unknown'];
+
+      testCases.forEach((testCase) => {
+        const result = getDefaultCardApiBaseUrlForMetaMaskEnv(
+          testCase as string | undefined,
+        );
+
+        expect(typeof result).toBe('string');
+        expect(result.length).toBeGreaterThan(0);
+      });
+    });
+  });
+});
diff --git a/app/components/UI/Card/util/mapCardApiUrl.ts b/app/components/UI/Card/util/mapCardApiUrl.ts
new file mode 100644
index 000000000000..857ab3599ed3
--- /dev/null
+++ b/app/components/UI/Card/util/mapCardApiUrl.ts
@@ -0,0 +1,28 @@
+import AppConstants from '../../../../core/AppConstants';
+
+/**
+ * Returns the MetaMask Card API (CX) base URL for the given MetaMask environment.
+ * When process.env.CARD_API_URL is set (set by builds.yml), uses it directly.
+ * Otherwise (e.g. Jest, environments without builds.yml), uses AppConstants.CARD_API_URL per env.
+ */
+export const getDefaultCardApiBaseUrlForMetaMaskEnv = (
+  metaMaskEnv: string | undefined,
+): string => {
+  if (process.env.CARD_API_URL) {
+    return process.env.CARD_API_URL;
+  }
+  switch (metaMaskEnv) {
+    case 'e2e':
+    case 'dev':
+    case 'local':
+      return AppConstants.CARD_API_URL.DEV;
+    case 'pre-release':
+    case 'exp':
+    case 'beta':
+      return AppConstants.CARD_API_URL.UAT;
+    case 'production':
+    case 'rc':
+    default:
+      return AppConstants.CARD_API_URL.PRD;
+  }
+};
diff --git a/app/components/UI/CliLoginPushNudge/CliLoginPushNudgeListener.test.tsx b/app/components/UI/CliLoginPushNudge/CliLoginPushNudgeListener.test.tsx
new file mode 100644
index 000000000000..3463edda495f
--- /dev/null
+++ b/app/components/UI/CliLoginPushNudge/CliLoginPushNudgeListener.test.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { render } from '@testing-library/react-native';
+import CliLoginPushNudgeListener from './CliLoginPushNudgeListener';
+
+const mockNewUserSheet = jest.fn();
+const mockUseCliLoginPushNudge = jest.fn();
+
+jest.mock(
+  '../../Views/Notifications/PushNotificationOnboarding/NewUserSheet',
+  () => ({
+    __esModule: true,
+    default: (props: unknown) => {
+      mockNewUserSheet(props);
+      return null;
+    },
+  }),
+);
+
+jest.mock('./useCliLoginPushNudge', () => ({
+  useCliLoginPushNudge: () => mockUseCliLoginPushNudge(),
+}));
+
+jest.mock('../../../../locales/i18n', () => ({
+  strings: (key: string) => key,
+}));
+
+describe('CliLoginPushNudgeListener', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseCliLoginPushNudge.mockReturnValue({
+      isVisible: true,
+      onYes: jest.fn(),
+      onNotNow: jest.fn(),
+      onClose: jest.fn(),
+    });
+  });
+
+  it('uses the CLI-specific copy and notification preview', () => {
+    render(<CliLoginPushNudgeListener />);
+
+    expect(mockNewUserSheet).toHaveBeenCalledWith(
+      expect.objectContaining({
+        testID: 'cli-login-push-nudge',
+        title: 'sdk_connect_v2.push_nudge.title',
+        body: 'sdk_connect_v2.push_nudge.description',
+        yesLabel: 'sdk_connect_v2.push_nudge.turn_on_button',
+        previewTitle: 'sdk_connect_v2.push_nudge.preview_title',
+        previewMessage: 'sdk_connect_v2.push_nudge.preview_message',
+        previewTimestamp: 'sdk_connect_v2.push_nudge.preview_timestamp',
+      }),
+    );
+  });
+});
diff --git a/app/components/UI/CliLoginPushNudge/CliLoginPushNudgeListener.tsx b/app/components/UI/CliLoginPushNudge/CliLoginPushNudgeListener.tsx
index a9ddf02a93f1..b3c5a54fb762 100644
--- a/app/components/UI/CliLoginPushNudge/CliLoginPushNudgeListener.tsx
+++ b/app/components/UI/CliLoginPushNudge/CliLoginPushNudgeListener.tsx
@@ -1,18 +1,35 @@
-import { useEffect } from 'react';
-import { subscribeCliLoginPushNudge } from '../../../core/AgenticCli/cliLoginPushNudgeSignal';
+import React from 'react';
+import { strings } from '../../../../locales/i18n';
+import NewUserSheet from '../../Views/Notifications/PushNotificationOnboarding/NewUserSheet';
 import { useCliLoginPushNudge } from './useCliLoginPushNudge';
 
 /**
- * Bridges the non-React CLI QR-login service layer to the toast UI (MMAI-925).
- * Mount once inside the ToastContext provider; subscribes to the module-level
- * push-nudge signal and shows the toast when emitted.
+ * Bridges the non-React CLI QR-login service layer to the push-permission
+ * bottom sheet (MMAI-925). Mounted once inside the authenticated Main flow
+ * (alongside PushNotificationOnboardingRoot) so the BottomSheet layers above
+ * native-stack screens on iOS; a sibling of <AppFlow /> in App.tsx would
+ * render behind those screens. Subscribes to the module-level push-nudge
+ * signal and shows the shared "Never miss a move" sheet (with CLI-specific
+ * copy) when emitted.
  */
 const CliLoginPushNudgeListener = () => {
-  const { showNudge } = useCliLoginPushNudge();
+  const { isVisible, onYes, onNotNow, onClose } = useCliLoginPushNudge();
 
-  useEffect(() => subscribeCliLoginPushNudge(() => showNudge()), [showNudge]);
-
-  return null;
+  return (
+    <NewUserSheet
+      isVisible={isVisible}
+      onClose={onClose}
+      onYes={onYes}
+      onNotNow={onNotNow}
+      title={strings('sdk_connect_v2.push_nudge.title')}
+      body={strings('sdk_connect_v2.push_nudge.description')}
+      yesLabel={strings('sdk_connect_v2.push_nudge.turn_on_button')}
+      previewTitle={strings('sdk_connect_v2.push_nudge.preview_title')}
+      previewMessage={strings('sdk_connect_v2.push_nudge.preview_message')}
+      previewTimestamp={strings('sdk_connect_v2.push_nudge.preview_timestamp')}
+      testID="cli-login-push-nudge"
+    />
+  );
 };
 
 export default CliLoginPushNudgeListener;
diff --git a/app/components/UI/CliLoginPushNudge/useCliLoginPushNudge.test.tsx b/app/components/UI/CliLoginPushNudge/useCliLoginPushNudge.test.tsx
index 8f069d6d36ba..594461efd985 100644
--- a/app/components/UI/CliLoginPushNudge/useCliLoginPushNudge.test.tsx
+++ b/app/components/UI/CliLoginPushNudge/useCliLoginPushNudge.test.tsx
@@ -1,13 +1,11 @@
-import React from 'react';
 // eslint-disable-next-line react-native/split-platform-components
-import { AppState, PermissionsAndroid, Platform } from 'react-native';
+import { Alert, AppState, PermissionsAndroid, Platform } from 'react-native';
 import { renderHook, act } from '@testing-library/react-native';
-import { ToastContext } from '../../../component-library/components/Toast';
-import type {
-  ToastRef,
-  ToastOptions,
-} from '../../../component-library/components/Toast/Toast.types';
 import { useCliLoginPushNudge } from './useCliLoginPushNudge';
+import {
+  emitCliLoginPushNudge,
+  __resetCliLoginPushNudgeListenersForTests,
+} from '../../../core/AgenticCli/cliLoginPushNudgeSignal';
 
 const mockEnableNotifications = jest.fn();
 const mockIsPushPermissionPromptable = jest.fn();
@@ -34,41 +32,26 @@ jest.mock('../../../util/notifications/services/NotificationService', () => ({
   isPushPermissionGranted: () => mockIsPushPermissionGranted(),
 }));
 
-jest.mock('../../../../locales/i18n', () => ({
-  strings: (key: string) => key,
+jest.mock('../../../core/SDKConnectV2/services/logger', () => ({
+  __esModule: true,
+  default: { warn: jest.fn() },
 }));
 
 describe('useCliLoginPushNudge', () => {
-  let showToast: jest.Mock;
-  let closeToast: jest.Mock;
   let appStateChangeHandler: ((state: string) => void) | undefined;
   let removeMocks: jest.Mock[];
 
-  const wrapper = ({ children }: { children: React.ReactNode }) => {
-    const toastRef = {
-      current: { showToast, closeToast } as unknown as ToastRef,
-    };
-    return (
-      <ToastContext.Provider value={{ toastRef }}>
-        {children}
-      </ToastContext.Provider>
-    );
-  };
+  const renderNudge = () => renderHook(() => useCliLoginPushNudge());
 
-  const renderNudge = () =>
-    renderHook(() => useCliLoginPushNudge(), { wrapper });
-
-  const tapTurnOn = async () => {
-    const options = showToast.mock.calls[0][0] as ToastOptions;
-    await act(async () => {
-      await options.linkButtonOptions?.onPress?.();
+  const emit = () => {
+    act(() => {
+      emitCliLoginPushNudge();
     });
   };
 
   beforeEach(() => {
     jest.clearAllMocks();
-    showToast = jest.fn();
-    closeToast = jest.fn();
+    __resetCliLoginPushNudgeListenersForTests();
     appStateChangeHandler = undefined;
     removeMocks = [];
     mockIsNotificationsFeatureEnabled.mockReturnValue(true);
@@ -78,6 +61,7 @@ describe('useCliLoginPushNudge', () => {
     jest
       .spyOn(PermissionsAndroid, 'request')
       .mockResolvedValue(PermissionsAndroid.RESULTS.DENIED);
+    jest.spyOn(Alert, 'alert').mockImplementation(jest.fn());
     Platform.OS = 'ios';
     jest.spyOn(AppState, 'addEventListener').mockImplementation(((
       _event: string,
@@ -94,100 +78,96 @@ describe('useCliLoginPushNudge', () => {
     jest.restoreAllMocks();
   });
 
-  it('does not show the toast when the notifications feature is disabled', () => {
-    mockIsNotificationsFeatureEnabled.mockReturnValue(false);
+  it('is hidden initially', () => {
     const { result } = renderNudge();
 
-    let shown: boolean | undefined;
-    act(() => {
-      shown = result.current.showNudge();
-    });
+    expect(result.current.isVisible).toBe(false);
+  });
+
+  it('becomes visible when the nudge signal is emitted', () => {
+    const { result } = renderNudge();
 
-    expect(shown).toBe(false);
-    expect(showToast).not.toHaveBeenCalled();
+    emit();
+
+    expect(result.current.isVisible).toBe(true);
   });
 
-  it('shows a toast with a Turn on action when enabled', () => {
+  it('stays hidden when the notifications feature is disabled', () => {
+    mockIsNotificationsFeatureEnabled.mockReturnValue(false);
     const { result } = renderNudge();
 
-    let shown: boolean | undefined;
-    act(() => {
-      shown = result.current.showNudge();
-    });
+    emit();
 
-    expect(shown).toBe(true);
-    expect(showToast).toHaveBeenCalledTimes(1);
-    const options = showToast.mock.calls[0][0] as ToastOptions;
-    expect(options.linkButtonOptions?.onPress).toBeDefined();
-    expect(options.closeButtonOptions?.onPress).toBeDefined();
+    expect(result.current.isVisible).toBe(false);
   });
 
-  it('enables and closes without opening settings when push is already granted', async () => {
+  it('enables notifications when push is already granted', async () => {
     mockIsPushPermissionGranted.mockResolvedValue(true);
     const { result } = renderNudge();
+    emit();
 
-    act(() => {
-      result.current.showNudge();
+    await act(async () => {
+      await result.current.onYes();
     });
-    await tapTurnOn();
 
     expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
     expect(mockOpenSystemSettings).not.toHaveBeenCalled();
-    expect(closeToast).toHaveBeenCalled();
+    expect(result.current.isVisible).toBe(false);
   });
 
-  it('enables via the OS dialog when push is still promptable', async () => {
-    mockIsPushPermissionPromptable.mockResolvedValue(true);
+  it('shows an error when enabling notifications fails', async () => {
+    mockIsPushPermissionGranted.mockResolvedValue(true);
+    mockEnableNotifications.mockRejectedValue(new Error('Network error'));
     const { result } = renderNudge();
+    emit();
 
-    act(() => {
-      result.current.showNudge();
+    await act(async () => {
+      await result.current.onYes();
     });
-    await tapTurnOn();
 
-    expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
-    expect(mockOpenSystemSettings).not.toHaveBeenCalled();
-    expect(closeToast).toHaveBeenCalled();
+    expect(Alert.alert).toHaveBeenCalledWith(
+      'Something went wrong',
+      "We couldn't enable notifications. Please try again later.",
+    );
+    expect(result.current.isVisible).toBe(false);
   });
 
-  it('does not open settings when the user denies the OS dialog', async () => {
+  it('enables via the OS dialog when push is still promptable on iOS', async () => {
     mockIsPushPermissionPromptable.mockResolvedValue(true);
-    mockIsPushPermissionGranted.mockResolvedValue(false);
     const { result } = renderNudge();
+    emit();
 
-    act(() => {
-      result.current.showNudge();
+    await act(async () => {
+      await result.current.onYes();
     });
-    await tapTurnOn();
 
     expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
     expect(mockOpenSystemSettings).not.toHaveBeenCalled();
-    expect(closeToast).toHaveBeenCalled();
+    expect(result.current.isVisible).toBe(false);
   });
 
-  it('opens device settings when the OS can no longer show its dialog', async () => {
+  it('opens device settings when iOS can no longer show its dialog', async () => {
     mockIsPushPermissionPromptable.mockResolvedValue(false);
     const { result } = renderNudge();
+    emit();
 
-    act(() => {
-      result.current.showNudge();
+    await act(async () => {
+      await result.current.onYes();
     });
-    await tapTurnOn();
 
     expect(mockEnableNotifications).not.toHaveBeenCalled();
     expect(mockOpenSystemSettings).toHaveBeenCalledTimes(1);
+    expect(result.current.isVisible).toBe(false);
   });
 
-  it('re-enables on return from settings when permission becomes granted', async () => {
+  it('enables on return from settings when permission becomes granted', async () => {
     mockIsPushPermissionPromptable.mockResolvedValue(false);
     const { result } = renderNudge();
+    emit();
 
-    act(() => {
-      result.current.showNudge();
+    await act(async () => {
+      await result.current.onYes();
     });
-    await tapTurnOn();
-
-    expect(mockOpenSystemSettings).toHaveBeenCalledTimes(1);
 
     mockIsPushPermissionGranted.mockResolvedValue(true);
     await act(async () => {
@@ -197,70 +177,93 @@ describe('useCliLoginPushNudge', () => {
     expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
   });
 
-  it('closes the toast without re-enabling when the user returns still not granted', async () => {
+  it('does not enable on foreground return when permission is still not granted', async () => {
     mockIsPushPermissionPromptable.mockResolvedValue(false);
     mockIsPushPermissionGranted.mockResolvedValue(false);
     const { result } = renderNudge();
+    emit();
 
-    act(() => {
-      result.current.showNudge();
+    await act(async () => {
+      await result.current.onYes();
     });
-    await tapTurnOn();
 
     mockEnableNotifications.mockClear();
-    closeToast.mockClear();
     await act(async () => {
       appStateChangeHandler?.('active');
     });
 
     expect(mockEnableNotifications).not.toHaveBeenCalled();
-    expect(closeToast).toHaveBeenCalled();
   });
 
-  it('does not block Turn on after opening settings when the user never returns', async () => {
+  it('does not block a repeat Yes after opening settings when the user never returns', async () => {
     mockIsPushPermissionPromptable.mockResolvedValue(false);
     const { result } = renderNudge();
+    emit();
 
-    act(() => {
-      result.current.showNudge();
+    await act(async () => {
+      await result.current.onYes();
+    });
+    await act(async () => {
+      await result.current.onYes();
     });
-
-    await tapTurnOn();
-    await tapTurnOn();
 
     expect(mockOpenSystemSettings).toHaveBeenCalledTimes(2);
   });
 
-  it('cancels a pending settings-return retry when a new nudge is shown', async () => {
-    mockIsPushPermissionPromptable.mockResolvedValue(false);
+  it('hides on "Not now" without enabling', () => {
     const { result } = renderNudge();
+    emit();
 
     act(() => {
-      result.current.showNudge();
+      result.current.onNotNow();
     });
-    await tapTurnOn();
 
-    expect(removeMocks).toHaveLength(1);
+    expect(result.current.isVisible).toBe(false);
+    expect(mockEnableNotifications).not.toHaveBeenCalled();
+  });
+
+  it('ignores button-driven close but hides on genuine dismissal', () => {
+    const { result } = renderNudge();
+    emit();
+
+    act(() => {
+      result.current.onClose(true);
+    });
+    expect(result.current.isVisible).toBe(true);
 
     act(() => {
-      result.current.showNudge();
+      result.current.onClose(false);
     });
+    expect(result.current.isVisible).toBe(false);
+  });
+
+  it('cancels a pending settings-return retry when a new nudge is emitted', async () => {
+    mockIsPushPermissionPromptable.mockResolvedValue(false);
+    const { result } = renderNudge();
+    emit();
+
+    await act(async () => {
+      await result.current.onYes();
+    });
+
+    expect(removeMocks).toHaveLength(1);
+
+    emit();
 
     expect(removeMocks[0]).toHaveBeenCalled();
+    expect(result.current.isVisible).toBe(true);
   });
 
   it('does not run a superseded settings-return retry after a new nudge', async () => {
     mockIsPushPermissionPromptable.mockResolvedValue(false);
     const { result } = renderNudge();
+    emit();
 
-    act(() => {
-      result.current.showNudge();
+    await act(async () => {
+      await result.current.onYes();
     });
-    await tapTurnOn();
 
-    act(() => {
-      result.current.showNudge();
-    });
+    emit();
 
     mockIsPushPermissionGranted.mockClear();
     mockIsPushPermissionGranted.mockResolvedValue(true);
@@ -274,24 +277,21 @@ describe('useCliLoginPushNudge', () => {
   });
 
   describe('android 13+', () => {
-    let requestMock: jest.SpyInstance;
-
     beforeEach(() => {
       Platform.OS = 'android';
       jest.spyOn(Platform, 'Version', 'get').mockReturnValue(33);
-      requestMock = jest
-        .spyOn(PermissionsAndroid, 'request')
-        .mockResolvedValue(PermissionsAndroid.RESULTS.DENIED);
     });
 
     it('opens settings when the OS permanently denied the permission', async () => {
-      requestMock.mockResolvedValue(PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN);
+      jest
+        .spyOn(PermissionsAndroid, 'request')
+        .mockResolvedValue(PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN);
       const { result } = renderNudge();
+      emit();
 
-      act(() => {
-        result.current.showNudge();
+      await act(async () => {
+        await result.current.onYes();
       });
-      await tapTurnOn();
 
       expect(PermissionsAndroid.request).toHaveBeenCalledWith(
         PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS,
@@ -301,12 +301,15 @@ describe('useCliLoginPushNudge', () => {
     });
 
     it('opens settings when the user denies the OS dialog', async () => {
+      jest
+        .spyOn(PermissionsAndroid, 'request')
+        .mockResolvedValue(PermissionsAndroid.RESULTS.DENIED);
       const { result } = renderNudge();
+      emit();
 
-      act(() => {
-        result.current.showNudge();
+      await act(async () => {
+        await result.current.onYes();
       });
-      await tapTurnOn();
 
       expect(PermissionsAndroid.request).toHaveBeenCalledTimes(1);
       expect(mockEnableNotifications).not.toHaveBeenCalled();
@@ -314,17 +317,18 @@ describe('useCliLoginPushNudge', () => {
     });
 
     it('enables notifications when the OS grants push permission', async () => {
-      requestMock.mockResolvedValue(PermissionsAndroid.RESULTS.GRANTED);
+      jest
+        .spyOn(PermissionsAndroid, 'request')
+        .mockResolvedValue(PermissionsAndroid.RESULTS.GRANTED);
       const { result } = renderNudge();
+      emit();
 
-      act(() => {
-        result.current.showNudge();
+      await act(async () => {
+        await result.current.onYes();
       });
-      await tapTurnOn();
 
       expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
       expect(mockOpenSystemSettings).not.toHaveBeenCalled();
-      expect(closeToast).toHaveBeenCalled();
     });
   });
 
@@ -336,11 +340,11 @@ describe('useCliLoginPushNudge', () => {
 
     it('opens settings without a runtime dialog when push is not granted', async () => {
       const { result } = renderNudge();
+      emit();
 
-      act(() => {
-        result.current.showNudge();
+      await act(async () => {
+        await result.current.onYes();
       });
-      await tapTurnOn();
 
       expect(PermissionsAndroid.request).not.toHaveBeenCalled();
       expect(mockEnableNotifications).not.toHaveBeenCalled();
diff --git a/app/components/UI/CliLoginPushNudge/useCliLoginPushNudge.ts b/app/components/UI/CliLoginPushNudge/useCliLoginPushNudge.ts
index d448eac2a5dd..be2b41bb63f6 100644
--- a/app/components/UI/CliLoginPushNudge/useCliLoginPushNudge.ts
+++ b/app/components/UI/CliLoginPushNudge/useCliLoginPushNudge.ts
@@ -1,13 +1,7 @@
-import { useCallback, useContext, useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 // PermissionsAndroid usage below is gated behind `Platform.OS === 'android'`.
 // eslint-disable-next-line react-native/split-platform-components
-import { AppState, PermissionsAndroid, Platform } from 'react-native';
-import { ToastContext } from '../../../component-library/components/Toast';
-import {
-  ToastVariants,
-  ButtonIconVariant,
-} from '../../../component-library/components/Toast/Toast.types';
-import { IconName } from '../../../component-library/components/Icons/Icon';
+import { Alert, AppState, PermissionsAndroid, Platform } from 'react-native';
 import { strings } from '../../../../locales/i18n';
 import { isNotificationsFeatureEnabled } from '../../../util/notifications/constants';
 import { useEnableNotifications } from '../../../util/notifications/hooks/useNotifications';
@@ -15,98 +9,62 @@ import NotificationService, {
   isPushPermissionGranted,
   isPushPermissionPromptable,
 } from '../../../util/notifications/services/NotificationService';
+import { subscribeCliLoginPushNudge } from '../../../core/AgenticCli/cliLoginPushNudgeSignal';
+import logger from '../../../core/SDKConnectV2/services/logger';
 
 /** Android API level (13) that introduced the POST_NOTIFICATIONS runtime permission. */
 const ANDROID_POST_NOTIFICATIONS_API_LEVEL = 33;
 
-const NUDGE_LABELS = () => [
-  { label: strings('sdk_connect_v2.push_nudge.title'), isBold: true },
-];
-
-const LOADING_LABELS = () => [
-  { label: strings('sdk_connect_v2.push_nudge.loading_title'), isBold: true },
-];
-
-const ERROR_LABELS = () => [
-  { label: strings('sdk_connect_v2.push_nudge.enable_error') },
-];
-
 /**
- * Shared toast-based push-permission nudge shown after a successful Agentic CLI
- * QR login (MMAI-925). On "Turn on", tapping the nudge signals intent to enable
- * notifications.
+ * Drives the post-CLI-login push-permission bottom sheet (MMAI-925). Subscribes
+ * to the module-level nudge signal to become visible after a successful login.
+ * On "Enable notifications": requests OS permission when needed, opens device
+ * notification settings when the OS dialog can no longer be shown, and enables
+ * MetaMask in-app notifications once native push is granted.
  *
  * iOS: when the OS can still show its permission dialog, enableNotifications()
- * requests permission; denying that dialog closes the toast without opening
- * Settings. When the OS can no longer show its dialog (e.g. after a prior
- * denial), it deep-links to device notification settings and retries once the
- * app returns to foreground.
+ * requests permission; denying that dialog does not open Settings. When the OS
+ * can no longer show its dialog (e.g. after a prior denial), it deep-links to
+ * device notification settings and retries once the app returns to foreground.
  *
  * Android: Notifee reports DENIED for both "never asked" and "permanently
- * denied", so we use PermissionsAndroid.request(POST_NOTIFICATIONS). Any deny
- * after "Turn on" opens notification settings because the user already signaled
- * intent to enable.
+ * denied", so we use PermissionsAndroid.request(POST_NOTIFICATIONS). Because the
+ * user already signaled intent by tapping "Enable notifications", any deny opens
+ * notification settings.
  */
 export function useCliLoginPushNudge(): {
-  showNudge: () => boolean;
+  isVisible: boolean;
+  onYes: () => Promise<void>;
+  onNotNow: () => void;
+  onClose: (hasPendingAction?: boolean) => void;
 } {
-  const { toastRef } = useContext(ToastContext);
+  const [isVisible, setIsVisible] = useState(false);
   const { enableNotifications } = useEnableNotifications({
     nudgeEnablePush: true,
+    throwOnError: true,
   });
 
   const inFlightRef = useRef(false);
   // Bumped each time a new nudge is shown so a fresh CLI login supersedes any
-  // in-progress Turn on flow: async continuations compare their captured epoch
+  // in-progress enable flow: async continuations compare their captured epoch
   // and skip their side effects once superseded, preventing overlapping enable
-  // calls, settings opens, and toast updates.
+  // calls and settings opens.
   const flowEpochRef = useRef(0);
   const appStateSubscriptionRef = useRef<ReturnType<
     typeof AppState.addEventListener
   > | null>(null);
 
-  const showLoadingToast = useCallback(() => {
-    toastRef?.current?.showToast({
-      variant: ToastVariants.Icon,
-      iconName: IconName.Loading,
-      hasNoTimeout: true,
-      labelOptions: LOADING_LABELS(),
-      descriptionOptions: {
-        description: strings('sdk_connect_v2.push_nudge.loading_description'),
-      },
-    });
-  }, [toastRef]);
-
-  const showErrorToast = useCallback(() => {
-    toastRef?.current?.showToast({
-      variant: ToastVariants.Icon,
-      iconName: IconName.Danger,
-      hasNoTimeout: false,
-      labelOptions: ERROR_LABELS(),
-    });
-  }, [toastRef]);
-
   const clearForegroundRetry = useCallback(() => {
     appStateSubscriptionRef.current?.remove();
     appStateSubscriptionRef.current = null;
   }, []);
 
-  const runEnableFlow = useCallback(
-    async (isCurrent: () => boolean) => {
-      try {
-        await enableNotifications();
-        if (isCurrent()) {
-          toastRef?.current?.closeToast();
-        }
-      } catch {
-        if (isCurrent()) {
-          toastRef?.current?.closeToast();
-          showErrorToast();
-        }
-      }
-    },
-    [enableNotifications, toastRef, showErrorToast],
-  );
+  const showEnableNotificationsError = useCallback(() => {
+    Alert.alert(
+      strings('notifications.notifications_enabled_error_title'),
+      strings('notifications.notifications_enabled_error_desc'),
+    );
+  }, []);
 
   const scheduleForegroundRetry = useCallback(
     (retry: () => Promise<void>) => {
@@ -118,22 +76,28 @@ export function useCliLoginPushNudge(): {
             return;
           }
           clearForegroundRetry();
-          retry().catch(() => {
-            /* enable flow logs its own failures */
+          retry().catch((error) => {
+            logger.warn(
+              'Failed to enable notifications after returning from settings',
+              error,
+            );
+            showEnableNotificationsError();
           });
         },
       );
     },
-    [clearForegroundRetry],
+    [clearForegroundRetry, showEnableNotificationsError],
   );
 
+  const runEnableNotifications = useCallback(async () => {
+    await enableNotifications();
+  }, [enableNotifications]);
+
   const openSettingsAndScheduleRetry = useCallback(
     (isCurrent: () => boolean) => {
-      toastRef?.current?.closeToast();
       // Release the in-flight guard before opening system settings so that a
-      // throw from openSystemSettings() can't leave "Turn on" permanently
-      // locked. Both iOS and Android reach this helper, so releasing here keeps
-      // them consistent. The scheduled foreground retry owns its own guard.
+      // throw from openSystemSettings() can't leave "Enable notifications"
+      // permanently locked. The scheduled foreground retry owns its own guard.
       inFlightRef.current = false;
       NotificationService.openSystemSettings();
       scheduleForegroundRetry(async () => {
@@ -143,22 +107,18 @@ export function useCliLoginPushNudge(): {
         inFlightRef.current = true;
         try {
           if (!(await isPushPermissionGranted())) {
-            if (isCurrent()) {
-              toastRef?.current?.closeToast();
-            }
             return;
           }
           if (!isCurrent()) {
             return;
           }
-          showLoadingToast();
-          await runEnableFlow(isCurrent);
+          await runEnableNotifications();
         } finally {
           inFlightRef.current = false;
         }
       });
     },
-    [runEnableFlow, scheduleForegroundRetry, showLoadingToast, toastRef],
+    [runEnableNotifications, scheduleForegroundRetry],
   );
 
   const runGrantedFlow = useCallback(
@@ -166,28 +126,20 @@ export function useCliLoginPushNudge(): {
       if (!isCurrent()) {
         return;
       }
-      showLoadingToast();
-      await enableNotifications();
-      if (isCurrent()) {
-        toastRef?.current?.closeToast();
-      }
+      await runEnableNotifications();
     },
-    [enableNotifications, showLoadingToast, toastRef],
+    [runEnableNotifications],
   );
 
   const runAndroidPermissionFlow = useCallback(
     async (isCurrent: () => boolean) => {
       // Android < 13 has no runtime dialog; when notifications are not already
       // granted they can only be enabled from system settings.
-      // openSettingsAndScheduleRetry closes the toast and opens settings, so no
-      // loading toast is needed here.
       if (Number(Platform.Version) < ANDROID_POST_NOTIFICATIONS_API_LEVEL) {
         openSettingsAndScheduleRetry(isCurrent);
         return;
       }
-      // Android 13+ requires the POST_NOTIFICATIONS runtime permission. Don't
-      // show the loading toast before the request — it would sit behind the OS
-      // permission dialog.
+      // Android 13+ requires the POST_NOTIFICATIONS runtime permission.
       const result = await PermissionsAndroid.request(
         PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS,
       );
@@ -195,16 +147,15 @@ export function useCliLoginPushNudge(): {
         return;
       }
       if (result === PermissionsAndroid.RESULTS.GRANTED) {
-        // Show the loading toast only while the enable work runs, after the OS
-        // dialog is dismissed.
-        showLoadingToast();
-        await runEnableFlow(isCurrent);
+        await runEnableNotifications();
         return;
       }
-      // User tapped Turn on — any deny opens settings (no loading toast).
+      // The user tapped "Enable notifications", so any deny (dismissed dialog or
+      // permanent denial) opens notification settings — the intent to enable is
+      // unambiguous.
       openSettingsAndScheduleRetry(isCurrent);
     },
-    [openSettingsAndScheduleRetry, runEnableFlow, showLoadingToast],
+    [openSettingsAndScheduleRetry, runEnableNotifications],
   );
 
   const runIosPermissionFlow = useCallback(
@@ -217,24 +168,15 @@ export function useCliLoginPushNudge(): {
         openSettingsAndScheduleRetry(isCurrent);
         return;
       }
-      // OS can still show its dialog — request permission via enableNotifications().
-      // If the user denies, dismiss the toast without opening Settings (matches
+      // OS can still show its dialog — request permission via
+      // enableNotifications(). If the user denies, do not open Settings (matches
       // PushNotificationOnboarding).
-      showLoadingToast();
-      await enableNotifications();
-      if (isCurrent()) {
-        toastRef?.current?.closeToast();
-      }
+      await runEnableNotifications();
     },
-    [
-      enableNotifications,
-      openSettingsAndScheduleRetry,
-      showLoadingToast,
-      toastRef,
-    ],
+    [openSettingsAndScheduleRetry, runEnableNotifications],
   );
 
-  const onTapTurnOn = useCallback(async () => {
+  const runPermissionFlow = useCallback(async () => {
     if (inFlightRef.current) {
       return;
     }
@@ -251,16 +193,16 @@ export function useCliLoginPushNudge(): {
       if (!isCurrent()) {
         return;
       }
+
       if (Platform.OS === 'android') {
         await runAndroidPermissionFlow(isCurrent);
         return;
       }
+
       await runIosPermissionFlow(isCurrent);
-    } catch {
-      if (isCurrent()) {
-        toastRef?.current?.closeToast();
-        showErrorToast();
-      }
+    } catch (error) {
+      logger.warn('Failed to run CLI login push permission flow', error);
+      showEnableNotificationsError();
     } finally {
       if (!appStateSubscriptionRef.current) {
         inFlightRef.current = false;
@@ -270,42 +212,41 @@ export function useCliLoginPushNudge(): {
     runGrantedFlow,
     runAndroidPermissionFlow,
     runIosPermissionFlow,
-    showErrorToast,
-    toastRef,
+    showEnableNotificationsError,
   ]);
 
-  const showNudge = useCallback((): boolean => {
-    if (!isNotificationsFeatureEnabled()) {
-      return false;
+  const onYes = useCallback(() => {
+    setIsVisible(false);
+    return runPermissionFlow();
+  }, [runPermissionFlow]);
+
+  const onNotNow = useCallback(() => {
+    setIsVisible(false);
+  }, []);
+
+  // BottomSheet passes hasPendingAction=true when a button (Yes/Not now) drove
+  // the close; those are handled by onYes/onNotNow, so only react to genuine
+  // dismissals (backdrop, close icon, hardware back).
+  const onClose = useCallback((hasPendingAction?: boolean) => {
+    if (hasPendingAction) {
+      return;
     }
-    // A new nudge supersedes any in-progress Turn on flow: cancel a pending
-    // foreground retry, invalidate in-flight async continuations via the epoch,
-    // and release the guard so this toast's Turn on is not blocked.
-    clearForegroundRetry();
-    flowEpochRef.current += 1;
-    inFlightRef.current = false;
-    toastRef?.current?.showToast({
-      variant: ToastVariants.Icon,
-      iconName: IconName.Notification,
-      hasNoTimeout: true,
-      labelOptions: NUDGE_LABELS(),
-      descriptionOptions: {
-        description: strings('sdk_connect_v2.push_nudge.description'),
-      },
-      linkButtonOptions: {
-        label: strings('sdk_connect_v2.push_nudge.turn_on_button'),
-        onPress: onTapTurnOn,
-      },
-      closeButtonOptions: {
-        variant: ButtonIconVariant.Icon,
-        iconName: IconName.Close,
-        onPress: () => {
-          toastRef?.current?.closeToast();
-        },
-      },
-    });
-    return true;
-  }, [onTapTurnOn, toastRef, clearForegroundRetry]);
+    setIsVisible(false);
+  }, []);
+
+  useEffect(
+    () =>
+      subscribeCliLoginPushNudge(() => {
+        if (!isNotificationsFeatureEnabled()) {
+          return;
+        }
+        clearForegroundRetry();
+        flowEpochRef.current += 1;
+        inFlightRef.current = false;
+        setIsVisible(true);
+      }),
+    [clearForegroundRetry],
+  );
 
   useEffect(
     () => () => {
@@ -314,5 +255,5 @@ export function useCliLoginPushNudge(): {
     [clearForegroundRetry],
   );
 
-  return { showNudge };
+  return { isVisible, onYes, onNotNow, onClose };
 }
diff --git a/app/components/UI/CustomNetworkSelector/CustomNetworkSelector.tsx b/app/components/UI/CustomNetworkSelector/CustomNetworkSelector.tsx
index 7add6fdeda6d..31ad439170e3 100644
--- a/app/components/UI/CustomNetworkSelector/CustomNetworkSelector.tsx
+++ b/app/components/UI/CustomNetworkSelector/CustomNetworkSelector.tsx
@@ -10,7 +10,6 @@ import { parseCaipChainId } from '@metamask/utils';
 import { toHex } from '@metamask/controller-utils';
 import { useSelector } from 'react-redux';
 import { formatChainIdToCaip } from '@metamask/bridge-controller';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
 
 // external dependencies
 import { strings } from '../../../../locales/i18n';
@@ -43,7 +42,6 @@ import { useNetworksToUse } from '../../hooks/useNetworksToUse/useNetworksToUse'
 import AccountGroupBalancePerChain from '../Assets/components/Balance/AccountGroupBalancePerChain';
 // internal dependencies
 import createStyles from './CustomNetworkSelector.styles';
-import { useElevatedSurface } from '../../../util/theme/themeUtils';
 
 import {
   CustomNetworkItem,
@@ -65,8 +63,6 @@ const CustomNetworkSelector = ({
 }: CustomNetworkSelectorProps) => {
   const { colors } = useTheme();
   const { styles } = useStyles(createStyles, {});
-  const tw = useTailwind();
-  const surfaceClass = useElevatedSurface();
   const { navigate } = useNavigation<AppNavigationProp>();
   const safeAreaInsets = useSafeAreaInsets();
 
@@ -169,7 +165,6 @@ const CustomNetworkSelector = ({
               caipChainId,
               isSelected,
             )}
-            style={tw.style(surfaceClass)}
           >
             {(!isTestNet(chainId) || showFiatOnTestnets) && (
               <AccountGroupBalancePerChain caipChainId={caipChainId} />
@@ -186,8 +181,6 @@ const CustomNetworkSelector = ({
       createAvatarProps,
       selectedChainIdCaip,
       showFiatOnTestnets,
-      surfaceClass,
-      tw,
     ],
   );
 
diff --git a/app/components/UI/DeFiPositions/DeFiPositionsList.test.tsx b/app/components/UI/DeFiPositions/DeFiPositionsList.test.tsx
index 881132526414..83485d8699f8 100644
--- a/app/components/UI/DeFiPositions/DeFiPositionsList.test.tsx
+++ b/app/components/UI/DeFiPositions/DeFiPositionsList.test.tsx
@@ -22,6 +22,20 @@ jest.mock('../../../selectors/defiPositionsController', () => ({
   selectDefiPositionsByEnabledNetworks: jest.fn(),
 }));
 
+jest.mock('../../../selectors/deFiPositionsV2SectionEnabled', () => ({
+  selectDeFiPositionsV2SectionEnabled: jest.fn(() => false),
+}));
+
+jest.mock('../Assets/DeFiPositions/hooks/useDeFiPositionsV2', () => ({
+  useDeFiPositionsV2: jest.fn(() => ({
+    positions: [],
+    isLoading: false,
+    isError: false,
+    hasFetched: false,
+    refresh: jest.fn().mockResolvedValue(undefined),
+  })),
+}));
+
 const mockNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => ({
   ...jest.requireActual('@react-navigation/native'),
@@ -31,6 +45,7 @@ jest.mock('@react-navigation/native', () => ({
 }));
 
 const mockDeFiExecutePoll = jest.fn().mockResolvedValue(undefined);
+const mockFetchDeFiPositions = jest.fn().mockResolvedValue(undefined);
 
 jest.mock('../../../core/Engine', () => ({
   context: {
@@ -46,6 +61,10 @@ jest.mock('../../../core/Engine', () => ({
     DeFiPositionsController: {
       _executePoll: (...args: unknown[]) => mockDeFiExecutePoll(...args),
     },
+    DeFiPositionsControllerV2: {
+      fetchDeFiPositions: (...args: unknown[]) =>
+        mockFetchDeFiPositions(...args),
+    },
   },
 }));
 
diff --git a/app/components/UI/DeFiPositions/DeFiPositionsList.tsx b/app/components/UI/DeFiPositions/DeFiPositionsList.tsx
index e992d6aa04fd..bd3b9a7c2c13 100644
--- a/app/components/UI/DeFiPositions/DeFiPositionsList.tsx
+++ b/app/components/UI/DeFiPositions/DeFiPositionsList.tsx
@@ -13,6 +13,7 @@ import {
   selectDeFiPositionsByAddress,
   selectDefiPositionsByEnabledNetworks,
 } from '../../../selectors/defiPositionsController';
+import { selectDeFiPositionsV2SectionEnabled } from '../../../selectors/deFiPositionsV2SectionEnabled';
 import styleSheet from './DeFiPositionsList.styles';
 import { GroupedDeFiPositions } from '@metamask/assets-controllers';
 import {
@@ -41,13 +42,14 @@ import { MetaMetricsEvents } from '../../../core/Analytics';
 import Engine from '../../../core/Engine';
 import { useTheme } from '../../../util/theme';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import DeFiPositionsListV2 from '../Assets/DeFiPositions/components/DeFiPositionsListV2';
 
 export interface DeFiPositionsListProps {
   tabLabel: string;
   isFullView?: boolean;
 }
 
-const DeFiPositionsList: React.FC<DeFiPositionsListProps> = ({
+const DeFiPositionsListV1: React.FC<DeFiPositionsListProps> = ({
   isFullView = false,
 }) => {
   const { styles } = useStyles(styleSheet, undefined);
@@ -229,4 +231,20 @@ const DeFiPositionsList: React.FC<DeFiPositionsListProps> = ({
   );
 };
 
+/**
+ * DeFiPositionsList - homepage / full-view list of DeFi positions.
+ *
+ * Feature-flag switch: renders the V2 implementation when the V2 flag is on,
+ * otherwise the (unchanged) V1 implementation.
+ */
+const DeFiPositionsList: React.FC<DeFiPositionsListProps> = (props) => {
+  const isV2Enabled = useSelector(selectDeFiPositionsV2SectionEnabled);
+
+  return isV2Enabled ? (
+    <DeFiPositionsListV2 isFullView={props.isFullView ?? false} />
+  ) : (
+    <DeFiPositionsListV1 {...props} />
+  );
+};
+
 export default DeFiPositionsList;
diff --git a/app/components/UI/DeFiPositions/DeFiProtocolPositionDetails.test.tsx b/app/components/UI/DeFiPositions/DeFiProtocolPositionDetails.test.tsx
index 261cbd00ad99..43103ad3378a 100644
--- a/app/components/UI/DeFiPositions/DeFiProtocolPositionDetails.test.tsx
+++ b/app/components/UI/DeFiPositions/DeFiProtocolPositionDetails.test.tsx
@@ -4,6 +4,7 @@ import renderWithProvider from '../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import DeFiProtocolPositionDetails, {
   DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID,
+  type DeFiProtocolPositionDetailsParams,
 } from './DeFiProtocolPositionDetails';
 import { CommonSelectorsIDs } from '../../../util/Common.testIds';
 // eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): route-isolation backlog
@@ -21,43 +22,73 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('../../../util/navigation/navUtils', () => ({
-  ...jest.requireActual('../../../util/navigation/navUtils'),
-  useParams: jest.fn(() => ({
-    networkIconAvatar: 10,
-    protocolAggregate: {
-      protocolDetails: {
-        name: 'Protocol 1',
-        iconUrl: 'https://example.com/protocol1.png',
-      },
+const mockProtocolAggregate = {
+  protocolDetails: {
+    name: 'Protocol 1',
+    iconUrl: 'https://example.com/protocol1.png',
+  },
+  aggregatedMarketValue: 100,
+  positionTypes: {
+    supply: {
       aggregatedMarketValue: 100,
-      positionTypes: {
-        supply: {
-          aggregatedMarketValue: 100,
-          positions: [
-            [
+      positions: [
+        [
+          {
+            protocolTokenAddress: '0x1234567890abcdef',
+            marketValue: 100,
+            tokens: [
               {
-                protocolTokenAddress: '0x1234567890abcdef',
+                name: 'Token 1',
+                symbol: 'TKN1',
+                iconUrl: 'https://example.com/tkn1.png',
+                balance: 500,
                 marketValue: 100,
-                tokens: [
-                  {
-                    name: 'Token 1',
-                    symbol: 'TKN1',
-                    iconUrl: 'https://example.com/tkn1.png',
-                    balance: 500,
-                    marketValue: 100,
-                    type: 'underlying',
-                  },
-                ],
+                type: 'underlying',
               },
             ],
-          ],
-        },
-      },
+          },
+        ],
+      ],
     },
-  })),
+  },
+};
+
+const mockProtocolPositionGroup = {
+  protocolId: 'Aave V3',
+  productName: 'Aave V3',
+  protocolIconUrl: 'https://example.com/aave.png',
+  chainId: 'eip155:1',
+  marketValue: 4100.5,
+  iconGroup: [],
+  sections: [],
+};
+
+const mockUseParams = jest.fn(
+  (): DeFiProtocolPositionDetailsParams =>
+    ({
+      networkIconAvatar: 10,
+      protocolAggregate: mockProtocolAggregate,
+    }) as unknown as DeFiProtocolPositionDetailsParams,
+);
+
+jest.mock('../../../util/navigation/navUtils', () => ({
+  ...jest.requireActual('../../../util/navigation/navUtils'),
+  useParams: () => mockUseParams(),
 }));
 
+jest.mock(
+  '../Assets/DeFiPositions/components/DeFiProtocolPositionDetailsV2',
+  () => {
+    const { View } = jest.requireActual('react-native');
+    return {
+      __esModule: true,
+      DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID:
+        'defi_protocol_position_details_balance',
+      default: () => <View testID="defi-protocol-position-details-v2" />,
+    };
+  },
+);
+
 const mockInitialState = {
   engine: {
     backgroundState: {
@@ -73,6 +104,10 @@ const mockInitialState = {
 describe('DeFiProtocolPositionDetails', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUseParams.mockReturnValue({
+      networkIconAvatar: 10,
+      protocolAggregate: mockProtocolAggregate,
+    } as unknown as DeFiProtocolPositionDetailsParams);
   });
 
   it('renders the protocol name header and aggregated balance', async () => {
@@ -140,4 +175,49 @@ describe('DeFiProtocolPositionDetails', () => {
         .edges,
     ).toEqual(['left', 'right', 'bottom']);
   });
+
+  it('renders V2 when protocolPositionGroup is present', () => {
+    mockUseParams.mockReturnValue({
+      networkIconAvatar: 10,
+      protocolPositionGroup: mockProtocolPositionGroup,
+    } as unknown as DeFiProtocolPositionDetailsParams);
+
+    const { getByTestId, queryByText } = renderWithProvider(
+      <DeFiProtocolPositionDetails />,
+      { state: mockInitialState },
+    );
+
+    expect(getByTestId('defi-protocol-position-details-v2')).toBeOnTheScreen();
+    expect(queryByText('Protocol 1')).not.toBeOnTheScreen();
+  });
+
+  it('prefers V2 when both protocol params are present', () => {
+    mockUseParams.mockReturnValue({
+      networkIconAvatar: 10,
+      protocolAggregate: mockProtocolAggregate,
+      protocolPositionGroup: mockProtocolPositionGroup,
+    } as unknown as DeFiProtocolPositionDetailsParams);
+
+    const { getByTestId, queryByText } = renderWithProvider(
+      <DeFiProtocolPositionDetails />,
+      { state: mockInitialState },
+    );
+
+    expect(getByTestId('defi-protocol-position-details-v2')).toBeOnTheScreen();
+    expect(queryByText('Protocol 1')).not.toBeOnTheScreen();
+  });
+
+  it('renders nothing when neither protocol param is present', () => {
+    mockUseParams.mockReturnValue({
+      networkIconAvatar: 10,
+    });
+
+    const { queryByTestId, queryByText } = renderWithProvider(
+      <DeFiProtocolPositionDetails />,
+      { state: mockInitialState },
+    );
+
+    expect(queryByTestId('defi-protocol-position-details-v2')).toBeNull();
+    expect(queryByText('Protocol 1')).toBeNull();
+  });
 });
diff --git a/app/components/UI/DeFiPositions/DeFiProtocolPositionDetails.tsx b/app/components/UI/DeFiPositions/DeFiProtocolPositionDetails.tsx
index 005b9f9bc4b4..53b33582e092 100644
--- a/app/components/UI/DeFiPositions/DeFiProtocolPositionDetails.tsx
+++ b/app/components/UI/DeFiPositions/DeFiProtocolPositionDetails.tsx
@@ -1,5 +1,8 @@
 import React, { useCallback } from 'react';
-import { GroupedDeFiPositions } from '@metamask/assets-controllers';
+import type {
+  DeFiProtocolPositionGroup,
+  GroupedDeFiPositions,
+} from '@metamask/assets-controllers';
 import { ImageSourcePropType, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useNavigation } from '@react-navigation/native';
@@ -24,16 +27,19 @@ import SensitiveText, {
 import DeFiProtocolPositionGroups from './DeFiProtocolPositionGroups';
 import { useStyles } from '../../hooks/useStyles';
 import { WalletViewSelectorsIDs } from '../../Views/Wallet/WalletView.testIds';
+import DeFiProtocolPositionDetailsV2, {
+  DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID,
+} from '../Assets/DeFiPositions/components/DeFiProtocolPositionDetailsV2';
 
-export const DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID =
-  'defi_protocol_position_details_balance';
+export { DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID };
 
 export interface DeFiProtocolPositionDetailsParams {
-  protocolAggregate: GroupedDeFiPositions['protocols'][number];
+  protocolAggregate?: GroupedDeFiPositions['protocols'][number];
+  protocolPositionGroup?: DeFiProtocolPositionGroup;
   networkIconAvatar: ImageSourcePropType | undefined;
 }
 
-const DeFiProtocolPositionDetails: React.FC = () => {
+const DeFiProtocolPositionDetailsV1: React.FC = () => {
   const { styles } = useStyles(styleSheet, undefined);
   const navigation = useNavigation<AppStackNavigationProp>();
 
@@ -45,6 +51,12 @@ const DeFiProtocolPositionDetails: React.FC = () => {
     navigation.pop();
   }, [navigation]);
 
+  // V1 is always opened with a protocolAggregate; guard for the shared
+  // (widened) params type.
+  if (!protocolAggregate) {
+    return null;
+  }
+
   return (
     <SafeAreaView
       edges={['left', 'right', 'bottom']}
@@ -100,4 +112,26 @@ const DeFiProtocolPositionDetails: React.FC = () => {
   );
 };
 
+/**
+ * DeFiProtocolPositionDetails - protocol details screen.
+ *
+ * Branches on which nav param is present (not the feature flag), so a mid-
+ * session flag flip — or landing with the other shape — still renders the
+ * matching implementation. Prefers V2 when `protocolPositionGroup` is set.
+ */
+const DeFiProtocolPositionDetails: React.FC = () => {
+  const { protocolPositionGroup, protocolAggregate } =
+    useParams<DeFiProtocolPositionDetailsParams>();
+
+  if (protocolPositionGroup) {
+    return <DeFiProtocolPositionDetailsV2 />;
+  }
+
+  if (protocolAggregate) {
+    return <DeFiProtocolPositionDetailsV1 />;
+  }
+
+  return null;
+};
+
 export default DeFiProtocolPositionDetails;
diff --git a/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.styles.ts b/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.styles.ts
index 443f72c1f79c..ae162cbf5eb6 100644
--- a/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.styles.ts
+++ b/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.styles.ts
@@ -12,11 +12,19 @@ const styleSheet = () =>
       alignItems: 'center',
       paddingVertical: 12,
     },
-    assetSymbolText: {
+    assetInfo: {
+      flex: 1,
+      flexDirection: 'row',
+      alignItems: 'center',
       marginLeft: 20,
+      marginRight: 8,
+      gap: 8,
+      minWidth: 0,
+    },
+    assetSymbolText: {
+      flexShrink: 1,
     },
     balance: {
-      flex: 1,
       alignItems: 'flex-end',
     },
   });
diff --git a/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.test.tsx b/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.test.tsx
index 8c21519a8576..5111ead88e25 100644
--- a/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.test.tsx
+++ b/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.test.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
 import renderWithProvider from '../../../util/test/renderWithProvider';
-import DeFiProtocolPositionGroupTokens from './DeFiProtocolPositionGroupTokens';
+import DeFiProtocolPositionGroupTokens, {
+  DEFI_DETAILS_POSITION_TYPE_TAG_TEST_ID,
+} from './DeFiProtocolPositionGroupTokens';
 import { backgroundState } from '../../../util/test/initial-root-state';
 
 const mockInitialState = {
@@ -87,4 +89,33 @@ describe('DeFiProtocolPositionGroupTokens', () => {
     expect(await findAllByText('•••••••••')).toHaveLength(2);
     expect(await findAllByText('••••••')).toHaveLength(2);
   });
+
+  it('renders a position type tag next to the token when provided', async () => {
+    const { findByText, getAllByTestId, queryByText } = renderWithProvider(
+      <DeFiProtocolPositionGroupTokens
+        tokens={[
+          {
+            ...mockTokens[0],
+            positionType: 'deposit',
+          },
+          {
+            ...mockTokens[1],
+            positionType: 'staked',
+          },
+        ]}
+        networkIconAvatar={10}
+        privacyMode={false}
+      />,
+      {
+        state: mockInitialState,
+      },
+    );
+
+    expect(queryByText('Supplied')).not.toBeOnTheScreen();
+    expect(await findByText('deposit')).toBeOnTheScreen();
+    expect(await findByText('staked')).toBeOnTheScreen();
+    expect(getAllByTestId(DEFI_DETAILS_POSITION_TYPE_TAG_TEST_ID)).toHaveLength(
+      2,
+    );
+  });
 });
diff --git a/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.tsx b/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.tsx
index 17e449a78b63..14ccd66e5030 100644
--- a/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.tsx
+++ b/app/components/UI/DeFiPositions/DeFiProtocolPositionGroupTokens.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { ImageSourcePropType, View } from 'react-native';
+import { Tag, TagSeverity } from '@metamask/design-system-react-native';
 import Text, {
   TextColor,
   TextVariant,
@@ -15,8 +16,12 @@ import { PositionType } from './position-types';
 import { useStyles } from '../../hooks/useStyles';
 import { getTokenAvatarUrl } from './get-token-avatar-url';
 
+export const DEFI_DETAILS_POSITION_TYPE_TAG_TEST_ID =
+  'defi-details-position-type-tag';
+
 interface DeFiProtocolPositionGroupTokensProps {
-  positionType: PositionType;
+  /** Group-level position-type label (V1). Omit to hide the section header. */
+  positionType?: PositionType;
   tokens: {
     key: string;
     address: string;
@@ -25,6 +30,8 @@ interface DeFiProtocolPositionGroupTokensProps {
     iconUrl: string;
     balance: number;
     marketValue: number | undefined;
+    /** Per-token position type tag (V2). Shown next to the symbol when present. */
+    positionType?: string;
   }[];
   networkIconAvatar: ImageSourcePropType | undefined;
   privacyMode: boolean;
@@ -46,9 +53,11 @@ const DeFiProtocolPositionGroupTokens: React.FC<
 
   return (
     <View>
-      <Text variant={TextVariant.BodyMDMedium} color={TextColor.Alternative}>
-        {strings(`defi_positions.${positionType}`)}
-      </Text>
+      {positionType ? (
+        <Text variant={TextVariant.BodyMDMedium} color={TextColor.Alternative}>
+          {strings(`defi_positions.${positionType}`)}
+        </Text>
+      ) : null}
       {tokens.map((token) => (
         <View key={token.key} style={styles.underlyingBalancesWrapper}>
           <View>
@@ -59,12 +68,23 @@ const DeFiProtocolPositionGroupTokens: React.FC<
             />
           </View>
 
-          <Text
-            style={styles.assetSymbolText}
-            variant={TextVariant.BodyMDMedium}
-          >
-            {token.symbol}
-          </Text>
+          <View style={styles.assetInfo}>
+            <Text
+              style={styles.assetSymbolText}
+              variant={TextVariant.BodyMDMedium}
+              numberOfLines={1}
+            >
+              {token.symbol}
+            </Text>
+            {token.positionType ? (
+              <Tag
+                severity={TagSeverity.Neutral}
+                testID={DEFI_DETAILS_POSITION_TYPE_TAG_TEST_ID}
+              >
+                {token.positionType}
+              </Tag>
+            ) : null}
+          </View>
 
           <View style={styles.balance}>
             <SensitiveText
diff --git a/app/components/UI/Earn/Views/EarnInputView/EarnInputView.test.tsx b/app/components/UI/Earn/Views/EarnInputView/EarnInputView.test.tsx
index b7682fa420ca..4b8751179f4b 100644
--- a/app/components/UI/Earn/Views/EarnInputView/EarnInputView.test.tsx
+++ b/app/components/UI/Earn/Views/EarnInputView/EarnInputView.test.tsx
@@ -147,19 +147,6 @@ jest.mock('../../../../../selectors/currencyRateController.ts', () => ({
 }));
 
 jest.mock('../../../../../selectors/multichain', () => ({
-  selectAccountTokensAcrossChains: jest.fn(() => ({
-    '0x1': [
-      {
-        address: '0x0',
-        symbol: 'ETH',
-        decimals: 18,
-        balance: '1.5',
-        balanceFiat: '$3000',
-        isNative: true,
-        isETH: true,
-      },
-    ],
-  })),
   selectMultichainAssetsRates: jest.fn(() => ({})),
 }));
 
diff --git a/app/components/UI/Earn/Views/EarnLendingDepositConfirmationView/components/Erc20TokenHero/index.tsx b/app/components/UI/Earn/Views/EarnLendingDepositConfirmationView/components/Erc20TokenHero/index.tsx
index 235f6343633f..151aa195072c 100644
--- a/app/components/UI/Earn/Views/EarnLendingDepositConfirmationView/components/Erc20TokenHero/index.tsx
+++ b/app/components/UI/Earn/Views/EarnLendingDepositConfirmationView/components/Erc20TokenHero/index.tsx
@@ -10,8 +10,8 @@ import Badge, {
   BadgeVariant,
 } from '../../../../../../../component-library/components/Badges/Badge';
 import NetworkAssetLogo from '../../../../../NetworkAssetLogo';
-import AvatarToken from '../../../../../../../component-library/components/Avatars/Avatar/variants/AvatarToken';
-import { AvatarSize } from '../../../../../../../component-library/components/Avatars/Avatar';
+import { AvatarTokenSize } from '@metamask/design-system-react-native';
+import AssetLogo from '../../../../../Assets/components/AssetLogo/AssetLogo';
 import { renderFromTokenMinimalUnit } from '../../../../../../../util/number';
 import Text, {
   TextVariant,
@@ -38,14 +38,7 @@ const TokenAvatar = ({ token }: { token: TokenI }) => {
     );
   }
 
-  return (
-    <AvatarToken
-      name={token.symbol}
-      imageSource={{ uri: token.image }}
-      size={AvatarSize.Xl}
-      testID={testId}
-    />
-  );
+  return <AssetLogo asset={token} size={AvatarTokenSize.Xl} testID={testId} />;
 };
 
 const NetworkAndTokenImage = ({ token }: { token: TokenI }) => {
diff --git a/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.tsx b/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.tsx
index 3547b3fae035..ac477b29a610 100644
--- a/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.tsx
+++ b/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.tsx
@@ -46,6 +46,7 @@ import {
 import { useMusdConversionFlowData } from '../../hooks/useMusdConversionFlowData';
 import Routes from '../../../../../constants/navigation/Routes';
 import { useRampNavigation } from '../../../Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../../Ramp/constants/rampsBuyCufTags';
 import { RampIntent } from '../../../Ramp/types';
 import { EARN_TEST_IDS } from '../../constants/testIds';
 import { MusdNavigationTarget } from '../../types/musd.types';
@@ -325,7 +326,7 @@ const EarnMusdConversionEducationView = () => {
           const rampIntent: RampIntent = {
             assetId: MUSD_TOKEN_ASSET_ID_BY_CHAIN[chainId],
           };
-          goToBuy(rampIntent);
+          goToBuy(rampIntent, { surface: RAMPS_BUY_CUF_SURFACE.DEEP_LINK });
           return;
         }
 
diff --git a/app/components/UI/Earn/Views/EarnWithdrawInputView/EarnWithdrawInputView.test.tsx b/app/components/UI/Earn/Views/EarnWithdrawInputView/EarnWithdrawInputView.test.tsx
index 2eda090225c1..5435f67cf88e 100644
--- a/app/components/UI/Earn/Views/EarnWithdrawInputView/EarnWithdrawInputView.test.tsx
+++ b/app/components/UI/Earn/Views/EarnWithdrawInputView/EarnWithdrawInputView.test.tsx
@@ -35,19 +35,6 @@ import { trace, TraceName } from '../../../../../util/trace';
 import { MAINNET_DISPLAY_NAME } from '../../../../../core/Engine/constants';
 
 jest.mock('../../../../../selectors/multichain', () => ({
-  selectAccountTokensAcrossChains: jest.fn(() => ({
-    '0x1': [
-      {
-        address: '0x0',
-        symbol: 'ETH',
-        decimals: 18,
-        balance: '1.5',
-        balanceFiat: '$3000',
-        isNative: true,
-        isETH: true,
-      },
-    ],
-  })),
   selectMultichainAssetsRates: jest.fn(() => ({})),
 }));
 
diff --git a/app/components/UI/Earn/components/EarnNetworkAvatar/index.test.tsx b/app/components/UI/Earn/components/EarnNetworkAvatar/index.test.tsx
index be8a0c39cc88..7a0625abf22b 100644
--- a/app/components/UI/Earn/components/EarnNetworkAvatar/index.test.tsx
+++ b/app/components/UI/Earn/components/EarnNetworkAvatar/index.test.tsx
@@ -1,5 +1,11 @@
 import React from 'react';
 import { render } from '@testing-library/react-native';
+import {
+  AvatarToken,
+  AvatarTokenSize,
+} from '@metamask/design-system-react-native';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import { getFallbackAssetImageUrls } from '../../../Assets/components/AssetLogo/AssetLogo.utils';
 import { EarnNetworkAvatar } from './index';
 import { TokenI } from '../../../Tokens/types';
 
@@ -17,10 +23,6 @@ jest.mock('../../../../hooks/useStyles', () => ({
 }));
 
 jest.mock('../../../NetworkAssetLogo', () => 'NetworkAssetLogo');
-jest.mock(
-  '../../../../../component-library/components/Avatars/Avatar/variants/AvatarToken',
-  () => 'AvatarToken',
-);
 
 describe('EarnNetworkAvatar', () => {
   const mockNativeToken: TokenI = {
@@ -39,7 +41,7 @@ describe('EarnNetworkAvatar', () => {
   };
 
   const mockNonNativeToken: TokenI = {
-    address: '0x123',
+    address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
     aggregators: [],
     decimals: 6,
     image: 'https://example.com/usdc.png',
@@ -49,6 +51,7 @@ describe('EarnNetworkAvatar', () => {
     logo: undefined,
     isETH: false,
     isNative: false,
+    chainId: '0x1',
   };
 
   it('renders NetworkAssetLogo for native tokens', () => {
@@ -71,22 +74,31 @@ describe('EarnNetworkAvatar', () => {
     });
   });
 
-  it('renders AvatarToken for non-native tokens', () => {
-    const { getByTestId } = render(
+  it('renders the token image for non-native tokens', () => {
+    const { UNSAFE_getByType } = renderWithProvider(
       <EarnNetworkAvatar token={mockNonNativeToken} />,
     );
 
-    const avatarToken = getByTestId('earn-token-avatar-USDC');
-    expect(avatarToken.props).toEqual({
-      name: 'USDC',
-      imageSource: { uri: 'https://example.com/usdc.png' },
-      size: '32',
-      style: {
-        height: 32,
-        width: 32,
-        flexShrink: 0,
-      },
-      testID: 'earn-token-avatar-USDC',
+    expect(UNSAFE_getByType(AvatarToken).props).toEqual(
+      expect.objectContaining({
+        name: 'USDC',
+        src: { uri: 'https://example.com/usdc.png' },
+        size: AvatarTokenSize.Md,
+        testID: 'earn-token-avatar-USDC',
+      }),
+    );
+  });
+
+  it('falls back to the CDN icon when the token carries no image', () => {
+    const { UNSAFE_getByType } = renderWithProvider(
+      <EarnNetworkAvatar token={{ ...mockNonNativeToken, image: '' }} />,
+    );
+
+    expect(UNSAFE_getByType(AvatarToken).props.src).toEqual({
+      uri: getFallbackAssetImageUrls(
+        mockNonNativeToken.chainId,
+        mockNonNativeToken.address,
+      )?.[0],
     });
   });
 
diff --git a/app/components/UI/Earn/components/EarnNetworkAvatar/index.tsx b/app/components/UI/Earn/components/EarnNetworkAvatar/index.tsx
index bf58a51e0de2..48ceaaf999a0 100644
--- a/app/components/UI/Earn/components/EarnNetworkAvatar/index.tsx
+++ b/app/components/UI/Earn/components/EarnNetworkAvatar/index.tsx
@@ -3,8 +3,8 @@ import { TokenI } from '../../../Tokens/types';
 import styleSheet from './EarnNetworkAvatar.styles';
 import { useStyles } from '../../../../hooks/useStyles';
 import NetworkAssetLogo from '../../../NetworkAssetLogo';
-import AvatarToken from '../../../../../component-library/components/Avatars/Avatar/variants/AvatarToken';
-import { AvatarSize } from '../../../../../component-library/components/Avatars/Avatar';
+import { AvatarTokenSize } from '@metamask/design-system-react-native';
+import AssetLogo from '../../../Assets/components/AssetLogo/AssetLogo';
 
 interface EarnNetworkAvatarProps {
   token: TokenI;
@@ -27,11 +27,9 @@ export const EarnNetworkAvatar = ({ token }: EarnNetworkAvatarProps) => {
   }
 
   return (
-    <AvatarToken
-      name={token.symbol}
-      imageSource={{ uri: token.image }}
-      size={AvatarSize.Md}
-      style={styles.networkAvatar}
+    <AssetLogo
+      asset={token}
+      size={AvatarTokenSize.Md}
       testID={`earn-token-avatar-${token.symbol}`}
     />
   );
diff --git a/app/components/UI/Earn/components/EarnTokenSelector/index.tsx b/app/components/UI/Earn/components/EarnTokenSelector/index.tsx
index d554b68b5d1c..56fb036e0099 100644
--- a/app/components/UI/Earn/components/EarnTokenSelector/index.tsx
+++ b/app/components/UI/Earn/components/EarnTokenSelector/index.tsx
@@ -7,11 +7,11 @@ import Text, {
   TextColor,
   TextVariant,
 } from '../../../../../component-library/components/Texts/Text';
-import AvatarToken from '../../../../../component-library/components/Avatars/Avatar/variants/AvatarToken';
+import { AvatarTokenSize } from '@metamask/design-system-react-native';
+import AssetLogo from '../../../Assets/components/AssetLogo/AssetLogo';
 import SelectButton, {
   SelectButtonSize,
 } from '../../../../../component-library/components/Select/SelectButton';
-import { AvatarSize } from '../../../../../component-library/components/Avatars/Avatar';
 import { useNavigation } from '@react-navigation/native';
 import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
 import Routes from '../../../../../constants/navigation/Routes';
@@ -98,11 +98,7 @@ const EarnTokenSelector = ({
     }
 
     return (
-      <AvatarToken
-        name={(tokenToRender as TokenI).symbol ?? ''}
-        imageSource={{ uri: (tokenToRender as TokenI).image }}
-        size={AvatarSize.Md}
-      />
+      <AssetLogo asset={tokenToRender as TokenI} size={AvatarTokenSize.Md} />
     );
   };
 
diff --git a/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/MusdConversionAssetListCta.test.tsx b/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/MusdConversionAssetListCta.test.tsx
index e33123dbdab8..c18963065256 100644
--- a/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/MusdConversionAssetListCta.test.tsx
+++ b/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/MusdConversionAssetListCta.test.tsx
@@ -313,9 +313,13 @@ describe('MusdConversionAssetListCta', () => {
 
       fireEvent.press(getByText('Buy mUSD'));
 
-      expect(mockGoToBuy).toHaveBeenCalledWith({
-        assetId: MUSD_TOKEN_ASSET_ID_BY_CHAIN[MUSD_CONVERSION_DEFAULT_CHAIN_ID],
-      });
+      expect(mockGoToBuy).toHaveBeenCalledWith(
+        {
+          assetId:
+            MUSD_TOKEN_ASSET_ID_BY_CHAIN[MUSD_CONVERSION_DEFAULT_CHAIN_ID],
+        },
+        { surface: 'earn' },
+      );
     });
 
     it('calls goToBuy when earn percentage text is pressed', () => {
@@ -330,9 +334,13 @@ describe('MusdConversionAssetListCta', () => {
       const bonusTextElement = getByText(bonusText);
       fireEvent.press(bonusTextElement.parent as never);
 
-      expect(mockGoToBuy).toHaveBeenCalledWith({
-        assetId: MUSD_TOKEN_ASSET_ID_BY_CHAIN[MUSD_CONVERSION_DEFAULT_CHAIN_ID],
-      });
+      expect(mockGoToBuy).toHaveBeenCalledWith(
+        {
+          assetId:
+            MUSD_TOKEN_ASSET_ID_BY_CHAIN[MUSD_CONVERSION_DEFAULT_CHAIN_ID],
+        },
+        { surface: 'earn' },
+      );
     });
 
     it('does not call initiateCustomConversion when wallet is empty', () => {
diff --git a/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/index.tsx b/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/index.tsx
index bee2b2ad9d22..16611ed7ec20 100644
--- a/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/index.tsx
+++ b/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/index.tsx
@@ -16,6 +16,7 @@ import {
   MUSD_TOKEN_ASSET_ID_BY_CHAIN,
 } from '../../../constants/musd';
 import { useRampNavigation } from '../../../../Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../../../Ramp/constants/rampsBuyCufTags';
 import { RampIntent } from '../../../../Ramp/types';
 import { strings } from '../../../../../../../locales/i18n';
 import { EARN_TEST_IDS } from '../../../constants/testIds';
@@ -116,7 +117,7 @@ const MusdConversionAssetListCta = () => {
       const rampIntent: RampIntent = {
         assetId: MUSD_TOKEN_ASSET_ID_BY_CHAIN[chainId],
       };
-      goToBuy(rampIntent);
+      goToBuy(rampIntent, { surface: RAMPS_BUY_CUF_SURFACE.EARN });
       return;
     }
 
diff --git a/app/components/UI/Earn/components/OutputAmountTag/OutputAmountTag.test.tsx b/app/components/UI/Earn/components/OutputAmountTag/OutputAmountTag.test.tsx
deleted file mode 100644
index eaac0ffe49dd..000000000000
--- a/app/components/UI/Earn/components/OutputAmountTag/OutputAmountTag.test.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from 'react';
-import renderWithProvider from '../../../../../util/test/renderWithProvider';
-import OutputAmountTag, { OUTPUT_AMOUNT_TAG_SELECTOR } from './OutputAmountTag';
-
-describe('OutputAmountTag', () => {
-  it('renders correctly with amount and symbol', () => {
-    const { getByTestId, getByText } = renderWithProvider(
-      <OutputAmountTag amount="10" symbol="mUSD" />,
-    );
-
-    expect(getByTestId(OUTPUT_AMOUNT_TAG_SELECTOR)).toBeOnTheScreen();
-    expect(getByText('10 mUSD')).toBeOnTheScreen();
-  });
-
-  it('renders correctly with custom symbol', () => {
-    const { getByText } = renderWithProvider(
-      <OutputAmountTag amount="25" symbol="USDC" />,
-    );
-
-    expect(getByText('25 USDC')).toBeOnTheScreen();
-  });
-
-  it('renders amount without symbol when symbol not provided', () => {
-    const { getByText } = renderWithProvider(<OutputAmountTag amount="100" />);
-
-    expect(getByText('100')).toBeOnTheScreen();
-  });
-
-  it('sets backgroundColor to transparent when showBackground is false', () => {
-    const { getByTestId } = renderWithProvider(
-      <OutputAmountTag amount="10" symbol="mUSD" showBackground={false} />,
-    );
-
-    const tagElement = getByTestId(OUTPUT_AMOUNT_TAG_SELECTOR);
-
-    expect(tagElement.props.style).toEqual(
-      expect.objectContaining({ backgroundColor: 'transparent' }),
-    );
-  });
-
-  it('uses custom testID when provided', () => {
-    const customTestID = 'custom-output-tag';
-    const { getByTestId } = renderWithProvider(
-      <OutputAmountTag amount="50" symbol="ETH" testID={customTestID} />,
-    );
-
-    expect(getByTestId(customTestID)).toBeOnTheScreen();
-  });
-
-  it('renders correctly with 0 amount', () => {
-    const { getByText } = renderWithProvider(
-      <OutputAmountTag amount="0" symbol="mUSD" />,
-    );
-
-    expect(getByText('0 mUSD')).toBeOnTheScreen();
-  });
-
-  it('renders correctly with large amount', () => {
-    const { getByText } = renderWithProvider(
-      <OutputAmountTag amount="1,500" symbol="USDT" />,
-    );
-
-    expect(getByText('1,500 USDT')).toBeOnTheScreen();
-  });
-});
diff --git a/app/components/UI/Earn/components/OutputAmountTag/OutputAmountTag.tsx b/app/components/UI/Earn/components/OutputAmountTag/OutputAmountTag.tsx
deleted file mode 100644
index c7f5a8c421f5..000000000000
--- a/app/components/UI/Earn/components/OutputAmountTag/OutputAmountTag.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React from 'react';
-import { StyleSheet, View } from 'react-native';
-import TagBase, {
-  TagSeverity,
-  TagShape,
-} from '../../../../../component-library/base-components/TagBase';
-import { TextVariant } from '../../../../../component-library/components/Texts/Text';
-import { useStyles } from '../../../../../component-library/hooks';
-import { useTheme } from '../../../../../util/theme';
-
-export const OUTPUT_AMOUNT_TAG_SELECTOR = 'output-amount-tag';
-
-interface OutputAmountTagProps {
-  /**
-   * Amount to display
-   */
-  amount: string;
-  /**
-   * Token symbol to display after the amount
-   */
-  symbol?: string;
-  /**
-   * Whether to show the background color
-   * @default true
-   */
-  showBackground?: boolean;
-  /**
-   * Optional test ID for the component
-   */
-  testID?: string;
-}
-
-const createStyles = () =>
-  StyleSheet.create({
-    wrapper: {
-      marginBottom: 6,
-    },
-  });
-
-/**
- * Generic tag component that displays an output amount with symbol.
- * Used in conversion flows to show the expected output amount.
- */
-const OutputAmountTag: React.FC<OutputAmountTagProps> = ({
-  amount,
-  symbol,
-  showBackground = true,
-  testID,
-}) => {
-  const { colors } = useTheme();
-  const { styles } = useStyles(createStyles, {});
-
-  const tagStyle = {
-    backgroundColor: showBackground ? colors.background.section : 'transparent',
-    paddingHorizontal: 16,
-    paddingTop: 6,
-    paddingBottom: 6,
-  };
-
-  const displayText = symbol ? `${amount} ${symbol}` : amount;
-
-  return (
-    <View style={styles.wrapper}>
-      <TagBase
-        shape={TagShape.Pill}
-        includesBorder={false}
-        textProps={{
-          variant: TextVariant.BodySMMedium,
-        }}
-        severity={TagSeverity.Neutral}
-        testID={testID || OUTPUT_AMOUNT_TAG_SELECTOR}
-        gap={6}
-        style={tagStyle}
-      >
-        {displayText}
-      </TagBase>
-    </View>
-  );
-};
-
-export default OutputAmountTag;
diff --git a/app/components/UI/Earn/components/OutputAmountTag/index.ts b/app/components/UI/Earn/components/OutputAmountTag/index.ts
deleted file mode 100644
index 7104def9cd56..000000000000
--- a/app/components/UI/Earn/components/OutputAmountTag/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default } from './OutputAmountTag';
-export { OUTPUT_AMOUNT_TAG_SELECTOR } from './OutputAmountTag';
diff --git a/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.constants.ts b/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.constants.ts
deleted file mode 100644
index 23bd3b0faaeb..000000000000
--- a/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.constants.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { createArcPath } from './TokenIconWithSpinner.utils';
-
-// Token icon dimensions
-export const TOKEN_ICON_SIZE = 32;
-export const RING_STROKE_WIDTH = 4;
-// Ring size matches token icon - no gap between icon and ring
-export const RING_SIZE = TOKEN_ICON_SIZE + RING_STROKE_WIDTH * 2;
-
-// Spinner configuration
-export const SPINNER_NUM_SEGMENTS = 18;
-export const SPINNER_ARC_DEGREES = 360;
-export const SPINNER_DURATION_MS = 1000;
-
-// Pre-calculate arc paths for the gradient spinner
-export const SPINNER_RADIUS = (RING_SIZE - RING_STROKE_WIDTH) / 2;
-export const SPINNER_CENTER = RING_SIZE / 2;
-export const SEGMENT_DEGREES = SPINNER_ARC_DEGREES / SPINNER_NUM_SEGMENTS;
-
-// Pre-calculate all arc paths and opacities at module load time
-export const SPINNER_SEGMENTS = Array.from(
-  { length: SPINNER_NUM_SEGMENTS },
-  (_, i) => ({
-    path: createArcPath(
-      i * SEGMENT_DEGREES,
-      (i + 1) * SEGMENT_DEGREES + 1,
-      SPINNER_CENTER,
-      SPINNER_RADIUS,
-    ),
-    opacity: (i + 1) / SPINNER_NUM_SEGMENTS,
-  }),
-);
diff --git a/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.styles.ts b/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.styles.ts
deleted file mode 100644
index 49b29d6d03c3..000000000000
--- a/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.styles.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { StyleSheet } from 'react-native';
-import { RING_SIZE, TOKEN_ICON_SIZE } from './TokenIconWithSpinner.constants';
-
-const styles = StyleSheet.create({
-  tokenIconWithRingContainer: {
-    width: RING_SIZE,
-    height: RING_SIZE,
-    alignItems: 'center',
-    justifyContent: 'center',
-    marginRight: 12,
-  },
-  spinningRingWrapper: {
-    position: 'absolute',
-    width: RING_SIZE,
-    height: RING_SIZE,
-  },
-  tokenIconWrapper: {
-    position: 'absolute',
-  },
-  tokenIcon: {
-    width: TOKEN_ICON_SIZE,
-    height: TOKEN_ICON_SIZE,
-    borderRadius: TOKEN_ICON_SIZE / 2,
-  },
-});
-
-export default styles;
diff --git a/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.utils.test.ts b/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.utils.test.ts
deleted file mode 100644
index 3d21489883ff..000000000000
--- a/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.utils.test.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { createArcPath } from './TokenIconWithSpinner.utils';
-
-describe('createArcPath', () => {
-  const defaultCenter = 20;
-  const defaultRadius = 18;
-
-  describe('arc path format', () => {
-    it('returns SVG path string with correct format', () => {
-      const result = createArcPath(0, 20, defaultCenter, defaultRadius);
-
-      expect(result).toMatch(/^M .+ .+ A .+ .+ 0 [01] 1 .+ .+$/);
-    });
-
-    it('includes move command with start coordinates', () => {
-      const result = createArcPath(0, 20, defaultCenter, defaultRadius);
-
-      expect(result).toContain('M ');
-    });
-
-    it('includes arc command with radius values', () => {
-      const result = createArcPath(0, 20, defaultCenter, defaultRadius);
-
-      expect(result).toContain(`A ${defaultRadius} ${defaultRadius}`);
-    });
-  });
-
-  describe('start coordinates calculation', () => {
-    it('calculates start point at 0 degrees (right side of circle)', () => {
-      const result = createArcPath(0, 10, defaultCenter, defaultRadius);
-
-      // At 0 degrees: x = center + radius, y = center
-      expect(result).toContain(
-        `M ${defaultCenter + defaultRadius} ${defaultCenter}`,
-      );
-    });
-
-    it('calculates start point at 90 degrees (bottom of circle)', () => {
-      const result = createArcPath(90, 100, defaultCenter, defaultRadius);
-
-      // At 90 degrees: x = center, y = center + radius
-      const expectedX =
-        defaultCenter + defaultRadius * Math.cos((90 * Math.PI) / 180);
-      const expectedY =
-        defaultCenter + defaultRadius * Math.sin((90 * Math.PI) / 180);
-
-      expect(result).toContain(`M ${expectedX} ${expectedY}`);
-    });
-
-    it('calculates start point at 180 degrees (left side of circle)', () => {
-      const result = createArcPath(180, 190, defaultCenter, defaultRadius);
-
-      const expectedX =
-        defaultCenter + defaultRadius * Math.cos((180 * Math.PI) / 180);
-      const expectedY =
-        defaultCenter + defaultRadius * Math.sin((180 * Math.PI) / 180);
-
-      expect(result).toContain(`M ${expectedX} ${expectedY}`);
-    });
-  });
-
-  describe('large arc flag', () => {
-    it('sets large arc flag to 0 when arc spans less than 180 degrees', () => {
-      const result = createArcPath(0, 90, defaultCenter, defaultRadius);
-
-      // Format: A rx ry x-axis-rotation large-arc-flag sweep-flag x y
-      expect(result).toMatch(/A \d+ \d+ 0 0 1/);
-    });
-
-    it('sets large arc flag to 0 when arc spans exactly 180 degrees', () => {
-      const result = createArcPath(0, 180, defaultCenter, defaultRadius);
-
-      expect(result).toMatch(/A \d+ \d+ 0 0 1/);
-    });
-
-    it('sets large arc flag to 1 when arc spans more than 180 degrees', () => {
-      const result = createArcPath(0, 270, defaultCenter, defaultRadius);
-
-      expect(result).toMatch(/A \d+ \d+ 0 1 1/);
-    });
-
-    it('sets large arc flag to 1 for full circle arc', () => {
-      const result = createArcPath(0, 359, defaultCenter, defaultRadius);
-
-      expect(result).toMatch(/A \d+ \d+ 0 1 1/);
-    });
-  });
-
-  describe('different center and radius values', () => {
-    it('generates path with custom center value', () => {
-      const customCenter = 50;
-      const result = createArcPath(0, 20, customCenter, defaultRadius);
-
-      expect(result).toContain(`M ${customCenter + defaultRadius}`);
-    });
-
-    it('generates path with custom radius value', () => {
-      const customRadius = 30;
-      const result = createArcPath(0, 20, defaultCenter, customRadius);
-
-      expect(result).toContain(`A ${customRadius} ${customRadius}`);
-    });
-
-    it('generates path with both custom center and radius', () => {
-      const customCenter = 40;
-      const customRadius = 35;
-      const result = createArcPath(0, 20, customCenter, customRadius);
-
-      expect(result).toContain(
-        `M ${customCenter + customRadius} ${customCenter}`,
-      );
-      expect(result).toContain(`A ${customRadius} ${customRadius}`);
-    });
-  });
-
-  describe('edge cases', () => {
-    it('handles zero degree arc', () => {
-      const result = createArcPath(0, 0, defaultCenter, defaultRadius);
-
-      expect(result).toBeDefined();
-      expect(typeof result).toBe('string');
-    });
-
-    it('handles negative start angle', () => {
-      const result = createArcPath(-45, 45, defaultCenter, defaultRadius);
-
-      expect(result).toBeDefined();
-      expect(typeof result).toBe('string');
-    });
-
-    it('handles angles greater than 360 degrees', () => {
-      const result = createArcPath(0, 450, defaultCenter, defaultRadius);
-
-      expect(result).toBeDefined();
-      expect(result).toMatch(/A \d+ \d+ 0 1 1/);
-    });
-  });
-});
diff --git a/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.utils.ts b/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.utils.ts
deleted file mode 100644
index d4a3dfa49dbe..000000000000
--- a/app/components/UI/Earn/components/TokenIconWithSpinner/TokenIconWithSpinner.utils.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export const createArcPath = (
-  startAngle: number,
-  endAngle: number,
-  center: number,
-  radius: number,
-): string => {
-  const startRad = (startAngle * Math.PI) / 180;
-  const endRad = (endAngle * Math.PI) / 180;
-  const x1 = center + radius * Math.cos(startRad);
-  const y1 = center + radius * Math.sin(startRad);
-  const x2 = center + radius * Math.cos(endRad);
-  const y2 = center + radius * Math.sin(endRad);
-  const largeArcFlag = endAngle - startAngle > 180 ? 1 : 0;
-  return `M ${x1} ${y1} A ${radius} ${radius} 0 ${largeArcFlag} 1 ${x2} ${y2}`;
-};
diff --git a/app/components/UI/Earn/components/TokenIconWithSpinner/index.tsx b/app/components/UI/Earn/components/TokenIconWithSpinner/index.tsx
deleted file mode 100644
index e28e038ee8da..000000000000
--- a/app/components/UI/Earn/components/TokenIconWithSpinner/index.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, { useEffect, useMemo } from 'react';
-import { View } from 'react-native';
-import Svg, { Path } from 'react-native-svg';
-import Animated, {
-  Easing,
-  useAnimatedStyle,
-  useSharedValue,
-  withRepeat,
-  withTiming,
-  cancelAnimation,
-} from 'react-native-reanimated';
-import { useAppThemeFromContext } from '../../../../../util/theme';
-import TokenIcon from '../../../../Base/TokenIcon';
-import {
-  RING_SIZE,
-  RING_STROKE_WIDTH,
-  SPINNER_DURATION_MS,
-  SPINNER_SEGMENTS,
-} from './TokenIconWithSpinner.constants';
-import styles from './TokenIconWithSpinner.styles';
-
-interface GradientSpinnerProps {
-  color: string;
-}
-
-/**
- * Reusable gradient spinner component
- * Renders a circular arc with gradient opacity that rotates continuously
- */
-export const GradientSpinner: React.FC<GradientSpinnerProps> = ({ color }) => {
-  const rotation = useSharedValue(0);
-
-  useEffect(() => {
-    rotation.value = withRepeat(
-      withTiming(360, {
-        duration: SPINNER_DURATION_MS,
-        easing: Easing.linear,
-      }),
-      -1,
-    );
-
-    return () => {
-      cancelAnimation(rotation);
-    };
-  }, [rotation]);
-
-  const animatedStyle = useAnimatedStyle(() => ({
-    transform: [{ rotate: `${rotation.value}deg` }],
-  }));
-
-  const segments = useMemo(
-    () =>
-      SPINNER_SEGMENTS.map(({ path, opacity }, i) => (
-        <Path
-          key={i}
-          d={path}
-          stroke={color}
-          strokeOpacity={opacity}
-          strokeWidth={RING_STROKE_WIDTH}
-          strokeLinecap="butt"
-          fill="transparent"
-        />
-      )),
-    [color],
-  );
-
-  return (
-    <Animated.View style={[styles.spinningRingWrapper, animatedStyle]}>
-      <Svg width={RING_SIZE} height={RING_SIZE}>
-        {segments}
-      </Svg>
-    </Animated.View>
-  );
-};
-
-export interface TokenIconWithSpinnerProps {
-  tokenSymbol: string;
-  tokenIcon?: string;
-}
-
-/**
- * Token icon with a spinning gradient ring around it
- */
-export const TokenIconWithSpinner: React.FC<TokenIconWithSpinnerProps> = ({
-  tokenSymbol,
-  tokenIcon,
-}) => {
-  const { colors } = useAppThemeFromContext();
-
-  return (
-    <View style={styles.tokenIconWithRingContainer}>
-      <GradientSpinner color={colors.primary.default} />
-      <View style={styles.tokenIconWrapper}>
-        <TokenIcon
-          symbol={tokenSymbol}
-          icon={tokenIcon}
-          style={styles.tokenIcon}
-        />
-      </View>
-    </View>
-  );
-};
diff --git a/app/components/UI/Earn/constants/events/earnEvents.ts b/app/components/UI/Earn/constants/events/earnEvents.ts
index 8911ae66f36d..692b6b47218b 100644
--- a/app/components/UI/Earn/constants/events/earnEvents.ts
+++ b/app/components/UI/Earn/constants/events/earnEvents.ts
@@ -7,6 +7,7 @@ export const EVENT_PROVIDERS = {
 
 export const EVENT_LOCATIONS = {
   ...STAKE_EVENT_LOCATIONS,
+  ACTIVITY_DETAILS: 'ActivityDetails',
   TOKEN_DETAILS_SCREEN: 'TokenDetailsScreen',
   LENDING_EARNINGS: 'LendingEarnings',
   EARN_INPUT_VIEW: 'EarnInputView',
diff --git a/app/components/UI/Earn/constants/musd.ts b/app/components/UI/Earn/constants/musd.ts
index d4d82aac61c5..9ecade6c507d 100644
--- a/app/components/UI/Earn/constants/musd.ts
+++ b/app/components/UI/Earn/constants/musd.ts
@@ -1,81 +1,36 @@
 /**
  * mUSD Conversion Constants for Earn namespace
+ *
+ * Shared constants and guards live in `@metamask/money-account-utils` and are
+ * re-exported here so existing import paths keep working. Client-specific
+ * presentation (icon asset) and configuration stay local.
  */
 
+import { MUSD_TOKEN as MUSD_TOKEN_BASE } from '@metamask/money-account-utils';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { Hex } from '@metamask/utils';
 import MusdIcon from '../../../../images/musd-icon-2x.png';
 
+export {
+  MUSD_DECIMALS,
+  MUSD_TOKEN_ADDRESS,
+  MUSD_TOKEN_ADDRESS_BY_CHAIN,
+  MUSD_TOKEN_ASSET_ID_BY_CHAIN,
+  MUSD_CURRENCY,
+  MUSD_MONEY_ACCOUNT_CHAIN_IDS,
+  isMusdToken,
+  getTokenDisplaySymbol,
+  isMusdTokenOnChain,
+  isMusdOnMoneyAccountChain,
+} from '@metamask/money-account-utils';
+
 export const MUSD_TOKEN = {
-  symbol: 'mUSD',
-  name: 'MetaMask USD',
-  decimals: 6,
+  ...MUSD_TOKEN_BASE,
   imageSource: MusdIcon,
-  /**
-   * Remote image URL used when the token is not yet in the user's wallet token list
-   * and a URI-based image source is needed (e.g. for AvatarToken in confirmation screens).
-   * The address casing in the path matches the token address on all supported chains.
-   */
-  image:
-    'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0xaca92e438df0b2401ff60da7e4337b687a2435da.png',
 } as const;
 
-/**
- * mUSD token decimals (derived from MUSD_TOKEN for single source of truth)
- */
-export const MUSD_DECIMALS = MUSD_TOKEN.decimals;
-
 export const MUSD_CONVERSION_DEFAULT_CHAIN_ID = CHAIN_IDS.MAINNET;
 
-/**
- * mUSD token address (same on all supported chains)
- */
-export const MUSD_TOKEN_ADDRESS: Hex =
-  '0xaca92e438df0b2401ff60da7e4337b687a2435da';
-
-export const MUSD_TOKEN_ADDRESS_BY_CHAIN: Record<Hex, Hex> = {
-  [CHAIN_IDS.MAINNET]: MUSD_TOKEN_ADDRESS,
-  [CHAIN_IDS.LINEA_MAINNET]: MUSD_TOKEN_ADDRESS,
-  [CHAIN_IDS.BSC]: MUSD_TOKEN_ADDRESS,
-  [CHAIN_IDS.MONAD]: MUSD_TOKEN_ADDRESS,
-};
-
-/**
- * Check if the given token address is mUSD.
- * mUSD has the same address on all supported chains.
- */
-export const isMusdToken = (address?: string): boolean => {
-  if (!address) return false;
-  const musdAddress = MUSD_TOKEN_ADDRESS_BY_CHAIN[CHAIN_IDS.MAINNET];
-  return address.toLowerCase() === musdAddress.toLowerCase();
-};
-
-/**
- * Resolves the display symbol for a token, special-casing tokens whose
- * registry symbol differs from the branded casing. mUSD may be registered
- * with the uppercase symbol "MUSD" (e.g. via token detection); canonicalise
- * it to the branded "mUSD" so UI never leaks the registry casing.
- */
-export const getTokenDisplaySymbol = (
-  address?: string,
-  symbol?: string,
-): string | undefined => (isMusdToken(address) ? MUSD_TOKEN.symbol : symbol);
-
-/**
- * Like {@link isMusdToken} but also requires `chainId` to be a chain where
- * mUSD is actually deployed. Prevents a same-address token on an unsupported
- * chain from being misclassified as mUSD.
- */
-export const isMusdTokenOnChain = (
-  address?: string,
-  chainId?: Hex,
-): boolean => {
-  if (!address || !chainId) return false;
-  const expected = MUSD_TOKEN_ADDRESS_BY_CHAIN[chainId];
-  if (!expected) return false;
-  return address.toLowerCase() === expected.toLowerCase();
-};
-
 /**
  * Chains where mUSD CTA should show (buy routes available).
  * BSC is excluded as buy routes are not yet available.
@@ -85,38 +40,6 @@ export const MUSD_BUYABLE_CHAIN_IDS: Hex[] = [
   CHAIN_IDS.LINEA_MAINNET,
   // CHAIN_IDS.BSC, // TODO: Uncomment once buy routes are available
 ];
-
-/**
- * Chains where the Money Account surfaces mUSD activity. mUSD exists on
- * several chains for buy/convert flows, but Money Account currently only
- * tracks Monad — inbound mUSD on Mainnet/Linea/BSC is unrelated to it and
- * must not appear in Money activity.
- */
-export const MUSD_MONEY_ACCOUNT_CHAIN_IDS: Hex[] = [CHAIN_IDS.MONAD];
-
-/**
- * Like {@link isMusdTokenOnChain} but restricted to chains where the Money
- * Account is active (currently Monad only).
- */
-export const isMusdOnMoneyAccountChain = (
-  address?: string,
-  chainId?: Hex,
-): boolean => {
-  if (!chainId || !MUSD_MONEY_ACCOUNT_CHAIN_IDS.includes(chainId)) return false;
-  return isMusdTokenOnChain(address, chainId);
-};
-
-export const MUSD_TOKEN_ASSET_ID_BY_CHAIN: Record<Hex, string> = {
-  [CHAIN_IDS.MAINNET]:
-    'eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA',
-  [CHAIN_IDS.LINEA_MAINNET]:
-    'eip155:59144/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA',
-  [CHAIN_IDS.BSC]: 'eip155:56/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA',
-  [CHAIN_IDS.MONAD]:
-    'eip155:143/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA',
-};
-
-export const MUSD_CURRENCY = 'MUSD';
 export const MUSD_CONVERSION_APY = 3;
 
 // Delay before cleaning up toast tracking entries after final transaction status
diff --git a/app/components/UI/Earn/hooks/useEarnInput.test.tsx b/app/components/UI/Earn/hooks/useEarnInput.test.tsx
index bb819d8e3f71..160d0ea5b4ee 100644
--- a/app/components/UI/Earn/hooks/useEarnInput.test.tsx
+++ b/app/components/UI/Earn/hooks/useEarnInput.test.tsx
@@ -36,11 +36,6 @@ jest.mock('../../../../selectors/multichain', () => ({
       address: '0x0',
     },
   ]),
-  selectAccountTokensAcrossChains: jest.fn(() => [
-    {
-      address: '0x0',
-    },
-  ]),
   selectAccountTokensAcrossChainsUnified: jest.fn(() => ({})),
   selectMultichainAssetsRates: () => mockSelectMultichainAssetsRates(),
 }));
diff --git a/app/components/UI/Earn/hooks/useEarnSelector.test.ts b/app/components/UI/Earn/hooks/useEarnSelector.test.ts
deleted file mode 100644
index f7ff36c5cc15..000000000000
--- a/app/components/UI/Earn/hooks/useEarnSelector.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import type { EarnControllerState } from '@metamask/earn-controller';
-import { RootState } from '../../../../reducers';
-import { backgroundState } from '../../../../util/test/initial-root-state';
-import { renderHookWithProvider } from '../../../../util/test/renderWithProvider';
-import { useEarnSelector } from './useEarnSelector';
-
-describe('useEarnSelector', () => {
-  const mockEarnState: EarnControllerState = {
-    pooled_staking: {
-      isEligible: true,
-      1: {
-        pooledStakes: {
-          account: 'test account',
-          lifetimeRewards: '0',
-          assets: '0',
-          exitRequests: [],
-        },
-        exchangeRate: '1',
-        vaultMetadata: {
-          apy: '3.3',
-          capacity: '1000000',
-          feePercent: 10,
-          totalAssets: '500000',
-          vaultAddress: '0xabcd',
-        },
-        vaultDailyApys: [],
-        vaultApyAverages: {
-          oneDay: '3.047713358665092375',
-          oneWeek: '3.25756026351317301786',
-          oneMonth: '3.25616054301749304217',
-          threeMonths: '3.31863306662107446672',
-          sixMonths: '3.05557344496273894133',
-          oneYear: '0',
-        },
-      },
-    },
-    lending: {
-      isEligible: true,
-      markets: [],
-      positions: [],
-    },
-    tron_staking: null,
-    lastUpdated: 0,
-  };
-
-  it('should return the selected value from earn state', () => {
-    const mockSelector = (state: EarnControllerState) =>
-      state.pooled_staking?.[1]?.pooledStakes?.account;
-
-    const { result } = renderHookWithProvider<
-      ReturnType<typeof useEarnSelector>,
-      RootState
-    >(() => useEarnSelector(mockSelector), {
-      state: {
-        engine: {
-          backgroundState: {
-            ...backgroundState,
-            EarnController: mockEarnState,
-          },
-        },
-      },
-    });
-
-    expect(result.current).toBe(
-      mockEarnState.pooled_staking?.[1]?.pooledStakes?.account,
-    );
-  });
-});
diff --git a/app/components/UI/Earn/hooks/useEarnSelector.ts b/app/components/UI/Earn/hooks/useEarnSelector.ts
deleted file mode 100644
index e988f88335cf..000000000000
--- a/app/components/UI/Earn/hooks/useEarnSelector.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useSelector } from 'react-redux';
-import type { Selector } from 'reselect';
-import type { EarnControllerState } from '@metamask/earn-controller';
-import { RootState } from '../../../../reducers';
-
-/**
- * A hook that adapts earn controller selectors to work with the client's state structure.
- * This allows us to use the earn controller selectors without being tightly coupled to its state structure.
- *
- * @param selector - A selector from the earn controller
- * @returns The selected value from the earn state
- */
-export function useEarnSelector<T>(
-  selector: Selector<EarnControllerState, T>,
-): T {
-  return useSelector((state: RootState) =>
-    selector(state.engine.backgroundState.EarnController),
-  );
-}
diff --git a/app/components/UI/Earn/hooks/useEarnToasts.test.tsx b/app/components/UI/Earn/hooks/useEarnToasts.test.tsx
index 4fcef2db41bf..dbde1fc640dc 100644
--- a/app/components/UI/Earn/hooks/useEarnToasts.test.tsx
+++ b/app/components/UI/Earn/hooks/useEarnToasts.test.tsx
@@ -163,7 +163,7 @@ describe('useEarnToasts', () => {
   });
 
   describe('spinner for inProgress toast', () => {
-    it('includes startAccessory with TokenIconWithSpinner for inProgress toast', () => {
+    it('includes startAccessory for inProgress toast', () => {
       const { result } = renderHook(() => useEarnToasts(), { wrapper });
 
       const inProgressToast =
diff --git a/app/components/UI/Earn/routes/index.tsx b/app/components/UI/Earn/routes/index.tsx
index f73a1a9c343b..1e937ee3a049 100644
--- a/app/components/UI/Earn/routes/index.tsx
+++ b/app/components/UI/Earn/routes/index.tsx
@@ -69,7 +69,7 @@ const EarnModalStack = () => (
     <ModalStack.Screen
       name={Routes.FULL_SCREEN_CONFIRMATIONS.REDESIGNED_CONFIRMATIONS}
       component={Confirm}
-      options={{ headerShown: false }}
+      options={{ headerShown: false, presentation: 'card' }}
     />
   </ModalStack.Navigator>
 );
diff --git a/app/components/UI/FundActionMenu/FundActionMenu.test.tsx b/app/components/UI/FundActionMenu/FundActionMenu.test.tsx
index d92500630c28..00ccea27678b 100644
--- a/app/components/UI/FundActionMenu/FundActionMenu.test.tsx
+++ b/app/components/UI/FundActionMenu/FundActionMenu.test.tsx
@@ -205,9 +205,10 @@ describe('FundActionMenu', () => {
       );
 
       await waitFor(() => {
-        expect(mockGoToBuy).toHaveBeenCalledWith({
-          assetId: 'eip155:1/slip44:60',
-        });
+        expect(mockGoToBuy).toHaveBeenCalledWith(
+          { assetId: 'eip155:1/slip44:60' },
+          { surface: 'fund_menu' },
+        );
       });
     });
 
@@ -264,9 +265,10 @@ describe('FundActionMenu', () => {
       );
 
       await waitFor(() => {
-        expect(mockGoToBuy).toHaveBeenCalledWith({
-          assetId: 'eip155:137/slip44:60',
-        });
+        expect(mockGoToBuy).toHaveBeenCalledWith(
+          { assetId: 'eip155:137/slip44:60' },
+          { surface: 'fund_menu' },
+        );
       });
     });
 
@@ -282,9 +284,10 @@ describe('FundActionMenu', () => {
       );
 
       await waitFor(() => {
-        expect(mockGoToBuy).toHaveBeenCalledWith({
-          assetId: undefined,
-        });
+        expect(mockGoToBuy).toHaveBeenCalledWith(
+          { assetId: undefined },
+          { surface: 'fund_menu' },
+        );
       });
     });
 
@@ -397,9 +400,10 @@ describe('FundActionMenu', () => {
       );
 
       await waitFor(() => {
-        expect(mockGoToBuy).toHaveBeenCalledWith({
-          assetId: undefined,
-        });
+        expect(mockGoToBuy).toHaveBeenCalledWith(
+          { assetId: undefined },
+          { surface: 'fund_menu' },
+        );
       });
     });
 
@@ -418,9 +422,10 @@ describe('FundActionMenu', () => {
       );
 
       await waitFor(() => {
-        expect(mockGoToBuy).toHaveBeenCalledWith({
-          assetId: undefined,
-        });
+        expect(mockGoToBuy).toHaveBeenCalledWith(
+          { assetId: undefined },
+          { surface: 'fund_menu' },
+        );
       });
     });
   });
diff --git a/app/components/UI/FundActionMenu/FundActionMenu.tsx b/app/components/UI/FundActionMenu/FundActionMenu.tsx
index cb318c8b41b7..a40515f51b81 100644
--- a/app/components/UI/FundActionMenu/FundActionMenu.tsx
+++ b/app/components/UI/FundActionMenu/FundActionMenu.tsx
@@ -24,6 +24,7 @@ import { trace, TraceName } from '../../../util/trace';
 import { selectCanSignTransactions } from '../../../selectors/accountsController';
 import { RampType } from '../../../reducers/fiatOrders/types';
 import { useRampNavigation } from '../Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../Ramp/constants/rampsBuyCufTags';
 
 // Types
 import type {
@@ -32,12 +33,10 @@ import type {
 } from './FundActionMenu.types';
 import { getDetectedGeolocation } from '../../../reducers/fiatOrders';
 import { useRampsButtonClickData } from '../Ramp/hooks/useRampsButtonClickData';
-import { useElevatedSurface } from '../../../util/theme/themeUtils';
 
 const FundActionMenu = () => {
   const sheetRef = useRef<BottomSheetRef>(null);
   const navigation = useNavigation<AppNavigationProp>();
-  const surfaceClass = useElevatedSurface();
   const route = useRoute<FundActionMenuRouteProp>();
 
   const customOnBuy = route.params?.onBuy;
@@ -124,7 +123,10 @@ const FundActionMenu = () => {
             if (customOnBuy) {
               customOnBuy();
             } else {
-              goToBuy({ assetId: assetContext?.assetId });
+              goToBuy(
+                { assetId: assetContext?.assetId },
+                { surface: RAMPS_BUY_CUF_SURFACE.FUND_MENU },
+              );
             }
           },
           traceName: TraceName.LoadRampExperience,
@@ -171,7 +173,6 @@ const FundActionMenu = () => {
       ref={sheetRef}
       goBack={navigation.goBack}
       testID="fund-action-menu-bottom-sheet"
-      twClassName={surfaceClass}
     >
       <Box twClassName="py-4">
         {actionConfigs.map(
diff --git a/app/components/UI/HardwareWallet/Swaps/HardwareWalletsSwaps.test.tsx b/app/components/UI/HardwareWallet/Swaps/HardwareWalletsSwaps.test.tsx
index 7c47058814b8..297c29fda5b6 100644
--- a/app/components/UI/HardwareWallet/Swaps/HardwareWalletsSwaps.test.tsx
+++ b/app/components/UI/HardwareWallet/Swaps/HardwareWalletsSwaps.test.tsx
@@ -23,6 +23,11 @@ import { updateHardwareWalletsSwaps } from '../../../../core/redux/slices/bridge
 
 const mockNavigate = jest.fn();
 const mockGoBack = jest.fn();
+type TransitionEndHandler = (event?: { data?: { closing?: boolean } }) => void;
+const mockAddListener = jest.fn<() => void, [string, TransitionEndHandler]>(
+  () => jest.fn(),
+);
+let mockIsFocused = true;
 const mockRouteParams: Record<string, any> = {};
 
 jest.mock('@react-navigation/native', () => ({
@@ -30,8 +35,10 @@ jest.mock('@react-navigation/native', () => ({
   useNavigation: () => ({
     navigate: mockNavigate,
     goBack: mockGoBack,
+    addListener: mockAddListener,
   }),
   useRoute: () => ({ params: mockRouteParams }),
+  useIsFocused: () => mockIsFocused,
 }));
 
 jest.mock('rive-react-native', () =>
@@ -121,6 +128,7 @@ jest.mock('../../../../core/Engine', () => ({
     unsubscribe: jest.fn(),
   },
   acceptPendingApproval: jest.fn().mockResolvedValue(undefined),
+  context: { BridgeController: { resetState: jest.fn() } },
 }));
 const mockAccept = (
   jest.requireMock('../../../../core/Engine') as {
@@ -405,11 +413,13 @@ describe('HardwareWalletsSwaps', () => {
     __clearLastMockedMethods();
     mockHardwareWalletState.walletType = null;
     mockHardwareWalletState.pendingScanRequest = null;
+    mockIsFocused = true;
     jest.mocked(selectSourceWalletAddress).mockReturnValue(WALLET_ADDRESS);
+    Object.keys(mockRouteParams).forEach((key) => delete mockRouteParams[key]);
     mockRouteSubmissionParams();
     mockEnsureDeviceReady.mockResolvedValue(true);
     mockGetDeviceId.mockResolvedValue('ledger-device-id');
-    mockSubmitBridgeTx.mockResolvedValue({ success: true });
+    mockSubmitBridgeTx.mockReturnValue(new Promise(() => undefined));
     mockConnectionState.status = 'disconnected';
   });
 
@@ -745,7 +755,7 @@ describe('HardwareWalletsSwaps', () => {
       const { getByTestId, store } = renderScreen({});
 
       await flushPromises();
-      dispatchRejection(store);
+      await act(async () => dispatchRejection(store));
       await flushPromises();
 
       await act(async () => {
@@ -816,6 +826,15 @@ describe('HardwareWalletsSwaps', () => {
       expect(mockSubmitBridgeTx).not.toHaveBeenCalled();
     });
 
+    it('does not resubmit a remounted flow with signed steps', async () => {
+      renderScreen({ steps: signedSteps });
+      await flushPromises();
+
+      expect(mockSubmitBridgeTx).not.toHaveBeenCalled();
+      // No mount-local settlement metadata: preserve toast + Activity.
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.TRANSACTIONS_VIEW);
+    });
+
     it.each([
       {
         name: 'no cached params',
@@ -855,21 +874,54 @@ describe('HardwareWalletsSwaps', () => {
   });
 
   describe('auto-navigation', () => {
-    it('auto-navigates to transactions when Submitted and submission completes', async () => {
+    it('opens post-trade after signing and submission complete', async () => {
+      let resolveSubmit!: (value: { id: string; hash: string }) => void;
+      mockHardwareWalletState.walletType = HardwareWalletType.Qr;
+      mockIsFocused = false;
+      mockSubmitBridgeTx.mockReturnValue(
+        new Promise((resolve) => {
+          resolveSubmit = resolve;
+        }),
+      );
       const { store } = renderScreen({});
 
       await flushPromises();
-      signAllSteps(store);
-      await flushPromises();
+      mockIsFocused = true;
+      await act(async () => signAllSteps(store));
+      expect(mockNavigate).not.toHaveBeenCalled();
 
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.TRANSACTIONS_VIEW);
+      await act(async () => {
+        resolveSubmit({ id: 'tx-id', hash: '0xabc' });
+        await Promise.resolve();
+      });
+
+      expect(mockNavigate).not.toHaveBeenCalled();
+      const transitionEndCall = mockAddListener.mock.calls.find(
+        ([event]) => event === 'transitionEnd',
+      );
+      const transitionEnd = transitionEndCall?.[1] as
+        | TransitionEndHandler
+        | undefined;
+      act(() => transitionEnd?.({ data: { closing: false } }));
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.BRIDGE.BRIDGE_VIEW);
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.BRIDGE.MODALS.ROOT, {
+        screen: Routes.BRIDGE.MODALS.POST_TRADE_MODAL,
+        params: expect.objectContaining({
+          transactionMetaId: 'tx-id',
+          transactionHash: '0xabc',
+        }),
+      });
     });
 
-    it('navigates to transactions after retry flow signs all txs', async () => {
+    it('opens post-trade after retry signs all txs', async () => {
+      mockSubmitBridgeTx
+        .mockReturnValueOnce(new Promise(() => undefined))
+        .mockResolvedValueOnce({ id: 'tx-id', hash: '0xabc' });
       const { getByTestId, store } = renderScreen({});
 
       await flushPromises();
-      dispatchRejection(store);
+      await act(async () => dispatchRejection(store));
       await flushPromises();
 
       await act(async () => {
@@ -883,7 +935,10 @@ describe('HardwareWalletsSwaps', () => {
         await Promise.resolve();
       });
 
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.TRANSACTIONS_VIEW);
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.BRIDGE.MODALS.ROOT, {
+        screen: Routes.BRIDGE.MODALS.POST_TRADE_MODAL,
+        params: expect.objectContaining({ transactionMetaId: 'tx-id' }),
+      });
     });
 
     it('does not auto-navigate for non-Submitted states', () => {
diff --git a/app/components/UI/HardwareWallet/Swaps/HardwareWalletsSwaps.tsx b/app/components/UI/HardwareWallet/Swaps/HardwareWalletsSwaps.tsx
index e80d528d135b..d0286e7d119d 100644
--- a/app/components/UI/HardwareWallet/Swaps/HardwareWalletsSwaps.tsx
+++ b/app/components/UI/HardwareWallet/Swaps/HardwareWalletsSwaps.tsx
@@ -284,6 +284,7 @@ export function HardwareWalletsSwaps() {
               navigation.navigate(Routes.BRIDGE.HW_QR_SCANNER, {
                 currentStep: getCameraScanStep(progress.currentStep),
                 totalSteps: getTotalQrScans(progress.totalSteps),
+                ...(strategy.isSendFlow ? { completeOnScan: true } : {}),
               })
             }
           >
diff --git a/app/components/UI/HardwareWallet/Swaps/HwQrScanner.test.tsx b/app/components/UI/HardwareWallet/Swaps/HwQrScanner.test.tsx
index cdcb38489781..0177453c56b1 100644
--- a/app/components/UI/HardwareWallet/Swaps/HwQrScanner.test.tsx
+++ b/app/components/UI/HardwareWallet/Swaps/HwQrScanner.test.tsx
@@ -6,9 +6,8 @@ import { HwQrScannerSelectorsIDs } from './HwQrScanner.testIds';
 import { useHardwareWallet } from '../../../../core/HardwareWallet';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { QrScanRequestType } from '@metamask/eth-qr-keyring';
-import Routes from '../../../../constants/navigation/Routes';
 import { resetHardwareWalletsSwaps } from '../../../../core/redux/slices/bridge';
-import { ToastVariants } from '../../../../component-library/components/Toast';
+import Routes from '../../../../constants/navigation/Routes';
 
 const mockDispatch = jest.fn();
 
@@ -412,7 +411,7 @@ describe('HwQrScanner', () => {
       expect(getMockShowToast()).not.toHaveBeenCalled();
     });
 
-    it('completes success on the last scan: toast, Redux reset, and activity navigation', () => {
+    it('goes back on the last Bridge scan so lifecycle owns completion', () => {
       mockUseRoute.mockReturnValue({
         params: { currentStep: 2, totalSteps: 2 },
       });
@@ -429,19 +428,28 @@ describe('HwQrScanner', () => {
         cbor: Buffer.from('signature').toString('hex'),
       });
       expect(mockSetRequestCompleted).toHaveBeenCalledTimes(1);
-      expect(mockGoBack).not.toHaveBeenCalled();
-      expect(getMockShowToast()).toHaveBeenCalledWith({
-        variant: ToastVariants.Icon,
-        iconName: 'check',
-        hasNoTimeout: false,
-        labelOptions: [
-          { label: 'bridge.hardware_wallet_progress.submitted_title' },
-        ],
+      expect(mockGoBack).toHaveBeenCalledTimes(1);
+      expect(getMockShowToast()).not.toHaveBeenCalled();
+      expect(resetHardwareWalletsSwaps).not.toHaveBeenCalled();
+      expect(mockDispatch).not.toHaveBeenCalled();
+      expect(mockNavigate).not.toHaveBeenCalled();
+    });
+
+    it('preserves scanner-owned completion on the last Send scan', () => {
+      mockUseRoute.mockReturnValue({
+        params: { currentStep: 2, totalSteps: 2, completeOnScan: true },
       });
-      expect(resetHardwareWalletsSwaps).toHaveBeenCalledTimes(1);
-      expect(mockDispatch).toHaveBeenCalledWith({
-        type: 'bridge/resetHardwareWalletsSwaps',
+
+      render(<HwQrScanner />);
+
+      capturedOnScanSuccess?.({
+        type: 'eth-signature',
+        cbor: Buffer.from('signature'),
       });
+
+      expect(mockGoBack).not.toHaveBeenCalled();
+      expect(getMockShowToast()).toHaveBeenCalled();
+      expect(resetHardwareWalletsSwaps).toHaveBeenCalled();
       expect(mockNavigate).toHaveBeenCalledWith(Routes.TRANSACTIONS_VIEW);
     });
 
diff --git a/app/components/UI/HardwareWallet/Swaps/HwQrScanner.tsx b/app/components/UI/HardwareWallet/Swaps/HwQrScanner.tsx
index 8f7adc9f4d96..12ed61cc15c7 100644
--- a/app/components/UI/HardwareWallet/Swaps/HwQrScanner.tsx
+++ b/app/components/UI/HardwareWallet/Swaps/HwQrScanner.tsx
@@ -157,6 +157,8 @@ const styles = StyleSheet.create({
 export interface HwQrScannerRouteParams {
   currentStep: number;
   totalSteps: number;
+  /** Preserve scanner-owned completion for Send; Bridge returns to its lifecycle. */
+  completeOnScan?: boolean;
 }
 
 /**
@@ -190,8 +192,11 @@ export function HwQrScanner() {
     string | null
   >(null);
 
-  const { currentStep = 1, totalSteps = 1 } =
-    (route.params as HwQrScannerRouteParams) ?? {};
+  const {
+    currentStep = 1,
+    totalSteps = 1,
+    completeOnScan = false,
+  } = (route.params as HwQrScannerRouteParams) ?? {};
 
   const isLastStep = currentStep >= totalSteps;
 
@@ -207,17 +212,14 @@ export function HwQrScanner() {
             cbor: Buffer.from(ur.cbor).toString('hex'),
           });
           setRequestCompleted();
-          // Last-step: complete success here (toast + Redux reset + navigate)
-          // instead of goBack()-ing to HardwareWalletsSwaps. Ledger flows do
-          // this via `useHwSwapLifecycle.navigateOnSuccess`, which is disabled
-          // for QR to avoid two native view insertions in the same frame on
-          // Android (addViewAt crash).
-          if (isLastStep) {
+          if (isLastStep && completeOnScan) {
             if (!hasCompletedOnSuccessRef.current) {
               hasCompletedOnSuccessRef.current = true;
               completeHwSwapSuccess({ dispatch, navigation, toastRef });
             }
           } else {
+            // Bridge returns to its lifecycle, which waits for submit settlement
+            // and this screen's transitionEnd before opening post-trade.
             navigation.goBack();
           }
           return true;
@@ -243,6 +245,7 @@ export function HwQrScanner() {
       pendingScanRequest,
       setRequestCompleted,
       isLastStep,
+      completeOnScan,
       dispatch,
       navigation,
       toastRef,
diff --git a/app/components/UI/HardwareWallet/Swaps/flowStrategy.ts b/app/components/UI/HardwareWallet/Swaps/flowStrategy.ts
index 8f8b233e58aa..48e53f0594f8 100644
--- a/app/components/UI/HardwareWallet/Swaps/flowStrategy.ts
+++ b/app/components/UI/HardwareWallet/Swaps/flowStrategy.ts
@@ -6,6 +6,7 @@ import type {
 } from '@metamask/bridge-controller';
 import type { TransactionActiveAbTestEntry } from '../../../../util/transactions/transaction-active-ab-test-attribution-registry';
 import Routes from '../../../../constants/navigation/Routes';
+import type { PostTradeBottomSheetParams } from '../../Bridge/components/PostTradeBottomSheet/PostTradeBottomSheet.types';
 
 /**
  * Signing-session origin. Bridge is the default; send activates only when
@@ -40,6 +41,11 @@ export interface SubmissionParams {
   quoteResponse: QuoteResponse & QuoteMetadata;
   location?: MetaMetricsSwapsEventSource;
   transactionActiveAbTests?: TransactionActiveAbTestEntry[];
+  /** Token/amount context for the post-trade modal after HW signing completes. */
+  postTradeModalParams?: Pick<
+    PostTradeBottomSheetParams,
+    'sourceAmount' | 'destAmount' | 'sourceToken' | 'destToken'
+  >;
 }
 
 /**
diff --git a/app/components/UI/HardwareWallet/Swaps/useHardwareWalletSubmit.ts b/app/components/UI/HardwareWallet/Swaps/useHardwareWalletSubmit.ts
index 02454c9cd950..076c45be9ed0 100644
--- a/app/components/UI/HardwareWallet/Swaps/useHardwareWalletSubmit.ts
+++ b/app/components/UI/HardwareWallet/Swaps/useHardwareWalletSubmit.ts
@@ -1,4 +1,10 @@
-import { useCallback, useEffect, useRef, type RefObject } from 'react';
+import {
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+  type RefObject,
+} from 'react';
 import type { Dispatch, AnyAction } from 'redux';
 import {
   TransactionStatus,
@@ -12,6 +18,7 @@ import { getDeviceIdForAddress } from '../../../../core/HardwareWallet/helpers';
 import { updateHardwareWalletsSwaps } from '../../../../core/redux/slices/bridge';
 import useApprovalRequest from '../../../Views/confirmations/hooks/useApprovalRequest';
 import useSubmitBridgeTx from '../../../../util/bridge/hooks/useSubmitBridgeTx';
+import { withPostTradeNotificationSuppression } from '../../Bridge/utils/postTradeNotifications';
 import {
   HardwareWalletsSwapsStatus,
   HardwareWalletsSwapsEventType,
@@ -121,6 +128,7 @@ interface UseHardwareWalletSubmitOptions {
  *
  * Exposes behavioral methods only — `submit()`, `canRetry()`,
  * `clearCachedSubmission()` — so callers never reach into internal refs.
+ * Bridge also exposes settled submission identifiers (`null` until settled).
  */
 export function useHardwareWalletSubmit({
   isSendFlow,
@@ -137,8 +145,10 @@ export function useHardwareWalletSubmit({
   submit: () => Promise<void>;
   /** True when enough state is cached to retry. Send: pending approval + prepared tx; bridge: cached params. */
   canRetry: () => boolean;
-  /** Clears the cached bridge submission params (no-op in send mode). */
+  /** Clears the cached bridge submission params and settled tx metadata. */
   clearCachedSubmission: () => void;
+  /** `null` while pending, transaction on success, `undefined` on failure. */
+  submittedTransaction: TransactionMeta | null | undefined;
 } {
   const { approvalRequest } = useApprovalRequest();
   const approvalRequestRef = useRef(approvalRequest);
@@ -154,6 +164,9 @@ export function useHardwareWalletSubmit({
   const cachedSubmissionParams = useRef<SubmissionParams | null>(
     submissionParams ?? null,
   );
+  const [submittedTransaction, setSubmittedTransaction] = useState<
+    TransactionMeta | null | undefined
+  >(null);
   useEffect(() => {
     if (submissionParams && !cachedSubmissionParams.current) {
       cachedSubmissionParams.current = submissionParams;
@@ -162,12 +175,14 @@ export function useHardwareWalletSubmit({
 
   // Shared stale-submission guard + TransactionFailed dispatch.
   const runSubmit = useCallback(
-    async (submitFn: () => Promise<unknown>) => {
-      const myGeneration = submissionGenerationRef.current;
+    async <Result>(submitFn: () => Promise<Result>) => {
+      const submissionGenerationAtStart = submissionGenerationRef.current;
       try {
-        await submitFn();
+        return await submitFn();
       } catch (error) {
-        if (submissionGenerationRef.current !== myGeneration) return;
+        if (submissionGenerationRef.current !== submissionGenerationAtStart) {
+          return;
+        }
         Logger.error(error as Error, 'HW swap submit failed');
         const status = progressRef.current.status;
         // Only transition to Failed from active phases:
@@ -187,6 +202,7 @@ export function useHardwareWalletSubmit({
             }),
           );
         }
+        return undefined;
       }
     },
     [dispatch, progressRef, submissionGenerationRef],
@@ -253,7 +269,7 @@ export function useHardwareWalletSubmit({
     setPendingOperationAddress,
   ]);
 
-  // ── Bridge flow (UNCHANGED) ─────────────────────────────────────────
+  // ── Bridge flow ────────────────────────────────────────────────────
   const submitBridgeFlow = useCallback(async () => {
     const cachedParams = cachedSubmissionParams.current;
     if (!cachedParams || !walletAddress) {
@@ -262,11 +278,25 @@ export function useHardwareWalletSubmit({
           type: HardwareWalletsSwapsEventType.TransactionFailed,
         }),
       );
+      setSubmittedTransaction(undefined);
+      return;
+    }
+
+    const submissionGenerationAtStart = submissionGenerationRef.current;
+    setSubmittedTransaction(null);
+
+    const submitted = await runSubmit(() =>
+      withPostTradeNotificationSuppression(() =>
+        submitBridgeTxRef.current(cachedParams),
+      ),
+    );
+
+    if (submissionGenerationRef.current !== submissionGenerationAtStart) {
       return;
     }
 
-    await runSubmit(() => submitBridgeTxRef.current(cachedParams));
-  }, [dispatch, walletAddress, runSubmit]);
+    setSubmittedTransaction(submitted);
+  }, [dispatch, walletAddress, runSubmit, submissionGenerationRef]);
 
   const submit = useCallback(async () => {
     if (isSendFlow) {
@@ -288,11 +318,13 @@ export function useHardwareWalletSubmit({
 
   const clearCachedSubmission = useCallback(() => {
     cachedSubmissionParams.current = null;
+    setSubmittedTransaction(null);
   }, []);
 
   return {
     submit,
     canRetry,
     clearCachedSubmission,
+    submittedTransaction,
   };
 }
diff --git a/app/components/UI/HardwareWallet/Swaps/useHwSwapLifecycle.ts b/app/components/UI/HardwareWallet/Swaps/useHwSwapLifecycle.ts
index 31d20ef9bfd7..d0dc7125e48e 100644
--- a/app/components/UI/HardwareWallet/Swaps/useHwSwapLifecycle.ts
+++ b/app/components/UI/HardwareWallet/Swaps/useHwSwapLifecycle.ts
@@ -8,16 +8,24 @@ import {
 } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigation, useIsFocused } from '@react-navigation/native';
-import type { AppNavigationProp } from '../../../../core/NavigationService/types';
+import type { AppStackNavigationProp } from '../../../../core/NavigationService/types';
 import { navigateWithDetails } from '../../../../util/navigation/navUtils';
 
 import Routes from '../../../../constants/navigation/Routes';
+import Engine from '../../../../core/Engine';
 import {
+  incrementBridgeBalanceRefreshKey,
+  resetBridgeTokenInputs,
   resetHardwareWalletsSwaps,
   selectHardwareWalletsSwaps,
   updateHardwareWalletsSwaps,
 } from '../../../../core/redux/slices/bridge';
 import { ToastContext } from '../../../../component-library/components/Toast';
+import { PostTradeStatus } from '../../Bridge/components/PostTradeBottomSheet/PostTradeBottomSheet.types';
+import {
+  hidePostTradeNotificationSurface,
+  showPostTradeNotificationSurface,
+} from '../../Bridge/utils/postTradeNotifications';
 import { completeHwSwapSuccess } from './hwSwapSuccess';
 import {
   HardwareWalletsSwapsStatus,
@@ -94,7 +102,7 @@ export function useHwSwapLifecycle({
   isQrHardwareWallet,
 }: UseHwSwapLifecycleInputs) {
   const dispatch = useDispatch();
-  const navigation = useNavigation<AppNavigationProp>();
+  const navigation = useNavigation<AppStackNavigationProp>();
   const isFocused = useIsFocused();
   const toastRef = useContext(ToastContext)?.toastRef;
 
@@ -109,8 +117,12 @@ export function useHwSwapLifecycle({
   const retryGenerationRef = useRef(0);
   const hasAutoNavigatedRef = useRef(false);
   const hasInitialSubmissionRef = useRef(false);
+  /** True once this mount starts a bridge submit (distinguishes remount). */
+  const didStartBridgeSubmitRef = useRef(false);
   const retryInProgressRef = useRef(false);
   const [isRetrying, setIsRetrying] = useState(false);
+  const [isQrReturnTransitionEnded, setIsQrReturnTransitionEnded] =
+    useState(true);
 
   // ── Sibling hooks (composed here so refs stay local) ─────────────
   const isEnabled = Boolean(strategy.walletAddress);
@@ -138,6 +150,7 @@ export function useHwSwapLifecycle({
     submit: submitWithDeviceReady,
     canRetry,
     clearCachedSubmission,
+    submittedTransaction,
   } = useHardwareWalletSubmit({
     isSendFlow: strategy.isSendFlow,
     walletAddress: strategy.walletAddress,
@@ -151,6 +164,36 @@ export function useHwSwapLifecycle({
     setPendingOperationAddress,
   });
 
+  // Suppress generic tx notifications while the Bridge HW screen is focused
+  // (BridgeView unregisters its surface when navigating here).
+  useEffect(() => {
+    if (strategy.isSendFlow || !isFocused) {
+      return;
+    }
+    showPostTradeNotificationSurface();
+    return () => {
+      hidePostTradeNotificationSurface();
+    };
+  }, [strategy.isSendFlow, isFocused]);
+
+  // Register before opening the QR scanner so transitionEnd cannot be missed.
+  // This is Bridge-only; Send retains its existing scanner-owned completion.
+  useEffect(() => {
+    if (strategy.isSendFlow || !isQrHardwareWallet) {
+      return;
+    }
+
+    return navigation.addListener('transitionEnd', (e) => {
+      if (!e.data.closing) setIsQrReturnTransitionEnded(true);
+    });
+  }, [isQrHardwareWallet, navigation, strategy.isSendFlow]);
+
+  useEffect(() => {
+    if (!strategy.isSendFlow && isQrHardwareWallet && !isFocused) {
+      setIsQrReturnTransitionEnded(false);
+    }
+  }, [isFocused, isQrHardwareWallet, strategy.isSendFlow]);
+
   // ── Derived ──────────────────────────────────────────────────────
   const allStepsSigned = useMemo(
     () =>
@@ -164,9 +207,67 @@ export function useHwSwapLifecycle({
   // ── Flow termination ─────────────────────────────────────────────
   const completeSignedFlow = useCallback(() => {
     if (hasAutoNavigatedRef.current) return;
+
+    const completeWithoutModal = () => {
+      hasAutoNavigatedRef.current = true;
+      clearCachedSubmission();
+      completeHwSwapSuccess({ dispatch, navigation, toastRef });
+    };
+
+    if (strategy.isSendFlow) {
+      completeWithoutModal();
+      return;
+    }
+
+    if (submittedTransaction === null) {
+      if (didStartBridgeSubmitRef.current) return;
+      // Remount has no local submission metadata; preserve legacy completion.
+      completeWithoutModal();
+      return;
+    }
+    if (
+      submittedTransaction === undefined ||
+      (!submittedTransaction.id && !submittedTransaction.hash)
+    ) {
+      dispatch(
+        updateHardwareWalletsSwaps({
+          type: HardwareWalletsSwapsEventType.TransactionFailed,
+        }),
+      );
+      return;
+    }
+
+    if (isQrHardwareWallet && !isQrReturnTransitionEnded) return;
+
     hasAutoNavigatedRef.current = true;
-    completeHwSwapSuccess({ dispatch, navigation, toastRef });
-  }, [dispatch, navigation, toastRef]);
+    clearCachedSubmission();
+
+    dispatch(resetBridgeTokenInputs());
+    Engine.context.BridgeController?.resetState?.();
+    dispatch(incrementBridgeBalanceRefreshKey());
+    dispatch(resetHardwareWalletsSwaps());
+    // Keep BridgeView beneath the modal, not the reset HW progress screen.
+    navigation.navigate(Routes.BRIDGE.BRIDGE_VIEW);
+    navigation.navigate(Routes.BRIDGE.MODALS.ROOT, {
+      screen: Routes.BRIDGE.MODALS.POST_TRADE_MODAL,
+      params: {
+        ...strategy.submitOptions.submissionParams?.postTradeModalParams,
+        status: PostTradeStatus.InProgress,
+        transactionMetaId: submittedTransaction.id,
+        transactionHash: submittedTransaction.hash,
+      },
+    });
+  }, [
+    clearCachedSubmission,
+    dispatch,
+    isQrHardwareWallet,
+    isQrReturnTransitionEnded,
+    navigation,
+    strategy.isSendFlow,
+    strategy.submitOptions.submissionParams?.postTradeModalParams,
+    submittedTransaction,
+    toastRef,
+  ]);
 
   const reconcileStuckFlowProgress = useCallback(() => {
     const current = progressRef.current;
@@ -181,9 +282,7 @@ export function useHwSwapLifecycle({
 
     const resolution = reconcileStuckProgress(current.steps);
     if (resolution.action === 'navigate') {
-      // All signed but status hasn't transitioned. QR wallets normally
-      // complete on the last HwQrScanner scan; when the user is still on
-      // progress/disconnected, finish here instead.
+      // All signed but status hasn't transitioned.
       completeSignedFlow();
       return;
     }
@@ -192,21 +291,21 @@ export function useHwSwapLifecycle({
   }, [completeSignedFlow, dispatch]);
 
   useEffect(() => {
-    // All device signing steps complete AND a submission was started.
-    // Fires exactly once (guarded by hasAutoNavigatedRef) to show the
-    // success toast, reset HW-swaps state, and navigate to activity view.
+    // Complete after signing; Bridge also waits for submission settlement.
     if (!allStepsSigned) return;
-    // For QR wallets the HwQrScanner screen handles final navigation
-    // directly (it navigates to TRANSACTIONS_VIEW on the last scan
-    // instead of calling goBack()).  Letting this effect also fire would
-    // produce two native view insertions in the same frame, colliding
-    // on Android (java.lang.IllegalStateException / addViewAt).
-    if (isQrHardwareWallet) return;
+    // Send QR retains scanner-owned completion.
+    if (strategy.isSendFlow && isQrHardwareWallet) return;
     if (!isFocused) return;
     if (hasAutoNavigatedRef.current) return;
     if (!hasInitialSubmissionRef.current) return;
     completeSignedFlow();
-  }, [allStepsSigned, isQrHardwareWallet, isFocused, completeSignedFlow]);
+  }, [
+    allStepsSigned,
+    isFocused,
+    isQrHardwareWallet,
+    strategy.isSendFlow,
+    completeSignedFlow,
+  ]);
 
   // ── Initial submit (first Waiting) ───────────────────────────────
   useEffect(() => {
@@ -225,15 +324,15 @@ export function useHwSwapLifecycle({
 
     hasInitialSubmissionRef.current = true;
 
-    // Race closure: if all steps were already signed before this effect ran
-    // (e.g., remount mid-flow), the all-steps-signed effect above returned
-    // early because the flag was false. Re-check here and navigate straight
-    // to success instead of submitting a no-op.
+    // Never resubmit a remounted flow whose signing steps already completed.
     if (allStepsSigned) {
       completeSignedFlow();
       return;
     }
 
+    if (!strategy.isSendFlow) {
+      didStartBridgeSubmitRef.current = true;
+    }
     submitWithDeviceReady();
   }, [
     progress.currentStep,
@@ -312,6 +411,9 @@ export function useHwSwapLifecycle({
 
       submissionGenerationRef.current += 1;
       hasInitialSubmissionRef.current = true;
+      if (!strategy.isSendFlow) {
+        didStartBridgeSubmitRef.current = true;
+      }
       dispatch(
         updateHardwareWalletsSwaps({
           type: HardwareWalletsSwapsEventType.Retry,
@@ -335,6 +437,7 @@ export function useHwSwapLifecycle({
     resetHandledError,
     canRetry,
     retryFallback,
+    strategy.isSendFlow,
   ]);
 
   const handleTryAgain = useCallback(
diff --git a/app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView.test.tsx b/app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView.test.tsx
index 0c45e50ffcd2..33c2c5073596 100644
--- a/app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView.test.tsx
+++ b/app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView.test.tsx
@@ -612,6 +612,7 @@ describe('MarketInsightsView', () => {
       params: expect.objectContaining({
         newTabUrl: 'https://www.coindesk.com/article',
         fromTrending: true,
+        fromMarketInsights: true,
       }),
     });
   });
diff --git a/app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView.tsx b/app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView.tsx
index a7c7c7acb10c..a06b74895916 100644
--- a/app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView.tsx
+++ b/app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView.tsx
@@ -593,6 +593,7 @@ const MarketInsightsView: React.FC = () => {
           newTabUrl: url,
           timestamp: Date.now(),
           fromTrending: true,
+          fromMarketInsights: true,
         },
       });
     },
diff --git a/app/components/UI/MarketInsights/components/MarketInsightsEntryCard/MarketInsightsDisclaimerBottomSheet.tsx b/app/components/UI/MarketInsights/components/MarketInsightsEntryCard/MarketInsightsDisclaimerBottomSheet.tsx
index 78c0a7f091b8..a81e9e6a1eb6 100644
--- a/app/components/UI/MarketInsights/components/MarketInsightsEntryCard/MarketInsightsDisclaimerBottomSheet.tsx
+++ b/app/components/UI/MarketInsights/components/MarketInsightsEntryCard/MarketInsightsDisclaimerBottomSheet.tsx
@@ -14,7 +14,6 @@ import {
   type BottomSheetRef,
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../../../locales/i18n';
-import { useElevatedSurface } from '../../../../../util/theme/themeUtils';
 
 interface MarketInsightsDisclaimerBottomSheetProps {
   onClose: () => void;
@@ -24,7 +23,6 @@ const MarketInsightsDisclaimerBottomSheet: React.FC<
   MarketInsightsDisclaimerBottomSheetProps
 > = ({ onClose }) => {
   const bottomSheetRef = useRef<BottomSheetRef>(null);
-  const surfaceClass = useElevatedSurface();
 
   const handleClose = useCallback(() => {
     bottomSheetRef.current?.onCloseBottomSheet();
@@ -49,11 +47,7 @@ const MarketInsightsDisclaimerBottomSheet: React.FC<
         statusBarTranslucent
         onRequestClose={handleClose}
       >
-        <BottomSheet
-          ref={bottomSheetRef}
-          onClose={onClose}
-          twClassName={surfaceClass}
-        >
+        <BottomSheet ref={bottomSheetRef} onClose={onClose}>
           <BottomSheetHeader onClose={handleClose}>
             {strings('market_insights.disclaimer_modal.title')}
           </BottomSheetHeader>
diff --git a/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.test.tsx b/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.test.tsx
index 5f1dfba615e6..5a13ed28793c 100644
--- a/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.test.tsx
+++ b/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.test.tsx
@@ -37,6 +37,7 @@ import {
   selectCardHomeDataStatus,
   selectHasMetalCard,
   selectIsCardholder,
+  selectIsCardStateResolved,
 } from '../../../../../selectors/cardController';
 import { useMoneyAccountCardLinkage } from '../../../Card/hooks/useMoneyAccountCardLinkage';
 import { MONEY_HOME_CARD_ORIGIN } from '../../../Card/hooks/useCardPostAuthRedirect';
@@ -120,6 +121,12 @@ jest.mock('../../components/MoneyNextBestActionParallax', () => ({
   PARALLAX_ARTBOARD_CARD: 'Parallax Block 2',
 }));
 
+// Animated Rive card thumbnail pulls in device sensors; not exercised here.
+jest.mock('../../components/MoneyCardTiltAnimation', () => ({
+  __esModule: true,
+  default: () => null,
+}));
+
 jest.mock('../../hooks/useMoneyAccountTransactions', () => ({
   useMoneyAccountTransactions: jest.fn(),
 }));
@@ -187,6 +194,8 @@ jest.mock('../../../../../core/NavigationService', () => ({
   },
 }));
 
+const mockFetchCardHomeData = jest.fn().mockResolvedValue(undefined);
+
 jest.mock('../../../../../core/Engine', () => ({
   __esModule: true,
   default: {
@@ -194,6 +203,10 @@ jest.mock('../../../../../core/Engine', () => ({
       PreferencesController: {
         setPrivacyMode: jest.fn(),
       },
+      CardController: {
+        fetchCardHomeData: (...args: unknown[]) =>
+          mockFetchCardHomeData(...args),
+      },
     },
   },
 }));
@@ -209,6 +222,7 @@ jest.mock('../../../../../selectors/cardController', () => ({
   selectIsCardholder: jest.fn(),
   selectHasMetalCard: jest.fn(),
   selectCardHomeDataStatus: jest.fn(() => 'idle'),
+  selectIsCardStateResolved: jest.fn(() => true),
   selectIsMoneyAccountDelegatedForCard: jest.fn(() => false),
 }));
 
@@ -306,6 +320,7 @@ jest.mock('../../hooks/useOnboardingStep', () => ({
 const mockSelectIsCardholder = jest.mocked(selectIsCardholder);
 const mockSelectHasMetalCard = jest.mocked(selectHasMetalCard);
 const mockSelectCardHomeDataStatus = jest.mocked(selectCardHomeDataStatus);
+const mockSelectIsCardStateResolved = jest.mocked(selectIsCardStateResolved);
 const mockSelectIsMoneyAccountGeoEligible = jest.mocked(
   selectIsMoneyAccountGeoEligible,
 );
@@ -474,6 +489,7 @@ describe('MoneyHomeView', () => {
     mockSelectIsCardholder.mockReturnValue(false);
     mockSelectHasMetalCard.mockReturnValue(false);
     mockSelectCardHomeDataStatus.mockReturnValue('idle');
+    mockSelectIsCardStateResolved.mockReturnValue(true);
     mockSelectIsMoneyAccountGeoEligible.mockReturnValue(true);
     mockSelectMoneyEnableMoneyAccountFlag.mockReturnValue(true);
     mockSelectMoneyEarningSectionEnabledFlag.mockReturnValue(true);
@@ -621,7 +637,7 @@ describe('MoneyHomeView', () => {
   });
 
   describe('pull to refresh', () => {
-    it('refreshes balance and interest when refresh control onRefresh runs', async () => {
+    it('refreshes balance, interest, and card home data when refresh control onRefresh runs', async () => {
       const { getByTestId } = renderWithProvider(<MoneyHomeView />);
       const scrollView = getByTestId(MoneyHomeViewTestIds.SCROLL_VIEW);
 
@@ -631,6 +647,7 @@ describe('MoneyHomeView', () => {
 
       expect(mockRefetchBalance).toHaveBeenCalledTimes(1);
       expect(mockRefetchInterest).toHaveBeenCalledTimes(1);
+      expect(mockFetchCardHomeData).toHaveBeenCalledWith({ force: true });
     });
 
     it('logs refresh failure when refetchBalance rejects', async () => {
@@ -2756,6 +2773,39 @@ describe('MoneyHomeView', () => {
       ).toBeOnTheScreen();
     });
 
+    it('shows a loading spinner instead of the verification banner while card state is unresolved', () => {
+      mockSelectIsCardholder.mockReturnValue(false);
+      mockSelectIsCardStateResolved.mockReturnValue(false);
+      mockUseMoneyAccountCardLinkage.mockReturnValue({
+        hasMoneyAccountRequirements: true,
+        hasMoneyAccountBaseRequirements: true,
+        isCardAuthenticated: true,
+        isCardVerified: false,
+        isCardLinkedToMoneyAccount: false,
+        primaryMoneyAccount: { address: '0xabc' },
+        moneyAccountCardToken: { symbol: 'USDC' },
+        canLink: false,
+        status: 'idle',
+        isLinking: false,
+        error: null,
+        startLinkFlow: mockStartLinkFlow,
+        openLinkCardSheet: mockOpenLinkCardSheet,
+        reset: jest.fn(),
+      } as unknown as ReturnType<typeof useMoneyAccountCardLinkage>);
+
+      const { getByTestId, queryByTestId } = renderWithProvider(
+        <MoneyHomeView />,
+      );
+
+      expect(getByTestId(MoneyMetaMaskCardTestIds.CONTAINER)).toBeOnTheScreen();
+      expect(
+        getByTestId(MoneyMetaMaskCardTestIds.LOADING_SPINNER),
+      ).toBeOnTheScreen();
+      expect(
+        queryByTestId(MoneyMetaMaskCardTestIds.VERIFYING_BANNER),
+      ).not.toBeOnTheScreen();
+    });
+
     it('disables the link button when linkage is in progress', () => {
       mockSelectIsCardholder.mockReturnValue(true);
       mockUseMoneyAccountCardLinkage.mockReturnValue({
diff --git a/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.tsx b/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.tsx
index af576a2984c2..c43cf0db0ff7 100644
--- a/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.tsx
+++ b/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.tsx
@@ -56,6 +56,7 @@ import {
   selectCardHomeDataStatus,
   selectHasMetalCard,
   selectIsCardholder,
+  selectIsCardStateResolved,
 } from '../../../../../selectors/cardController';
 import { selectIsMoneyAccountGeoEligible } from '../../selectors/eligibility';
 import {
@@ -155,6 +156,7 @@ const MoneyHomeView = () => {
         refetchBalance(),
         refetchInterest(),
         refreshMusdFiatRate(),
+        Engine.context.CardController.fetchCardHomeData({ force: true }),
       ]);
     } catch (error) {
       Logger.error(error as Error, '[MoneyHomeView] Pull-to-refresh failed');
@@ -201,6 +203,7 @@ const MoneyHomeView = () => {
 
   const isCardholder = useSelector(selectIsCardholder);
   const cardHomeDataStatus = useSelector(selectCardHomeDataStatus);
+  const isCardStateResolved = useSelector(selectIsCardStateResolved);
   const hasMetalCard = useSelector(selectHasMetalCard);
   const isMoneyAccountEnabled = useSelector(selectMoneyEnableMoneyAccountFlag);
   const isMoneyEarningSectionEnabled = useSelector(
@@ -231,6 +234,7 @@ const MoneyHomeView = () => {
     isMoneyAccountVisible,
     hasMoneyAccountBaseRequirements,
     hasMoneyAccountRequirements,
+    isCardStateResolved,
   });
 
   let displayState: MoneyBalanceDisplayState;
diff --git a/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.test.tsx b/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.test.tsx
index 227bfcf52d50..c4d3fbe3a788 100644
--- a/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.test.tsx
+++ b/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.test.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { StyleSheet } from 'react-native';
 import { render, fireEvent } from '@testing-library/react-native';
 import MoneyBalanceSummary from './MoneyBalanceSummary';
 import { MoneyBalanceSummaryTestIds } from './MoneyBalanceSummary.testIds';
@@ -293,4 +294,17 @@ describe('MoneyBalanceSummary', () => {
       ).toHaveTextContent('•'.repeat(12));
     });
   });
+
+  it('sits flush under the header, matching the Home page balance', () => {
+    const { getByTestId } = render(
+      <MoneyBalanceSummary apy={4} displayState={balanceState()} />,
+    );
+
+    const container = getByTestId(MoneyBalanceSummaryTestIds.CONTAINER);
+
+    expect(container).toHaveStyle({ paddingLeft: 16, paddingRight: 16 });
+    expect(
+      StyleSheet.flatten(container.props.style).paddingTop,
+    ).toBeUndefined();
+  });
 });
diff --git a/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.tsx b/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.tsx
index d1b444d4ca33..c2dc31bb373e 100644
--- a/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.tsx
+++ b/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.tsx
@@ -156,10 +156,7 @@ const MoneyBalanceSummary = ({
   };
 
   return (
-    <Box
-      twClassName="px-4 pt-4 gap-1"
-      testID={MoneyBalanceSummaryTestIds.CONTAINER}
-    >
+    <Box twClassName="px-4 gap-1" testID={MoneyBalanceSummaryTestIds.CONTAINER}>
       {renderBalanceSlot()}
       <Box
         flexDirection={BoxFlexDirection.Row}
diff --git a/app/components/UI/Money/components/MoneyCardFlipAnimation/MoneyCardFlipAnimation.styles.ts b/app/components/UI/Money/components/MoneyCardFlipAnimation/MoneyCardFlipAnimation.styles.ts
index 875c31b471fb..b9b3dbf3b734 100644
--- a/app/components/UI/Money/components/MoneyCardFlipAnimation/MoneyCardFlipAnimation.styles.ts
+++ b/app/components/UI/Money/components/MoneyCardFlipAnimation/MoneyCardFlipAnimation.styles.ts
@@ -1,6 +1,6 @@
 import { StyleSheet } from 'react-native';
 
-// 620 / 400 is the native size of the MainTilt artboard in card_tilt_v1.2.riv.
+// 620 / 400 is the native size of the MainTilt artboard in card_tilt_v1.3.riv.
 const styles = StyleSheet.create({
   riveContainer: {
     width: 150,
diff --git a/app/components/UI/Money/components/MoneyCardFlipAnimation/MoneyCardFlipAnimation.tsx b/app/components/UI/Money/components/MoneyCardFlipAnimation/MoneyCardFlipAnimation.tsx
index 5e9a77ae7462..383871d8c208 100644
--- a/app/components/UI/Money/components/MoneyCardFlipAnimation/MoneyCardFlipAnimation.tsx
+++ b/app/components/UI/Money/components/MoneyCardFlipAnimation/MoneyCardFlipAnimation.tsx
@@ -11,7 +11,7 @@ import Animated, {
 import { createProjectLogger } from '@metamask/utils';
 import { selectMoneyCardFlipAnimationEnabledFlag } from '../../selectors/featureFlags';
 import { useReduceMotionState } from '../../hooks/useReduceMotion';
-import CardTiltAnimation from '../../../../../animations/card_tilt_v1.2.riv';
+import CardTiltAnimation from '../../../../../animations/card_tilt_v1.3.riv';
 import mmCardRegular from '../../../../../images/mm_card_regular.png';
 import mmCardMetal from '../../../../../images/mm_card_metal.png';
 import styles from './MoneyCardFlipAnimation.styles';
@@ -20,13 +20,13 @@ import { MoneyCardFlipAnimationTestIds } from './MoneyCardFlipAnimation.testIds'
 const log = createProjectLogger('money-card-flip');
 
 // -- Rive names ------------------------------------------------------------
-// These MUST match the names authored in card_tilt_v1.2.riv. If the Rive
+// These MUST match the names authored in card_tilt_v1.3.riv. If the Rive
 // designer renames any of these, update the constants here.
 //
 // The flip is played as a raw timeline on the per-variant artboards. The
-// MainTilt state machine + ViewModel (cardType / startAnimation) do not
-// respond to the data-bound trigger in this asset version, so the state
-// machine is deliberately bypassed here.
+// MainTilt state machine + ViewModel (cardType / startAnimation) do respond
+// to data binding in this asset version, but the state machine is still
+// deliberately bypassed here so the flip plays as a one-shot timeline.
 
 /** Artboard holding the virtual-card flip animation. */
 const RIVE_ARTBOARD_VIRTUAL = 'Card Tilt Y Animation - Digital';
diff --git a/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.styles.ts b/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.styles.ts
new file mode 100644
index 000000000000..cae01fb8f285
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.styles.ts
@@ -0,0 +1,19 @@
+import { StyleSheet } from 'react-native';
+
+const styles = StyleSheet.create({
+  container: {
+    width: 104,
+    height: 66,
+  },
+  media: {
+    width: 104,
+    height: 66,
+  },
+  staticImage: {
+    width: 104,
+    height: 66,
+    borderRadius: 6,
+  },
+});
+
+export default styles;
diff --git a/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.test.tsx b/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.test.tsx
new file mode 100644
index 000000000000..62b33a5d3a87
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.test.tsx
@@ -0,0 +1,246 @@
+import React from 'react';
+import { render, act } from '@testing-library/react-native';
+import MoneyCardTiltAnimation from './MoneyCardTiltAnimation';
+import { MoneyCardTiltAnimationTestIds } from './MoneyCardTiltAnimation.testIds';
+import { useReduceMotion } from '../../hooks/useReduceMotion';
+import { useDeviceOrientation } from '../../hooks/useDeviceOrientation';
+import mmCardRegular from '../../../../../images/mm_card_regular.png';
+import mmCardMetal from '../../../../../images/mm_card_metal.png';
+
+const mockSetNumber = jest.fn();
+const mockViewTag = jest.fn((): number | null => 1);
+const mockOnErrorRef: { current?: (error: { message: string }) => void } = {};
+const mockRiveProps: { current?: { artboardName?: string } } = {};
+const mockMountCount = { current: 0 };
+
+jest.mock('rive-react-native', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View: RNView } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    AutoBind: jest.fn(() => ({})),
+    Fit: { Contain: 'contain' },
+    default: ReactActual.forwardRef(
+      (
+        props: {
+          testID?: string;
+          artboardName?: string;
+          onError?: (error: { message: string }) => void;
+        },
+        ref: React.Ref<{
+          setNumber: (path: string, value: number) => void;
+          viewTag: () => number | null;
+        }>,
+      ) => {
+        mockOnErrorRef.current = props.onError;
+        mockRiveProps.current = { artboardName: props.artboardName };
+        ReactActual.useImperativeHandle(ref, () => ({
+          setNumber: mockSetNumber,
+          viewTag: mockViewTag,
+        }));
+        ReactActual.useEffect(() => {
+          mockMountCount.current += 1;
+        }, []);
+        return ReactActual.createElement(RNView, { testID: props.testID });
+      },
+    ),
+  };
+});
+
+const mockUseSelector = jest.fn();
+jest.mock('react-redux', () => ({
+  useSelector: (selector: unknown) => mockUseSelector(selector),
+}));
+
+jest.mock('../../hooks/useReduceMotion', () => ({
+  useReduceMotion: jest.fn(),
+}));
+
+jest.mock('../../hooks/useDeviceOrientation', () => ({
+  useDeviceOrientation: jest.fn(),
+}));
+
+const mockUseReduceMotion = useReduceMotion as jest.Mock;
+const mockUseDeviceOrientation = useDeviceOrientation as jest.Mock;
+
+describe('MoneyCardTiltAnimation', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockOnErrorRef.current = undefined;
+    mockRiveProps.current = undefined;
+    mockMountCount.current = 0;
+    mockViewTag.mockReturnValue(1);
+    mockUseSelector.mockReturnValue(true);
+    mockUseReduceMotion.mockReturnValue(false);
+  });
+
+  it('renders the Rive animation when the flag is on and reduce motion is off', () => {
+    const { getByTestId, queryByTestId } = render(
+      <MoneyCardTiltAnimation isMetalCard={false} />,
+    );
+
+    expect(getByTestId(MoneyCardTiltAnimationTestIds.RIVE)).toBeOnTheScreen();
+    expect(
+      queryByTestId(MoneyCardTiltAnimationTestIds.STATIC_IMAGE),
+    ).toBeNull();
+  });
+
+  it('renders the digital tilt artboard for a virtual card', () => {
+    render(<MoneyCardTiltAnimation isMetalCard={false} />);
+
+    expect(mockRiveProps.current?.artboardName).toBe('CardTiltDigital');
+  });
+
+  it('renders the metal tilt artboard for a metal card', () => {
+    render(<MoneyCardTiltAnimation isMetalCard />);
+
+    expect(mockRiveProps.current?.artboardName).toBe('CardTiltMetal');
+  });
+
+  it('renders the static image when the feature flag is disabled', () => {
+    mockUseSelector.mockReturnValue(false);
+
+    const { getByTestId, queryByTestId } = render(
+      <MoneyCardTiltAnimation isMetalCard={false} />,
+    );
+
+    expect(
+      getByTestId(MoneyCardTiltAnimationTestIds.STATIC_IMAGE),
+    ).toBeOnTheScreen();
+    expect(queryByTestId(MoneyCardTiltAnimationTestIds.RIVE)).toBeNull();
+  });
+
+  it('renders the static image when reduce motion is enabled', () => {
+    mockUseReduceMotion.mockReturnValue(true);
+
+    const { getByTestId, queryByTestId } = render(
+      <MoneyCardTiltAnimation isMetalCard={false} />,
+    );
+
+    expect(
+      getByTestId(MoneyCardTiltAnimationTestIds.STATIC_IMAGE),
+    ).toBeOnTheScreen();
+    expect(queryByTestId(MoneyCardTiltAnimationTestIds.RIVE)).toBeNull();
+  });
+
+  it('falls back to the static image when Rive reports an error', () => {
+    const { getByTestId, queryByTestId } = render(
+      <MoneyCardTiltAnimation isMetalCard={false} />,
+    );
+
+    act(() => mockOnErrorRef.current?.({ message: 'boom' }));
+
+    expect(
+      getByTestId(MoneyCardTiltAnimationTestIds.STATIC_IMAGE),
+    ).toBeOnTheScreen();
+    expect(queryByTestId(MoneyCardTiltAnimationTestIds.RIVE)).toBeNull();
+  });
+
+  it('uses the metal card image as static fallback for a metal card', () => {
+    mockUseSelector.mockReturnValue(false);
+
+    const { getByTestId } = render(<MoneyCardTiltAnimation isMetalCard />);
+
+    expect(
+      getByTestId(MoneyCardTiltAnimationTestIds.STATIC_IMAGE).props.source,
+    ).toBe(mmCardMetal);
+  });
+
+  it('uses the regular card image as static fallback for a virtual card', () => {
+    mockUseSelector.mockReturnValue(false);
+
+    const { getByTestId } = render(
+      <MoneyCardTiltAnimation isMetalCard={false} />,
+    );
+
+    expect(
+      getByTestId(MoneyCardTiltAnimationTestIds.STATIC_IMAGE).props.source,
+    ).toBe(mmCardRegular);
+  });
+
+  it('enables the device tilt callback when animating', () => {
+    render(<MoneyCardTiltAnimation isMetalCard={false} />);
+
+    expect(mockUseDeviceOrientation).toHaveBeenCalledWith(
+      expect.any(Function),
+      {
+        enabled: true,
+      },
+    );
+  });
+
+  it('disables the device tilt callback when not animating', () => {
+    mockUseReduceMotion.mockReturnValue(true);
+
+    render(<MoneyCardTiltAnimation isMetalCard={false} />);
+
+    expect(mockUseDeviceOrientation).toHaveBeenCalledWith(
+      expect.any(Function),
+      {
+        enabled: false,
+      },
+    );
+  });
+
+  it('drives the bound Rive number properties from mapped tilt values', () => {
+    render(<MoneyCardTiltAnimation isMetalCard={false} />);
+
+    const applyTilt = mockUseDeviceOrientation.mock.calls[0][0] as (
+      x: number,
+      y: number,
+    ) => void;
+
+    act(() => applyTilt(0.5, 0.5));
+
+    expect(mockSetNumber).toHaveBeenCalledWith('xValue', 75);
+    expect(mockSetNumber).toHaveBeenCalledWith('yValue', 25);
+  });
+
+  it('does not dispatch tilt values while the native Rive view is detached', () => {
+    mockViewTag.mockReturnValue(null);
+    render(<MoneyCardTiltAnimation isMetalCard={false} />);
+
+    const applyTilt = mockUseDeviceOrientation.mock.calls[0][0] as (
+      x: number,
+      y: number,
+    ) => void;
+
+    act(() => applyTilt(0.5, -0.5));
+
+    expect(mockSetNumber).not.toHaveBeenCalled();
+  });
+
+  it('remounts the Rive view when the card variant changes', () => {
+    const { rerender } = render(<MoneyCardTiltAnimation isMetalCard={false} />);
+
+    rerender(<MoneyCardTiltAnimation isMetalCard />);
+
+    expect(mockMountCount.current).toBe(2);
+  });
+
+  it('keeps the Rive view mounted when re-rendered with the same variant', () => {
+    const { rerender } = render(<MoneyCardTiltAnimation isMetalCard={false} />);
+
+    rerender(<MoneyCardTiltAnimation isMetalCard={false} testID="renamed" />);
+
+    expect(mockMountCount.current).toBe(1);
+  });
+
+  it('applies the provided testID to the container', () => {
+    const { getByTestId } = render(
+      <MoneyCardTiltAnimation isMetalCard={false} testID="custom-tilt-id" />,
+    );
+
+    expect(getByTestId('custom-tilt-id')).toBeOnTheScreen();
+  });
+
+  it('applies the default container testID when none is provided', () => {
+    const { getByTestId } = render(
+      <MoneyCardTiltAnimation isMetalCard={false} />,
+    );
+
+    expect(
+      getByTestId(MoneyCardTiltAnimationTestIds.CONTAINER),
+    ).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.testIds.ts b/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.testIds.ts
new file mode 100644
index 000000000000..68c05467deed
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.testIds.ts
@@ -0,0 +1,5 @@
+export const MoneyCardTiltAnimationTestIds = {
+  CONTAINER: 'money-card-tilt-animation-container',
+  RIVE: 'money-card-tilt-animation-rive',
+  STATIC_IMAGE: 'money-card-tilt-animation-static-image',
+} as const;
diff --git a/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.tsx b/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.tsx
new file mode 100644
index 000000000000..4123441c2869
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyCardTiltAnimation/MoneyCardTiltAnimation.tsx
@@ -0,0 +1,118 @@
+import React, { useCallback, useRef, useState } from 'react';
+import { Image } from 'react-native';
+import { useSelector } from 'react-redux';
+import { Box } from '@metamask/design-system-react-native';
+import Rive, { AutoBind, Fit, RNRiveError, RiveRef } from 'rive-react-native';
+import { createProjectLogger } from '@metamask/utils';
+import { selectMoneyCardTiltAnimationEnabledFlag } from '../../selectors/featureFlags';
+import { useReduceMotion } from '../../hooks/useReduceMotion';
+import { useDeviceOrientation } from '../../hooks/useDeviceOrientation';
+import {
+  pitchToParallaxValue,
+  tiltToParallaxValue,
+} from '../../utils/parallax';
+import CardTiltAnimation from '../../../../../animations/card_tilt_v1.4.riv';
+import mmCardRegular from '../../../../../images/mm_card_regular.png';
+import mmCardMetal from '../../../../../images/mm_card_metal.png';
+import styles from './MoneyCardTiltAnimation.styles';
+import { MoneyCardTiltAnimationTestIds } from './MoneyCardTiltAnimation.testIds';
+
+const log = createProjectLogger('money-card-tilt');
+
+// -- Rive names ------------------------------------------------------------
+// These MUST match the names authored in card_tilt_v1.4.riv. If the Rive
+// designer renames any of these, update the constants here.
+//
+// The per-variant artboards are rendered directly so the component needs no
+// imperative setup calls that could race the native view's file load. Each
+// board tilts on both axes, driven by `xValue` and `yValue`.
+
+/** Artboard holding the virtual-card tilt. */
+const RIVE_ARTBOARD_DIGITAL = 'CardTiltDigital';
+
+/** Artboard holding the metal-card tilt. */
+const RIVE_ARTBOARD_METAL = 'CardTiltMetal';
+
+/** ViewModel numbers (0-100, rest 50) driving the tilt per axis. */
+const RIVE_PROPERTY_X = 'xValue';
+const RIVE_PROPERTY_Y = 'yValue';
+
+interface MoneyCardTiltAnimationProps {
+  /** Which card variant to show. */
+  isMetalCard: boolean;
+  testID?: string;
+}
+
+const MoneyCardTiltAnimation = ({
+  isMetalCard,
+  testID,
+}: MoneyCardTiltAnimationProps) => {
+  const flagEnabled = useSelector(selectMoneyCardTiltAnimationEnabledFlag);
+  const reduceMotion = useReduceMotion();
+  const [hasRiveError, setHasRiveError] = useState(false);
+  // Written to via a plain ref rather than `useRiveNumber`: that hook echoes
+  // every value back to JS through setState, re-rendering at the accelerometer
+  // sample rate for values this component never reads.
+  const riveRef = useRef<RiveRef>(null);
+
+  const animate = flagEnabled && !reduceMotion && !hasRiveError;
+
+  const applyTilt = useCallback((x: number, y: number) => {
+    const rive = riveRef.current;
+    // viewTag() is null while the native Rive view is detached; dispatching
+    // then throws "found null reactTag".
+    if (!rive || rive.viewTag() === null) return;
+    rive.setNumber(RIVE_PROPERTY_X, tiltToParallaxValue(x));
+    rive.setNumber(RIVE_PROPERTY_Y, pitchToParallaxValue(y));
+  }, []);
+
+  useDeviceOrientation(applyTilt, { enabled: animate });
+
+  const handleError = useCallback((riveError: RNRiveError) => {
+    log(`Rive error: ${riveError.message}`);
+    setHasRiveError(true);
+  }, []);
+
+  const artboardName = isMetalCard
+    ? RIVE_ARTBOARD_METAL
+    : RIVE_ARTBOARD_DIGITAL;
+
+  let content: React.ReactNode;
+  if (animate) {
+    content = (
+      <Rive
+        // Remount per artboard: swapping `artboardName` in place reloads the
+        // artboard but leaves data binding pointing at the previous one.
+        key={artboardName}
+        ref={riveRef}
+        source={CardTiltAnimation}
+        artboardName={artboardName}
+        dataBinding={AutoBind(true)}
+        fit={Fit.Contain}
+        style={styles.media}
+        onError={handleError}
+        testID={MoneyCardTiltAnimationTestIds.RIVE}
+      />
+    );
+  } else {
+    content = (
+      <Image
+        source={isMetalCard ? mmCardMetal : mmCardRegular}
+        style={styles.staticImage}
+        resizeMode="contain"
+        testID={MoneyCardTiltAnimationTestIds.STATIC_IMAGE}
+      />
+    );
+  }
+
+  return (
+    <Box
+      style={styles.container}
+      testID={testID ?? MoneyCardTiltAnimationTestIds.CONTAINER}
+    >
+      {content}
+    </Box>
+  );
+};
+
+export default MoneyCardTiltAnimation;
diff --git a/app/components/UI/Money/components/MoneyCardTiltAnimation/index.ts b/app/components/UI/Money/components/MoneyCardTiltAnimation/index.ts
new file mode 100644
index 000000000000..6f0c809c21c2
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyCardTiltAnimation/index.ts
@@ -0,0 +1,2 @@
+export { default } from './MoneyCardTiltAnimation';
+export { MoneyCardTiltAnimationTestIds } from './MoneyCardTiltAnimation.testIds';
diff --git a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.styles.ts b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.styles.ts
index 29abb8149409..c55c7780e684 100644
--- a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.styles.ts
+++ b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.styles.ts
@@ -4,7 +4,7 @@ const styleSheet = () =>
   StyleSheet.create({
     content: {
       paddingHorizontal: 16,
-      paddingBottom: 8,
+      paddingBottom: 24,
       gap: 16,
     },
   });
diff --git a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.test.tsx b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.test.tsx
index 953c2ca93b6e..c2a95c6c6c51 100644
--- a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.test.tsx
+++ b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { fireEvent } from '@testing-library/react-native';
+import { lightTheme } from '@metamask/design-tokens';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import MoneyEarningsInfoSheet from './MoneyEarningsInfoSheet';
 import { MoneyEarningsInfoSheetTestIds } from './MoneyEarningsInfoSheet.testIds';
@@ -14,7 +15,6 @@ jest.mock('../../hooks/useMoneyAnalytics', () => ({
   useMoneyAnalytics: jest.fn(),
 }));
 
-const mockOnCloseBottomSheet = jest.fn((cb?: () => void) => cb?.());
 const mockGoBack = jest.fn();
 
 jest.mock('@react-navigation/native', () => {
@@ -36,18 +36,25 @@ jest.mock('@metamask/design-system-react-native', () => {
   const ReactActual = jest.requireActual('react');
   const { View, Text: RNText, Pressable } = jest.requireActual('react-native');
 
-  const MockBottomSheet = ReactActual.forwardRef(
-    (
-      { children, testID }: { children: React.ReactNode; testID?: string },
-      ref: React.Ref<{ onCloseBottomSheet: (cb?: () => void) => void }>,
-    ) => {
-      ReactActual.useImperativeHandle(ref, () => ({
-        onCloseBottomSheet: mockOnCloseBottomSheet,
-        onOpenBottomSheet: jest.fn(),
-      }));
-      return ReactActual.createElement(View, { testID }, children);
-    },
-  );
+  const MockBottomSheet = ({
+    children,
+    testID,
+    goBack,
+  }: {
+    children: React.ReactNode;
+    testID?: string;
+    goBack?: () => void;
+  }) =>
+    ReactActual.createElement(
+      View,
+      { testID },
+      ReactActual.createElement(
+        Pressable,
+        { testID: 'bottom-sheet-dismiss', onPress: goBack },
+        ReactActual.createElement(RNText, {}, 'dismiss'),
+      ),
+      children,
+    );
 
   const MockBottomSheetHeader = ({
     children,
@@ -59,11 +66,13 @@ jest.mock('@metamask/design-system-react-native', () => {
     ReactActual.createElement(
       View,
       { testID: 'bottom-sheet-header' },
-      ReactActual.createElement(
-        Pressable,
-        { testID: 'bottom-sheet-close-button', onPress: onClose },
-        ReactActual.createElement(RNText, {}, 'close'),
-      ),
+      onClose
+        ? ReactActual.createElement(
+            Pressable,
+            { testID: 'bottom-sheet-close-button', onPress: onClose },
+            ReactActual.createElement(RNText, {}, 'close'),
+          )
+        : null,
       children,
     );
 
@@ -133,12 +142,26 @@ describe('MoneyEarningsInfoSheet', () => {
     expect(queryByTestId('money-earnings-info-sheet-got-it-button')).toBeNull();
   });
 
-  it('closes the sheet when the close button is pressed', () => {
+  it('does not render a close button', () => {
+    const { queryByTestId } = renderWithProvider(<MoneyEarningsInfoSheet />);
+
+    expect(queryByTestId('bottom-sheet-close-button')).toBeNull();
+  });
+
+  it('navigates back when the sheet is dismissed', () => {
     const { getByTestId } = renderWithProvider(<MoneyEarningsInfoSheet />);
 
-    fireEvent.press(getByTestId('bottom-sheet-close-button'));
+    fireEvent.press(getByTestId('bottom-sheet-dismiss'));
 
-    expect(mockOnCloseBottomSheet).toHaveBeenCalledTimes(1);
+    expect(mockGoBack).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders the body in the alternative text colour', () => {
+    const { getByTestId } = renderWithProvider(<MoneyEarningsInfoSheet />);
+
+    expect(getByTestId(MoneyEarningsInfoSheetTestIds.BODY)).toHaveStyle({
+      color: lightTheme.colors.text.alternative,
+    });
   });
 
   describe('analytics', () => {
diff --git a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.testIds.ts b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.testIds.ts
index 9503d8a52629..cd099cf51c98 100644
--- a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.testIds.ts
+++ b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.testIds.ts
@@ -1,3 +1,4 @@
 export const MoneyEarningsInfoSheetTestIds = {
   CONTAINER: 'money-earnings-info-sheet-container',
+  BODY: 'money-earnings-info-sheet-body',
 } as const;
diff --git a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.tsx b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.tsx
index d61c05078e8c..66f86bc47416 100644
--- a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.tsx
+++ b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useRef } from 'react';
+import React, { useCallback } from 'react';
 import { View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
@@ -6,8 +6,8 @@ import {
   BottomSheet,
   BottomSheetHeader,
   Text,
+  TextColor,
   TextVariant,
-  type BottomSheetRef,
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../../../locales/i18n';
 import { useStyles } from '../../../../../component-library/hooks';
@@ -38,7 +38,6 @@ const VARIANT_CONFIG = {
 } as const;
 
 const MoneyEarningsInfoSheet = () => {
-  const sheetRef = useRef<BottomSheetRef>(null);
   const navigation = useNavigation<AppNavigationProp>();
   const { styles } = useStyles(styleSheet, {});
   const { variant } = useParams<MoneyEarningsInfoSheetParams>();
@@ -54,22 +53,23 @@ const MoneyEarningsInfoSheet = () => {
     navigation.goBack();
   }, [navigation]);
 
-  const handleClose = useCallback(() => {
-    sheetRef.current?.onCloseBottomSheet();
-  }, []);
-
   return (
     <BottomSheet
-      ref={sheetRef}
       goBack={handleGoBack}
       testID={MoneyEarningsInfoSheetTestIds.CONTAINER}
       keyboardAvoidingViewEnabled={false}
     >
-      <BottomSheetHeader onClose={handleClose}>
+      <BottomSheetHeader>
         <Text variant={TextVariant.HeadingSm}>{strings(config.titleKey)}</Text>
       </BottomSheetHeader>
       <View style={styles.content}>
-        <Text variant={TextVariant.BodyMd}>{strings(config.bodyKey)}</Text>
+        <Text
+          variant={TextVariant.BodyMd}
+          color={TextColor.TextAlternative}
+          testID={MoneyEarningsInfoSheetTestIds.BODY}
+        >
+          {strings(config.bodyKey)}
+        </Text>
       </View>
     </BottomSheet>
   );
diff --git a/app/components/UI/Money/components/MoneyHeader/MoneyHeader.test.tsx b/app/components/UI/Money/components/MoneyHeader/MoneyHeader.test.tsx
index 2b7a7ebcc97f..c529eb9a97b5 100644
--- a/app/components/UI/Money/components/MoneyHeader/MoneyHeader.test.tsx
+++ b/app/components/UI/Money/components/MoneyHeader/MoneyHeader.test.tsx
@@ -29,4 +29,13 @@ describe('MoneyHeader', () => {
 
     expect(mockOnMenuPress).toHaveBeenCalledTimes(1);
   });
+
+  it('uses the same horizontal padding as the Home page header', () => {
+    const { getByTestId } = render(<MoneyHeader onMenuPress={jest.fn()} />);
+
+    expect(getByTestId(MoneyHeaderTestIds.CONTAINER)).toHaveStyle({
+      paddingLeft: 16,
+      paddingRight: 12,
+    });
+  });
 });
diff --git a/app/components/UI/Money/components/MoneyHeader/MoneyHeader.tsx b/app/components/UI/Money/components/MoneyHeader/MoneyHeader.tsx
index a3c8afea6dc7..5a961c7d4546 100644
--- a/app/components/UI/Money/components/MoneyHeader/MoneyHeader.tsx
+++ b/app/components/UI/Money/components/MoneyHeader/MoneyHeader.tsx
@@ -13,7 +13,7 @@ interface MoneyHeaderProps {
 const MoneyHeader = ({ onMenuPress }: MoneyHeaderProps) => (
   <HeaderRoot
     testID={MoneyHeaderTestIds.CONTAINER}
-    twClassName="px-4"
+    twClassName="pl-4 pr-3"
     endButtonIconProps={[
       {
         iconName: IconName.MoreVertical,
diff --git a/app/components/UI/Money/components/MoneyLinkCardSheet/MoneyLinkCardSheet.tsx b/app/components/UI/Money/components/MoneyLinkCardSheet/MoneyLinkCardSheet.tsx
index 5920c907eccb..d7dcfb4c8fa3 100644
--- a/app/components/UI/Money/components/MoneyLinkCardSheet/MoneyLinkCardSheet.tsx
+++ b/app/components/UI/Money/components/MoneyLinkCardSheet/MoneyLinkCardSheet.tsx
@@ -21,6 +21,7 @@ import {
   selectCardHomeData,
   selectCardHomeDataStatus,
 } from '../../../../../selectors/cardController';
+import Engine from '../../../../../core/Engine';
 import { useMoneyAccountCardLinkage } from '../../../Card/hooks/useMoneyAccountCardLinkage';
 import useMoneyAccountBalance from '../../hooks/useMoneyAccountBalance';
 import { CardType } from '../../../Card/types';
@@ -65,6 +66,12 @@ const MoneyLinkCardSheet = () => {
   const isCardDataReady =
     cardHomeDataStatus === 'success' || cardHomeDataStatus === 'error';
 
+  useEffect(() => {
+    if (cardHomeDataStatus === 'idle') {
+      Engine.context.CardController.fetchCardHomeData();
+    }
+  }, [cardHomeDataStatus]);
+
   useEffect(() => {
     if (hasTrackedViewRef.current || !isCardDataReady) return;
     hasTrackedViewRef.current = true;
diff --git a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.styles.ts b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.styles.ts
index 318e10c7a0e2..c48746ee8821 100644
--- a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.styles.ts
+++ b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.styles.ts
@@ -1,19 +1,10 @@
 import { StyleSheet } from 'react-native';
 
 const styles = StyleSheet.create({
-  cardImage: {
-    width: 104,
-    height: 66,
-  },
   linkCardImage: {
     width: 111,
     height: 70,
   },
-  manageCardImage: {
-    width: 104,
-    height: 66,
-    borderRadius: 6,
-  },
 });
 
 export default styles;
diff --git a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.test.tsx b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.test.tsx
index 1942fb907ca3..162aaac905c8 100644
--- a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.test.tsx
+++ b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.test.tsx
@@ -28,6 +28,24 @@ jest.mock('../../../../hooks/useAnalytics/useAnalytics', () => ({
   }),
 }));
 
+const MOCK_TILT_ANIMATION_TEST_ID = 'mock-money-card-tilt-animation';
+const mockTiltAnimationCalls: { isMetalCard: boolean }[] = [];
+
+// Animated Rive thumbnail pulls in redux + device sensors; not exercised here.
+jest.mock('../MoneyCardTiltAnimation', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View: RNView } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ({ isMetalCard }: { isMetalCard: boolean }) => {
+      mockTiltAnimationCalls.push({ isMetalCard });
+      return ReactActual.createElement(RNView, {
+        testID: MOCK_TILT_ANIMATION_TEST_ID,
+      });
+    },
+  };
+});
+
 describe('MoneyMetaMaskCard', () => {
   const analyticsProps = {
     analyticsScreen: CardScreens.MONEY_HOME,
@@ -38,6 +56,7 @@ describe('MoneyMetaMaskCard', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockTiltAnimationCalls.length = 0;
   });
 
   it('renders the section title and subtitle', () => {
@@ -529,6 +548,38 @@ describe('MoneyMetaMaskCard', () => {
     });
   });
 
+  describe('mode="loading"', () => {
+    it('renders the MetaMask Card title and a loading spinner', () => {
+      const { getByText, getByTestId } = render(
+        <MoneyMetaMaskCard mode="loading" onGetNowPress={jest.fn()} />,
+      );
+
+      expect(getByText(strings('money.metamask_card.title'))).toBeOnTheScreen();
+      expect(
+        getByTestId(MoneyMetaMaskCardTestIds.LOADING_SPINNER),
+      ).toBeOnTheScreen();
+    });
+
+    it('does not render link, manage, verifying, or upsell content', () => {
+      const { queryByTestId } = render(
+        <MoneyMetaMaskCard mode="loading" onGetNowPress={jest.fn()} />,
+      );
+
+      expect(
+        queryByTestId(MoneyMetaMaskCardTestIds.LINK_CONTAINER),
+      ).not.toBeOnTheScreen();
+      expect(
+        queryByTestId(MoneyMetaMaskCardTestIds.MANAGE_CONTAINER),
+      ).not.toBeOnTheScreen();
+      expect(
+        queryByTestId(MoneyMetaMaskCardTestIds.VERIFYING_BANNER),
+      ).not.toBeOnTheScreen();
+      expect(
+        queryByTestId(MoneyMetaMaskCardTestIds.VIRTUAL_CARD_ROW),
+      ).not.toBeOnTheScreen();
+    });
+  });
+
   describe('upsell mode (default)', () => {
     it('renders only the virtual card row regardless of showMetalCard', () => {
       const { getByTestId, queryByTestId } = render(
@@ -567,6 +618,72 @@ describe('MoneyMetaMaskCard', () => {
     });
   });
 
+  describe('card thumbnail', () => {
+    it('renders the tilt animation thumbnail with the virtual variant in upsell mode', () => {
+      const { getByTestId } = render(
+        <MoneyMetaMaskCard onGetNowPress={jest.fn()} />,
+      );
+
+      expect(getByTestId(MOCK_TILT_ANIMATION_TEST_ID)).toBeOnTheScreen();
+      expect(mockTiltAnimationCalls).toEqual([{ isMetalCard: false }]);
+    });
+
+    it('keeps the virtual variant in upsell mode even when showMetalCard is true', () => {
+      render(<MoneyMetaMaskCard onGetNowPress={jest.fn()} showMetalCard />);
+
+      expect(mockTiltAnimationCalls).toEqual([{ isMetalCard: false }]);
+    });
+
+    it('renders the tilt animation thumbnail with the metal variant in manage mode when showMetalCard is true', () => {
+      const { getByTestId } = render(
+        <MoneyMetaMaskCard
+          mode="manage"
+          onGetNowPress={jest.fn()}
+          onManagePress={jest.fn()}
+          cardBalance="$0.00"
+          showMetalCard
+        />,
+      );
+
+      expect(getByTestId(MOCK_TILT_ANIMATION_TEST_ID)).toBeOnTheScreen();
+      expect(mockTiltAnimationCalls).toEqual([{ isMetalCard: true }]);
+    });
+
+    it('renders the tilt animation thumbnail with the virtual variant in manage mode when showMetalCard is false', () => {
+      render(
+        <MoneyMetaMaskCard
+          mode="manage"
+          onGetNowPress={jest.fn()}
+          onManagePress={jest.fn()}
+          cardBalance="$0.00"
+          showMetalCard={false}
+        />,
+      );
+
+      expect(mockTiltAnimationCalls).toEqual([{ isMetalCard: false }]);
+    });
+
+    it('keeps the static card image in link mode and does not render the tilt animation', () => {
+      const { getByTestId, queryByTestId } = render(
+        <MoneyMetaMaskCard mode="link" onGetNowPress={jest.fn()} />,
+      );
+
+      expect(
+        getByTestId(MoneyMetaMaskCardTestIds.LINK_CARD_IMAGE),
+      ).toBeOnTheScreen();
+      expect(queryByTestId(MOCK_TILT_ANIMATION_TEST_ID)).toBeNull();
+      expect(mockTiltAnimationCalls).toEqual([]);
+    });
+
+    it('does not render the tilt animation in verifying mode', () => {
+      const { queryByTestId } = render(
+        <MoneyMetaMaskCard mode="verifying" onGetNowPress={jest.fn()} />,
+      );
+
+      expect(queryByTestId(MOCK_TILT_ANIMATION_TEST_ID)).toBeNull();
+    });
+  });
+
   describe('analytics', () => {
     it('does not track when analytics props are omitted', () => {
       render(<MoneyMetaMaskCard onGetNowPress={jest.fn()} />);
diff --git a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.testIds.ts b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.testIds.ts
index f3078d0855a4..87fe03578830 100644
--- a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.testIds.ts
+++ b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.testIds.ts
@@ -15,4 +15,5 @@ export const MoneyMetaMaskCardTestIds = {
   MANAGE_METAL_GET_NOW: 'money-mm-card-manage-metal-get-now',
   MANAGE_BALANCE: 'money-mm-card-manage-balance',
   VERIFYING_BANNER: 'money-mm-card-verifying-banner',
+  LOADING_SPINNER: 'money-mm-card-loading-spinner',
 } as const;
diff --git a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.tsx b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.tsx
index 9f219a654224..841f3473fb37 100644
--- a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.tsx
+++ b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useRef } from 'react';
-import { Image, ImageSourcePropType } from 'react-native';
+import { Image } from 'react-native';
 import {
   BannerAlert,
   BannerAlertSeverity,
@@ -17,12 +17,14 @@ import {
   IconSize,
   SensitiveText,
   SensitiveTextLength,
+  Spinner,
   Text,
   TextColor,
   TextVariant,
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../../../locales/i18n';
 import MoneySectionHeader from '../MoneySectionHeader';
+import MoneyCardTiltAnimation from '../MoneyCardTiltAnimation';
 import { MoneyMetaMaskCardTestIds } from './MoneyMetaMaskCard.testIds';
 import styles from './MoneyMetaMaskCard.styles';
 import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
@@ -43,7 +45,7 @@ interface MoneyMetaMaskCardProps {
    * 'link': card-linking CTA layout.
    * 'manage': cardholder management layout with available balance and metal upsell.
    */
-  mode?: 'upsell' | 'link' | 'manage' | 'verifying';
+  mode?: 'upsell' | 'link' | 'manage' | 'verifying' | 'loading';
   onGetNowPress: () => void;
   /** Called when the "Link card" button is pressed (link mode only). */
   onLinkPress?: () => void;
@@ -85,13 +87,13 @@ interface MoneyMetaMaskCardProps {
 }
 
 const CardRow = ({
-  imageSource,
+  isMetalCard,
   cardName,
   cashbackPercentage,
   onPress,
   testID,
 }: {
-  imageSource: ImageSourcePropType;
+  isMetalCard: boolean;
   cardName: string;
   cashbackPercentage: string;
   onPress: () => void;
@@ -109,7 +111,7 @@ const CardRow = ({
       alignItems={BoxAlignItems.Center}
       twClassName="gap-4"
     >
-      <Image source={imageSource} style={styles.cardImage} />
+      <MoneyCardTiltAnimation isMetalCard={isMetalCard} />
       <Box twClassName="gap-1">
         <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
           {cardName}
@@ -261,10 +263,7 @@ const ManageContent = ({
       twClassName="pt-3 gap-3"
       testID={MoneyMetaMaskCardTestIds.MANAGE_BALANCE_ROW}
     >
-      <Image
-        source={showMetalCard ? mmCardMetal : mmCardRegular}
-        style={styles.manageCardImage}
-      />
+      <MoneyCardTiltAnimation isMetalCard={showMetalCard} />
       <Box alignItems={BoxAlignItems.End} twClassName="gap-1 flex-1">
         <SensitiveText
           variant={TextVariant.BodyMd}
@@ -437,6 +436,17 @@ const MoneyMetaMaskCard = ({
         />
       </Box>
     );
+  } else if (mode === 'loading') {
+    content = (
+      <Box
+        alignItems={BoxAlignItems.Center}
+        justifyContent={BoxJustifyContent.Center}
+        twClassName="py-3"
+        testID={MoneyMetaMaskCardTestIds.LOADING_SPINNER}
+      >
+        <Spinner spinnerIconProps={{ size: IconSize.Lg }} />
+      </Box>
+    );
   } else {
     content = (
       <>
@@ -448,7 +458,7 @@ const MoneyMetaMaskCard = ({
           {strings('money.metamask_card.subtitle')}
         </Text>
         <CardRow
-          imageSource={mmCardRegular}
+          isMetalCard={false}
           cardName={strings('money.metamask_card.virtual_card')}
           cashbackPercentage="1"
           onPress={handleGetNowPress}
@@ -461,7 +471,7 @@ const MoneyMetaMaskCard = ({
   let headerTitleKey: string;
   if (mode === 'link') {
     headerTitleKey = 'money.metamask_card.link_title';
-  } else if (mode === 'manage' || mode === 'verifying') {
+  } else if (mode === 'manage' || mode === 'verifying' || mode === 'loading') {
     headerTitleKey = 'money.metamask_card.title';
   } else {
     headerTitleKey = 'money.metamask_card.upsell_title';
diff --git a/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.test.tsx b/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.test.tsx
index 1634d524a309..3aae0071baee 100644
--- a/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.test.tsx
+++ b/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.test.tsx
@@ -79,12 +79,14 @@ jest.mock('../../../../hooks/useAnalytics/useAnalytics', () => ({
 
 const mockIsCardholder = jest.fn(() => true);
 const mockCardHomeDataStatus = jest.fn(() => 'success');
+const mockIsCardStateResolved = jest.fn(() => true);
 jest.mock('react-redux', () => ({
   useSelector: (selector: (state: unknown) => unknown) => selector(undefined),
 }));
 jest.mock('../../../../../selectors/cardController', () => ({
   selectIsCardholder: () => mockIsCardholder(),
   selectCardHomeDataStatus: () => mockCardHomeDataStatus(),
+  selectIsCardStateResolved: () => mockIsCardStateResolved(),
 }));
 
 const mockUseOnboardingStep = useOnboardingStep as jest.MockedFunction<
@@ -149,11 +151,14 @@ const setupDefaultMocks = ({
     isLinking: false,
   });
   mockIsCardholder.mockReturnValue(isCardholder);
+  mockIsCardStateResolved.mockReturnValue(true);
 };
 
 describe('MoneyOnboardingCard', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockIsCardStateResolved.mockReturnValue(true);
+    mockCardHomeDataStatus.mockReturnValue('success');
     (useMoneyAnalytics as jest.Mock).mockReturnValue({
       trackOnboardingEvent: mockTrackOnboardingEvent,
     });
@@ -176,6 +181,35 @@ describe('MoneyOnboardingCard', () => {
       expect(toJSON()).toBeNull();
     });
 
+    it('renders step 1 while card state is unresolved', () => {
+      setupDefaultMocks({ currentStep: 0, tokenTotal: new BigNumber(0) });
+      mockIsCardStateResolved.mockReturnValue(false);
+
+      const { getByTestId } = render(<MoneyOnboardingCard />);
+
+      expect(getByTestId('money-onboarding-card-title')).toHaveTextContent(
+        strings('money.onboarding.step_1.title_no_apy'),
+      );
+    });
+
+    it('returns null while card state is unresolved and the account is funded', () => {
+      setupDefaultMocks({ currentStep: 0, tokenTotal: new BigNumber(1) });
+      mockIsCardStateResolved.mockReturnValue(false);
+
+      const { toJSON } = render(<MoneyOnboardingCard />);
+
+      expect(toJSON()).toBeNull();
+    });
+
+    it('returns null while card state is unresolved at step 2', () => {
+      setupDefaultMocks({ currentStep: 1 });
+      mockIsCardStateResolved.mockReturnValue(false);
+
+      const { toJSON } = render(<MoneyOnboardingCard />);
+
+      expect(toJSON()).toBeNull();
+    });
+
     it('renders the card container when currentStep is 0', () => {
       setupDefaultMocks({ currentStep: 0 });
 
diff --git a/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.tsx b/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.tsx
index cbc884a854e5..30b28e161785 100644
--- a/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.tsx
+++ b/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.tsx
@@ -28,6 +28,7 @@ import { useSelector } from 'react-redux';
 import {
   selectIsCardholder,
   selectCardHomeDataStatus,
+  selectIsCardStateResolved,
 } from '../../../../../selectors/cardController';
 import { useMoneyAnalytics } from '../../hooks/useMoneyAnalytics';
 import {
@@ -70,6 +71,7 @@ const MoneyOnboardingCard = () => {
   } = useMoneyAccountCardLinkage();
   const isCardholder = useSelector(selectIsCardholder);
   const cardHomeDataStatus = useSelector(selectCardHomeDataStatus);
+  const isCardStateResolved = useSelector(selectIsCardStateResolved);
 
   const isMoneyAccountFunded = Boolean(
     !isBalanceLoading && tokenTotal?.isGreaterThan(0),
@@ -366,7 +368,15 @@ const MoneyOnboardingCard = () => {
     handleSkipPress,
   ]);
 
-  if (isBalanceLoading || !isOnboardingCardVisible || !isVisibleAfterAutoSkip) {
+  const isWaitingForCardState =
+    !isCardStateResolved && effectiveCurrentStep > 0;
+
+  if (
+    isBalanceLoading ||
+    isWaitingForCardState ||
+    !isOnboardingCardVisible ||
+    !isVisibleAfterAutoSkip
+  ) {
     return null;
   }
 
diff --git a/app/components/UI/Money/hooks/useMoneyAccountBalance.test.ts b/app/components/UI/Money/hooks/useMoneyAccountBalance.test.ts
index a6cb4c43e884..8c9beb3ed716 100644
--- a/app/components/UI/Money/hooks/useMoneyAccountBalance.test.ts
+++ b/app/components/UI/Money/hooks/useMoneyAccountBalance.test.ts
@@ -204,6 +204,19 @@ describe('useMoneyAccountBalance', () => {
     expect(result.current.isBalanceLoading).toBe(false);
   });
 
+  it('disables every query when disabled', () => {
+    renderHook(() => useMoneyAccountBalance({ enabled: false }));
+
+    expect(mockUseQuery).toHaveBeenNthCalledWith(
+      1,
+      expect.objectContaining({ enabled: false }),
+    );
+    expect(mockUseQuery).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({ enabled: false }),
+    );
+  });
+
   it('returns undefined tokenTotal when still loading', () => {
     setupDefaultQueries({
       data: undefined,
diff --git a/app/components/UI/Money/hooks/useMoneyAccountBalance.ts b/app/components/UI/Money/hooks/useMoneyAccountBalance.ts
index 1aec2423b750..2aee7b6b635c 100644
--- a/app/components/UI/Money/hooks/useMoneyAccountBalance.ts
+++ b/app/components/UI/Money/hooks/useMoneyAccountBalance.ts
@@ -62,9 +62,15 @@ interface UseMoneyAccountBalanceResult {
   apyPercentFormatted: string | undefined;
 }
 
-const useMoneyAccountBalance = (
-  refetchInterval: number = DEFAULT_REFETCH_INTERVAL,
-): UseMoneyAccountBalanceResult => {
+interface UseMoneyAccountBalanceOptions {
+  enabled?: boolean;
+  refetchInterval?: number;
+}
+
+const useMoneyAccountBalance = ({
+  enabled = true,
+  refetchInterval = DEFAULT_REFETCH_INTERVAL,
+}: UseMoneyAccountBalanceOptions = {}): UseMoneyAccountBalanceResult => {
   const dispatch = useDispatch();
   const { primaryMoneyAccount } = useMoneyAccountInfo();
   const moneyAccountAddress = primaryMoneyAccount?.address;
@@ -80,12 +86,13 @@ const useMoneyAccountBalance = (
       MoneyAccountBalanceServiceQueryKeys.FETCH_BALANCE_WITH_FALLBACK,
       moneyAccountAddress as string,
     ],
-    enabled: Boolean(moneyAccountAddress),
+    enabled: enabled && Boolean(moneyAccountAddress),
     refetchInterval,
   }) as UseQueryResult<CanonicalMoneyAccountBalanceResponse>;
 
   const vaultApyQuery = useQuery({
     queryKey: [MoneyAccountBalanceServiceQueryKeys.GET_VAULT_APY],
+    enabled,
     refetchInterval: FIVE_MINUTES_MS,
   }) as UseQueryResult<NormalizedVaultApyResponse>;
 
@@ -103,10 +110,10 @@ const useMoneyAccountBalance = (
 
   const refetchBalance = useCallback(
     () =>
-      moneyAccountAddress
+      enabled && moneyAccountAddress
         ? invalidateMoneyAccountBalanceCaches(moneyAccountAddress)
         : Promise.resolve(),
-    [moneyAccountAddress],
+    [enabled, moneyAccountAddress],
   );
 
   const { tokenTotal, totalFiat, withdrawableFiat, withdrawableMusd } =
@@ -163,6 +170,7 @@ const useMoneyAccountBalance = (
   // is unavailable — including after an app restart.
   useEffect(() => {
     if (
+      enabled &&
       moneyAccountAddress &&
       !isBalanceFetchError &&
       !isBalanceLoading &&
@@ -179,6 +187,7 @@ const useMoneyAccountBalance = (
     }
   }, [
     dispatch,
+    enabled,
     moneyAccountAddress,
     isBalanceFetchError,
     totalFiatFormatted,
diff --git a/app/components/UI/Money/selectors/featureFlags.test.ts b/app/components/UI/Money/selectors/featureFlags.test.ts
index cd9ce0a00131..a62168c166df 100644
--- a/app/components/UI/Money/selectors/featureFlags.test.ts
+++ b/app/components/UI/Money/selectors/featureFlags.test.ts
@@ -14,6 +14,7 @@ import {
   selectMoneyNoFeeDepositTokens,
   selectMoneyFirstTimeDepositAnimationEnabledFlag,
   selectMoneyCardFlipAnimationEnabledFlag,
+  selectMoneyCardTiltAnimationEnabledFlag,
   selectMoneyParallaxAnimationEnabledFlag,
   selectMoneyVaultApyRemoteConfig,
   selectIsMoneyAssetOverviewBalanceCtaEnabledFlag,
@@ -947,6 +948,91 @@ describe('selectMoneyCardFlipAnimationEnabledFlag', () => {
   });
 });
 
+describe('selectMoneyCardTiltAnimationEnabledFlag', () => {
+  const originalEnv = process.env;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    process.env = { ...originalEnv };
+  });
+
+  afterEach(() => {
+    process.env = originalEnv;
+  });
+
+  it('returns true when remote flag is enabled and version requirement is met', () => {
+    mockedValidate.mockReturnValue(true);
+
+    const state = createState({
+      earnMoneyCardTiltAnimationEnabled: {
+        enabled: true,
+        minimumVersion: '1.0.0',
+      },
+    });
+
+    const result = selectMoneyCardTiltAnimationEnabledFlag(state as never);
+
+    expect(result).toBe(true);
+  });
+
+  it('returns false when remote flag is disabled', () => {
+    mockedValidate.mockReturnValue(false);
+
+    const state = createState({
+      earnMoneyCardTiltAnimationEnabled: {
+        enabled: false,
+        minimumVersion: '1.0.0',
+      },
+    });
+
+    const result = selectMoneyCardTiltAnimationEnabledFlag(state as never);
+
+    expect(result).toBe(false);
+  });
+
+  it('defaults to true when remote flag returns undefined and env is unset', () => {
+    mockedValidate.mockReturnValue(undefined);
+    delete process.env.MM_MONEY_CARD_TILT_ANIMATION_ENABLED;
+
+    const state = createState({
+      _unique: 'card-tilt-default-on',
+    });
+
+    const result = selectMoneyCardTiltAnimationEnabledFlag(state as never);
+
+    expect(result).toBe(true);
+  });
+
+  it('returns false when env var is set to false and remote is undefined', () => {
+    mockedValidate.mockReturnValue(undefined);
+    process.env.MM_MONEY_CARD_TILT_ANIMATION_ENABLED = 'false';
+
+    const state = createState({
+      _unique: 'card-tilt-env-false',
+    });
+
+    const result = selectMoneyCardTiltAnimationEnabledFlag(state as never);
+
+    expect(result).toBe(false);
+  });
+
+  it('remote flag takes precedence over env var', () => {
+    mockedValidate.mockReturnValue(false);
+    process.env.MM_MONEY_CARD_TILT_ANIMATION_ENABLED = 'true';
+
+    const state = createState({
+      earnMoneyCardTiltAnimationEnabled: {
+        enabled: false,
+        minimumVersion: '1.0.0',
+      },
+    });
+
+    const result = selectMoneyCardTiltAnimationEnabledFlag(state as never);
+
+    expect(result).toBe(false);
+  });
+});
+
 describe('selectMoneyParallaxAnimationEnabledFlag', () => {
   const originalEnv = process.env;
 
diff --git a/app/components/UI/Money/selectors/featureFlags.ts b/app/components/UI/Money/selectors/featureFlags.ts
index 57bee5e3792e..9daf91dddb38 100644
--- a/app/components/UI/Money/selectors/featureFlags.ts
+++ b/app/components/UI/Money/selectors/featureFlags.ts
@@ -246,6 +246,20 @@ export const selectMoneyCardFlipAnimationEnabledFlag = createSelector(
   },
 );
 
+/**
+ * Kill-switch for the tilt-driven Rive card thumbnail animation.
+ * Defaults to ON (true).
+ */
+export const selectMoneyCardTiltAnimationEnabledFlag = createSelector(
+  selectRemoteFeatureFlags,
+  (remoteFeatureFlags) => {
+    const remoteFlag =
+      remoteFeatureFlags?.earnMoneyCardTiltAnimationEnabled as unknown as VersionGatedFeatureFlag;
+    const local = process.env.MM_MONEY_CARD_TILT_ANIMATION_ENABLED !== 'false';
+    return validatedVersionGatedFeatureFlag(remoteFlag) ?? local;
+  },
+);
+
 const FALLBACK_MONEY_DEPOSIT_MIN_BALANCE = 0.01; // 1 cent
 
 /**
diff --git a/app/components/UI/Money/utils/moneyMetaMaskCardMode.test.ts b/app/components/UI/Money/utils/moneyMetaMaskCardMode.test.ts
index 30030665fb46..ca6464038ae9 100644
--- a/app/components/UI/Money/utils/moneyMetaMaskCardMode.test.ts
+++ b/app/components/UI/Money/utils/moneyMetaMaskCardMode.test.ts
@@ -9,6 +9,7 @@ const baseInput = {
   isMoneyAccountVisible: true,
   hasMoneyAccountBaseRequirements: true,
   hasMoneyAccountRequirements: true,
+  isCardStateResolved: true,
 };
 
 describe('deriveMoneyMetaMaskCardMode', () => {
@@ -171,4 +172,35 @@ describe('deriveMoneyMetaMaskCardMode', () => {
       }),
     ).toBe('link');
   });
+
+  it('returns loading when card state is unresolved and Money account is visible', () => {
+    expect(
+      deriveMoneyMetaMaskCardMode({
+        ...baseInput,
+        isCardStateResolved: false,
+        isCardAuthenticated: true,
+      }),
+    ).toBe('loading');
+  });
+
+  it('returns null when card state is unresolved and Money account is not visible', () => {
+    expect(
+      deriveMoneyMetaMaskCardMode({
+        ...baseInput,
+        isCardStateResolved: false,
+        isCardAuthenticated: true,
+        isMoneyAccountVisible: false,
+      }),
+    ).toBeNull();
+  });
+
+  it('prefers loading over manage while card state is unresolved', () => {
+    expect(
+      deriveMoneyMetaMaskCardMode({
+        ...baseInput,
+        isCardStateResolved: false,
+        isCardLinkedToMoneyAccount: true,
+      }),
+    ).toBe('loading');
+  });
 });
diff --git a/app/components/UI/Money/utils/moneyMetaMaskCardMode.ts b/app/components/UI/Money/utils/moneyMetaMaskCardMode.ts
index 9a4871e0802d..a5bec4de1d69 100644
--- a/app/components/UI/Money/utils/moneyMetaMaskCardMode.ts
+++ b/app/components/UI/Money/utils/moneyMetaMaskCardMode.ts
@@ -1,4 +1,9 @@
-export type MoneyMetaMaskCardMode = 'upsell' | 'link' | 'manage' | 'verifying';
+export type MoneyMetaMaskCardMode =
+  | 'upsell'
+  | 'link'
+  | 'manage'
+  | 'verifying'
+  | 'loading';
 
 export interface MoneyMetaMaskCardModeInput {
   isCardLinkedToMoneyAccount: boolean;
@@ -9,6 +14,7 @@ export interface MoneyMetaMaskCardModeInput {
   isMoneyAccountVisible: boolean;
   hasMoneyAccountBaseRequirements: boolean;
   hasMoneyAccountRequirements: boolean;
+  isCardStateResolved: boolean;
 }
 
 export const deriveMoneyMetaMaskCardMode = ({
@@ -20,7 +26,12 @@ export const deriveMoneyMetaMaskCardMode = ({
   isMoneyAccountVisible,
   hasMoneyAccountBaseRequirements,
   hasMoneyAccountRequirements,
+  isCardStateResolved,
 }: MoneyMetaMaskCardModeInput): MoneyMetaMaskCardMode | null => {
+  if (!isCardStateResolved) {
+    return isMoneyAccountVisible ? 'loading' : null;
+  }
+
   // Card already linked to the Money account -> manage it.
   if (isCardLinkedToMoneyAccount) return 'manage';
 
diff --git a/app/components/UI/Navbar/index.js b/app/components/UI/Navbar/index.js
index 07c609a4d4bf..7cb2d2ec56aa 100644
--- a/app/components/UI/Navbar/index.js
+++ b/app/components/UI/Navbar/index.js
@@ -1,439 +1,37 @@
 /* eslint-disable react/display-name */
 import React from 'react';
-import NavbarTitle from '../NavbarTitle';
-import ModalNavbarTitle from '../ModalNavbarTitle';
-import {
-  Alert,
-  Image,
-  StyleSheet,
-  Text,
-  TouchableOpacity,
-  View,
-} from 'react-native';
+import { Image, StyleSheet, Text, View } from 'react-native';
 import { colors as importedColors, fontStyles } from '../../../styles/common';
-import IonicIcon from 'react-native-vector-icons/Ionicons';
 import { strings } from '../../../../locales/i18n';
-import AppConstants from '../../../core/AppConstants';
-import { SharedDeeplinkManager } from '../../../core/DeeplinkManager/DeeplinkManager';
-import { MetaMetricsEvents } from '../../../core/Analytics';
-import { analytics } from '../../../util/analytics/analytics';
-import { Authentication } from '../../../core';
-import { isNotificationsFeatureEnabled } from '../../../util/notifications';
 import Device from '../../../util/device';
-import { NavbarSelectorsIDs } from './Navbar.testIds';
-import Routes from '../../../constants/navigation/Routes';
-
-import {
-  default as MorphText,
-  TextVariant,
-  TextColor,
-} from '../../../component-library/components/Texts/Text';
-import { CommonSelectorsIDs } from '../../../util/Common.testIds';
-import { NetworksViewSelectorsIDs } from '../../Views/Settings/NetworksSettings/NetworksView.testIds';
-import Icon, {
-  IconName,
-  IconSize,
-  IconColor,
-} from '../../../component-library/components/Icons/Icon';
-import { AddContactViewSelectorsIDs } from '../../Views/Settings/Contacts/AddContactView.testIds';
-import { SettingsViewSelectorsIDs } from '../../Views/Settings/SettingsView.testIds';
-import getHeaderCompactStandardNavbarOptions from '../../../component-library/components-temp/HeaderCompactStandard/getHeaderCompactStandardNavbarOptions';
-import BottomSheetHeader from '../../../component-library/components/BottomSheets/BottomSheetHeader';
-import { AnalyticsEventBuilder } from '../../../util/analytics/AnalyticsEventBuilder';
-
 import {
-  BadgeStatus,
-  BadgeStatusStatus,
-  BadgeWrapperPosition,
-  BadgeWrapperPositionAnchorShape,
-  BadgeWrapper,
   ButtonIcon,
   ButtonIconSize,
-  HeaderBase,
-  IconColor as MMDSIconColor,
 } from '@metamask/design-system-react-native';
-
-import { withMetaMetrics } from '../Stake/utils/metaMetrics/withMetaMetrics';
-import { BridgeViewMode } from '../Bridge/types';
+import { IconName } from '../../../component-library/components/Icons/Icon';
 
 const styles = StyleSheet.create({
-  hitSlop: {
-    top: 15,
-    bottom: 15,
-    left: 15,
-    right: 15,
-  },
-  metamaskName: {
-    width: 70,
-    height: 35,
-  },
-  metamaskFox: {
-    width: 40,
-    height: 40,
-    marginRight: 10,
-  },
-  backIconIOS: {
-    marginHorizontal: 4,
-    marginTop: -4,
-  },
-  shareIconIOS: {
-    marginHorizontal: -5,
-  },
-  hamburgerButton: {
-    paddingLeft: Device.isAndroid() ? 22 : 18,
-    paddingRight: Device.isAndroid() ? 22 : 18,
-    paddingTop: Device.isAndroid() ? 14 : 10,
-    paddingBottom: Device.isAndroid() ? 14 : 10,
-  },
-  backButton: {
-    paddingLeft: Device.isAndroid() ? 22 : 18,
-    paddingRight: Device.isAndroid() ? 22 : 18,
-    marginTop: 5,
-  },
   closeButton: {
     paddingHorizontal: Device.isAndroid() ? 22 : 18,
     paddingVertical: Device.isAndroid() ? 14 : 8,
   },
-  disabled: {
-    opacity: 0.3,
-  },
-  rightElementContainer: {
-    marginRight: 12,
-    flexDirection: 'row',
-    alignItems: 'flex-end',
-    gap: 12,
-  },
-  optinHeaderLeft: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    marginHorizontal: Device.isIos() ? 20 : 0,
-  },
   metamaskNameTransparentWrapper: {
     alignItems: 'center',
     justifyContent: 'center',
     flex: 1,
   },
-  metamaskNameWrapper: {
-    marginLeft: Device.isAndroid() ? 20 : 0,
-  },
-  leftElementContainer: {
-    marginLeft: 16,
-  },
-  headerLeftButton: {
-    marginHorizontal: 16,
-  },
-  headerRightButton: {
-    marginHorizontal: 16,
-  },
-  iconButton: {
-    marginHorizontal: 24,
-  },
-  hidden: {
-    opacity: 0,
-  },
 });
 
 const metamask_name = require('../../../images/branding/metamask-name.png'); // eslint-disable-line
-const metamask_fox = require('../../../images/branding/fox.png'); // eslint-disable-line
-
-/**
- * Function that returns the navigation options
- * This is used by views that will show our custom navbar which contains Title
- *
- * @param {string} title - Title in string format
- * @param {Object} navigation - Navigation object required to push new views
- * @param isFullScreenModal
- * @param themeColors
- * @param {IMetaMetricsEvent} navigationPopEvent
- * @returns {Object} - Corresponding navbar options containing title and headerTitleStyle
- */
-export function getNavigationOptionsTitle(
-  title,
-  navigation,
-  isFullScreenModal,
-  themeColors,
-  navigationPopEvent = null,
-) {
-  const innerStyles = StyleSheet.create({
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-    accessories: {
-      marginHorizontal: 16,
-    },
-  });
-
-  function navigationPop() {
-    if (navigationPopEvent)
-      analytics.trackEvent(
-        AnalyticsEventBuilder.createEventBuilder(navigationPopEvent).build(),
-      );
-    navigation.goBack();
-  }
-
-  return {
-    title,
-    headerTitle: <MorphText variant={TextVariant.HeadingMD}>{title}</MorphText>,
-    headerTitleAlign: 'center',
-    headerRight: () =>
-      isFullScreenModal ? (
-        <ButtonIcon
-          size={ButtonIconSize.Lg}
-          iconName={IconName.Close}
-          onPress={navigationPop}
-          style={innerStyles.accessories}
-          testID={NetworksViewSelectorsIDs.CLOSE_ICON}
-        />
-      ) : null,
-    headerLeft: () =>
-      isFullScreenModal ? null : (
-        <ButtonIcon
-          size={ButtonIconSize.Md}
-          iconName={IconName.ArrowLeft}
-          onPress={navigationPop}
-          style={innerStyles.accessories}
-          testID={CommonSelectorsIDs.BACK_ARROW_BUTTON}
-        />
-      ),
-    headerTintColor: themeColors.primary.default,
-    ...innerStyles,
-  };
-}
-
-/**
- * Function that returns the navigation options
- * This is used by contact form
- *
- * @param {string} title - Title in string format
- * @param {Object} navigation - Navigation object required to push new views
- * @returns {Object} - Corresponding navbar options
- */
-export function getEditableOptions(title, navigation, route, themeColors) {
-  const innerStyles = StyleSheet.create({
-    headerTitleStyle: {
-      fontSize: 20,
-      color: themeColors.text.default,
-      ...fontStyles.normal,
-    },
-    headerIcon: {
-      color: themeColors.primary.default,
-    },
-    headerButtonText: {
-      color: themeColors.primary.default,
-      fontSize: 14,
-      ...fontStyles.normal,
-    },
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-  });
-
-  function navigationPop() {
-    navigation.pop();
-  }
-
-  const rightAction = route.params?.dispatch;
-  const editMode = route.params?.editMode === 'edit';
-  const addMode = route.params?.mode === 'add';
-  return {
-    title,
-    headerTitleStyle: innerStyles.headerTitleStyle,
-    headerLeft: () => (
-      <TouchableOpacity
-        onPress={navigationPop}
-        style={styles.backButton}
-        testID={CommonSelectorsIDs.EDIT_CONTACT_BACK_BUTTON}
-      >
-        <IonicIcon
-          name={'arrow-back'}
-          size={Device.isAndroid() ? 24 : 28}
-          style={innerStyles.headerIcon}
-        />
-      </TouchableOpacity>
-    ),
-    headerRight: () =>
-      !addMode ? (
-        <TouchableOpacity
-          onPress={rightAction}
-          style={styles.backButton}
-          testID={AddContactViewSelectorsIDs.EDIT_BUTTON}
-        >
-          <Text style={innerStyles.headerButtonText}>
-            {editMode
-              ? strings('address_book.edit')
-              : strings('address_book.cancel')}
-          </Text>
-        </TouchableOpacity>
-      ) : (
-        <View />
-      ),
-    headerStyle: innerStyles.headerStyle,
-    headerTintColor: themeColors.primary.default,
-  };
-}
 
 /**
- * Function that returns the navigation options
- * This is used by views that confirms transactions, showing current network
+ * Transparent navigation options for onboarding-style screens.
  *
- * @param {string} title - Title in string format
- * @returns {Object} - Corresponding navbar options containing title and headerTitleStyle
- */
-export function getTransactionOptionsTitle(
-  _title,
-  navigation,
-  route,
-  themeColors,
-) {
-  const innerStyles = StyleSheet.create({
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-    headerButtonText: {
-      color: themeColors.primary.default,
-      fontSize: 14,
-      ...fontStyles.normal,
-    },
-  });
-  const transactionMode = route.params?.mode ?? '';
-  const { name } = route;
-  const leftText =
-    transactionMode === 'edit'
-      ? strings('transaction.cancel')
-      : strings('transaction.edit');
-  const disableModeChange = route.params?.disableModeChange;
-  const modeChange = route.params?.dispatch;
-  const leftAction = () => modeChange('edit');
-  const rightAction = () => navigation.pop();
-  const rightText = strings('transaction.cancel');
-  const title = transactionMode === 'edit' ? 'transaction.edit' : _title;
-
-  return {
-    headerTitle: () => <NavbarTitle title={title} disableNetwork />,
-    headerLeft: () =>
-      transactionMode !== 'edit' ? (
-        <TouchableOpacity
-          disabled={disableModeChange}
-          // eslint-disable-next-line react/jsx-no-bind
-          onPress={leftAction}
-          style={styles.closeButton}
-          testID={CommonSelectorsIDs.CONFIRM_TXN_EDIT_BUTTON}
-        >
-          <Text
-            style={
-              disableModeChange
-                ? [innerStyles.headerButtonText, styles.disabled]
-                : innerStyles.headerButtonText
-            }
-          >
-            {leftText}
-          </Text>
-        </TouchableOpacity>
-      ) : (
-        <View />
-      ),
-    headerRight: () =>
-      name === 'Send' ? (
-        // eslint-disable-next-line react/jsx-no-bind
-        <TouchableOpacity
-          onPress={rightAction}
-          style={styles.closeButton}
-          testID={CommonSelectorsIDs.SEND_BACK_BUTTON}
-        >
-          <Text style={innerStyles.headerButtonText}>{rightText}</Text>
-        </TouchableOpacity>
-      ) : (
-        <View />
-      ),
-    headerStyle: innerStyles.headerStyle,
-    headerTintColor: themeColors.primary.default,
-  };
-}
-
-export function getApproveNavbar(title) {
-  return {
-    headerTitle: () => <NavbarTitle title={title} disableNetwork />,
-    headerLeft: () => <View />,
-    headerRight: () => <View />,
-  };
-}
-
-/**
- * Function that returns the navigation options
- * for our modals
- *
- * @param {string} title - Title in string format
- * @returns {Object} - Corresponding navbar options containing headerTitle
- */
-export function getModalNavbarOptions(title) {
-  return {
-    headerTitle: () => <ModalNavbarTitle title={title} />,
-  };
-}
-
-/**
- * Function that returns the navigation options
- * for our onboarding screens,
- * which is just the metamask log and the Back button
- *
- * @returns {Object} - Corresponding navbar options containing headerTitle, headerTitle and headerTitle
- */
-export function getOnboardingNavbarOptions(
-  route,
-  { headerLeft, headerRight },
-  themeColors,
-  showLogo = true,
-) {
-  const headerLeftHide =
-    headerLeft || route.params?.headerLeft || (() => <View />);
-  const headerRightHide =
-    headerRight || route.params?.headerRight || (() => <View />);
-  const innerStyles = StyleSheet.create({
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-    metamaskName: {
-      width: 70,
-      height: 35,
-      tintColor: themeColors.text.default,
-    },
-  });
-
-  return {
-    headerStyle: innerStyles.headerStyle,
-    headerTitle: showLogo
-      ? () => (
-          <View style={styles.metamaskNameTransparentWrapper}>
-            <Image
-              source={metamask_name}
-              style={innerStyles.metamaskName}
-              resizeMethod={'auto'}
-            />
-          </View>
-        )
-      : '',
-    headerRight: headerRightHide,
-    headerLeft: headerLeftHide,
-    headerTintColor: themeColors.primary.default,
-  };
-}
-
-/**
- * Function that returns a transparent navigation options for our onboarding screens.
- *
- * @returns {Object} - Corresponding navbar options containing headerTitle
  * @param {Object} themeColors - The theme colors object
- * @param {string} backgroundColor - The color to overwrite the background color
- * @param {boolean} showLogo - Whether to show the logo
- * @param {string} logoColor - The color to overwrite the logo color
+ * @param {string} [backgroundColor]
+ * @param {boolean} [showLogo=true]
+ * @param {string} [logoColor]
+ * @returns {Object} Navbar options
  */
 export function getTransparentOnboardingNavbarOptions(
   themeColors,
@@ -471,151 +69,9 @@ export function getTransparentOnboardingNavbarOptions(
 }
 
 /**
- * Function that returns a transparent navigation options for our onboarding screens.
+ * Navigation options for the offline mode modal.
  *
- * @returns {Object} - Corresponding navbar options containing headerTitle and a back button
- * @param {Object} themeColors - The theme colors object
- */
-export function getTransparentBackOnboardingNavbarOptions(themeColors) {
-  const innerStyles = StyleSheet.create({
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-    metamaskName: {
-      width: 70,
-      height: 35,
-      tintColor: themeColors.text.default,
-    },
-  });
-  return {
-    headerTitle: () => (
-      <View style={styles.metamaskNameTransparentWrapper}>
-        <Image
-          source={metamask_name}
-          style={innerStyles.metamaskName}
-          resizeMethod={'auto'}
-        />
-      </View>
-    ),
-    headerBackTitle: strings('navigation.back'),
-    headerRight: () => <View />,
-    headerStyle: innerStyles.headerStyle,
-    headerTintColor: themeColors.primary.default,
-  };
-}
-
-/**
- * Function that returns the navigation options
- * for our metric opt-in screen
- *
- * @returns {Object} - Corresponding navbar options containing headerLeft
- */
-export function getOptinMetricsNavbarOptions(themeColors, showLogo = true) {
-  const innerStyles = StyleSheet.create({
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-    metamaskName: {
-      width: 70,
-      height: 35,
-      tintColor: themeColors.text.default,
-    },
-  });
-  return {
-    headerTitle: () =>
-      showLogo ? (
-        <View style={styles.metamaskNameTransparentWrapper}>
-          <Image
-            source={metamask_name}
-            style={innerStyles.metamaskName}
-            resizeMethod={'auto'}
-          />
-        </View>
-      ) : null,
-    headerBackTitle: strings('navigation.back'),
-    headerRight: () => <View />,
-    headerLeft: () => <View />,
-    headerStyle: innerStyles.headerStyle,
-    headerTintColor: themeColors.primary.default,
-  };
-}
-
-/**
- * Function that returns the navigation options
- * for our closable screens,
- *
- * @returns {Object} - Corresponding navbar options containing headerTitle, headerTitle and headerTitle
- */
-export function getClosableNavigationOptions(
-  title,
-  backButtonText,
-  navigation,
-  themeColors,
-) {
-  const innerStyles = StyleSheet.create({
-    headerButtonText: {
-      color: themeColors.primary.default,
-      fontSize: 14,
-      ...fontStyles.normal,
-    },
-    headerIcon: {
-      color: themeColors.primary.default,
-    },
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-    headerTitleStyle: {
-      fontSize: 20,
-      ...fontStyles.normal,
-      color: themeColors.text.default,
-    },
-  });
-
-  function navigationPop() {
-    navigation.pop();
-  }
-
-  return {
-    title,
-    headerTitleStyle: innerStyles.headerTitleStyle,
-    headerLeft: () =>
-      Device.isIos() ? (
-        <TouchableOpacity
-          onPress={navigationPop}
-          style={styles.closeButton}
-          testID={CommonSelectorsIDs.NAV_IOS_BACK}
-        >
-          <Text style={innerStyles.headerButtonText}>{backButtonText}</Text>
-        </TouchableOpacity>
-      ) : (
-        <TouchableOpacity
-          onPress={navigationPop}
-          style={styles.backButton}
-          testID={NavbarSelectorsIDs.ANDROID_BACK_BUTTON}
-        >
-          <IonicIcon
-            name={'arrow-back'}
-            size={24}
-            style={innerStyles.headerIcon}
-          />
-        </TouchableOpacity>
-      ),
-    headerStyle: innerStyles.headerStyle,
-    headerTintColor: themeColors.primary.default,
-  };
-}
-
-/**
- * Function that returns the navigation options
- * for our closable screens,
- *
- * @returns {Object} - Corresponding navbar options containing headerTitle, headerTitle and headerTitle
+ * @returns {Object} Navbar options with header hidden
  */
 export function getOfflineModalNavbar() {
   return {
@@ -624,621 +80,12 @@ export function getOfflineModalNavbar() {
 }
 
 /**
- * Function that returns the navigation options for the Import Asset screen
- *
- * @param {Object} navigation - Navigation object required to push new views
- * @param {string} title - Title in string format
- * @returns {Object} - Corresponding navbar options
- */
-export function getImportTokenNavbarOptions(navigation, title, onPress) {
-  return {
-    header: () => (
-      <BottomSheetHeader
-        includesTopInset
-        onBack={onPress ?? (() => navigation.goBack())}
-      >
-        {title}
-      </BottomSheetHeader>
-    ),
-  };
-}
-
-export function getNftDetailsNavbarOptions(
-  navigation,
-  themeColors,
-  onRightPress,
-  contentOffset = 0,
-) {
-  const innerStyles = StyleSheet.create({
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-    headerShadow: {
-      elevation: 2,
-      shadowColor: themeColors.background.primary,
-      shadowOpacity: contentOffset < 20 ? contentOffset / 100 : 0.2,
-      shadowOffset: { height: 4, width: 0 },
-      shadowRadius: 8,
-    },
-    headerIcon: {
-      color: themeColors.primary.default,
-    },
-    headerBackIcon: {
-      color: themeColors.icon.default,
-    },
-  });
-  return {
-    headerLeft: () => (
-      <TouchableOpacity
-        onPress={() => navigation.pop()}
-        style={styles.backButton}
-        testID={CommonSelectorsIDs.BACK_ARROW_BUTTON}
-      >
-        <Icon
-          name={IconName.ArrowLeft}
-          size={IconSize.Lg}
-          style={innerStyles.headerBackIcon}
-        />
-      </TouchableOpacity>
-    ),
-    headerRight: onRightPress
-      ? () => (
-          <TouchableOpacity style={styles.backButton} onPress={onRightPress}>
-            <Icon
-              name={IconName.MoreVertical}
-              size={IconSize.Lg}
-              style={innerStyles.headerBackIcon}
-            />
-          </TouchableOpacity>
-        )
-      : () => <View />,
-    headerStyle: [
-      innerStyles.headerStyle,
-      contentOffset && innerStyles.headerShadow,
-    ],
-  };
-}
-
-export function getNftFullImageNavbarOptions(
-  navigation,
-  themeColors,
-  contentOffset = 0,
-) {
-  const innerStyles = StyleSheet.create({
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-    headerShadow: {
-      elevation: 2,
-      shadowColor: themeColors.background.primary,
-      shadowOpacity: contentOffset < 20 ? contentOffset / 100 : 0.2,
-      shadowOffset: { height: 4, width: 0 },
-      shadowRadius: 8,
-    },
-    headerIcon: {
-      color: themeColors.primary.default,
-    },
-    headerBackIcon: {
-      color: themeColors.icon.default,
-    },
-  });
-  return {
-    headerRight: () => (
-      <TouchableOpacity
-        style={styles.backButton}
-        onPress={() => navigation.pop()}
-      >
-        <Icon
-          name={IconName.Close}
-          size={IconSize.Lg}
-          style={innerStyles.headerBackIcon}
-        />
-      </TouchableOpacity>
-    ),
-    headerLeft: () => <View />,
-    headerStyle: [
-      innerStyles.headerStyle,
-      contentOffset && innerStyles.headerShadow,
-    ],
-  };
-}
-
-/**
- * Function that returns the navigation options containing title and network indicator
+ * Navigation options for the Edit Account Name screen.
  *
- * @param {string} title - Title in string format
- * @param {boolean} translate - Boolean that specifies if the title needs translation
- * @param {Object} navigation - Navigation object required to push new views
- * @param {Object} themeColors - Colors from theme
- * @param {Function} onRightPress - Callback that determines if right button exists
- * @param {boolean} disableNetwork - Boolean that determines if network is accessible from navbar
- * @returns {Object} - Corresponding navbar options containing headerTitle and headerTitle
+ * @param {Function} goBack
+ * @param {Object} themeColors
+ * @returns {Object} Navbar options
  */
-export function getNetworkNavbarOptions(
-  title,
-  translate,
-  navigation,
-  themeColors,
-  onRightPress = undefined,
-  disableNetwork = false,
-  contentOffset = 0,
-  networkName = '',
-) {
-  return {
-    header: () => (
-      <HeaderBase
-        includesTopInset
-        twClassName="h-auto"
-        startAccessory={
-          <ButtonIcon
-            style={styles.headerLeftButton}
-            onPress={() => navigation.pop()}
-            testID={CommonSelectorsIDs.BACK_ARROW_BUTTON}
-            size={ButtonIconSize.Md}
-            iconName={IconName.ArrowLeft}
-            iconColor={IconColor.Default}
-          />
-        }
-        endAccessory={
-          onRightPress ? (
-            <ButtonIcon
-              style={styles.headerRightButton}
-              onPress={onRightPress}
-              size={ButtonIconSize.Lg}
-              iconName={IconName.MoreVertical}
-              iconColor={IconColor.Default}
-            />
-          ) : (
-            // Empty View to maintain layout spacing without showing a button
-            <View style={styles.headerRightButton} />
-          )
-        }
-      >
-        <NavbarTitle
-          disableNetwork={disableNetwork}
-          title={title}
-          translate={translate}
-          networkName={networkName}
-        />
-      </HeaderBase>
-    ),
-  };
-}
-
-export function getPaymentSelectorMethodNavbar(navigation, onPop, themeColors) {
-  const innerStyles = StyleSheet.create({
-    headerButtonText: {
-      color: themeColors.primary.default,
-    },
-    headerTitleStyle: {
-      fontSize: 20,
-      color: themeColors.text.default,
-      textAlign: 'center',
-      ...fontStyles.normal,
-      alignItems: 'center',
-    },
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-  });
-  return {
-    headerTitle: () => (
-      <Text style={innerStyles.headerTitleStyle}>
-        {strings('fiat_on_ramp.purchase_method')}
-      </Text>
-    ),
-    headerLeft: () => <View />,
-    headerRight: () => (
-      // eslint-disable-next-line react/jsx-no-bind
-      <TouchableOpacity
-        onPress={() => {
-          navigation.getParent()?.pop();
-          onPop?.();
-        }}
-        style={styles.closeButton}
-      >
-        <Text style={innerStyles.headerButtonText}>
-          {strings('navigation.cancel')}
-        </Text>
-      </TouchableOpacity>
-    ),
-    headerStyle: innerStyles.headerStyle,
-  };
-}
-
-export function getPaymentMethodApplePayNavbar(
-  navigation,
-  onPop,
-  onExit,
-  themeColors,
-) {
-  const innerStyles = StyleSheet.create({
-    headerTitleStyle: {
-      fontSize: 20,
-      color: themeColors.text.default,
-      ...fontStyles.normal,
-    },
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-    headerButtonText: {
-      color: themeColors.primary.default,
-    },
-    headerIcon: {
-      color: themeColors.primary.default,
-    },
-  });
-  return {
-    title: strings('fiat_on_ramp.amount_to_buy'),
-    headerTitleStyle: innerStyles.headerTitleStyle,
-    headerRight: () => (
-      // eslint-disable-next-line react/jsx-no-bind
-      <TouchableOpacity
-        onPress={() => {
-          navigation.getParent()?.pop();
-          onExit?.();
-        }}
-        style={styles.closeButton}
-      >
-        <Text style={innerStyles.headerButtonText}>
-          {strings('navigation.cancel')}
-        </Text>
-      </TouchableOpacity>
-    ),
-    headerLeft: () =>
-      Device.isAndroid() ? (
-        // eslint-disable-next-line react/jsx-no-bind
-        <TouchableOpacity
-          onPress={() => {
-            navigation.pop();
-            onPop?.();
-          }}
-          style={styles.backButton}
-        >
-          <IonicIcon
-            name={'arrow-back'}
-            size={24}
-            style={innerStyles.headerIcon}
-          />
-        </TouchableOpacity>
-      ) : (
-        // eslint-disable-next-line react/jsx-no-bind
-        <TouchableOpacity
-          onPress={() => {
-            navigation.pop();
-            onPop?.();
-          }}
-          style={styles.closeButton}
-        >
-          <Text style={innerStyles.headerButtonText}>
-            {strings('navigation.back')}
-          </Text>
-        </TouchableOpacity>
-      ),
-    headerStyle: innerStyles.headerStyle,
-  };
-}
-
-export function getTransakWebviewNavbar(navigation, route, onPop, themeColors) {
-  const innerStyles = StyleSheet.create({
-    headerTitleStyle: {
-      fontSize: 20,
-      color: themeColors.text.default,
-      ...fontStyles.normal,
-    },
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-    headerIcon: {
-      color: themeColors.primary.default,
-    },
-  });
-
-  const title = route.params?.title ?? '';
-  return {
-    title,
-    headerTitleStyle: innerStyles.headerTitleStyle,
-    headerLeft: () =>
-      Device.isAndroid() ? (
-        // eslint-disable-next-line react/jsx-no-bind
-        <TouchableOpacity
-          onPress={() => {
-            navigation.pop();
-            onPop?.();
-          }}
-          style={styles.backButton}
-        >
-          <IonicIcon
-            name={'arrow-back'}
-            size={24}
-            style={innerStyles.headerIcon}
-          />
-        </TouchableOpacity>
-      ) : (
-        // eslint-disable-next-line react/jsx-no-bind
-        <TouchableOpacity
-          onPress={() => {
-            navigation.pop();
-            onPop?.();
-          }}
-          style={styles.backButton}
-        >
-          <IonicIcon
-            name="close"
-            size={38}
-            style={[innerStyles.headerIcon, styles.backIconIOS]}
-          />
-        </TouchableOpacity>
-      ),
-    headerStyle: innerStyles.headerStyle,
-    headerTintColor: themeColors.primary.default,
-  };
-}
-
-export function getSwapsAmountNavbar(navigation, route, themeColors) {
-  const innerStyles = StyleSheet.create({
-    headerButtonText: {
-      color: themeColors.primary.default,
-      fontSize: 14,
-      ...fontStyles.normal,
-    },
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-  });
-  const title = route.params?.title ?? 'Swap';
-  return {
-    headerTitle: () => (
-      <NavbarTitle
-        title={title}
-        disableNetwork
-        translate={false}
-        showSelectedNetwork={false}
-      />
-    ),
-    headerLeft: () => <View />,
-    headerRight: () => (
-      // eslint-disable-next-line react/jsx-no-bind
-      <TouchableOpacity
-        onPress={() => navigation.getParent()?.pop()}
-        style={styles.closeButton}
-      >
-        <Text style={innerStyles.headerButtonText}>
-          {strings('navigation.cancel')}
-        </Text>
-      </TouchableOpacity>
-    ),
-    headerStyle: innerStyles.headerStyle,
-  };
-}
-
-export function getSwapsQuotesNavbar(navigation, route, themeColors) {
-  const innerStyles = StyleSheet.create({
-    headerButtonText: {
-      color: themeColors.primary.default,
-      fontSize: 14,
-      ...fontStyles.normal,
-    },
-    headerIcon: {
-      color: themeColors.primary.default,
-    },
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
-  });
-  const title = route.params?.title ?? 'Swap';
-  const leftActionText = route.params?.leftAction ?? strings('navigation.back');
-
-  const trackQuotesCancelledIfNeeded = () => {
-    const trade = route.params?.requestedTrade;
-    const selectedQuote = route.params?.selectedQuote;
-    const quoteBegin = route.params?.quoteBegin;
-    if (!selectedQuote) {
-      analytics.trackEvent(
-        AnalyticsEventBuilder.createEventBuilder(
-          MetaMetricsEvents.QUOTES_REQUEST_CANCELLED,
-        )
-          .addProperties({
-            action: 'Quote',
-            name: 'Swaps',
-            token_from: trade.token_from,
-            token_to: trade.token_to,
-            request_type: trade.request_type,
-            custom_slippage: trade.custom_slippage,
-            chain_id: trade.chain_id,
-            responseTime: new Date().getTime() - quoteBegin,
-          })
-          .addSensitiveProperties({
-            token_from_amount: trade.token_from_amount,
-          })
-          .build(),
-      );
-    }
-  };
-
-  const leftAction = () => {
-    trackQuotesCancelledIfNeeded();
-    navigation.pop();
-  };
-
-  const rightAction = () => {
-    trackQuotesCancelledIfNeeded();
-    navigation.getParent()?.pop();
-  };
-
-  return {
-    headerTitle: () => (
-      <NavbarTitle title={title} disableNetwork translate={false} />
-    ),
-    headerLeft: () =>
-      Device.isAndroid() ? (
-        // eslint-disable-next-line react/jsx-no-bind
-        <TouchableOpacity onPress={leftAction} style={styles.backButton}>
-          <IonicIcon
-            name={'arrow-back'}
-            size={24}
-            style={innerStyles.headerIcon}
-          />
-        </TouchableOpacity>
-      ) : (
-        // eslint-disable-next-line react/jsx-no-bind
-        <TouchableOpacity onPress={leftAction} style={styles.closeButton}>
-          <Text style={innerStyles.headerButtonText}>{leftActionText}</Text>
-        </TouchableOpacity>
-      ),
-    headerRight: () => (
-      // eslint-disable-next-line react/jsx-no-bind
-      <TouchableOpacity onPress={rightAction} style={styles.closeButton}>
-        <Text style={innerStyles.headerButtonText}>
-          {strings('navigation.cancel')}
-        </Text>
-      </TouchableOpacity>
-    ),
-    headerStyle: innerStyles.headerStyle,
-  };
-}
-
-export function getBridgeNavbar(navigation, bridgeViewMode, themeColors) {
-  let title = `${strings('swaps.title')}/${strings('bridge.title')}`;
-  if (bridgeViewMode === BridgeViewMode.Bridge) {
-    title = strings('bridge.title');
-  } else if (
-    bridgeViewMode === BridgeViewMode.Swap ||
-    bridgeViewMode === BridgeViewMode.Unified
-  ) {
-    title = strings('swaps.title');
-  }
-
-  return getHeaderCompactStandardNavbarOptions({
-    title,
-    onBack: () => navigation.goBack(),
-    includesTopInset: true,
-  });
-}
-
-export function getBridgeTransactionDetailsNavbar(navigation) {
-  const leftAction = () => navigation.pop();
-
-  return {
-    headerTitle: () => (
-      <NavbarTitle
-        title={strings('bridge_transaction_details.transaction_details')}
-        disableNetwork
-        showSelectedNetwork={false}
-        translate={false}
-      />
-    ),
-    headerLeft: () => (
-      <TouchableOpacity onPress={leftAction} style={styles.backButton}>
-        <Icon name={IconName.ArrowLeft} />
-      </TouchableOpacity>
-    ),
-  };
-}
-
-export function getPerpsTransactionsDetailsNavbar(navigation, title) {
-  const innerStyles = StyleSheet.create({
-    perpsTransactionsTitle: {
-      fontWeight: '700',
-      textAlign: 'center',
-      flex: 1,
-    },
-    rightSpacer: {
-      width: 48, // Same width as the back button to balance the header
-    },
-  });
-  // Go back to transaction history view
-  const leftAction = () => navigation.goBack();
-
-  return {
-    headerTitleAlign: 'center',
-    headerTitle: () => (
-      <NavbarTitle
-        style={innerStyles.perpsTransactionsTitle}
-        variant={TextVariant.HeadingMD}
-        title={title}
-        disableNetwork
-        showSelectedNetwork={false}
-        translate={false}
-      />
-    ),
-    headerLeft: () => (
-      <ButtonIcon
-        iconName={IconName.Arrow2Left}
-        onPress={leftAction}
-        size={ButtonIconSize.Md}
-      />
-    ),
-    headerRight: () => <View style={innerStyles.rightSpacer} />,
-  };
-}
-
-/**
- * Function that returns navigation options for deposit flow screens
- *
- * @param {string} title - Title to display in the header
- * @param {Object} navigation - Navigation object required to navigate between screens
- * @param {Object} theme - Theme object containing colors
- * @param {Function} onClose - Optional custom close function
- * @returns {Object} - Navigation options object
- */
-export function getDepositNavbarOptions(
-  navigation,
-  {
-    title,
-    showBack = true,
-    showClose = true,
-    showConfiguration = false,
-    onConfigurationPress,
-  },
-  theme,
-  onClose = undefined,
-) {
-  let startButtonIconProps, closeButtonProps;
-  if (showBack || showClose) {
-    startButtonIconProps = {
-      iconName: IconName.ArrowLeft,
-      onPress: () => {
-        navigation.pop();
-        onClose?.();
-      },
-      testID: 'deposit-back-navbar-button',
-    };
-  }
-
-  if (showConfiguration) {
-    closeButtonProps = {
-      iconName: IconName.Setting,
-      onPress: onConfigurationPress,
-      testID: NavbarSelectorsIDs.DEPOSIT_CONFIGURATION_BUTTON,
-    };
-  }
-
-  return getHeaderCompactStandardNavbarOptions({
-    title,
-    startButtonIconProps,
-    closeButtonProps,
-    includesTopInset: true,
-    style: {
-      backgroundColor: theme.colors.background.default,
-    },
-  });
-}
-
 export const getEditAccountNameNavBarOptions = (goBack, themeColors) => {
   const innerStyles = StyleSheet.create({
     headerStyle: {
@@ -1267,193 +114,3 @@ export const getEditAccountNameNavBarOptions = (goBack, themeColors) => {
     ...innerStyles,
   };
 };
-
-/**
- *
- * @param {String} title - Navbar Title.
- * @param {NavigationProp<ParamListBase>} navigation Navigation object returned from useNavigation hook.
- * @param {ThemeColors} themeColors theme.colors returned from useStyles hook.
- * @param {{ backgroundColor?: string, hasCancelButton?: boolean, hasBackButton?: boolean, hasIconButton?: boolean, handleIconPress?: () => void }} [navBarOptions] - Optional navbar options.
- * @param {{ cancelButtonEvent?: { event: IMetaMetricsEvent, properties: Record<string, string> }, backButtonEvent?: { event: IMetaMetricsEvent, properties: Record<string, string>}, iconButtonEvent?: { event: IMetaMetricsEvent, properties: Record<string, string> } }} [metricsOptions] - Optional metrics options.
- * @param {import('../Earn/types/lending.types').EarnTokenDetails | null | undefined} [earnToken] - Optional earn token.
- * @param {string | null | undefined} [aprOverride] - Optional APR override (e.g., for Tron staking).
- * @returns Staking Navbar Component.
- */
-export function getStakingNavbar(
-  title,
-  navigation,
-  themeColors,
-  navBarOptions,
-  metricsOptions,
-  ///: BEGIN:ONLY_INCLUDE_IF(tron)
-  earnToken = null,
-  aprOverride = null,
-  ///: END:ONLY_INCLUDE_IF
-) {
-  const {
-    hasBackButton = true,
-    hasCancelButton = true,
-    hasIconButton = false,
-    handleIconPress,
-  } = navBarOptions ?? {};
-
-  const innerStyles = StyleSheet.create({
-    headerStyle: {
-      backgroundColor:
-        navBarOptions?.backgroundColor ?? themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      shadowOffset: null,
-    },
-    headerLeft: {
-      marginHorizontal: 16,
-    },
-    headerButtonText: {
-      color: themeColors.primary.default,
-      fontSize: 14,
-      ...fontStyles.normal,
-    },
-    headerTitle: {
-      alignItems: 'center',
-    },
-    headerTitleBalanceAndAPR: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      gap: 8,
-      marginTop: 4,
-    },
-  });
-
-  function navigationPop() {
-    navigation.goBack();
-  }
-
-  function handleBackPress() {
-    if (metricsOptions?.backButtonEvent) {
-      withMetaMetrics(navigationPop, {
-        event: metricsOptions.backButtonEvent.event,
-        properties: metricsOptions.backButtonEvent.properties,
-      })();
-    } else {
-      navigationPop();
-    }
-  }
-
-  function handleCancelPress() {
-    if (metricsOptions?.cancelButtonEvent) {
-      withMetaMetrics(navigationPop, {
-        event: metricsOptions.cancelButtonEvent.event,
-        properties: metricsOptions.cancelButtonEvent.properties,
-      })();
-    } else {
-      navigationPop();
-    }
-  }
-
-  function handleIconPressWrapper() {
-    if (!handleIconPress) return;
-    if (metricsOptions?.iconButtonEvent) {
-      withMetaMetrics(handleIconPress, {
-        event: metricsOptions.iconButtonEvent.event,
-        properties: metricsOptions.iconButtonEvent.properties,
-      })();
-    } else {
-      handleIconPress();
-    }
-  }
-
-  ///: BEGIN:ONLY_INCLUDE_IF(tron)
-  const parsedOverride = aprOverride ? parseFloat(aprOverride) : 0;
-  const apr =
-    parsedOverride > 0
-      ? aprOverride
-      : `${parseFloat(earnToken?.experience?.apr ?? '0').toFixed(1)}%`;
-  ///: END:ONLY_INCLUDE_IF
-
-  return {
-    headerTitle: () => (
-      <View style={innerStyles.headerTitle}>
-        <MorphText variant={TextVariant.HeadingMD}>{title}</MorphText>
-        {
-          ///: BEGIN:ONLY_INCLUDE_IF(tron)
-          earnToken && (
-            <View style={innerStyles.headerTitleBalanceAndAPR}>
-              <MorphText
-                variant={TextVariant.BodySMMedium}
-                color={TextColor.Alternative}
-                numberOfLines={1}
-                ellipsizeMode="tail"
-              >
-                {earnToken.balanceFormatted}
-              </MorphText>
-              <MorphText
-                variant={TextVariant.BodySMMedium}
-                color={TextColor.Success}
-              >
-                {`${apr} ${strings('earn.apr')}`}
-              </MorphText>
-            </View>
-          )
-          ///: END:ONLY_INCLUDE_IF
-        }
-      </View>
-    ),
-    headerStyle: innerStyles.headerStyle,
-    headerLeft: () =>
-      hasBackButton ? (
-        <ButtonIcon
-          size={ButtonIconSize.Md}
-          iconName={IconName.ArrowLeft}
-          onPress={handleBackPress}
-          style={innerStyles.headerLeft}
-        />
-      ) : (
-        <></>
-      ),
-    headerRight: () =>
-      hasCancelButton ? (
-        <TouchableOpacity
-          onPress={handleCancelPress}
-          style={styles.closeButton}
-        >
-          <Text style={innerStyles.headerButtonText}>
-            {strings('navigation.cancel')}
-          </Text>
-        </TouchableOpacity>
-      ) : hasIconButton ? (
-        <TouchableOpacity
-          hitSlop={styles.hitSlop}
-          onPress={handleIconPressWrapper}
-          style={styles.iconButton}
-        >
-          <Icon name={IconName.Question} size={IconSize.Lg} />
-        </TouchableOpacity>
-      ) : (
-        <></>
-      ),
-  };
-}
-
-export function getRampsOrderDetailsNavbarOptions(
-  navigation,
-  { title, showBack = true },
-  theme,
-  onClose,
-) {
-  let startButtonIconProps;
-  if (showBack) {
-    startButtonIconProps = {
-      iconName: IconName.ArrowLeft,
-      onPress: () => {
-        navigation.pop();
-        onClose?.();
-      },
-      testID: 'ramps-order-details-back-navbar-button',
-    };
-  }
-
-  return getHeaderCompactStandardNavbarOptions({
-    title,
-    startButtonIconProps,
-    includesTopInset: true,
-  });
-}
diff --git a/app/components/UI/Navbar/index.test.js b/app/components/UI/Navbar/index.test.js
index 04fada348db4..f532b3a7a1c5 100644
--- a/app/components/UI/Navbar/index.test.js
+++ b/app/components/UI/Navbar/index.test.js
@@ -1,39 +1,8 @@
-import React from 'react';
-import { render, fireEvent } from '@testing-library/react-native';
 import {
-  getNavigationOptionsTitle,
-  getEditableOptions,
-  getTransactionOptionsTitle,
-  getApproveNavbar,
-  getModalNavbarOptions,
-  getOnboardingNavbarOptions,
   getTransparentOnboardingNavbarOptions,
-  getTransparentBackOnboardingNavbarOptions,
-  getOptinMetricsNavbarOptions,
-  getClosableNavigationOptions,
   getOfflineModalNavbar,
-  getDepositNavbarOptions,
   getEditAccountNameNavBarOptions,
-  getNetworkNavbarOptions,
-  getBridgeNavbar,
-  getBridgeTransactionDetailsNavbar,
-  getStakingNavbar,
-  getRampsOrderDetailsNavbarOptions,
-  getPaymentSelectorMethodNavbar,
-  getPaymentMethodApplePayNavbar,
-  getSwapsAmountNavbar,
-  getSwapsQuotesNavbar,
 } from './index';
-import { BridgeViewMode } from '../Bridge/types';
-
-jest.mock('@react-navigation/native', () => ({
-  ...jest.requireActual('@react-navigation/native'),
-  useNavigation: () => ({
-    navigate: jest.fn(),
-    goBack: jest.fn(),
-    setOptions: jest.fn(),
-  }),
-}));
 
 /* eslint-disable @metamask/design-tokens/color-no-hex -- theme mock uses hex for test compatibility */
 const mockThemeColors = {
@@ -56,177 +25,7 @@ const mockThemeColors = {
 };
 /* eslint-enable @metamask/design-tokens/color-no-hex */
 
-const mockNavigation = {
-  goBack: jest.fn(),
-  pop: jest.fn(),
-  setOptions: jest.fn(),
-  navigate: jest.fn(),
-  getParent: jest.fn(() => ({
-    pop: jest.fn(),
-  })),
-};
-
-const mockRoute = {
-  params: {},
-  name: 'TestRoute',
-};
-
 describe('Navbar', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe('getNavigationOptionsTitle', () => {
-    it('returns correct options with title', () => {
-      const options = getNavigationOptionsTitle(
-        'Settings',
-        mockNavigation,
-        false,
-        mockThemeColors,
-      );
-
-      expect(options.title).toBe('Settings');
-      expect(options.headerTitleAlign).toBe('center');
-      expect(options).toHaveProperty('headerLeft');
-      expect(options).toHaveProperty('headerRight');
-    });
-
-    it('shows close button for full screen modal', () => {
-      const options = getNavigationOptionsTitle(
-        'Settings',
-        mockNavigation,
-        true,
-        mockThemeColors,
-      );
-
-      const HeaderRight = options.headerRight;
-      expect(HeaderRight).toBeDefined();
-    });
-
-    it('shows back button for non-full screen modal', () => {
-      const options = getNavigationOptionsTitle(
-        'Settings',
-        mockNavigation,
-        false,
-        mockThemeColors,
-      );
-
-      const HeaderLeft = options.headerLeft;
-      expect(HeaderLeft).toBeDefined();
-    });
-  });
-
-  describe('getEditableOptions', () => {
-    it('returns correct options for edit mode', () => {
-      const routeWithEditMode = {
-        ...mockRoute,
-        params: { editMode: 'edit', dispatch: jest.fn() },
-      };
-      const options = getEditableOptions(
-        'Contact',
-        mockNavigation,
-        routeWithEditMode,
-        mockThemeColors,
-      );
-
-      expect(options.title).toBe('Contact');
-      expect(options).toHaveProperty('headerLeft');
-      expect(options).toHaveProperty('headerRight');
-      expect(options).toHaveProperty('headerStyle');
-    });
-
-    it('returns correct options for add mode', () => {
-      const routeWithAddMode = {
-        ...mockRoute,
-        params: { mode: 'add' },
-      };
-      const options = getEditableOptions(
-        'Contact',
-        mockNavigation,
-        routeWithAddMode,
-        mockThemeColors,
-      );
-
-      expect(options.title).toBe('Contact');
-    });
-  });
-
-  describe('getTransactionOptionsTitle', () => {
-    it('returns correct options', () => {
-      const options = getTransactionOptionsTitle(
-        'transaction.confirm',
-        mockNavigation,
-        mockRoute,
-        mockThemeColors,
-      );
-
-      expect(options).toHaveProperty('headerTitle');
-      expect(options).toHaveProperty('headerLeft');
-      expect(options).toHaveProperty('headerRight');
-      expect(options).toHaveProperty('headerStyle');
-    });
-
-    it('returns edit title when mode is edit', () => {
-      const routeWithEditMode = {
-        ...mockRoute,
-        params: { mode: 'edit' },
-      };
-      const options = getTransactionOptionsTitle(
-        'transaction.confirm',
-        mockNavigation,
-        routeWithEditMode,
-        mockThemeColors,
-      );
-
-      expect(options).toHaveProperty('headerTitle');
-    });
-  });
-
-  describe('getApproveNavbar', () => {
-    it('returns correct options', () => {
-      const options = getApproveNavbar('Approve');
-
-      expect(options).toHaveProperty('headerTitle');
-      expect(options).toHaveProperty('headerLeft');
-      expect(options).toHaveProperty('headerRight');
-    });
-  });
-
-  describe('getModalNavbarOptions', () => {
-    it('returns correct options with title', () => {
-      const options = getModalNavbarOptions('Modal Title');
-
-      expect(options).toHaveProperty('headerTitle');
-    });
-  });
-
-  describe('getOnboardingNavbarOptions', () => {
-    it('returns correct options', () => {
-      const options = getOnboardingNavbarOptions(
-        mockRoute,
-        {},
-        mockThemeColors,
-        true,
-      );
-
-      expect(options).toHaveProperty('headerStyle');
-      expect(options).toHaveProperty('headerTitle');
-      expect(options).toHaveProperty('headerRight');
-      expect(options).toHaveProperty('headerLeft');
-    });
-
-    it('hides logo when showLogo is false', () => {
-      const options = getOnboardingNavbarOptions(
-        mockRoute,
-        {},
-        mockThemeColors,
-        false,
-      );
-
-      expect(options.headerTitle).toBe('');
-    });
-  });
-
   describe('getTransparentOnboardingNavbarOptions', () => {
     it('returns correct options', () => {
       const options = getTransparentOnboardingNavbarOptions(mockThemeColors);
@@ -256,51 +55,18 @@ describe('Navbar', () => {
 
       expect(options.headerTitle()).toBeNull();
     });
-  });
-
-  describe('getTransparentBackOnboardingNavbarOptions', () => {
-    it('returns correct options', () => {
-      const options =
-        getTransparentBackOnboardingNavbarOptions(mockThemeColors);
-
-      expect(options).toHaveProperty('headerTitle');
-      expect(options).toHaveProperty('headerBackTitle');
-      expect(options).toHaveProperty('headerRight');
-      expect(options).toHaveProperty('headerStyle');
-    });
-  });
-
-  describe('getOptinMetricsNavbarOptions', () => {
-    it('returns correct options', () => {
-      const options = getOptinMetricsNavbarOptions(mockThemeColors, true);
-
-      expect(options).toHaveProperty('headerTitle');
-      expect(options).toHaveProperty('headerBackTitle');
-      expect(options).toHaveProperty('headerRight');
-      expect(options).toHaveProperty('headerLeft');
-      expect(options).toHaveProperty('headerStyle');
-    });
-
-    it('hides logo when showLogo is false', () => {
-      const options = getOptinMetricsNavbarOptions(mockThemeColors, false);
-
-      expect(options.headerTitle()).toBeNull();
-    });
-  });
 
-  describe('getClosableNavigationOptions', () => {
-    it('returns correct options', () => {
-      const options = getClosableNavigationOptions(
-        'Title',
-        'Back',
-        mockNavigation,
+    it('applies custom logo tint color when provided', () => {
+      const options = getTransparentOnboardingNavbarOptions(
         mockThemeColors,
+        'red',
+        true,
+        'blue',
       );
 
-      expect(options.title).toBe('Title');
-      expect(options).toHaveProperty('headerTitleStyle');
-      expect(options).toHaveProperty('headerLeft');
-      expect(options).toHaveProperty('headerStyle');
+      expect(options).toBeDefined();
+      expect(options.headerStyle.backgroundColor).toBe('red');
+      expect(options.headerTitle()).not.toBeNull();
     });
   });
 
@@ -312,73 +78,6 @@ describe('Navbar', () => {
     });
   });
 
-  describe('getDepositNavbarOptions', () => {
-    it('returns correct options with title', () => {
-      const options = getDepositNavbarOptions(
-        mockNavigation,
-        { title: 'Deposit' },
-        { colors: mockThemeColors },
-      );
-
-      expect(options).toHaveProperty('header');
-    });
-
-    it('shows back button when showBack is true', () => {
-      const options = getDepositNavbarOptions(
-        mockNavigation,
-        { title: 'Deposit', showBack: true },
-        { colors: mockThemeColors },
-      );
-
-      expect(options).toHaveProperty('header');
-    });
-
-    it('shows configuration button when showConfiguration is true', () => {
-      const options = getDepositNavbarOptions(
-        mockNavigation,
-        {
-          title: 'Deposit',
-          showConfiguration: true,
-          onConfigurationPress: jest.fn(),
-        },
-        { colors: mockThemeColors },
-      );
-
-      expect(options).toHaveProperty('header');
-    });
-
-    it('invokes onClose after pop when back is pressed and onClose is provided', () => {
-      const onClose = jest.fn();
-      const options = getDepositNavbarOptions(
-        mockNavigation,
-        { title: 'Deposit', showBack: true },
-        { colors: mockThemeColors },
-        onClose,
-      );
-
-      const { getByTestId } = render(options.header());
-      fireEvent.press(getByTestId('deposit-back-navbar-button'));
-
-      expect(mockNavigation.pop).toHaveBeenCalled();
-      expect(onClose).toHaveBeenCalled();
-    });
-
-    it('omits start button when showBack and showClose are false', () => {
-      const options = getDepositNavbarOptions(
-        mockNavigation,
-        {
-          title: 'Deposit',
-          showBack: false,
-          showClose: false,
-        },
-        { colors: mockThemeColors },
-      );
-
-      const { queryByTestId } = render(options.header());
-      expect(queryByTestId('deposit-back-navbar-button')).toBeNull();
-    });
-  });
-
   describe('getEditAccountNameNavBarOptions', () => {
     it('returns correct options', () => {
       const goBack = jest.fn();
@@ -388,412 +87,14 @@ describe('Navbar', () => {
       expect(options.headerLeft).toBeNull();
       expect(options).toHaveProperty('headerRight');
     });
-  });
-
-  describe('getNetworkNavbarOptions', () => {
-    it('returns correct options', () => {
-      const options = getNetworkNavbarOptions(
-        'Network',
-        false,
-        mockNavigation,
-        mockThemeColors,
-      );
 
-      expect(options).toHaveProperty('header');
-    });
-
-    it('shows right button when onRightPress is provided', () => {
-      const onRightPress = jest.fn();
-      const options = getNetworkNavbarOptions(
-        'Network',
-        false,
-        mockNavigation,
-        mockThemeColors,
-        onRightPress,
-      );
-
-      expect(options).toHaveProperty('header');
-    });
-  });
-
-  describe('getBridgeNavbar', () => {
-    it('returns correct options for Bridge mode', () => {
-      const options = getBridgeNavbar(
-        mockNavigation,
-        BridgeViewMode.Bridge,
-        mockThemeColors,
-      );
-
-      expect(options).toBeDefined();
-    });
-
-    it('returns correct options for Swap mode', () => {
-      const options = getBridgeNavbar(
-        mockNavigation,
-        BridgeViewMode.Swap,
-        mockThemeColors,
-      );
-
-      expect(options).toBeDefined();
-    });
-  });
-
-  describe('getBridgeTransactionDetailsNavbar', () => {
-    it('returns correct options', () => {
-      const options = getBridgeTransactionDetailsNavbar(mockNavigation);
-
-      expect(options).toHaveProperty('headerTitle');
-      expect(options).toHaveProperty('headerLeft');
-    });
-  });
-
-  describe('getStakingNavbar', () => {
-    it('returns correct options', () => {
-      const options = getStakingNavbar(
-        'Staking',
-        mockNavigation,
-        mockThemeColors,
-      );
-
-      expect(options).toHaveProperty('headerTitle');
-      expect(options).toHaveProperty('headerStyle');
-      expect(options).toHaveProperty('headerLeft');
-      expect(options).toHaveProperty('headerRight');
-    });
-
-    it('hides back button when hasBackButton is false', () => {
-      const options = getStakingNavbar(
-        'Staking',
-        mockNavigation,
-        mockThemeColors,
-        { hasBackButton: false },
-      );
-
-      expect(options).toHaveProperty('headerLeft');
-    });
-
-    it('shows icon button when hasIconButton is true', () => {
-      const options = getStakingNavbar(
-        'Staking',
-        mockNavigation,
-        mockThemeColors,
-        {
-          hasCancelButton: false,
-          hasIconButton: true,
-          handleIconPress: jest.fn(),
-        },
-      );
-
-      expect(options).toHaveProperty('headerRight');
-    });
-  });
-
-  describe('getRampsOrderDetailsNavbarOptions', () => {
-    it('returns correct options', () => {
-      const options = getRampsOrderDetailsNavbarOptions(
-        mockNavigation,
-        { title: 'Order Details' },
-        { colors: mockThemeColors },
-      );
-
-      expect(options).toBeDefined();
-    });
-
-    it('shows back button when showBack is true', () => {
-      const options = getRampsOrderDetailsNavbarOptions(
-        mockNavigation,
-        { title: 'Order Details', showBack: true },
-        { colors: mockThemeColors },
-        jest.fn(),
-      );
-
-      expect(options).toBeDefined();
-    });
-  });
-
-  describe('getPaymentSelectorMethodNavbar', () => {
-    it('returns correct options', () => {
-      const onPop = jest.fn();
-      const options = getPaymentSelectorMethodNavbar(
-        mockNavigation,
-        onPop,
-        mockThemeColors,
-      );
-
-      expect(options).toHaveProperty('headerTitle');
-      expect(options).toHaveProperty('headerLeft');
-      expect(options).toHaveProperty('headerRight');
-      expect(options).toHaveProperty('headerStyle');
-    });
-
-    it('calls navigation.getParent().pop() and onPop when headerRight is pressed', () => {
-      const onPop = jest.fn();
-      const mockParentPop = jest.fn();
-      const navigationWithParent = {
-        ...mockNavigation,
-        getParent: jest.fn(() => ({
-          pop: mockParentPop,
-        })),
-      };
-      const options = getPaymentSelectorMethodNavbar(
-        navigationWithParent,
-        onPop,
-        mockThemeColors,
-      );
-
-      const HeaderRight = options.headerRight;
-      const { getByText } = render(<HeaderRight />);
-      fireEvent.press(getByText('Cancel'));
-
-      expect(navigationWithParent.getParent).toHaveBeenCalled();
-      expect(mockParentPop).toHaveBeenCalled();
-      expect(onPop).toHaveBeenCalled();
-    });
-  });
-
-  describe('getPaymentMethodApplePayNavbar', () => {
-    it('returns correct options', () => {
-      const onPop = jest.fn();
-      const onExit = jest.fn();
-      const options = getPaymentMethodApplePayNavbar(
-        mockNavigation,
-        onPop,
-        onExit,
-        mockThemeColors,
-      );
-
-      expect(options).toHaveProperty('title');
-      expect(options).toHaveProperty('headerLeft');
-      expect(options).toHaveProperty('headerRight');
-      expect(options).toHaveProperty('headerStyle');
-    });
-
-    it('calls navigation.getParent().pop() and onExit when headerRight is pressed', () => {
-      const onPop = jest.fn();
-      const onExit = jest.fn();
-      const mockParentPop = jest.fn();
-      const navigationWithParent = {
-        ...mockNavigation,
-        getParent: jest.fn(() => ({
-          pop: mockParentPop,
-        })),
-      };
-      const options = getPaymentMethodApplePayNavbar(
-        navigationWithParent,
-        onPop,
-        onExit,
-        mockThemeColors,
-      );
-
-      const HeaderRight = options.headerRight;
-      const { getByText } = render(<HeaderRight />);
-      fireEvent.press(getByText('Cancel'));
-
-      expect(navigationWithParent.getParent).toHaveBeenCalled();
-      expect(mockParentPop).toHaveBeenCalled();
-      expect(onExit).toHaveBeenCalled();
-    });
-  });
-
-  describe('getSwapsAmountNavbar', () => {
-    it('returns correct options', () => {
-      const options = getSwapsAmountNavbar(
-        mockNavigation,
-        mockRoute,
-        mockThemeColors,
-      );
-
-      expect(options).toHaveProperty('headerTitle');
-      expect(options).toHaveProperty('headerLeft');
-      expect(options).toHaveProperty('headerRight');
-      expect(options).toHaveProperty('headerStyle');
-    });
-
-    it('calls navigation.getParent().pop() when headerRight is pressed', () => {
-      const mockParentPop = jest.fn();
-      const navigationWithParent = {
-        ...mockNavigation,
-        getParent: jest.fn(() => ({
-          pop: mockParentPop,
-        })),
-      };
-      const options = getSwapsAmountNavbar(
-        navigationWithParent,
-        mockRoute,
-        mockThemeColors,
-      );
-
-      const HeaderRight = options.headerRight;
-      const { getByText } = render(<HeaderRight />);
-      fireEvent.press(getByText('Cancel'));
-
-      expect(navigationWithParent.getParent).toHaveBeenCalled();
-      expect(mockParentPop).toHaveBeenCalled();
-    });
-  });
-
-  describe('getSwapsQuotesNavbar', () => {
-    const mockSwapsRoute = {
-      ...mockRoute,
-      params: {
-        requestedTrade: {
-          token_from: 'ETH',
-          token_to: 'DAI',
-          request_type: 'Order',
-          custom_slippage: false,
-          chain_id: '0x1',
-          token_from_amount: '1',
-        },
-        selectedQuote: { id: 'quote-1' },
-        quoteBegin: Date.now(),
-      },
-    };
-
-    it('returns correct options', () => {
-      const options = getSwapsQuotesNavbar(
-        mockNavigation,
-        mockSwapsRoute,
-        mockThemeColors,
-      );
-
-      expect(options).toHaveProperty('headerTitle');
-      expect(options).toHaveProperty('headerLeft');
-      expect(options).toHaveProperty('headerRight');
-      expect(options).toHaveProperty('headerStyle');
-    });
-
-    it('calls navigation.getParent().pop() when headerRight is pressed', () => {
-      const mockParentPop = jest.fn();
-      const navigationWithParent = {
-        ...mockNavigation,
-        getParent: jest.fn(() => ({
-          pop: mockParentPop,
-        })),
-      };
-      const options = getSwapsQuotesNavbar(
-        navigationWithParent,
-        mockSwapsRoute,
-        mockThemeColors,
-      );
-
-      const HeaderRight = options.headerRight;
-      const { getByText } = render(<HeaderRight />);
-      fireEvent.press(getByText('Cancel'));
-
-      expect(navigationWithParent.getParent).toHaveBeenCalled();
-      expect(mockParentPop).toHaveBeenCalled();
-    });
-  });
-
-  describe('getBridgeNavbar back button behavior', () => {
-    it('calls navigation.goBack() when back button is pressed', () => {
-      const navigationWithParent = {
-        ...mockNavigation,
-        getParent: jest.fn(),
-      };
-      const options = getBridgeNavbar(
-        navigationWithParent,
-        BridgeViewMode.Bridge,
-        mockThemeColors,
-      );
-
-      expect(options).toBeDefined();
-      const Header = options.header;
-      const { getByTestId } = render(<Header />);
-      fireEvent.press(getByTestId('button-icon'));
-      expect(navigationWithParent.goBack).toHaveBeenCalled();
-      expect(navigationWithParent.getParent).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('getEditableOptions back button behavior', () => {
-    it('calls navigation.pop when back button is pressed in edit mode', () => {
-      const routeWithEditMode = {
-        ...mockRoute,
-        params: { editMode: 'edit', dispatch: jest.fn() },
-      };
-      const options = getEditableOptions(
-        'Contact',
-        mockNavigation,
-        routeWithEditMode,
-        mockThemeColors,
-      );
-
-      const HeaderLeft = options.headerLeft;
-      const { getByTestId } = render(<HeaderLeft />);
-      fireEvent.press(getByTestId('edit-contact-back-button'));
-
-      expect(mockNavigation.pop).toHaveBeenCalled();
-    });
-  });
-
-  describe('getNavigationOptionsTitle close button behavior', () => {
-    it('renders and handles close button in fullscreen modal mode', () => {
-      const options = getNavigationOptionsTitle(
-        'Settings',
-        mockNavigation,
-        true,
-        mockThemeColors,
-      );
-
-      const HeaderRight = options.headerRight;
-      if (HeaderRight) {
-        const { getByTestId } = render(<HeaderRight />);
-        fireEvent.press(getByTestId('close-network-icon'));
-        expect(mockNavigation.goBack).toHaveBeenCalled();
-      }
-    });
-  });
-
-  describe('getStakingNavbar back button behavior', () => {
-    it('calls navigation.goBack when back button is pressed', () => {
-      const options = getStakingNavbar(
-        'Staking',
-        mockNavigation,
-        mockThemeColors,
-        { hasBackButton: true },
-      );
-
-      const HeaderLeft = options.headerLeft;
-      if (HeaderLeft) {
-        const rendered = render(
-          typeof HeaderLeft === 'function' ? <HeaderLeft /> : HeaderLeft,
-        );
-        fireEvent.press(rendered.getByTestId('button-icon'));
-        expect(mockNavigation.goBack).toHaveBeenCalled();
-        expect(rendered).toBeTruthy();
-      }
-    });
-  });
-
-  describe('getDepositNavbarOptions close button behavior', () => {
-    it('invokes onClose after pop when close button is pressed', () => {
-      const onClose = jest.fn();
-      const options = getDepositNavbarOptions(
-        mockNavigation,
-        { title: 'Deposit', showClose: true },
-        { colors: mockThemeColors },
-        onClose,
-      );
-
-      const rendered = render(options.header());
-      expect(rendered).toBeTruthy();
-      const { getByTestId } = rendered;
-      fireEvent.press(getByTestId('deposit-back-navbar-button'));
-      expect(mockNavigation.pop).toHaveBeenCalled();
-      expect(onClose).toHaveBeenCalled();
-    });
-  });
+    it('calls goBack when close button is pressed', () => {
+      const goBack = jest.fn();
+      const options = getEditAccountNameNavBarOptions(goBack, mockThemeColors);
 
-  describe('getRampsOrderDetailsNavbarOptions close behavior', () => {
-    it('shows close button when showCloseButton is true', () => {
-      const options = getRampsOrderDetailsNavbarOptions(
-        mockNavigation,
-        { title: 'Order Details', showCloseButton: true },
-        { colors: mockThemeColors },
-      );
+      options.headerRight().props.onPress();
 
-      expect(options).toBeDefined();
+      expect(goBack).toHaveBeenCalledTimes(1);
     });
   });
 });
diff --git a/app/components/UI/Navbar/index.test.jsx b/app/components/UI/Navbar/index.test.jsx
deleted file mode 100644
index b9107882fe7f..000000000000
--- a/app/components/UI/Navbar/index.test.jsx
+++ /dev/null
@@ -1,1167 +0,0 @@
-/* eslint-disable react/prop-types */
-import React from 'react';
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import { fireEvent } from '@testing-library/react-native';
-import renderWithProvider from '../../../util/test/renderWithProvider';
-import { backgroundState } from '../../../util/test/initial-root-state';
-import {
-  getDepositNavbarOptions,
-  getNetworkNavbarOptions,
-  getNavigationOptionsTitle,
-  getOnboardingNavbarOptions,
-  getTransparentOnboardingNavbarOptions,
-  getStakingNavbar,
-  getSwapsQuotesNavbar,
-} from '.';
-import { mockTheme } from '../../../util/theme';
-import Device from '../../../util/device';
-import { View } from 'react-native';
-import { BridgeViewMode } from '../Bridge/types';
-import { strings } from '../../../../locales/i18n';
-import {
-  AnalyticsEventBuilder,
-  chainableBuilder,
-} from '../../../util/analytics/AnalyticsEventBuilder';
-
-jest.mock('../../../util/device', () => ({
-  isAndroid: jest.fn(),
-  isIphoneX: jest.fn(),
-  isIphone5S: jest.fn(),
-  isIos: jest.fn(),
-}));
-
-jest.mock('../../../core/Engine', () => ({
-  context: {
-    AccountsController: {
-      state: {
-        internalAccounts: {
-          accounts: {
-            'account-1': {
-              address: '0x1234567890123456789012345678901234567890',
-              id: 'account-1',
-              metadata: {
-                name: 'Test Account',
-                keyring: { type: 'HD Key Tree' },
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}));
-
-jest.mock('../../../util/address', () => ({
-  getLabelTextByAddress: jest.fn(() => null),
-  getInternalAccountByAddress: jest.fn(() => ({
-    address: '0x1234567890123456789012345678901234567890',
-    id: 'account-1',
-    metadata: {
-      name: 'Test Account',
-      keyring: { type: 'HD Key Tree' },
-    },
-  })),
-  areAddressesEqual: jest.fn(() => true),
-}));
-
-jest.mock('../../../util/notifications', () => ({
-  isNotificationsFeatureEnabled: jest.fn(() => false),
-  NotificationTypes: {
-    TRANSACTION: 'transaction',
-    SIMPLE: 'simple',
-  },
-}));
-
-jest.mock('../../../util/networks', () => ({
-  getNetworkNameFromProviderConfig: jest.fn(() => 'Ethereum Mainnet'),
-}));
-
-jest.mock('../../../util/analytics/AnalyticsEventBuilder', () => {
-  const chainableBuilder = {
-    addProperties: jest.fn(function () {
-      return this;
-    }),
-    addSensitiveProperties: jest.fn(function () {
-      return this;
-    }),
-    removeProperties: jest.fn(function () {
-      return this;
-    }),
-    removeSensitiveProperties: jest.fn(function () {
-      return this;
-    }),
-    build: jest.fn(() => ({ builtEvent: true })),
-  };
-  const createEventBuilder = jest.fn(() => chainableBuilder);
-  return {
-    __esModule: true,
-    default: { createEventBuilder },
-    AnalyticsEventBuilder: { createEventBuilder },
-    chainableBuilder,
-  };
-});
-
-const mockAnalyticsTrackEvent = jest.fn();
-jest.mock('../../../util/analytics/analytics', () => ({
-  analytics: {
-    trackEvent: (...args) => mockAnalyticsTrackEvent(...args),
-  },
-}));
-
-jest.mock('../../../core/Analytics', () => ({
-  MetaMetricsEvents: {
-    SEND_FLOW_CANCEL: 'SEND_FLOW_CANCEL',
-    WALLET_QR_SCANNER: 'WALLET_QR_SCANNER',
-    NOTIFICATIONS_MENU_OPENED: 'NOTIFICATIONS_MENU_OPENED',
-    NAVIGATION_TAPS_SETTINGS: 'NAVIGATION_TAPS_SETTINGS',
-    CARD_HOME_CLICKED: 'CARD_HOME_CLICKED',
-    QUOTES_REQUEST_CANCELLED: 'QUOTES_REQUEST_CANCELLED',
-  },
-}));
-
-jest.mock('../../../util/blockaid', () => ({
-  getBlockaidTransactionMetricsParams: jest.fn(() => ({})),
-}));
-
-jest.mock('../Stake/utils/metaMetrics/withMetaMetrics', () => ({
-  withMetaMetrics: jest.fn((fn) => () => fn()),
-}));
-
-jest.mock('../AddressCopy', () => {
-  const { View } = require('react-native');
-  return {
-    __esModule: true,
-    default: (props) => <View testID="address-copy-mock" />,
-  };
-});
-
-describe('getNetworkNavbarOptions', () => {
-  const Stack = createNativeStackNavigator();
-
-  const mockNavigation = {
-    pop: jest.fn(),
-  };
-
-  const TestNavigator = ({ options }) => (
-    <Stack.Navigator>
-      <Stack.Screen
-        name="TestScreen"
-        component={() => null}
-        options={options}
-      />
-    </Stack.Navigator>
-  );
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    Device.isAndroid.mockReset();
-  });
-
-  it('renders correctly with default options', () => {
-    const options = getNetworkNavbarOptions(
-      'Test Title',
-      false,
-      mockNavigation,
-      mockTheme.colors,
-    );
-
-    const { getByText } = renderWithProvider(
-      <TestNavigator options={options} />,
-      {
-        state: {
-          engine: {
-            backgroundState: {
-              ...backgroundState,
-            },
-          },
-        },
-      },
-    );
-
-    expect(getByText('Test Title')).toBeTruthy();
-  });
-});
-
-describe('getDepositNavbarOptions', () => {
-  const mockNavigation = {
-    pop: jest.fn(),
-    goBack: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns navbar options with header function', () => {
-    const options = getDepositNavbarOptions(
-      mockNavigation,
-      { title: 'Deposit' },
-      mockTheme,
-    );
-
-    expect(options).toBeDefined();
-    expect(options.header).toBeInstanceOf(Function);
-  });
-
-  it('pops navigation when back button is pressed', () => {
-    const options = getDepositNavbarOptions(
-      mockNavigation,
-      { title: 'Deposit' },
-      mockTheme,
-    );
-    const HeaderComponent = options.header();
-    HeaderComponent.props.startButtonIconProps.onPress();
-
-    expect(mockNavigation.pop).toHaveBeenCalledTimes(1);
-  });
-});
-
-describe('getTransparentOnboardingNavbarOptions', () => {
-  const mockNavigation = {
-    pop: jest.fn(),
-    goBack: jest.fn(),
-  };
-
-  it('render transparent onboarding navbar options', () => {
-    const options = getTransparentOnboardingNavbarOptions(
-      mockTheme,
-      'red',
-      true,
-      'blue',
-    );
-    expect(options).toBeDefined();
-  });
-
-  it('render transparent onboarding navbar options with custom background color', () => {
-    const options = getTransparentOnboardingNavbarOptions(
-      mockTheme,
-      'red',
-      true,
-      'blue',
-    );
-    expect(options.headerStyle.backgroundColor).toBe('red');
-  });
-
-  it('handles getOnboardingNavbarOptions', () => {
-    const options = getOnboardingNavbarOptions(
-      mockNavigation,
-      { headerLeft: () => <View />, headerRight: () => <View /> },
-      mockTheme.colors,
-      true,
-    );
-    expect(options).toBeDefined();
-  });
-});
-
-describe('getOnboardingNavbarOptions', () => {
-  const mockNavigation = {
-    pop: jest.fn(),
-    goBack: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('render onboarding navbar options with default props', () => {
-    const options = getOnboardingNavbarOptions(
-      mockNavigation,
-      { headerLeft: () => <View />, headerRight: () => <View /> },
-      mockTheme.colors,
-      true,
-    );
-    expect(options).toBeDefined();
-  });
-});
-
-describe('getBridgeNavbar', () => {
-  const mockNavigation = {
-    getParent: jest.fn(() => ({
-      pop: jest.fn(),
-    })),
-  };
-  const mockThemeColors = {
-    background: {
-      default: mockTheme.colors.background.default,
-    },
-    primary: {
-      default: mockTheme.colors.primary.default,
-    },
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    Device.isAndroid.mockReset();
-  });
-
-  describe('returns header options', () => {
-    it('returns a header function', () => {
-      const { getBridgeNavbar } = require('.');
-      const options = getBridgeNavbar(
-        mockNavigation,
-        BridgeViewMode.Swap,
-        mockTheme.colors,
-      );
-
-      expect(options.header).toBeDefined();
-      expect(typeof options.header).toBe('function');
-    });
-  });
-});
-
-describe('getStakingNavbar', () => {
-  const mockNavigation = {
-    goBack: jest.fn(),
-  };
-  const {
-    withMetaMetrics,
-  } = require('../Stake/utils/metaMetrics/withMetaMetrics');
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('renders balance and APR when earnToken is provided', () => {
-    const mockNavigation = { goBack: jest.fn() };
-    const earnToken = {
-      balanceFormatted: '1,234.56 USDC',
-      experience: { apr: '5.234' },
-    };
-
-    const options = getStakingNavbar(
-      'Stake',
-      mockNavigation,
-      mockTheme.colors,
-      { hasBackButton: false, hasCancelButton: false },
-      undefined,
-      earnToken,
-    );
-
-    const HeaderTitle = options.headerTitle;
-    const { getByText } = renderWithProvider(<HeaderTitle />, {
-      state: { engine: { backgroundState } },
-    });
-
-    expect(getByText(earnToken.balanceFormatted)).toBeTruthy();
-
-    const expectedApr = `${parseFloat(earnToken.experience.apr).toFixed(
-      1,
-    )}% ${strings('earn.apr')}`;
-    expect(getByText(expectedApr)).toBeTruthy();
-  });
-
-  it('invokes goBack on back button press and records metrics when provided', () => {
-    const options = getStakingNavbar(
-      'Stake',
-      mockNavigation,
-      mockTheme.colors,
-      { hasBackButton: true },
-      {
-        backButtonEvent: { event: 'BACK_EVT', properties: { source: 'test' } },
-      },
-    );
-
-    const headerLeft = options.headerLeft();
-    headerLeft.props.onPress();
-
-    expect(withMetaMetrics).toHaveBeenCalledTimes(1);
-    expect(withMetaMetrics).toHaveBeenCalledWith(expect.any(Function), {
-      event: 'BACK_EVT',
-      properties: { source: 'test' },
-    });
-    expect(mockNavigation.goBack).toHaveBeenCalledTimes(1);
-  });
-
-  it('invokes icon handler and records metrics when icon button is pressed', () => {
-    const handleIconPress = jest.fn();
-
-    const options = getStakingNavbar(
-      'Stake',
-      mockNavigation,
-      mockTheme.colors,
-      {
-        hasBackButton: false,
-        hasCancelButton: false,
-        hasIconButton: true,
-        handleIconPress,
-      },
-      {
-        iconButtonEvent: { event: 'ICON_EVT', properties: { from: 'header' } },
-      },
-    );
-
-    const headerRight = options.headerRight();
-    headerRight.props.onPress();
-
-    expect(withMetaMetrics).toHaveBeenCalledTimes(1);
-    expect(withMetaMetrics).toHaveBeenCalledWith(expect.any(Function), {
-      event: 'ICON_EVT',
-      properties: { from: 'header' },
-    });
-    expect(handleIconPress).toHaveBeenCalledTimes(1);
-  });
-});
-
-describe('getNavigationOptionsTitle', () => {
-  const Stack = createNativeStackNavigator();
-
-  const mockNavigation = {
-    goBack: jest.fn(),
-  };
-
-  const renderNavigatorWithOptions = (options) => {
-    const TestNavigator = () => (
-      <Stack.Navigator>
-        <Stack.Screen
-          name="TestScreen"
-          component={() => null}
-          options={options}
-        />
-      </Stack.Navigator>
-    );
-    return renderWithProvider(<TestNavigator />);
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('calls trackEvent when navigationPopEvent is provided and close button pressed', () => {
-    const mockEvent = { category: 'test' };
-    const options = getNavigationOptionsTitle(
-      'Test Title',
-      mockNavigation,
-      true,
-      mockTheme.colors,
-      mockEvent,
-    );
-
-    const { getByTestId } = renderNavigatorWithOptions(options);
-
-    fireEvent.press(getByTestId('close-network-icon'));
-
-    expect(mockNavigation.goBack).toHaveBeenCalledTimes(1);
-    expect(AnalyticsEventBuilder.createEventBuilder).toHaveBeenCalledWith(
-      mockEvent,
-    );
-    expect(chainableBuilder.build).toHaveBeenCalled();
-    expect(mockAnalyticsTrackEvent).toHaveBeenCalled();
-  });
-
-  it('does not call trackEvent when navigationPopEvent is null', () => {
-    const options = getNavigationOptionsTitle(
-      'Test Title',
-      mockNavigation,
-      false,
-      mockTheme.colors,
-      null,
-    );
-
-    const { getByTestId } = renderNavigatorWithOptions(options);
-
-    fireEvent.press(getByTestId('back-arrow-button'));
-
-    expect(AnalyticsEventBuilder.createEventBuilder).not.toHaveBeenCalled();
-    expect(mockAnalyticsTrackEvent).not.toHaveBeenCalled();
-    expect(mockNavigation.goBack).toHaveBeenCalledTimes(1);
-  });
-});
-
-describe('getSwapsQuotesNavbar', () => {
-  const mockNavigation = {
-    pop: jest.fn(),
-    getParent: jest.fn(() => ({
-      pop: jest.fn(),
-    })),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('tracks QUOTES_REQUEST_CANCELLED on left action when no quote is selected', () => {
-    const route = {
-      params: {
-        title: 'Swap',
-        requestedTrade: {
-          token_from: 'ETH',
-          token_to: 'DAI',
-          request_type: 'Order',
-          custom_slippage: false,
-          chain_id: '0x1',
-          token_from_amount: '1',
-        },
-        selectedQuote: null,
-        quoteBegin: Date.now() - 1000,
-      },
-    };
-
-    const options = getSwapsQuotesNavbar(
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    Device.isAndroid.mockReturnValue(false);
-    const headerLeft = options.headerLeft();
-    headerLeft.props.onPress();
-
-    expect(AnalyticsEventBuilder.createEventBuilder).toHaveBeenCalledWith(
-      'QUOTES_REQUEST_CANCELLED',
-    );
-    expect(mockAnalyticsTrackEvent).toHaveBeenCalled();
-    expect(mockNavigation.pop).toHaveBeenCalled();
-  });
-
-  it('does not track event when quote is selected', () => {
-    const route = {
-      params: {
-        title: 'Swap',
-        requestedTrade: {
-          token_from: 'ETH',
-          token_to: 'DAI',
-          request_type: 'Order',
-          custom_slippage: false,
-          chain_id: '0x1',
-          token_from_amount: '1',
-        },
-        selectedQuote: { id: 'quote-1' },
-        quoteBegin: Date.now() - 1000,
-      },
-    };
-
-    const options = getSwapsQuotesNavbar(
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    Device.isAndroid.mockReturnValue(false);
-    const headerLeft = options.headerLeft();
-    headerLeft.props.onPress();
-
-    expect(AnalyticsEventBuilder.createEventBuilder).not.toHaveBeenCalled();
-    expect(mockNavigation.pop).toHaveBeenCalled();
-  });
-
-  it('renders Android back button correctly', () => {
-    const route = {
-      params: {
-        title: 'Swap',
-      },
-    };
-
-    Device.isAndroid.mockReturnValue(true);
-    const options = getSwapsQuotesNavbar(
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    const headerLeft = options.headerLeft();
-    expect(headerLeft.type).toBe(require('react-native').TouchableOpacity);
-  });
-});
-
-describe('getApproveNavbar', () => {
-  const { getApproveNavbar } = require('.');
-
-  it('returns navbar options with title and empty left/right components', () => {
-    const options = getApproveNavbar('Approve');
-
-    expect(options.headerTitle).toBeDefined();
-    expect(options.headerLeft).toBeDefined();
-    expect(options.headerRight).toBeDefined();
-
-    const HeaderLeft = options.headerLeft();
-    const HeaderRight = options.headerRight();
-    expect(HeaderLeft.type).toBe(View);
-    expect(HeaderRight.type).toBe(View);
-  });
-});
-
-describe('getModalNavbarOptions', () => {
-  const { getModalNavbarOptions } = require('.');
-
-  it('returns navbar options with modal title', () => {
-    const options = getModalNavbarOptions('Modal Title');
-
-    expect(options.headerTitle).toBeDefined();
-  });
-});
-
-describe('getOfflineModalNavbar', () => {
-  const { getOfflineModalNavbar } = require('.');
-
-  it('returns navbar options with header hidden', () => {
-    const options = getOfflineModalNavbar();
-
-    expect(options.headerShown).toBe(false);
-  });
-});
-
-describe('getOptinMetricsNavbarOptions', () => {
-  const { getOptinMetricsNavbarOptions } = require('.');
-
-  it('returns navbar options with logo when showLogo is true', () => {
-    const options = getOptinMetricsNavbarOptions(mockTheme.colors, true);
-
-    expect(options.headerTitle).toBeDefined();
-    expect(options.headerLeft).toBeDefined();
-    expect(options.headerRight).toBeDefined();
-  });
-
-  it('returns navbar options without logo when showLogo is false', () => {
-    const options = getOptinMetricsNavbarOptions(mockTheme.colors, false);
-
-    const HeaderTitle = options.headerTitle();
-    expect(HeaderTitle).toBeNull();
-  });
-});
-
-describe('getTransparentBackOnboardingNavbarOptions', () => {
-  const { getTransparentBackOnboardingNavbarOptions } = require('.');
-
-  it('returns navbar options with back button', () => {
-    const options = getTransparentBackOnboardingNavbarOptions(mockTheme.colors);
-
-    expect(options.headerTitle).toBeDefined();
-    expect(options.headerBackTitle).toBe(strings('navigation.back'));
-    expect(options.headerRight).toBeDefined();
-  });
-});
-
-describe('getEditAccountNameNavBarOptions', () => {
-  const { getEditAccountNameNavBarOptions } = require('.');
-
-  const mockGoBack = jest.fn();
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns navbar options with close button', () => {
-    const options = getEditAccountNameNavBarOptions(
-      mockGoBack,
-      mockTheme.colors,
-    );
-
-    expect(options.headerTitle).toBeDefined();
-    expect(options.headerLeft).toBeNull();
-    expect(options.headerRight).toBeDefined();
-  });
-
-  it('calls goBack when close button is pressed', () => {
-    const options = getEditAccountNameNavBarOptions(
-      mockGoBack,
-      mockTheme.colors,
-    );
-
-    const HeaderRight = options.headerRight();
-    HeaderRight.props.onPress();
-
-    expect(mockGoBack).toHaveBeenCalledTimes(1);
-  });
-});
-
-describe('getRampsOrderDetailsNavbarOptions', () => {
-  const { getRampsOrderDetailsNavbarOptions } = require('.');
-
-  const mockNavigation = {
-    pop: jest.fn(),
-  };
-
-  const mockOnClose = jest.fn();
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns navbar options with back button when showBack is true', () => {
-    const options = getRampsOrderDetailsNavbarOptions(
-      mockNavigation,
-      { title: 'Order Details', showBack: true },
-      mockTheme,
-      mockOnClose,
-    );
-
-    expect(options).toBeDefined();
-    expect(options.header).toBeInstanceOf(Function);
-  });
-
-  it('pops navigation and calls onClose when back is pressed', () => {
-    const options = getRampsOrderDetailsNavbarOptions(
-      mockNavigation,
-      { title: 'Order Details', showBack: true },
-      mockTheme,
-      mockOnClose,
-    );
-
-    const HeaderComponent = options.header();
-    HeaderComponent.props.startButtonIconProps.onPress();
-
-    expect(mockNavigation.pop).toHaveBeenCalledTimes(1);
-    expect(mockOnClose).toHaveBeenCalledTimes(1);
-  });
-});
-
-describe('getBridgeTransactionDetailsNavbar', () => {
-  const { getBridgeTransactionDetailsNavbar } = require('.');
-
-  const mockNavigation = {
-    pop: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns navbar options with back button', () => {
-    const options = getBridgeTransactionDetailsNavbar(mockNavigation);
-
-    expect(options.headerTitle).toBeDefined();
-    expect(options.headerLeft).toBeDefined();
-  });
-
-  it('calls navigation.pop when back button is pressed', () => {
-    const options = getBridgeTransactionDetailsNavbar(mockNavigation);
-
-    const HeaderLeft = options.headerLeft();
-    HeaderLeft.props.onPress();
-
-    expect(mockNavigation.pop).toHaveBeenCalledTimes(1);
-  });
-});
-
-describe('getEditableOptions', () => {
-  const { getEditableOptions } = require('.');
-
-  const mockNavigation = {
-    pop: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns navbar options with title and back button', () => {
-    const route = { params: { editMode: 'edit', dispatch: jest.fn() } };
-    const options = getEditableOptions(
-      'Edit Contact',
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    expect(options.title).toBe('Edit Contact');
-    expect(options.headerLeft).toBeDefined();
-    expect(options.headerRight).toBeDefined();
-  });
-
-  it('shows edit button when in view mode', () => {
-    const mockDispatch = jest.fn();
-    const route = { params: { editMode: 'view', dispatch: mockDispatch } };
-    const options = getEditableOptions(
-      'View Contact',
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    const HeaderRight = options.headerRight();
-    expect(HeaderRight).toBeDefined();
-  });
-
-  it('shows empty view when in add mode', () => {
-    const route = { params: { mode: 'add', dispatch: jest.fn() } };
-    const options = getEditableOptions(
-      'Add Contact',
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    const HeaderRight = options.headerRight();
-    expect(HeaderRight.type).toBe(View);
-  });
-
-  it('calls navigation.pop on back button press', () => {
-    const route = { params: { editMode: 'edit' } };
-    const options = getEditableOptions(
-      'Edit Contact',
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    const HeaderLeft = options.headerLeft();
-    HeaderLeft.props.onPress();
-
-    expect(mockNavigation.pop).toHaveBeenCalledTimes(1);
-  });
-});
-
-describe('getClosableNavigationOptions', () => {
-  const { getClosableNavigationOptions } = require('.');
-
-  const mockNavigation = {
-    pop: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    Device.isIos.mockReset();
-  });
-
-  it('returns navbar options with title', () => {
-    Device.isIos.mockReturnValue(true);
-    const options = getClosableNavigationOptions(
-      'Test Title',
-      'Back',
-      mockNavigation,
-      mockTheme.colors,
-    );
-
-    expect(options.title).toBe('Test Title');
-    expect(options.headerLeft).toBeDefined();
-  });
-
-  it('shows text button on iOS', () => {
-    Device.isIos.mockReturnValue(true);
-    const options = getClosableNavigationOptions(
-      'Test Title',
-      'Back',
-      mockNavigation,
-      mockTheme.colors,
-    );
-
-    const HeaderLeft = options.headerLeft();
-    HeaderLeft.props.onPress();
-
-    expect(mockNavigation.pop).toHaveBeenCalledTimes(1);
-  });
-
-  it('shows icon button on Android', () => {
-    Device.isIos.mockReturnValue(false);
-    Device.isAndroid.mockReturnValue(true);
-    const options = getClosableNavigationOptions(
-      'Test Title',
-      'Back',
-      mockNavigation,
-      mockTheme.colors,
-    );
-
-    const HeaderLeft = options.headerLeft();
-    HeaderLeft.props.onPress();
-
-    expect(mockNavigation.pop).toHaveBeenCalledTimes(1);
-  });
-});
-
-describe('getImportTokenNavbarOptions', () => {
-  const { getImportTokenNavbarOptions } = require('.');
-
-  const mockNavigation = {
-    goBack: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns navbar options with header function', () => {
-    const options = getImportTokenNavbarOptions(mockNavigation, 'Import Token');
-
-    expect(options.header).toBeDefined();
-    expect(typeof options.header).toBe('function');
-  });
-
-  it('calls custom onPress when provided', () => {
-    const customOnPress = jest.fn();
-    const options = getImportTokenNavbarOptions(
-      mockNavigation,
-      'Import Token',
-      customOnPress,
-    );
-
-    expect(options.header).toBeDefined();
-  });
-});
-
-describe('getNftDetailsNavbarOptions', () => {
-  const { getNftDetailsNavbarOptions } = require('.');
-
-  const mockNavigation = {
-    pop: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns navbar options with back button', () => {
-    const options = getNftDetailsNavbarOptions(
-      mockNavigation,
-      mockTheme.colors,
-    );
-
-    expect(options.headerLeft).toBeDefined();
-    expect(options.headerStyle).toBeDefined();
-  });
-
-  it('calls navigation.pop when back button is pressed', () => {
-    const options = getNftDetailsNavbarOptions(
-      mockNavigation,
-      mockTheme.colors,
-    );
-
-    const HeaderLeft = options.headerLeft();
-    HeaderLeft.props.onPress();
-
-    expect(mockNavigation.pop).toHaveBeenCalledTimes(1);
-  });
-
-  it('shows more options button when onRightPress is provided', () => {
-    const mockOnRightPress = jest.fn();
-    const options = getNftDetailsNavbarOptions(
-      mockNavigation,
-      mockTheme.colors,
-      mockOnRightPress,
-    );
-
-    const HeaderRight = options.headerRight();
-    HeaderRight.props.onPress();
-
-    expect(mockOnRightPress).toHaveBeenCalledTimes(1);
-  });
-
-  it('shows empty view when onRightPress is not provided', () => {
-    const options = getNftDetailsNavbarOptions(
-      mockNavigation,
-      mockTheme.colors,
-    );
-
-    const HeaderRight = options.headerRight();
-    expect(HeaderRight.type).toBe(View);
-  });
-
-  it('applies shadow styles based on contentOffset', () => {
-    const options = getNftDetailsNavbarOptions(
-      mockNavigation,
-      mockTheme.colors,
-      undefined,
-      25,
-    );
-
-    expect(options.headerStyle).toBeDefined();
-  });
-});
-
-describe('getNftFullImageNavbarOptions', () => {
-  const { getNftFullImageNavbarOptions } = require('.');
-
-  const mockNavigation = {
-    pop: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns navbar options with close button on right', () => {
-    const options = getNftFullImageNavbarOptions(
-      mockNavigation,
-      mockTheme.colors,
-    );
-
-    expect(options.headerRight).toBeDefined();
-    expect(options.headerLeft).toBeDefined();
-  });
-
-  it('calls navigation.pop when close button is pressed', () => {
-    const options = getNftFullImageNavbarOptions(
-      mockNavigation,
-      mockTheme.colors,
-    );
-
-    const HeaderRight = options.headerRight();
-    HeaderRight.props.onPress();
-
-    expect(mockNavigation.pop).toHaveBeenCalledTimes(1);
-  });
-
-  it('shows empty view on left', () => {
-    const options = getNftFullImageNavbarOptions(
-      mockNavigation,
-      mockTheme.colors,
-    );
-
-    const HeaderLeft = options.headerLeft();
-    expect(HeaderLeft.type).toBe(View);
-  });
-});
-
-describe('getSwapsAmountNavbar', () => {
-  const { getSwapsAmountNavbar } = require('.');
-
-  const mockNavigation = {
-    getParent: jest.fn(() => ({
-      pop: jest.fn(),
-    })),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns navbar options with title and cancel button', () => {
-    const route = { params: { title: 'Swap' } };
-    const options = getSwapsAmountNavbar(
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    expect(options.headerTitle).toBeDefined();
-    expect(options.headerLeft).toBeDefined();
-    expect(options.headerRight).toBeDefined();
-  });
-
-  it('uses default title when not provided', () => {
-    const route = { params: {} };
-    const options = getSwapsAmountNavbar(
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    expect(options.headerTitle).toBeDefined();
-  });
-
-  it('shows empty view on left', () => {
-    const route = { params: {} };
-    const options = getSwapsAmountNavbar(
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    const HeaderLeft = options.headerLeft();
-    expect(HeaderLeft.type).toBe(View);
-  });
-});
-
-describe('getPerpsTransactionsDetailsNavbar', () => {
-  const { getPerpsTransactionsDetailsNavbar } = require('.');
-
-  const mockNavigation = {
-    goBack: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns navbar options with title and back button', () => {
-    const options = getPerpsTransactionsDetailsNavbar(
-      mockNavigation,
-      'Position Details',
-    );
-
-    expect(options.headerTitle).toBeDefined();
-    expect(options.headerLeft).toBeDefined();
-    expect(options.headerRight).toBeDefined();
-  });
-
-  it('calls navigation.goBack when back button is pressed', () => {
-    const options = getPerpsTransactionsDetailsNavbar(
-      mockNavigation,
-      'Position Details',
-    );
-
-    const HeaderLeft = options.headerLeft();
-    HeaderLeft.props.onPress();
-
-    expect(mockNavigation.goBack).toHaveBeenCalledTimes(1);
-  });
-});
-
-describe('getTransactionOptionsTitle', () => {
-  const { getTransactionOptionsTitle } = require('.');
-
-  const mockNavigation = {
-    pop: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns navbar options with title', () => {
-    const route = {
-      name: 'Send',
-      params: { mode: '', disableModeChange: false, dispatch: jest.fn() },
-    };
-    const options = getTransactionOptionsTitle(
-      'transaction.title',
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    expect(options.headerTitle).toBeDefined();
-    expect(options.headerLeft).toBeDefined();
-    expect(options.headerRight).toBeDefined();
-  });
-
-  it('shows edit button when not in edit mode', () => {
-    const mockDispatch = jest.fn();
-    const route = {
-      name: 'Confirm',
-      params: { mode: '', disableModeChange: false, dispatch: mockDispatch },
-    };
-    const options = getTransactionOptionsTitle(
-      'transaction.title',
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    const HeaderLeft = options.headerLeft();
-    expect(HeaderLeft).toBeDefined();
-  });
-
-  it('shows empty view on left when in edit mode', () => {
-    const route = {
-      name: 'Confirm',
-      params: { mode: 'edit', disableModeChange: false },
-    };
-    const options = getTransactionOptionsTitle(
-      'transaction.title',
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    const HeaderLeft = options.headerLeft();
-    expect(HeaderLeft.type).toBe(View);
-  });
-
-  it('shows cancel button on right for Send screen', () => {
-    const route = {
-      name: 'Send',
-      params: { mode: '' },
-    };
-    const options = getTransactionOptionsTitle(
-      'transaction.title',
-      mockNavigation,
-      route,
-      mockTheme.colors,
-    );
-
-    const HeaderRight = options.headerRight();
-    HeaderRight.props.onPress();
-
-    expect(mockNavigation.pop).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/app/components/UI/NetworkConnectionBanner/NetworkConnectionBanner.tsx b/app/components/UI/NetworkConnectionBanner/NetworkConnectionBanner.tsx
index e3319248b599..98382172cadd 100644
--- a/app/components/UI/NetworkConnectionBanner/NetworkConnectionBanner.tsx
+++ b/app/components/UI/NetworkConnectionBanner/NetworkConnectionBanner.tsx
@@ -303,11 +303,17 @@ const getBannerContent = (
   };
 };
 
-export const NetworkConnectionBanner = () => {
+type NetworkConnectionBannerData = ReturnType<
+  typeof useNetworkConnectionBanner
+>;
+
+export const NetworkConnectionBannerContent = ({
+  networkConnectionBannerState,
+  updateRpc,
+  switchToInfura,
+}: NetworkConnectionBannerData) => {
   const theme = useAppTheme();
   const tw = useTailwind();
-  const { networkConnectionBannerState, updateRpc, switchToInfura } =
-    useNetworkConnectionBanner();
 
   const handleUpdateRpc = useCallback(() => {
     if (networkConnectionBannerState.visible) {
@@ -349,4 +355,9 @@ export const NetworkConnectionBanner = () => {
   );
 };
 
+export const NetworkConnectionBanner = () => {
+  const bannerData = useNetworkConnectionBanner();
+  return <NetworkConnectionBannerContent {...bannerData} />;
+};
+
 export default NetworkConnectionBanner;
diff --git a/app/components/UI/NetworkConnectionBanner/index.ts b/app/components/UI/NetworkConnectionBanner/index.ts
index 0052bedd53f8..088651ad09f5 100644
--- a/app/components/UI/NetworkConnectionBanner/index.ts
+++ b/app/components/UI/NetworkConnectionBanner/index.ts
@@ -1 +1,2 @@
 export { default } from './NetworkConnectionBanner';
+export { NetworkConnectionBannerContent } from './NetworkConnectionBanner';
diff --git a/app/components/UI/NetworkMultiSelectorList/NetworkMultiSelectorList.tsx b/app/components/UI/NetworkMultiSelectorList/NetworkMultiSelectorList.tsx
index 248744bef934..976a5a22520f 100644
--- a/app/components/UI/NetworkMultiSelectorList/NetworkMultiSelectorList.tsx
+++ b/app/components/UI/NetworkMultiSelectorList/NetworkMultiSelectorList.tsx
@@ -59,7 +59,6 @@ import { strings } from '../../../../locales/i18n';
 import TagColored, {
   TagColor,
 } from '../../../component-library/components-temp/TagColored';
-import { useElevatedSurface } from '../../../util/theme/themeUtils';
 
 const SELECTION_DEBOUNCE_DELAY = 150;
 
@@ -106,7 +105,6 @@ const NetworkMultiSelectList = ({
 
   const { styles } = useStyles(styleSheet, {});
   const tw = useTailwind();
-  const surfaceClass = useElevatedSurface();
 
   const processedNetworks = useMemo(
     (): ProcessedNetwork[] =>
@@ -310,7 +308,7 @@ const NetworkMultiSelectList = ({
             disabled={isDisabled}
             showButtonIcon={showButtonIcon}
             buttonProps={createButtonProps(network)}
-            style={tw.style(`${surfaceClass} items-center`)}
+            style={tw.style('items-center')}
             testID={NETWORK_MULTI_SELECTOR_TEST_IDS.NETWORK_LIST_ITEM(
               caipChainId,
               isSelected,
@@ -340,7 +338,6 @@ const NetworkMultiSelectList = ({
       isGasFeesSponsoredNetworkEnabled,
       isHardwareWallet,
       styles.noNetworkFeeContainer,
-      surfaceClass,
       tw,
       styles.networkNameText,
     ],
diff --git a/app/components/UI/NftGrid/NftGridItemBottomSheet.tsx b/app/components/UI/NftGrid/NftGridItemBottomSheet.tsx
index d295e323c528..9a1ce6538e10 100644
--- a/app/components/UI/NftGrid/NftGridItemBottomSheet.tsx
+++ b/app/components/UI/NftGrid/NftGridItemBottomSheet.tsx
@@ -14,7 +14,6 @@ import { strings } from '../../../../locales/i18n';
 import { Nft } from '@metamask/assets-controllers';
 import Engine from '../../../core/Engine';
 import { toHex } from '@metamask/controller-utils';
-import { useElevatedSurface } from '../../../util/theme/themeUtils';
 
 interface NftGridItemBottomSheetProps {
   isVisible: boolean;
@@ -28,7 +27,6 @@ const NftGridItemBottomSheet: React.FC<NftGridItemBottomSheetProps> = ({
   nft,
 }) => {
   const sheetRef = useRef<BottomSheetRef>(null);
-  const surfaceClass = useElevatedSurface();
 
   const handleSheetClose = useCallback(() => {
     sheetRef.current?.onCloseBottomSheet();
@@ -77,11 +75,7 @@ const NftGridItemBottomSheet: React.FC<NftGridItemBottomSheetProps> = ({
   return (
     <View testID="nft-grid-item-bottom-sheet">
       <Modal visible transparent animationType="none" statusBarTranslucent>
-        <BottomSheet
-          ref={sheetRef}
-          onClose={onClose}
-          twClassName={surfaceClass}
-        >
+        <BottomSheet ref={sheetRef} onClose={onClose}>
           <BottomSheetHeader onClose={handleSheetClose}>
             <Text variant={TextVariant.HeadingMd}>
               {strings('wallet.collectible_action_title')}
diff --git a/app/components/UI/Perps/Perps.testIds.ts b/app/components/UI/Perps/Perps.testIds.ts
index 8934132f2d84..fa28fd89ca49 100644
--- a/app/components/UI/Perps/Perps.testIds.ts
+++ b/app/components/UI/Perps/Perps.testIds.ts
@@ -466,6 +466,8 @@ export const PerpsProMarketViewSelectorsIDs = {
   HEADER_MARKET_LIST_BUTTON: 'perps-pro-market-header-market-list-button',
   HEADER_WALLET_BUTTON: 'perps-pro-market-header-wallet-button',
   HEADER_FAVORITE_BUTTON: 'perps-pro-market-header-favorite-button',
+  HEADER_PRICE: 'perps-pro-market-header-price',
+  HEADER_PRICE_CHANGE: 'perps-pro-market-header-price-change',
   MARKET_SUMMARY: 'perps-pro-market-summary',
   MARKET_PRICE: 'perps-pro-market-price',
   MARKET_PRICE_CHANGE: 'perps-pro-market-price-change',
@@ -500,19 +502,36 @@ export const PerpsProMarketViewSelectorsIDs = {
   ORDER_BOOK_EXPAND_BUTTON: 'perps-pro-market-order-book-expand',
   POSITIONS_PANEL: 'perps-pro-market-positions-panel',
   POSITIONS_PANEL_TABS: 'perps-pro-market-positions-panel-tabs',
+  POSITIONS_HISTORY_BUTTON: 'perps-pro-market-positions-history',
   POSITIONS_PANEL_TAB_POSITIONS:
     'perps-pro-market-positions-panel-tab-positions',
   POSITIONS_PANEL_TAB_ORDERS: 'perps-pro-market-positions-panel-tab-orders',
   POSITIONS_TICKER_ONLY: 'perps-pro-market-positions-ticker-only',
+  POSITIONS_SIDE_FILTER_BUTTON: 'perps-pro-market-positions-side-filter-button',
+  POSITIONS_SIDE_FILTER_SHEET: 'perps-pro-market-positions-side-filter-sheet',
+  POSITIONS_SORT_BUTTON: 'perps-pro-market-positions-sort-button',
+  POSITIONS_SORT_SHEET: 'perps-pro-market-positions-sort-sheet',
+  ORDERS_SORT_SHEET: 'perps-pro-market-orders-sort-sheet',
   POSITIONS_LIST: 'perps-pro-market-positions-list',
+  POSITIONS_CLOSE_ALL: 'perps-pro-market-positions-close-all',
+  POSITION_CLOSE: 'perps-pro-market-position-close',
+  POSITION_REVERSE: 'perps-pro-market-position-reverse',
+  POSITION_SHARE: 'perps-pro-market-position-share',
+  POSITION_EDIT_TPSL: 'perps-pro-market-position-edit-tpsl',
+  POSITION_EDIT_MARGIN: 'perps-pro-market-position-edit-margin',
   POSITION_ROW: 'perps-pro-market-position-row',
   ORDERS_LIST: 'perps-pro-market-orders-list',
+  ORDER_CANCEL: 'perps-pro-market-order-cancel',
+  ORDER_EDIT: 'perps-pro-market-order-edit',
+  ORDER_PRICE_EDIT: 'perps-pro-market-order-price-edit',
+  ORDER_SIZE_EDIT: 'perps-pro-market-order-size-edit',
   ORDER_ROW: 'perps-pro-market-order-row',
+  ORDER_TYPE: 'perps-pro-market-order-type',
 };
 
 // Helper for dynamic Pro position row test IDs
-export const getPerpsProPositionRowSelector = (symbol: string, index: number) =>
-  `${PerpsProMarketViewSelectorsIDs.POSITION_ROW}-${symbol}-${index}`;
+export const getPerpsProPositionRowSelector = (symbol: string) =>
+  `${PerpsProMarketViewSelectorsIDs.POSITION_ROW}-${symbol}`;
 
 export const getPerpsProOrderRowSelector = (symbol: string, index: number) =>
   `${PerpsProMarketViewSelectorsIDs.ORDER_ROW}-${symbol}-${index}`;
@@ -523,12 +542,20 @@ export const PerpsProOrderFormSelectorsIDs = {
   DIRECTION_LONG: 'perps-pro-order-form-direction-long',
   DIRECTION_SHORT: 'perps-pro-order-form-direction-short',
   LEVERAGE_BUTTON: 'perps-pro-order-form-leverage',
+  MARGIN_MODE_BUTTON: 'perps-pro-order-form-margin-mode',
   ORDER_TYPE_BUTTON: 'perps-pro-order-form-order-type',
   LIMIT_PRICE_INPUT: 'perps-pro-order-form-limit-price-input',
+  LIMIT_PRICE_PREFIX: 'perps-pro-order-form-limit-price-prefix',
   MID_PRICE_BUTTON: 'perps-pro-order-form-mid-price',
+  MARGIN_SETTINGS_ROW: 'perps-pro-order-form-margin-settings',
+  SIZE_CARD: 'perps-pro-order-form-size-card',
+  SIZE_FIELD: 'perps-pro-order-form-size-field',
   SIZE_INPUT: 'perps-pro-order-form-size-input',
+  SIZE_PREFIX: 'perps-pro-order-form-size-prefix',
   SIZE_SLIDER: 'perps-pro-order-form-size-slider',
+  SIZE_SLIDER_SECTION: 'perps-pro-order-form-size-slider-section',
   SIZE_UNIT_BUTTON: 'perps-pro-order-form-size-unit',
+  SIZE_UNIT_LABEL: 'perps-pro-order-form-size-unit-label',
   KEYBOARD_CLOSE: 'perps-pro-order-form-keyboard-close',
   AVAILABLE_BALANCE: 'perps-pro-order-form-available-balance',
   ADD_FUNDS_BUTTON: 'perps-pro-order-form-add-funds',
@@ -555,6 +582,9 @@ export const PerpsMarketHeaderSelectorsIDs = {
   BACK_BUTTON: 'perps-market-header-back-button',
   ASSET_ICON: 'perps-market-header-asset-icon',
   ASSET_NAME: 'perps-market-header-asset-name',
+  /** Compact header price shown while scrolling (distinct from summary row). */
+  COMPACT_PRICE: 'perps-market-header-compact-price',
+  COMPACT_PRICE_CHANGE: 'perps-market-header-compact-price-change',
   PRICE: 'perps-market-header-price',
   PRICE_CHANGE: 'perps-market-header-price-change',
   MORE_BUTTON: 'perps-market-header-more-button',
@@ -640,6 +670,23 @@ export const PerpsMarketBalanceActionsSelectorsIDs = {
   EMPTY_STATE_DESCRIPTION: 'perps-market-empty-state-description',
 };
 
+// ========================================
+// PERPS BALANCE BOTTOM SHEET SELECTORS
+// ========================================
+
+export const PerpsBalanceBottomSheetSelectorsIDs = {
+  CONTAINER: 'perps-balance-bottom-sheet',
+  CLOSE_BUTTON: 'perps-balance-bottom-sheet-close-button',
+  HISTORY_BUTTON: 'perps-balance-bottom-sheet-history-button',
+  BALANCE_VALUE: 'perps-balance-bottom-sheet-balance-value',
+  AVAILABLE_VALUE: 'perps-balance-bottom-sheet-available-value',
+  PNL_VALUE: 'perps-balance-bottom-sheet-pnl-value',
+  WITHDRAW_BUTTON: 'perps-balance-bottom-sheet-withdraw-button',
+  ADD_FUNDS_BUTTON: 'perps-balance-bottom-sheet-add-funds-button',
+  GEO_BLOCK_BOTTOM_SHEET_TOOLTIP:
+    'perps-balance-bottom-sheet-geo-block-tooltip',
+};
+
 export const PerpsChartAuxiliaryLinesSelectorsIDs = {
   // Auxiliary lines container (TP/SL lines)
   AUXILIARY_LINES: 'auxiliary-lines',
@@ -781,6 +828,11 @@ export const PerpsLimitPriceBottomSheetSelectorsIDs = {
   PRESET_PERCENT: 'perps-limit-price-preset-',
 };
 
+export const PerpsOrderSizeBottomSheetSelectorsIDs = {
+  SIZE_DISPLAY: 'perps-order-size-display',
+  CONFIRM_BUTTON: 'perps-order-size-confirm-button',
+};
+
 // ========================================
 // PERPS CLOSE POSITION VIEW SELECTORS
 // ========================================
@@ -809,6 +861,21 @@ export const PerpsOrderTypeBottomSheetSelectorsIDs = {
   LIMIT_OPTION: 'perps-order-type-limit',
 } as const;
 
+export const PerpsMarginModeBottomSheetSelectorsIDs = {
+  CONTAINER: 'perps-margin-mode-bottom-sheet',
+  CLOSE_BUTTON: 'perps-margin-mode-bottom-sheet-close',
+  ISOLATED_OPTION: 'perps-margin-mode-isolated',
+  CROSS_OPTION: 'perps-margin-mode-cross',
+} as const;
+
+export const PerpsLeverageBottomSheetSelectorsIDs = {
+  SLIDER: 'perps-leverage-slider',
+  SLIDER_INCOMING: 'perps-leverage-slider-incoming',
+  SLIDER_INCOMING_WRAP: 'perps-leverage-slider-incoming-wrap',
+  HELP_TEXT: 'perps-leverage-help-text',
+  QUICK_SELECT: 'leverage-quick-select',
+} as const;
+
 export const PerpsAdjustMarginActionSheetSelectorsIDs = {
   ADD_MARGIN_OPTION: 'perps-adjust-margin-add-btn',
   REDUCE_MARGIN_OPTION: 'perps-adjust-margin-reduce-btn',
@@ -817,6 +884,7 @@ export const PerpsAdjustMarginActionSheetSelectorsIDs = {
 export const PerpsAdjustMarginViewSelectorsIDs = {
   CONFIRM_BUTTON: 'perps-adjust-margin-confirm-button',
   DONE_BUTTON: 'perps-adjust-margin-done-button',
+  SLIDER: 'perps-adjust-margin-slider',
   AVAILABLE_VALUE: 'perps-adjust-margin-available-value',
   LIQUIDATION_PRICE_VALUE: 'perps-adjust-margin-liquidation-price-value',
   LIQUIDATION_DISTANCE_VALUE: 'perps-adjust-margin-liquidation-distance-value',
@@ -989,11 +1057,16 @@ export const PerpsModeToggleSelectorsIDs = {
   PRO_SEGMENT: 'perps-mode-toggle-pro',
 } as const;
 
+export const PerpsModeSelectionBottomSheetSelectorsIDs = {
+  CONTAINER: 'perps-mode-selection-bottom-sheet',
+  TITLE: 'perps-mode-selection-bottom-sheet-title',
+  LITE_OPTION: 'perps-mode-selection-lite-option',
+  PRO_OPTION: 'perps-mode-selection-pro-option',
+  LITE_ICON: 'perps-mode-selection-lite-icon',
+  PRO_ICON: 'perps-mode-selection-pro-icon',
+  SELECTED_INDICATOR: 'perps-mode-selection-selected-indicator',
+} as const;
+
 // ========================================
 // PERPS MODE FLASH SELECTORS
 // ========================================
-
-export const PerpsModeFlashSelectorsIDs = {
-  CONTAINER: 'perps-mode-flash',
-  TITLE: 'perps-mode-flash-title',
-} as const;
diff --git a/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.styles.ts b/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.styles.ts
deleted file mode 100644
index c706f351a716..000000000000
--- a/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.styles.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import { StyleSheet } from 'react-native';
-import { Theme } from '../../../../../util/theme/models';
-
-const styleSheet = (params: { theme: Theme }) => {
-  const { theme } = params;
-  const { colors } = theme;
-
-  return StyleSheet.create({
-    container: {
-      flex: 1,
-      backgroundColor: colors.background.default,
-    },
-    header: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      justifyContent: 'space-between',
-      paddingHorizontal: 16,
-      paddingVertical: 12,
-    },
-    headerTitle: {
-      textAlign: 'center',
-    },
-    headerSpacer: {
-      width: 32,
-    },
-    contentContainer: {
-      flex: 1,
-      paddingHorizontal: 16,
-      justifyContent: 'space-between',
-    },
-    scrollView: {
-      flex: 1,
-    },
-    scrollContent: {
-      paddingHorizontal: 16,
-      paddingBottom: 24,
-    },
-    section: {
-      marginTop: 24,
-    },
-    errorContainer: {
-      flex: 1,
-      justifyContent: 'center',
-      alignItems: 'center',
-      padding: 24,
-    },
-    amountSection: {
-      marginTop: 24,
-      marginBottom: 16,
-    },
-    sliderSection: {
-      marginBottom: 24,
-    },
-    infoSection: {
-      gap: 16,
-      marginBottom: 16,
-    },
-    labelWithIcon: {
-      flexDirection: 'row',
-      alignItems: 'center',
-    },
-    infoIcon: {
-      marginLeft: 4,
-      padding: 4,
-    },
-    keypadFooter: {
-      paddingHorizontal: 16,
-      paddingTop: 16,
-      paddingBottom: 16,
-      backgroundColor: colors.background.default,
-    },
-    percentageButtonsContainer: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      gap: 8,
-      marginBottom: 16,
-    },
-    percentageButton: {
-      flex: 1,
-    },
-    keypad: {},
-    infoCard: {
-      backgroundColor: colors.background.alternative,
-      borderRadius: 8,
-      padding: 16,
-      gap: 12,
-    },
-    infoRow: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-    },
-    labelRow: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-      marginBottom: 12,
-    },
-    maxButton: {
-      paddingHorizontal: 12,
-      paddingVertical: 4,
-      borderRadius: 4,
-      backgroundColor: colors.primary.muted,
-    },
-    amountDisplay: {
-      alignItems: 'center',
-      paddingVertical: 16,
-    },
-    slider: {
-      width: '100%',
-      height: 40,
-    },
-    sliderLabels: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      marginTop: 8,
-    },
-    impactCard: {
-      backgroundColor: colors.info.muted,
-      borderRadius: 8,
-      padding: 16,
-      gap: 12,
-    },
-    impactCardWarning: {
-      backgroundColor: colors.warning.muted,
-    },
-    impactCardDanger: {
-      backgroundColor: colors.error.muted,
-    },
-    impactHeader: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      gap: 8,
-      marginBottom: 4,
-    },
-    impactTitle: {
-      flex: 1,
-    },
-    impactRow: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-    },
-    changeContainer: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      gap: 8,
-    },
-    strikethrough: {
-      textDecorationLine: 'line-through',
-    },
-    warningCard: {
-      flexDirection: 'row',
-      alignItems: 'flex-start',
-      gap: 12,
-      backgroundColor: colors.warning.muted,
-      borderRadius: 8,
-      padding: 16,
-    },
-    warningCardDanger: {
-      backgroundColor: colors.error.muted,
-    },
-    warningText: {
-      flex: 1,
-    },
-    warningTextContainer: {
-      flex: 1,
-      gap: 4,
-    },
-    footer: {
-      padding: 16,
-      borderTopWidth: 1,
-      borderTopColor: colors.border.muted,
-      backgroundColor: colors.background.default,
-    },
-  });
-};
-
-export default styleSheet;
diff --git a/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.test.tsx b/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.test.tsx
index d794c11caf79..14e356fd853f 100644
--- a/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.test.tsx
@@ -1,24 +1,50 @@
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react-native';
+import { render, screen, fireEvent, act } from '@testing-library/react-native';
 import Logger from '../../../../../util/Logger';
+import { playImpact, ImpactMoment } from '../../../../../util/haptics';
 import PerpsAdjustMarginView from './PerpsAdjustMarginView';
-import { type Position } from '@metamask/perps-controller';
+import { type Position, PERPS_CONSTANTS } from '@metamask/perps-controller';
+import {
+  PerpsAdjustMarginViewSelectorsIDs,
+  PerpsAmountDisplaySelectorsIDs,
+} from '../../Perps.testIds';
 
 // Mock dependencies
 jest.mock('react-native-reanimated', () =>
   jest.requireActual('react-native-reanimated/mock'),
 );
 
-jest.mock('react-native-gesture-handler', () => ({
-  GestureHandlerRootView: 'View',
-  GestureDetector: 'View',
-  Gesture: {
-    Pan: jest.fn().mockReturnValue({
-      onUpdate: jest.fn().mockReturnThis(),
-      onEnd: jest.fn().mockReturnThis(),
-    }),
-  },
-}));
+jest.mock('react-native-gesture-handler', () => {
+  const chainable = () => {
+    const api: Record<string, unknown> = {};
+    const returnApi = () => api;
+    [
+      'enabled',
+      'onBegin',
+      'onStart',
+      'onUpdate',
+      'onEnd',
+      'onFinalize',
+      'activeOffsetX',
+      'hitSlop',
+      'minDistance',
+      'maxPointers',
+    ].forEach((method) => {
+      api[method] = jest.fn(returnApi);
+    });
+    return api;
+  };
+
+  return {
+    GestureHandlerRootView: 'View',
+    GestureDetector: ({ children }: { children?: unknown }) => children,
+    Gesture: {
+      Pan: jest.fn(chainable),
+      Tap: jest.fn(chainable),
+      Simultaneous: jest.fn((...gestures: unknown[]) => gestures),
+    },
+  };
+});
 
 const mockHandleAddMargin = jest.fn();
 const mockHandleRemoveMargin = jest.fn();
@@ -82,111 +108,106 @@ jest.mock('@react-navigation/native', () => ({
   }),
 }));
 
-jest.mock('./PerpsAdjustMarginView.styles', () => ({
-  __esModule: true,
-  default: () => ({
-    container: {},
-    scrollView: {},
-    scrollContent: {},
-    amountSection: {},
-    sliderSection: {},
-    infoSection: {},
-    infoRow: {},
-    changeContainer: {},
-    footer: {},
-    errorContainer: {},
-  }),
-}));
-
-jest.mock('../../../../../util/theme', () => {
-  const { mockTheme } = jest.requireActual('../../../../../util/theme');
-  return {
-    useTheme: jest.fn(() => mockTheme),
-  };
-});
-
 jest.mock('../../../../../../locales/i18n', () => ({
   strings: jest.fn((key) => key),
 }));
 
-// Mock PerpsOrderHeader component to render title prop
-jest.mock('../../components/PerpsOrderHeader', () => {
-  const ReactModule = jest.requireActual('react');
-  const RNModule = jest.requireActual('react-native');
-  return function MockPerpsOrderHeader({ title }: { title: string }) {
-    return ReactModule.createElement(RNModule.Text, null, title);
-  };
+jest.mock('../../components/PerpsAmountDisplay', () => {
+  const ReactActual = jest.requireActual('react');
+  const { TouchableOpacity: Touchable, Text } =
+    jest.requireActual('react-native');
+  const { PerpsAmountDisplaySelectorsIDs: Selectors } = jest.requireActual(
+    '../../Perps.testIds',
+  );
+  return ({ onPress, amount }: { onPress?: () => void; amount?: string }) =>
+    ReactActual.createElement(
+      Touchable,
+      {
+        onPress,
+        testID: Selectors.TOUCHABLE,
+      },
+      ReactActual.createElement(Text, null, amount ?? '0'),
+    );
 });
-jest.mock('../../components/PerpsAmountDisplay', () => 'PerpsAmountDisplay');
-jest.mock(
-  '../../components/PerpsBottomSheetTooltip',
-  () => 'PerpsBottomSheetTooltip',
-);
-jest.mock('../../components/PerpsSlider', () => {
-  const ReactModule = jest.requireActual('react');
+
+jest.mock('../../components/PerpsBottomSheetTooltip', () => {
+  const ReactActual = jest.requireActual('react');
+  const { TouchableOpacity: Touchable, Text } =
+    jest.requireActual('react-native');
+  return ({
+    onClose,
+    contentKey,
+  }: {
+    onClose?: () => void;
+    contentKey?: string;
+  }) =>
+    ReactActual.createElement(
+      Touchable,
+      {
+        testID: 'perps-bottom-sheet-tooltip',
+        onPress: onClose,
+      },
+      ReactActual.createElement(Text, null, contentKey),
+    );
+});
+
+jest.mock('../../../../Base/Keypad', () => {
+  const ReactActual = jest.requireActual('react');
   const { View } = jest.requireActual('react-native');
-  return function MockPerpsSlider({
-    onValueChange,
+  return function MockKeypad({
+    onChange,
+    value,
   }: {
-    onValueChange?: (value: number) => void;
+    onChange?: (data: { value: string }) => void;
+    value?: string;
   }) {
-    return ReactModule.createElement(View, {
-      testID: 'mock-perps-slider',
-      onValueChange,
+    return ReactActual.createElement(View, {
+      testID: 'mock-keypad',
+      value,
+      onChange,
     });
   };
 });
 
 jest.mock('@metamask/design-system-react-native', () => {
-  const { TouchableOpacity, Text } = jest.requireActual('react-native');
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
   return {
-    ...jest.requireActual('@metamask/design-system-react-native'),
-    __esModule: true,
-    Button: ({
-      label,
-      onPress,
+    ...actual,
+    Slider: ({
+      testID,
+      value,
+      onValueChange,
+      onGrip,
+      onMark,
       isDisabled,
-      isLoading,
-      children,
-      ...props
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    }: any) => (
-      <TouchableOpacity
-        onPress={onPress}
-        disabled={isDisabled}
-        accessibilityRole="button"
-        accessibilityLabel={label}
-        {...props}
-      >
-        {!isLoading && <Text>{label ?? children}</Text>}
-      </TouchableOpacity>
-    ),
-    ButtonVariant: {
-      Primary: 'Primary',
-      Secondary: 'Secondary',
-    },
-    ButtonSize: {
-      Lg: 'Lg',
-      Sm: 'Sm',
-    },
+    }: {
+      testID?: string;
+      value?: number;
+      onValueChange?: (value: number) => void;
+      onGrip?: () => void;
+      onMark?: () => void;
+      isDisabled?: boolean;
+    }) =>
+      ReactActual.createElement(View, {
+        testID,
+        value,
+        onValueChange,
+        onGrip,
+        onMark,
+        isDisabled,
+      }),
   };
 });
 
-jest.mock('../../../../../component-library/components/Icons/Icon', () => {
-  const ReactModule = jest.requireActual('react');
-  const { View } = jest.requireActual('react-native');
-  return {
-    __esModule: true,
-    default: ({ name }: { name: string }) =>
-      ReactModule.createElement(View, { accessibilityLabel: name }),
-    IconName: {
-      ArrowRight: 'ArrowRight',
-      Info: 'Info',
-    },
-    IconSize: { Sm: 'Sm' },
-    IconColor: { Alternative: 'Alternative' },
-  };
-});
+jest.mock('../../../../../util/haptics', () => ({
+  playImpact: jest.fn(),
+  ImpactMoment: {
+    SliderGrip: 'SliderGrip',
+    SliderTick: 'SliderTick',
+  },
+}));
 
 describe('PerpsAdjustMarginView', () => {
   const mockPosition: Position = {
@@ -265,7 +286,9 @@ describe('PerpsAdjustMarginView', () => {
       expect(
         screen.getByText('perps.adjust_margin.margin_available_to_add'),
       ).toBeOnTheScreen();
-      expect(screen.getByText('$1000.00')).toBeOnTheScreen();
+      expect(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.AVAILABLE_VALUE),
+      ).toHaveTextContent('$1000.00');
     });
 
     it('displays liquidation price label', () => {
@@ -288,8 +311,8 @@ describe('PerpsAdjustMarginView', () => {
       render(<PerpsAdjustMarginView />);
 
       expect(
-        screen.getByText('perps.adjust_margin.add_margin'),
-      ).toBeOnTheScreen();
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.CONFIRM_BUTTON),
+      ).toHaveTextContent('perps.adjust_margin.add_margin');
     });
   });
 
@@ -336,15 +359,17 @@ describe('PerpsAdjustMarginView', () => {
       expect(
         screen.getByText('perps.adjust_margin.margin_available_to_remove'),
       ).toBeOnTheScreen();
-      expect(screen.getByText('$200.00')).toBeOnTheScreen();
+      expect(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.AVAILABLE_VALUE),
+      ).toHaveTextContent('$200.00');
     });
 
     it('displays reduce margin button label', () => {
       render(<PerpsAdjustMarginView />);
 
       expect(
-        screen.getByText('perps.adjust_margin.reduce_margin'),
-      ).toBeOnTheScreen();
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.CONFIRM_BUTTON),
+      ).toHaveTextContent('perps.adjust_margin.reduce_margin');
     });
   });
 
@@ -441,7 +466,7 @@ describe('PerpsAdjustMarginView', () => {
   });
 
   describe('loading states', () => {
-    it('does not display button text when isAdjusting is true', () => {
+    it('marks confirm button as busy when isAdjusting is true', () => {
       mockRouteParams = {
         position: mockPosition,
         mode: 'add',
@@ -455,13 +480,13 @@ describe('PerpsAdjustMarginView', () => {
 
       render(<PerpsAdjustMarginView />);
 
-      // When loading, button text is not rendered
       expect(
-        screen.queryByText('perps.adjust_margin.add_margin'),
-      ).not.toBeOnTheScreen();
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.CONFIRM_BUTTON)
+          .props.accessibilityState.busy,
+      ).toBe(true);
     });
 
-    it('displays button text when not adjusting', () => {
+    it('does not mark confirm button as busy when not adjusting', () => {
       mockRouteParams = {
         position: mockPosition,
         mode: 'add',
@@ -475,9 +500,11 @@ describe('PerpsAdjustMarginView', () => {
 
       render(<PerpsAdjustMarginView />);
 
-      expect(
-        screen.getByText('perps.adjust_margin.add_margin'),
-      ).toBeOnTheScreen();
+      const confirmButton = screen.getByTestId(
+        PerpsAdjustMarginViewSelectorsIDs.CONFIRM_BUTTON,
+      );
+      expect(confirmButton.props.accessibilityState?.busy).not.toBe(true);
+      expect(confirmButton).toHaveTextContent('perps.adjust_margin.add_margin');
     });
   });
 
@@ -512,7 +539,9 @@ describe('PerpsAdjustMarginView', () => {
       expect(
         screen.getByText('perps.adjust_margin.margin_available_to_remove'),
       ).toBeOnTheScreen();
-      expect(screen.getByText('$200.00')).toBeOnTheScreen();
+      expect(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.AVAILABLE_VALUE),
+      ).toHaveTextContent('$200.00');
     });
   });
 
@@ -525,13 +554,588 @@ describe('PerpsAdjustMarginView', () => {
     });
 
     it('uses ArrowRight (not Arrow2Right) for liquidation price and distance transition arrows', () => {
-      const { getByTestId } = render(<PerpsAdjustMarginView />);
+      render(<PerpsAdjustMarginView />);
 
-      // Trigger showTransition by setting a non-zero margin amount via the slider
-      fireEvent(getByTestId('mock-perps-slider'), 'valueChange', 100);
+      const slider = screen.getByTestId(
+        PerpsAdjustMarginViewSelectorsIDs.SLIDER,
+      );
+      act(() => {
+        (slider.props as { onValueChange: (v: number) => void }).onValueChange(
+          25,
+        );
+      });
 
       const arrowIcons = screen.getAllByLabelText('ArrowRight');
       expect(arrowIcons).toHaveLength(2);
     });
   });
+
+  describe('slider interactions', () => {
+    beforeEach(() => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'add',
+      };
+    });
+
+    const getSliderProps = () => {
+      const slider = screen.getByTestId(
+        PerpsAdjustMarginViewSelectorsIDs.SLIDER,
+      );
+      return slider.props as {
+        onValueChange: (percentage: number) => void;
+        onGrip: () => void;
+        onMark: () => void;
+      };
+    };
+
+    it('updates amount from slider percentage changes', () => {
+      render(<PerpsAdjustMarginView />);
+
+      act(() => {
+        getSliderProps().onValueChange(50);
+      });
+
+      expect(
+        screen.getByTestId(PerpsAmountDisplaySelectorsIDs.TOUCHABLE),
+      ).toHaveTextContent('500.00');
+    });
+
+    it('plays grip and mark haptics from slider callbacks', () => {
+      render(<PerpsAdjustMarginView />);
+
+      act(() => {
+        getSliderProps().onGrip();
+        getSliderProps().onMark();
+      });
+
+      expect(playImpact).toHaveBeenCalledWith(ImpactMoment.SliderGrip);
+      expect(playImpact).toHaveBeenCalledWith(ImpactMoment.SliderTick);
+    });
+
+    it('keeps slider at zero when max amount is zero', () => {
+      mockUsePerpsAdjustMarginData.mockReturnValue({
+        position: mockPosition,
+        isLoading: false,
+        currentMargin: 500,
+        positionValue: 5000,
+        maxAmount: 0,
+        currentLiquidationPrice: 1900,
+        newLiquidationPrice: 1900,
+        currentLiquidationDistance: 5,
+        newLiquidationDistance: 5,
+        spendableBalance: 0,
+        currentPrice: 2000,
+        isAddMode: true,
+        positionLeverage: 10,
+      });
+
+      render(<PerpsAdjustMarginView />);
+
+      const slider = screen.getByTestId(
+        PerpsAdjustMarginViewSelectorsIDs.SLIDER,
+      );
+      expect((slider.props as { value: number }).value).toBe(0);
+    });
+  });
+
+  describe('confirm actions', () => {
+    it('adds margin and navigates back on success', async () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'add',
+      };
+      mockUsePerpsAdjustMarginData.mockReturnValue({
+        position: mockPosition,
+        isLoading: false,
+        currentMargin: 500,
+        positionValue: 5000,
+        maxAmount: 1000,
+        currentLiquidationPrice: 1900,
+        newLiquidationPrice: 1850,
+        currentLiquidationDistance: 5,
+        newLiquidationDistance: 8,
+        spendableBalance: 1000,
+        currentPrice: 2000,
+        isAddMode: true,
+        positionLeverage: 10,
+      });
+
+      render(<PerpsAdjustMarginView />);
+
+      const slider = screen.getByTestId(
+        PerpsAdjustMarginViewSelectorsIDs.SLIDER,
+      );
+      act(() => {
+        (slider.props as { onValueChange: (v: number) => void }).onValueChange(
+          25,
+        );
+      });
+
+      fireEvent.press(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.CONFIRM_BUTTON),
+      );
+
+      await act(async () => {
+        await Promise.resolve();
+      });
+
+      expect(mockHandleAddMargin).toHaveBeenCalledWith('ETH', 250);
+    });
+
+    it('removes margin on confirm in remove mode', async () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'remove',
+      };
+      mockUsePerpsAdjustMarginData.mockReturnValue({
+        position: mockPosition,
+        isLoading: false,
+        currentMargin: 500,
+        positionValue: 5000,
+        maxAmount: 200,
+        currentLiquidationPrice: 1900,
+        newLiquidationPrice: 1920,
+        currentLiquidationDistance: 5,
+        newLiquidationDistance: 3,
+        spendableBalance: 1000,
+        currentPrice: 2000,
+        isAddMode: false,
+        positionLeverage: 10,
+      });
+
+      render(<PerpsAdjustMarginView />);
+
+      const slider = screen.getByTestId(
+        PerpsAdjustMarginViewSelectorsIDs.SLIDER,
+      );
+      act(() => {
+        (slider.props as { onValueChange: (v: number) => void }).onValueChange(
+          50,
+        );
+      });
+
+      fireEvent.press(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.CONFIRM_BUTTON),
+      );
+
+      await act(async () => {
+        await Promise.resolve();
+      });
+
+      expect(mockHandleRemoveMargin).toHaveBeenCalledWith('ETH', 100);
+    });
+
+    it('does not submit when amount is zero', () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'add',
+      };
+
+      render(<PerpsAdjustMarginView />);
+
+      fireEvent.press(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.CONFIRM_BUTTON),
+      );
+
+      expect(mockHandleAddMargin).not.toHaveBeenCalled();
+      expect(mockHandleRemoveMargin).not.toHaveBeenCalled();
+    });
+
+    it('does not remove margin when amount exceeds max removable', async () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'remove',
+      };
+      mockUsePerpsAdjustMarginData.mockReturnValue({
+        position: mockPosition,
+        isLoading: false,
+        currentMargin: 500,
+        positionValue: 5000,
+        maxAmount: 200,
+        currentLiquidationPrice: 1900,
+        newLiquidationPrice: 1900,
+        currentLiquidationDistance: 5,
+        newLiquidationDistance: 5,
+        spendableBalance: 1000,
+        currentPrice: 2000,
+        isAddMode: false,
+        positionLeverage: 10,
+      });
+
+      render(<PerpsAdjustMarginView />);
+
+      const slider = screen.getByTestId(
+        PerpsAdjustMarginViewSelectorsIDs.SLIDER,
+      );
+      act(() => {
+        (slider.props as { onValueChange: (v: number) => void }).onValueChange(
+          100,
+        );
+      });
+
+      mockUsePerpsAdjustMarginData.mockReturnValue({
+        position: mockPosition,
+        isLoading: false,
+        currentMargin: 500,
+        positionValue: 5000,
+        maxAmount: 50,
+        currentLiquidationPrice: 1900,
+        newLiquidationPrice: 1900,
+        currentLiquidationDistance: 5,
+        newLiquidationDistance: 5,
+        spendableBalance: 1000,
+        currentPrice: 2000,
+        isAddMode: false,
+        positionLeverage: 10,
+      });
+
+      // Re-render summary/validation with lowered max while amount stays at 200
+      fireEvent.press(
+        screen.getByTestId(PerpsAmountDisplaySelectorsIDs.TOUCHABLE),
+      );
+      fireEvent.press(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.DONE_BUTTON),
+      );
+
+      fireEvent.press(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.CONFIRM_BUTTON),
+      );
+
+      await act(async () => {
+        await Promise.resolve();
+      });
+
+      expect(mockHandleRemoveMargin).not.toHaveBeenCalled();
+    });
+
+    it('navigates back when margin adjustment succeeds', () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'add',
+      };
+
+      render(<PerpsAdjustMarginView />);
+
+      const options = mockUsePerpsMarginAdjustment.mock.calls[0][0] as {
+        onSuccess?: () => void;
+      };
+      options.onSuccess?.();
+
+      expect(mockGoBack).toHaveBeenCalled();
+    });
+
+    it('logs remove-margin errors from the hook callback', () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'remove',
+      };
+      mockUsePerpsAdjustMarginData.mockReturnValue({
+        position: mockPosition,
+        isLoading: false,
+        currentMargin: 500,
+        positionValue: 5000,
+        maxAmount: 200,
+        currentLiquidationPrice: 1900,
+        newLiquidationPrice: 1900,
+        currentLiquidationDistance: 5,
+        newLiquidationDistance: 5,
+        spendableBalance: 1000,
+        currentPrice: 2000,
+        isAddMode: false,
+        positionLeverage: 10,
+      });
+
+      render(<PerpsAdjustMarginView />);
+
+      const options = mockUsePerpsMarginAdjustment.mock.calls[0][0] as {
+        onError?: (errorMessage: string) => void;
+      };
+      options.onError?.('Failed to remove margin');
+
+      expect(Logger.error).toHaveBeenCalledWith(
+        expect.any(Error),
+        expect.objectContaining({
+          context: {
+            name: 'PerpsAdjustMarginView',
+            data: {
+              action: 'remove_margin',
+              symbol: 'ETH',
+              error: 'Failed to remove margin',
+            },
+          },
+        }),
+      );
+    });
+  });
+
+  describe('keypad and percentage inputs', () => {
+    beforeEach(() => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'add',
+      };
+    });
+
+    const openKeypad = () => {
+      fireEvent.press(
+        screen.getByTestId(PerpsAmountDisplaySelectorsIDs.TOUCHABLE),
+      );
+    };
+
+    const typeKeypadValue = (value: string) => {
+      const keypad = screen.getByTestId('mock-keypad');
+      act(() => {
+        (
+          keypad.props as { onChange: (data: { value: string }) => void }
+        ).onChange({ value });
+      });
+    };
+
+    it('opens keypad and applies 25% and 50% shortcuts', () => {
+      render(<PerpsAdjustMarginView />);
+      openKeypad();
+
+      fireEvent.press(screen.getByText('25%'));
+      expect(
+        screen.getByTestId(PerpsAmountDisplaySelectorsIDs.TOUCHABLE),
+      ).toHaveTextContent('250.00');
+
+      fireEvent.press(screen.getByText('50%'));
+      expect(
+        screen.getByTestId(PerpsAmountDisplaySelectorsIDs.TOUCHABLE),
+      ).toHaveTextContent('500.00');
+    });
+
+    it('applies max amount and closes keypad with Done', () => {
+      render(<PerpsAdjustMarginView />);
+      openKeypad();
+
+      fireEvent.press(screen.getByText('perps.deposit.max_button'));
+      expect(
+        screen.getByTestId(PerpsAmountDisplaySelectorsIDs.TOUCHABLE),
+      ).toHaveTextContent('1000.00');
+
+      fireEvent.press(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.DONE_BUTTON),
+      );
+
+      expect(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.CONFIRM_BUTTON),
+      ).toBeOnTheScreen();
+      expect(screen.queryByTestId('mock-keypad')).toBeNull();
+    });
+
+    it('updates amount from keypad input', () => {
+      render(<PerpsAdjustMarginView />);
+      openKeypad();
+      typeKeypadValue('150');
+
+      expect(
+        screen.getByTestId(PerpsAmountDisplaySelectorsIDs.TOUCHABLE),
+      ).toHaveTextContent('150');
+    });
+
+    it('clamps keypad input to max removable in remove mode', () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'remove',
+      };
+      mockUsePerpsAdjustMarginData.mockReturnValue({
+        position: mockPosition,
+        isLoading: false,
+        currentMargin: 500,
+        positionValue: 5000,
+        maxAmount: 200,
+        currentLiquidationPrice: 1900,
+        newLiquidationPrice: 1900,
+        currentLiquidationDistance: 5,
+        newLiquidationDistance: 5,
+        spendableBalance: 1000,
+        currentPrice: 2000,
+        isAddMode: false,
+        positionLeverage: 10,
+      });
+
+      render(<PerpsAdjustMarginView />);
+      openKeypad();
+      typeKeypadValue('350');
+
+      expect(
+        screen.getByTestId(PerpsAmountDisplaySelectorsIDs.TOUCHABLE),
+      ).toHaveTextContent('200.00');
+    });
+
+    it('navigates back from header', () => {
+      render(<PerpsAdjustMarginView />);
+
+      // HeaderStandard back control is the first ButtonIcon on the screen
+      const iconButtons = screen.getAllByTestId('button-icon');
+      fireEvent.press(iconButtons[0]);
+      expect(mockGoBack).toHaveBeenCalled();
+    });
+  });
+
+  describe('validation and tooltips', () => {
+    const openKeypad = () => {
+      fireEvent.press(
+        screen.getByTestId(PerpsAmountDisplaySelectorsIDs.TOUCHABLE),
+      );
+    };
+
+    const typeKeypadValue = (value: string) => {
+      const keypad = screen.getByTestId('mock-keypad');
+      act(() => {
+        (
+          keypad.props as { onChange: (data: { value: string }) => void }
+        ).onChange({ value });
+      });
+    };
+
+    it('shows exceeds available validation after amount exceeds max', () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'add',
+      };
+
+      render(<PerpsAdjustMarginView />);
+      openKeypad();
+      typeKeypadValue('1500');
+      fireEvent.press(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.DONE_BUTTON),
+      );
+
+      expect(
+        screen.getByText('perps.adjust_margin.exceeds_available'),
+      ).toBeOnTheScreen();
+    });
+
+    it('shows exceeds max removable validation in remove mode', () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'remove',
+      };
+      mockUsePerpsAdjustMarginData.mockReturnValue({
+        position: mockPosition,
+        isLoading: false,
+        currentMargin: 500,
+        positionValue: 5000,
+        maxAmount: 200,
+        currentLiquidationPrice: 1900,
+        newLiquidationPrice: 1900,
+        currentLiquidationDistance: 5,
+        newLiquidationDistance: 5,
+        spendableBalance: 1000,
+        currentPrice: 2000,
+        isAddMode: false,
+        positionLeverage: 10,
+      });
+
+      render(<PerpsAdjustMarginView />);
+
+      const slider = screen.getByTestId(
+        PerpsAdjustMarginViewSelectorsIDs.SLIDER,
+      );
+      act(() => {
+        (slider.props as { onValueChange: (v: number) => void }).onValueChange(
+          100,
+        );
+      });
+
+      mockUsePerpsAdjustMarginData.mockReturnValue({
+        position: mockPosition,
+        isLoading: false,
+        currentMargin: 500,
+        positionValue: 5000,
+        maxAmount: 50,
+        currentLiquidationPrice: 1900,
+        newLiquidationPrice: 1900,
+        currentLiquidationDistance: 5,
+        newLiquidationDistance: 5,
+        spendableBalance: 1000,
+        currentPrice: 2000,
+        isAddMode: false,
+        positionLeverage: 10,
+      });
+
+      openKeypad();
+      fireEvent.press(
+        screen.getByTestId(PerpsAdjustMarginViewSelectorsIDs.DONE_BUTTON),
+      );
+
+      expect(
+        screen.getByText('perps.errors.marginValidation.exceedsMaxRemovable'),
+      ).toBeOnTheScreen();
+    });
+
+    it('suppresses validation errors while keypad is focused', () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'add',
+      };
+
+      render(<PerpsAdjustMarginView />);
+      openKeypad();
+      typeKeypadValue('1500');
+
+      expect(
+        screen.queryByText('perps.adjust_margin.exceeds_available'),
+      ).toBeNull();
+    });
+
+    it('opens and closes liquidation tooltips', () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'add',
+      };
+
+      render(<PerpsAdjustMarginView />);
+
+      // button-icon order: header back, liquidation price info, liquidation distance info
+      const iconButtons = screen.getAllByTestId('button-icon');
+      expect(iconButtons.length).toBeGreaterThanOrEqual(3);
+
+      fireEvent.press(iconButtons[1]);
+      expect(
+        screen.getByTestId('perps-bottom-sheet-tooltip'),
+      ).toBeOnTheScreen();
+      expect(screen.getByText('liquidation_price')).toBeOnTheScreen();
+
+      fireEvent.press(screen.getByTestId('perps-bottom-sheet-tooltip'));
+      expect(screen.queryByTestId('perps-bottom-sheet-tooltip')).toBeNull();
+
+      fireEvent.press(iconButtons[2]);
+      expect(screen.getByText('liquidation_distance')).toBeOnTheScreen();
+    });
+
+    it('shows fallback display when liquidation price is zero', () => {
+      mockRouteParams = {
+        position: mockPosition,
+        mode: 'add',
+      };
+      mockUsePerpsAdjustMarginData.mockReturnValue({
+        position: mockPosition,
+        isLoading: false,
+        currentMargin: 500,
+        positionValue: 5000,
+        maxAmount: 1000,
+        currentLiquidationPrice: 0,
+        newLiquidationPrice: 0,
+        currentLiquidationDistance: 0,
+        newLiquidationDistance: 0,
+        spendableBalance: 1000,
+        currentPrice: 2000,
+        isAddMode: true,
+        positionLeverage: 10,
+      });
+
+      render(<PerpsAdjustMarginView />);
+
+      expect(
+        screen.getByTestId(
+          PerpsAdjustMarginViewSelectorsIDs.LIQUIDATION_DISTANCE_VALUE,
+        ),
+      ).toHaveTextContent(PERPS_CONSTANTS.FallbackDataDisplay);
+    });
+  });
 });
diff --git a/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.tsx b/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.tsx
index ed26399eab77..470162e2aa68 100644
--- a/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.tsx
+++ b/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.tsx
@@ -1,18 +1,29 @@
 import React, { useState, useCallback, useMemo, useRef } from 'react';
-import { View, TouchableOpacity } from 'react-native';
+import { ScrollView } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
 import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
 
-import { useStyles } from '../../../../../component-library/hooks';
 import {
+  Box,
   Button,
   ButtonSize,
   ButtonVariant,
   Text,
   TextColor,
   TextVariant,
+  Slider,
+  KeyValueRow,
+  KeyValueRowVariant,
+  Icon,
+  IconName,
+  IconSize,
+  IconColor,
+  HelpText,
+  HelpTextSeverity,
+  HeaderStandard,
 } from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { strings } from '../../../../../../locales/i18n';
 import {
   type Position,
@@ -21,16 +32,6 @@ import {
   PERPS_EVENT_VALUE,
 } from '@metamask/perps-controller';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
-import styleSheet from './PerpsAdjustMarginView.styles';
-import { useTheme } from '../../../../../util/theme';
-import Icon, {
-  IconName,
-  IconSize,
-  IconColor,
-} from '../../../../../component-library/components/Icons/Icon';
-import ButtonIcon, {
-  ButtonIconSizes,
-} from '../../../../../component-library/components/Buttons/ButtonIcon';
 import { PerpsAdjustMarginViewSelectorsIDs } from '../../Perps.testIds';
 import { usePerpsMarginAdjustment } from '../../hooks/usePerpsMarginAdjustment';
 import { usePerpsEventTracking } from '../../hooks/usePerpsEventTracking';
@@ -39,7 +40,6 @@ import { usePerpsAdjustMarginData } from '../../hooks/usePerpsAdjustMarginData';
 import { TraceName } from '../../../../../util/trace';
 import Logger from '../../../../../util/Logger';
 import PerpsAmountDisplay from '../../components/PerpsAmountDisplay';
-import PerpsSlider from '../../components/PerpsSlider';
 import PerpsBottomSheetTooltip from '../../components/PerpsBottomSheetTooltip';
 import { PerpsTooltipContentKey } from '../../components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.types';
 import Keypad from '../../../../Base/Keypad';
@@ -48,19 +48,21 @@ import {
   PRICE_RANGES_UNIVERSAL,
   PRICE_RANGES_MINIMAL_VIEW,
 } from '../../utils/formatUtils';
+import { ImpactMoment, playImpact } from '../../../../../util/haptics';
 
 interface AdjustMarginRouteParams {
   position: Position;
   mode: 'add' | 'remove';
 }
 
+const floorUsd = (value: number) => Math.floor(value * 100) / 100;
+
 const PerpsAdjustMarginView: React.FC = () => {
+  const tw = useTailwind();
   const navigation = useNavigation<AppNavigationProp>();
   const route =
     useRoute<RouteProp<{ params: AdjustMarginRouteParams }, 'params'>>();
   const { position: routePosition, mode } = route.params || {};
-  const { styles } = useStyles(styleSheet, {});
-  const { colors } = useTheme();
 
   const [marginAmountString, setMarginAmountString] = useState('0');
   const [isInputFocused, setIsInputFocused] = useState(false);
@@ -120,6 +122,32 @@ const PerpsAdjustMarginView: React.FC = () => {
     inputAmount: marginAmount,
   });
 
+  const flooredMaxAmount = floorUsd(maxAmount);
+
+  const sliderPercentage = useMemo(() => {
+    if (flooredMaxAmount <= 0) {
+      return 0;
+    }
+    return Math.min(100, (marginAmount / flooredMaxAmount) * 100);
+  }, [flooredMaxAmount, marginAmount]);
+
+  const validationErrors = useMemo(() => {
+    // Skip under keypad so messages don't flicker while typing
+    if (isInputFocused) {
+      return [];
+    }
+    if (marginAmount > flooredMaxAmount && marginAmount > 0) {
+      return [
+        isAddMode
+          ? strings('perps.adjust_margin.exceeds_available')
+          : strings('perps.errors.marginValidation.exceedsMaxRemovable'),
+      ];
+    }
+    return [];
+  }, [isInputFocused, marginAmount, flooredMaxAmount, isAddMode]);
+
+  const amountHasError = validationErrors.length > 0;
+
   // Add performance measurement for this view
   usePerpsMeasurement({
     traceName: TraceName.PerpsAdjustMarginView,
@@ -138,19 +166,26 @@ const PerpsAdjustMarginView: React.FC = () => {
     },
   });
 
-  const handleSliderChange = useCallback((value: number) => {
-    // Floor to 2 decimal places to match Hyperliquid behavior
-    const flooredValue = Math.floor(value * 100) / 100;
-    setMarginAmountString(flooredValue.toFixed(2));
+  const handleSliderChange = useCallback(
+    (percentage: number) => {
+      const amount = (flooredMaxAmount * percentage) / 100;
+      setMarginAmountString(floorUsd(amount).toFixed(2));
+    },
+    [flooredMaxAmount],
+  );
+
+  const handleSliderGrip = useCallback(() => {
+    playImpact(ImpactMoment.SliderGrip);
+  }, []);
+
+  const handleSliderMark = useCallback(() => {
+    playImpact(ImpactMoment.SliderTick);
   }, []);
 
   const handleMaxPress = useCallback(() => {
-    // Floor maxAmount to 2 decimal places
-    const flooredMax = Math.floor(maxAmount * 100) / 100;
-    setMarginAmountString(flooredMax.toFixed(2));
-  }, [maxAmount]);
+    setMarginAmountString(flooredMaxAmount.toFixed(2));
+  }, [flooredMaxAmount]);
 
-  // Keypad handlers
   const handleAmountPress = useCallback(() => {
     setIsInputFocused(true);
   }, []);
@@ -159,14 +194,13 @@ const PerpsAdjustMarginView: React.FC = () => {
     ({ value }: { value: string }) => {
       const numValue = parseFloat(value) || 0;
       // Clamp to maxAmount for remove mode to prevent invalid submissions
-      const flooredMax = Math.floor(maxAmount * 100) / 100;
-      if (!isAddMode && numValue > flooredMax) {
-        setMarginAmountString(flooredMax.toFixed(2));
+      if (!isAddMode && numValue > flooredMaxAmount) {
+        setMarginAmountString(flooredMaxAmount.toFixed(2));
       } else {
         setMarginAmountString(value || '0');
       }
     },
-    [isAddMode, maxAmount],
+    [isAddMode, flooredMaxAmount],
   );
 
   const handleDonePress = useCallback(() => {
@@ -175,15 +209,12 @@ const PerpsAdjustMarginView: React.FC = () => {
 
   const handlePercentagePress = useCallback(
     (percentage: number) => {
-      // Floor the percentage result
-      const amount = maxAmount * percentage;
-      const flooredAmount = Math.floor(amount * 100) / 100;
-      setMarginAmountString(flooredAmount.toFixed(2));
+      const amount = flooredMaxAmount * percentage;
+      setMarginAmountString(floorUsd(amount).toFixed(2));
     },
-    [maxAmount],
+    [flooredMaxAmount],
   );
 
-  // Tooltip handlers
   const handleTooltipPress = useCallback(
     (contentKey: PerpsTooltipContentKey) => {
       setSelectedTooltip(contentKey);
@@ -195,7 +226,6 @@ const PerpsAdjustMarginView: React.FC = () => {
     setSelectedTooltip(null);
   }, []);
 
-  // Helper to format liquidation distance with fallback when liquidation price is unavailable
   const formatLiquidationDistance = useCallback(
     (distance: number, liquidationPrice: number): string => {
       if (liquidationPrice === 0) {
@@ -210,8 +240,7 @@ const PerpsAdjustMarginView: React.FC = () => {
     if (marginAmount <= 0 || !position) return;
 
     // Prevent submission if amount exceeds max removable (extra safety for remove mode)
-    const flooredMax = Math.floor(maxAmount * 100) / 100;
-    if (!isAddMode && marginAmount > flooredMax) {
+    if (!isAddMode && marginAmount > flooredMaxAmount) {
       return;
     }
 
@@ -230,22 +259,32 @@ const PerpsAdjustMarginView: React.FC = () => {
     marginAmount,
     position,
     isAddMode,
-    maxAmount,
+    flooredMaxAmount,
     newLiquidationPrice,
     newLiquidationDistance,
     handleAddMargin,
     handleRemoveMargin,
   ]);
 
+  const buttonLabel = isAddMode
+    ? strings('perps.adjust_margin.add_margin')
+    : strings('perps.adjust_margin.reduce_margin');
+
+  const isConfirmDisabled =
+    marginAmount <= 0 ||
+    isAdjusting ||
+    marginAmount > flooredMaxAmount ||
+    Boolean(validationErrors.length);
+
   // Show error if no position found (either from route or live data)
   if ((!routePosition && !position) || !mode) {
     return (
-      <SafeAreaView style={styles.container}>
-        <View style={styles.errorContainer}>
+      <SafeAreaView style={tw.style('flex-1 bg-default')}>
+        <Box twClassName="flex-1 items-center justify-center p-6">
           <Text variant={TextVariant.BodyMd} color={TextColor.ErrorDefault}>
             {strings('perps.errors.position_not_found')}
           </Text>
-        </View>
+        </Box>
       </SafeAreaView>
     );
   }
@@ -254,13 +293,6 @@ const PerpsAdjustMarginView: React.FC = () => {
     ? strings('perps.adjust_margin.add_title')
     : strings('perps.adjust_margin.remove_title');
 
-  const buttonLabel = isAddMode
-    ? strings('perps.adjust_margin.add_margin')
-    : strings('perps.adjust_margin.reduce_margin');
-
-  // Floor maxAmount for display and comparison
-  const flooredMaxAmount = Math.floor(maxAmount * 100) / 100;
-
   // Use submitted estimate during exit animation, otherwise use live calculated values.
   const submittedEstimate = submittedEstimateRef.current;
   const displayNewLiquidationPrice =
@@ -269,237 +301,157 @@ const PerpsAdjustMarginView: React.FC = () => {
     submittedEstimate?.distance ?? newLiquidationDistance;
   const showTransition = marginAmount > 0 || submittedEstimate !== null;
 
-  return (
-    <SafeAreaView style={styles.container}>
-      <View style={styles.header}>
-        <ButtonIcon
-          iconName={IconName.ArrowLeft}
-          onPress={() => navigation.goBack()}
-          iconColor={IconColor.Default}
-          size={ButtonIconSizes.Md}
+  const renderTransitionValue = (
+    currentDisplay: string,
+    nextDisplay: string,
+    testID: string,
+  ) =>
+    showTransition ? (
+      <Box twClassName="flex-row items-center gap-2">
+        <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+          {currentDisplay}
+        </Text>
+        <Icon
+          name={IconName.ArrowRight}
+          size={IconSize.Sm}
+          color={IconColor.IconAlternative}
+          accessibilityLabel="ArrowRight"
         />
-        <Text variant={TextVariant.HeadingMd} style={styles.headerTitle}>
-          {title}
+        <Text variant={TextVariant.BodyMd} testID={testID}>
+          {nextDisplay}
         </Text>
-        <View style={styles.headerSpacer} />
-      </View>
-
-      <View style={styles.contentContainer}>
-        {/* Amount Display */}
-        <View style={styles.amountSection}>
-          <PerpsAmountDisplay
-            amount={marginAmountString}
-            onPress={handleAmountPress}
-            isActive={isInputFocused}
-            hasError={false}
-            isLoading={isLoading}
-          />
-        </View>
-
-        {/* Slider - Hide when keypad is active */}
+      </Box>
+    ) : (
+      <Text variant={TextVariant.BodyMd} testID={testID}>
+        {currentDisplay}
+      </Text>
+    );
+
+  const Summary = (
+    <Box twClassName="pt-4 pb-4 gap-1">
+      <KeyValueRow
+        variant={KeyValueRowVariant.Summary}
+        keyLabel={strings('perps.adjust_margin.margin_in_position')}
+        value={formatPerpsFiat(currentMargin, {
+          ranges: PRICE_RANGES_MINIMAL_VIEW,
+        })}
+      />
+      <KeyValueRow
+        variant={KeyValueRowVariant.Summary}
+        keyLabel={
+          isAddMode
+            ? strings('perps.adjust_margin.margin_available_to_add')
+            : strings('perps.adjust_margin.margin_available_to_remove')
+        }
+        value={formatPerpsFiat(flooredMaxAmount, {
+          ranges: PRICE_RANGES_MINIMAL_VIEW,
+        })}
+        valueTextProps={{
+          testID: PerpsAdjustMarginViewSelectorsIDs.AVAILABLE_VALUE,
+        }}
+      />
+      <KeyValueRow
+        variant={KeyValueRowVariant.Summary}
+        keyLabel={strings('perps.adjust_margin.liquidation_price')}
+        keyEndButtonIconProps={{
+          iconName: IconName.Info,
+          onPress: () => handleTooltipPress('liquidation_price'),
+        }}
+        value={renderTransitionValue(
+          formatPerpsFiat(currentLiquidationPrice, {
+            ranges: PRICE_RANGES_UNIVERSAL,
+          }),
+          formatPerpsFiat(displayNewLiquidationPrice, {
+            ranges: PRICE_RANGES_UNIVERSAL,
+          }),
+          PerpsAdjustMarginViewSelectorsIDs.LIQUIDATION_PRICE_VALUE,
+        )}
+      />
+      <KeyValueRow
+        variant={KeyValueRowVariant.Summary}
+        keyLabel={strings('perps.adjust_margin.liquidation_distance')}
+        keyEndButtonIconProps={{
+          iconName: IconName.Info,
+          onPress: () => handleTooltipPress('liquidation_distance'),
+        }}
+        value={renderTransitionValue(
+          formatLiquidationDistance(
+            currentLiquidationDistance,
+            currentLiquidationPrice,
+          ),
+          formatLiquidationDistance(
+            displayNewLiquidationDistance,
+            displayNewLiquidationPrice,
+          ),
+          PerpsAdjustMarginViewSelectorsIDs.LIQUIDATION_DISTANCE_VALUE,
+        )}
+      />
+    </Box>
+  );
+
+  return (
+    <SafeAreaView style={tw.style('flex-1 bg-default')} edges={['bottom']}>
+      <HeaderStandard
+        includesTopInset
+        title={title}
+        onBack={() => navigation.goBack()}
+      />
+
+      <ScrollView
+        style={tw.style('flex-1')}
+        alwaysBounceVertical={false}
+        contentContainerStyle={tw.style(isInputFocused ? 'pb-[100px]' : 'pb-5')}
+        showsVerticalScrollIndicator={false}
+      >
+        <PerpsAmountDisplay
+          amount={marginAmountString}
+          onPress={handleAmountPress}
+          isActive={isInputFocused}
+          hasError={amountHasError}
+          isLoading={isLoading}
+          showMaxAmount={false}
+        />
+
         {!isInputFocused && (
-          <View style={styles.sliderSection}>
-            <PerpsSlider
-              value={marginAmount}
+          <Box twClassName="px-4 py-4">
+            <Slider
+              value={sliderPercentage}
               onValueChange={handleSliderChange}
               minimumValue={0}
-              maximumValue={flooredMaxAmount}
-              step={0.01}
-              showPercentageLabels
-              disabled={false}
+              maximumValue={100}
+              step={1}
+              showRangeLabels
+              showRangeDots
+              isDisabled={isAdjusting}
+              onGrip={handleSliderGrip}
+              onMark={handleSliderMark}
+              testID={PerpsAdjustMarginViewSelectorsIDs.SLIDER}
             />
-          </View>
+          </Box>
         )}
 
-        {/* Info Section - Always visible */}
-        <View style={styles.infoSection}>
-          {/* First row: Current margin */}
-          <View style={styles.infoRow}>
-            <Text
-              variant={TextVariant.BodyMd}
-              color={TextColor.TextAlternative}
+        <Box twClassName="items-center justify-start px-4 my-4 min-h-10">
+          {validationErrors.map((error, index) => (
+            <HelpText
+              key={`error-${index}`}
+              severity={HelpTextSeverity.Danger}
+              twClassName="w-full justify-center text-center"
             >
-              {strings('perps.adjust_margin.margin_in_position')}
-            </Text>
-            <Text variant={TextVariant.BodyMd}>
-              {formatPerpsFiat(currentMargin, {
-                ranges: PRICE_RANGES_MINIMAL_VIEW,
-              })}
-            </Text>
-          </View>
-
-          {/* Second row: Margin available to add/remove */}
-          <View style={styles.infoRow}>
-            <Text
-              variant={TextVariant.BodyMd}
-              color={TextColor.TextAlternative}
-            >
-              {isAddMode
-                ? strings('perps.adjust_margin.margin_available_to_add')
-                : strings('perps.adjust_margin.margin_available_to_remove')}
-            </Text>
-            <Text
-              variant={TextVariant.BodyMd}
-              testID={PerpsAdjustMarginViewSelectorsIDs.AVAILABLE_VALUE}
-            >
-              {formatPerpsFiat(flooredMaxAmount, {
-                ranges: PRICE_RANGES_MINIMAL_VIEW,
-              })}
-            </Text>
-          </View>
-
-          {/* Third row: Liquidation price with transition */}
-          <View style={styles.infoRow}>
-            <View style={styles.labelWithIcon}>
-              <Text
-                variant={TextVariant.BodyMd}
-                color={TextColor.TextAlternative}
-              >
-                {strings('perps.adjust_margin.liquidation_price')}
-              </Text>
-              <TouchableOpacity
-                onPress={() => handleTooltipPress('liquidation_price')}
-                style={styles.infoIcon}
-              >
-                <Icon
-                  name={IconName.Info}
-                  size={IconSize.Sm}
-                  color={IconColor.Alternative}
-                />
-              </TouchableOpacity>
-            </View>
-            {showTransition ? (
-              <View style={styles.changeContainer}>
-                <Text
-                  variant={TextVariant.BodyMd}
-                  color={TextColor.TextAlternative}
-                >
-                  {formatPerpsFiat(currentLiquidationPrice, {
-                    ranges: PRICE_RANGES_UNIVERSAL,
-                  })}
-                </Text>
-                <Icon
-                  name={IconName.ArrowRight}
-                  size={IconSize.Sm}
-                  color={colors.icon.alternative}
-                />
-                <Text
-                  variant={TextVariant.BodyMd}
-                  testID={
-                    PerpsAdjustMarginViewSelectorsIDs.LIQUIDATION_PRICE_VALUE
-                  }
-                >
-                  {formatPerpsFiat(displayNewLiquidationPrice, {
-                    ranges: PRICE_RANGES_UNIVERSAL,
-                  })}
-                </Text>
-              </View>
-            ) : (
-              <Text
-                variant={TextVariant.BodyMd}
-                testID={
-                  PerpsAdjustMarginViewSelectorsIDs.LIQUIDATION_PRICE_VALUE
-                }
-              >
-                {formatPerpsFiat(currentLiquidationPrice, {
-                  ranges: PRICE_RANGES_UNIVERSAL,
-                })}
-              </Text>
-            )}
-          </View>
-
-          {/* Fourth row: Liquidation distance with transition */}
-          <View style={styles.infoRow}>
-            <View style={styles.labelWithIcon}>
-              <Text
-                variant={TextVariant.BodyMd}
-                color={TextColor.TextAlternative}
-              >
-                {strings('perps.adjust_margin.liquidation_distance')}
-              </Text>
-              <TouchableOpacity
-                onPress={() => handleTooltipPress('liquidation_distance')}
-                style={styles.infoIcon}
-              >
-                <Icon
-                  name={IconName.Info}
-                  size={IconSize.Sm}
-                  color={IconColor.Alternative}
-                />
-              </TouchableOpacity>
-            </View>
-            {showTransition ? (
-              <View style={styles.changeContainer}>
-                <Text
-                  variant={TextVariant.BodyMd}
-                  color={TextColor.TextAlternative}
-                >
-                  {formatLiquidationDistance(
-                    currentLiquidationDistance,
-                    currentLiquidationPrice,
-                  )}
-                </Text>
-                <Icon
-                  name={IconName.ArrowRight}
-                  size={IconSize.Sm}
-                  color={colors.icon.alternative}
-                />
-                <Text
-                  variant={TextVariant.BodyMd}
-                  testID={
-                    PerpsAdjustMarginViewSelectorsIDs.LIQUIDATION_DISTANCE_VALUE
-                  }
-                >
-                  {formatLiquidationDistance(
-                    displayNewLiquidationDistance,
-                    displayNewLiquidationPrice,
-                  )}
-                </Text>
-              </View>
-            ) : (
-              <Text
-                variant={TextVariant.BodyMd}
-                testID={
-                  PerpsAdjustMarginViewSelectorsIDs.LIQUIDATION_DISTANCE_VALUE
-                }
-              >
-                {formatLiquidationDistance(
-                  currentLiquidationDistance,
-                  currentLiquidationPrice,
-                )}
-              </Text>
-            )}
-          </View>
-        </View>
-      </View>
-
-      {/* Footer - Shows either Add Margin button or Keypad */}
-      {!isInputFocused ? (
-        <View style={styles.footer}>
-          <Button
-            testID={PerpsAdjustMarginViewSelectorsIDs.CONFIRM_BUTTON}
-            variant={ButtonVariant.Primary}
-            size={ButtonSize.Lg}
-            isFullWidth
-            onPress={handleConfirm}
-            isDisabled={
-              marginAmount <= 0 ||
-              isAdjusting ||
-              (!isAddMode && marginAmount > flooredMaxAmount)
-            }
-            isLoading={isAdjusting}
-          >
-            {buttonLabel}
-          </Button>
-        </View>
-      ) : (
-        <View style={styles.keypadFooter}>
-          <View style={styles.percentageButtonsContainer}>
+              {error}
+            </HelpText>
+          ))}
+        </Box>
+      </ScrollView>
+
+      {isInputFocused && (
+        <Box twClassName="pt-4">
+          {Summary}
+          <Box twClassName="flex-row justify-between px-4 mb-3 gap-2">
             <Button
               variant={ButtonVariant.Secondary}
               size={ButtonSize.Md}
               onPress={() => handlePercentagePress(0.25)}
-              style={styles.percentageButton}
+              twClassName="flex-1"
             >
               25%
             </Button>
@@ -507,7 +459,7 @@ const PerpsAdjustMarginView: React.FC = () => {
               variant={ButtonVariant.Secondary}
               size={ButtonSize.Md}
               onPress={() => handlePercentagePress(0.5)}
-              style={styles.percentageButton}
+              twClassName="flex-1"
             >
               50%
             </Button>
@@ -515,7 +467,7 @@ const PerpsAdjustMarginView: React.FC = () => {
               variant={ButtonVariant.Secondary}
               size={ButtonSize.Md}
               onPress={handleMaxPress}
-              style={styles.percentageButton}
+              twClassName="flex-1"
             >
               {strings('perps.deposit.max_button')}
             </Button>
@@ -524,23 +476,42 @@ const PerpsAdjustMarginView: React.FC = () => {
               variant={ButtonVariant.Secondary}
               size={ButtonSize.Md}
               onPress={handleDonePress}
-              style={styles.percentageButton}
+              twClassName="flex-1"
             >
               {strings('perps.deposit.done_button')}
             </Button>
-          </View>
-
-          <Keypad
-            value={marginAmountString}
-            onChange={handleKeypadChange}
-            currency="USD"
-            decimals={2}
-            style={styles.keypad}
-          />
-        </View>
+          </Box>
+
+          <Box twClassName="px-4">
+            <Keypad
+              value={marginAmountString}
+              onChange={handleKeypadChange}
+              currency="USD"
+              decimals={2}
+            />
+          </Box>
+        </Box>
       )}
 
-      {/* Tooltip Bottom Sheet */}
+      <Box twClassName="w-full pb-4">
+        {!isInputFocused && Summary}
+        {!isInputFocused && (
+          <Box twClassName="px-4 pt-2">
+            <Button
+              variant={ButtonVariant.Primary}
+              size={ButtonSize.Lg}
+              twClassName="w-full"
+              onPress={handleConfirm}
+              isDisabled={isConfirmDisabled}
+              isLoading={isAdjusting}
+              testID={PerpsAdjustMarginViewSelectorsIDs.CONFIRM_BUTTON}
+            >
+              {buttonLabel}
+            </Button>
+          </Box>
+        )}
+      </Box>
+
       {selectedTooltip && (
         <PerpsBottomSheetTooltip
           isVisible
diff --git a/app/components/UI/Perps/Views/PerpsCloseAllPositionsView/PerpsCloseAllPositionsView.tsx b/app/components/UI/Perps/Views/PerpsCloseAllPositionsView/PerpsCloseAllPositionsView.tsx
index 4e4c1a9c5666..c82c005b7df5 100644
--- a/app/components/UI/Perps/Views/PerpsCloseAllPositionsView/PerpsCloseAllPositionsView.tsx
+++ b/app/components/UI/Perps/Views/PerpsCloseAllPositionsView/PerpsCloseAllPositionsView.tsx
@@ -38,17 +38,21 @@ import {
   PERPS_EVENT_PROPERTY,
   PERPS_EVENT_VALUE,
   type ClosePositionsResult,
+  type Position,
 } from '@metamask/perps-controller';
 import { PerpsCloseAllPositionsViewSelectorsIDs } from '../../Perps.testIds';
 
 interface PerpsCloseAllPositionsViewProps {
   sheetRef?: React.RefObject<BottomSheetRef | null>;
   onClose?: () => void;
+  /** When provided, only these positions are shown and closed. */
+  positions?: Position[];
 }
 
 const PerpsCloseAllPositionsView: React.FC<PerpsCloseAllPositionsViewProps> = ({
   sheetRef: externalSheetRef,
   onClose: onExternalClose,
+  positions: propPositions,
 }) => {
   const theme = useTheme();
   const styles = createStyles(theme);
@@ -57,10 +61,12 @@ const PerpsCloseAllPositionsView: React.FC<PerpsCloseAllPositionsViewProps> = ({
   const sheetRef = externalSheetRef || internalSheetRef;
   const { showToast } = usePerpsToasts();
 
-  // Fetch positions from live stream
-  const { positions, isInitialLoading } = usePerpsLivePositions({
+  // Fetch positions from live stream (used only when no positions prop is passed)
+  const liveResult = usePerpsLivePositions({
     throttleMs: 1000,
   });
+  const positions = propPositions ?? liveResult.positions;
+  const isInitialLoading = propPositions ? false : liveResult.isInitialLoading;
 
   // Fetch current prices for fee calculations (throttled to avoid excessive updates)
   const symbols = useMemo(
diff --git a/app/components/UI/Perps/Views/PerpsCloseAllPositionsView/PerpsCloseAllPositionsView.view.test.tsx b/app/components/UI/Perps/Views/PerpsCloseAllPositionsView/PerpsCloseAllPositionsView.view.test.tsx
index 39fc2e1737d8..c89a3f62ef81 100644
--- a/app/components/UI/Perps/Views/PerpsCloseAllPositionsView/PerpsCloseAllPositionsView.view.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsCloseAllPositionsView/PerpsCloseAllPositionsView.view.test.tsx
@@ -56,7 +56,9 @@ describe('PerpsCloseAllPositionsView', () => {
     );
 
     await waitFor(() => {
-      expect(closePositions).toHaveBeenCalledWith({ closeAll: true });
+      expect(closePositions).toHaveBeenCalledWith({
+        symbols: positions.map((p) => p.symbol),
+      });
     });
   });
 
diff --git a/app/components/UI/Perps/Views/PerpsClosePositionView/PerpsClosePositionView.tsx b/app/components/UI/Perps/Views/PerpsClosePositionView/PerpsClosePositionView.tsx
index 4a0c4203fbda..61922f6df283 100644
--- a/app/components/UI/Perps/Views/PerpsClosePositionView/PerpsClosePositionView.tsx
+++ b/app/components/UI/Perps/Views/PerpsClosePositionView/PerpsClosePositionView.tsx
@@ -63,6 +63,7 @@ import {
 import { usePerpsEventTracking } from '../../hooks/usePerpsEventTracking';
 import { usePerpsAbandonOrderTracking } from '../../hooks/usePerpsAbandonOrderTracking';
 import { usePerpsMeasurement } from '../../hooks/usePerpsMeasurement';
+import { MAX_PERPS_INPUT_DIGITS } from '../../constants/perpsConfig';
 import {
   formatPositionSize,
   formatPerpsFiat,
@@ -685,10 +686,10 @@ const PerpsClosePositionView: React.FC = () => {
         setIsUserInputActive(true);
       }
 
-      // Enforce 9-digit limit (ignoring non-digits). Block the change if exceeded.
+      // Enforce digit limit (ignoring non-digits). Block the change if exceeded.
       const digitCount = (adjustedValue.match(/\d/g) || []).length;
-      if (digitCount > 9) {
-        return; // Ignore input that would exceed 9 digits
+      if (digitCount > MAX_PERPS_INPUT_DIGITS) {
+        return; // Ignore input that would exceed the max digit limit
       }
 
       // USD decimal input logic - preserve raw string for display
diff --git a/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.test.tsx b/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.test.tsx
index e6dd2e09fd2d..437c4f3cb50c 100644
--- a/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { act, render, fireEvent } from '@testing-library/react-native';
+import { act, render, fireEvent, waitFor } from '@testing-library/react-native';
 import PerpsHomeView from './PerpsHomeView';
 import { PERPS_EVENT_VALUE } from '@metamask/perps-controller';
 import {
@@ -69,6 +69,8 @@ jest.mock('@react-navigation/native', () => ({
   },
 }));
 
+const mockPerpsModeToggle = jest.fn();
+
 // Stub the reusable Lite/Pro toggle so this view test focuses on header wiring
 // (its analytics/design-system internals are covered by its own unit tests).
 jest.mock('../../components/PerpsModeToggle', () => {
@@ -79,12 +81,20 @@ jest.mock('../../components/PerpsModeToggle', () => {
   );
   return {
     __esModule: true,
-    default: ({ onChange }: { onChange?: (mode: string) => void }) =>
-      ReactActual.createElement(TouchableOpacity, {
+    default: ({
+      onChange,
+      variant,
+    }: {
+      onChange?: (mode: string) => void;
+      variant?: string;
+    }) => {
+      mockPerpsModeToggle({ variant });
+      return ReactActual.createElement(TouchableOpacity, {
         testID: SelectorsIDs.CONTAINER,
         // Simulate the user switching to Pro from the stubbed toggle.
         onPress: () => onChange?.('pro'),
-      }),
+      });
+    },
     PerpsMode: { Lite: 'lite', Pro: 'pro' },
   };
 });
@@ -150,6 +160,13 @@ jest.mock('../../hooks', () => ({
   })),
 }));
 
+const mockHasCompletedPerpsModeSelection = jest.fn(() =>
+  Promise.resolve(false),
+);
+jest.mock('../../utils/perpsModeSelectionStorage', () => ({
+  hasCompletedPerpsModeSelection: () => mockHasCompletedPerpsModeSelection(),
+}));
+
 // Mock direct import of usePerpsCategories (used for sections_displayed gating)
 jest.mock('../../hooks/usePerpsCategories', () => ({
   usePerpsCategories: jest.fn(() => []),
@@ -255,7 +272,7 @@ jest.mock('@metamask/design-system-twrnc-preset', () => ({
 // Mock design system - needed because real module requires tailwind setup
 jest.mock('@metamask/design-system-react-native', () => {
   const { TouchableOpacity } = jest.requireActual('react-native');
-  const React = jest.requireActual('react');
+  const ReactActual = jest.requireActual('react');
   return {
     ...jest.requireActual('@metamask/design-system-react-native'),
     ButtonIcon: ({
@@ -264,7 +281,7 @@ jest.mock('@metamask/design-system-react-native', () => {
     }: {
       testID?: string;
       onPress?: () => void;
-    }) => React.createElement(TouchableOpacity, { testID, onPress }),
+    }) => ReactActual.createElement(TouchableOpacity, { testID, onPress }),
     Box: 'Box',
   };
 });
@@ -536,6 +553,7 @@ describe('PerpsHomeView', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockHasCompletedPerpsModeSelection.mockResolvedValue(false);
     mockNavigateBack.mockClear();
     mockNavigateToWallet.mockClear();
     mockNavigateToMarketList.mockClear();
@@ -588,7 +606,7 @@ describe('PerpsHomeView', () => {
     expect(getByTestId(PerpsHomeViewSelectorsIDs.SEARCH_TOGGLE)).toBeTruthy();
   });
 
-  it('renders the Lite/Pro toggle in the header when the Pro mode flag is enabled', () => {
+  it('renders the active-mode pill in the header when the Pro mode flag is enabled', () => {
     // Arrange
     mockUseSelector.mockImplementation(
       (selector: unknown) => selector === selectPerpsProModeEnabledFlag,
@@ -605,6 +623,7 @@ describe('PerpsHomeView', () => {
     expect(
       getByTestId(PerpsModeToggleSelectorsIDs.CONTAINER),
     ).toBeOnTheScreen();
+    expect(mockPerpsModeToggle).toHaveBeenCalledWith({ variant: 'active' });
   });
 
   it('does not render the Lite/Pro toggle when the Pro mode flag is disabled', () => {
@@ -619,20 +638,48 @@ describe('PerpsHomeView', () => {
     expect(queryByTestId(PerpsModeToggleSelectorsIDs.CONTAINER)).toBeNull();
   });
 
-  it('navigates to the default Pro market when the header toggle switches to Pro', () => {
+  it('opens the mode selection sheet when the header toggle is pressed', async () => {
     // Arrange
     mockUseSelector.mockImplementation(
       (selector: unknown) => selector === selectPerpsProModeEnabledFlag,
     );
     const { getByTestId } = render(<PerpsHomeView />);
 
-    // Act - stubbed toggle switches to Pro on press
+    // Act
+    fireEvent.press(getByTestId(PerpsModeToggleSelectorsIDs.CONTAINER));
+
+    // Assert — chooser opens once while selection is incomplete
+    await waitFor(() => {
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.MODALS.ROOT, {
+        screen: Routes.PERPS.MODALS.MODE_SELECTION,
+        params: {
+          entry: 'home',
+          source: 'perps_home',
+        },
+      });
+    });
+    expect(mockSetPerpsMode).not.toHaveBeenCalled();
+    expect(mockReset).not.toHaveBeenCalled();
+  });
+
+  it('does not open the mode selection sheet when the user has already completed it', async () => {
+    mockHasCompletedPerpsModeSelection.mockResolvedValue(true);
+    mockUseSelector.mockImplementation(
+      (selector: unknown) => selector === selectPerpsProModeEnabledFlag,
+    );
+    const { getByTestId } = render(<PerpsHomeView />);
+
     fireEvent.press(getByTestId(PerpsModeToggleSelectorsIDs.CONTAINER));
 
-    // Assert - persists the new mode and resets onto the default (BTC)
-    // market, discarding Perps Home from history so it stays unreachable
-    // via back navigation while Pro mode is active.
-    expect(mockSetPerpsMode).toHaveBeenCalledWith('pro');
+    await waitFor(() => {
+      expect(mockSetPerpsMode).toHaveBeenCalledWith('pro');
+    });
+    expect(mockNavigate).not.toHaveBeenCalledWith(
+      Routes.PERPS.MODALS.ROOT,
+      expect.objectContaining({
+        screen: Routes.PERPS.MODALS.MODE_SELECTION,
+      }),
+    );
     expect(mockReset).toHaveBeenCalledWith({
       index: 0,
       routes: [
@@ -644,13 +691,9 @@ describe('PerpsHomeView', () => {
         }),
       ],
     });
-    expect(mockNavigate).not.toHaveBeenCalledWith(
-      Routes.PERPS.MARKET_DETAILS,
-      expect.anything(),
-    );
   });
 
-  it('routes first-time users to the Perps tutorial when the header toggle switches mode', () => {
+  it('opens the mode selection sheet for first-time users from the header toggle', async () => {
     // Arrange
     mockUseSelector.mockImplementation(
       (selector: unknown) =>
@@ -662,24 +705,21 @@ describe('PerpsHomeView', () => {
     // Act
     fireEvent.press(getByTestId(PerpsModeToggleSelectorsIDs.CONTAINER));
 
-    // Assert - mode is persisted, but onboarding is not skipped. The
-    // tutorial redirect still points at the default Pro market (not Perps
-    // Home) so completing onboarding doesn't violate the Pro-mode invariant
-    // (TAT-3612).
-    expect(mockSetPerpsMode).toHaveBeenCalledWith('pro');
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.TUTORIAL, {
-      source: 'perps_home',
-      redirectScreen: Routes.PERPS.MARKET_DETAILS,
-      redirectParams: {
-        market: { symbol: 'BTC' },
-        source: 'perps_home',
-      },
+    // Assert — first-time tutorial continues from the chooser after select
+    await waitFor(() => {
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.MODALS.ROOT, {
+        screen: Routes.PERPS.MODALS.MODE_SELECTION,
+        params: {
+          entry: 'home',
+          source: 'perps_home',
+        },
+      });
     });
+    expect(mockSetPerpsMode).not.toHaveBeenCalled();
     expect(mockNavigate).not.toHaveBeenCalledWith(
-      Routes.PERPS.MARKET_DETAILS,
+      Routes.PERPS.TUTORIAL,
       expect.anything(),
     );
-    expect(mockReset).not.toHaveBeenCalled();
   });
 
   it('navigates to market list view with search enabled when search button is pressed', () => {
diff --git a/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.tsx b/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.tsx
index 6937b3dbf653..d0edc670c1a1 100644
--- a/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.tsx
+++ b/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.tsx
@@ -19,10 +19,13 @@ import type { AppNavigationProp } from '../../../../../core/NavigationService/ty
 import {
   BottomSheetRef,
   Button,
+  ButtonIcon,
+  ButtonIconSize,
   ButtonVariant,
   ButtonSize,
   TextColor,
   Box,
+  BoxAlignItems,
   BoxFlexDirection,
   HeaderStandard,
   HeaderStandardAnimated,
@@ -72,7 +75,7 @@ import {
   selectPerpsProModeEnabledFlag,
 } from '../../selectors/featureFlags';
 import PerpsModeToggle, { PerpsMode } from '../../components/PerpsModeToggle';
-import { showPerpsModeFlash } from '../../utils/perpsModeFlash';
+import { openPerpsModeSelectionIfNeeded } from '../../utils/openPerpsModeSelection';
 import { buildDefaultProMarket } from '../../utils/perpsModeSwitch';
 import { usePerpsCategories } from '../../hooks/usePerpsCategories';
 import { useHasNewMarkets } from '../../hooks/useHasNewMarkets';
@@ -87,7 +90,6 @@ import PerpsHomeSectionList from '../../components/PerpsHomeSectionList';
 import PerpsRowSkeleton from '../../components/PerpsRowSkeleton';
 import { usePerpsProvider } from '../../hooks/usePerpsProvider';
 import {
-  selectIsFirstTimePerpsUser,
   selectPerpsNetwork,
   selectPerpsWatchlistMarkets,
 } from '../../selectors/perpsController';
@@ -161,38 +163,20 @@ const PerpsHomeView = () => {
   );
   const isWatchlistEnabled = useSelector(selectPerpsWatchlistEnabledFlag);
   const isPerpsProModeEnabled = useSelector(selectPerpsProModeEnabledFlag);
-  const isFirstTimePerpsUser = useSelector(selectIsFirstTimePerpsUser);
   const { mode: perpsMode, setMode: setPerpsMode } = usePerpsMode();
   const handleModeChange = useCallback(
-    (nextMode: PerpsMode) => {
-      setPerpsMode(nextMode);
-      // First-time users must still go through onboarding (same as Trade sheet):
-      // routing straight into the Pro market would skip the tutorial otherwise,
-      // so no mode-switch flash is shown here. The redirect mirrors the Pro
-      // branch below so completing the tutorial doesn't land back on Perps
-      // Home while Pro mode is active (TAT-3612).
-      if (isFirstTimePerpsUser) {
-        navigation.navigate(
-          Routes.PERPS.TUTORIAL,
-          nextMode === PerpsMode.Pro
-            ? {
-                source: PERPS_EVENT_VALUE.SOURCE.PERPS_HOME,
-                redirectScreen: Routes.PERPS.MARKET_DETAILS,
-                redirectParams: {
-                  market: buildDefaultProMarket(),
-                  source: PERPS_EVENT_VALUE.SOURCE.PERPS_HOME,
-                },
-              }
-            : undefined,
-        );
+    async (nextMode: PerpsMode) => {
+      const openedChooser = await openPerpsModeSelectionIfNeeded(navigation, {
+        entry: 'home',
+        source: PERPS_EVENT_VALUE.SOURCE.PERPS_HOME,
+      });
+      if (openedChooser) {
         return;
       }
-      // Flash the destination mode on top of the current screen.
-      showPerpsModeFlash(nextMode);
-      // Pro lands on the default (BTC) market screen; Lite stays on Perps
-      // home. Home is reset out of history (rather than pushed under the
-      // market screen) so Perps Home is never reachable while Pro mode is
-      // active, including via the back button (TAT-3612).
+
+      // Chooser already completed — flip immediately without the sheet.
+      setPerpsMode(nextMode);
+      // Discard Perps Home while Pro is active (TAT-3612).
       if (nextMode === PerpsMode.Pro) {
         navigation.reset({
           index: 0,
@@ -208,7 +192,7 @@ const PerpsHomeView = () => {
         });
       }
     },
-    [isFirstTimePerpsUser, navigation, setPerpsMode],
+    [navigation, setPerpsMode],
   );
   // Mirrors PerpsProducts' own visibility check (enabled + has categories,
   // or a "New" pill on its own when there are no categories but at least
@@ -1085,33 +1069,39 @@ const PerpsHomeView = () => {
     <View style={styles.container}>
       {/* Header */}
       {isPerpsProModeEnabled ? (
-        // Pro mode: persistent centered Lite/Pro toggle in the top nav
+        // Pro mode: persistent active-mode pill beside search in the top nav
         // (the animated compact title would only appear on scroll).
-        // h-16 (64px) matches the Figma header so the 40px toggle keeps its
-        // 12px of breathing room above/below (HeaderBase defaults to 56px).
+        // h-16 (64px) matches the Figma header (HeaderBase defaults to 56px).
         <HeaderStandard
           includesTopInset
           twClassName="h-16"
-          title={
-            <PerpsModeToggle
-              mode={perpsMode}
-              onChange={handleModeChange}
-              source={PERPS_EVENT_VALUE.SOURCE.PERPS_HOME}
-            />
-          }
+          title={perpsScreenTitle}
           onBack={handleBackPress}
           backButtonProps={{
             accessibilityLabel: 'Back',
             testID: PerpsHomeViewSelectorsIDs.BACK_HOME_BUTTON,
           }}
-          endButtonIconProps={[
-            {
-              iconName: IconName.Search,
-              onPress: handleSearchToggle,
-              accessibilityLabel: 'Search',
-              testID: PerpsHomeViewSelectorsIDs.SEARCH_TOGGLE,
-            },
-          ]}
+          endAccessory={
+            <Box
+              accessible={false}
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+            >
+              <ButtonIcon
+                iconName={IconName.Search}
+                size={ButtonIconSize.Md}
+                onPress={handleSearchToggle}
+                accessibilityLabel="Search"
+                testID={PerpsHomeViewSelectorsIDs.SEARCH_TOGGLE}
+              />
+              <PerpsModeToggle
+                mode={perpsMode}
+                onChange={handleModeChange}
+                variant="active"
+                source={PERPS_EVENT_VALUE.SOURCE.PERPS_HOME}
+              />
+            </Box>
+          }
           testID="perps-home"
         />
       ) : (
diff --git a/app/components/UI/Perps/Views/PerpsMarketDetailsRouter/PerpsMarketDetailsRouter.test.tsx b/app/components/UI/Perps/Views/PerpsMarketDetailsRouter/PerpsMarketDetailsRouter.test.tsx
index df42ba6c9a4a..c926361dcaa2 100644
--- a/app/components/UI/Perps/Views/PerpsMarketDetailsRouter/PerpsMarketDetailsRouter.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketDetailsRouter/PerpsMarketDetailsRouter.test.tsx
@@ -5,6 +5,24 @@ import { usePerpsProModeEnabled } from './usePerpsProModeEnabled';
 
 jest.mock('./usePerpsProModeEnabled');
 
+const mockSafeAreaMount = jest.fn();
+
+jest.mock('react-native-safe-area-context', () => {
+  const { View } = jest.requireActual('react-native');
+  const ActualReact = jest.requireActual('react');
+  return {
+    ...jest.requireActual('react-native-safe-area-context'),
+    SafeAreaView: ({ children, ...props }: { children?: React.ReactNode }) => {
+      ActualReact.useEffect(() => mockSafeAreaMount(), []);
+      return (
+        <View testID="safe-area-container" {...props}>
+          {children}
+        </View>
+      );
+    },
+  };
+});
+
 jest.mock('../PerpsProMarketView', () => {
   const { View } = jest.requireActual('react-native');
   return {
@@ -47,4 +65,30 @@ describe('PerpsMarketDetailsRouter', () => {
     expect(getByTestId('mock-lite-market-details-view')).toBeOnTheScreen();
     expect(queryByTestId('mock-pro-market-view')).not.toBeOnTheScreen();
   });
+
+  it('applies every safe-area edge around the rendered layout', () => {
+    mockUsePerpsProModeEnabled.mockReturnValue(false);
+
+    const { getByTestId } = render(<PerpsMarketDetailsRouter />);
+
+    expect(getByTestId('safe-area-container')).toHaveProp('edges', [
+      'top',
+      'bottom',
+      'left',
+      'right',
+    ]);
+  });
+
+  it('keeps the safe-area container mounted across a mode switch', () => {
+    mockUsePerpsProModeEnabled.mockReturnValue(false);
+
+    const { rerender, getByTestId } = render(<PerpsMarketDetailsRouter />);
+    mockUsePerpsProModeEnabled.mockReturnValue(true);
+    rerender(<PerpsMarketDetailsRouter />);
+
+    expect(getByTestId('mock-pro-market-view')).toBeOnTheScreen();
+    // Remounting it would re-run the native inset layout pass, dropping the
+    // header under the status bar until that pass lands.
+    expect(mockSafeAreaMount).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/app/components/UI/Perps/Views/PerpsMarketDetailsRouter/PerpsMarketDetailsRouter.tsx b/app/components/UI/Perps/Views/PerpsMarketDetailsRouter/PerpsMarketDetailsRouter.tsx
index 999a1e21ddd3..0d7fca451a5c 100644
--- a/app/components/UI/Perps/Views/PerpsMarketDetailsRouter/PerpsMarketDetailsRouter.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketDetailsRouter/PerpsMarketDetailsRouter.tsx
@@ -1,8 +1,12 @@
 import React from 'react';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { SafeAreaView, type Edge } from 'react-native-safe-area-context';
 import PerpsMarketDetailsView from '../PerpsMarketDetailsView';
 import PerpsProMarketView from '../PerpsProMarketView';
 import { usePerpsProModeEnabled } from './usePerpsProModeEnabled';
 
+const SAFE_AREA_EDGES: Edge[] = ['top', 'bottom', 'left', 'right'];
+
 /**
  * Route component registered for `Routes.PERPS.MARKET_DETAILS`.
  *
@@ -10,11 +14,23 @@ import { usePerpsProModeEnabled } from './usePerpsProModeEnabled';
  * enabled, otherwise the lite `PerpsMarketDetailsView`. The route name and
  * navigation params are identical for both modes; only the rendered component
  * differs, so market-list navigation is unaffected.
+ *
+ * The safe-area container lives here rather than in each layout: `SafeAreaView`
+ * applies its insets through a native layout pass that lands a frame or more
+ * after mount, so remounting it on every mode switch let the header sit under
+ * the status bar until that pass ran — visibly long while the incoming layout
+ * was still mounting. Keeping one container mounted across the swap keeps the
+ * insets already applied.
  */
 const PerpsMarketDetailsRouter: React.FC = () => {
+  const tw = useTailwind();
   const isProModeEnabled = usePerpsProModeEnabled();
 
-  return isProModeEnabled ? <PerpsProMarketView /> : <PerpsMarketDetailsView />;
+  return (
+    <SafeAreaView style={tw.style('flex-1 bg-default')} edges={SAFE_AREA_EDGES}>
+      {isProModeEnabled ? <PerpsProMarketView /> : <PerpsMarketDetailsView />}
+    </SafeAreaView>
+  );
 };
 
 export default PerpsMarketDetailsRouter;
diff --git a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx
index 6534913fc6b8..ca6e11c8cd6c 100644
--- a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx
@@ -12,6 +12,7 @@ import {
   PerpsRelatedMarketsSelectorsIDs,
 } from '../../Perps.testIds';
 import { PerpsConnectionProvider } from '../../providers/PerpsConnectionProvider';
+import { GLOW_TOTAL_MS } from '../../components/PerpsModeToggle/PerpsModeSwitchPill';
 import { useDefaultPayWithTokenWhenNoPerpsBalance } from '../../hooks/useDefaultPayWithTokenWhenNoPerpsBalance';
 import { Linking } from 'react-native';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
@@ -208,16 +209,25 @@ jest.mock(
 const mockNavigate = jest.fn();
 const mockGoBack = jest.fn();
 const mockCanGoBack = jest.fn();
+const mockReset = jest.fn();
+const mockGetState = jest.fn();
 const mockSetPerpsMode = jest.fn();
 // Mutable active mode surfaced by the mocked usePerpsMode hook.
 let mockPerpsModeValue = 'lite';
-
+// The one-time Lite/Pro chooser gates the header pill; default to completed so
+// existing tests exercise the direct switch.
+const mockHasCompletedPerpsModeSelection = jest.fn(() => Promise.resolve(true));
+jest.mock('../../utils/perpsModeSelectionStorage', () => ({
+  hasCompletedPerpsModeSelection: () => mockHasCompletedPerpsModeSelection(),
+  markPerpsModeSelectionCompleted: jest.fn(() => Promise.resolve()),
+}));
 // usePerpsNavigation mock functions
 const mockNavigateToHome = jest.fn();
 const mockNavigateToActivity = jest.fn();
 const mockNavigateToOrder = jest.fn();
 const mockNavigateToTutorial = jest.fn();
 const mockNavigateToMarketList = jest.fn();
+const mockNavigateToMarketListFromHeader = jest.fn();
 const mockNavigateBack = jest.fn();
 
 // Mock notification feature flag
@@ -258,6 +268,8 @@ jest.mock('@react-navigation/native', () => {
       goBack: mockGoBack,
       canGoBack: mockCanGoBack,
       setOptions: jest.fn(),
+      getState: mockGetState,
+      reset: mockReset,
     }),
     useRoute: () => ({
       params: mockRouteParams,
@@ -401,16 +413,11 @@ jest.mock('../../hooks/stream/usePerpsLiveFills', () => ({
 
 // Mock Engine for REST fallback tests
 const mockGetOrderFills = jest.fn();
-const mockToggleWatchlistMarket = jest.fn();
-const mockGetWatchlistMarkets = jest.fn(() => [] as string[]);
 const mockRecordMarketViewed = jest.fn();
 jest.mock('../../../../../core/Engine', () => ({
   context: {
     PerpsController: {
       getOrderFills: (...args: unknown[]) => mockGetOrderFills(...args),
-      toggleWatchlistMarket: (...args: unknown[]) =>
-        mockToggleWatchlistMarket(...args),
-      getWatchlistMarkets: () => mockGetWatchlistMarkets(),
       recordMarketViewed: (...args: unknown[]) =>
         mockRecordMarketViewed(...args),
     },
@@ -595,6 +602,7 @@ jest.mock('../../hooks', () => ({
     navigateToOrder: mockNavigateToOrder,
     navigateToTutorial: mockNavigateToTutorial,
     navigateToMarketList: mockNavigateToMarketList,
+    navigateToMarketListFromHeader: mockNavigateToMarketListFromHeader,
     navigateBack: mockNavigateBack,
     canGoBack: mockCanGoBack(),
   })),
@@ -827,6 +835,7 @@ describe('PerpsMarketDetailsView', () => {
   // Set up default mock return values before each test
   beforeEach(() => {
     jest.clearAllMocks();
+    mockPerpsModeValue = 'lite';
     jest.spyOn(Date, 'now').mockReturnValue(MOCK_NOW_MS);
 
     mockUsePerpsAccount.mockReturnValue({
@@ -881,6 +890,14 @@ describe('PerpsMarketDetailsView', () => {
 
     // Reset navigation mocks
     mockCanGoBack.mockReturnValue(true);
+    // Default stack shape for this screen: reached from Perps Home.
+    mockGetState.mockReturnValue({
+      index: 1,
+      routes: [
+        { name: Routes.PERPS.PERPS_HOME, key: 'home-1' },
+        { name: Routes.PERPS.MARKET_DETAILS, key: 'market-1' },
+      ],
+    });
 
     // Default eligibility mock
     const { useSelector } = jest.requireMock('react-redux');
@@ -936,6 +953,8 @@ describe('PerpsMarketDetailsView', () => {
     mockSetPerpsMode.mockClear();
     mockNavigateToHome.mockClear();
     mockPerpsModeValue = 'lite';
+    mockHasCompletedPerpsModeSelection.mockResolvedValue(true);
+    jest.useRealTimers();
   });
 
   it('renders correctly', () => {
@@ -956,7 +975,7 @@ describe('PerpsMarketDetailsView', () => {
     ).toBeOnTheScreen();
   });
 
-  it('toggles the watchlist via the controller when the favorite button is pressed', () => {
+  it('renders the asset identity in the Lite header', () => {
     const { getByTestId } = renderWithProvider(
       <PerpsConnectionProvider>
         <PerpsMarketDetailsView />
@@ -966,11 +985,12 @@ describe('PerpsMarketDetailsView', () => {
       },
     );
 
-    fireEvent.press(getByTestId(PerpsMarketHeaderSelectorsIDs.FAVORITE_BUTTON));
-
-    // The component fires the controller's own optimistic-update/revert toggle
-    // (fire-and-forget) rather than maintaining a separate local optimistic copy.
-    expect(mockToggleWatchlistMarket).toHaveBeenCalledWith('BTC');
+    expect(
+      getByTestId(PerpsMarketHeaderSelectorsIDs.ASSET_NAME),
+    ).toHaveTextContent('Bitcoin');
+    expect(
+      getByTestId(PerpsMarketHeaderSelectorsIDs.ASSET_ICON),
+    ).toBeOnTheScreen();
   });
 
   const enableProModeFlag = () => {
@@ -989,7 +1009,7 @@ describe('PerpsMarketDetailsView', () => {
     });
   };
 
-  it('shows the active-mode pill next to the star when the Pro mode flag is enabled', () => {
+  it('shows the active-mode pill next to search when the Pro mode flag is enabled', () => {
     enableProModeFlag();
 
     const { getByTestId } = renderWithProvider(
@@ -1001,17 +1021,16 @@ describe('PerpsMarketDetailsView', () => {
       },
     );
 
-    // Watchlist star remains, and the active-mode pill (Lite, from the mocked
-    // usePerpsMode) is appended next to it.
     expect(
-      getByTestId(PerpsMarketHeaderSelectorsIDs.FAVORITE_BUTTON),
+      getByTestId(PerpsMarketHeaderSelectorsIDs.MARKET_LIST_BUTTON),
     ).toBeOnTheScreen();
     expect(
       getByTestId(PerpsModeToggleSelectorsIDs.LITE_SEGMENT),
     ).toBeOnTheScreen();
   });
 
-  it('flips to Pro and stays on the current market when the active-mode pill is pressed', () => {
+  it('plays the shimmer before switching from Lite to Pro', async () => {
+    jest.useFakeTimers();
     enableProModeFlag();
 
     const { getByTestId } = renderWithProvider(
@@ -1023,15 +1042,24 @@ describe('PerpsMarketDetailsView', () => {
       },
     );
 
-    // Mocked mode is Lite, so pressing the pill flips to Pro.
     fireEvent.press(getByTestId(PerpsModeToggleSelectorsIDs.LITE_SEGMENT));
 
-    // Switching mode persists and flashes, but does not leave the market page.
+    expect(mockSetPerpsMode).not.toHaveBeenCalled();
+    await act(async () => {
+      jest.advanceTimersByTime(GLOW_TOTAL_MS);
+    });
+
     expect(mockSetPerpsMode).toHaveBeenCalledWith(PerpsMode.Pro);
-    expect(mockNavigateToHome).not.toHaveBeenCalled();
+    expect(mockNavigate).not.toHaveBeenCalledWith(
+      Routes.PERPS.MODALS.ROOT,
+      expect.objectContaining({
+        screen: Routes.PERPS.MODALS.MODE_SELECTION,
+      }),
+    );
   });
 
-  it('flips to Lite and stays on the current market when the active-mode pill is pressed', () => {
+  it('plays the shimmer before switching from Pro to Lite', async () => {
+    jest.useFakeTimers();
     enableProModeFlag();
     mockPerpsModeValue = PerpsMode.Pro;
 
@@ -1044,12 +1072,45 @@ describe('PerpsMarketDetailsView', () => {
       },
     );
 
-    // Mocked mode is Pro, so pressing the pill flips to Lite.
     fireEvent.press(getByTestId(PerpsModeToggleSelectorsIDs.PRO_SEGMENT));
 
-    // Switching mode persists and flashes, but does not leave the market page.
+    expect(mockSetPerpsMode).not.toHaveBeenCalled();
+    await act(async () => {
+      jest.advanceTimersByTime(GLOW_TOTAL_MS);
+    });
+
     expect(mockSetPerpsMode).toHaveBeenCalledWith(PerpsMode.Lite);
-    expect(mockNavigateToHome).not.toHaveBeenCalled();
+    expect(mockReset).not.toHaveBeenCalled();
+  });
+
+  it('opens the mode chooser from the pill when the chooser has not been completed', async () => {
+    jest.useFakeTimers();
+    enableProModeFlag();
+    mockHasCompletedPerpsModeSelection.mockResolvedValue(false);
+
+    const { getByTestId } = renderWithProvider(
+      <PerpsConnectionProvider>
+        <PerpsMarketDetailsView />
+      </PerpsConnectionProvider>,
+      {
+        state: initialState,
+      },
+    );
+
+    fireEvent.press(getByTestId(PerpsModeToggleSelectorsIDs.LITE_SEGMENT));
+
+    await act(async () => {
+      jest.advanceTimersByTime(GLOW_TOTAL_MS);
+    });
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.MODALS.ROOT, {
+      screen: Routes.PERPS.MODALS.MODE_SELECTION,
+      params: {
+        entry: 'market',
+        source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
+      },
+    });
+    expect(mockSetPerpsMode).not.toHaveBeenCalled();
   });
 
   it('does not show the active-mode pill when the Pro mode flag is disabled', () => {
@@ -3786,7 +3847,7 @@ describe('PerpsMarketDetailsView', () => {
       );
       fireEvent.press(marketListButton);
 
-      expect(mockNavigateToMarketList).toHaveBeenCalledWith({
+      expect(mockNavigateToMarketListFromHeader).toHaveBeenCalledWith({
         source: 'perp_asset_screen',
       });
     });
@@ -4866,7 +4927,7 @@ describe('PerpsMarketDetailsView', () => {
       });
 
       try {
-        const { getByTestId, getByText } = renderWithProvider(
+        const { getByTestId } = renderWithProvider(
           <PerpsConnectionProvider>
             <PerpsMarketDetailsView />
           </PerpsConnectionProvider>,
@@ -4875,10 +4936,6 @@ describe('PerpsMarketDetailsView', () => {
           },
         );
 
-        await waitFor(() => {
-          expect(getByText('5x')).toBeOnTheScreen();
-        });
-
         await act(async () => {
           fireEvent.press(
             getByTestId(PerpsMarketDetailsViewSelectorsIDs.LONG_BUTTON),
diff --git a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx
index 1f48e212f3d3..464b40326051 100644
--- a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx
@@ -31,7 +31,15 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import { Linking, RefreshControl, ScrollView, View } from 'react-native';
+import {
+  Linking,
+  RefreshControl,
+  View,
+  type LayoutChangeEvent,
+  type NativeScrollEvent,
+} from 'react-native';
+import Animated, { useAnimatedScrollHandler } from 'react-native-reanimated';
+import { scheduleOnRN } from 'react-native-worklets';
 import {
   CandlePeriod,
   PerpsMode,
@@ -45,7 +53,6 @@ import {
   PERPS_EVENT_PROPERTY,
   PERPS_EVENT_VALUE,
 } from '@metamask/perps-controller/constants';
-import { SafeAreaView } from 'react-native-safe-area-context';
 import { useSelector } from 'react-redux';
 import { strings } from '../../../../../../locales/i18n';
 import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
@@ -71,10 +78,13 @@ import {
   PerpsTutorialSelectorsIDs,
   PerpsCompactOrderRowSelectorsIDs,
 } from '../../Perps.testIds';
-import LivePriceHeader from '../../components/LivePriceDisplay/LivePriceHeader';
-import PerpsMarketInlineHeader from '../../components/PerpsMarketInlineHeader';
+import PerpsMarketHeader, {
+  createLiteMarketHeaderTestIDs,
+} from '../../components/PerpsMarketHeader';
+import PerpsMarketSummary from '../../components/PerpsMarketSummary';
 import PerpsModeToggle from '../../components/PerpsModeToggle';
-import { showPerpsModeFlash } from '../../utils/perpsModeFlash';
+import { useDropPerpsHomeFromStackHistory } from '../../utils/perpsModeSwitch';
+import { openPerpsModeSelectionIfNeeded } from '../../utils/openPerpsModeSelection';
 import PerpsMarketAboutSection from '../../components/PerpsMarketAboutSection';
 import PerpsMarketHoursBanner from '../../components/PerpsMarketHoursBanner';
 import PerpsMarketStatisticsCard from '../../components/PerpsMarketStatisticsCard';
@@ -145,7 +155,6 @@ import {
   getPerpsChartAnalyticsProperties,
   getPerpsChartLibrary,
 } from '../../utils/chartAnalytics';
-import { WATCHLIST_LIMIT } from '../../utils/marketUtils';
 import {
   getRelatedMarketsForMarket,
   hasRelatedMarketsCategory,
@@ -196,7 +205,7 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
   // Use centralized navigation hook for all Perps navigation
   const {
     navigateToHome,
-    navigateToMarketList,
+    navigateToMarketListFromHeader,
     navigateToOrder,
     navigateToTutorial,
     navigateToClosePosition,
@@ -296,7 +305,7 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
   // This prevents stale closure issues where the captured position is outdated
   // Initialized to null, will be updated via useEffect when existingPosition is available
   const currentPositionRef = useRef<Position | null>(null);
-  const scrollViewRef = useRef<ScrollView>(null);
+  const scrollViewRef = useRef<Animated.ScrollView>(null);
 
   const isEligible = useSelector(selectPerpsEligibility);
 
@@ -351,17 +360,29 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
   // Redux if the controller's optimistic-then-revert collapsed before a reconcile.
   const isWatchlist = useSelector(selectIsWatchlist);
 
-  // Pro-mode active-mode pill in the header (TAT-3551, AC #6.3). Pressing it
-  // flips the shared mode and flashes the switch on top of the current market
-  // screen — no navigation either direction.
+  // Pro-mode active-mode pill in the header (TAT-3551, AC #6.3).
   const isPerpsProModeEnabled = useSelector(selectPerpsProModeEnabledFlag);
   const { mode: perpsMode, setMode: setPerpsMode } = usePerpsMode();
+  const dropPerpsHomeFromStackHistory = useDropPerpsHomeFromStackHistory();
   const handlePerpsModeChange = useCallback(
-    (nextMode: PerpsMode) => {
+    async (nextMode: PerpsMode) => {
+      // PerpsModeSwitchPill runs the shimmer before invoking this callback. The
+      // one-time chooser gates every header toggle, so show it here when the
+      // user has not completed it and let the sheet own the switch.
+      const openedChooser = await openPerpsModeSelectionIfNeeded(navigation, {
+        entry: 'market',
+        source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
+      });
+      if (openedChooser) {
+        return;
+      }
+
       setPerpsMode(nextMode);
-      showPerpsModeFlash(nextMode);
+      if (nextMode === PerpsMode.Pro) {
+        dropPerpsHomeFromStackHistory();
+      }
     },
-    [setPerpsMode],
+    [navigation, setPerpsMode, dropPerpsHomeFromStackHistory],
   );
 
   // Keep current market symbol ref in sync for staleness checks in async callbacks
@@ -391,11 +412,54 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
 
   const {
     scrollY: scrollYShared,
-    onScroll,
     setTitleSectionHeight,
     titleSectionHeightSv,
   } = useHeaderStandardAnimated();
 
+  const handleMarketSummaryLayout = useCallback(
+    (event: LayoutChangeEvent) => {
+      const { height } = event.nativeEvent.layout;
+      if (height > 0) {
+        setTitleSectionHeight(height);
+      }
+    },
+    [setTitleSectionHeight],
+  );
+
+  const handleAboutScrollEvent = useCallback(
+    (scrollY: number, viewportHeight: number) => {
+      handleAboutScroll({
+        nativeEvent: {
+          contentOffset: { x: 0, y: scrollY },
+          layoutMeasurement: { width: 0, height: viewportHeight },
+        } as NativeScrollEvent,
+      });
+    },
+    [handleAboutScroll],
+  );
+
+  const handleAboutScrollEventRef = useRef(handleAboutScrollEvent);
+  handleAboutScrollEventRef.current = handleAboutScrollEvent;
+  const scheduleAboutScrollOnRN = useCallback(
+    (scrollY: number, viewportHeight: number) => {
+      handleAboutScrollEventRef.current(scrollY, viewportHeight);
+    },
+    [],
+  );
+
+  const scrollHandler = useAnimatedScrollHandler({
+    onScroll: (event) => {
+      'worklet';
+      // eslint-disable-next-line react-compiler/react-compiler -- Reanimated shared values are intentionally mutated from worklets.
+      scrollYShared.value = event.contentOffset.y;
+      scheduleOnRN(
+        scheduleAboutScrollOnRN,
+        event.contentOffset.y,
+        event.layoutMeasurement.height,
+      );
+    },
+  });
+
   // Get persisted candle period preference from Redux store
   const selectedCandlePeriod = useSelector(
     selectPerpsChartPreferredCandlePeriod,
@@ -852,41 +916,6 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
     asset: market?.symbol || '',
   });
 
-  const handleWatchlistPress = useCallback(() => {
-    if (!market?.symbol) return;
-
-    const controller = Engine.context.PerpsController;
-    const isAdding = !isWatchlist;
-
-    // Guard: block adding when the watchlist is already full
-    if (
-      isAdding &&
-      controller.getWatchlistMarkets().length >= WATCHLIST_LIMIT
-    ) {
-      showToast(PerpsToastOptions.watchlist.limitReached);
-      return;
-    }
-
-    // Controller applies its own synchronous optimistic update (instant UI
-    // feedback via Redux) and reverts internally on remote-write failure;
-    // fire-and-forget here.
-    controller.toggleWatchlistMarket(market.symbol);
-
-    // Track watchlist toggle event
-    const watchlistCount = controller.getWatchlistMarkets().length;
-
-    track(MetaMetricsEvents.PERPS_UI_INTERACTION, {
-      [PERPS_EVENT_PROPERTY.INTERACTION_TYPE]:
-        PERPS_EVENT_VALUE.INTERACTION_TYPE.FAVORITE_TOGGLED,
-      [PERPS_EVENT_PROPERTY.ACTION_TYPE]: isAdding
-        ? PERPS_EVENT_VALUE.ACTION_TYPE.FAVORITE_MARKET
-        : PERPS_EVENT_VALUE.ACTION_TYPE.UNFAVORITE_MARKET,
-      [PERPS_EVENT_PROPERTY.ASSET]: market.symbol,
-      [PERPS_EVENT_PROPERTY.SOURCE]: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
-      [PERPS_EVENT_PROPERTY.FAVORITES_COUNT]: watchlistCount,
-    });
-  }, [market, isWatchlist, track, showToast, PerpsToastOptions]);
-
   const handleMarketListPress = useCallback(() => {
     if (!market) return;
 
@@ -900,10 +929,54 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
       [PERPS_EVENT_PROPERTY.ASSET]: market.symbol,
     });
 
-    navigateToMarketList({
+    navigateToMarketListFromHeader({
       source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
     });
-  }, [market, track, navigateToMarketList]);
+  }, [market, track, navigateToMarketListFromHeader]);
+
+  const liteHeaderEndAccessory = useMemo(() => {
+    const searchButton = (
+      <Box
+        alignItems={BoxAlignItems.Center}
+        justifyContent={BoxJustifyContent.Center}
+        twClassName="size-10"
+      >
+        <ButtonIcon
+          iconName={IconName.Search}
+          size={ButtonIconSize.Md}
+          onPress={handleMarketListPress}
+          testID={PerpsMarketHeaderSelectorsIDs.MARKET_LIST_BUTTON}
+          accessibilityLabel={strings('perps.market_details.market_list')}
+        />
+      </Box>
+    );
+
+    if (!isPerpsProModeEnabled) {
+      return searchButton;
+    }
+
+    return (
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+      >
+        {searchButton}
+        <Box justifyContent={BoxJustifyContent.Center} twClassName="h-10">
+          <PerpsModeToggle
+            mode={perpsMode}
+            variant="active"
+            onChange={handlePerpsModeChange}
+            source={PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN}
+          />
+        </Box>
+      </Box>
+    );
+  }, [
+    handleMarketListPress,
+    isPerpsProModeEnabled,
+    perpsMode,
+    handlePerpsModeChange,
+  ]);
 
   const handleTradeAction = useCallback(
     (direction: 'long' | 'short') =>
@@ -1549,7 +1622,7 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
 
   if (!market) {
     return (
-      <SafeAreaView style={styles.container}>
+      <View style={styles.container}>
         <View
           style={styles.errorContainer}
           testID={PerpsMarketDetailsViewSelectorsIDs.ERROR}
@@ -1558,7 +1631,7 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
             {strings('perps.market.details.error_message')}
           </Text>
         </View>
-      </SafeAreaView>
+      </View>
     );
   }
 
@@ -1574,97 +1647,55 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
     shouldShowNewPositionActions && !shouldShowAddFundsCTASection;
 
   return (
-    <SafeAreaView
+    <View
       style={styles.mainContainer}
-      edges={['bottom', 'left', 'right']}
       testID={PerpsMarketDetailsViewSelectorsIDs.CONTAINER}
     >
-      {/* Only the market identity (icon + name + ticker + leverage) is a tap
-          target that opens the market list; it renders as a content-hugging
-          box inside the header. */}
-      <PerpsMarketInlineHeader
+      <PerpsMarketHeader
         market={market}
-        currentPrice={syncedChartCurrentPrice}
+        testIDs={createLiteMarketHeaderTestIDs()}
         onBackPress={handleBackPress}
-        onFavoritePress={handleWatchlistPress}
-        onIdentityPress={handleMarketListPress}
-        isFavorite={isWatchlist}
-        useDetailLayout
-        testID={PerpsMarketDetailsViewSelectorsIDs.HEADER}
-        // Pro mode: keep the watchlist star and append a read-only pill showing
-        // the active mode. `endAccessory` replaces the header's default end
-        // icons, so the star is re-composed here alongside the pill.
-        endAccessory={
-          isPerpsProModeEnabled ? (
-            <Box
-              flexDirection={BoxFlexDirection.Row}
-              alignItems={BoxAlignItems.Center}
-              gap={2}
-            >
-              <ButtonIcon
-                iconName={isWatchlist ? IconName.StarFilled : IconName.Star}
-                size={ButtonIconSize.Md}
-                onPress={handleWatchlistPress}
-                testID={PerpsMarketHeaderSelectorsIDs.FAVORITE_BUTTON}
-              />
-              <PerpsModeToggle
-                mode={perpsMode}
-                variant="active"
-                onChange={handlePerpsModeChange}
-                source={PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN}
-              />
-            </Box>
-          ) : undefined
-        }
+        scrollY={scrollYShared}
+        priceSectionHeight={titleSectionHeightSv}
+        endAccessory={liteHeaderEndAccessory}
       />
 
       <View style={styles.scrollableContentContainer}>
-        <ScrollView
+        <Animated.ScrollView
           ref={scrollViewRef}
           style={styles.mainContentScrollView}
           contentContainerStyle={styles.scrollViewContent}
           showsVerticalScrollIndicator={false}
-          onScroll={handleAboutScroll}
+          onScroll={scrollHandler}
           scrollEventThrottle={16}
           testID={PerpsMarketDetailsViewSelectorsIDs.SCROLL_VIEW}
           refreshControl={
             <RefreshControl refreshing={refreshing} onRefresh={handleRefresh} />
           }
         >
-          {/* Below header: live price + 24h change and fullscreen chart button.
-              Rendered inside the ScrollView (not the header) so it scrolls with
-              the content instead of staying sticky. */}
-          <Box
-            flexDirection={BoxFlexDirection.Row}
-            alignItems={BoxAlignItems.Center}
-            justifyContent={BoxJustifyContent.Between}
-            gap={2}
-            twClassName="px-4 pb-2"
+          <PerpsMarketSummary
+            symbol={market.symbol}
+            currentPrice={syncedChartCurrentPrice}
             testID={PerpsMarketDetailsViewSelectorsIDs.MARKET_SUMMARY}
-          >
-            {/* Flexible wrapper lets the price shrink; the button stays fixed. */}
-            <Box twClassName="flex-1">
-              <LivePriceHeader
-                symbol={market.symbol}
-                testIDPrice={PerpsMarketHeaderSelectorsIDs.PRICE}
-                testIDChange={PerpsMarketHeaderSelectorsIDs.PRICE_CHANGE}
-                currentPrice={syncedChartCurrentPrice}
-                size="large"
+            testIDPrice={PerpsMarketHeaderSelectorsIDs.PRICE}
+            testIDChange={PerpsMarketHeaderSelectorsIDs.PRICE_CHANGE}
+            size="large"
+            onLayout={handleMarketSummaryLayout}
+            endAccessory={
+              <ButtonIcon
+                iconName={IconName.Expand}
+                size={ButtonIconSize.Md}
+                onPress={handleFullscreenChartOpen}
+                style={styles.marketSummaryFullscreenButton}
+                testID={
+                  PerpsMarketDetailsViewSelectorsIDs.FULLSCREEN_CHART_BUTTON
+                }
+                accessibilityLabel={strings(
+                  'perps.market_details.fullscreen_chart',
+                )}
               />
-            </Box>
-            <ButtonIcon
-              iconName={IconName.Expand}
-              size={ButtonIconSize.Md}
-              onPress={handleFullscreenChartOpen}
-              style={styles.marketSummaryFullscreenButton}
-              testID={
-                PerpsMarketDetailsViewSelectorsIDs.FULLSCREEN_CHART_BUTTON
-              }
-              accessibilityLabel={strings(
-                'perps.market_details.fullscreen_chart',
-              )}
-            />
-          </Box>
+            }
+          />
 
           {/* TradingView Chart Section */}
           <View style={[styles.section, styles.chartSection]}>
@@ -1832,7 +1863,7 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
               </Text>
             </Text>
           </View>
-        </ScrollView>
+        </Animated.ScrollView>
       </View>
 
       {/* Fixed Actions Footer */}
@@ -2040,7 +2071,7 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
           onConfirm={closeReversePositionSheet}
         />
       )}
-    </SafeAreaView>
+    </View>
   );
 };
 
diff --git a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.view.test.tsx b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.view.test.tsx
index 71be07c6a178..1acedb90e44f 100644
--- a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.view.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.view.test.tsx
@@ -504,7 +504,9 @@ describe('PerpsMarketDetailsView', () => {
         await screen.findByTestId(PerpsMarketDetailsViewSelectorsIDs.HEADER),
       ).toBeOnTheScreen();
       expect(screen.getByText('Ethereum')).toBeOnTheScreen();
-      expect(screen.getByText('ETH-USD perp')).toBeOnTheScreen();
+      expect(
+        screen.getByTestId(PerpsMarketHeaderSelectorsIDs.SUBTITLE),
+      ).toHaveTextContent('ETH-USD perp');
     });
 
     it('renders live price, 24h change, and fullscreen button inside the market summary row', async () => {
diff --git a/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.test.tsx b/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.test.tsx
index 9c63d9732ec2..59bf1cad7b20 100644
--- a/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.test.tsx
@@ -11,6 +11,7 @@ import {
   type MarketTypeFilter,
 } from '@metamask/perps-controller';
 import { PerpsMarketListViewSelectorsIDs } from '../../Perps.testIds';
+import Routes from '../../../../../constants/navigation/Routes';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { createActiveABTestAssignment } from '../../../../../util/analytics/activeABTestAssignments';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
@@ -487,6 +488,9 @@ jest.mock('@metamask/design-system-twrnc-preset', () => {
   twFn.color = () => 'black';
   return {
     useTailwind: () => twFn,
+    // MMDS Input (via TextFieldSearch) reads theme for placeholder color.
+    useTheme: () => 'light',
+    Theme: { Light: 'light', Dark: 'dark' },
   };
 });
 
@@ -1084,6 +1088,7 @@ describe('PerpsMarketListView', () => {
       expect(mockNavigation.dispatch).toHaveBeenCalledTimes(1);
       expect(mockNavigation.dispatch).toHaveBeenCalledWith(
         expect.objectContaining({
+          type: 'PUSH',
           payload: expect.objectContaining({
             params: expect.objectContaining({
               market: watchlistMarket,
@@ -1541,6 +1546,76 @@ describe('PerpsMarketListView', () => {
         }),
       );
     });
+
+    it('replaces underlying market details when opened as the header picker', () => {
+      mockUseRoute.mockReturnValue({
+        key: 'PerpsMarketListView-picker',
+        name: 'PerpsMarketListView',
+        params: {
+          animation: 'slide_from_bottom',
+          replaceOnSelect: true,
+        },
+      });
+
+      renderWithProvider(<PerpsMarketListView />, { state: mockState });
+
+      fireEvent.press(screen.getAllByTestId('market-row-ETH')[0]);
+
+      expect(mockNavigation.dispatch).toHaveBeenCalledTimes(1);
+      const stackReducer = mockNavigation.dispatch.mock.calls[0][0] as (state: {
+        key: string;
+        index: number;
+        routeNames: string[];
+        routes: { key: string; name: string; params?: object }[];
+        type: string;
+        stale: boolean;
+      }) => unknown;
+
+      expect(typeof stackReducer).toBe('function');
+      expect(
+        stackReducer({
+          key: 'stack',
+          index: 2,
+          routeNames: [
+            'PerpsMarketListView',
+            'PerpsMarketDetails',
+            'PerpsMarketListView',
+          ],
+          routes: [
+            { key: 'list', name: 'PerpsMarketListView' },
+            {
+              key: 'details-btc',
+              name: 'PerpsMarketDetails',
+              params: { market: mockMarketData[0] },
+            },
+            {
+              key: 'picker',
+              name: 'PerpsMarketListView',
+              params: { replaceOnSelect: true },
+            },
+          ],
+          type: 'stack',
+          stale: false,
+        }),
+      ).toEqual(
+        expect.objectContaining({
+          type: 'RESET',
+          payload: expect.objectContaining({
+            index: 1,
+            routes: [
+              { key: 'list', name: 'PerpsMarketListView' },
+              expect.objectContaining({
+                name: 'PerpsMarketDetails',
+                params: expect.objectContaining({
+                  market: mockMarketData[1],
+                  source: 'perp_markets',
+                }),
+              }),
+            ],
+          }),
+        }),
+      );
+    });
   });
 
   describe('Loading States', () => {
diff --git a/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx b/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx
index c109eaba2278..5581f1612999 100644
--- a/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx
@@ -9,6 +9,7 @@ import {
   HeaderStandard,
   Text,
   TextColor,
+  TextFieldSearch,
   TextVariant,
 } from '@metamask/design-system-react-native';
 import {
@@ -19,7 +20,6 @@ import {
   Platform,
 } from 'react-native';
 import { useStyles } from '../../../../../component-library/hooks';
-import TextFieldSearch from '../../../../../component-library/components/Form/TextFieldSearch/TextFieldSearch';
 import { strings } from '../../../../../../locales/i18n';
 import PerpsMarketBalanceActions from '../../components/PerpsMarketBalanceActions';
 import PerpsMarketSortFieldBottomSheet from '../../components/PerpsMarketSortFieldBottomSheet';
@@ -55,6 +55,7 @@ import {
   RouteProp,
   useNavigation,
   useFocusEffect,
+  CommonActions,
   StackActions,
 } from '@react-navigation/native';
 import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
@@ -105,6 +106,7 @@ const PerpsMarketListView = ({
   const defaultSortOptionId = route.params?.defaultSortOptionId;
   const defaultSortDirection = route.params?.defaultSortDirection;
   const transactionActiveAbTests = route.params?.transactionActiveAbTests;
+  const replaceOnSelect = route.params?.replaceOnSelect === true;
 
   const isWatchlistEnabled = useSelector(selectPerpsWatchlistEnabledFlag);
   const isRecentlyViewedEnabled = useSelector(
@@ -293,26 +295,54 @@ const PerpsMarketListView = ({
           source_section = PERPS_EVENT_VALUE.SOURCE_SECTION.ALL_MARKETS;
         }
 
+        const detailsParams = {
+          market,
+          source: PERPS_EVENT_VALUE.SOURCE.PERP_MARKETS,
+          source_section,
+          ...(transactionActiveAbTests?.length
+            ? { transactionActiveAbTests }
+            : {}),
+        };
+
+        if (replaceOnSelect) {
+          // Header slide-up picker: dismiss this list and replace the stale
+          // MARKET_DETAILS beneath it so Back does not return to the prior market.
+          navigation.dispatch((state) => {
+            const routes = state.routes.slice(0, -1);
+            if (
+              routes[routes.length - 1]?.name === Routes.PERPS.MARKET_DETAILS
+            ) {
+              routes.pop();
+            }
+            return CommonActions.reset({
+              ...state,
+              index: routes.length,
+              routes: [
+                ...routes,
+                {
+                  name: Routes.PERPS.MARKET_DETAILS,
+                  params: detailsParams,
+                },
+              ],
+            });
+          });
+          return;
+        }
+
         // Use push instead of navigate so that MARKET_LIST is always beneath
         // MARKET_DETAILS in the stack. navigate() can jump to an existing
         // MARKET_DETAILS entry (e.g. one opened from PerpsHome via the watchlist
         // component's ROOT-based navigation), which would skip MARKET_LIST on
         // back and land the user on PERPS_HOME instead.
         navigation.dispatch(
-          StackActions.push(Routes.PERPS.MARKET_DETAILS, {
-            market,
-            source: PERPS_EVENT_VALUE.SOURCE.PERP_MARKETS,
-            source_section,
-            ...(transactionActiveAbTests?.length
-              ? { transactionActiveAbTests }
-              : {}),
-          }),
+          StackActions.push(Routes.PERPS.MARKET_DETAILS, detailsParams),
         );
       }
     },
     [
       onMarketSelect,
       navigation,
+      replaceOnSelect,
       transactionActiveAbTests,
       searchQuery,
       showFavoritesOnly,
@@ -857,13 +887,15 @@ const PerpsMarketListView = ({
             onChangeText={setSearchQuery}
             onPressClearButton={() => setSearchQuery('')}
             placeholder={strings('perps.search_by_token_symbol')}
-            testID={PerpsMarketListViewSelectorsIDs.SEARCH_BAR}
-            autoComplete="off"
-            autoCorrect={false}
-            autoCapitalize="none"
             clearButtonProps={{
               testID: PerpsMarketListViewSelectorsIDs.SEARCH_CLEAR_BUTTON,
             }}
+            inputProps={{
+              autoComplete: 'off',
+              autoCorrect: false,
+              autoCapitalize: 'none',
+              testID: PerpsMarketListViewSelectorsIDs.SEARCH_BAR,
+            }}
           />
         </View>
       )}
diff --git a/app/components/UI/Perps/Views/PerpsModeSelectionView/PerpsModeSelectionView.test.tsx b/app/components/UI/Perps/Views/PerpsModeSelectionView/PerpsModeSelectionView.test.tsx
new file mode 100644
index 000000000000..027b2ebfacee
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsModeSelectionView/PerpsModeSelectionView.test.tsx
@@ -0,0 +1,328 @@
+import { PerpsMode } from '@metamask/perps-controller';
+import {
+  PERPS_EVENT_PROPERTY,
+  PERPS_EVENT_VALUE,
+} from '@metamask/perps-controller/constants';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import React from 'react';
+import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import Routes from '../../../../../constants/navigation/Routes';
+import { PerpsModeSelectionBottomSheetSelectorsIDs } from '../../Perps.testIds';
+import PerpsModeSelectionView from './PerpsModeSelectionView';
+
+const mockGoBack = jest.fn();
+const mockNavigate = jest.fn();
+const mockGetParentReset = jest.fn();
+const mockGetParentGetState = jest.fn(() => ({
+  index: 2,
+  routes: [
+    { name: Routes.PERPS.PERPS_HOME, key: 'home-1' },
+    { name: Routes.PERPS.MARKET_DETAILS, key: 'market-1' },
+    { name: Routes.PERPS.MODALS.ROOT, key: 'modal-1' },
+  ],
+}));
+const mockSetMode = jest.fn();
+const mockTrack = jest.fn();
+
+let mockIsProModeEnabled = true;
+let mockIsFirstTimePerpsUser = true;
+let mockPerpsMode = PerpsMode.Lite;
+let mockRouteParams: { entry?: string; source?: string } = {};
+
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: () => ({
+    navigate: mockNavigate,
+    goBack: mockGoBack,
+    getParent: () => ({
+      getState: mockGetParentGetState,
+      reset: mockGetParentReset,
+    }),
+  }),
+  useRoute: () => ({
+    params: mockRouteParams,
+  }),
+}));
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: (selector: () => unknown) => selector(),
+}));
+
+jest.mock('../../selectors/perpsController', () => ({
+  selectIsFirstTimePerpsUser: () => mockIsFirstTimePerpsUser,
+}));
+
+jest.mock('../../selectors/featureFlags', () => ({
+  selectPerpsProModeEnabledFlag: () => mockIsProModeEnabled,
+}));
+
+jest.mock('../../hooks/usePerpsMode', () => ({
+  usePerpsMode: () => ({
+    mode: mockPerpsMode,
+    setMode: mockSetMode,
+  }),
+}));
+
+jest.mock('../../hooks/usePerpsEventTracking', () => ({
+  usePerpsEventTracking: () => ({ track: mockTrack }),
+}));
+
+const mockMarkPerpsModeSelectionCompleted = jest.fn(() => Promise.resolve());
+jest.mock('../../utils/perpsModeSelectionStorage', () => ({
+  markPerpsModeSelectionCompleted: () => mockMarkPerpsModeSelectionCompleted(),
+}));
+
+jest.mock('../../utils/perpsModeSwitch', () => ({
+  buildDefaultProMarket: () => ({ symbol: 'BTC', name: 'Bitcoin' }),
+  toPerpsNavigatorScreenParams: (target: unknown) => target,
+  resolvePerpsHomeNavigationTarget: jest.requireActual(
+    '../../utils/perpsModeSwitch',
+  ).resolvePerpsHomeNavigationTarget,
+  dropPerpsHomeFromStackHistory: jest.requireActual(
+    '../../utils/perpsModeSwitch',
+  ).dropPerpsHomeFromStackHistory,
+}));
+
+jest.mock('../../../../../../locales/i18n', () => ({
+  strings: jest.fn((key: string) => {
+    const translations: Record<string, string> = {
+      'perps.mode.selection_title': 'Choose how you trade',
+      'perps.mode.lite': 'Lite',
+      'perps.mode.lite_description':
+        'One-tap longs or shorts. Simple by design.',
+      'perps.mode.pro': 'Pro',
+      'perps.mode.pro_description':
+        'Order book, advanced order types, and leverage.',
+    };
+    return translations[key] ?? key;
+  }),
+}));
+
+jest.mock('@metamask/design-system-twrnc-preset', () => {
+  const tw = (..._args: unknown[]) => ({});
+  tw.style = jest.fn(() => ({}));
+  return { useTailwind: () => tw };
+});
+
+describe('PerpsModeSelectionView', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockIsProModeEnabled = true;
+    mockIsFirstTimePerpsUser = true;
+    mockPerpsMode = PerpsMode.Lite;
+    mockRouteParams = {};
+    jest.spyOn(window, 'requestAnimationFrame').mockImplementation((cb) => {
+      cb(0);
+      return 0;
+    });
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('pre-selects the current Perps mode', () => {
+    mockPerpsMode = PerpsMode.Pro;
+
+    render(<PerpsModeSelectionView />);
+
+    expect(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.PRO_OPTION)
+        .props.accessibilityState,
+    ).toEqual({ selected: true });
+    expect(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.LITE_OPTION)
+        .props.accessibilityState,
+    ).toEqual({ selected: false });
+  });
+
+  it('persists Lite, dismisses, and continues to the tutorial for first-time users', async () => {
+    render(<PerpsModeSelectionView />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.LITE_OPTION),
+    );
+
+    await Promise.resolve();
+
+    expect(mockSetMode).toHaveBeenCalledWith(PerpsMode.Lite);
+    expect(mockMarkPerpsModeSelectionCompleted).toHaveBeenCalledTimes(1);
+    expect(mockTrack).toHaveBeenCalledWith(
+      MetaMetricsEvents.PERPS_UI_INTERACTION,
+      {
+        [PERPS_EVENT_PROPERTY.INTERACTION_TYPE]:
+          PERPS_EVENT_VALUE.INTERACTION_TYPE.BUTTON_CLICKED,
+        [PERPS_EVENT_PROPERTY.MODE]: PerpsMode.Lite,
+        [PERPS_EVENT_PROPERTY.SOURCE]:
+          PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION,
+      },
+    );
+    expect(mockGoBack).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.TUTORIAL, {
+      source: PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION,
+    });
+  });
+
+  it('persists Pro and continues to the tutorial with a Pro market redirect', async () => {
+    render(<PerpsModeSelectionView />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.PRO_OPTION),
+    );
+
+    await Promise.resolve();
+
+    expect(mockSetMode).toHaveBeenCalledWith(PerpsMode.Pro);
+    expect(mockMarkPerpsModeSelectionCompleted).toHaveBeenCalledTimes(1);
+    expect(mockGoBack).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.TUTORIAL, {
+      source: PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION,
+      redirectScreen: Routes.PERPS.MARKET_DETAILS,
+      redirectParams: {
+        market: { symbol: 'BTC', name: 'Bitcoin' },
+        source: PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION,
+      },
+    });
+  });
+
+  it('continues to Perps Home when a returning Trade-entry user selects Lite', async () => {
+    mockIsFirstTimePerpsUser = false;
+
+    render(<PerpsModeSelectionView />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.LITE_OPTION),
+    );
+
+    await Promise.resolve();
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+      screen: Routes.PERPS.PERPS_HOME,
+      params: { source: PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION },
+    });
+  });
+
+  it('continues to the default Pro market when a returning Trade-entry user selects Pro', async () => {
+    // Regression: the destination must come from the selected mode, not from the
+    // Pro-mode selector, which still reads Lite at this point.
+    mockIsFirstTimePerpsUser = false;
+    mockPerpsMode = PerpsMode.Lite;
+
+    render(<PerpsModeSelectionView />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.PRO_OPTION),
+    );
+
+    await Promise.resolve();
+
+    expect(mockSetMode).toHaveBeenCalledWith(PerpsMode.Pro);
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+      screen: Routes.PERPS.MARKET_DETAILS,
+      params: {
+        market: expect.objectContaining({ symbol: 'BTC' }),
+        source: PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION,
+      },
+    });
+  });
+
+  it('continues to Perps Home when Pro is selected but the Pro-mode flag is off', async () => {
+    mockIsFirstTimePerpsUser = false;
+    mockIsProModeEnabled = false;
+
+    render(<PerpsModeSelectionView />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.PRO_OPTION),
+    );
+
+    await Promise.resolve();
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+      screen: Routes.PERPS.PERPS_HOME,
+      params: { source: PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION },
+    });
+  });
+
+  it('resets onto the default Pro market when selecting Pro from home', async () => {
+    mockIsFirstTimePerpsUser = false;
+    mockRouteParams = {
+      entry: 'home',
+      source: PERPS_EVENT_VALUE.SOURCE.PERPS_HOME,
+    };
+
+    render(<PerpsModeSelectionView />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.PRO_OPTION),
+    );
+
+    await Promise.resolve();
+
+    expect(mockSetMode).toHaveBeenCalledWith(PerpsMode.Pro);
+    expect(mockGetParentReset).toHaveBeenCalledWith({
+      index: 0,
+      routes: [
+        {
+          name: Routes.PERPS.MARKET_DETAILS,
+          params: {
+            market: { symbol: 'BTC', name: 'Bitcoin' },
+            source: PERPS_EVENT_VALUE.SOURCE.PERPS_HOME,
+          },
+        },
+      ],
+    });
+    expect(mockGoBack).not.toHaveBeenCalled();
+  });
+
+  it('drops Perps Home from the parent stack when selecting Pro from a market', async () => {
+    mockIsFirstTimePerpsUser = false;
+    mockRouteParams = {
+      entry: 'market',
+      source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
+    };
+
+    render(<PerpsModeSelectionView />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.PRO_OPTION),
+    );
+
+    await Promise.resolve();
+
+    expect(mockSetMode).toHaveBeenCalledWith(PerpsMode.Pro);
+    expect(mockGetParentReset).toHaveBeenCalledWith(
+      expect.objectContaining({
+        index: 1,
+        routes: [
+          { name: Routes.PERPS.MARKET_DETAILS, key: 'market-1' },
+          { name: Routes.PERPS.MODALS.ROOT, key: 'modal-1' },
+        ],
+      }),
+    );
+    expect(mockGoBack).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).not.toHaveBeenCalled();
+  });
+
+  it('dismisses only when selecting Lite from a market header', async () => {
+    mockIsFirstTimePerpsUser = false;
+    mockRouteParams = {
+      entry: 'market',
+      source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
+    };
+
+    render(<PerpsModeSelectionView />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.LITE_OPTION),
+    );
+
+    await Promise.resolve();
+
+    expect(mockSetMode).toHaveBeenCalledWith(PerpsMode.Lite);
+    expect(mockGoBack).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).not.toHaveBeenCalled();
+    expect(mockGetParentReset).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsModeSelectionView/PerpsModeSelectionView.tsx b/app/components/UI/Perps/Views/PerpsModeSelectionView/PerpsModeSelectionView.tsx
new file mode 100644
index 000000000000..53b3bb1eb078
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsModeSelectionView/PerpsModeSelectionView.tsx
@@ -0,0 +1,186 @@
+import {
+  useNavigation,
+  useRoute,
+  type RouteProp,
+} from '@react-navigation/native';
+import {
+  PERPS_EVENT_PROPERTY,
+  PERPS_EVENT_VALUE,
+  PerpsMode,
+} from '@metamask/perps-controller';
+import React, { useCallback } from 'react';
+import { useSelector } from 'react-redux';
+import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
+import Routes from '../../../../../constants/navigation/Routes';
+import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import PerpsModeSelectionBottomSheet from '../../components/PerpsModeSelectionBottomSheet';
+import { usePerpsEventTracking } from '../../hooks/usePerpsEventTracking';
+import { usePerpsMode } from '../../hooks/usePerpsMode';
+import { selectIsFirstTimePerpsUser } from '../../selectors/perpsController';
+import { selectPerpsProModeEnabledFlag } from '../../selectors/featureFlags';
+import { markPerpsModeSelectionCompleted } from '../../utils/perpsModeSelectionStorage';
+import {
+  type PerpsModeSelectionEntry,
+  type PerpsModeSelectionRouteParams,
+} from '../../utils/openPerpsModeSelection';
+import {
+  buildDefaultProMarket,
+  dropPerpsHomeFromStackHistory,
+  resolvePerpsHomeNavigationTarget,
+  toPerpsNavigatorScreenParams,
+} from '../../utils/perpsModeSwitch';
+
+type ModeSelectionRoute = RouteProp<
+  { PerpsModeSelection: PerpsModeSelectionRouteParams },
+  'PerpsModeSelection'
+>;
+
+/**
+ * Host screen for the Lite/Pro chooser bottom sheet.
+ *
+ * Opened from the Trade menu (once) or from Perps header toggles. Selecting a
+ * mode persists the choice and continues into the right destination — no
+ * mode-switch flash overlay.
+ */
+const PerpsModeSelectionView: React.FC = () => {
+  const navigation = useNavigation<AppNavigationProp>();
+  const route = useRoute<ModeSelectionRoute>();
+  const entry: PerpsModeSelectionEntry = route.params?.entry ?? 'trade';
+  const source =
+    route.params?.source ?? PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION;
+
+  const { track } = usePerpsEventTracking();
+  const { mode: selectedMode, setMode } = usePerpsMode();
+  const isFirstTimePerpsUser = useSelector(selectIsFirstTimePerpsUser);
+  const isProModeEnabled = useSelector(selectPerpsProModeEnabledFlag);
+
+  const handleClose = useCallback(() => {
+    navigation.goBack();
+  }, [navigation]);
+
+  const continueAfterSelection = useCallback(
+    (mode: PerpsMode) => {
+      if (isFirstTimePerpsUser) {
+        navigation.navigate(
+          Routes.PERPS.TUTORIAL,
+          mode === PerpsMode.Pro
+            ? {
+                source,
+                redirectScreen: Routes.PERPS.MARKET_DETAILS,
+                redirectParams: {
+                  market: buildDefaultProMarket(),
+                  source,
+                },
+              }
+            : { source },
+        );
+        return;
+      }
+
+      if (entry === 'home' && mode === PerpsMode.Pro) {
+        // Modal is nested under the Perps stack when opened from home.
+        // Reset that parent stack so Perps Home is discarded while Pro is
+        // active (TAT-3612) — same behavior as the old direct header switch.
+        navigation.getParent()?.reset({
+          index: 0,
+          routes: [
+            {
+              name: Routes.PERPS.MARKET_DETAILS,
+              params: {
+                market: buildDefaultProMarket(),
+                source,
+              },
+            },
+          ],
+        });
+        return;
+      }
+
+      if (entry === 'trade') {
+        // Derive the destination from the mode just selected, not from the
+        // Pro-mode selector: `setMode` has run but this closure still holds the
+        // pre-selection render's value, so reading it back would send a user who
+        // picked Pro to Lite Home.
+        navigation.navigate(
+          Routes.PERPS.ROOT,
+          toPerpsNavigatorScreenParams(
+            resolvePerpsHomeNavigationTarget(
+              isProModeEnabled && mode === PerpsMode.Pro,
+              { source },
+            ),
+          ),
+        );
+        return;
+      }
+
+      if (entry === 'market' && mode === PerpsMode.Pro) {
+        // Modal is nested under the Perps stack when opened from a market.
+        // Drop Home from that parent so back cannot reveal the Lite hub while
+        // Pro is active (TAT-3612). Mode remount stays in place via the router.
+        const perpsStack = navigation.getParent();
+        if (perpsStack) {
+          dropPerpsHomeFromStackHistory(perpsStack);
+        }
+      }
+
+      // `home` + Lite: dismiss only — already on Perps Home.
+    },
+    [entry, isFirstTimePerpsUser, isProModeEnabled, navigation, source],
+  );
+
+  const handleSelect = useCallback(
+    async (mode: PerpsMode) => {
+      setMode(mode);
+      await markPerpsModeSelectionCompleted();
+
+      track(MetaMetricsEvents.PERPS_UI_INTERACTION, {
+        [PERPS_EVENT_PROPERTY.INTERACTION_TYPE]:
+          PERPS_EVENT_VALUE.INTERACTION_TYPE.BUTTON_CLICKED,
+        [PERPS_EVENT_PROPERTY.MODE]: mode,
+        [PERPS_EVENT_PROPERTY.SOURCE]: source,
+      });
+
+      // Home → Pro resets the parent Perps stack (clears the modal too).
+      if (entry === 'home' && mode === PerpsMode.Pro && !isFirstTimePerpsUser) {
+        continueAfterSelection(mode);
+        return;
+      }
+
+      // Market → Pro must drop Home while the modal is still nested under the
+      // Perps stack — after goBack the parent relationship is gone.
+      if (
+        entry === 'market' &&
+        mode === PerpsMode.Pro &&
+        !isFirstTimePerpsUser
+      ) {
+        continueAfterSelection(mode);
+        navigation.goBack();
+        return;
+      }
+
+      navigation.goBack();
+      requestAnimationFrame(() => {
+        continueAfterSelection(mode);
+      });
+    },
+    [
+      continueAfterSelection,
+      entry,
+      isFirstTimePerpsUser,
+      navigation,
+      setMode,
+      source,
+      track,
+    ],
+  );
+
+  return (
+    <PerpsModeSelectionBottomSheet
+      selectedMode={selectedMode}
+      onSelect={handleSelect}
+      onClose={handleClose}
+    />
+  );
+};
+
+export default PerpsModeSelectionView;
diff --git a/app/components/UI/Perps/Views/PerpsModeSelectionView/index.ts b/app/components/UI/Perps/Views/PerpsModeSelectionView/index.ts
new file mode 100644
index 000000000000..218f3db51e1e
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsModeSelectionView/index.ts
@@ -0,0 +1 @@
+export { default } from './PerpsModeSelectionView';
diff --git a/app/components/UI/Perps/Views/PerpsOrderBookView/PerpsOrderBookView.test.tsx b/app/components/UI/Perps/Views/PerpsOrderBookView/PerpsOrderBookView.test.tsx
index 28f5681fd1b1..dfb351156a9a 100644
--- a/app/components/UI/Perps/Views/PerpsOrderBookView/PerpsOrderBookView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsOrderBookView/PerpsOrderBookView.test.tsx
@@ -253,8 +253,8 @@ jest.mock('../../components/PerpsOrderBookDepthChart', () => {
   );
 });
 
-// Mock PerpsMarketHeader to avoid PerpsStreamProvider dependency
-jest.mock('../../components/PerpsMarketHeader', () => {
+// Mock PerpsMarketInlineHeader to avoid PerpsStreamProvider dependency
+jest.mock('../../components/PerpsMarketInlineHeader', () => {
   const { View, Text, TouchableOpacity } = jest.requireActual('react-native');
   const selectors = jest.requireActual<typeof import('../../Perps.testIds')>(
     '../../Perps.testIds',
diff --git a/app/components/UI/Perps/Views/PerpsOrderBookView/PerpsOrderBookView.tsx b/app/components/UI/Perps/Views/PerpsOrderBookView/PerpsOrderBookView.tsx
index c3de5008570d..8c591de110ea 100644
--- a/app/components/UI/Perps/Views/PerpsOrderBookView/PerpsOrderBookView.tsx
+++ b/app/components/UI/Perps/Views/PerpsOrderBookView/PerpsOrderBookView.tsx
@@ -49,7 +49,7 @@ import { MetaMetricsEvents } from '../../../../../core/Analytics';
 import PerpsBottomSheetTooltip from '../../components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip';
 import type { PerpsTooltipContentKey } from '../../components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.types';
 import LivePriceHeader from '../../components/LivePriceDisplay/LivePriceHeader';
-import PerpsMarketHeader from '../../components/PerpsMarketHeader';
+import PerpsMarketInlineHeader from '../../components/PerpsMarketInlineHeader';
 import PerpsTokenLogo from '../../components/PerpsTokenLogo';
 import PerpsOrderBookDepthChart from '../../components/PerpsOrderBookDepthChart';
 import PerpsOrderBookTable, {
@@ -379,10 +379,10 @@ const PerpsOrderBookView: React.FC<PerpsOrderBookViewProps> = ({
 
     if (market) {
       return (
-        <PerpsMarketHeader
+        <PerpsMarketInlineHeader
           market={market}
-          onBackPress={handleBack}
           currentPrice={currentPrice}
+          onBackPress={handleBack}
           endAccessory={groupingSelectButton}
         />
       );
diff --git a/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.tsx b/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.tsx
index 5d5511330b16..a87b5271acb9 100644
--- a/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.tsx
+++ b/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.tsx
@@ -57,9 +57,9 @@ import {
 } from '../../../../Views/confirmations/constants/perps';
 import {
   useIsTransactionPayQuoteLoading,
-  useTransactionPayRequiredTokens,
   useTransactionPayTotals,
 } from '../../../../Views/confirmations/hooks/pay/useTransactionPayData';
+import { useIsTransactionPayAmountStale } from '../../../../Views/confirmations/hooks/pay/useIsTransactionPayAmountStale';
 import { useTransactionPayMetrics } from '../../../../Views/confirmations/hooks/pay/useTransactionPayMetrics';
 import { useTransactionPayToken } from '../../../../Views/confirmations/hooks/pay/useTransactionPayToken';
 import { useAddToken } from '../../../../Views/confirmations/hooks/tokens/useAddToken';
@@ -85,14 +85,13 @@ import PerpsSlider from '../../components/PerpsSlider';
 import {
   DECIMAL_PRECISION_CONFIG,
   PERPS_CONSTANTS,
-  getPerpsDisplaySymbol,
-  calculateMarginRequired,
   calculatePositionSize,
+  getPerpsDisplaySymbol,
+  getTriggerExecution,
   type InputMethod,
   type OrderParams,
   type OrderType,
   type Position,
-  ORDER_SLIPPAGE_CONFIG,
 } from '@metamask/perps-controller';
 import {
   PERPS_EVENT_PROPERTY,
@@ -131,6 +130,7 @@ import { useABTest } from '../../../../../hooks/useABTest';
 import { usePerpsEventTracking } from '../../hooks/usePerpsEventTracking';
 import { usePerpsAbandonOrderTracking } from '../../hooks/usePerpsAbandonOrderTracking';
 import { usePerpsMeasurement } from '../../hooks/usePerpsMeasurement';
+import { MAX_PERPS_INPUT_DIGITS } from '../../constants/perpsConfig';
 import { buildPerpsCufStartTags } from '../../utils/perpsCufTrace';
 import { PERPS_CUF_TAG, PERPS_CUF_VARIANT } from '../../constants/perpsCufTags';
 import { usePerpsOICap } from '../../hooks/usePerpsOICap';
@@ -151,14 +151,16 @@ import {
 } from '../../utils/formatUtils';
 import { willFlipPosition } from '../../utils/orderUtils';
 import { derivePerpsTradeAction } from '../../utils/deriveTradeAction';
-import { toPerpsEntryAttribution } from '../../utils/perpsAnalyticsAttribution';
 import { getPerpsChartLibrary } from '../../utils/chartAnalytics';
 import {
   calculateRoEForPrice,
-  isStopLossSafeFromLiquidation,
-  isValidStopLossPrice,
-  isValidTakeProfitPrice,
+  getPerpsOrderTpSlWarnings,
 } from '../../utils/tpslValidation';
+import { deriveOrderSizing } from '../../utils/orderSizing';
+import {
+  buildPerpsOrderParams,
+  buildPerpsOrderTrackingData,
+} from '../../utils/orderParams';
 import createStyles from './PerpsOrderView.styles';
 import { PerpsPayRow } from './PerpsPayRow';
 import { useUpdateTokenAmount } from '../../../../Views/confirmations/hooks/transactions/useUpdateTokenAmount';
@@ -619,7 +621,7 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
   // Deposit/bridge fees from transaction pay (when paying with custom token)
   const payTotals = useTransactionPayTotals();
   const isPayTotalsLoading = useIsTransactionPayQuoteLoading();
-  const payRequiredTokens = useTransactionPayRequiredTokens();
+  const isPayAmountStale = useIsTransactionPayAmountStale();
   const depositFeeUsd = useMemo(() => {
     if (!hasCustomTokenSelected || !payTotals?.fees) return 0;
     const { provider, sourceNetwork, targetNetwork } = payTotals.fees;
@@ -638,13 +640,6 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
   const undiscountedFeesToDisplay = hasCustomTokenSelected
     ? undiscountedEstimatedFees + depositFeeUsd
     : undiscountedEstimatedFees;
-  // The order amount reaches the pay controller through a chain of effects, so
-  // right after the pay token changes it still holds a zero amount, has no
-  // quote, and has not started loading. Without this the CTA is open for a few
-  // seconds and the deposit submits unfunded.
-  const isPayAmountStale = (payRequiredTokens ?? []).some(
-    (token) => !token.skipIfBalance && token.amountRaw === '0',
-  );
 
   const isPayStateNotReady = isPayTotalsLoading || isPayAmountStale;
 
@@ -727,43 +722,39 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
     },
   });
 
-  // For limit orders, use the user-set limit price for calculations instead of the market price.
-  // This ensures position size, margin, and max order size correctly reflect the limit price.
-  const effectivePrice = useMemo(() => {
-    if (
-      orderForm.type === 'limit' &&
-      orderForm.limitPrice &&
-      parseFloat(orderForm.limitPrice) > 0
-    ) {
-      return parseFloat(orderForm.limitPrice);
-    }
-    return assetData.price;
-  }, [orderForm.type, orderForm.limitPrice, assetData.price]);
-
-  // Committed position size - feeds margin/validation/submission, so it only
-  // recomputes once per commit (orderForm.amount), not once per drag frame.
-  const positionSize = useMemo(() => {
-    // During loading, show '--' placeholder (consistent with other unavailable data displays)
-    if (isLoadingMarketData) {
-      return PERPS_CONSTANTS.FallbackDataDisplay;
-    }
-
-    return calculatePositionSize({
-      amount: orderForm.amount,
-      price: effectivePrice,
-      // Defensive fallback if market data fails to load - prevents crashes
-      // Real szDecimals should come from market data (varies by asset)
-      szDecimals: szDecimals ?? DECIMAL_PRECISION_CONFIG.FallbackSizeDecimals,
-    });
-  }, [orderForm.amount, effectivePrice, szDecimals, isLoadingMarketData]);
+  // Position size, margin, and effective price are derived together. For limit
+  // orders with a valid limit price, that price is used for sizing/margin;
+  // otherwise the market price (sizing) and oracle mark price (margin) are used.
+  const { effectivePrice, positionSize, marginRequired } = useMemo(
+    () =>
+      deriveOrderSizing({
+        amount: orderForm.amount,
+        orderType: orderForm.type,
+        limitPrice: orderForm.limitPrice,
+        marketPrice: assetData.price,
+        markPrice: assetData.markPrice,
+        leverage: orderForm.leverage,
+        szDecimals,
+        isLoadingMarketData,
+      }),
+    [
+      orderForm.amount,
+      orderForm.type,
+      orderForm.limitPrice,
+      orderForm.leverage,
+      assetData.price,
+      assetData.markPrice,
+      szDecimals,
+      isLoadingMarketData,
+    ],
+  );
 
-  // Live position size for the token-size subtitle only - cheap synchronous
+  // Live position size for the token-size subtitle only — cheap synchronous
   // calc, safe to recompute every drag frame off the live display amount.
   const livePositionSize = useMemo(() => {
     if (isLoadingMarketData) {
       return PERPS_CONSTANTS.FallbackDataDisplay;
     }
-
     return calculatePositionSize({
       amount: displayAmount,
       price: effectivePrice,
@@ -771,33 +762,6 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
     });
   }, [displayAmount, effectivePrice, szDecimals, isLoadingMarketData]);
 
-  const marginRequired = useMemo(() => {
-    if (!isLoadingMarketData && orderForm.amount) {
-      // For limit orders with a valid limit price, use that price for margin calculation.
-      // Otherwise use markPrice (oracle price) which is the standard margin basis.
-      const hasValidLimitPrice =
-        orderForm.type === 'limit' &&
-        orderForm.limitPrice &&
-        parseFloat(orderForm.limitPrice) > 0;
-      const priceForMargin = hasValidLimitPrice
-        ? effectivePrice
-        : assetData.markPrice;
-      return calculateMarginRequired({
-        amount: BigNumber(priceForMargin).times(positionSize).toString(),
-        leverage: orderForm.leverage,
-      });
-    }
-  }, [
-    orderForm.amount,
-    orderForm.type,
-    orderForm.limitPrice,
-    effectivePrice,
-    assetData.markPrice,
-    orderForm.leverage,
-    isLoadingMarketData,
-    positionSize,
-  ]);
-
   const hasInsufficientPayTokenBalance = useMemo(() => {
     if (marginRequired == null || !payToken || !hasCustomTokenSelected) {
       return false;
@@ -1040,20 +1004,18 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
     usePerpsOrderExecution({
       onSuccess: (_position) => {
         showToast(
-          PerpsToastOptions.orderManagement[orderForm.type].confirmed(
-            orderForm.direction,
-            positionSize,
-            orderForm.asset,
-          ),
+          PerpsToastOptions.orderManagement[
+            getTriggerExecution(orderForm.type)
+          ].confirmed(orderForm.direction, positionSize, orderForm.asset),
         );
       },
       onError: (error) => {
         // Error is already captured in usePerpsOrderExecution hook
         // No need to capture again here to avoid duplicate Sentry reports
         showToast(
-          PerpsToastOptions.orderManagement[orderForm.type].creationFailed(
-            error,
-          ),
+          PerpsToastOptions.orderManagement[
+            getTriggerExecution(orderForm.type)
+          ].creationFailed(error),
         );
       },
     });
@@ -1244,10 +1206,10 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
   const handleKeypadChange = useCallback(
     ({ value }: { value: string; valueAsNumber: number }) => {
       inputMethodRef.current = 'keypad';
-      // Enforce 9-digit limit (ignoring non-digits like separators)
+      // Enforce digit limit (ignoring non-digits like separators)
       const digitCount = (value.match(/\d/g) || []).length;
-      if (digitCount > 9) {
-        return; // Ignore input that would exceed 9 digits
+      if (digitCount > MAX_PERPS_INPUT_DIGITS) {
+        return; // Ignore input that would exceed the max digit limit
       }
       commitAmount(value || '0');
     },
@@ -1511,14 +1473,6 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
           },
         });
 
-        const tpParams = orderForm.takeProfitPrice?.trim()
-          ? { takeProfitPrice: orderForm.takeProfitPrice }
-          : {};
-
-        const slParams = orderForm.stopLossPrice?.trim()
-          ? { stopLossPrice: orderForm.stopLossPrice }
-          : {};
-
         // Execute order using the new hook
         // Only include TP/SL if they have valid, non-empty values
         //
@@ -1527,67 +1481,38 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
         // 1. Validate price hasn't moved beyond maxSlippageBps
         // 2. Recalculate size with fresh price from usdAmount
         // 3. Use the recalculated size for order execution
-        const orderParams: OrderParams = {
-          symbol: orderForm.asset,
+        const orderParams: OrderParams = buildPerpsOrderParams({
+          asset: orderForm.asset,
           isBuy: orderForm.direction === 'long',
-          size: positionSize, // Kept for backward compatibility, provider recalculates from usdAmount
+          size: positionSize,
           orderType: orderForm.type,
-          currentPrice: effectivePrice,
+          effectivePrice,
           leverage: orderForm.leverage,
-          // USD as source of truth (hybrid approach)
-          usdAmount: orderForm.amount, // USD amount (primary source of truth, provider calculates size from this)
-          priceAtCalculation: effectivePrice, // Price snapshot when size was calculated (for slippage validation)
-          maxSlippageBps:
-            orderForm.type === 'limit'
-              ? ORDER_SLIPPAGE_CONFIG.DefaultLimitSlippageBps // 1% for limit orders (fixed)
-              : maxSlippageBps, // User-configured for market orders (already in bps)
-          // Only add TP/SL/Limit if they are truthy and/or not empty strings
-          ...(orderForm.type === 'limit' && orderForm.limitPrice
-            ? { price: orderForm.limitPrice }
-            : {}),
-          ...tpParams,
-          ...slParams,
-          // Add tracking data for MetaMetrics events (controller owns emission)
-          trackingData: {
-            marginUsed: Number(marginRequired),
-            totalFee: feeResults.totalFee,
+          usdAmount: orderForm.amount,
+          maxSlippageBps,
+          limitPrice: orderForm.limitPrice,
+          takeProfitPrice: orderForm.takeProfitPrice,
+          stopLossPrice: orderForm.stopLossPrice,
+          trackingData: buildPerpsOrderTrackingData({
+            marginRequired,
+            feeResults,
             marketPrice: assetData.price,
-            metamaskFee: feeResults.metamaskFee,
-            metamaskFeeRate: feeResults.metamaskFeeRate,
-            feeDiscountPercentage: feeResults.feeDiscountPercentage,
-            estimatedPoints: feeResults.estimatedPoints,
             inputMethod: inputMethodRef.current,
             source,
-            ...toPerpsEntryAttribution({ source, sourceSection }),
-            ...(feeResults.protocolFeeRate !== undefined
-              ? { hlFeeRate: feeResults.protocolFeeRate }
-              : {}),
-            tradeAction: derivePerpsTradeAction(
-              currentMarketPosition,
-              orderForm.direction,
-            ),
+            sourceSection,
+            currentMarketPosition,
+            direction: orderForm.direction,
             chartLibrary,
-            tradeWithToken: hasCustomTokenSelected,
-            ...(hasCustomTokenSelected &&
-              payToken && {
-                mmPayTokenSelected: payToken.symbol ?? '',
-                mmPayNetworkSelected: String(payToken.chainId ?? ''),
-              }),
-            vipTier: vipTier ?? undefined,
-            vipDiscount: feeResults.feeDiscountPercentage,
-            // Cast needed only because the installed perps-controller 9.2.1
-            // TradeAction type is narrow (create_position | increase_exposure)
-            // and does not yet include the flip values. The next release widens
-            // it, after which this cast can be dropped.
-          } as OrderParams['trackingData'],
-        };
+            vipTier,
+            hasCustomTokenSelected,
+            payToken,
+          }),
+        });
 
         showToast(
-          PerpsToastOptions.orderManagement[orderForm.type].submitted(
-            orderForm.direction,
-            positionSize,
-            orderForm.asset,
-          ),
+          PerpsToastOptions.orderManagement[
+            getTriggerExecution(orderForm.type)
+          ].submitted(orderForm.direction, positionSize, orderForm.asset),
         );
 
         // Check if TP/SL should be handled separately (for new positions or position flips)
@@ -1603,7 +1528,11 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
           delete orderWithoutTPSL.takeProfitPrice;
           delete orderWithoutTPSL.stopLossPrice;
 
-          await executeOrder(orderWithoutTPSL);
+          const orderResult = await executeOrder(orderWithoutTPSL);
+          if (!orderResult?.success) {
+            return;
+          }
+
           const tpslResult = await updatePositionTPSL({
             symbol: orderForm.asset,
             takeProfitPrice: orderForm.takeProfitPrice,
@@ -1621,7 +1550,10 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
             );
           }
         } else {
-          await executeOrder(orderParams);
+          const orderResult = await executeOrder(orderParams);
+          if (!orderResult?.success) {
+            return;
+          }
         }
 
         // Clear pending trade config after successful submission to prevent
@@ -1662,12 +1594,7 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
       PerpsToastOptions.positionManagement.tpsl,
       updatePositionTPSL,
       marginRequired,
-      feeResults.totalFee,
-      feeResults.metamaskFee,
-      feeResults.metamaskFeeRate,
-      feeResults.protocolFeeRate,
-      feeResults.feeDiscountPercentage,
-      feeResults.estimatedPoints,
+      feeResults,
       source,
       sourceSection,
       chartLibrary,
@@ -1767,41 +1694,20 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
         asset: getPerpsDisplaySymbol(orderForm.asset),
       });
 
-  const doesStopLossRiskLiquidation = Boolean(
-    orderForm.stopLossPrice &&
-      !isStopLossSafeFromLiquidation(
-        orderForm.stopLossPrice,
-        liquidationPrice,
-        orderForm.direction,
-      ),
-  );
-
-  const isLimitWithPrice =
-    orderForm.type === 'limit' && Boolean(orderForm.limitPrice);
-
-  const validationReferencePrice = isLimitWithPrice
-    ? parseFloat(String(orderForm.limitPrice))
-    : assetData.price;
-
-  const tpslPriceType = isLimitWithPrice ? 'entry' : 'current';
-
-  const isTakeProfitPriceInvalid = Boolean(
-    orderForm.takeProfitPrice?.trim() &&
-      validationReferencePrice > 0 &&
-      !isValidTakeProfitPrice(orderForm.takeProfitPrice, {
-        currentPrice: validationReferencePrice,
-        direction: orderForm.direction,
-      }),
-  );
-
-  const isStopLossPriceInvalid = Boolean(
-    orderForm.stopLossPrice?.trim() &&
-      validationReferencePrice > 0 &&
-      !isValidStopLossPrice(orderForm.stopLossPrice, {
-        currentPrice: validationReferencePrice,
-        direction: orderForm.direction,
-      }),
-  );
+  const {
+    doesStopLossRiskLiquidation,
+    isTakeProfitPriceInvalid,
+    isStopLossPriceInvalid,
+    tpslPriceType,
+  } = getPerpsOrderTpSlWarnings({
+    orderType: orderForm.type,
+    limitPrice: orderForm.limitPrice,
+    direction: orderForm.direction,
+    takeProfitPrice: orderForm.takeProfitPrice,
+    stopLossPrice: orderForm.stopLossPrice,
+    liquidationPrice,
+    marketPrice: assetData.price,
+  });
 
   const hasInvalidTPSL = isTakeProfitPriceInvalid || isStopLossPriceInvalid;
 
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView.test.tsx
index fcd616dce817..8f9e056e5ebe 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView.test.tsx
@@ -1,7 +1,12 @@
 import React from 'react';
 import { fireEvent, within } from '@testing-library/react-native';
 import { Box, ButtonBase } from '@metamask/design-system-react-native';
-import { CandlePeriod, PerpsMode } from '@metamask/perps-controller';
+import {
+  CandlePeriod,
+  PerpsMode,
+  type Order,
+  type Position,
+} from '@metamask/perps-controller';
 import {
   PERPS_EVENT_PROPERTY,
   PERPS_EVENT_VALUE,
@@ -11,10 +16,21 @@ import PerpsProMarketView from './';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../../util/test/initial-root-state';
 import {
+  getPerpsProOrderRowSelector,
+  getPerpsProPositionRowSelector,
+  PerpsBalanceBottomSheetSelectorsIDs,
   PerpsProMarketViewSelectorsIDs,
-  PerpsProOrderFormSelectorsIDs,
-  PerpsOrderTypeBottomSheetSelectorsIDs,
 } from '../../Perps.testIds';
+import type { UsePerpsMarketsOptions } from '../../hooks/usePerpsMarkets';
+import type { OrderBookData } from '../../hooks/stream/usePerpsLiveOrderBook';
+
+interface MockLiveOrderBookResult {
+  orderBook: OrderBookData | null;
+  isLoading: boolean;
+  error: null;
+  connectionStatus: string;
+  reconnect: () => void;
+}
 
 interface MockRouteParams {
   market?: {
@@ -25,6 +41,7 @@ interface MockRouteParams {
   };
   source?: string;
   source_section?: string;
+  direction?: 'long' | 'short';
 }
 
 interface MockChartPanelProps {
@@ -41,6 +58,16 @@ interface MockCandlePeriodBottomSheetProps {
   testID?: string;
 }
 
+interface MockBalanceBottomSheetProps {
+  isVisible: boolean;
+  onClose: () => void;
+}
+
+interface MockOrderFormPanelProps {
+  isOrderBookCollapsed?: boolean;
+  onExpandOrderBook?: () => void;
+}
+
 let mockRouteParams: MockRouteParams | undefined = {
   market: {
     symbol: 'BTC',
@@ -50,13 +77,25 @@ let mockRouteParams: MockRouteParams | undefined = {
   },
 };
 const mockTrack = jest.fn();
+const mockSetParams = jest.fn();
 const mockUsePerpsEventTracking = jest.fn((_options?: unknown) => ({
   track: mockTrack,
 }));
 
+// The order-form provider and its business hooks are exercised by
+// PerpsProOrderFormPanel.test.tsx / usePerpsProOrderForm.test.ts. Here the
+// provider is a passthrough and the shared order-form setters are captured so
+// the order-book → order-form wiring (TAT-3643) can be asserted directly.
+const mockSetLimitPrice = jest.fn();
+const mockSetOrderType = jest.fn();
+const mockPerpsOrderProvider = jest.fn(
+  ({ children }: { children: React.ReactNode; fallbackAmount?: string }) =>
+    children,
+);
+const mockOrderProviderProps = jest.fn();
+
 const mockHandleBackPress = jest.fn();
 const mockHandleMarketListPress = jest.fn();
-const mockHandleWalletPress = jest.fn();
 const mockHandleFavoritePress = jest.fn();
 const mockHandlePerpsModeChange = jest.fn();
 const mockHeaderPerpsMode = PerpsMode.Pro;
@@ -106,11 +145,62 @@ const mockCandlePeriodBottomSheet = jest.fn(
     ) : null,
 );
 
+const mockBalanceBottomSheet = jest.fn(
+  ({ isVisible, onClose }: MockBalanceBottomSheetProps) =>
+    isVisible ? (
+      <Box testID={PerpsBalanceBottomSheetSelectorsIDs.CONTAINER}>
+        <ButtonBase testID="mock-balance-sheet-close" onPress={onClose}>
+          <Box />
+        </ButtonBase>
+      </Box>
+    ) : null,
+);
+
 jest.mock('./components/PerpsProChartPanel', () => ({
   __esModule: true,
   default: (props: MockChartPanelProps) => mockPerpsProChartPanel(props),
 }));
 
+jest.mock('../../components/PerpsBalanceBottomSheet', () => ({
+  __esModule: true,
+  default: (props: MockBalanceBottomSheetProps) =>
+    mockBalanceBottomSheet(props),
+}));
+// The order-form panel now mounts its own provider + business hooks + sheets
+// (order type, leverage, slippage). Its wiring is covered by
+// PerpsProOrderFormPanel.test.tsx and usePerpsProOrderForm.test.ts; here we only
+// need a lightweight placeholder so the layout scaffold assertions still pass.
+jest.mock('./components/PerpsProOrderFormPanel', () => {
+  const ReactActual = jest.requireActual('react');
+  const { Box, ButtonBase } = jest.requireActual(
+    '@metamask/design-system-react-native',
+  );
+  const { PerpsProMarketViewSelectorsIDs: ids } = jest.requireActual(
+    '../../Perps.testIds',
+  );
+  return {
+    __esModule: true,
+    default: ({
+      isOrderBookCollapsed,
+      onExpandOrderBook,
+    }: MockOrderFormPanelProps) =>
+      ReactActual.createElement(
+        Box,
+        { testID: ids.ORDER_FORM_PANEL },
+        isOrderBookCollapsed
+          ? ReactActual.createElement(
+              ButtonBase,
+              {
+                testID: ids.ORDER_BOOK_EXPAND_BUTTON,
+                onPress: onExpandOrderBook,
+              },
+              ReactActual.createElement(Box, null),
+            )
+          : null,
+      ),
+  };
+});
+
 jest.mock('../../components/PerpsCandlePeriodBottomSheet', () => ({
   __esModule: true,
   default: (props: MockCandlePeriodBottomSheetProps) =>
@@ -122,13 +212,12 @@ jest.mock('../../hooks/usePerpsEventTracking', () => ({
     mockUsePerpsEventTracking(options),
 }));
 
-jest.mock('../../hooks/usePerpsProMarketHeaderActions', () => ({
-  usePerpsProMarketHeaderActions: jest.fn(() => ({
+jest.mock('../../hooks/usePerpsMarketHeaderActions', () => ({
+  usePerpsMarketHeaderActions: jest.fn(() => ({
     perpsMode: mockHeaderPerpsMode,
     isWatchlist: false,
     handleBackPress: mockHandleBackPress,
     handleMarketListPress: mockHandleMarketListPress,
-    handleWalletPress: mockHandleWalletPress,
     handleFavoritePress: mockHandleFavoritePress,
     handlePerpsModeChange: mockHandlePerpsModeChange,
   })),
@@ -139,6 +228,7 @@ jest.mock('@react-navigation/native', () => {
   return {
     ...actualNav,
     useRoute: () => ({ params: mockRouteParams }),
+    useNavigation: () => ({ setParams: mockSetParams }),
   };
 });
 
@@ -160,14 +250,38 @@ jest.mock('../../hooks/stream', () => ({
   usePerpsLivePrices: jest.fn(() => ({})),
 }));
 
-jest.mock('../../hooks/stream/usePerpsLiveOrderBook', () => ({
-  usePerpsLiveOrderBook: jest.fn(() => ({
+jest.mock('../../hooks/usePerpsProPositionsPanelActions', () => ({
+  usePerpsProPositionsPanelActions: jest.fn(() => ({
+    handleClosePosition: jest.fn(),
+    handleReversePosition: jest.fn(),
+    handleSharePosition: jest.fn(),
+    handleEditPositionTpSl: jest.fn(),
+    handleEditPositionMargin: jest.fn(),
+    handleCancelOrder: jest.fn(),
+    handleEditOrderPrice: jest.fn(),
+    handleEditOrderSize: jest.fn(),
+    handleCloseAllPress: jest.fn(),
+    cancelingOrderId: null,
+    editingOrderId: null,
+    isOrderCancelable: () => true,
+    isOrderEditable: () => true,
+    isOrderSizeEditable: () => true,
+    isPositionMarginEditable: () => true,
+    renderActionSheets: () => null,
+  })),
+}));
+
+const mockUsePerpsLiveOrderBook = jest.fn(
+  (_params?: unknown): MockLiveOrderBookResult => ({
     orderBook: null,
     isLoading: true,
     error: null,
     connectionStatus: 'connecting',
     reconnect: jest.fn(),
-  })),
+  }),
+);
+jest.mock('../../hooks/stream/usePerpsLiveOrderBook', () => ({
+  usePerpsLiveOrderBook: (params: unknown) => mockUsePerpsLiveOrderBook(params),
 }));
 
 jest.mock('../../hooks/usePerpsOrderBookGrouping', () => ({
@@ -177,6 +291,41 @@ jest.mock('../../hooks/usePerpsOrderBookGrouping', () => ({
   })),
 }));
 
+jest.mock('../../contexts/PerpsOrderContext', () => ({
+  PerpsOrderProvider: (props: {
+    children: React.ReactNode;
+    fallbackAmount?: string;
+  }) => {
+    const { children, ...providerProps } = props;
+    mockPerpsOrderProvider(props);
+    mockOrderProviderProps(providerProps);
+    return children;
+  },
+  usePerpsOrderContext: () => ({
+    setLimitPrice: mockSetLimitPrice,
+    setOrderType: mockSetOrderType,
+  }),
+}));
+
+// The default mock route already has a formatted `maxLeverage` ("40x"), so
+// this enrichment hook's markets list is never actually consulted in most
+// tests — mocked (rather than requireActual) to avoid needing a real
+// PerpsStreamProvider in the tree, and overridable per-test via
+// `mockUsePerpsMarketsImpl` for the enrichment test below.
+const mockUsePerpsMarketsImpl = jest.fn(
+  (_options?: UsePerpsMarketsOptions) => ({
+    markets: [] as { symbol: string; maxLeverage: string }[],
+    isLoading: false,
+    error: null,
+    refresh: jest.fn(),
+    isRefreshing: false,
+  }),
+);
+jest.mock('../../hooks/usePerpsMarkets', () => ({
+  usePerpsMarkets: (options?: UsePerpsMarketsOptions) =>
+    mockUsePerpsMarketsImpl(options),
+}));
+
 jest.mock('../../hooks/usePerpsMarketStats', () => ({
   usePerpsMarketStats: jest.fn(() => ({
     high24h: '$50,000.00',
@@ -190,6 +339,44 @@ jest.mock('../../hooks/usePerpsMarketStats', () => ({
   })),
 }));
 
+const mockUsePerpsLivePositions = jest.requireMock('../../hooks/stream')
+  .usePerpsLivePositions as jest.Mock;
+const mockUsePerpsLiveOrders = jest.requireMock('../../hooks/stream')
+  .usePerpsLiveOrders as jest.Mock;
+
+const ethPosition: Position = {
+  symbol: 'ETH',
+  size: '1.5',
+  entryPrice: '2900',
+  positionValue: '4350',
+  unrealizedPnl: '150',
+  marginUsed: '1450',
+  leverage: { type: 'cross', value: 3 },
+  liquidationPrice: '2500',
+  maxLeverage: 50,
+  returnOnEquity: '0.103',
+  cumulativeFunding: { allTime: '0', sinceOpen: '0', sinceChange: '0' },
+  takeProfitCount: 0,
+  stopLossCount: 0,
+};
+
+const ethOrder: Order = {
+  orderId: 'eth-order-1',
+  symbol: 'ETH',
+  side: 'buy',
+  size: '1',
+  originalSize: '1',
+  filledSize: '0',
+  remainingSize: '1',
+  price: '3000',
+  orderType: 'limit',
+  status: 'open',
+  timestamp: 1_711_756_800_000,
+  reduceOnly: false,
+  isTrigger: false,
+  detailedOrderType: 'Limit',
+};
+
 const renderView = () =>
   renderWithProvider(<PerpsProMarketView />, {
     state: { engine: { backgroundState } },
@@ -206,6 +393,168 @@ describe('PerpsProMarketView', () => {
         maxLeverage: '40x',
       },
     };
+    mockUsePerpsMarketsImpl.mockReturnValue({
+      markets: [],
+      isLoading: false,
+      error: null,
+      refresh: jest.fn(),
+      isRefreshing: false,
+    });
+    // Restore the default "connecting" order book so tests that set a live
+    // book via mockImplementation don't leak into later tests (clearAllMocks
+    // resets call history but not implementations).
+    mockUsePerpsLiveOrderBook.mockImplementation(() => ({
+      orderBook: null,
+      isLoading: true,
+      error: null,
+      connectionStatus: 'connecting',
+      reconnect: jest.fn(),
+    }));
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [],
+      isInitialLoading: false,
+    });
+    mockUsePerpsLiveOrders.mockReturnValue({
+      orders: [],
+      isInitialLoading: false,
+    });
+  });
+
+  it('configures an empty fallback amount for the Pro order form', () => {
+    renderView();
+
+    expect(mockPerpsOrderProvider.mock.calls[0][0]).toEqual(
+      expect.objectContaining({
+        fallbackAmount: '',
+      }),
+    );
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('swaps the route market in place when a positions-panel row is tapped', () => {
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [ethPosition],
+      isInitialLoading: false,
+    });
+
+    const { getByTestId } = renderView();
+
+    fireEvent.press(getByTestId(getPerpsProPositionRowSelector('ETH')));
+
+    expect(mockSetParams).toHaveBeenCalledWith({
+      market: { symbol: 'ETH' },
+      source: PERPS_EVENT_VALUE.SOURCE.POSITION_TAB,
+      source_section: PERPS_EVENT_VALUE.SOURCE_SECTION.POSITIONS,
+      direction: undefined,
+    });
+  });
+
+  it('attributes order-row market switches with the orders source section', () => {
+    mockUsePerpsLiveOrders.mockReturnValue({
+      orders: [ethOrder],
+      isInitialLoading: false,
+    });
+
+    const { getByTestId } = renderView();
+
+    fireEvent.press(
+      getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TAB_ORDERS),
+    );
+    fireEvent.press(getByTestId(getPerpsProOrderRowSelector('ETH', 0)));
+
+    expect(mockSetParams).toHaveBeenCalledWith({
+      market: { symbol: 'ETH' },
+      source: PERPS_EVENT_VALUE.SOURCE.POSITION_TAB,
+      source_section: PERPS_EVENT_VALUE.SOURCE_SECTION.ORDERS,
+      direction: undefined,
+    });
+  });
+
+  it('seeds the order form with the direction carried by the route', () => {
+    mockRouteParams = {
+      market: {
+        symbol: 'BTC',
+        price: '$90,000.00',
+        name: 'Bitcoin',
+        maxLeverage: '40x',
+      },
+      direction: 'short',
+    };
+
+    renderView();
+
+    expect(mockOrderProviderProps).toHaveBeenCalledWith(
+      expect.objectContaining({
+        initialAsset: 'BTC',
+        initialDirection: 'short',
+      }),
+    );
+  });
+
+  it('drops the entry-point direction when switching markets so the form does not reopen on the previous side', () => {
+    // `setParams` merges, so a `direction` left over from a token-details
+    // Long/Short would reseed the remounted order form for the new market.
+    mockRouteParams = {
+      market: {
+        symbol: 'BTC',
+        price: '$90,000.00',
+        name: 'Bitcoin',
+        maxLeverage: '40x',
+      },
+      direction: 'long',
+    };
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [ethPosition],
+      isInitialLoading: false,
+    });
+
+    const { getByTestId } = renderView();
+
+    fireEvent.press(getByTestId(getPerpsProPositionRowSelector('ETH')));
+
+    // `direction` must be present and undefined: omitting the key would leave
+    // the previous side in place, since setParams merges rather than replaces.
+    const nextParams = mockSetParams.mock.calls[0][0];
+    expect(nextParams).toHaveProperty('market', { symbol: 'ETH' });
+    expect(nextParams).toHaveProperty('direction', undefined);
+  });
+
+  it('ignores a row tap for the market already being displayed', () => {
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [{ ...ethPosition, symbol: 'BTC' }],
+      isInitialLoading: false,
+    });
+
+    const { getByTestId } = renderView();
+
+    fireEvent.press(getByTestId(getPerpsProPositionRowSelector('BTC')));
+
+    expect(mockSetParams).not.toHaveBeenCalled();
+  });
+
+  it('scrolls to the top when the active market symbol changes', () => {
+    const scrollToSpy = jest.spyOn(
+      jest.requireActual('react-native').ScrollView.prototype,
+      'scrollTo',
+    );
+
+    const { rerender } = renderView();
+    scrollToSpy.mockClear();
+
+    mockRouteParams = {
+      market: {
+        symbol: 'ETH',
+        price: '$3,000.00',
+        name: 'Ethereum',
+        maxLeverage: '25x',
+      },
+    };
+    rerender(<PerpsProMarketView />);
+
+    expect(scrollToSpy).toHaveBeenCalledWith({ y: 0, animated: false });
   });
 
   it.each([
@@ -231,15 +580,6 @@ describe('PerpsProMarketView', () => {
     },
   );
 
-  it('renders the screen inside every safe-area edge', () => {
-    const { getByTestId } = renderView();
-
-    expect(getByTestId(PerpsProMarketViewSelectorsIDs.CONTAINER)).toHaveProp(
-      'edges',
-      ['top', 'bottom', 'left', 'right'],
-    );
-  });
-
   it('tracks an attributed Pro market screen view', () => {
     renderView();
 
@@ -282,9 +622,6 @@ describe('PerpsProMarketView', () => {
     expect(
       getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_FORM_PANEL),
     ).toBeOnTheScreen();
-    expect(
-      getByTestId(PerpsProOrderFormSelectorsIDs.CONTAINER),
-    ).toBeOnTheScreen();
     expect(
       getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_BOOK_PANEL),
     ).toBeOnTheScreen();
@@ -306,26 +643,6 @@ describe('PerpsProMarketView', () => {
     );
   });
 
-  it('keeps the fixture Place Order action disabled until wiring lands', () => {
-    const { getByTestId } = renderView();
-
-    expect(
-      getByTestId(PerpsProOrderFormSelectorsIDs.PLACE_ORDER_BUTTON),
-    ).toBeDisabled();
-  });
-
-  it('opens the order type sheet from the form', () => {
-    const { getByTestId } = renderView();
-
-    fireEvent.press(
-      getByTestId(PerpsProOrderFormSelectorsIDs.ORDER_TYPE_BUTTON),
-    );
-
-    expect(
-      getByTestId(PerpsOrderTypeBottomSheetSelectorsIDs.CONTAINER),
-    ).toBeOnTheScreen();
-  });
-
   it('opens the More candle periods sheet from the chart', () => {
     const { getByTestId } = renderView();
 
@@ -372,83 +689,6 @@ describe('PerpsProMarketView', () => {
     ).not.toBeOnTheScreen();
   });
 
-  it('updates the form to Market and closes the order type sheet', () => {
-    const { getByTestId, queryByTestId } = renderView();
-    fireEvent.press(
-      getByTestId(PerpsProOrderFormSelectorsIDs.ORDER_TYPE_BUTTON),
-    );
-
-    fireEvent.press(
-      getByTestId(PerpsOrderTypeBottomSheetSelectorsIDs.MARKET_OPTION),
-    );
-
-    expect(
-      getByTestId(PerpsProOrderFormSelectorsIDs.ORDER_TYPE_BUTTON),
-    ).toHaveTextContent('Market');
-    expect(
-      queryByTestId(PerpsProOrderFormSelectorsIDs.LIMIT_PRICE_INPUT),
-    ).not.toBeOnTheScreen();
-    expect(
-      queryByTestId(PerpsOrderTypeBottomSheetSelectorsIDs.CONTAINER),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('restores the limit price input when Limit is selected', () => {
-    const { getByTestId, queryByTestId } = renderView();
-    fireEvent.press(
-      getByTestId(PerpsProOrderFormSelectorsIDs.ORDER_TYPE_BUTTON),
-    );
-    fireEvent.press(
-      getByTestId(PerpsOrderTypeBottomSheetSelectorsIDs.MARKET_OPTION),
-    );
-    fireEvent.press(
-      getByTestId(PerpsProOrderFormSelectorsIDs.ORDER_TYPE_BUTTON),
-    );
-
-    fireEvent.press(
-      getByTestId(PerpsOrderTypeBottomSheetSelectorsIDs.LIMIT_OPTION),
-    );
-
-    expect(
-      getByTestId(PerpsProOrderFormSelectorsIDs.LIMIT_PRICE_INPUT),
-    ).toBeOnTheScreen();
-    expect(
-      queryByTestId(PerpsOrderTypeBottomSheetSelectorsIDs.CONTAINER),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('closes the order type sheet without changing the current selection', () => {
-    const { getByTestId, queryByTestId } = renderView();
-    fireEvent.press(
-      getByTestId(PerpsProOrderFormSelectorsIDs.ORDER_TYPE_BUTTON),
-    );
-
-    fireEvent.press(
-      getByTestId(PerpsOrderTypeBottomSheetSelectorsIDs.CLOSE_BUTTON),
-    );
-
-    expect(
-      getByTestId(PerpsProOrderFormSelectorsIDs.ORDER_TYPE_BUTTON),
-    ).toHaveTextContent('Limit');
-    expect(
-      getByTestId(PerpsProOrderFormSelectorsIDs.LIMIT_PRICE_INPUT),
-    ).toBeOnTheScreen();
-    expect(
-      queryByTestId(PerpsOrderTypeBottomSheetSelectorsIDs.CONTAINER),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('renders the Pro summary and available balance copy from Figma', () => {
-    const { getByTestId } = renderView();
-
-    expect(
-      getByTestId(PerpsProOrderFormSelectorsIDs.SUMMARY_LIQUIDATION),
-    ).toHaveTextContent(/Est Liquidation/);
-    expect(
-      getByTestId(PerpsProOrderFormSelectorsIDs.AVAILABLE_BALANCE),
-    ).toHaveTextContent('-- available');
-  });
-
   it('keeps the header fixed while the market summary scrolls', () => {
     const { getByTestId } = renderView();
 
@@ -482,6 +722,31 @@ describe('PerpsProMarketView', () => {
     ).toHaveTextContent(/^TSLA$/);
   });
 
+  it('enriches minimal route market data with maxLeverage from usePerpsMarkets', () => {
+    // Some navigation sources (e.g. Recent Activity, deep links) pass
+    // minimal market data without a formatted `maxLeverage`.
+    mockRouteParams = { market: { symbol: 'BTC', name: 'Bitcoin' } };
+    mockUsePerpsMarketsImpl.mockReturnValue({
+      markets: [{ symbol: 'BTC', maxLeverage: '40x' }],
+      isLoading: false,
+      error: null,
+      refresh: jest.fn(),
+      isRefreshing: false,
+    });
+
+    const { getByText } = renderView();
+
+    expect(getByText('40x')).toBeOnTheScreen();
+  });
+
+  it('does not re-fetch markets when route data already has a formatted maxLeverage', () => {
+    renderView();
+
+    expect(mockUsePerpsMarketsImpl).toHaveBeenCalledWith(
+      expect.objectContaining({ skipInitialFetch: true }),
+    );
+  });
+
   it('renders the redesigned header controls from Figma', () => {
     const { getByTestId } = renderView();
 
@@ -519,19 +784,37 @@ describe('PerpsProMarketView', () => {
     fireEvent.press(
       getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_MARKET_LIST_BUTTON),
     );
-    fireEvent.press(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_WALLET_BUTTON),
-    );
     fireEvent.press(
       getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_FAVORITE_BUTTON),
     );
 
     expect(mockHandleBackPress).toHaveBeenCalledTimes(1);
     expect(mockHandleMarketListPress).toHaveBeenCalledTimes(1);
-    expect(mockHandleWalletPress).toHaveBeenCalledTimes(1);
     expect(mockHandleFavoritePress).toHaveBeenCalledTimes(1);
   });
 
+  it('opens and closes the balance bottom sheet from the wallet button', () => {
+    const { getByTestId, queryByTestId } = renderView();
+
+    expect(
+      queryByTestId(PerpsBalanceBottomSheetSelectorsIDs.CONTAINER),
+    ).not.toBeOnTheScreen();
+
+    fireEvent.press(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_WALLET_BUTTON),
+    );
+
+    expect(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+
+    fireEvent.press(getByTestId('mock-balance-sheet-close'));
+
+    expect(
+      queryByTestId(PerpsBalanceBottomSheetSelectorsIDs.CONTAINER),
+    ).not.toBeOnTheScreen();
+  });
+
   it('uses the Figma shell heights', () => {
     const { getByTestId } = renderView();
 
@@ -571,4 +854,52 @@ describe('PerpsProMarketView', () => {
       getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_BOOK_PANEL),
     ).toBeOnTheScreen();
   });
+
+  it('fills the order form with a limit order when an order-book row is tapped', () => {
+    // Both panels sit inside a single PerpsOrderProvider so a bid/ask row tap
+    // can reach the order form's shared setters (TAT-3643).
+    const liveBook: OrderBookData = {
+      bids: [
+        {
+          price: '89950',
+          size: '1.5',
+          total: '1.5',
+          notional: '134925',
+          totalNotional: '134925',
+        },
+      ],
+      asks: [
+        {
+          price: '90050',
+          size: '1.2',
+          total: '1.2',
+          notional: '108060',
+          totalNotional: '108060',
+        },
+      ],
+      spread: '100',
+      spreadPercentage: '0.11',
+      midPrice: '90000',
+      lastUpdated: 1700000000000,
+      maxTotal: '1.5',
+    };
+    mockUsePerpsLiveOrderBook.mockImplementation(() => ({
+      orderBook: liveBook,
+      isLoading: false,
+      error: null,
+      connectionStatus: 'connected',
+      reconnect: jest.fn(),
+    }));
+
+    const { getByTestId } = renderView();
+
+    fireEvent.press(
+      getByTestId(
+        `${PerpsProMarketViewSelectorsIDs.ORDER_BOOK_PANEL}-bid-row-0`,
+      ),
+    );
+
+    expect(mockSetOrderType).toHaveBeenCalledWith('limit');
+    expect(mockSetLimitPrice).toHaveBeenCalledWith('89950');
+  });
 });
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView.tsx
index 554c84bd55b6..ab096b0f24cc 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView.tsx
@@ -4,31 +4,48 @@ import {
   Text,
   TextColor,
   TextVariant,
+  useHeaderStandardAnimated,
 } from '@metamask/design-system-react-native';
-import {
-  TimeDuration,
-  getPerpsDisplaySymbol,
-  type OrderType,
-} from '@metamask/perps-controller';
+import { TimeDuration, type PerpsMarketData } from '@metamask/perps-controller';
 import {
   PERPS_EVENT_PROPERTY,
   PERPS_EVENT_VALUE,
 } from '@metamask/perps-controller/constants';
-import { useRoute, type RouteProp } from '@react-navigation/native';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { ScrollView } from 'react-native';
+import { AnimationDuration } from '@metamask/design-tokens';
+import {
+  useNavigation,
+  useRoute,
+  type NavigationProp,
+  type RouteProp,
+} from '@react-navigation/native';
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import { useSelector } from 'react-redux';
-import { SafeAreaView } from 'react-native-safe-area-context';
+import { View, type ScrollView } from 'react-native';
+import Animated, { LinearTransition } from 'react-native-reanimated';
 import { strings } from '../../../../../../locales/i18n';
 import { useStyles } from '../../../../../component-library/hooks';
+import Routes from '../../../../../constants/navigation/Routes';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
 import { PerpsProMarketViewSelectorsIDs } from '../../Perps.testIds';
+import PerpsBalanceBottomSheet from '../../components/PerpsBalanceBottomSheet';
 import PerpsCandlePeriodBottomSheet from '../../components/PerpsCandlePeriodBottomSheet';
-import PerpsOrderTypeBottomSheetView from '../../components/PerpsOrderTypeBottomSheet/PerpsOrderTypeBottomSheetView';
 import PerpsProMarketStatsBar from '../../components/PerpsProMarketStatsBar';
+import { usePerpsMarketData } from '../../hooks';
 import { usePerpsChartInteractions } from '../../hooks/usePerpsChartInteractions';
 import { usePerpsEventTracking } from '../../hooks/usePerpsEventTracking';
-import { usePerpsProMarketHeaderActions } from '../../hooks/usePerpsProMarketHeaderActions';
+import { usePerpsMarkets } from '../../hooks/usePerpsMarkets';
+import { usePerpsMarketHeaderActions } from '../../hooks/usePerpsMarketHeaderActions';
+import {
+  PerpsOrderProvider,
+  usePerpsOrderContext,
+} from '../../contexts/PerpsOrderContext';
 import { selectPerpsChartPreferredCandlePeriod } from '../../selectors/chartPreferences';
 import { selectPerpsAdvancedChartEnabledFlag } from '../../selectors/featureFlags';
 import type { PerpsStackParamList } from '../../types/navigation';
@@ -37,13 +54,62 @@ import {
   getPerpsChartLibrary,
 } from '../../utils/chartAnalytics';
 import PerpsProChartPanel from './components/PerpsProChartPanel';
-import PerpsProMarketHeader from './components/PerpsProMarketHeader';
+import PerpsMarketHeader, {
+  createProMarketHeaderTestIDs,
+} from '../../components/PerpsMarketHeader';
+import { PRICE_SECTION_HEIGHT } from '../../components/PerpsMarketSummary';
 import PerpsProMarketLayout from './components/PerpsProMarketLayout';
 import PerpsProOrderBookPanel from './components/PerpsProOrderBookPanel';
 import PerpsProOrderFormPanel from './components/PerpsProOrderFormPanel';
 import PerpsProPositionsPanel from './components/PerpsProPositionsPanel';
 import { createStyles } from './PerpsProMarketView.styles';
 
+interface PerpsProOrderBookColumnProps {
+  symbol: string;
+  marketPrice?: number;
+  onCollapse: () => void;
+}
+
+/**
+ * Order-book column bridged to the shared order-form state (TAT-3643).
+ *
+ * Rendered inside `PerpsOrderProvider` (owned by `PerpsProMarketView`) so a
+ * bid/ask row tap can flip the form to a Limit order and prefill the tapped
+ * price — the two setters live in `PerpsOrderContext`, which the sibling order
+ * book cannot otherwise reach. Wiring both at once has no existing analog
+ * (`onUseMidPricePress` only sets price and assumes the form is already Limit).
+ */
+const PerpsProOrderBookColumn = ({
+  symbol,
+  marketPrice,
+  onCollapse,
+}: PerpsProOrderBookColumnProps) => {
+  const { setLimitPrice, setOrderType } = usePerpsOrderContext();
+  // Drives the ladder's price precision and base-size decimals — without it
+  // every price falls back to magnitude-based formatting.
+  const { marketData } = usePerpsMarketData({ asset: symbol });
+
+  const handleSelectPrice = useCallback(
+    (price: string) => {
+      // Force Limit first (no-op when already Limit) so the prefilled price is
+      // always shown in the limit-price input, regardless of the prior type.
+      setOrderType('limit');
+      setLimitPrice(price);
+    },
+    [setOrderType, setLimitPrice],
+  );
+
+  return (
+    <PerpsProOrderBookPanel
+      symbol={symbol}
+      marketPrice={marketPrice}
+      szDecimals={marketData?.szDecimals}
+      onCollapse={onCollapse}
+      onSelectPrice={handleSelectPrice}
+    />
+  );
+};
+
 /**
  * Pro-mode replacement for `PerpsMarketDetailsView`.
  *
@@ -55,12 +121,70 @@ import { createStyles } from './PerpsProMarketView.styles';
  */
 const PerpsProMarketView = () => {
   const { styles } = useStyles(createStyles, {});
+  const navigation =
+    useNavigation<NavigationProp<PerpsStackParamList, 'PerpsMarketDetails'>>();
   const route =
     useRoute<RouteProp<PerpsStackParamList, 'PerpsMarketDetails'>>();
-  const market = route.params?.market;
+  const routeMarket = route.params?.market;
   const source = route.params?.source;
   const sourceSection = route.params?.source_section;
+  // Set by entry points that already carry a trade intent (e.g. spot token
+  // details Long/Short), so the inline form opens on the right side.
+  const initialDirection = route.params?.direction;
+
+  // Some navigation sources (e.g. Recent Activity, deep links) pass minimal
+  // market data without `maxLeverage` — fetch the full markets list to
+  // enrich it, same as PerpsMarketDetailsView (Lite). Skipped entirely once
+  // the route already has a properly formatted value (e.g. "40x").
+  const hasFormattedMaxLeverage =
+    typeof routeMarket?.maxLeverage === 'string' &&
+    routeMarket.maxLeverage.endsWith('x');
+  const { markets } = usePerpsMarkets({
+    skipInitialFetch: hasFormattedMaxLeverage,
+  });
+  const market = useMemo(() => {
+    if (hasFormattedMaxLeverage) return routeMarket;
+    const fullMarket = markets.find((m) => m.symbol === routeMarket?.symbol);
+    return fullMarket || routeMarket;
+  }, [hasFormattedMaxLeverage, markets, routeMarket]);
   const [isOrderBookCollapsed, setIsOrderBookCollapsed] = useState(false);
+  const scrollViewRef = useRef<ScrollView>(null);
+
+  // Swapping the route param rather than pushing keeps a single Pro screen on
+  // the stack, so tapping through positions/orders doesn't build up history.
+  const handleSelectMarket = useCallback(
+    (
+      nextMarket: PerpsMarketData | Partial<PerpsMarketData>,
+      panelSourceSection:
+        | typeof PERPS_EVENT_VALUE.SOURCE_SECTION.POSITIONS
+        | typeof PERPS_EVENT_VALUE.SOURCE_SECTION.ORDERS,
+    ) => {
+      if (!nextMarket.symbol || nextMarket.symbol === routeMarket?.symbol) {
+        return;
+      }
+
+      // POSITION_TAB is the panel-level source; source_section distinguishes
+      // which tab the row came from (same pattern as Perps home).
+      // `direction` is cleared because `setParams` merges: the side belongs to
+      // the entry point that opened this screen, and keeping it would reseed
+      // the remounted order form with the previous market's trade intent.
+      navigation.setParams({
+        market: nextMarket,
+        source: PERPS_EVENT_VALUE.SOURCE.POSITION_TAB,
+        source_section: panelSourceSection,
+        direction: undefined,
+      });
+    },
+    [navigation, routeMarket?.symbol],
+  );
+
+  // Bring the chart back into view when the active market changes (e.g. the
+  // user tapped a positions/orders row while scrolled down). Matches Lite's
+  // related-markets behaviour in PerpsMarketDetailsView, including
+  // `animated: false` so a near-top scroll doesn't flash an animation.
+  useEffect(() => {
+    scrollViewRef.current?.scrollTo({ y: 0, animated: false });
+  }, [market?.symbol]);
 
   const handleCollapseOrderBook = useCallback(() => {
     setIsOrderBookCollapsed(true);
@@ -70,6 +194,15 @@ const PerpsProMarketView = () => {
     setIsOrderBookCollapsed(false);
   }, []);
 
+  // Drives the header's subtitle/live-price crossfade (see
+  // PerpsProMarketHeader). The price section above the fold has a fixed
+  // height, so the threshold is set once instead of measured via onLayout.
+  const { scrollY, onScroll, titleSectionHeightSv, setTitleSectionHeight } =
+    useHeaderStandardAnimated();
+  useEffect(() => {
+    setTitleSectionHeight(PRICE_SECTION_HEIGHT);
+  }, [setTitleSectionHeight]);
+
   const selectedCandlePeriod = useSelector(
     selectPerpsChartPreferredCandlePeriod,
   );
@@ -83,20 +216,22 @@ const PerpsProMarketView = () => {
   const [isMoreCandlePeriodsVisible, setIsMoreCandlePeriodsVisible] =
     useState(false);
 
-  const [orderType, setOrderType] = useState<OrderType>('limit');
-  const [isOrderTypeSheetVisible, setIsOrderTypeSheetVisible] = useState(false);
+  const [isBalanceSheetVisible, setIsBalanceSheetVisible] = useState(false);
 
-  const handleOrderTypeButtonPress = useCallback(() => {
-    setIsOrderTypeSheetVisible(true);
+  const handleWalletPress = useCallback(() => {
+    setIsBalanceSheetVisible(true);
   }, []);
 
-  const handleOrderTypeSheetClose = useCallback(() => {
-    setIsOrderTypeSheetVisible(false);
-  }, []);
+  const appNavigation = useNavigation<AppNavigationProp>();
 
-  const handleOrderTypeSelect = useCallback((newOrderType: OrderType) => {
-    setOrderType(newOrderType);
-    setIsOrderTypeSheetVisible(false);
+  const handleHistoryPress = useCallback(() => {
+    appNavigation.navigate(Routes.PERPS.ACTIVITY, {
+      redirectToPerpsTransactions: true,
+    });
+  }, [appNavigation]);
+
+  const handleBalanceSheetClose = useCallback(() => {
+    setIsBalanceSheetVisible(false);
   }, []);
 
   useEffect(() => {
@@ -148,17 +283,13 @@ const PerpsProMarketView = () => {
     isWatchlist,
     handleBackPress,
     handleMarketListPress,
-    handleWalletPress,
     handleFavoritePress,
     handlePerpsModeChange,
-  } = usePerpsProMarketHeaderActions({ symbol: market?.symbol });
+  } = usePerpsMarketHeaderActions({ symbol: market?.symbol });
 
   if (!market?.symbol) {
     return (
-      <SafeAreaView
-        style={styles.container}
-        edges={['top', 'bottom', 'left', 'right']}
-      >
+      <View style={styles.container}>
         <Box
           twClassName="flex-1 items-center justify-center px-4"
           testID={PerpsProMarketViewSelectorsIDs.ERROR}
@@ -167,11 +298,10 @@ const PerpsProMarketView = () => {
             {strings('perps.market.details.error_message')}
           </Text>
         </Box>
-      </SafeAreaView>
+      </View>
     );
   }
 
-  const symbol = getPerpsDisplaySymbol(market.symbol);
   const marketPrice = (() => {
     if (!market.price) {
       return undefined;
@@ -182,13 +312,13 @@ const PerpsProMarketView = () => {
   })();
 
   return (
-    <SafeAreaView
+    <View
       style={styles.container}
-      edges={['top', 'bottom', 'left', 'right']}
       testID={PerpsProMarketViewSelectorsIDs.CONTAINER}
     >
-      <PerpsProMarketHeader
+      <PerpsMarketHeader
         market={{ ...market, symbol: market.symbol }}
+        testIDs={createProMarketHeaderTestIDs()}
         mode={perpsMode}
         onBackPress={handleBackPress}
         onIdentityPress={handleMarketListPress}
@@ -196,14 +326,19 @@ const PerpsProMarketView = () => {
         onFavoritePress={handleFavoritePress}
         isFavorite={isWatchlist}
         onModeChange={handlePerpsModeChange}
+        scrollY={scrollY}
+        priceSectionHeight={titleSectionHeightSv}
       />
-      <ScrollView
+      <Animated.ScrollView
+        ref={scrollViewRef}
         style={styles.scrollView}
         contentContainerStyle={styles.scrollContent}
         testID={PerpsProMarketViewSelectorsIDs.SCROLL_VIEW}
         showsVerticalScrollIndicator={false}
         keyboardDismissMode="interactive"
         keyboardShouldPersistTaps="handled"
+        onScroll={onScroll}
+        scrollEventThrottle={16}
       >
         <PerpsProChartPanel
           symbol={market.symbol}
@@ -214,31 +349,59 @@ const PerpsProMarketView = () => {
           onMorePress={() => setIsMoreCandlePeriodsVisible(true)}
           onChartError={handleChartError}
         />
-        <PerpsProMarketStatsBar
-          symbol={market.symbol}
-          nextFundingTime={market.nextFundingTime}
-          fundingIntervalHours={market.fundingIntervalHours}
-        />
-        <PerpsProMarketLayout
-          isOrderBookCollapsed={isOrderBookCollapsed}
-          onExpandOrderBook={handleExpandOrderBook}
-          orderForm={
-            <PerpsProOrderFormPanel
-              orderType={orderType}
-              onOrderTypeButtonPress={handleOrderTypeButtonPress}
-            />
-          }
-          orderBook={
-            <PerpsProOrderBookPanel
-              symbol={market.symbol}
-              marketPrice={marketPrice}
-              onCollapse={handleCollapseOrderBook}
+        {/* The chart's own height (`PerpsProChartPanel`) animates when
+            expanded/collapsed above this point — wrap everything that would
+            otherwise jump when that happens so it slides into place. */}
+        <Animated.View
+          layout={LinearTransition.duration(AnimationDuration.Fast)}
+        >
+          <PerpsProMarketStatsBar
+            symbol={market.symbol}
+            nextFundingTime={market.nextFundingTime}
+            fundingIntervalHours={market.fundingIntervalHours}
+          />
+          {/* Provider wraps BOTH columns (not just the form) so an order-book
+              row tap can drive the form's Limit price / order type via shared
+              context (TAT-3643). Keyed by symbol so form state resets when the
+              market changes. */}
+          <PerpsOrderProvider
+            key={market.symbol}
+            initialAsset={market.symbol}
+            initialDirection={initialDirection}
+            initialType="market"
+            fallbackAmount=""
+          >
+            <PerpsProMarketLayout
+              isOrderBookCollapsed={isOrderBookCollapsed}
+              orderForm={
+                // PerpsMarketDetails accepts PerpsMarketData | Partial<PerpsMarketData>
+                // to support deep-link trade-detail entries that may only carry
+                // partial data. PerpsProMarketView is only reachable via full-market
+                // navigation; the !market?.symbol guard above validates the minimum
+                // required field at runtime.
+                <PerpsProOrderFormPanel
+                  market={market as PerpsMarketData}
+                  isOrderBookCollapsed={isOrderBookCollapsed}
+                  onExpandOrderBook={handleExpandOrderBook}
+                />
+              }
+              orderBook={
+                <PerpsProOrderBookColumn
+                  symbol={market.symbol}
+                  marketPrice={marketPrice}
+                  onCollapse={handleCollapseOrderBook}
+                />
+              }
             />
-          }
-        />
-        <SectionDivider />
-        <PerpsProPositionsPanel symbol={symbol} />
-      </ScrollView>
+          </PerpsOrderProvider>
+          <SectionDivider marginVertical={0} />
+          <PerpsProPositionsPanel
+            symbol={market.symbol}
+            onSelectMarket={handleSelectMarket}
+            onHistoryPress={handleHistoryPress}
+          />
+        </Animated.View>
+      </Animated.ScrollView>
       <PerpsCandlePeriodBottomSheet
         isVisible={isMoreCandlePeriodsVisible}
         onClose={() => setIsMoreCandlePeriodsVisible(false)}
@@ -249,15 +412,11 @@ const PerpsProMarketView = () => {
         asset={market.symbol}
         testID={PerpsProMarketViewSelectorsIDs.CHART_MORE_PERIODS_SHEET}
       />
-      <PerpsOrderTypeBottomSheetView
-        isVisible={isOrderTypeSheetVisible}
-        onClose={handleOrderTypeSheetClose}
-        onSelect={handleOrderTypeSelect}
-        currentOrderType={orderType}
-        title={strings('perps.pro_order_form.choose_order_type')}
-        showSelectedIcon
+      <PerpsBalanceBottomSheet
+        isVisible={isBalanceSheetVisible}
+        onClose={handleBalanceSheetClose}
       />
-    </SafeAreaView>
+    </View>
   );
 };
 
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView.view.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView.view.test.tsx
new file mode 100644
index 000000000000..d9d6d2a8ebac
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView.view.test.tsx
@@ -0,0 +1,198 @@
+import '../../../../../../tests/component-view/mocks';
+
+import {
+  cleanup,
+  fireEvent,
+  screen,
+  waitFor,
+} from '@testing-library/react-native';
+import { renderPerpsProMarketView } from '../../../../../../tests/component-view/renderers/perpsViewRenderer';
+import {
+  describeForPlatforms,
+  itForPlatforms,
+} from '../../../../../../tests/component-view/platform';
+import {
+  createFundedAccountForViews,
+  createLongPositionForViews,
+} from '../../../../../../tests/component-view/fixtures/perpsViewFixtures';
+import { strings } from '../../../../../../locales/i18n';
+import {
+  PerpsOrderTypeBottomSheetSelectorsIDs,
+  PerpsProOrderFormSelectorsIDs,
+} from '../../Perps.testIds';
+
+const ids = PerpsProOrderFormSelectorsIDs;
+const TIMEOUT_MS = 5000;
+
+const renderFundedProMarket = () =>
+  renderPerpsProMarketView({
+    streamOverrides: {
+      account: createFundedAccountForViews('1000'),
+    },
+  });
+
+const findSizeInput = () =>
+  screen.findByTestId(ids.SIZE_INPUT, {}, { timeout: TIMEOUT_MS });
+
+describeForPlatforms('PerpsProMarketView input journeys', () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  itForPlatforms(
+    'supports size backspace and retype, then removes limit-price leading zeros',
+    async () => {
+      renderFundedProMarket();
+      const sizeInput = await findSizeInput();
+
+      fireEvent(sizeInput, 'focus');
+      fireEvent.changeText(sizeInput, '1');
+      await waitFor(() => expect(sizeInput).toHaveProp('value', '1'));
+      fireEvent.changeText(sizeInput, '');
+      await waitFor(() => expect(sizeInput).toHaveProp('value', ''));
+      fireEvent.changeText(sizeInput, '2');
+
+      await waitFor(() => expect(sizeInput).toHaveProp('value', '2'));
+      fireEvent.press(screen.getByTestId(ids.ORDER_TYPE_BUTTON));
+      fireEvent.press(
+        await screen.findByTestId(
+          PerpsOrderTypeBottomSheetSelectorsIDs.LIMIT_OPTION,
+          {},
+          { timeout: TIMEOUT_MS },
+        ),
+      );
+      const limitPriceInput = await screen.findByTestId(ids.LIMIT_PRICE_INPUT);
+      fireEvent.changeText(limitPriceInput, '00025');
+
+      await waitFor(() => expect(limitPriceInput).toHaveProp('value', '25'));
+    },
+  );
+
+  itForPlatforms(
+    'keeps the size stable while toggling between USD and the asset',
+    async () => {
+      renderFundedProMarket();
+      const sizeInput = await findSizeInput();
+      const unitButton = screen.getByTestId(ids.SIZE_UNIT_BUTTON);
+
+      fireEvent.changeText(sizeInput, '100');
+      await waitFor(() => expect(sizeInput).toHaveProp('value', '100'));
+      fireEvent.press(unitButton);
+
+      await waitFor(() => {
+        expect(sizeInput).toHaveProp('value', '0.04');
+        expect(screen.getByTestId(ids.SIZE_UNIT_LABEL)).toHaveTextContent(
+          'Size (ETH)',
+        );
+      });
+      fireEvent.press(unitButton);
+
+      await waitFor(() => {
+        expect(sizeInput).toHaveProp('value', '100');
+        expect(screen.getByTestId(ids.SIZE_UNIT_LABEL)).toHaveTextContent(
+          'Size (USD)',
+        );
+      });
+    },
+  );
+
+  itForPlatforms(
+    'previews slider sizing live and keeps it after drag-end commit',
+    async () => {
+      renderFundedProMarket();
+      const sizeInput = await findSizeInput();
+      const slider = screen.getByTestId(ids.SIZE_SLIDER);
+      const initialValue = sizeInput.props.value;
+
+      fireEvent(slider, 'valueChange', 50);
+
+      await waitFor(() => {
+        expect(sizeInput.props.value).not.toBe(initialValue);
+        expect(Number(sizeInput.props.value)).toBeGreaterThan(0);
+      });
+      const previewValue = sizeInput.props.value;
+      fireEvent(slider, 'dragEnd', 50);
+
+      await waitFor(() => expect(sizeInput).toHaveProp('value', previewValue));
+    },
+  );
+
+  itForPlatforms(
+    'blocks reduce-only orders when there is no open position',
+    async () => {
+      renderPerpsProMarketView({
+        streamOverrides: {
+          account: createFundedAccountForViews('1000'),
+          positions: [],
+          orders: [],
+        },
+      });
+      await findSizeInput();
+
+      fireEvent.press(screen.getByTestId(ids.REDUCE_ONLY));
+
+      await waitFor(() => {
+        expect(
+          screen.getByTestId(`${ids.NOTICE}-reduce-only`),
+        ).toHaveTextContent(
+          strings('perps.order.validation.reduce_only_no_position'),
+        );
+        expect(screen.getByTestId(ids.PLACE_ORDER_BUTTON)).toBeDisabled();
+        expect(screen.queryByTestId(ids.TPSL)).not.toBeOnTheScreen();
+      });
+    },
+  );
+
+  itForPlatforms(
+    'blocks reduce-only orders that match the open position direction',
+    async () => {
+      renderPerpsProMarketView({
+        streamOverrides: {
+          account: createFundedAccountForViews('1000'),
+          positions: [createLongPositionForViews()],
+          orders: [],
+        },
+      });
+      await findSizeInput();
+
+      fireEvent.press(screen.getByTestId(ids.REDUCE_ONLY));
+
+      await waitFor(() => {
+        expect(
+          screen.getByTestId(`${ids.NOTICE}-reduce-only`),
+        ).toHaveTextContent(
+          strings('perps.order.validation.reduce_only_wrong_side'),
+        );
+        expect(screen.getByTestId(ids.PLACE_ORDER_BUTTON)).toBeDisabled();
+        expect(screen.queryByTestId(ids.TPSL)).not.toBeOnTheScreen();
+      });
+    },
+  );
+
+  itForPlatforms(
+    'blocks reduce-only orders when size exceeds the open position',
+    async () => {
+      renderPerpsProMarketView({
+        streamOverrides: {
+          account: createFundedAccountForViews('100000'),
+          positions: [createLongPositionForViews({ size: '-1' })],
+          orders: [],
+        },
+      });
+      const sizeInput = await findSizeInput();
+
+      fireEvent.press(screen.getByTestId(ids.REDUCE_ONLY));
+      fireEvent.changeText(sizeInput, '3000');
+
+      await waitFor(() => {
+        expect(
+          screen.getByTestId(`${ids.NOTICE}-reduce-only`),
+        ).toHaveTextContent(
+          strings('perps.order.validation.reduce_only_too_large'),
+        );
+        expect(screen.getByTestId(ids.PLACE_ORDER_BUTTON)).toBeDisabled();
+        expect(screen.queryByTestId(ids.TPSL)).not.toBeOnTheScreen();
+      });
+    },
+  );
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProChartPanel.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProChartPanel.tsx
index 3da5a092768f..be7bd603c7c3 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProChartPanel.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProChartPanel.tsx
@@ -14,6 +14,7 @@ import {
   PERPS_EVENT_PROPERTY,
   PERPS_EVENT_VALUE,
 } from '@metamask/perps-controller/constants';
+import { AnimationDuration } from '@metamask/design-tokens';
 import React, {
   useCallback,
   useEffect,
@@ -21,6 +22,7 @@ import React, {
   useRef,
   useState,
 } from 'react';
+import Animated, { FadeIn, FadeOut } from 'react-native-reanimated';
 import { strings } from '../../../../../../../locales/i18n';
 import { MetaMetricsEvents } from '../../../../../../core/Analytics';
 import { Skeleton } from '../../../../../../component-library/components-temp/Skeleton';
@@ -46,7 +48,7 @@ import TradingViewChart, {
   type OhlcData,
   type TradingViewChartRef,
 } from '../../../components/TradingViewChart';
-import PerpsProMarketSummary from './PerpsProMarketSummary';
+import PerpsMarketSummary from '../../../components/PerpsMarketSummary';
 
 const PRO_CHART_HEIGHT = 288;
 /**
@@ -245,13 +247,16 @@ const PerpsProChartPanel = ({
 
   return (
     <>
-      <PerpsProMarketSummary
+      <PerpsMarketSummary
         symbol={symbol}
         currentPrice={syncedChartCurrentPrice}
+        testID={PerpsProMarketViewSelectorsIDs.MARKET_SUMMARY}
+        testIDPrice={PerpsProMarketViewSelectorsIDs.MARKET_PRICE}
+        testIDChange={PerpsProMarketViewSelectorsIDs.MARKET_PRICE_CHANGE}
         endAccessory={
           <ButtonIcon
             iconName={IconName.Candlestick}
-            size={ButtonIconSize.Lg}
+            size={ButtonIconSize.Md}
             variant={ButtonIconVariant.Filled}
             onPress={() => handleToggleChartExpanded(!isChartExpanded)}
             testID={PerpsProMarketViewSelectorsIDs.CHART_TOGGLE_BUTTON}
@@ -265,63 +270,70 @@ const PerpsProChartPanel = ({
         }
       />
       {isChartExpanded ? (
-        <Box
-          testID={PerpsProMarketViewSelectorsIDs.CHART_PANEL}
-          twClassName="my-2 h-[344px] px-4 py-2"
+        <Animated.View
+          entering={FadeIn.duration(AnimationDuration.Fast)}
+          exiting={FadeOut.duration(AnimationDuration.Fast)}
         >
           <Box
-            testID={PerpsProMarketViewSelectorsIDs.CHART_CONTENT}
-            twClassName="flex-1 gap-2"
+            testID={PerpsProMarketViewSelectorsIDs.CHART_PANEL}
+            twClassName="my-2 h-[344px] px-2 py-2"
           >
             <Box
-              flexDirection={BoxFlexDirection.Row}
-              alignItems={BoxAlignItems.Center}
+              testID={PerpsProMarketViewSelectorsIDs.CHART_CONTENT}
+              twClassName="flex-1 gap-2"
             >
-              <PerpsCandlePeriodSelector
-                selectedPeriod={selectedCandlePeriod}
-                onPeriodChange={onCandlePeriodChange}
-                onMorePress={onMorePress}
-                visiblePeriods={PRO_CANDLE_PERIODS}
-                twClassName="flex-1 py-0"
-                groupTwClassName="gap-2 justify-start"
-                filterVariant={FilterButtonVariant.Secondary}
-                periodButtonTwClassName="h-7 rounded px-1"
-                moreButtonTwClassName="h-7 rounded px-1"
-                textVariant={TextVariant.BodyXs}
-                testID={PerpsProMarketViewSelectorsIDs.CHART_PERIOD_SELECTOR}
-              />
-              <ButtonIcon
-                iconName={IconName.Expand}
-                size={ButtonIconSize.Sm}
-                onPress={handleFullscreenChartOpen}
-                testID={PerpsProMarketViewSelectorsIDs.CHART_FULLSCREEN_BUTTON}
-                accessibilityLabel={strings(
-                  'perps.market_details.fullscreen_chart',
-                )}
-              />
-            </Box>
-            <ComponentErrorBoundary
-              componentLabel="PerpsProMarketChart"
-              onError={onChartError}
-            >
-              <Box twClassName="relative flex-1">
-                {ohlcData ? (
-                  <Box twClassName="absolute left-0 right-0 top-0 z-10">
-                    <PerpsOHLCVBar
-                      open={ohlcData.open}
-                      high={ohlcData.high}
-                      low={ohlcData.low}
-                      close={ohlcData.close}
-                      volume={ohlcData.volume}
-                      testID={PerpsProMarketViewSelectorsIDs.CHART_OHLCV}
-                    />
-                  </Box>
-                ) : null}
-                {chartContent}
+              <Box
+                flexDirection={BoxFlexDirection.Row}
+                alignItems={BoxAlignItems.Center}
+              >
+                <PerpsCandlePeriodSelector
+                  selectedPeriod={selectedCandlePeriod}
+                  onPeriodChange={onCandlePeriodChange}
+                  onMorePress={onMorePress}
+                  visiblePeriods={PRO_CANDLE_PERIODS}
+                  twClassName="flex-1 py-0"
+                  groupTwClassName="gap-2 justify-start"
+                  filterVariant={FilterButtonVariant.Secondary}
+                  periodButtonTwClassName="h-7 rounded px-1"
+                  moreButtonTwClassName="h-7 rounded px-1"
+                  textVariant={TextVariant.BodyXs}
+                  testID={PerpsProMarketViewSelectorsIDs.CHART_PERIOD_SELECTOR}
+                />
+                <ButtonIcon
+                  iconName={IconName.Expand}
+                  size={ButtonIconSize.Sm}
+                  onPress={handleFullscreenChartOpen}
+                  testID={
+                    PerpsProMarketViewSelectorsIDs.CHART_FULLSCREEN_BUTTON
+                  }
+                  accessibilityLabel={strings(
+                    'perps.market_details.fullscreen_chart',
+                  )}
+                />
               </Box>
-            </ComponentErrorBoundary>
+              <ComponentErrorBoundary
+                componentLabel="PerpsProMarketChart"
+                onError={onChartError}
+              >
+                <Box twClassName="relative flex-1">
+                  {ohlcData ? (
+                    <Box twClassName="absolute left-0 right-0 top-0 z-10">
+                      <PerpsOHLCVBar
+                        open={ohlcData.open}
+                        high={ohlcData.high}
+                        low={ohlcData.low}
+                        close={ohlcData.close}
+                        volume={ohlcData.volume}
+                        testID={PerpsProMarketViewSelectorsIDs.CHART_OHLCV}
+                      />
+                    </Box>
+                  ) : null}
+                  {chartContent}
+                </Box>
+              </ComponentErrorBoundary>
+            </Box>
           </Box>
-        </Box>
+        </Animated.View>
       ) : null}
       {isTradingHalted && !isLoadingTradingHalted ? (
         <PerpsPriceDeviationWarning
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketHeader.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketHeader.test.tsx
deleted file mode 100644
index fee19d9c677c..000000000000
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketHeader.test.tsx
+++ /dev/null
@@ -1,219 +0,0 @@
-import React from 'react';
-import { fireEvent } from '@testing-library/react-native';
-import { PerpsMode, type PerpsMarketData } from '@metamask/perps-controller';
-import renderWithProvider from '../../../../../../util/test/renderWithProvider';
-import { backgroundState } from '../../../../../../util/test/initial-root-state';
-import {
-  PerpsModeToggleSelectorsIDs,
-  PerpsProMarketViewSelectorsIDs,
-} from '../../../Perps.testIds';
-import PerpsProMarketHeader from './PerpsProMarketHeader';
-
-jest.mock('../../../providers/PerpsStreamManager');
-
-const mockMarket: PerpsMarketData = {
-  symbol: 'BTC',
-  name: 'Bitcoin',
-  price: '$45,000.00',
-  change24h: '+$1,125.00',
-  change24hPercent: '+2.50%',
-  volume: '$1.23B',
-  maxLeverage: '40x',
-};
-
-const initialState = {
-  engine: {
-    backgroundState,
-  },
-};
-
-const renderHeader = (
-  overrides: Partial<React.ComponentProps<typeof PerpsProMarketHeader>> = {},
-) =>
-  renderWithProvider(
-    <PerpsProMarketHeader
-      market={mockMarket}
-      mode={PerpsMode.Pro}
-      {...overrides}
-    />,
-    { state: initialState },
-  );
-
-describe('PerpsProMarketHeader', () => {
-  it('renders the asset name, leverage, and ticker subtitle', () => {
-    const { getByTestId, getByText } = renderHeader();
-
-    expect(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL),
-    ).toHaveTextContent('Bitcoin');
-    expect(getByText('40x')).toBeOnTheScreen();
-    expect(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SUBTITLE),
-    ).toHaveTextContent('BTC-USD perp');
-  });
-
-  it('falls back to the display symbol when the market has no name', () => {
-    const { getByTestId, queryByText } = renderHeader({
-      market: { symbol: 'ETH', maxLeverage: '25x' },
-    });
-
-    expect(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL),
-    ).toHaveTextContent('ETH');
-    expect(queryByText('Bitcoin')).not.toBeOnTheScreen();
-  });
-
-  it('hides the leverage tag when maxLeverage is missing', () => {
-    const { getByTestId, queryByText } = renderHeader({
-      market: { symbol: 'BTC', name: 'Bitcoin' },
-    });
-
-    expect(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL),
-    ).toHaveTextContent('Bitcoin');
-    expect(queryByText('40x')).not.toBeOnTheScreen();
-  });
-
-  it('strips HIP-3 dex prefixes from the ticker subtitle', () => {
-    const { getByTestId } = renderHeader({
-      market: { symbol: 'xyz:TSLA', name: 'Tesla', maxLeverage: '10x' },
-    });
-
-    expect(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL),
-    ).toHaveTextContent('Tesla');
-    expect(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SUBTITLE),
-    ).toHaveTextContent('TSLA-USD perp');
-  });
-
-  it('fires onBackPress from the back button', () => {
-    const onBackPress = jest.fn();
-    const { getByTestId } = renderHeader({ onBackPress });
-
-    fireEvent.press(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_BACK_BUTTON),
-    );
-
-    expect(onBackPress).toHaveBeenCalledTimes(1);
-  });
-
-  it('omits the back button when onBackPress is not provided', () => {
-    const { queryByTestId } = renderHeader();
-
-    expect(
-      queryByTestId(PerpsProMarketViewSelectorsIDs.HEADER_BACK_BUTTON),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('fires onIdentityPress from the market identity and shows the caret', () => {
-    const onIdentityPress = jest.fn();
-    const { getByTestId } = renderHeader({ onIdentityPress });
-
-    fireEvent.press(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_MARKET_LIST_BUTTON),
-    );
-
-    expect(onIdentityPress).toHaveBeenCalledTimes(1);
-  });
-
-  it('renders a non-interactive identity when onIdentityPress is omitted', () => {
-    const { queryByTestId, getByTestId } = renderHeader();
-
-    expect(
-      queryByTestId(PerpsProMarketViewSelectorsIDs.HEADER_MARKET_LIST_BUTTON),
-    ).not.toBeOnTheScreen();
-    expect(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL),
-    ).toBeOnTheScreen();
-  });
-
-  it('fires onWalletPress from the wallet button', () => {
-    const onWalletPress = jest.fn();
-    const { getByTestId } = renderHeader({ onWalletPress });
-
-    fireEvent.press(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_WALLET_BUTTON),
-    );
-
-    expect(onWalletPress).toHaveBeenCalledTimes(1);
-  });
-
-  it('fires onFavoritePress from the favorite button', () => {
-    const onFavoritePress = jest.fn();
-    const { getByTestId } = renderHeader({ onFavoritePress });
-
-    fireEvent.press(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_FAVORITE_BUTTON),
-    );
-
-    expect(onFavoritePress).toHaveBeenCalledTimes(1);
-  });
-
-  it('renders the filled star when the market is favorited', () => {
-    const { getByTestId } = renderHeader({
-      onFavoritePress: jest.fn(),
-      isFavorite: true,
-    });
-
-    expect(
-      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_FAVORITE_BUTTON),
-    ).toBeOnTheScreen();
-  });
-
-  it('fires onModeChange from the active Pro mode pill', () => {
-    const onModeChange = jest.fn();
-    const { getByTestId } = renderHeader({ onModeChange });
-
-    fireEvent.press(getByTestId(PerpsModeToggleSelectorsIDs.PRO_SEGMENT));
-
-    expect(onModeChange).toHaveBeenCalledWith(PerpsMode.Lite);
-  });
-
-  it('omits the mode pill when mode is not provided', () => {
-    const { queryByTestId } = renderHeader({
-      mode: undefined,
-      onModeChange: jest.fn(),
-    });
-
-    expect(
-      queryByTestId(PerpsModeToggleSelectorsIDs.PRO_SEGMENT),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('exposes accessibility labels on back, wallet, and favorite buttons', () => {
-    const { getByLabelText } = renderHeader({
-      onBackPress: jest.fn(),
-      onWalletPress: jest.fn(),
-      onFavoritePress: jest.fn(),
-      isFavorite: false,
-    });
-
-    expect(getByLabelText('Back')).toBeOnTheScreen();
-    expect(getByLabelText('Perps home')).toBeOnTheScreen();
-    expect(getByLabelText('Add to watchlist')).toBeOnTheScreen();
-  });
-
-  it('uses a state-aware accessibility label for the favorite toggle', () => {
-    const { getByLabelText } = renderHeader({
-      onFavoritePress: jest.fn(),
-      isFavorite: true,
-    });
-
-    expect(getByLabelText('Remove from watchlist')).toBeOnTheScreen();
-  });
-
-  it('omits end actions when their handlers are not provided', () => {
-    const { queryByTestId } = renderHeader();
-
-    expect(
-      queryByTestId(PerpsProMarketViewSelectorsIDs.HEADER_WALLET_BUTTON),
-    ).not.toBeOnTheScreen();
-    expect(
-      queryByTestId(PerpsProMarketViewSelectorsIDs.HEADER_FAVORITE_BUTTON),
-    ).not.toBeOnTheScreen();
-    expect(
-      queryByTestId(PerpsModeToggleSelectorsIDs.PRO_SEGMENT),
-    ).not.toBeOnTheScreen();
-  });
-});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketHeader.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketHeader.tsx
index 1c3ee590d965..b6bcbe4a4602 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketHeader.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketHeader.tsx
@@ -1,142 +1,4 @@
-import {
-  Box,
-  BoxAlignItems,
-  BoxFlexDirection,
-  ButtonIcon,
-  ButtonIconSize,
-  IconName,
-} from '@metamask/design-system-react-native';
-import { PerpsMode, type PerpsMarketData } from '@metamask/perps-controller';
-import { PERPS_EVENT_VALUE } from '@metamask/perps-controller/constants';
-import React from 'react';
-import { StyleSheet } from 'react-native';
-import { strings } from '../../../../../../../locales/i18n';
-import { PerpsProMarketViewSelectorsIDs } from '../../../Perps.testIds';
-import PerpsMarketIdentity from '../../../components/PerpsMarketIdentity';
-import PerpsModeToggle from '../../../components/PerpsModeToggle';
-
-interface PerpsProMarketHeaderProps {
-  /**
-   * Market payload from route params. After the parent has verified
-   * `symbol`, remaining fields may still be partial (deep-link entries).
-   */
-  market: Partial<PerpsMarketData> & { symbol: string };
-  /**
-   * Active Perps mode for the read-only mode pill. Required when
-   * `onModeChange` is provided; ignored otherwise.
-   */
-  mode?: PerpsMode;
-  onBackPress?: () => void;
-  /**
-   * When provided, the asset identity (icon + name + leverage) becomes a tap
-   * target that opens the market list, and a trailing caret is shown.
-   */
-  onIdentityPress?: () => void;
-  onWalletPress?: () => void;
-  onFavoritePress?: () => void;
-  isFavorite?: boolean;
-  onModeChange?: (mode: PerpsMode) => void;
-}
-
-const styles = StyleSheet.create({
-  container: {
-    height: 64,
-  },
-  // Matches the Figma title cap so long names truncate instead of pushing the
-  // leverage tag / caret out of view.
-  nameText: {
-    maxWidth: 120,
-  },
-});
-
-/**
- * Fixed Pro-mode market header.
- *
- * Left: back button. Center: tappable asset identity (token icon, name,
- * leverage pill, market-list caret, and `[Ticker]-[collateral] perp`
- * subtitle). Right: wallet, favorite (watchlist star), and the read-only
- * Lite/Pro mode pill.
- */
-const PerpsProMarketHeader = ({
-  market,
-  mode,
-  onBackPress,
-  onIdentityPress,
-  onWalletPress,
-  onFavoritePress,
-  isFavorite = false,
-  onModeChange,
-}: PerpsProMarketHeaderProps) => (
-  <Box
-    testID={PerpsProMarketViewSelectorsIDs.HEADER}
-    style={styles.container}
-    twClassName="border-b border-muted bg-default px-4"
-    flexDirection={BoxFlexDirection.Row}
-    alignItems={BoxAlignItems.Center}
-    gap={2}
-  >
-    {onBackPress ? (
-      <ButtonIcon
-        iconName={IconName.ArrowLeft}
-        size={ButtonIconSize.Md}
-        onPress={onBackPress}
-        accessibilityLabel={strings('perps.market_details.back')}
-        testID={PerpsProMarketViewSelectorsIDs.HEADER_BACK_BUTTON}
-      />
-    ) : null}
-
-    <Box twClassName="flex-1">
-      <PerpsMarketIdentity
-        symbol={market.symbol}
-        name={market.name}
-        maxLeverage={market.maxLeverage}
-        size={32}
-        gap={2}
-        nameStyle={styles.nameText}
-        onPress={onIdentityPress}
-        testIDs={{
-          assetIcon: PerpsProMarketViewSelectorsIDs.HEADER_ASSET_ICON,
-          assetName: PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL,
-          subtitle: PerpsProMarketViewSelectorsIDs.HEADER_SUBTITLE,
-          marketListButton:
-            PerpsProMarketViewSelectorsIDs.HEADER_MARKET_LIST_BUTTON,
-        }}
-      />
-    </Box>
-
-    <Box flexDirection={BoxFlexDirection.Row} alignItems={BoxAlignItems.Center}>
-      {onWalletPress ? (
-        <ButtonIcon
-          iconName={IconName.Wallet}
-          size={ButtonIconSize.Md}
-          onPress={onWalletPress}
-          accessibilityLabel={strings('perps.market_details.wallet')}
-          testID={PerpsProMarketViewSelectorsIDs.HEADER_WALLET_BUTTON}
-        />
-      ) : null}
-      {onFavoritePress ? (
-        <ButtonIcon
-          iconName={isFavorite ? IconName.StarFilled : IconName.Star}
-          size={ButtonIconSize.Md}
-          onPress={onFavoritePress}
-          accessibilityLabel={strings(
-            isFavorite
-              ? 'perps.market_details.remove_from_watchlist'
-              : 'perps.market_details.add_to_watchlist',
-          )}
-          testID={PerpsProMarketViewSelectorsIDs.HEADER_FAVORITE_BUTTON}
-        />
-      ) : null}
-      {onModeChange && mode ? (
-        <PerpsModeToggle
-          mode={mode}
-          variant="active"
-          onChange={onModeChange}
-          source={PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN}
-        />
-      ) : null}
-    </Box>
-  </Box>
-);
-
-export default PerpsProMarketHeader;
+export {
+  default,
+  PERPS_MARKET_HEADER_HEIGHT as PERPS_PRO_MARKET_HEADER_HEIGHT,
+} from '../../../components/PerpsMarketHeader';
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketLayout.styles.ts b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketLayout.styles.ts
new file mode 100644
index 000000000000..94612d2eff48
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketLayout.styles.ts
@@ -0,0 +1,35 @@
+import { StyleSheet } from 'react-native';
+import type { Theme } from '../../../../../../util/theme/models';
+
+/** Matches `px-2` (8px) — same inset as `PerpsProPositionsPanel` rows. */
+export const PRO_SCREEN_HORIZONTAL_INSET = 8;
+export const PRO_TRADING_AREA_BOTTOM_INSET = 16;
+export const PRO_ORDER_BOOK_COLUMN_WIDTH = 132;
+
+const createStyles = ({ theme }: { theme: Theme }) =>
+  StyleSheet.create({
+    container: {
+      flexDirection: 'row',
+      alignItems: 'flex-start',
+      paddingHorizontal: PRO_SCREEN_HORIZONTAL_INSET,
+    },
+    orderFormColumn: {
+      flex: 1,
+      alignSelf: 'flex-start',
+      paddingBottom: PRO_TRADING_AREA_BOTTOM_INSET,
+    },
+    columnDivider: {
+      width: StyleSheet.hairlineWidth,
+      alignSelf: 'stretch',
+      backgroundColor: theme.colors.border.muted,
+      marginHorizontal: 16,
+    },
+    orderBookColumn: {
+      width: PRO_ORDER_BOOK_COLUMN_WIDTH,
+      alignSelf: 'flex-start',
+      paddingLeft: 0,
+      paddingBottom: PRO_TRADING_AREA_BOTTOM_INSET,
+    },
+  });
+
+export { createStyles };
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketLayout.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketLayout.test.tsx
index 80f15623d674..aff4ee156422 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketLayout.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketLayout.test.tsx
@@ -1,8 +1,13 @@
 import React from 'react';
 import { View } from 'react-native';
-import { fireEvent, render, within } from '@testing-library/react-native';
+import { render, within } from '@testing-library/react-native';
 import { PerpsProMarketViewSelectorsIDs } from '../../../Perps.testIds';
 import PerpsProMarketLayout from './PerpsProMarketLayout';
+import {
+  PRO_ORDER_BOOK_COLUMN_WIDTH,
+  PRO_SCREEN_HORIZONTAL_INSET,
+  PRO_TRADING_AREA_BOTTOM_INSET,
+} from './PerpsProMarketLayout.styles';
 
 const renderLayout = (
   props: Partial<React.ComponentProps<typeof PerpsProMarketLayout>> = {},
@@ -29,38 +34,49 @@ describe('PerpsProMarketLayout', () => {
       within(rightColumn).getByTestId('mock-order-book'),
     ).toBeOnTheScreen();
     expect(leftColumn).toHaveStyle({ flex: 1 });
-    expect(rightColumn).toHaveStyle({ width: 132 });
+    expect(rightColumn).toHaveStyle({ width: PRO_ORDER_BOOK_COLUMN_WIDTH });
   });
 
-  it('uses the Figma trading-area dimensions', () => {
+  it('uses the correct width and padding for the order book column', () => {
+    const { getByTestId } = renderLayout();
+
+    expect(
+      getByTestId(PerpsProMarketViewSelectorsIDs.RIGHT_COLUMN),
+    ).toHaveStyle({
+      width: PRO_ORDER_BOOK_COLUMN_WIDTH,
+      paddingLeft: 0,
+    });
+  });
+
+  it('uses content-driven column heights with bottom inset on each column', () => {
     const { getByTestId } = renderLayout();
 
     expect(getByTestId(PerpsProMarketViewSelectorsIDs.LAYOUT)).toHaveStyle({
-      minHeight: 682,
+      paddingHorizontal: PRO_SCREEN_HORIZONTAL_INSET,
     });
+    expect(getByTestId(PerpsProMarketViewSelectorsIDs.LEFT_COLUMN)).toHaveStyle(
+      {
+        alignSelf: 'flex-start',
+        paddingBottom: PRO_TRADING_AREA_BOTTOM_INSET,
+      },
+    );
     expect(
-      getByTestId(PerpsProMarketViewSelectorsIDs.VERTICAL_DIVIDER),
-    ).toHaveStyle({ width: 24 });
+      getByTestId(PerpsProMarketViewSelectorsIDs.RIGHT_COLUMN),
+    ).toHaveStyle({
+      width: PRO_ORDER_BOOK_COLUMN_WIDTH,
+      alignSelf: 'flex-start',
+      paddingBottom: PRO_TRADING_AREA_BOTTOM_INSET,
+    });
   });
 
-  it('hides the order book and shows expand when collapsed', () => {
-    const onExpandOrderBook = jest.fn();
+  it('hides the order book column when collapsed', () => {
     const { getByTestId, queryByTestId } = renderLayout({
       isOrderBookCollapsed: true,
-      onExpandOrderBook,
     });
 
     expect(
       queryByTestId(PerpsProMarketViewSelectorsIDs.RIGHT_COLUMN),
     ).not.toBeOnTheScreen();
-    expect(
-      queryByTestId(PerpsProMarketViewSelectorsIDs.VERTICAL_DIVIDER),
-    ).not.toBeOnTheScreen();
     expect(getByTestId('mock-order-form')).toBeOnTheScreen();
-
-    fireEvent.press(
-      getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_BOOK_EXPAND_BUTTON),
-    );
-    expect(onExpandOrderBook).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketLayout.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketLayout.tsx
index 627235ff2b33..53e332169eb8 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketLayout.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketLayout.tsx
@@ -1,23 +1,22 @@
-import {
-  Box,
-  BoxAlignItems,
-  BoxFlexDirection,
-  BoxJustifyContent,
-  ButtonIcon,
-  ButtonIconSize,
-  IconName,
-} from '@metamask/design-system-react-native';
+import { AnimationDuration } from '@metamask/design-tokens';
 import React, { type ReactNode } from 'react';
-import { StyleSheet } from 'react-native';
-import { strings } from '../../../../../../../locales/i18n';
+import { View } from 'react-native';
+import Animated, {
+  FadeIn,
+  FadeOut,
+  LinearTransition,
+} from 'react-native-reanimated';
+import { useStyles } from '../../../../../../component-library/hooks';
 import { PerpsProMarketViewSelectorsIDs } from '../../../Perps.testIds';
+import { createStyles } from './PerpsProMarketLayout.styles';
 
 interface PerpsProMarketLayoutProps {
   orderForm: ReactNode;
   orderBook: ReactNode;
   /**
    * When true, the order-book column and divider are hidden so the order form
-   * expands to full width. An expand control restores the book.
+   * expands to full width. The order form itself renders the control that
+   * restores the book (Figma: order-book icon beside the direction control).
    *
    * Collapse unmounts the order-book panel (subscriptions disconnect). On
    * expand, session-only UI state in that panel — list currency, metric, and
@@ -25,100 +24,47 @@ interface PerpsProMarketLayoutProps {
    * persisted per market separately from this layout.
    */
   isOrderBookCollapsed?: boolean;
-  onExpandOrderBook?: () => void;
 }
 
-const PRO_TRADING_AREA_MIN_HEIGHT = 682;
-const PRO_DIVIDER_COLUMN_WIDTH = 24;
-const PRO_ORDER_BOOK_COLUMN_WIDTH = 132;
-
-const styles = StyleSheet.create({
-  container: {
-    minHeight: PRO_TRADING_AREA_MIN_HEIGHT,
-  },
-  dividerColumn: {
-    width: PRO_DIVIDER_COLUMN_WIDTH,
-  },
-  dividerLine: {
-    width: 1,
-  },
-  orderFormColumn: {
-    flex: 1,
-  },
-  orderBookColumn: {
-    width: PRO_ORDER_BOOK_COLUMN_WIDTH,
-  },
-});
-
 /**
  * Two-column trading area for the Pro-mode market screen.
  *
- * Matches the current Figma layout: the order form fills the left column and
- * the order book occupies the fixed-width right column. Configurable panel
- * positioning is deferred until the rearrangeable-layout feature consumes the
- * controller preferences.
- *
- * When the book is collapsed, `{orderBook}` is not rendered so the panel
- * unmounts and live order-book sockets disconnect. That remount-on-expand
- * path intentionally drops session-only book preferences (currency, metric,
- * view mode); persisted grouping survives via `usePerpsOrderBookGrouping`.
+ * Uses an 8px (`px-2`) screen-edge inset aligned with the positions panel.
  */
 const PerpsProMarketLayout = ({
   orderForm,
   orderBook,
   isOrderBookCollapsed = false,
-  onExpandOrderBook,
-}: PerpsProMarketLayoutProps) => (
-  <Box
-    testID={PerpsProMarketViewSelectorsIDs.LAYOUT}
-    flexDirection={BoxFlexDirection.Row}
-    style={styles.container}
-  >
-    <Box
-      testID={PerpsProMarketViewSelectorsIDs.LEFT_COLUMN}
-      style={styles.orderFormColumn}
+}: PerpsProMarketLayoutProps) => {
+  const { styles } = useStyles(createStyles);
+
+  return (
+    <View
+      testID={PerpsProMarketViewSelectorsIDs.LAYOUT}
+      style={styles.container}
     >
-      {isOrderBookCollapsed ? (
-        <Box
-          flexDirection={BoxFlexDirection.Row}
-          alignItems={BoxAlignItems.Center}
-          justifyContent={BoxJustifyContent.End}
-          twClassName="px-4 pt-2"
-        >
-          <ButtonIcon
-            iconName={IconName.Expand}
-            accessibilityLabel={strings('perps.order_book.expand')}
-            size={ButtonIconSize.Md}
-            onPress={onExpandOrderBook}
-            testID={PerpsProMarketViewSelectorsIDs.ORDER_BOOK_EXPAND_BUTTON}
-          />
-        </Box>
+      <Animated.View
+        testID={PerpsProMarketViewSelectorsIDs.LEFT_COLUMN}
+        style={styles.orderFormColumn}
+        layout={LinearTransition.duration(AnimationDuration.Fast)}
+      >
+        {orderForm}
+      </Animated.View>
+      {!isOrderBookCollapsed ? (
+        <>
+          <View style={styles.columnDivider} />
+          <Animated.View
+            testID={PerpsProMarketViewSelectorsIDs.RIGHT_COLUMN}
+            style={styles.orderBookColumn}
+            entering={FadeIn.duration(AnimationDuration.Fast)}
+            exiting={FadeOut.duration(AnimationDuration.Fast)}
+          >
+            {orderBook}
+          </Animated.View>
+        </>
       ) : null}
-      {orderForm}
-    </Box>
-    {/* Omit the column while collapsed: unmount disconnects subscriptions. */}
-    {!isOrderBookCollapsed ? (
-      <>
-        <Box
-          testID={PerpsProMarketViewSelectorsIDs.VERTICAL_DIVIDER}
-          twClassName="items-center"
-          style={styles.dividerColumn}
-        >
-          <Box
-            twClassName="flex-1 bg-border-muted"
-            style={styles.dividerLine}
-          />
-        </Box>
-        <Box
-          testID={PerpsProMarketViewSelectorsIDs.RIGHT_COLUMN}
-          twClassName="pr-4"
-          style={styles.orderBookColumn}
-        >
-          {orderBook}
-        </Box>
-      </>
-    ) : null}
-  </Box>
-);
+    </View>
+  );
+};
 
 export default PerpsProMarketLayout;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketSummary.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketSummary.tsx
index 4c14541af171..ac05ac04e84b 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketSummary.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProMarketSummary.tsx
@@ -1,48 +1,4 @@
-import {
-  Box,
-  BoxAlignItems,
-  BoxFlexDirection,
-} from '@metamask/design-system-react-native';
-import React from 'react';
-import { PerpsProMarketViewSelectorsIDs } from '../../../Perps.testIds';
-import LivePriceHeader from '../../../components/LivePriceDisplay/LivePriceHeader';
-
-interface PerpsProMarketSummaryProps {
-  symbol: string;
-  currentPrice: number;
-  /**
-   * Optional right-aligned accessory rendered on the same 76px row as the
-   * price (per Figma "Chart Compact"). Used for the collapsed-chart expand
-   * action so no extra row is introduced below the summary.
-   */
-  endAccessory?: React.ReactNode;
-}
-
-/**
- * Scroll-contained live market price and 24-hour change.
- */
-const PerpsProMarketSummary = ({
-  symbol,
-  currentPrice,
-  endAccessory,
-}: PerpsProMarketSummaryProps) => (
-  <Box
-    testID={PerpsProMarketViewSelectorsIDs.MARKET_SUMMARY}
-    flexDirection={BoxFlexDirection.Row}
-    alignItems={BoxAlignItems.Center}
-    twClassName="h-[76px] gap-4 px-4"
-  >
-    <Box twClassName="h-full flex-1 justify-start py-1">
-      <LivePriceHeader
-        symbol={symbol}
-        currentPrice={currentPrice}
-        size="large"
-        testIDPrice={PerpsProMarketViewSelectorsIDs.MARKET_PRICE}
-        testIDChange={PerpsProMarketViewSelectorsIDs.MARKET_PRICE_CHANGE}
-      />
-    </Box>
-    {endAccessory}
-  </Box>
-);
-
-export default PerpsProMarketSummary;
+export {
+  default,
+  PRICE_SECTION_HEIGHT,
+} from '../../../components/PerpsMarketSummary';
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderBookPanel.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderBookPanel.test.tsx
index 659cd2995960..296390f894ae 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderBookPanel.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderBookPanel.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { fireEvent } from '@testing-library/react-native';
+import { fireEvent, within } from '@testing-library/react-native';
 import PerpsProOrderBookPanel from './PerpsProOrderBookPanel';
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../../../util/test/initial-root-state';
@@ -58,7 +58,9 @@ const mockOrderBook: OrderBookData = {
   spread: '100',
   spreadPercentage: '0.2',
   midPrice: '50050',
-  lastUpdated: Date.now(),
+  // Fixed epoch (2023-11-14T22:13:20.000Z) — no test asserts on this value,
+  // but a pinned constant keeps the fixture deterministic across runs.
+  lastUpdated: 1700000000000,
   maxTotal: '3.5',
 };
 
@@ -150,32 +152,16 @@ describe('PerpsProOrderBookPanel', () => {
     expect(mockReconnect).toHaveBeenCalledTimes(1);
   });
 
-  it('cycles the view mode when the toggle is pressed', () => {
+  it('hides the buy/sell view-toggle button (ladder only shows ~5 rows/side today)', () => {
     const { getByTestId, queryByTestId } = renderWithProvider(
       <PerpsProOrderBookPanel symbol="BTC" marketPrice={50000} />,
       { state: { engine: { backgroundState } } },
     );
 
-    const toggle = getByTestId(`${testID}-view-toggle`);
-    expect(toggle).toHaveAccessibilityValue({ text: 'Bids and asks' });
-
-    // default → buy (asks hidden)
-    fireEvent.press(toggle);
-    expect(queryByTestId(`${testID}-ask-row-0`)).not.toBeOnTheScreen();
-    expect(getByTestId(`${testID}-bid-row-0`)).toBeOnTheScreen();
-    expect(toggle).toHaveAccessibilityValue({ text: 'Bids only' });
-
-    // buy → sell (bids hidden)
-    fireEvent.press(toggle);
-    expect(getByTestId(`${testID}-ask-row-0`)).toBeOnTheScreen();
-    expect(queryByTestId(`${testID}-bid-row-0`)).not.toBeOnTheScreen();
-    expect(toggle).toHaveAccessibilityValue({ text: 'Asks only' });
-
-    // sell → default (both sides)
-    fireEvent.press(toggle);
+    expect(queryByTestId(`${testID}-view-toggle`)).not.toBeOnTheScreen();
+    // Both sides still render by default with the toggle hidden.
     expect(getByTestId(`${testID}-ask-row-0`)).toBeOnTheScreen();
     expect(getByTestId(`${testID}-bid-row-0`)).toBeOnTheScreen();
-    expect(toggle).toHaveAccessibilityValue({ text: 'Bids and asks' });
   });
 
   it('shows a ladder skeleton while the aggregated book is loading', () => {
@@ -210,6 +196,37 @@ describe('PerpsProOrderBookPanel', () => {
     expect(queryByTestId(`${testID}-reconnect`)).not.toBeOnTheScreen();
   });
 
+  it('makes ladder rows interactive and reports the tapped price via onSelectPrice', () => {
+    const onSelectPrice = jest.fn();
+    const { getByTestId } = renderWithProvider(
+      <PerpsProOrderBookPanel
+        symbol="BTC"
+        marketPrice={50000}
+        onSelectPrice={onSelectPrice}
+      />,
+      { state: { engine: { backgroundState } } },
+    );
+
+    fireEvent.press(getByTestId(`${testID}-bid-row-0`));
+    expect(onSelectPrice).toHaveBeenCalledWith('50000');
+
+    fireEvent.press(getByTestId(`${testID}-ask-row-0`));
+    // Asks render farthest-to-closest, so ask-row-0 is the deepest ask (50200).
+    expect(onSelectPrice).toHaveBeenLastCalledWith('50200');
+  });
+
+  it('renders static, non-interactive rows when onSelectPrice is omitted', () => {
+    const { getByTestId } = renderWithProvider(
+      <PerpsProOrderBookPanel symbol="BTC" marketPrice={50000} />,
+      { state: { engine: { backgroundState } } },
+    );
+
+    expect(getByTestId(`${testID}-bid-row-0`)).not.toHaveProp(
+      'accessibilityRole',
+      'button',
+    );
+  });
+
   it('invokes onCollapse when the collapse button is pressed', () => {
     const onCollapse = jest.fn();
     const { getByTestId } = renderWithProvider(
@@ -227,6 +244,34 @@ describe('PerpsProOrderBookPanel', () => {
     expect(onCollapse).toHaveBeenCalledTimes(1);
   });
 
+  it('positions collapse at the leading edge and settings at the trailing edge', () => {
+    const { getByTestId } = renderWithProvider(
+      <PerpsProOrderBookPanel
+        symbol="BTC"
+        marketPrice={50000}
+        onCollapse={jest.fn()}
+      />,
+      { state: { engine: { backgroundState } } },
+    );
+
+    const header = getByTestId(`${testID}-header`);
+    const leading = getByTestId(`${testID}-header-leading`);
+    const trailing = getByTestId(`${testID}-header-trailing`);
+
+    expect(header).toHaveStyle({
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+    });
+    expect(
+      within(leading).getByTestId(
+        PerpsProMarketViewSelectorsIDs.ORDER_BOOK_COLLAPSE_BUTTON,
+      ),
+    ).toBeOnTheScreen();
+    expect(
+      within(trailing).getByTestId(`${testID}-grouping-trigger`),
+    ).toBeOnTheScreen();
+  });
+
   it('opens settings and saves currency, metric, and grouping', () => {
     const { getByTestId } = renderWithProvider(
       <PerpsProOrderBookPanel symbol="BTC" marketPrice={50000} />,
@@ -242,6 +287,168 @@ describe('PerpsProOrderBookPanel', () => {
     expect(mockSaveGrouping).toHaveBeenCalledWith(100);
   });
 
+  it('shows the spread value alone, keeping the label for screen readers', () => {
+    const { getByTestId, queryByText } = renderWithProvider(
+      <PerpsProOrderBookPanel symbol="BTC" marketPrice={50000} />,
+      { state: { engine: { backgroundState } } },
+    );
+
+    const spreadRow = getByTestId(`${testID}-spread`);
+
+    expect(spreadRow).toHaveTextContent('$100 (0.2%)');
+    expect(queryByText('Spread')).not.toBeOnTheScreen();
+    expect(
+      within(spreadRow).getByLabelText('Spread $100 (0.2%)'),
+    ).toBeOnTheScreen();
+  });
+
+  it('shows the depth ratio as +/- percentages, keeping buy/sell for screen readers', () => {
+    const { getByTestId, queryByText } = renderWithProvider(
+      <PerpsProOrderBookPanel symbol="BTC" marketPrice={50000} />,
+      { state: { engine: { backgroundState } } },
+    );
+
+    const buySide = getByTestId(`${testID}-buy-percent`);
+    const sellSide = getByTestId(`${testID}-sell-percent`);
+
+    expect(buySide).toHaveTextContent('54%');
+    expect(sellSide).toHaveTextContent('46%');
+    expect(queryByText(/Buy: /u)).not.toBeOnTheScreen();
+    expect(queryByText(/Sell: /u)).not.toBeOnTheScreen();
+    expect(buySide).toHaveProp('accessibilityLabel', 'Buy: 54%');
+    expect(sellSide).toHaveProp('accessibilityLabel', 'Sell: 46%');
+  });
+
+  it('abbreviates large size values instead of printing every digit', () => {
+    const { getByTestId } = renderWithProvider(
+      <PerpsProOrderBookPanel symbol="BTC" marketPrice={50000} />,
+      { state: { engine: { backgroundState } } },
+    );
+
+    // totalNotional 174800 for the deepest bid.
+    expect(getByTestId(`${testID}-bid-row-1-value`)).toHaveTextContent(
+      '$174.8K',
+    );
+  });
+
+  it('abbreviates ladder prices to the scale the grouping makes redundant', () => {
+    // Grouping by 1,000 fixes the last three digits, so "$69,000" spent three
+    // characters per row on padding that never changes.
+    mockSavedGroupingBySymbol.BTC = 1000;
+
+    const btcOrderBook: OrderBookData = {
+      ...mockOrderBook,
+      midPrice: '64500',
+      bids: [
+        { ...mockOrderBook.bids[0], price: '64000' },
+        { ...mockOrderBook.bids[1], price: '63000' },
+      ],
+      asks: [
+        { ...mockOrderBook.asks[0], price: '65000' },
+        { ...mockOrderBook.asks[1], price: '66000' },
+      ],
+    };
+    mockUsePerpsLiveOrderBook.mockImplementation(() => ({
+      orderBook: btcOrderBook,
+      isLoading: false,
+      error: null,
+      connectionStatus: 'connected',
+      reconnect: mockReconnect,
+    }));
+
+    const { getByTestId } = renderWithProvider(
+      <PerpsProOrderBookPanel
+        symbol="BTC"
+        marketPrice={64500}
+        szDecimals={5}
+      />,
+      { state: { engine: { backgroundState } } },
+    );
+
+    expect(getByTestId(`${testID}-bid-row-0-price`)).toHaveTextContent('$64K');
+    expect(getByTestId(`${testID}-bid-row-1-price`)).toHaveTextContent('$63K');
+    expect(getByTestId(`${testID}-ask-row-0-price`)).toHaveTextContent('$66K');
+  });
+
+  it('keeps the grouping step visible when it needs decimals to survive', () => {
+    // BTC's default grouping of 10 is the Figma reference ladder: "$61.47K".
+    const btcOrderBook: OrderBookData = {
+      ...mockOrderBook,
+      midPrice: '61470',
+      bids: [
+        { ...mockOrderBook.bids[0], price: '61470' },
+        { ...mockOrderBook.bids[1], price: '61460' },
+      ],
+      asks: [
+        { ...mockOrderBook.asks[0], price: '61480' },
+        { ...mockOrderBook.asks[1], price: '61490' },
+      ],
+    };
+    mockUsePerpsLiveOrderBook.mockImplementation(() => ({
+      orderBook: btcOrderBook,
+      isLoading: false,
+      error: null,
+      connectionStatus: 'connected',
+      reconnect: mockReconnect,
+    }));
+
+    const { getByTestId } = renderWithProvider(
+      <PerpsProOrderBookPanel
+        symbol="BTC"
+        marketPrice={61470}
+        szDecimals={5}
+      />,
+      { state: { engine: { backgroundState } } },
+    );
+
+    expect(getByTestId(`${testID}-bid-row-0-price`)).toHaveTextContent(
+      '$61.47K',
+    );
+    expect(getByTestId(`${testID}-bid-row-1-price`)).toHaveTextContent(
+      '$61.46K',
+    );
+  });
+
+  it('renders every low-priced level at one precision so none collapse', () => {
+    // PUMP-style ladder: magnitude formatting stripped trailing zeros, so
+    // "0.0021" rendered two digits shorter than its neighbours.
+    const pumpOrderBook: OrderBookData = {
+      ...mockOrderBook,
+      midPrice: '0.0021',
+      bids: [
+        { ...mockOrderBook.bids[0], price: '0.002099' },
+        { ...mockOrderBook.bids[1], price: '0.0021' },
+      ],
+      asks: [
+        { ...mockOrderBook.asks[0], price: '0.002101' },
+        { ...mockOrderBook.asks[1], price: '0.002102' },
+      ],
+    };
+    mockUsePerpsLiveOrderBook.mockImplementation(() => ({
+      orderBook: pumpOrderBook,
+      isLoading: false,
+      error: null,
+      connectionStatus: 'connected',
+      reconnect: mockReconnect,
+    }));
+
+    const { getByTestId } = renderWithProvider(
+      <PerpsProOrderBookPanel
+        symbol="PUMP"
+        marketPrice={0.0021}
+        szDecimals={0}
+      />,
+      { state: { engine: { backgroundState } } },
+    );
+
+    expect(getByTestId(`${testID}-bid-row-0-price`)).toHaveTextContent(
+      '$0.002099',
+    );
+    expect(getByTestId(`${testID}-bid-row-1-price`)).toHaveTextContent(
+      '$0.002100',
+    );
+  });
+
   it('resets grouping to the new market preference when symbol changes', () => {
     mockSavedGroupingBySymbol.ETH = 1;
 
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderBookPanel.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderBookPanel.tsx
index 64450e80fda7..323dcadb7ba6 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderBookPanel.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderBookPanel.tsx
@@ -8,7 +8,10 @@ import {
   ButtonVariant,
   ButtonIcon,
   ButtonIconSize,
+  Icon,
+  IconColor,
   IconName,
+  IconSize,
   Skeleton,
   Text,
   TextColor,
@@ -16,8 +19,14 @@ import {
   FontWeight,
 } from '@metamask/design-system-react-native';
 import { getPerpsDisplaySymbol } from '@metamask/perps-controller';
+import { AnimationDuration } from '@metamask/design-tokens';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Pressable, View } from 'react-native';
+import Animated, {
+  useAnimatedStyle,
+  useSharedValue,
+  withTiming,
+} from 'react-native-reanimated';
 import { strings } from '../../../../../../../locales/i18n';
 import { useTheme } from '../../../../../../util/theme';
 import { PerpsProMarketViewSelectorsIDs } from '../../../Perps.testIds';
@@ -34,15 +43,18 @@ import {
   calculateAggregationParams,
   calculateGroupingOptions,
   formatColumnValue,
+  formatOrderBookPrice,
   formatSpreadPercent,
   getDepthRatio,
   getDepthWidth,
+  getOrderBookPriceFormat,
   groupOrderBook,
   FAST_ORDER_BOOK_LEVELS,
   ORDER_BOOK_AGGREGATED_LEVELS,
   selectDefaultGrouping,
   type OrderBookListCurrency,
   type OrderBookListMetric,
+  type OrderBookPriceFormat,
 } from '../../../utils/orderBookGrouping';
 import PerpsProOrderBookConfigSheet from './PerpsProOrderBookConfigSheet';
 import styles from './PerpsProOrderBookPanel.styles';
@@ -67,6 +79,14 @@ export interface PerpsProOrderBookPanelProps {
   onCollapse?: () => void;
 }
 
+/**
+ * Price and value share the row equally (Figma: two 62px columns with an 8px
+ * gutter). Fixed halves plus single-line text are what keep the two from
+ * running into each other once either side grows.
+ */
+const COLUMN_CLASS = 'relative z-10 flex-1';
+const VALUE_COLUMN_CLASS = `${COLUMN_CLASS} text-right`;
+
 interface OrderBookRowProps {
   level: OrderBookLevel;
   side: 'bid' | 'ask';
@@ -75,6 +95,7 @@ interface OrderBookRowProps {
   maxTotal: number;
   depthBarColor: string;
   szDecimals?: number;
+  priceFormat: OrderBookPriceFormat | null;
   onSelectPrice?: (price: string) => void;
   testID: string;
 }
@@ -87,6 +108,7 @@ const OrderBookRow = ({
   maxTotal,
   depthBarColor,
   szDecimals,
+  priceFormat,
   onSelectPrice,
   testID,
 }: OrderBookRowProps) => {
@@ -94,14 +116,29 @@ const OrderBookRow = ({
   const isBid = side === 'bid';
   const sideColor = isBid ? TextColor.SuccessDefault : TextColor.ErrorDefault;
 
+  // Ladder rows are reused positionally across live ticks (see key comment
+  // below), so this same instance's width target changes as new data
+  // arrives — animate that change instead of snapping the bar.
+  const depthWidthSv = useSharedValue(depthWidth);
+  useEffect(() => {
+    depthWidthSv.value = withTiming(depthWidth, {
+      duration: AnimationDuration.Fast,
+    });
+  }, [depthWidth, depthWidthSv]);
+  const depthBarAnimatedStyle = useAnimatedStyle(() => ({
+    width: `${depthWidthSv.value}%`,
+  }));
+
+  const priceLabel = formatOrderBookPrice(level.price, priceFormat);
+
   const content = (
     <>
-      <View
+      <Animated.View
         pointerEvents="none"
         style={[
           styles.depthBar,
+          depthBarAnimatedStyle,
           {
-            width: `${depthWidth}%`,
             backgroundColor: depthBarColor,
             opacity: DEPTH_BAR_OPACITY,
           },
@@ -111,16 +148,18 @@ const OrderBookRow = ({
         variant={TextVariant.BodyXs}
         fontWeight={FontWeight.Medium}
         color={sideColor}
-        twClassName="relative z-10"
+        numberOfLines={1}
+        twClassName={COLUMN_CLASS}
         testID={`${testID}-price`}
       >
-        {formatPerpsFiat(level.price, { ranges: PRICE_RANGES_UNIVERSAL })}
+        {priceLabel}
       </Text>
       <Text
         variant={TextVariant.BodyXs}
         fontWeight={FontWeight.Medium}
         color={sideColor}
-        twClassName="relative z-10"
+        numberOfLines={1}
+        twClassName={VALUE_COLUMN_CLASS}
         testID={`${testID}-value`}
       >
         {formatColumnValue(level, currency, metric, szDecimals)}
@@ -134,9 +173,7 @@ const OrderBookRow = ({
         onPress={() => onSelectPrice(level.price)}
         accessibilityRole="button"
         accessibilityLabel={strings('perps.order_book.use_price', {
-          price: formatPerpsFiat(level.price, {
-            ranges: PRICE_RANGES_UNIVERSAL,
-          }),
+          price: priceLabel,
         })}
         testID={testID}
         style={styles.interactiveRow}
@@ -144,8 +181,7 @@ const OrderBookRow = ({
         <Box
           flexDirection={BoxFlexDirection.Row}
           alignItems={BoxAlignItems.Center}
-          justifyContent={BoxJustifyContent.Between}
-          twClassName="relative h-full px-1"
+          twClassName="relative h-full gap-2"
         >
           {content}
         </Box>
@@ -157,8 +193,7 @@ const OrderBookRow = ({
     <Box
       flexDirection={BoxFlexDirection.Row}
       alignItems={BoxAlignItems.Center}
-      justifyContent={BoxJustifyContent.Between}
-      twClassName="relative h-8 px-1"
+      twClassName="relative h-8 gap-2"
       testID={testID}
     >
       {content}
@@ -166,6 +201,52 @@ const OrderBookRow = ({
   );
 };
 
+/**
+ * Buy/sell depth-ratio bars. Widths animate on change instead of snapping,
+ * since the ratio recomputes on every live order-book tick.
+ */
+const DepthRatioBars = ({
+  buyPercent,
+  sellPercent,
+  buyColor,
+  sellColor,
+}: {
+  buyPercent: number;
+  sellPercent: number;
+  buyColor: string;
+  sellColor: string;
+}) => {
+  const buyPercentSv = useSharedValue(buyPercent);
+  const sellPercentSv = useSharedValue(sellPercent);
+
+  useEffect(() => {
+    buyPercentSv.value = withTiming(buyPercent, {
+      duration: AnimationDuration.Fast,
+    });
+    sellPercentSv.value = withTiming(sellPercent, {
+      duration: AnimationDuration.Fast,
+    });
+  }, [buyPercent, sellPercent, buyPercentSv, sellPercentSv]);
+
+  const buyBarStyle = useAnimatedStyle(() => ({
+    width: `${buyPercentSv.value}%`,
+  }));
+  const sellBarStyle = useAnimatedStyle(() => ({
+    width: `${sellPercentSv.value}%`,
+  }));
+
+  return (
+    <>
+      <Animated.View
+        style={[styles.ratioBar, buyBarStyle, { backgroundColor: buyColor }]}
+      />
+      <Animated.View
+        style={[styles.ratioBar, sellBarStyle, { backgroundColor: sellColor }]}
+      />
+    </>
+  );
+};
+
 /**
  * View-toggle glyph: four left-aligned descending bars. Colors reflect the
  * active view (green = buy, red = sell), matching Extension's order-book
@@ -231,20 +312,19 @@ const OrderBookLadderSkeleton = ({ testID }: { testID: string }) => {
           alignItems={BoxAlignItems.Center}
           justifyContent={BoxJustifyContent.Between}
           style={styles.interactiveRow}
-          twClassName="px-1"
         >
           <Skeleton height={12} width="42%" />
           <Skeleton height={12} width="32%" />
         </Box>
       ))}
 
+      {/* Spread row: value only, right-aligned (no label). */}
       <Box
         flexDirection={BoxFlexDirection.Row}
         alignItems={BoxAlignItems.Center}
-        justifyContent={BoxJustifyContent.Between}
-        twClassName="h-8 px-1"
+        justifyContent={BoxJustifyContent.End}
+        twClassName="h-8"
       >
-        <Skeleton height={12} width="28%" />
         <Skeleton height={12} width="48%" />
       </Box>
 
@@ -256,7 +336,6 @@ const OrderBookLadderSkeleton = ({ testID }: { testID: string }) => {
           alignItems={BoxAlignItems.Center}
           justifyContent={BoxJustifyContent.Between}
           style={styles.interactiveRow}
-          twClassName="px-1"
         >
           <Skeleton height={12} width="42%" />
           <Skeleton height={12} width="32%" />
@@ -265,7 +344,7 @@ const OrderBookLadderSkeleton = ({ testID }: { testID: string }) => {
 
       <Box
         flexDirection={BoxFlexDirection.Column}
-        twClassName="gap-1 px-1 pt-2 pb-1"
+        twClassName="gap-1 pt-2 pb-1"
       >
         <Skeleton height={4} width="100%" twClassName="rounded-full" />
         <Box
@@ -390,6 +469,14 @@ const PerpsProOrderBookPanel = ({
     return calculateAggregationParams(currentGrouping, midPriceValue);
   }, [currentGrouping, midPriceValue]);
 
+  // One shared price format for the whole ladder, derived from the grouping
+  // step — see `getOrderBookPriceFormat` for why per-row magnitude formatting
+  // is not usable here.
+  const priceFormat = useMemo(
+    () => getOrderBookPriceFormat(currentGrouping, midPriceValue, szDecimals),
+    [currentGrouping, midPriceValue, szDecimals],
+  );
+
   // Server-aggregated book on its own dedicated socket (does not disturb raw).
   const {
     orderBook: aggregatedOrderBook,
@@ -417,6 +504,9 @@ const PerpsProOrderBookPanel = ({
     [aggregatedOrderBook],
   );
 
+  // Asks render above the spread, farthest-to-closest top to bottom (highest
+  // ask first) — the standard order-book convention, with the ask nearest
+  // the spread sitting right above it.
   const reversedAsks = useMemo(
     () => (grouped ? [...grouped.asks].reverse() : []),
     [grouped],
@@ -483,35 +573,42 @@ const PerpsProOrderBookPanel = ({
     <Box
       testID={testID}
       flexDirection={BoxFlexDirection.Column}
-      twClassName="flex-1 py-2"
+      collapsable={false}
+      twClassName="w-full py-2"
     >
-      {/* Header: left inset matches rows; settings sit flush on the right */}
+      {/* Header: collapse stays on the leading edge while settings stays flush
+          with the ladder's trailing edge. */}
       <Box
         flexDirection={BoxFlexDirection.Row}
         alignItems={BoxAlignItems.Center}
         justifyContent={BoxJustifyContent.Between}
-        twClassName="pb-1 pl-1"
+        twClassName="pb-1"
+        testID={`${testID}-header`}
+        accessible={false}
       >
-        <Pressable
-          onPress={handleCycleViewMode}
-          accessibilityRole="button"
-          accessibilityLabel={strings('perps.order_book.view_toggle')}
-          accessibilityValue={{ text: viewModeAccessibilityValue }}
-          testID={`${testID}-view-toggle`}
-          hitSlop={8}
-          style={styles.viewToggleButton}
-        >
-          <OrderBookViewIcon
-            mode={viewMode}
-            buyColor={buyColor}
-            sellColor={sellColor}
-          />
-        </Pressable>
-        <Box
-          flexDirection={BoxFlexDirection.Row}
-          alignItems={BoxAlignItems.Center}
-          twClassName="-mr-1 gap-1"
-        >
+        {/* Buy/sell-only view-toggle hidden for now (2026-07-30): the ladder
+            only ever shows ~5 rows/side today, so filtering to one side adds
+            little value. Logic (viewMode/handleCycleViewMode/showBids/
+            showAsks) is kept as-is so the button can be restored later by
+            un-gating this block. */}
+        {false && (
+          <Pressable
+            onPress={handleCycleViewMode}
+            accessibilityRole="button"
+            accessibilityLabel={strings('perps.order_book.view_toggle')}
+            accessibilityValue={{ text: viewModeAccessibilityValue }}
+            testID={`${testID}-view-toggle`}
+            hitSlop={8}
+            style={styles.viewToggleButton}
+          >
+            <OrderBookViewIcon
+              mode={viewMode}
+              buyColor={buyColor}
+              sellColor={sellColor}
+            />
+          </Pressable>
+        )}
+        <Box testID={`${testID}-header-leading`} accessible={false}>
           {onCollapse ? (
             <ButtonIcon
               iconName={IconName.Collapse}
@@ -521,6 +618,12 @@ const PerpsProOrderBookPanel = ({
               testID={PerpsProMarketViewSelectorsIDs.ORDER_BOOK_COLLAPSE_BUTTON}
             />
           ) : null}
+        </Box>
+        <Box
+          twClassName="-mr-1"
+          testID={`${testID}-header-trailing`}
+          accessible={false}
+        >
           <ButtonIcon
             iconName={IconName.Setting}
             accessibilityLabel={strings('perps.order_book.config_title')}
@@ -532,15 +635,13 @@ const PerpsProOrderBookPanel = ({
       </Box>
 
       {/* Column headers */}
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        justifyContent={BoxJustifyContent.Between}
-        twClassName="px-1 pb-1"
-      >
+      <Box flexDirection={BoxFlexDirection.Row} twClassName="gap-2 pb-1">
         <Text
           variant={TextVariant.BodyXs}
           fontWeight={FontWeight.Medium}
           color={TextColor.TextAlternative}
+          numberOfLines={1}
+          twClassName="flex-1"
         >
           {strings('perps.order_book.price')}
         </Text>
@@ -548,6 +649,8 @@ const PerpsProOrderBookPanel = ({
           variant={TextVariant.BodyXs}
           fontWeight={FontWeight.Medium}
           color={TextColor.TextAlternative}
+          numberOfLines={1}
+          twClassName="flex-1 text-right"
         >
           {`${metricLabel} (${unitLabel})`}
         </Text>
@@ -561,7 +664,7 @@ const PerpsProOrderBookPanel = ({
           flexDirection={BoxFlexDirection.Column}
           alignItems={BoxAlignItems.Center}
           justifyContent={BoxJustifyContent.Center}
-          twClassName="flex-1 gap-3 px-2"
+          twClassName="gap-3 px-2 py-8"
           testID={hasConnectionError ? `${testID}-connection-error` : undefined}
         >
           <Text
@@ -599,6 +702,7 @@ const PerpsProOrderBookPanel = ({
                   maxTotal={grouped.maxTotal}
                   depthBarColor={sellColor}
                   szDecimals={szDecimals}
+                  priceFormat={priceFormat}
                   onSelectPrice={onSelectPrice}
                   testID={`${testID}-ask-row-${index}`}
                 />
@@ -606,25 +710,26 @@ const PerpsProOrderBookPanel = ({
             </Box>
           )}
 
+          {/* Figma drops the "Spread" label and right-aligns the value on its
+              own, giving the figures the full column width. The row still
+              carries the label for screen readers, which would otherwise get
+              a bare amount with no indication of what it measures. */}
           <Box
             flexDirection={BoxFlexDirection.Row}
             alignItems={BoxAlignItems.Center}
-            justifyContent={BoxJustifyContent.Between}
-            twClassName="h-8 px-1"
+            twClassName="h-8"
             testID={`${testID}-spread`}
           >
-            <Text
-              variant={TextVariant.BodyXs}
-              fontWeight={FontWeight.Medium}
-              color={TextColor.TextAlternative}
-            >
-              {strings('perps.order_book.spread')}
-            </Text>
             {spreadDisplay ? (
               <Text
                 variant={TextVariant.BodyXs}
                 fontWeight={FontWeight.Medium}
                 color={TextColor.TextDefault}
+                numberOfLines={1}
+                twClassName="flex-1 text-right"
+                accessibilityLabel={strings('perps.order_book.spread_value', {
+                  value: spreadDisplay,
+                })}
               >
                 {spreadDisplay}
               </Text>
@@ -644,6 +749,7 @@ const PerpsProOrderBookPanel = ({
                   maxTotal={grouped.maxTotal}
                   depthBarColor={buyColor}
                   szDecimals={szDecimals}
+                  priceFormat={priceFormat}
                   onSelectPrice={onSelectPrice}
                   testID={`${testID}-bid-row-${index}`}
                 />
@@ -657,7 +763,7 @@ const PerpsProOrderBookPanel = ({
       {depthRatio ? (
         <Box
           flexDirection={BoxFlexDirection.Column}
-          twClassName="gap-1 px-1 pt-2 pb-1"
+          twClassName="gap-1 pt-2 pb-1"
           testID={`${testID}-ratio`}
         >
           <Box
@@ -669,48 +775,68 @@ const PerpsProOrderBookPanel = ({
               sell: String(depthRatio.sellPercent),
             })}
           >
-            <View
-              style={[
-                styles.ratioBar,
-                {
-                  width: `${depthRatio.buyPercent}%`,
-                  backgroundColor: buyColor,
-                },
-              ]}
-            />
-            <View
-              style={[
-                styles.ratioBar,
-                {
-                  width: `${depthRatio.sellPercent}%`,
-                  backgroundColor: sellColor,
-                },
-              ]}
+            <DepthRatioBars
+              buyPercent={depthRatio.buyPercent}
+              sellPercent={depthRatio.sellPercent}
+              buyColor={buyColor}
+              sellColor={sellColor}
             />
           </Box>
+          {/* Figma renders the buy/sell sides as "+ 80%" / "− 20%" rather than
+              spelled-out labels, to reduce clutter in the narrow column. The
+              sign glyph carries no meaning to a screen reader, so each side
+              keeps the spelled-out label as its accessibility label. */}
           <Box
             flexDirection={BoxFlexDirection.Row}
             justifyContent={BoxJustifyContent.Between}
             twClassName="w-full"
           >
-            <Text
-              variant={TextVariant.BodyXs}
-              fontWeight={FontWeight.Medium}
-              color={TextColor.SuccessDefault}
-            >
-              {strings('perps.order_book.buy_percent', {
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              twClassName="gap-0.5"
+              accessible
+              accessibilityLabel={strings('perps.order_book.buy_percent', {
                 percent: String(depthRatio.buyPercent),
               })}
-            </Text>
-            <Text
-              variant={TextVariant.BodyXs}
-              fontWeight={FontWeight.Medium}
-              color={TextColor.ErrorDefault}
+              testID={`${testID}-buy-percent`}
             >
-              {strings('perps.order_book.sell_percent', {
+              <Icon
+                name={IconName.Add}
+                size={IconSize.Xs}
+                color={IconColor.SuccessDefault}
+              />
+              <Text
+                variant={TextVariant.BodyXs}
+                fontWeight={FontWeight.Medium}
+                color={TextColor.SuccessDefault}
+              >
+                {`${depthRatio.buyPercent}%`}
+              </Text>
+            </Box>
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              twClassName="gap-0.5"
+              accessible
+              accessibilityLabel={strings('perps.order_book.sell_percent', {
                 percent: String(depthRatio.sellPercent),
               })}
-            </Text>
+              testID={`${testID}-sell-percent`}
+            >
+              <Icon
+                name={IconName.Minus}
+                size={IconSize.Xs}
+                color={IconColor.ErrorDefault}
+              />
+              <Text
+                variant={TextVariant.BodyXs}
+                fontWeight={FontWeight.Medium}
+                color={TextColor.ErrorDefault}
+              >
+                {`${depthRatio.sellPercent}%`}
+              </Text>
+            </Box>
           </Box>
         </Box>
       ) : null}
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderCard.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderCard.test.tsx
index 132e838113fe..089503689bf5 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderCard.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderCard.test.tsx
@@ -1,7 +1,8 @@
-import { render, screen } from '@testing-library/react-native';
+import { fireEvent, render, screen } from '@testing-library/react-native';
 import type { Order } from '@metamask/perps-controller';
 import React from 'react';
 import { useSelector } from 'react-redux';
+import { PerpsProMarketViewSelectorsIDs } from '../../../Perps.testIds';
 import PerpsProOrderCard from './PerpsProOrderCard';
 
 jest.mock('../../../components/PerpsTokenLogo', () => 'PerpsTokenLogo');
@@ -51,7 +52,7 @@ describe('PerpsProOrderCard', () => {
 
     expect(screen.getByText('SOL')).toBeOnTheScreen();
     expect(screen.getByText('Long')).toBeOnTheScreen();
-    expect(screen.getByText('Stop')).toBeOnTheScreen();
+    expect(screen.getByText('Stop market')).toBeOnTheScreen();
     expect(screen.getByText('13 SOL')).toBeOnTheScreen();
     // Trigger orders resolve display price from triggerPrice via
     // resolveOrderDisplayPriceAndLabel ($101), not the leftover order price.
@@ -63,6 +64,47 @@ describe('PerpsProOrderCard', () => {
     expect(screen.getByText('Cancel')).toBeOnTheScreen();
   });
 
+  it('shows edit affordance for editable limit orders', () => {
+    render(<PerpsProOrderCard order={baseOrder} onEditPrice={jest.fn()} />);
+
+    expect(screen.getByText('Edit')).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_EDIT),
+    ).toBeOnTheScreen();
+  });
+
+  it('shows size edit affordance when size handler is provided', () => {
+    render(<PerpsProOrderCard order={baseOrder} onEditSize={jest.fn()} />);
+
+    expect(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_SIZE_EDIT),
+    ).toBeOnTheScreen();
+  });
+
+  it('hides edit affordance when edit handler is omitted', () => {
+    render(<PerpsProOrderCard order={baseOrder} />);
+
+    expect(
+      screen.queryByTestId(PerpsProMarketViewSelectorsIDs.ORDER_EDIT),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('hides edit button when price edit is disabled (panel wiring)', () => {
+    // Production panel always supplies onEditPrice and toggles
+    // isEditPriceDisabled — ineligible orders must show no Edit affordance.
+    render(
+      <PerpsProOrderCard
+        order={baseOrder}
+        onEditPrice={jest.fn()}
+        isEditPriceDisabled
+      />,
+    );
+
+    expect(
+      screen.queryByTestId(PerpsProMarketViewSelectorsIDs.ORDER_EDIT),
+    ).not.toBeOnTheScreen();
+  });
+
   it('shows Price above for take-profit sell triggers', () => {
     render(
       <PerpsProOrderCard
@@ -111,7 +153,7 @@ describe('PerpsProOrderCard', () => {
         orderType: 'limit' as const,
         reduceOnly: false,
       },
-      typeLabel: 'Open limit',
+      typeLabel: 'Limit',
       directionLabel: 'Long',
       reduceOnlyLabel: 'No',
     },
@@ -125,7 +167,7 @@ describe('PerpsProOrderCard', () => {
         reduceOnly: true,
         isTrigger: false,
       },
-      typeLabel: 'Close limit',
+      typeLabel: 'Limit',
       directionLabel: 'Long',
       reduceOnlyLabel: 'Yes',
     },
@@ -139,7 +181,7 @@ describe('PerpsProOrderCard', () => {
         reduceOnly: true,
         isTrigger: false,
       },
-      typeLabel: 'Close limit',
+      typeLabel: 'Limit',
       directionLabel: 'Short',
       reduceOnlyLabel: 'Yes',
     },
@@ -167,7 +209,7 @@ describe('PerpsProOrderCard', () => {
         isTrigger: true,
         triggerPrice: '220',
       },
-      typeLabel: 'Take profit',
+      typeLabel: 'Take profit limit',
       directionLabel: 'Long',
       reduceOnlyLabel: 'Yes',
     },
@@ -182,7 +224,7 @@ describe('PerpsProOrderCard', () => {
         isTrigger: true,
         triggerPrice: '101',
       },
-      typeLabel: 'Stop',
+      typeLabel: 'Stop limit',
       directionLabel: 'Long',
       reduceOnlyLabel: 'Yes',
     },
@@ -197,7 +239,7 @@ describe('PerpsProOrderCard', () => {
         isTrigger: true,
         triggerPrice: '101',
       },
-      typeLabel: 'Stop',
+      typeLabel: 'Stop market',
       directionLabel: 'Short',
       reduceOnlyLabel: 'Yes',
     },
@@ -212,6 +254,61 @@ describe('PerpsProOrderCard', () => {
     },
   );
 
+  it('exposes the order type pill via testID', () => {
+    render(
+      <PerpsProOrderCard
+        order={{
+          ...baseOrder,
+          detailedOrderType: 'Stop Market',
+          orderType: 'market',
+          isTrigger: true,
+        }}
+      />,
+    );
+
+    expect(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_TYPE),
+    ).toHaveTextContent('Stop market');
+  });
+
+  it('invokes the market switch handler when the card is pressed', () => {
+    const onPress = jest.fn();
+
+    render(<PerpsProOrderCard order={baseOrder} onPress={onPress} />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_ROW),
+    );
+
+    expect(onPress).toHaveBeenCalledWith(baseOrder);
+  });
+
+  it('exposes the market switch as a labelled action for screen readers', () => {
+    render(<PerpsProOrderCard order={baseOrder} onPress={jest.fn()} />);
+
+    expect(screen.getByLabelText('Switch to the SOL market')).toBeOnTheScreen();
+  });
+
+  it('keeps cancel scoped to its own handler when the card is pressable', () => {
+    const onPress = jest.fn();
+    const onCancel = jest.fn();
+
+    render(
+      <PerpsProOrderCard
+        order={baseOrder}
+        onPress={onPress}
+        onCancel={onCancel}
+      />,
+    );
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_CANCEL),
+    );
+
+    expect(onCancel).toHaveBeenCalledWith(baseOrder);
+    expect(onPress).not.toHaveBeenCalled();
+  });
+
   describe('Privacy Mode', () => {
     it('hides monetary values but keeps size and labels visible', () => {
       (useSelector as jest.Mock).mockReturnValue(true);
@@ -227,7 +324,7 @@ describe('PerpsProOrderCard', () => {
       );
 
       expect(screen.getByText('13 SOL')).toBeOnTheScreen();
-      expect(screen.getByText('Open limit')).toBeOnTheScreen();
+      expect(screen.getByText('Limit')).toBeOnTheScreen();
       expect(screen.getByText('SOL')).toBeOnTheScreen();
       expect(screen.queryByText('$160.71')).toBeNull();
       expect(screen.queryByText('$220 / $130')).toBeNull();
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderCard.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderCard.tsx
index 86989b8ceaa6..6affad51870a 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderCard.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderCard.tsx
@@ -24,6 +24,7 @@ import {
   type Order,
 } from '@metamask/perps-controller';
 import React from 'react';
+import { Pressable } from 'react-native';
 import { useSelector } from 'react-redux';
 import { strings } from '../../../../../../../locales/i18n';
 import { selectPrivacyMode } from '../../../../../../selectors/preferencesController';
@@ -35,8 +36,8 @@ import {
   formatProOrderCardTimestamp,
   PRICE_RANGES_UNIVERSAL,
 } from '../../../utils/formatUtils';
-import { isClosingOrder } from '../../../utils/orderDirection';
 import {
+  formatOrderTypeLabel,
   getOrderPositionDirection,
   getValidTriggerPrice,
   inferTriggerConditionKey,
@@ -47,42 +48,79 @@ import {
 interface PerpsProOrderCardProps {
   order: Order;
   testID?: string;
+  /** Switches the Pro screen to this order's market. */
+  onPress?: (order: Order) => void;
+  onCancel?: (order: Order) => void;
+  onEditPrice?: (order: Order) => void;
+  onEditSize?: (order: Order) => void;
+  isCancelDisabled?: boolean;
+  isEditPriceDisabled?: boolean;
+  isEditSizeDisabled?: boolean;
 }
 
 interface KeyValueItemProps {
   label: string;
   value: string;
-  isEditable?: boolean;
   isHidden?: boolean;
+  onValuePress?: () => void;
+  valuePressTestID?: string;
+  valuePressAccessibilityLabel?: string;
+  showEditIcon?: boolean;
 }
 
 const KeyValueItem = ({
   label,
   value,
-  isEditable = false,
   isHidden = false,
-}: KeyValueItemProps) => (
-  <Box>
-    <Text variant={TextVariant.BodyXs} color={TextColor.TextAlternative}>
-      {label}
-    </Text>
-    <Box
-      flexDirection={BoxFlexDirection.Row}
-      alignItems={BoxAlignItems.Center}
-      twClassName="gap-1"
+  onValuePress,
+  valuePressTestID,
+  valuePressAccessibilityLabel,
+  showEditIcon = false,
+}: KeyValueItemProps) => {
+  const valueContent = (
+    <SensitiveText
+      variant={TextVariant.BodyXs}
+      fontWeight={FontWeight.Medium}
+      isHidden={isHidden}
+      length={SensitiveTextLength.Short}
     >
-      <SensitiveText
-        variant={TextVariant.BodyXs}
-        fontWeight={FontWeight.Medium}
-        isHidden={isHidden}
-        length={SensitiveTextLength.Short}
-      >
-        {value}
-      </SensitiveText>
-      {isEditable && <Icon name={IconName.Edit} size={IconSize.Sm} />}
+      {value}
+    </SensitiveText>
+  );
+
+  return (
+    <Box>
+      <Text variant={TextVariant.BodyXs} color={TextColor.TextAlternative}>
+        {label}
+      </Text>
+      {onValuePress ? (
+        <Pressable
+          onPress={onValuePress}
+          testID={valuePressTestID}
+          accessibilityRole="button"
+          accessibilityLabel={valuePressAccessibilityLabel}
+        >
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            // Long values (e.g. "205.02 CASHCAT") can wrap to two lines in
+            // this narrow column; flex-wrap keeps the edit icon within the
+            // column bounds (dropping to its own line) instead of
+            // overflowing into the neighboring column.
+            twClassName="flex-wrap gap-1"
+          >
+            {valueContent}
+            {showEditIcon ? (
+              <Icon name={IconName.Edit} size={IconSize.Sm} />
+            ) : null}
+          </Box>
+        </Pressable>
+      ) : (
+        valueContent
+      )}
     </Box>
-  </Box>
-);
+  );
+};
 
 const formatOptionalPrice = (price?: string): string => {
   const parsedPrice = Number.parseFloat(price ?? '');
@@ -91,26 +129,21 @@ const formatOptionalPrice = (price?: string): string => {
     : PERPS_CONSTANTS.FallbackPriceDisplay;
 };
 
-const getOrderTypeLabel = (order: Order): string => {
-  const detailedType = order.detailedOrderType?.toLowerCase() ?? '';
-  if (detailedType.includes('take profit')) {
-    return strings('perps.pro_positions_panel.order_card.take_profit');
-  }
-  if (detailedType.includes('stop')) {
-    return strings('perps.pro_positions_panel.order_card.stop');
-  }
-  if (order.orderType === 'limit') {
-    return isClosingOrder(order)
-      ? strings('perps.pro_positions_panel.order_card.close_limit')
-      : strings('perps.pro_positions_panel.order_card.open_limit');
-  }
-  return strings('perps.order.market');
-};
-
 /**
- * Read-only summary of an open perps order in the Pro market view.
+ * Summary of an open perps order in the Pro market view with cancel and
+ * in-place limit price and size edit actions when the venue allows.
  */
-const PerpsProOrderCard = ({ order, testID }: PerpsProOrderCardProps) => {
+const PerpsProOrderCard = ({
+  order,
+  testID,
+  onPress,
+  onCancel,
+  onEditPrice,
+  onEditSize,
+  isCancelDisabled = false,
+  isEditPriceDisabled = false,
+  isEditSizeDisabled = false,
+}: PerpsProOrderCardProps) => {
   const privacyMode = useSelector(selectPrivacyMode);
   const displaySymbol = getPerpsDisplaySymbol(order.symbol);
   const direction = getOrderPositionDirection(order);
@@ -118,6 +151,8 @@ const PerpsProOrderCard = ({ order, testID }: PerpsProOrderCardProps) => {
   const size = formatPositionSize(order.originalSize);
   const { priceValue } = resolveOrderDisplayPriceAndLabel(order);
   const validTriggerPrice = getValidTriggerPrice(order);
+  const canEditPrice = Boolean(onEditPrice) && !isEditPriceDisabled;
+  const canEditSize = Boolean(onEditSize) && !isEditSizeDisabled;
   const orderValue =
     priceValue === null
       ? PERPS_CONSTANTS.FallbackPriceDisplay
@@ -153,118 +188,187 @@ const PerpsProOrderCard = ({ order, testID }: PerpsProOrderCardProps) => {
     order.takeProfitPrice,
   )} / ${formatOptionalPrice(order.stopLossPrice)}`;
 
+  const handlePress = onPress ? () => onPress(order) : undefined;
+
+  const handleEditPricePress = () => {
+    onEditPrice?.(order);
+  };
+
+  const handleEditSizePress = () => {
+    onEditSize?.(order);
+  };
+
   return (
-    <Box
-      twClassName="gap-3 py-3"
+    // The card owns cancel/edit buttons, so this wrapper stays out of the
+    // accessibility tree to avoid collapsing it into a single element. The
+    // header below repeats the handler as the labelled, screen-reader-reachable
+    // entry point for the same action.
+    <Pressable
+      onPress={handlePress}
+      disabled={!handlePress}
+      accessible={false}
       testID={testID ?? PerpsProMarketViewSelectorsIDs.ORDER_ROW}
     >
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Center}
-        justifyContent={BoxJustifyContent.Between}
-        twClassName="gap-4 px-4 py-2"
-      >
-        <Box
-          flexDirection={BoxFlexDirection.Row}
-          alignItems={BoxAlignItems.Center}
-          twClassName="flex-1 gap-4"
+      <Box twClassName="gap-3 py-3">
+        <Pressable
+          onPress={handlePress}
+          disabled={!handlePress}
+          accessibilityRole={handlePress ? 'button' : undefined}
+          accessibilityLabel={
+            handlePress
+              ? strings('perps.pro_positions_panel.view_market_accessibility', {
+                  symbol: displaySymbol,
+                })
+              : undefined
+          }
         >
-          <PerpsTokenLogo symbol={order.symbol} size={40} />
-          <Box>
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Between}
+            twClassName="gap-4 px-2 py-2"
+          >
             <Box
               flexDirection={BoxFlexDirection.Row}
               alignItems={BoxAlignItems.Center}
-              twClassName="gap-1"
+              twClassName="flex-1 gap-4"
             >
-              <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
-                {displaySymbol}
-              </Text>
-              <Tag severity={isLong ? TagSeverity.Success : TagSeverity.Danger}>
-                {isLong
-                  ? strings('perps.market.long')
-                  : strings('perps.market.short')}
-              </Tag>
+              <PerpsTokenLogo symbol={order.symbol} size={40} />
+              <Box>
+                <Box
+                  flexDirection={BoxFlexDirection.Row}
+                  alignItems={BoxAlignItems.Center}
+                  twClassName="gap-1"
+                >
+                  <Text
+                    variant={TextVariant.BodyMd}
+                    fontWeight={FontWeight.Medium}
+                  >
+                    {displaySymbol}
+                  </Text>
+                  <Tag
+                    severity={isLong ? TagSeverity.Success : TagSeverity.Danger}
+                  >
+                    {isLong
+                      ? strings('perps.market.long')
+                      : strings('perps.market.short')}
+                  </Tag>
+                </Box>
+                <Text
+                  variant={TextVariant.BodySm}
+                  fontWeight={FontWeight.Medium}
+                  color={TextColor.TextAlternative}
+                >
+                  {formatProOrderCardTimestamp(order.timestamp)}
+                </Text>
+              </Box>
             </Box>
-            <Text
-              variant={TextVariant.BodySm}
-              fontWeight={FontWeight.Medium}
-              color={TextColor.TextAlternative}
+            <Tag
+              severity={TagSeverity.Neutral}
+              testID={PerpsProMarketViewSelectorsIDs.ORDER_TYPE}
             >
-              {formatProOrderCardTimestamp(order.timestamp)}
-            </Text>
+              {formatOrderTypeLabel(order)}
+            </Tag>
           </Box>
-        </Box>
-        <Tag severity={TagSeverity.Neutral}>{getOrderTypeLabel(order)}</Tag>
-      </Box>
+        </Pressable>
 
-      <Box twClassName="px-4">
-        <Box
-          flexDirection={BoxFlexDirection.Row}
-          alignItems={BoxAlignItems.Center}
-          twClassName="gap-4 rounded-xl border border-muted px-4 py-2"
-        >
-          <Box twClassName="flex-1 gap-6">
-            <KeyValueItem
-              label={strings('perps.pro_positions_panel.order_card.size')}
-              value={`${size} ${displaySymbol}`}
-              isEditable
-            />
-            <KeyValueItem
-              label={strings(
-                'perps.pro_positions_panel.order_card.reduce_only',
-              )}
-              value={
-                order.reduceOnly
-                  ? strings('perps.order_details.yes')
-                  : strings('perps.order_details.no')
-              }
-            />
-          </Box>
-          <Box twClassName="flex-1 gap-6">
-            <KeyValueItem
-              label={strings(
-                'perps.pro_positions_panel.order_card.order_value',
-              )}
-              value={orderValue}
-              isHidden={privacyMode}
-            />
-            <KeyValueItem
-              label={strings('perps.pro_positions_panel.order_card.tp_sl')}
-              value={tpSl}
-              isEditable
-              isHidden={privacyMode}
-            />
-          </Box>
-          <Box twClassName="min-w-[120px] gap-6">
-            <KeyValueItem
-              label={strings('perps.pro_positions_panel.order_card.price')}
-              value={price}
-              isEditable
-              isHidden={privacyMode}
-            />
-            <KeyValueItem
-              label={strings(
-                'perps.pro_positions_panel.order_card.trigger_condition',
-              )}
-              value={triggerCondition}
-              isHidden={privacyMode}
-            />
+        <Box twClassName="px-2">
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="gap-4 rounded-xl border border-muted px-4 py-2"
+          >
+            <Box twClassName="flex-1 gap-6">
+              <KeyValueItem
+                label={strings('perps.pro_positions_panel.order_card.size')}
+                value={`${size} ${displaySymbol}`}
+                onValuePress={canEditSize ? handleEditSizePress : undefined}
+                valuePressTestID={
+                  PerpsProMarketViewSelectorsIDs.ORDER_SIZE_EDIT
+                }
+                valuePressAccessibilityLabel={strings(
+                  'perps.pro_positions_panel.order_card.edit_size',
+                )}
+                showEditIcon={canEditSize}
+              />
+              <KeyValueItem
+                label={strings(
+                  'perps.pro_positions_panel.order_card.reduce_only',
+                )}
+                value={
+                  order.reduceOnly
+                    ? strings('perps.order_details.yes')
+                    : strings('perps.order_details.no')
+                }
+              />
+            </Box>
+            <Box twClassName="flex-1 gap-6">
+              <KeyValueItem
+                label={strings(
+                  'perps.pro_positions_panel.order_card.order_value',
+                )}
+                value={orderValue}
+                isHidden={privacyMode}
+              />
+              <KeyValueItem
+                label={strings('perps.pro_positions_panel.order_card.tp_sl')}
+                value={tpSl}
+                isHidden={privacyMode}
+              />
+            </Box>
+            <Box twClassName="min-w-[120px] gap-6">
+              <KeyValueItem
+                label={strings('perps.pro_positions_panel.order_card.price')}
+                value={price}
+                isHidden={privacyMode}
+                onValuePress={canEditPrice ? handleEditPricePress : undefined}
+                valuePressTestID={
+                  PerpsProMarketViewSelectorsIDs.ORDER_PRICE_EDIT
+                }
+                valuePressAccessibilityLabel={strings(
+                  'perps.pro_positions_panel.order_card.edit_price',
+                )}
+                showEditIcon={canEditPrice}
+              />
+              <KeyValueItem
+                label={strings(
+                  'perps.pro_positions_panel.order_card.trigger_condition',
+                )}
+                value={triggerCondition}
+                isHidden={privacyMode}
+              />
+            </Box>
           </Box>
         </Box>
-      </Box>
 
-      <Box twClassName="px-4">
-        <Button
-          variant={ButtonVariant.Secondary}
-          size={ButtonSize.Sm}
-          isDanger
-          startIconName={IconName.Close}
-          twClassName="w-full border-muted bg-background-default"
-        >
-          {strings('perps.pro_positions_panel.order_card.cancel')}
-        </Button>
+        <Box flexDirection={BoxFlexDirection.Row} twClassName="gap-2 px-2">
+          {onEditPrice && !isEditPriceDisabled ? (
+            <Button
+              variant={ButtonVariant.Secondary}
+              size={ButtonSize.Sm}
+              startIconName={IconName.Edit}
+              twClassName="flex-1 border-muted bg-background-default"
+              onPress={handleEditPricePress}
+              testID={PerpsProMarketViewSelectorsIDs.ORDER_EDIT}
+            >
+              {strings('perps.pro_positions_panel.order_card.edit')}
+            </Button>
+          ) : null}
+          <Button
+            variant={ButtonVariant.Secondary}
+            size={ButtonSize.Sm}
+            isDanger
+            startIconName={IconName.Close}
+            twClassName="flex-1 border-muted bg-background-default"
+            onPress={() => onCancel?.(order)}
+            isDisabled={isCancelDisabled}
+            testID={PerpsProMarketViewSelectorsIDs.ORDER_CANCEL}
+          >
+            {strings('perps.pro_positions_panel.order_card.cancel')}
+          </Button>
+        </Box>
       </Box>
-    </Box>
+    </Pressable>
   );
 };
 
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderEditSheets.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderEditSheets.test.tsx
new file mode 100644
index 000000000000..af329f8d4e3f
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderEditSheets.test.tsx
@@ -0,0 +1,198 @@
+import type { Order } from '@metamask/perps-controller';
+import { render, screen } from '@testing-library/react-native';
+import React from 'react';
+import PerpsProOrderEditSheets from './PerpsProOrderEditSheets';
+
+jest.mock('./PerpsProPositionsModalPortal', () => {
+  const { View } = jest.requireActual('react-native');
+  return function PerpsProPositionsModalPortal({
+    children,
+  }: {
+    children: React.ReactNode;
+  }) {
+    return <View testID="perps-order-edit-portal">{children}</View>;
+  };
+});
+
+jest.mock(
+  '../../../components/PerpsLimitPriceBottomSheet/PerpsLimitPriceBottomSheet',
+  () => {
+    const { View, Text } = jest.requireActual('react-native');
+    return function PerpsLimitPriceBottomSheet({
+      asset,
+      limitPrice,
+      direction,
+    }: {
+      asset: string;
+      limitPrice: string;
+      direction: string;
+    }) {
+      return (
+        <View testID="perps-limit-price-bottom-sheet">
+          <Text testID="limit-sheet-asset">{asset}</Text>
+          <Text testID="limit-sheet-price">{limitPrice}</Text>
+          <Text testID="limit-sheet-direction">{direction}</Text>
+        </View>
+      );
+    };
+  },
+);
+
+jest.mock(
+  '../../../components/PerpsOrderSizeBottomSheet/PerpsOrderSizeBottomSheet',
+  () => {
+    const { View, Text } = jest.requireActual('react-native');
+    return function PerpsOrderSizeBottomSheet({
+      asset,
+      orderSize,
+      limitPrice,
+      szDecimals,
+      leverage,
+      reduceOnly,
+      isMarketDataReady,
+    }: {
+      asset: string;
+      orderSize?: string;
+      limitPrice?: string;
+      szDecimals?: number;
+      leverage?: number;
+      reduceOnly?: boolean;
+      isMarketDataReady?: boolean;
+    }) {
+      return (
+        <View testID="perps-order-size-bottom-sheet">
+          <Text testID="size-sheet-asset">{asset}</Text>
+          <Text testID="size-sheet-size">{orderSize}</Text>
+          <Text testID="size-sheet-price">{limitPrice}</Text>
+          <Text testID="size-sheet-decimals">{String(szDecimals)}</Text>
+          <Text testID="size-sheet-leverage">{String(leverage)}</Text>
+          <Text testID="size-sheet-reduce-only">{String(reduceOnly)}</Text>
+          <Text testID="size-sheet-market-ready">
+            {String(isMarketDataReady)}
+          </Text>
+        </View>
+      );
+    };
+  },
+);
+
+const editingOrder: Order = {
+  orderId: 'order-1',
+  symbol: 'SOL',
+  side: 'buy',
+  size: '1',
+  originalSize: '1',
+  filledSize: '0',
+  remainingSize: '1',
+  price: '160.71',
+  orderType: 'limit',
+  status: 'open',
+  timestamp: 1_711_756_800_000,
+  reduceOnly: false,
+  isTrigger: false,
+};
+
+describe('PerpsProOrderEditSheets', () => {
+  const onClose = jest.fn();
+  const onConfirmPrice = jest.fn();
+  const onConfirmSize = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders nothing when there is no editing order', () => {
+    render(
+      <PerpsProOrderEditSheets
+        editingOrder={null}
+        editingOrderSheet="price"
+        editingOrderSzDecimals={3}
+        editingOrderLeverage={25}
+        isEditingOrderMarketDataReady
+        onClose={onClose}
+        onConfirmPrice={onConfirmPrice}
+        onConfirmSize={onConfirmSize}
+      />,
+    );
+
+    expect(
+      screen.queryByTestId('perps-limit-price-bottom-sheet'),
+    ).not.toBeOnTheScreen();
+    expect(
+      screen.queryByTestId('perps-order-size-bottom-sheet'),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('renders nothing when no sheet field is selected', () => {
+    render(
+      <PerpsProOrderEditSheets
+        editingOrder={editingOrder}
+        editingOrderSheet={null}
+        editingOrderSzDecimals={3}
+        editingOrderLeverage={25}
+        isEditingOrderMarketDataReady
+        onClose={onClose}
+        onConfirmPrice={onConfirmPrice}
+        onConfirmSize={onConfirmSize}
+      />,
+    );
+
+    expect(
+      screen.queryByTestId('perps-limit-price-bottom-sheet'),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('renders the limit price sheet for a price edit', () => {
+    render(
+      <PerpsProOrderEditSheets
+        editingOrder={editingOrder}
+        editingOrderSheet="price"
+        editingOrderSzDecimals={3}
+        editingOrderLeverage={25}
+        isEditingOrderMarketDataReady
+        onClose={onClose}
+        onConfirmPrice={onConfirmPrice}
+        onConfirmSize={onConfirmSize}
+      />,
+    );
+
+    expect(
+      screen.getByTestId('perps-limit-price-bottom-sheet'),
+    ).toBeOnTheScreen();
+    expect(screen.getByTestId('limit-sheet-asset')).toHaveTextContent('SOL');
+    expect(screen.getByTestId('limit-sheet-price')).toHaveTextContent('160.71');
+    expect(screen.getByTestId('limit-sheet-direction')).toHaveTextContent(
+      'long',
+    );
+  });
+
+  it('renders the size sheet with market and order props', () => {
+    render(
+      <PerpsProOrderEditSheets
+        editingOrder={{ ...editingOrder, reduceOnly: true }}
+        editingOrderSheet="size"
+        editingOrderSzDecimals={4}
+        editingOrderLeverage={40}
+        isEditingOrderMarketDataReady={false}
+        onClose={onClose}
+        onConfirmPrice={onConfirmPrice}
+        onConfirmSize={onConfirmSize}
+      />,
+    );
+
+    expect(
+      screen.getByTestId('perps-order-size-bottom-sheet'),
+    ).toBeOnTheScreen();
+    expect(screen.getByTestId('size-sheet-asset')).toHaveTextContent('SOL');
+    expect(screen.getByTestId('size-sheet-size')).toHaveTextContent('1');
+    expect(screen.getByTestId('size-sheet-price')).toHaveTextContent('160.71');
+    expect(screen.getByTestId('size-sheet-decimals')).toHaveTextContent('4');
+    expect(screen.getByTestId('size-sheet-leverage')).toHaveTextContent('40');
+    expect(screen.getByTestId('size-sheet-reduce-only')).toHaveTextContent(
+      'true',
+    );
+    expect(screen.getByTestId('size-sheet-market-ready')).toHaveTextContent(
+      'false',
+    );
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderEditSheets.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderEditSheets.tsx
new file mode 100644
index 000000000000..b5e1941b5099
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderEditSheets.tsx
@@ -0,0 +1,80 @@
+import type { Order } from '@metamask/perps-controller';
+import React from 'react';
+import PerpsLimitPriceBottomSheet from '../../../components/PerpsLimitPriceBottomSheet/PerpsLimitPriceBottomSheet';
+import PerpsOrderSizeBottomSheet from '../../../components/PerpsOrderSizeBottomSheet/PerpsOrderSizeBottomSheet';
+import { isClosingOrder } from '../../../utils/orderDirection';
+import {
+  getOrderEditableLimitPrice,
+  getOrderEditableSize,
+  type OrderEditField,
+} from '../../../utils/orderEditUtils';
+import { getOrderPositionDirection } from '../../../utils/orderUtils';
+import PerpsProPositionsModalPortal from './PerpsProPositionsModalPortal';
+
+interface PerpsProOrderEditSheetsProps {
+  editingOrder: Order | null;
+  editingOrderSheet: OrderEditField | null;
+  editingOrderSzDecimals: number;
+  editingOrderLeverage: number;
+  isEditingOrderMarketDataReady: boolean;
+  onClose: () => void;
+  onConfirmPrice: (limitPrice: string) => void;
+  onConfirmSize: (size: string) => void;
+}
+
+/**
+ * Shared Pro order edit sheets (limit price and size) rendered in a portal.
+ */
+const PerpsProOrderEditSheets = ({
+  editingOrder,
+  editingOrderSheet,
+  editingOrderSzDecimals,
+  editingOrderLeverage,
+  isEditingOrderMarketDataReady,
+  onClose,
+  onConfirmPrice,
+  onConfirmSize,
+}: PerpsProOrderEditSheetsProps) => {
+  if (!editingOrder || !editingOrderSheet) {
+    return null;
+  }
+
+  if (editingOrderSheet === 'price') {
+    return (
+      <PerpsProPositionsModalPortal onRequestClose={onClose}>
+        <PerpsLimitPriceBottomSheet
+          isVisible
+          asset={editingOrder.symbol}
+          limitPrice={getOrderEditableLimitPrice(editingOrder)}
+          direction={getOrderPositionDirection(editingOrder)}
+          isClosingPosition={isClosingOrder(editingOrder)}
+          restingOrderSize={getOrderEditableSize(editingOrder)}
+          leverage={editingOrderLeverage}
+          reduceOnly={editingOrder.reduceOnly}
+          isMarketDataReady={isEditingOrderMarketDataReady}
+          onClose={onClose}
+          onConfirm={onConfirmPrice}
+        />
+      </PerpsProPositionsModalPortal>
+    );
+  }
+
+  return (
+    <PerpsProPositionsModalPortal onRequestClose={onClose}>
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset={editingOrder.symbol}
+        orderSize={getOrderEditableSize(editingOrder)}
+        limitPrice={getOrderEditableLimitPrice(editingOrder)}
+        szDecimals={editingOrderSzDecimals}
+        leverage={editingOrderLeverage}
+        reduceOnly={editingOrder.reduceOnly}
+        isMarketDataReady={isEditingOrderMarketDataReady}
+        onClose={onClose}
+        onConfirm={onConfirmSize}
+      />
+    </PerpsProPositionsModalPortal>
+  );
+};
+
+export default React.memo(PerpsProOrderEditSheets);
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProCompactInput.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProCompactInput.test.tsx
new file mode 100644
index 000000000000..5ece06d60cd0
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProCompactInput.test.tsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import PerpsProCompactInput from './PerpsProCompactInput';
+
+// Mock Input to expose a spyable `focus` via its forwarded ref, mirroring the
+// design system's real `forwardRef<TextInput>` contract.
+const mockInputFocus = jest.fn();
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  const MockReact = jest.requireActual('react');
+  const { TextInput } = jest.requireActual('react-native');
+  return {
+    ...actual,
+    Input: MockReact.forwardRef(
+      (props: Record<string, unknown>, ref: React.Ref<unknown>) => {
+        MockReact.useImperativeHandle(ref, () => ({ focus: mockInputFocus }));
+        return MockReact.createElement(TextInput, props);
+      },
+    ),
+  };
+});
+
+const defaultProps = {
+  label: 'Size (USD)',
+  value: '',
+  onChangeText: jest.fn(),
+  testID: 'size-input',
+};
+
+describe('PerpsProCompactInput', () => {
+  beforeEach(() => {
+    // Clears every mock's call history — including `defaultProps.onChangeText`,
+    // which is shared across tests since `defaultProps` is a module-level
+    // constant — not just `mockInputFocus`, so stale call counts can't bleed
+    // between tests.
+    jest.clearAllMocks();
+  });
+
+  it('focuses the input when the label is pressed', () => {
+    render(<PerpsProCompactInput {...defaultProps} />);
+
+    fireEvent.press(screen.getByText('Size (USD)'));
+
+    expect(mockInputFocus).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not focus the input on render, only on label press', () => {
+    render(<PerpsProCompactInput {...defaultProps} />);
+
+    expect(mockInputFocus).not.toHaveBeenCalled();
+  });
+
+  it('uses the custom keyboard accessory without requesting a native Done key', () => {
+    render(<PerpsProCompactInput {...defaultProps} />);
+
+    expect(screen.getByTestId(defaultProps.testID)).toHaveProp(
+      'inputAccessoryViewID',
+    );
+    expect(screen.getByTestId(defaultProps.testID)).not.toHaveProp(
+      'returnKeyType',
+    );
+    expect(screen.getByTestId(defaultProps.testID)).not.toHaveProp(
+      'onSubmitEditing',
+    );
+  });
+
+  it('adds top spacing above the footer to match the Figma slider row', () => {
+    render(<PerpsProCompactInput {...defaultProps} footer={<></>} />);
+
+    expect(screen.getByTestId(`${defaultProps.testID}-footer`)).toHaveStyle({
+      marginTop: 12,
+    });
+  });
+
+  it('omits the footer wrapper entirely when no footer is provided', () => {
+    render(<PerpsProCompactInput {...defaultProps} />);
+
+    expect(
+      screen.queryByTestId(`${defaultProps.testID}-footer`),
+    ).not.toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProCompactInput.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProCompactInput.tsx
index d1c439efcdc3..2bdbbf95ea67 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProCompactInput.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProCompactInput.tsx
@@ -6,8 +6,8 @@ import {
   TextVariant,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import React from 'react';
-import { Keyboard, Platform } from 'react-native';
+import React, { useRef } from 'react';
+import { Platform, Pressable, type TextInput } from 'react-native';
 
 export const getPerpsProInputAccessoryID = (testID: string) =>
   `${testID}-input-accessory`;
@@ -18,10 +18,13 @@ interface PerpsProCompactInputProps {
   onChangeText: (value: string) => void;
   testID: string;
   variant?: 'stacked' | 'inline';
+  startAccessory?: React.ReactNode;
   endAccessory?: React.ReactNode;
   footer?: React.ReactNode;
   placeholder?: string;
   placeholderColor?: 'default' | 'muted';
+  onFocus?: () => void;
+  onBlur?: () => void;
 }
 
 const PerpsProCompactInput = ({
@@ -30,28 +33,34 @@ const PerpsProCompactInput = ({
   onChangeText,
   testID,
   variant = 'stacked',
+  startAccessory,
   endAccessory,
   footer,
   placeholder = '0',
   placeholderColor = 'muted',
+  onFocus,
+  onBlur,
 }: PerpsProCompactInputProps) => {
   const tw = useTailwind();
+  const inputRef = useRef<TextInput>(null);
   const inputAccessoryViewID =
     Platform.OS === 'ios' ? getPerpsProInputAccessoryID(testID) : undefined;
+  const focusInput = () => inputRef.current?.focus();
 
   const input = (
     <Input
+      ref={inputRef}
       value={value}
       onChangeText={onChangeText}
       keyboardType="decimal-pad"
-      returnKeyType="done"
-      onSubmitEditing={Keyboard.dismiss}
+      onFocus={onFocus}
+      onBlur={onBlur}
       inputAccessoryViewID={inputAccessoryViewID}
       placeholder={placeholder}
       placeholderTextColor={tw.color(`text-${placeholderColor}`)}
       textVariant={TextVariant.BodySm}
       isStateStylesDisabled
-      twClassName="flex-1 border-0 bg-transparent p-0 font-medium"
+      twClassName="flex-1 border-0 bg-transparent p-0"
       testID={testID}
       accessibilityLabel={label}
     />
@@ -63,7 +72,10 @@ const PerpsProCompactInput = ({
         twClassName="h-12 flex-row items-center border-t border-muted px-3"
         testID={`${testID}-container`}
       >
-        {input}
+        <Box twClassName="min-w-0 flex-1 flex-row items-center">
+          {startAccessory}
+          {input}
+        </Box>
         {endAccessory}
       </Box>
     );
@@ -72,13 +84,24 @@ const PerpsProCompactInput = ({
   return (
     <Box twClassName="rounded-xl bg-muted p-3" testID={`${testID}-container`}>
       <Box twClassName="flex-row items-center justify-between">
-        <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
-          {label}
-        </Text>
+        {/* Tapping the label focuses the input and opens the keyboard, same
+            as tapping the (visually small) input row itself. */}
+        <Pressable onPress={focusInput}>
+          <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
+            {label}
+          </Text>
+        </Pressable>
         {endAccessory}
       </Box>
-      {input}
-      {footer}
+      <Box twClassName="flex-row items-center">
+        {startAccessory}
+        {input}
+      </Box>
+      {footer ? (
+        <Box twClassName="mt-3" testID={`${testID}-footer`}>
+          {footer}
+        </Box>
+      ) : null}
     </Box>
   );
 };
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.test.tsx
index be88a8c02d96..73c7b6973310 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.test.tsx
@@ -1,7 +1,11 @@
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react-native';
 import { IconName } from '@metamask/design-system-react-native';
-import { PerpsProOrderFormSelectorsIDs } from '../../../../Perps.testIds';
+import { Keyboard } from 'react-native';
+import {
+  PerpsProMarketViewSelectorsIDs,
+  PerpsProOrderFormSelectorsIDs,
+} from '../../../../Perps.testIds';
 import { getPerpsProInputAccessoryID } from './PerpsProCompactInput';
 import PerpsProOrderForm from './PerpsProOrderForm';
 import type { PerpsProOrderFormProps } from './PerpsProOrderForm.types';
@@ -13,45 +17,75 @@ const host = (name: string) => name as unknown as React.ComponentType<unknown>;
 
 const ids = PerpsProOrderFormSelectorsIDs;
 
-const createProps = (
-  overrides: Partial<PerpsProOrderFormProps> = {},
-): PerpsProOrderFormProps => ({
-  direction: 'long',
-  onDirectionChange: jest.fn(),
-  marginModeLabel: 'Isolated',
-  leverageLabel: '3x',
-  orderType: 'market',
-  onOrderTypeButtonPress: jest.fn(),
-  limitPrice: '',
-  onLimitPriceChange: jest.fn(),
-  size: '',
-  onSizeChange: jest.fn(),
-  balancePercentage: 0,
-  onBalancePercentageChange: jest.fn(),
-  availableBalance: '-- available',
-  reduceOnly: false,
-  onReduceOnlyChange: jest.fn(),
-  isTPSLConfigured: false,
-  notices: [],
-  summary: { margin: '--', liquidationPrice: '--', slippage: '--' },
-  placeOrderLabel: 'Place order',
-  placeOrderIntent: 'long',
-  onPlaceOrderPress: jest.fn(),
+const createSizeInput = (
+  overrides: Partial<PerpsProOrderFormProps['sizeInput']> = {},
+): PerpsProOrderFormProps['sizeInput'] => ({
+  value: '',
+  denomination: { unit: 'usd' },
+  canToggleDenomination: true,
+  onChange: jest.fn(),
+  onFocus: jest.fn(),
+  onBlur: jest.fn(),
+  onToggleDenomination: jest.fn(),
+  ...overrides,
+});
+
+const createSizeSlider = (
+  overrides: Partial<PerpsProOrderFormProps['sizeSlider']> = {},
+): PerpsProOrderFormProps['sizeSlider'] => ({
+  value: 0,
+  maximumValue: 1000,
+  onValueChange: jest.fn(),
+  onDragEnd: jest.fn(),
+  onDragCancel: jest.fn(),
   ...overrides,
 });
 
+const createProps = (
+  overrides: Partial<PerpsProOrderFormProps> = {},
+): PerpsProOrderFormProps => {
+  const { sizeInput, sizeSlider, ...rest } = overrides;
+  return {
+    direction: 'long',
+    onDirectionChange: jest.fn(),
+    marginModeLabel: 'Isolated',
+    leverageLabel: '3x',
+    orderType: 'market',
+    onOrderTypeButtonPress: jest.fn(),
+    limitPrice: '',
+    onLimitPriceChange: jest.fn(),
+    onLimitPriceBlur: jest.fn(),
+    sizeInput: createSizeInput(sizeInput),
+    sizeSlider: createSizeSlider(sizeSlider),
+    availableBalance: '-- available',
+    reduceOnly: false,
+    onReduceOnlyChange: jest.fn(),
+    isTPSLConfigured: false,
+    notices: [],
+    summary: { margin: '--', liquidationPrice: '--', slippage: '--' },
+    placeOrderLabel: 'Place order',
+    placeOrderIntent: 'long',
+    onPlaceOrderPress: jest.fn(),
+    ...rest,
+  };
+};
+
 const renderForm = (overrides: Partial<PerpsProOrderFormProps> = {}) =>
   render(<PerpsProOrderForm {...createProps(overrides)} />);
 
 describe('PerpsProOrderForm', () => {
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
   describe('inputs', () => {
-    it('passes raw size text to onSizeChange', () => {
-      const onSizeChange = jest.fn();
-      renderForm({ onSizeChange });
+    it('passes raw size text to sizeInput.onChange', () => {
+      const onChange = jest.fn();
+      renderForm({ sizeInput: createSizeInput({ onChange }) });
 
       fireEvent.changeText(screen.getByTestId(ids.SIZE_INPUT), '1..2');
 
-      expect(onSizeChange).toHaveBeenCalledWith('1..2');
+      expect(onChange).toHaveBeenCalledWith('1..2');
     });
 
     it('passes raw limit price text to onLimitPriceChange', () => {
@@ -63,18 +97,109 @@ describe('PerpsProOrderForm', () => {
       expect(onLimitPriceChange).toHaveBeenCalledWith('.123');
     });
 
+    it('wires limit price blur to onLimitPriceBlur', () => {
+      const onLimitPriceBlur = jest.fn();
+      renderForm({ orderType: 'limit', onLimitPriceBlur });
+
+      fireEvent(screen.getByTestId(ids.LIMIT_PRICE_INPUT), 'blur');
+
+      expect(onLimitPriceBlur).toHaveBeenCalledTimes(1);
+    });
+
     it('renders limit price input for limit orders', () => {
       renderForm({ orderType: 'limit' });
 
       expect(screen.getByTestId(ids.LIMIT_PRICE_INPUT)).toBeOnTheScreen();
     });
 
+    it('renders the dollar prefix for limit prices', () => {
+      renderForm({ orderType: 'limit' });
+
+      expect(screen.getByTestId(ids.LIMIT_PRICE_PREFIX)).toHaveTextContent('$');
+    });
+
     it('omits limit price input for market orders', () => {
       renderForm({ orderType: 'market' });
 
       expect(screen.queryByTestId(ids.LIMIT_PRICE_INPUT)).not.toBeOnTheScreen();
     });
 
+    it('renders the size label with the active unit', () => {
+      renderForm({
+        sizeInput: createSizeInput({ denomination: { unit: 'usd' } }),
+      });
+
+      expect(screen.getByTestId(ids.SIZE_UNIT_LABEL)).toHaveTextContent(
+        'Size (USD)',
+      );
+    });
+
+    it('renders the dollar prefix for USD size', () => {
+      renderForm({
+        sizeInput: createSizeInput({ denomination: { unit: 'usd' } }),
+      });
+
+      expect(screen.getByTestId(ids.SIZE_PREFIX)).toHaveTextContent('$');
+    });
+
+    it('omits the dollar prefix for asset size', () => {
+      renderForm({
+        sizeInput: createSizeInput({
+          denomination: { unit: 'asset', symbol: 'BTC' },
+        }),
+      });
+
+      expect(screen.queryByTestId(ids.SIZE_PREFIX)).not.toBeOnTheScreen();
+      expect(screen.getByTestId(ids.SIZE_UNIT_LABEL)).toHaveTextContent(
+        'Size (BTC)',
+      );
+    });
+
+    it('forwards size focus and blur callbacks', () => {
+      const onFocus = jest.fn();
+      const onBlur = jest.fn();
+      renderForm({ sizeInput: createSizeInput({ onFocus, onBlur }) });
+
+      fireEvent(screen.getByTestId(ids.SIZE_INPUT), 'focus');
+      fireEvent(screen.getByTestId(ids.SIZE_INPUT), 'blur');
+
+      expect(onFocus).toHaveBeenCalledTimes(1);
+      expect(onBlur).toHaveBeenCalledTimes(1);
+    });
+
+    it('shows available balance with add funds action below the size input', () => {
+      renderForm({
+        availableBalance: '$250 available',
+        onAddFundsPress: jest.fn(),
+      });
+
+      expect(screen.getByTestId(ids.AVAILABLE_BALANCE)).toHaveTextContent(
+        '$250 available',
+      );
+      expect(screen.getByTestId(ids.ADD_FUNDS_BUTTON)).toBeOnTheScreen();
+    });
+
+    it('announces the available balance and the add funds action to screen readers', () => {
+      renderForm({
+        availableBalance: '$250 available',
+        onAddFundsPress: jest.fn(),
+      });
+
+      const addFundsButton = screen.getByTestId(ids.ADD_FUNDS_BUTTON);
+
+      expect(addFundsButton).toHaveAccessibleName('$250 available');
+      expect(addFundsButton.props.accessibilityHint).toBe('Add funds');
+    });
+
+    it('calls onAddFundsPress when the available balance text is pressed', () => {
+      const onAddFundsPress = jest.fn();
+      renderForm({ availableBalance: '$250 available', onAddFundsPress });
+
+      fireEvent.press(screen.getByTestId(ids.AVAILABLE_BALANCE));
+
+      expect(onAddFundsPress).toHaveBeenCalledTimes(1);
+    });
+
     it('connects each iOS numeric input to its own keyboard accessory', () => {
       renderForm({ orderType: 'limit' });
 
@@ -98,6 +223,19 @@ describe('PerpsProOrderForm', () => {
           .map((accessory) => accessory.props.nativeID),
       ).toEqual([sizeAccessoryID, limitPriceAccessoryID]);
     });
+
+    it('dismisses the keyboard from the custom minimize control', () => {
+      const dismissSpy = jest
+        .spyOn(Keyboard, 'dismiss')
+        .mockImplementation(jest.fn());
+      renderForm();
+
+      fireEvent.press(
+        screen.getByTestId(`${ids.KEYBOARD_CLOSE}-${ids.SIZE_INPUT}`),
+      );
+
+      expect(dismissSpy).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe('controls', () => {
@@ -106,12 +244,14 @@ describe('PerpsProOrderForm', () => {
 
       expect(screen.getByTestId(`${ids.ORDER_TYPE_BUTTON}-chevron`)).toHaveProp(
         'name',
-        IconName.ArrowRight,
+        IconName.ArrowDown,
       );
     });
 
     it('passes compact accessibility props to the size slider', () => {
-      renderForm();
+      renderForm({
+        sizeSlider: createSizeSlider({ value: 10, maximumValue: 43.55 }),
+      });
 
       expect(screen.UNSAFE_getByType(host('PerpsSlider'))).toHaveProp(
         'variant',
@@ -123,10 +263,48 @@ describe('PerpsProOrderForm', () => {
       );
       expect(screen.UNSAFE_getByType(host('PerpsSlider'))).toHaveProp(
         'accessibilityLabel',
-        'Order size percentage',
+        'Order size percentage (USD)',
+      );
+      expect(screen.UNSAFE_getByType(host('PerpsSlider'))).toHaveProp(
+        'value',
+        10,
+      );
+      expect(screen.UNSAFE_getByType(host('PerpsSlider'))).toHaveProp(
+        'maximumValue',
+        43.55,
+      );
+      expect(screen.UNSAFE_getByType(host('PerpsSlider'))).toHaveProp(
+        'step',
+        1,
+      );
+    });
+
+    it('passes drag completion to the size slider', () => {
+      const onDragEnd = jest.fn();
+      renderForm({ sizeSlider: createSizeSlider({ onDragEnd }) });
+
+      expect(screen.UNSAFE_getByType(host('PerpsSlider'))).toHaveProp(
+        'onDragEnd',
+        onDragEnd,
       );
     });
 
+    it('enables the size denomination toggle when conversion is available', () => {
+      renderForm({
+        sizeInput: createSizeInput({ canToggleDenomination: true }),
+      });
+
+      expect(screen.getByTestId(ids.SIZE_UNIT_BUTTON)).toBeEnabled();
+    });
+
+    it('disables the size denomination toggle when conversion is unavailable', () => {
+      renderForm({
+        sizeInput: createSizeInput({ canToggleDenomination: false }),
+      });
+
+      expect(screen.getByTestId(ids.SIZE_UNIT_BUTTON)).toBeDisabled();
+    });
+
     it('calls onDirectionChange when Short is pressed', () => {
       const onDirectionChange = jest.fn();
       renderForm({ onDirectionChange });
@@ -154,7 +332,7 @@ describe('PerpsProOrderForm', () => {
       );
       expect(screen.getByTestId(ids.REDUCE_ONLY)).toHaveProp(
         'accessibilityState',
-        { checked: true },
+        expect.objectContaining({ checked: true }),
       );
     });
 
@@ -167,6 +345,12 @@ describe('PerpsProOrderForm', () => {
       expect(onReduceOnlyChange).toHaveBeenCalledWith(true);
     });
 
+    it('hides the TP/SL row when Reduce Only is on', () => {
+      renderForm({ reduceOnly: true, onTPSLPress: jest.fn() });
+
+      expect(screen.queryByTestId(ids.TPSL)).not.toBeOnTheScreen();
+    });
+
     it('exposes TP/SL as a button action', () => {
       renderForm({ onTPSLPress: jest.fn() });
 
@@ -194,6 +378,22 @@ describe('PerpsProOrderForm', () => {
       expect(onPlaceOrderPress).toHaveBeenCalledTimes(1);
     });
 
+    it('calls onSlippagePress when the slippage value is pressed', () => {
+      const onSlippagePress = jest.fn();
+      renderForm({
+        summary: {
+          margin: '--',
+          liquidationPrice: '--',
+          slippage: '0.50% / 1%',
+          onSlippagePress,
+        },
+      });
+
+      fireEvent.press(screen.getByTestId(ids.SUMMARY_SLIPPAGE_BUTTON));
+
+      expect(onSlippagePress).toHaveBeenCalledTimes(1);
+    });
+
     it('disables Place Order when requested', () => {
       renderForm({ isPlaceOrderDisabled: true });
 
@@ -209,12 +409,86 @@ describe('PerpsProOrderForm', () => {
       ['slippage', ids.SUMMARY_SLIPPAGE_BUTTON],
       ['fees', ids.SUMMARY_FEES_BUTTON],
     ])('disables deferred %s action without a callback', (_name, testID) => {
-      renderForm({ orderType: 'limit' });
+      renderForm({
+        orderType: 'limit',
+        sizeInput: createSizeInput({ canToggleDenomination: false }),
+        onAddFundsPress: undefined,
+        onTPSLPress: undefined,
+        onUseMidPricePress: undefined,
+        onLeveragePress: undefined,
+        summary: {
+          margin: '--',
+          liquidationPrice: '--',
+          slippage: '--',
+        },
+      });
 
       expect(screen.getByTestId(testID)).toBeDisabled();
     });
   });
 
+  describe('direction control', () => {
+    it('fills the remaining row width whether or not the order book icon is shown', () => {
+      const { rerender } = renderForm();
+
+      expect(screen.getByTestId(ids.DIRECTION_CONTROL)).toHaveStyle({
+        flexGrow: 1,
+      });
+
+      rerender(
+        <PerpsProOrderForm {...createProps({ isOrderBookCollapsed: true })} />,
+      );
+
+      expect(screen.getByTestId(ids.DIRECTION_CONTROL)).toHaveStyle({
+        flexGrow: 1,
+      });
+    });
+
+    it('calls onDirectionChange when the order book icon is also shown', () => {
+      const onDirectionChange = jest.fn();
+      renderForm({ isOrderBookCollapsed: true, onDirectionChange });
+
+      fireEvent.press(screen.getByTestId(ids.DIRECTION_SHORT));
+
+      expect(onDirectionChange).toHaveBeenCalledWith('short');
+    });
+  });
+
+  describe('order book expand icon', () => {
+    it('omits the order book icon by default', () => {
+      renderForm();
+
+      expect(
+        screen.queryByTestId(
+          PerpsProMarketViewSelectorsIDs.ORDER_BOOK_EXPAND_BUTTON,
+        ),
+      ).not.toBeOnTheScreen();
+    });
+
+    it('renders the order book icon when the order book is collapsed', () => {
+      renderForm({ isOrderBookCollapsed: true });
+
+      expect(
+        screen.getByTestId(
+          PerpsProMarketViewSelectorsIDs.ORDER_BOOK_EXPAND_BUTTON,
+        ),
+      ).toBeOnTheScreen();
+    });
+
+    it('calls onExpandOrderBook when the order book icon is pressed', () => {
+      const onExpandOrderBook = jest.fn();
+      renderForm({ isOrderBookCollapsed: true, onExpandOrderBook });
+
+      fireEvent.press(
+        screen.getByTestId(
+          PerpsProMarketViewSelectorsIDs.ORDER_BOOK_EXPAND_BUTTON,
+        ),
+      );
+
+      expect(onExpandOrderBook).toHaveBeenCalledTimes(1);
+    });
+  });
+
   describe('conditional content', () => {
     it('omits Slippage when no display value is provided', () => {
       renderForm({
@@ -242,6 +516,17 @@ describe('PerpsProOrderForm', () => {
       expect(screen.getByTestId(ids.CONTAINER)).toHaveStyle({ gap: 16 });
     });
 
+    it('left-aligns margin mode and leverage with 8-point spacing', () => {
+      renderForm();
+
+      expect(screen.getByTestId(ids.MARGIN_SETTINGS_ROW)).toHaveStyle({
+        gap: 8,
+      });
+      expect(screen.getByTestId(ids.MARGIN_SETTINGS_ROW)).not.toHaveStyle({
+        justifyContent: 'space-between',
+      });
+    });
+
     it('uses 4-point spacing between summary rows', () => {
       renderForm();
 
@@ -255,5 +540,30 @@ describe('PerpsProOrderForm', () => {
         height: 20,
       });
     });
+
+    it('uses no horizontal padding on summary rows so they align with the form', () => {
+      renderForm();
+
+      expect(screen.getByTestId(ids.SUMMARY_MARGIN)).toHaveStyle({
+        paddingHorizontal: 0,
+      });
+    });
+  });
+
+  describe('margin mode chip', () => {
+    it('calls onMarginModePress when Isolated chip is pressed', () => {
+      const onMarginModePress = jest.fn();
+      renderForm({ onMarginModePress });
+
+      fireEvent.press(screen.getByTestId(ids.MARGIN_MODE_BUTTON));
+
+      expect(onMarginModePress).toHaveBeenCalledTimes(1);
+    });
+
+    it('renders the margin mode chip with the provided label', () => {
+      renderForm({ marginModeLabel: 'Isolated', onMarginModePress: jest.fn() });
+
+      expect(screen.getByTestId(ids.MARGIN_MODE_BUTTON)).toBeOnTheScreen();
+    });
   });
 });
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.tsx
index 6c6fd01592e7..5ff01e4a7142 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.tsx
@@ -3,6 +3,7 @@ import {
   BannerAlertSeverity,
   Box,
   BoxAlignItems,
+  BoxFlexDirection,
   ButtonBase,
   ButtonBaseSize,
   ButtonIcon,
@@ -29,12 +30,15 @@ import {
   Pressable,
 } from 'react-native';
 import { strings } from '../../../../../../../../locales/i18n';
-import { PerpsProOrderFormSelectorsIDs } from '../../../../Perps.testIds';
+import {
+  PerpsProMarketViewSelectorsIDs,
+  PerpsProOrderFormSelectorsIDs,
+} from '../../../../Perps.testIds';
 import PerpsFeesDisplay from '../../../../components/PerpsFeesDisplay';
-import PerpsSlider from '../../../../components/PerpsSlider';
 import PerpsProCompactInput, {
   getPerpsProInputAccessoryID,
 } from './PerpsProCompactInput';
+import PerpsProSizeInput from './PerpsProSizeInput';
 import type {
   PerpsProOrderDirection,
   PerpsProOrderFormProps,
@@ -169,6 +173,7 @@ const Notices = ({ notices }: { notices: PerpsProOrderNotice[] }) =>
         notice.variant === 'banner' ? (
           <BannerAlert
             key={notice.id}
+            alignItems={BoxAlignItems.Center}
             severity={BannerAlertSeverity.Warning}
             title={notice.title}
             description={notice.message}
@@ -188,6 +193,41 @@ const Notices = ({ notices }: { notices: PerpsProOrderNotice[] }) =>
     </Box>
   ) : null;
 
+const summaryRowClassName = 'h-5 px-0';
+const summaryFeesRowClassName = 'min-h-6 h-auto px-0';
+const summaryRowStyle = { paddingHorizontal: 0 } as const;
+
+interface SlippageValueProps {
+  value: string;
+  onPress?: () => void;
+}
+
+const SlippageValue = ({ value, onPress }: SlippageValueProps) => (
+  <Pressable
+    accessibilityRole="button"
+    accessibilityState={{ disabled: !onPress }}
+    disabled={!onPress}
+    onPress={onPress}
+    testID={ids.SUMMARY_SLIPPAGE_BUTTON}
+  >
+    <Box twClassName="min-w-0 flex-1 flex-row items-center justify-end gap-1">
+      <Text
+        variant={TextVariant.BodyXs}
+        fontWeight={FontWeight.Medium}
+        numberOfLines={1}
+        ellipsizeMode="tail"
+      >
+        {value}
+      </Text>
+      <Icon
+        name={IconName.Edit}
+        size={IconSize.Sm}
+        color={IconColor.IconDefault}
+      />
+    </Box>
+  </Pressable>
+);
+
 const OrderSummary = ({
   margin,
   liquidationPrice,
@@ -198,13 +238,14 @@ const OrderSummary = ({
   onSlippagePress,
   onFeesInfoPress,
 }: PerpsProOrderSummaryProps) => (
-  <Box twClassName="gap-1" testID={ids.SUMMARY}>
+  <Box twClassName="w-full gap-1" testID={ids.SUMMARY}>
     <KeyValueRow
       keyLabel={strings('perps.order.margin')}
       value={margin}
       keyTextProps={summaryKeyTextProps}
       valueTextProps={summaryValueTextProps}
-      twClassName="h-5"
+      twClassName={summaryRowClassName}
+      style={summaryRowStyle}
       testID={ids.SUMMARY_MARGIN}
     />
     <KeyValueRow
@@ -212,21 +253,18 @@ const OrderSummary = ({
       value={liquidationPrice}
       keyTextProps={summaryKeyTextProps}
       valueTextProps={summaryValueTextProps}
-      twClassName="h-5"
+      twClassName={summaryRowClassName}
+      style={summaryRowStyle}
       testID={ids.SUMMARY_LIQUIDATION}
     />
     {slippage !== undefined ? (
       <KeyValueRow
         keyLabel={strings('perps.slippage.slippage')}
-        value={slippage}
-        valueEndButtonIconProps={buttonIcon(
-          IconName.Edit,
-          ids.SUMMARY_SLIPPAGE_BUTTON,
-          onSlippagePress,
-        )}
+        value={<SlippageValue value={slippage} onPress={onSlippagePress} />}
         keyTextProps={summaryKeyTextProps}
         valueTextProps={summaryValueTextProps}
-        twClassName="h-5"
+        twClassName={summaryRowClassName}
+        style={summaryRowStyle}
         testID={ids.SUMMARY_SLIPPAGE}
       />
     ) : null}
@@ -239,6 +277,8 @@ const OrderSummary = ({
           feeDiscountPercentage={feeDiscountPercentage}
           testID={ids.SUMMARY_FEES_VALUE}
           variant={TextVariant.BodyXs}
+          color={TextColor.TextDefault}
+          fontWeight={FontWeight.Medium}
         />
       }
       keyEndButtonIconProps={buttonIcon(
@@ -248,7 +288,8 @@ const OrderSummary = ({
       )}
       keyTextProps={summaryKeyTextProps}
       valueTextProps={summaryValueTextProps}
-      twClassName="h-5"
+      twClassName={summaryFeesRowClassName}
+      style={summaryRowStyle}
       testID={ids.SUMMARY_FEES}
     />
   </Box>
@@ -257,19 +298,20 @@ const OrderSummary = ({
 const PerpsProOrderForm = ({
   direction,
   onDirectionChange,
+  isOrderBookCollapsed = false,
+  onExpandOrderBook,
   marginModeLabel,
+  onMarginModePress,
   leverageLabel,
   onLeveragePress,
   orderType,
   onOrderTypeButtonPress,
   limitPrice,
   onLimitPriceChange,
+  onLimitPriceBlur,
   onUseMidPricePress,
-  size,
-  onSizeChange,
-  onSizeUnitPress,
-  balancePercentage,
-  onBalancePercentageChange,
+  sizeInput,
+  sizeSlider,
   availableBalance,
   onAddFundsPress,
   reduceOnly,
@@ -289,53 +331,82 @@ const PerpsProOrderForm = ({
   return (
     <>
       <Box twClassName="gap-4" testID={ids.CONTAINER}>
-        <Box twClassName="gap-4 px-4">
-          <SegmentedControl
-            value={direction}
-            onChange={(value) =>
-              onDirectionChange(value as PerpsProOrderDirection)
-            }
-            isFullWidth
-            size={ButtonBaseSize.Sm}
-            testID={ids.DIRECTION_CONTROL}
+        {/* Screen-edge inset comes from PerpsProMarketLayout's outer padding
+            (wraps form + divider + book), not this Box. Summary rows use
+            KeyValueRow which ships with px-4 by default — override to px-0 so
+            margin/liquidation/slippage/fees align with the form above. */}
+        <Box twClassName="gap-4">
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            gap={4}
           >
-            <FilterButton
-              value="long"
-              twClassName={isLong ? 'bg-success-muted' : ''}
-              testID={ids.DIRECTION_LONG}
+            <SegmentedControl
+              value={direction}
+              onChange={(value) =>
+                onDirectionChange(value as PerpsProOrderDirection)
+              }
+              isFullWidth
+              twClassName="flex-1"
+              size={ButtonBaseSize.Sm}
+              testID={ids.DIRECTION_CONTROL}
             >
-              <Text
-                variant={TextVariant.BodySm}
-                fontWeight={FontWeight.Medium}
-                color={
-                  isLong ? TextColor.SuccessDefault : TextColor.TextAlternative
-                }
+              <FilterButton
+                value="long"
+                twClassName={isLong ? 'bg-success-muted' : ''}
+                testID={ids.DIRECTION_LONG}
               >
-                {strings('perps.market.long')}
-              </Text>
-            </FilterButton>
-            <FilterButton
-              value="short"
-              twClassName={!isLong ? 'bg-error-muted' : ''}
-              testID={ids.DIRECTION_SHORT}
-            >
-              <Text
-                variant={TextVariant.BodySm}
-                fontWeight={FontWeight.Medium}
-                color={
-                  isLong ? TextColor.TextAlternative : TextColor.ErrorDefault
-                }
+                <Text
+                  variant={TextVariant.BodySm}
+                  fontWeight={FontWeight.Medium}
+                  color={
+                    isLong
+                      ? TextColor.SuccessDefault
+                      : TextColor.TextAlternative
+                  }
+                >
+                  {strings('perps.market.long')}
+                </Text>
+              </FilterButton>
+              <FilterButton
+                value="short"
+                twClassName={!isLong ? 'bg-error-muted' : ''}
+                testID={ids.DIRECTION_SHORT}
               >
-                {strings('perps.market.short')}
-              </Text>
-            </FilterButton>
-          </SegmentedControl>
-          <Box twClassName="flex-row items-center justify-between">
-            <Box twClassName="h-8 justify-center rounded-lg bg-muted px-2">
-              <Text variant={TextVariant.BodySm} fontWeight={FontWeight.Medium}>
-                {marginModeLabel}
-              </Text>
-            </Box>
+                <Text
+                  variant={TextVariant.BodySm}
+                  fontWeight={FontWeight.Medium}
+                  color={
+                    isLong ? TextColor.TextAlternative : TextColor.ErrorDefault
+                  }
+                >
+                  {strings('perps.market.short')}
+                </Text>
+              </FilterButton>
+            </SegmentedControl>
+            {isOrderBookCollapsed ? (
+              <ButtonIcon
+                iconName={IconName.Book}
+                accessibilityLabel={strings('perps.order_book.expand')}
+                size={ButtonIconSize.Md}
+                onPress={onExpandOrderBook}
+                testID={PerpsProMarketViewSelectorsIDs.ORDER_BOOK_EXPAND_BUTTON}
+              />
+            ) : null}
+          </Box>
+          <Box
+            twClassName="flex-row items-center gap-2"
+            testID={ids.MARGIN_SETTINGS_ROW}
+          >
+            <ButtonBase
+              size={ButtonBaseSize.Sm}
+              onPress={onMarginModePress}
+              isDisabled={!onMarginModePress}
+              twClassName="h-8 rounded-lg bg-muted px-2"
+              testID={ids.MARGIN_MODE_BUTTON}
+            >
+              {marginModeLabel}
+            </ButtonBase>
             <ButtonBase
               size={ButtonBaseSize.Sm}
               onPress={onLeveragePress}
@@ -346,13 +417,13 @@ const PerpsProOrderForm = ({
               {leverageLabel}
             </ButtonBase>
           </Box>
-          <Box twClassName="overflow-hidden rounded-xl bg-muted">
+          <Box twClassName="overflow-hidden rounded-xl border border-muted bg-muted">
             <ButtonBase
               onPress={onOrderTypeButtonPress}
               twClassName="h-12 w-full bg-transparent px-3"
               contentWrapperProps={{ twClassName: 'w-full justify-between' }}
               textProps={{ variant: TextVariant.BodySm }}
-              endIconName={IconName.ArrowRight}
+              endIconName={IconName.ArrowDown}
               endIconProps={{
                 size: IconSize.Sm,
                 testID: `${ids.ORDER_TYPE_BUTTON}-chevron`,
@@ -368,90 +439,66 @@ const PerpsProOrderForm = ({
                 label={strings('perps.order.limit_price_modal.title')}
                 value={limitPrice}
                 onChangeText={onLimitPriceChange}
+                onBlur={onLimitPriceBlur}
                 testID={ids.LIMIT_PRICE_INPUT}
                 variant="inline"
                 placeholder={strings('perps.order.limit_price_modal.title')}
-                endAccessory={
-                  <ButtonBase
-                    size={ButtonBaseSize.Sm}
-                    onPress={onUseMidPricePress}
-                    isDisabled={!onUseMidPricePress}
-                    twClassName="h-12 bg-transparent px-0"
-                    testID={ids.MID_PRICE_BUTTON}
+                startAccessory={
+                  <Text
+                    variant={TextVariant.BodySm}
+                    twClassName="mr-1"
+                    testID={ids.LIMIT_PRICE_PREFIX}
                   >
-                    {strings('perps.order.limit_price_modal.mid_price')}
-                  </ButtonBase>
+                    $
+                  </Text>
+                }
+                endAccessory={
+                  <Box twClassName="h-full shrink-0 justify-center">
+                    <ButtonBase
+                      size={ButtonBaseSize.Sm}
+                      onPress={onUseMidPricePress}
+                      isDisabled={!onUseMidPricePress}
+                      twClassName="h-[26px] shrink-0 rounded bg-subsection px-2 py-0.5"
+                      contentWrapperProps={{ twClassName: 'justify-end' }}
+                      textProps={{
+                        variant: TextVariant.BodySm,
+                        fontWeight: FontWeight.Medium,
+                      }}
+                      testID={ids.MID_PRICE_BUTTON}
+                    >
+                      {strings('perps.order.limit_price_modal.mid_price')}
+                    </ButtonBase>
+                  </Box>
                 }
               />
             ) : null}
           </Box>
-          <Box twClassName="gap-2">
-            <PerpsProCompactInput
-              label={strings('perps.pro_order_form.size_usd')}
-              value={size}
-              onChangeText={onSizeChange}
-              testID={ids.SIZE_INPUT}
-              placeholder="0.00"
-              placeholderColor="default"
-              endAccessory={
-                <ButtonIcon
-                  iconName={IconName.SwapHorizontal}
-                  size={ButtonIconSize.Xs}
-                  isDisabled={!onSizeUnitPress}
-                  onPress={onSizeUnitPress}
-                  testID={ids.SIZE_UNIT_BUTTON}
-                  accessibilityLabel={strings(
-                    'perps.pro_order_form.toggle_size_unit',
-                  )}
-                />
-              }
-              footer={
-                <PerpsSlider
-                  value={balancePercentage}
-                  onValueChange={onBalancePercentageChange}
-                  minimumValue={0}
-                  maximumValue={100}
-                  showPercentageLabels={false}
-                  showPercentageMarkers
-                  variant="compact"
-                  testID={ids.SIZE_SLIDER}
-                  accessibilityLabel={strings(
-                    'perps.pro_order_form.size_percentage',
-                  )}
-                />
-              }
-            />
-            <Box twClassName="flex-row items-center gap-1">
-              <Text
-                variant={TextVariant.BodySm}
-                color={TextColor.TextAlternative}
-                testID={ids.AVAILABLE_BALANCE}
-              >
-                {availableBalance}
-              </Text>
-              <ButtonIcon
-                iconName={IconName.AddCircle}
-                size={ButtonIconSize.Xs}
-                iconProps={{ color: IconColor.IconAlternative }}
-                isDisabled={!onAddFundsPress}
-                onPress={onAddFundsPress}
-                testID={ids.ADD_FUNDS_BUTTON}
-                accessibilityLabel={strings('perps.add_funds')}
-              />
-            </Box>
-          </Box>
+          <PerpsProSizeInput
+            value={sizeInput.value}
+            onChangeText={sizeInput.onChange}
+            denomination={sizeInput.denomination}
+            canToggleDenomination={sizeInput.canToggleDenomination}
+            onFocus={sizeInput.onFocus}
+            onBlur={sizeInput.onBlur}
+            onToggleDenomination={sizeInput.onToggleDenomination}
+            sizeSlider={sizeSlider}
+            availableBalance={availableBalance}
+            onAddFundsPress={onAddFundsPress}
+          />
           <ReduceOnlyRow
             label={strings('perps.order.reduce_only')}
             isSelected={reduceOnly}
             onChange={onReduceOnlyChange}
             testID={ids.REDUCE_ONLY}
           />
-          <TPSLRow
-            label={strings('perps.pro_order_form.tpsl')}
-            isSelected={isTPSLConfigured}
-            onPress={onTPSLPress}
-            testID={ids.TPSL}
-          />
+          {!reduceOnly ? (
+            <TPSLRow
+              label={strings('perps.pro_order_form.tpsl')}
+              isSelected={isTPSLConfigured}
+              onPress={onTPSLPress}
+              testID={ids.TPSL}
+            />
+          ) : null}
           <Notices notices={notices} />
           <ButtonSemantic
             severity={
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.types.ts b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.types.ts
index ef79c840c37c..66ae6228e94e 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.types.ts
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProOrderForm.types.ts
@@ -1,11 +1,47 @@
 import type { OrderType } from '@metamask/perps-controller';
+
 export type PerpsProOrderDirection = 'long' | 'short';
+
+/**
+ * Active size-denomination for the Pro order form size field.
+ * USD is the canonical controller amount; asset is a UI conversion view.
+ */
+export type PerpsProSizeDenomination =
+  | { unit: 'usd' }
+  | { unit: 'asset'; symbol: string };
+
+/**
+ * Editable size field state and handlers for the Pro order form.
+ */
+export interface PerpsProSizeInputModel {
+  value: string;
+  denomination: PerpsProSizeDenomination;
+  canToggleDenomination: boolean;
+  onChange: (value: string) => void;
+  onFocus: () => void;
+  onBlur: () => void;
+  onToggleDenomination: () => void;
+}
+
+/**
+ * Amount-domain size slider, matching Lite's USD amount / maxPossibleAmount
+ * controlled range rather than a Pro-only percentage adapter.
+ */
+export interface PerpsProSizeSliderModel {
+  value: number;
+  maximumValue: number;
+  onValueChange: (value: number) => void;
+  onDragEnd: (value: number) => void;
+  onDragCancel: () => void;
+}
+
 export interface PerpsProOrderNotice {
   id: string;
   variant: 'banner' | 'inline';
   title?: string;
   message: string;
 }
+
 export interface PerpsProOrderSummaryProps {
   margin: string;
   liquidationPrice: string;
@@ -16,22 +52,29 @@ export interface PerpsProOrderSummaryProps {
   onSlippagePress?: () => void;
   onFeesInfoPress?: () => void;
 }
+
 export interface PerpsProOrderFormProps {
   direction: PerpsProOrderDirection;
   onDirectionChange: (direction: PerpsProOrderDirection) => void;
+  /**
+   * When true, an order-book icon renders beside the direction control to
+   * restore the collapsed order-book column (Figma "No Order Book" state).
+   */
+  isOrderBookCollapsed?: boolean;
+  onExpandOrderBook?: () => void;
   marginModeLabel: string;
+  /** Called when the user taps the Isolated margin-mode chip. */
+  onMarginModePress?: () => void;
   leverageLabel: string;
   onLeveragePress?: () => void;
   orderType: OrderType;
   onOrderTypeButtonPress: () => void;
   limitPrice: string;
   onLimitPriceChange: (value: string) => void;
+  onLimitPriceBlur?: () => void;
   onUseMidPricePress?: () => void;
-  size: string;
-  onSizeChange: (value: string) => void;
-  onSizeUnitPress?: () => void;
-  balancePercentage: number;
-  onBalancePercentageChange: (value: number) => void;
+  sizeInput: PerpsProSizeInputModel;
+  sizeSlider: PerpsProSizeSliderModel;
   availableBalance: string;
   onAddFundsPress?: () => void;
   reduceOnly: boolean;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProSizeInput.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProSizeInput.test.tsx
new file mode 100644
index 000000000000..9be62ab5eded
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProSizeInput.test.tsx
@@ -0,0 +1,185 @@
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import { TextVariant } from '@metamask/design-system-react-native';
+import { PerpsProOrderFormSelectorsIDs } from '../../../../Perps.testIds';
+import PerpsProSizeInput, {
+  type PerpsProSizeInputProps,
+} from './PerpsProSizeInput';
+
+const mockInputFocus = jest.fn();
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  const MockReact = jest.requireActual('react');
+  const { TextInput } = jest.requireActual('react-native');
+
+  return {
+    ...actual,
+    Input: MockReact.forwardRef(
+      (props: Record<string, unknown>, ref: React.Ref<unknown>) => {
+        MockReact.useImperativeHandle(ref, () => ({ focus: mockInputFocus }));
+        return MockReact.createElement(TextInput, props);
+      },
+    ),
+  };
+});
+
+jest.mock('../../../../components/PerpsSlider', () => 'PerpsSlider');
+
+const host = (name: string) => name as unknown as React.ComponentType<unknown>;
+const ids = PerpsProOrderFormSelectorsIDs;
+
+const createSizeSlider = (
+  overrides: Partial<PerpsProSizeInputProps['sizeSlider']> = {},
+): PerpsProSizeInputProps['sizeSlider'] => ({
+  value: 25,
+  maximumValue: 100,
+  onValueChange: jest.fn(),
+  onDragEnd: jest.fn(),
+  onDragCancel: jest.fn(),
+  ...overrides,
+});
+
+const createProps = (
+  overrides: Partial<PerpsProSizeInputProps> = {},
+): PerpsProSizeInputProps => {
+  const { sizeSlider, ...rest } = overrides;
+  return {
+    value: '',
+    onChangeText: jest.fn(),
+    denomination: { unit: 'usd' },
+    canToggleDenomination: true,
+    onToggleDenomination: jest.fn(),
+    sizeSlider: createSizeSlider(sizeSlider),
+    availableBalance: '$500 available',
+    onAddFundsPress: jest.fn(),
+    ...rest,
+  };
+};
+
+const renderInput = (overrides: Partial<PerpsProSizeInputProps> = {}) =>
+  render(<PerpsProSizeInput {...createProps(overrides)} />);
+
+describe('PerpsProSizeInput', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('focuses the input when the upper field is pressed', () => {
+    renderInput();
+
+    fireEvent.press(screen.getByTestId(ids.SIZE_FIELD));
+
+    expect(mockInputFocus).toHaveBeenCalledTimes(1);
+  });
+
+  it('refocuses the input after the denomination toggle is pressed', () => {
+    const onToggleDenomination = jest.fn();
+    renderInput({ onToggleDenomination });
+
+    fireEvent.press(screen.getByTestId(ids.SIZE_UNIT_BUTTON));
+
+    expect(onToggleDenomination).toHaveBeenCalledTimes(1);
+    expect(mockInputFocus).toHaveBeenCalledTimes(1);
+  });
+
+  it('disables the denomination toggle when conversion is unavailable', () => {
+    renderInput({ canToggleDenomination: false });
+
+    expect(screen.getByTestId(ids.SIZE_UNIT_BUTTON)).toBeDisabled();
+  });
+
+  it('uses the custom keyboard accessory without requesting a native Done key', () => {
+    renderInput();
+
+    expect(screen.getByTestId(ids.SIZE_INPUT)).toHaveProp(
+      'inputAccessoryViewID',
+    );
+    expect(screen.getByTestId(ids.SIZE_INPUT)).not.toHaveProp('returnKeyType');
+    expect(screen.getByTestId(ids.SIZE_INPUT)).not.toHaveProp(
+      'onSubmitEditing',
+    );
+  });
+
+  it('uses the asset symbol in field and toggle accessibility text', () => {
+    renderInput({ denomination: { unit: 'asset', symbol: 'BTC' } });
+
+    expect(screen.getByTestId(ids.SIZE_FIELD)).toHaveAccessibleName(
+      'Size (BTC)',
+    );
+    expect(screen.getByTestId(ids.SIZE_UNIT_BUTTON)).toHaveAccessibleName(
+      'Switch size denomination: BTC',
+    );
+  });
+
+  it('allocates the Figma line height to the amount input', () => {
+    renderInput();
+
+    expect(screen.getByTestId(ids.SIZE_FIELD)).toHaveStyle({
+      height: 78,
+    });
+    expect(screen.getByTestId(ids.SIZE_INPUT)).toHaveProp(
+      'twClassName',
+      expect.stringContaining('h-8'),
+    );
+    expect(screen.getByTestId(ids.SIZE_INPUT)).toHaveProp(
+      'textVariant',
+      TextVariant.HeadingLg,
+    );
+  });
+
+  it('keeps the compact slider section visible with Figma spacing', () => {
+    renderInput();
+
+    expect(screen.getByTestId(ids.SIZE_SLIDER_SECTION)).toHaveStyle({
+      overflow: 'visible',
+      paddingTop: 24,
+      paddingBottom: 16,
+      paddingLeft: 12,
+      paddingRight: 12,
+    });
+  });
+
+  it('uses the Figma footer row height and horizontal padding', () => {
+    renderInput();
+
+    expect(screen.getByTestId(ids.ADD_FUNDS_BUTTON)).toHaveStyle({
+      height: 46,
+      paddingLeft: 12,
+      paddingRight: 12,
+    });
+  });
+
+  it('passes the amount-domain slider model to PerpsSlider', () => {
+    const onValueChange = jest.fn();
+    const onDragEnd = jest.fn();
+    renderInput({
+      sizeSlider: createSizeSlider({
+        value: 10,
+        maximumValue: 43.55,
+        onValueChange,
+        onDragEnd,
+      }),
+    });
+    const slider = screen.UNSAFE_getByType(host('PerpsSlider'));
+
+    expect(slider).toHaveProp('value', 10);
+    expect(slider).toHaveProp('maximumValue', 43.55);
+    expect(slider).toHaveProp('step', 1);
+
+    slider.props.onValueChange(20);
+    slider.props.onDragEnd(20);
+
+    expect(onValueChange).toHaveBeenCalledWith(20);
+    expect(onDragEnd).toHaveBeenCalledTimes(1);
+  });
+
+  it('commits the slider preview when the touch is cancelled', () => {
+    const onDragCancel = jest.fn();
+    renderInput({ sizeSlider: createSizeSlider({ onDragCancel }) });
+
+    fireEvent(screen.getByTestId(ids.SIZE_SLIDER_SECTION), 'touchCancel');
+
+    expect(onDragCancel).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProSizeInput.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProSizeInput.tsx
new file mode 100644
index 000000000000..f4ad547cd328
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/PerpsProSizeInput.tsx
@@ -0,0 +1,216 @@
+import {
+  Box,
+  ButtonBase,
+  ButtonIcon,
+  ButtonIconSize,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Input,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import React, { useCallback, useRef } from 'react';
+import { Platform, type TextInput } from 'react-native';
+import { strings } from '../../../../../../../../locales/i18n';
+import { PerpsProOrderFormSelectorsIDs } from '../../../../Perps.testIds';
+import PerpsSlider from '../../../../components/PerpsSlider';
+import { getPerpsProInputAccessoryID } from './PerpsProCompactInput';
+import type {
+  PerpsProSizeDenomination,
+  PerpsProSizeSliderModel,
+} from './PerpsProOrderForm.types';
+
+const ids = PerpsProOrderFormSelectorsIDs;
+
+const getUnitLabel = (denomination: PerpsProSizeDenomination): string =>
+  denomination.unit === 'usd' ? 'USD' : denomination.symbol;
+
+export interface PerpsProSizeInputProps {
+  value: string;
+  onChangeText: (value: string) => void;
+  denomination: PerpsProSizeDenomination;
+  canToggleDenomination: boolean;
+  onFocus?: () => void;
+  onBlur?: () => void;
+  onToggleDenomination?: () => void;
+  sizeSlider: PerpsProSizeSliderModel;
+  availableBalance: string;
+  onAddFundsPress?: () => void;
+}
+
+const PerpsProSizeInput = ({
+  value,
+  onChangeText,
+  denomination,
+  canToggleDenomination,
+  onFocus,
+  onBlur,
+  onToggleDenomination,
+  sizeSlider,
+  availableBalance,
+  onAddFundsPress,
+}: PerpsProSizeInputProps) => {
+  const tw = useTailwind();
+  const inputRef = useRef<TextInput>(null);
+  const unitLabel = getUnitLabel(denomination);
+  const showUsdPrefix = denomination.unit === 'usd';
+  const label = strings('perps.pro_order_form.size_unit', {
+    unit: unitLabel,
+  });
+  const canPressDenominationToggle =
+    canToggleDenomination && Boolean(onToggleDenomination);
+  const inputAccessoryViewID =
+    Platform.OS === 'ios'
+      ? getPerpsProInputAccessoryID(ids.SIZE_INPUT)
+      : undefined;
+
+  const focusInput = useCallback(() => {
+    inputRef.current?.focus();
+  }, []);
+
+  const handleToggleDenomination = useCallback(() => {
+    if (!canPressDenominationToggle) {
+      return;
+    }
+
+    onToggleDenomination?.();
+    focusInput();
+  }, [canPressDenominationToggle, focusInput, onToggleDenomination]);
+
+  return (
+    <Box
+      twClassName="overflow-visible rounded-2xl border border-muted bg-muted"
+      testID={ids.SIZE_CARD}
+    >
+      <Box twClassName="relative">
+        <ButtonBase
+          onPress={focusInput}
+          twClassName="h-[78px] w-full bg-transparent p-0"
+          contentWrapperProps={{
+            twClassName: 'w-full flex-col items-start',
+          }}
+          testID={ids.SIZE_FIELD}
+          accessibilityLabel={label}
+          accessibilityHint={strings('perps.pro_order_form.size_input_hint', {
+            unit: unitLabel,
+          })}
+        >
+          <Box twClassName="h-[46px] w-full justify-center px-3 py-3">
+            <Text
+              variant={TextVariant.BodySm}
+              fontWeight={FontWeight.Medium}
+              testID={ids.SIZE_UNIT_LABEL}
+            >
+              {label}
+            </Text>
+          </Box>
+          <Box twClassName="h-8 w-full min-w-0 flex-row items-center gap-0.5 px-3 pr-8">
+            {showUsdPrefix ? (
+              <Text
+                variant={TextVariant.BodyLg}
+                twClassName="font-semibold"
+                testID={ids.SIZE_PREFIX}
+              >
+                $
+              </Text>
+            ) : null}
+            <Input
+              ref={inputRef}
+              value={value}
+              onChangeText={onChangeText}
+              onFocus={onFocus}
+              onBlur={onBlur}
+              keyboardType="decimal-pad"
+              inputAccessoryViewID={inputAccessoryViewID}
+              placeholder="0.00"
+              placeholderTextColor={tw.color('text-muted')}
+              textVariant={TextVariant.HeadingLg}
+              isStateStylesDisabled
+              twClassName="h-8 min-w-0 flex-1 border-0 bg-transparent p-0 font-semibold"
+              testID={ids.SIZE_INPUT}
+              accessibilityLabel={label}
+              accessibilityHint={strings(
+                'perps.pro_order_form.size_input_hint',
+                {
+                  unit: unitLabel,
+                },
+              )}
+            />
+          </Box>
+        </ButtonBase>
+        <Box twClassName="absolute right-3 top-3 z-10">
+          <ButtonIcon
+            iconName={IconName.SwapHorizontal}
+            size={ButtonIconSize.Sm}
+            isDisabled={!canPressDenominationToggle}
+            onPress={
+              canPressDenominationToggle ? handleToggleDenomination : undefined
+            }
+            testID={ids.SIZE_UNIT_BUTTON}
+            accessibilityLabel={`${strings(
+              'perps.pro_order_form.toggle_size_unit',
+            )}: ${unitLabel}`}
+            accessibilityHint={strings(
+              'perps.pro_order_form.toggle_size_unit_hint',
+              { unit: unitLabel },
+            )}
+          />
+        </Box>
+      </Box>
+      <Box
+        twClassName="overflow-visible px-3 pb-4 pt-6"
+        onTouchCancel={sizeSlider.onDragCancel}
+        testID={ids.SIZE_SLIDER_SECTION}
+      >
+        <PerpsSlider
+          value={sizeSlider.value}
+          onValueChange={sizeSlider.onValueChange}
+          onDragEnd={sizeSlider.onDragEnd}
+          minimumValue={0}
+          maximumValue={sizeSlider.maximumValue}
+          step={1}
+          showPercentageLabels={false}
+          showPercentageMarkers
+          variant="compact"
+          testID={ids.SIZE_SLIDER}
+          accessibilityLabel={strings(
+            'perps.pro_order_form.size_percentage_unit',
+            { unit: unitLabel },
+          )}
+        />
+      </Box>
+      <Box twClassName="w-full border-t border-muted" />
+      <ButtonBase
+        onPress={onAddFundsPress}
+        isDisabled={!onAddFundsPress}
+        twClassName="h-[46px] w-full rounded-b-2xl bg-transparent px-3"
+        contentWrapperProps={{
+          twClassName: 'w-full flex-row items-center justify-start gap-1',
+        }}
+        testID={ids.ADD_FUNDS_BUTTON}
+        accessibilityLabel={availableBalance}
+        accessibilityHint={strings('perps.add_funds')}
+      >
+        <Text
+          variant={TextVariant.BodySm}
+          color={TextColor.TextAlternative}
+          testID={ids.AVAILABLE_BALANCE}
+        >
+          {availableBalance}
+        </Text>
+        <Icon
+          name={IconName.AddCircle}
+          size={IconSize.Sm}
+          color={IconColor.IconAlternative}
+        />
+      </ButtonBase>
+    </Box>
+  );
+};
+
+export default PerpsProSizeInput;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProOrderForm.test.ts b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProOrderForm.test.ts
new file mode 100644
index 000000000000..14f36a6e6b6e
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProOrderForm.test.ts
@@ -0,0 +1,1109 @@
+import { act, renderHook } from '@testing-library/react-native';
+import type { PerpsMarketData } from '@metamask/perps-controller';
+import { usePerpsProOrderForm } from './usePerpsProOrderForm';
+
+// ---------------------------------------------------------------------------
+// Mock scaffolding
+// ---------------------------------------------------------------------------
+const mockTrack = jest.fn();
+const mockShowToast = jest.fn();
+const mockNavigate = jest.fn();
+const mockSetMaxSlippage = jest.fn();
+const mockHandleAddFunds = jest.fn();
+const mockCloseEligibilityModal = jest.fn();
+const mockUpdatePositionTPSL = jest.fn().mockResolvedValue({ success: true });
+const mockExecuteOrder = jest.fn().mockResolvedValue({ success: true });
+const mockClearPendingTradeConfiguration = jest.fn();
+
+let mockExecutionOptions: {
+  onSuccess?: (position?: unknown) => void;
+  onError?: (error: unknown) => void;
+} = {};
+
+const mockOrderForm = {
+  asset: 'BTC',
+  direction: 'long' as 'long' | 'short',
+  type: 'market' as 'market' | 'limit',
+  amount: '100',
+  leverage: 5,
+  balancePercent: 10,
+  limitPrice: undefined as string | undefined,
+  takeProfitPrice: undefined as string | undefined,
+  stopLossPrice: undefined as string | undefined,
+};
+
+const mockSetAmount = jest.fn();
+const mockSetLeverage = jest.fn();
+const mockSetDirection = jest.fn();
+const mockSetTakeProfitPrice = jest.fn();
+const mockSetStopLossPrice = jest.fn();
+const mockSetLimitPrice = jest.fn();
+const mockSetOrderType = jest.fn();
+const mockHandlePercentageAmount = jest.fn();
+const mockUpdateOrderForm = jest.fn();
+
+const mockContextValue = {
+  orderForm: mockOrderForm,
+  updateOrderForm: mockUpdateOrderForm,
+  setAmount: mockSetAmount,
+  setLeverage: mockSetLeverage,
+  setDirection: mockSetDirection,
+  setTakeProfitPrice: mockSetTakeProfitPrice,
+  setStopLossPrice: mockSetStopLossPrice,
+  setLimitPrice: mockSetLimitPrice,
+  setOrderType: mockSetOrderType,
+  handlePercentageAmount: mockHandlePercentageAmount,
+  maxPossibleAmount: 1000,
+  balanceForValidation: 500,
+};
+
+const mockValidation = {
+  isValid: true,
+  errors: [] as string[],
+  isValidating: false,
+};
+
+let mockExistingPosition: {
+  leverage?: { type?: string; value?: number };
+  size?: string;
+} | null = null;
+
+let mockIsAtCap = false;
+let mockEstimatedSlippageBps: number | null = 50;
+
+const submitted = jest.fn(() => ({ id: 'submitted' }));
+const confirmed = jest.fn(() => ({ id: 'confirmed' }));
+const creationFailed = jest.fn(() => ({ id: 'failed' }));
+const validationError = jest.fn((message: string) => ({
+  id: 'validationError',
+  message,
+}));
+const updateTPSLError = jest.fn((message: string) => ({
+  id: 'tpslError',
+  message,
+}));
+const limitPriceRequired = { id: 'limitPriceRequired' };
+
+const mockPerpsToastOptions = {
+  orderManagement: {
+    market: { submitted, confirmed, creationFailed },
+    limit: { submitted, confirmed, creationFailed },
+  },
+  formValidation: { orderForm: { validationError, limitPriceRequired } },
+  positionManagement: { tpsl: { updateTPSLError } },
+};
+
+jest.mock('../../../../contexts/PerpsOrderContext', () => ({
+  usePerpsOrderContext: () => mockContextValue,
+}));
+
+let mockPositionStreamLoading = false;
+
+jest.mock('../../../../hooks', () => ({
+  useHasExistingPosition: () => ({
+    existingPosition: mockExistingPosition,
+    isLoading: mockPositionStreamLoading,
+  }),
+  usePerpsLiquidationPrice: () => ({ liquidationPrice: '80000' }),
+  usePerpsMarketData: () => ({
+    marketData: { szDecimals: 3, maxLeverage: 40 },
+    isLoading: false,
+  }),
+  usePerpsOrderExecution: (opts: typeof mockExecutionOptions) => {
+    mockExecutionOptions = opts;
+    return { placeOrder: mockExecuteOrder, isPlacing: false };
+  },
+  usePerpsOrderFees: () => ({
+    totalFee: 5,
+    undiscountedTotalFee: 6,
+    metamaskFee: 1,
+    metamaskFeeRate: 0.01,
+    protocolFeeRate: 0.02,
+    originalMetamaskFeeRate: 0.01,
+    feeDiscountPercentage: 10,
+    estimatedPoints: 100,
+  }),
+  usePerpsOrderValidation: () => mockValidation,
+  usePerpsToasts: () => ({
+    showToast: mockShowToast,
+    PerpsToastOptions: mockPerpsToastOptions,
+  }),
+  usePerpsTrading: () => ({ updatePositionTPSL: mockUpdatePositionTPSL }),
+}));
+
+jest.mock('../../../../hooks/usePerpsHomeActions', () => ({
+  usePerpsHomeActions: () => ({
+    handleAddFunds: mockHandleAddFunds,
+    isEligibilityModalVisible: false,
+    closeEligibilityModal: mockCloseEligibilityModal,
+  }),
+}));
+
+jest.mock('../../../../hooks/stream', () => ({
+  usePerpsLivePrices: () => ({
+    BTC: { price: '90000', markPrice: '90000', percentChange24h: '1' },
+  }),
+  usePerpsTopOfBook: () => ({ bestBid: '89999', bestAsk: '90001' }),
+}));
+
+let mockIsInitialized = true;
+
+jest.mock('../../../../hooks/usePerpsConnection', () => ({
+  usePerpsConnection: () => ({ isInitialized: mockIsInitialized }),
+}));
+
+jest.mock('../../../../hooks/usePerpsEstimatedSlippage', () => ({
+  usePerpsEstimatedSlippage: () => ({
+    estimatedSlippageBps: mockEstimatedSlippageBps,
+  }),
+}));
+
+jest.mock('../../../../hooks/usePerpsEventTracking', () => ({
+  usePerpsEventTracking: () => ({ track: mockTrack }),
+}));
+
+jest.mock('../../../../hooks/usePerpsMaxSlippage', () => ({
+  usePerpsMaxSlippage: () => ({
+    maxSlippageBps: 100,
+    maxSlippageSource: 'default',
+    setMaxSlippage: mockSetMaxSlippage,
+  }),
+}));
+
+jest.mock('../../../../hooks/usePerpsOICap', () => ({
+  usePerpsOICap: () => ({ isAtCap: mockIsAtCap }),
+}));
+
+jest.mock('../../../../../Rewards/hooks/useVipTier', () => ({
+  useVipTier: () => 1,
+}));
+
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({ navigate: mockNavigate }),
+  useRoute: () => ({ params: {} }),
+}));
+
+jest.mock('react-redux', () => ({
+  useSelector: () => false,
+}));
+
+jest.mock('../../../../../../../core/Engine', () => ({
+  context: {
+    PerpsController: {
+      clearPendingTradeConfiguration: (...args: unknown[]) =>
+        mockClearPendingTradeConfiguration(...args),
+    },
+  },
+}));
+
+const market = { symbol: 'BTC', name: 'Bitcoin' } as PerpsMarketData;
+
+const renderProForm = () => renderHook(() => usePerpsProOrderForm({ market }));
+
+describe('usePerpsProOrderForm', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockExecutionOptions = {};
+    mockOrderForm.type = 'market';
+    mockOrderForm.direction = 'long';
+    mockOrderForm.amount = '100';
+    mockOrderForm.leverage = 5;
+    mockOrderForm.limitPrice = undefined;
+    mockOrderForm.takeProfitPrice = undefined;
+    mockOrderForm.stopLossPrice = undefined;
+    mockValidation.isValid = true;
+    mockValidation.errors = [];
+    mockExistingPosition = null;
+    mockIsAtCap = false;
+    mockEstimatedSlippageBps = 50;
+    mockIsInitialized = true;
+    mockPositionStreamLoading = false;
+    mockUpdatePositionTPSL.mockResolvedValue({ success: true });
+  });
+
+  describe('availableBalance', () => {
+    it('formats spendable balance as "$amount available" when connected', () => {
+      const { result } = renderProForm();
+
+      expect(result.current.availableBalance).toMatch(/^\$500 available$/);
+    });
+
+    it('shows the unavailable placeholder before Perps is initialized', () => {
+      mockIsInitialized = false;
+
+      const { result } = renderProForm();
+
+      expect(result.current.availableBalance).toBe('-- available');
+    });
+  });
+
+  describe('summary', () => {
+    it('builds display-ready margin, liquidation, slippage and numeric fees', () => {
+      // Arrange / Act
+      const { result } = renderProForm();
+
+      // Assert
+      expect(result.current.summary.margin).toMatch(/\$/);
+      expect(result.current.summary.liquidationPrice).toMatch(/\$/);
+      expect(result.current.summary.slippage).toContain('Max: 1%');
+      expect(result.current.summary.fee).toBe(5);
+      expect(result.current.summary.originalFee).toBe(6);
+      expect(result.current.summary.feeDiscountPercentage).toBe(10);
+    });
+
+    it('shows the fallback liquidation display when amount is empty', () => {
+      // Arrange
+      mockOrderForm.amount = '0';
+
+      // Act
+      const { result } = renderProForm();
+
+      // Assert
+      expect(result.current.summary.liquidationPrice).toBe('--');
+    });
+  });
+
+  describe('notices', () => {
+    it('maps a margin validation error to a priority banner', () => {
+      // Arrange
+      mockValidation.isValid = false;
+      mockValidation.errors = ['Insufficient funds'];
+
+      // Act
+      const { result } = renderProForm();
+
+      // Assert
+      const banner = result.current.notices.find((n) => n.id === 'margin');
+      expect(banner?.variant).toBe('banner');
+      expect(banner?.message).toBe('Insufficient funds');
+    });
+
+    it('maps an OI cap to a banner notice', () => {
+      // Arrange
+      mockIsAtCap = true;
+
+      // Act
+      const { result } = renderProForm();
+
+      // Assert
+      const banner = result.current.notices.find((n) => n.id === 'oi-cap');
+      expect(banner?.variant).toBe('banner');
+    });
+
+    it('shows the sl-liq-risk notice when the stop loss risks liquidation', () => {
+      // Arrange: long, market 90000, liquidation 80000 — SL at 79000 is past liq
+      mockOrderForm.stopLossPrice = '79000';
+      const { result } = renderProForm();
+
+      // Assert
+      expect(
+        result.current.notices.find((n) => n.id === 'sl-liq-risk'),
+      ).toBeDefined();
+    });
+
+    it('shows the tp-invalid notice when the take profit is on the wrong side', () => {
+      // Arrange: long, market 90000 — TP below market is wrong side
+      mockOrderForm.takeProfitPrice = '85000';
+      const { result } = renderProForm();
+
+      // Assert
+      expect(
+        result.current.notices.find((n) => n.id === 'tp-invalid'),
+      ).toBeDefined();
+    });
+
+    it('shows the sl-invalid notice when the stop loss is on the wrong side', () => {
+      // Arrange: long, market 90000 — SL above market is wrong side
+      mockOrderForm.stopLossPrice = '95000';
+      const { result } = renderProForm();
+
+      // Assert
+      expect(
+        result.current.notices.find((n) => n.id === 'sl-invalid'),
+      ).toBeDefined();
+    });
+
+    it('shows the reduce-only no-position banner and suppresses TP/SL notices', () => {
+      mockOrderForm.takeProfitPrice = '85000';
+      const { result } = renderProForm();
+
+      act(() => {
+        result.current.onReduceOnlyChange(true);
+      });
+
+      expect(
+        result.current.notices.find((n) => n.id === 'reduce-only')?.message,
+      ).toBe(
+        'You need to have an open position in this market to place reduce-only orders',
+      );
+      expect(
+        result.current.notices.find((n) => n.id === 'tp-invalid'),
+      ).toBeUndefined();
+    });
+
+    it('shows the reduce-only wrong-side banner for same-direction orders', () => {
+      mockExistingPosition = {
+        size: '1',
+        leverage: { type: 'isolated', value: 5 },
+      };
+      const { result } = renderProForm();
+
+      act(() => {
+        result.current.onReduceOnlyChange(true);
+      });
+
+      expect(
+        result.current.notices.find((n) => n.id === 'reduce-only')?.message,
+      ).toBe(
+        'Reduce-only orders can only reduce an existing position. Switch to the opposite side.',
+      );
+    });
+
+    it('shows the reduce-only too-large banner and disables submit when size exceeds position', () => {
+      mockExistingPosition = {
+        size: '-1',
+        leverage: { type: 'isolated', value: 5 },
+      };
+      mockOrderForm.amount = '100000';
+      const { result } = renderProForm();
+
+      act(() => {
+        result.current.onReduceOnlyChange(true);
+      });
+
+      expect(
+        result.current.notices.find((n) => n.id === 'reduce-only')?.message,
+      ).toBe('Reduce only order is larger than your open position');
+      expect(result.current.isPlaceOrderDisabled).toBe(true);
+    });
+
+    it('suppresses stale validation notices while the position is loading', () => {
+      // Arrange: retain a prior margin error (skipValidation freezes errors)
+      // while the position is still loading after Reduce Only is enabled.
+      mockValidation.isValid = false;
+      mockValidation.errors = ['Insufficient funds'];
+      mockPositionStreamLoading = true;
+      const { result } = renderProForm();
+
+      act(() => {
+        result.current.onReduceOnlyChange(true);
+      });
+
+      // Assert: no stale margin/limit banner, and Place Order stays disabled.
+      expect(
+        result.current.notices.find((n) => n.id === 'margin'),
+      ).toBeUndefined();
+      expect(
+        result.current.notices.find((n) => n.id === 'reduce-only'),
+      ).toBeUndefined();
+      expect(result.current.isPlaceOrderDisabled).toBe(true);
+    });
+  });
+
+  describe('handlePlaceOrder', () => {
+    it('builds OrderParams including reduceOnly and calls executeOrder', async () => {
+      // Arrange: long form reduces a short position; stale TP must be ignored.
+      mockExistingPosition = {
+        size: '-1',
+        leverage: { type: 'isolated', value: 5 },
+      };
+      mockOrderForm.takeProfitPrice = '95000';
+      const { result } = renderProForm();
+      act(() => {
+        result.current.onReduceOnlyChange(true);
+      });
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      expect(mockExecuteOrder).toHaveBeenCalledTimes(1);
+      const params = mockExecuteOrder.mock.calls[0][0];
+      expect(params).toMatchObject({
+        symbol: 'BTC',
+        isBuy: true,
+        orderType: 'market',
+        usdAmount: '100',
+        reduceOnly: true,
+      });
+      expect(params).not.toHaveProperty('takeProfitPrice');
+      expect(mockUpdatePositionTPSL).not.toHaveBeenCalled();
+      expect(submitted).toHaveBeenCalled();
+      expect(mockClearPendingTradeConfiguration).toHaveBeenCalledWith('BTC');
+      expect(mockUpdateOrderForm).toHaveBeenCalledWith({
+        amount: '',
+        direction: 'long',
+        type: 'market',
+        balancePercent: 0,
+        limitPrice: undefined,
+        takeProfitPrice: undefined,
+        stopLossPrice: undefined,
+      });
+      expect(result.current.reduceOnly).toBe(false);
+      // No success navigation
+      expect(mockNavigate).not.toHaveBeenCalled();
+    });
+
+    it('flushes a pending slider preview before allowing submission', async () => {
+      // Arrange
+      const { result, rerender } = renderProForm();
+      act(() => {
+        result.current.sizeSlider.onValueChange(250);
+      });
+
+      // Act: the first tap commits the preview but must not race submission
+      // against the canonical order-form state update.
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      expect(mockSetAmount).toHaveBeenCalledWith('250');
+      expect(mockExecuteOrder).not.toHaveBeenCalled();
+
+      // Arrange: echo the context update and render the canonical amount.
+      mockOrderForm.amount = '250';
+      rerender({});
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      expect(mockExecuteOrder).toHaveBeenCalledTimes(1);
+      expect(mockExecuteOrder.mock.calls[0][0]).toMatchObject({
+        usdAmount: '250',
+      });
+    });
+
+    it('submits on the first tap when a pending slider preview is unchanged', async () => {
+      // Arrange
+      const { result } = renderProForm();
+      act(() => {
+        result.current.sizeSlider.onValueChange(100);
+      });
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      expect(mockSetAmount).not.toHaveBeenCalled();
+      expect(mockExecuteOrder).toHaveBeenCalledTimes(1);
+      expect(mockExecuteOrder.mock.calls[0][0]).toMatchObject({
+        usdAmount: '100',
+      });
+    });
+
+    it('blocks reduce-only submit when there is no open position', async () => {
+      const { result } = renderProForm();
+      act(() => {
+        result.current.onReduceOnlyChange(true);
+      });
+
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      expect(mockExecuteOrder).not.toHaveBeenCalled();
+      expect(result.current.isPlaceOrderDisabled).toBe(true);
+    });
+
+    it('blocks reduce-only submit when size exceeds the open position', async () => {
+      mockExistingPosition = {
+        size: '-1',
+        leverage: { type: 'isolated', value: 5 },
+      };
+      mockOrderForm.amount = '100000';
+      const { result } = renderProForm();
+
+      act(() => {
+        result.current.onReduceOnlyChange(true);
+      });
+
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      expect(mockExecuteOrder).not.toHaveBeenCalled();
+      expect(result.current.isPlaceOrderDisabled).toBe(true);
+    });
+
+    it('blocks submit and shows a toast when validation is invalid', async () => {
+      // Arrange
+      mockValidation.isValid = false;
+      mockValidation.errors = ['Bad order'];
+      const { result } = renderProForm();
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      expect(mockExecuteOrder).not.toHaveBeenCalled();
+      expect(validationError).toHaveBeenCalledWith('Bad order');
+    });
+
+    it('navigates to the cross-margin warning and aborts', async () => {
+      // Arrange
+      mockExistingPosition = { leverage: { type: 'cross', value: 5 } };
+      const { result } = renderProForm();
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      expect(mockNavigate).toHaveBeenCalledTimes(1);
+      expect(mockExecuteOrder).not.toHaveBeenCalled();
+    });
+
+    it('aborts and tracks when the estimated slippage exceeds the max', async () => {
+      // Arrange: estimate 500 bps > max 100 bps
+      mockEstimatedSlippageBps = 500;
+      const { result } = renderProForm();
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      expect(mockExecuteOrder).not.toHaveBeenCalled();
+      expect(validationError).toHaveBeenCalled();
+    });
+
+    it('aborts submit when the stop loss risks liquidation (doesStopLossRiskLiquidation guard)', async () => {
+      // Arrange: long, liquidation 80000 — SL at 79000 is past liquidation
+      mockOrderForm.stopLossPrice = '79000';
+      const { result } = renderProForm();
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      expect(mockExecuteOrder).not.toHaveBeenCalled();
+    });
+
+    it('skips updatePositionTPSL and clearPendingConfig when the order fails (shouldHandleTPSLSeparately path)', async () => {
+      // Arrange: new market position with TP triggers the separate-TP/SL branch;
+      // controller returns failure so post-processing must not run
+      mockOrderForm.takeProfitPrice = '95000';
+      mockExecuteOrder.mockResolvedValueOnce({
+        success: false,
+        error: 'rejected',
+      });
+      const { result } = renderProForm();
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      expect(mockUpdatePositionTPSL).not.toHaveBeenCalled();
+      expect(mockClearPendingTradeConfiguration).not.toHaveBeenCalled();
+    });
+
+    it('skips clearPendingConfig when the order fails (plain else path)', async () => {
+      // Arrange: valid reduce-only order with no TP/SL; controller returns failure
+      mockExistingPosition = {
+        size: '-1',
+        leverage: { type: 'isolated', value: 5 },
+      };
+      mockExecuteOrder.mockResolvedValueOnce({
+        success: false,
+        error: 'rejected',
+      });
+      const { result } = renderProForm();
+      act(() => {
+        result.current.onReduceOnlyChange(true);
+      });
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      expect(mockClearPendingTradeConfiguration).not.toHaveBeenCalled();
+      expect(mockUpdateOrderForm).not.toHaveBeenCalled();
+      expect(result.current.reduceOnly).toBe(true);
+    });
+  });
+
+  describe('execution toasts', () => {
+    it('shows the confirmed toast on success', () => {
+      // Arrange
+      renderProForm();
+
+      // Act
+      act(() => {
+        mockExecutionOptions.onSuccess?.();
+      });
+
+      // Assert
+      expect(confirmed).toHaveBeenCalled();
+    });
+
+    it('shows the creation-failed toast on error', () => {
+      // Arrange
+      renderProForm();
+
+      // Act
+      act(() => {
+        mockExecutionOptions.onError?.(new Error('boom'));
+      });
+
+      // Assert
+      expect(creationFailed).toHaveBeenCalled();
+    });
+  });
+
+  describe('TP/SL handling', () => {
+    it('places the order without TP/SL then updates position TP/SL when flagged', async () => {
+      // Arrange: new market position with TP set -> handled separately
+      mockOrderForm.takeProfitPrice = '95000';
+      const { result } = renderProForm();
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      const params = mockExecuteOrder.mock.calls[0][0];
+      expect(params.takeProfitPrice).toBeUndefined();
+      expect(mockUpdatePositionTPSL).toHaveBeenCalledWith({
+        symbol: 'BTC',
+        takeProfitPrice: '95000',
+        stopLossPrice: undefined,
+      });
+    });
+
+    it('shows an error toast when the separate TP/SL update fails', async () => {
+      // Arrange
+      mockOrderForm.takeProfitPrice = '95000';
+      mockUpdatePositionTPSL.mockResolvedValue({
+        success: false,
+        error: 'nope',
+      });
+      const { result } = renderProForm();
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      expect(updateTPSLError).toHaveBeenCalledWith('nope');
+    });
+  });
+
+  describe('limit orders', () => {
+    it('sets the limit price and the fixed limit slippage on OrderParams', async () => {
+      // Arrange
+      mockOrderForm.type = 'limit';
+      mockOrderForm.limitPrice = '80000';
+      const { result } = renderProForm();
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      const params = mockExecuteOrder.mock.calls[0][0];
+      expect(params.price).toBe('80000');
+      expect(params.orderType).toBe('limit');
+    });
+
+    it('finalizes a trailing decimal separator from the limit price before submit', async () => {
+      // Arrange: Place Order can fire before blur commits a state update.
+      mockOrderForm.type = 'limit';
+      mockOrderForm.limitPrice = '12.';
+      const { result } = renderProForm();
+
+      // Act
+      await act(async () => {
+        await result.current.onPlaceOrderPress();
+      });
+
+      // Assert
+      const params = mockExecuteOrder.mock.calls[0][0];
+      expect(params.price).toBe('12');
+      expect(params.orderType).toBe('limit');
+    });
+  });
+
+  describe('additional notices', () => {
+    it('flags TP invalid, SL invalid and SL-liquidation-risk as inline notices', () => {
+      // Arrange: long order, current price 90000, liquidation 80000
+      mockOrderForm.takeProfitPrice = '2000'; // below market -> invalid
+      mockOrderForm.stopLossPrice = '70000'; // below liq -> risk (and valid side)
+      const { result } = renderProForm();
+
+      // Act
+      const ids = result.current.notices.map((n) => n.id);
+
+      // Assert
+      expect(ids).toContain('tp-invalid');
+      expect(ids).toContain('sl-liq-risk');
+    });
+  });
+
+  describe('summary slippage', () => {
+    it('hides the slippage row for limit orders', () => {
+      // Arrange: limit orders force DefaultLimitSlippageBps in buildPerpsOrderParams
+      // so the user-configured cap has no effect; the row is hidden to avoid misrepresentation.
+      mockOrderForm.type = 'limit';
+      mockEstimatedSlippageBps = null;
+      const { result } = renderProForm();
+
+      // Assert
+      expect(result.current.summary.slippage).toBeUndefined();
+      expect(result.current.summary.onSlippagePress).toBeUndefined();
+    });
+
+    it('shows a pending slippage row for market orders when no estimate is available', () => {
+      // Arrange: market order — estimate not yet available from the order book
+      mockEstimatedSlippageBps = null;
+      const { result } = renderProForm();
+
+      // Assert
+      expect(typeof result.current.summary.slippage).toBe('string');
+      expect(result.current.summary.slippage?.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe('isPlaceOrderDisabled', () => {
+    it('is disabled at the OI cap', () => {
+      // Arrange
+      mockIsAtCap = true;
+      const { result } = renderProForm();
+
+      // Assert
+      expect(result.current.isPlaceOrderDisabled).toBe(true);
+    });
+
+    it('is enabled for a valid, uncapped order', () => {
+      // Arrange / Act
+      const { result } = renderProForm();
+
+      // Assert
+      expect(result.current.isPlaceOrderDisabled).toBe(false);
+    });
+
+    it('is disabled when the stop loss risks liquidation', () => {
+      // Arrange: long, liquidation 80000 — SL at 79000 sits past liquidation
+      mockOrderForm.stopLossPrice = '79000';
+      const { result } = renderProForm();
+
+      // Assert
+      expect(result.current.isPlaceOrderDisabled).toBe(true);
+    });
+
+    it('is disabled when the take profit is on the wrong side', () => {
+      // Arrange: long, market 90000 — TP below market price is invalid
+      mockOrderForm.takeProfitPrice = '85000';
+      const { result } = renderProForm();
+
+      // Assert
+      expect(result.current.isPlaceOrderDisabled).toBe(true);
+    });
+
+    it('is disabled when the stop loss is on the wrong side', () => {
+      // Arrange: long, market 90000 — SL above market price is invalid
+      mockOrderForm.stopLossPrice = '95000';
+      const { result } = renderProForm();
+
+      // Assert
+      expect(result.current.isPlaceOrderDisabled).toBe(true);
+    });
+
+    it('ignores TP/SL blockers while Reduce Only is on with a valid closing side', () => {
+      mockExistingPosition = {
+        size: '-1',
+        leverage: { type: 'isolated', value: 5 },
+      };
+      mockOrderForm.takeProfitPrice = '85000';
+      const { result } = renderProForm();
+
+      act(() => {
+        result.current.onReduceOnlyChange(true);
+      });
+
+      expect(result.current.isPlaceOrderDisabled).toBe(false);
+    });
+
+    it('disables Place Order while the reduce-only position is loading', () => {
+      mockPositionStreamLoading = true;
+      mockExistingPosition = {
+        size: '-1',
+        leverage: { type: 'isolated', value: 5 },
+      };
+      const { result } = renderProForm();
+
+      act(() => {
+        result.current.onReduceOnlyChange(true);
+      });
+
+      expect(result.current.isPlaceOrderDisabled).toBe(true);
+    });
+  });
+
+  describe('reduceOnly toggle', () => {
+    it('clears TP/SL state when Reduce Only turns on', () => {
+      mockOrderForm.takeProfitPrice = '95000';
+      mockOrderForm.stopLossPrice = '80000';
+      const { result } = renderProForm();
+
+      act(() => {
+        result.current.onReduceOnlyChange(true);
+      });
+
+      expect(mockSetTakeProfitPrice).toHaveBeenCalledWith(undefined);
+      expect(mockSetStopLossPrice).toHaveBeenCalledWith(undefined);
+      expect(result.current.reduceOnly).toBe(true);
+    });
+  });
+
+  describe('handlers', () => {
+    it('navigates to the TP/SL screen and its onConfirm sets TP/SL', async () => {
+      // Arrange
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onTPSLPress();
+      });
+
+      // Assert
+      expect(mockNavigate).toHaveBeenCalledTimes(1);
+      const onConfirm = mockNavigate.mock.calls[0][1].onConfirm;
+      await act(async () => {
+        await onConfirm(undefined, '95000', '80000');
+      });
+      expect(mockSetTakeProfitPrice).toHaveBeenCalledWith('95000');
+      expect(mockSetStopLossPrice).toHaveBeenCalledWith('80000');
+    });
+
+    it('shows the limit-price-required toast and does not navigate for a limit order without a price', () => {
+      // Arrange
+      mockOrderForm.type = 'limit';
+      mockOrderForm.limitPrice = undefined;
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onTPSLPress();
+      });
+
+      // Assert
+      expect(mockShowToast).toHaveBeenCalledWith(limitPriceRequired);
+      expect(mockNavigate).not.toHaveBeenCalled();
+    });
+
+    it('confirms leverage, clamps an over-max amount, and tracks the change', () => {
+      // Arrange: amount 6000 > spendable(500) * leverage(10) = 5000
+      mockOrderForm.amount = '6000';
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onLeverageConfirm(10, 'slider');
+      });
+
+      // Assert
+      expect(mockSetLeverage).toHaveBeenCalledWith(10);
+      expect(mockSetAmount).toHaveBeenCalledWith('5000');
+      expect(mockTrack).toHaveBeenCalled();
+    });
+
+    it('saves slippage and opens the slippage sheet', () => {
+      // Arrange
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onSlippageSave(200);
+      });
+      act(() => {
+        result.current.summary.onSlippagePress?.();
+      });
+
+      // Assert
+      expect(mockSetMaxSlippage).toHaveBeenCalledWith(200);
+      expect(mockTrack).toHaveBeenCalled();
+    });
+
+    it('selects an order type', () => {
+      // Arrange
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onOrderTypeSelect('limit');
+      });
+
+      // Assert
+      expect(mockSetOrderType).toHaveBeenCalledWith('limit');
+    });
+
+    it('ignores size input over nine digits and forwards valid input', () => {
+      // Arrange
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.sizeInput.onChange('1234567890'); // 10 digits -> ignored
+      });
+      expect(mockSetAmount).not.toHaveBeenCalled();
+      act(() => {
+        result.current.sizeInput.onChange('1234'); // valid
+      });
+
+      // Assert
+      expect(mockSetAmount).toHaveBeenCalledWith('1234');
+    });
+
+    it('ignores limit price input over nine digits and forwards valid input', () => {
+      // Arrange
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onLimitPriceChange('1234567890'); // 10 digits -> ignored
+      });
+      expect(mockSetLimitPrice).not.toHaveBeenCalled();
+      act(() => {
+        result.current.onLimitPriceChange('1234.56'); // valid
+      });
+
+      // Assert
+      expect(mockSetLimitPrice).toHaveBeenCalledWith('1234.56');
+    });
+
+    it('normalizes leading zeroes in limit price input', () => {
+      // Arrange
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onLimitPriceChange('0012.5');
+      });
+
+      // Assert
+      expect(mockSetLimitPrice).toHaveBeenCalledWith('12.5');
+    });
+
+    it('normalizes comma decimal input in the limit price', () => {
+      // Arrange
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onLimitPriceChange('0012,5');
+      });
+
+      // Assert
+      expect(mockSetLimitPrice).toHaveBeenCalledWith('12.5');
+    });
+
+    it('rejects repeated decimal separators in limit price input', () => {
+      // Arrange
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onLimitPriceChange('1.2.3');
+      });
+
+      // Assert
+      expect(mockSetLimitPrice).not.toHaveBeenCalled();
+    });
+
+    it('finalizes a trailing decimal separator from the limit price on blur', () => {
+      // Arrange
+      mockOrderForm.limitPrice = '12.';
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onLimitPriceBlur();
+      });
+
+      // Assert
+      expect(mockSetLimitPrice).toHaveBeenCalledWith('12');
+    });
+
+    it('does not update the limit price on blur when already finalized', () => {
+      // Arrange
+      mockOrderForm.limitPrice = '12.5';
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onLimitPriceBlur();
+      });
+
+      // Assert
+      expect(mockSetLimitPrice).not.toHaveBeenCalled();
+    });
+
+    it('sets the limit price from the live mid', () => {
+      // Arrange
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onUseMidPricePress();
+      });
+
+      // Assert
+      expect(mockSetLimitPrice).toHaveBeenCalled();
+    });
+
+    it('previews a slider USD amount before committing on drag end', () => {
+      // Arrange
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.sizeSlider.onValueChange(500);
+      });
+      expect(mockSetAmount).not.toHaveBeenCalled();
+      act(() => {
+        result.current.sizeSlider.onDragEnd(500);
+      });
+
+      // Assert
+      expect(mockSetAmount).toHaveBeenCalledWith('500');
+    });
+
+    it('forwards the direction and add-funds handlers', () => {
+      // Arrange
+      const { result } = renderProForm();
+
+      // Act
+      act(() => {
+        result.current.onDirectionChange('short');
+      });
+      act(() => {
+        result.current.onAddFundsPress();
+      });
+
+      // Assert
+      expect(mockSetDirection).toHaveBeenCalledWith('short');
+      expect(mockHandleAddFunds).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProOrderForm.ts b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProOrderForm.ts
new file mode 100644
index 000000000000..50f6ea263dc5
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProOrderForm.ts
@@ -0,0 +1,1155 @@
+import {
+  DECIMAL_PRECISION_CONFIG,
+  PERPS_CONSTANTS,
+  getTriggerExecution,
+  type OrderType,
+  type PerpsMarketData,
+  type Position,
+} from '@metamask/perps-controller';
+import {
+  PERPS_EVENT_PROPERTY,
+  PERPS_EVENT_VALUE,
+} from '@metamask/perps-controller/constants';
+import {
+  useNavigation,
+  useRoute,
+  type RouteProp,
+} from '@react-navigation/native';
+import { useCallback, useMemo, useRef, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { strings } from '../../../../../../../../locales/i18n';
+import Engine from '../../../../../../../core/Engine';
+import { MetaMetricsEvents } from '../../../../../../../core/Analytics';
+import Routes from '../../../../../../../constants/navigation/Routes';
+import type { AppNavigationProp } from '../../../../../../../core/NavigationService/types';
+import { useVipTier } from '../../../../../Rewards/hooks/useVipTier';
+import type { PerpsTooltipContentKey } from '../../../../components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.types';
+import { bpsToPercent } from '../../../../constants/slippageConfig';
+import { usePerpsOrderContext } from '../../../../contexts/PerpsOrderContext';
+import {
+  useHasExistingPosition,
+  usePerpsLiquidationPrice,
+  usePerpsMarketData,
+  usePerpsOrderExecution,
+  usePerpsOrderFees,
+  usePerpsOrderValidation,
+  usePerpsToasts,
+  usePerpsTrading,
+} from '../../../../hooks';
+import { usePerpsHomeActions } from '../../../../hooks/usePerpsHomeActions';
+import {
+  usePerpsLivePrices,
+  usePerpsTopOfBook,
+} from '../../../../hooks/stream';
+import { usePerpsConnection } from '../../../../hooks/usePerpsConnection';
+import { usePerpsEstimatedSlippage } from '../../../../hooks/usePerpsEstimatedSlippage';
+import { usePerpsEventTracking } from '../../../../hooks/usePerpsEventTracking';
+import { usePerpsMaxSlippage } from '../../../../hooks/usePerpsMaxSlippage';
+import { usePerpsOICap } from '../../../../hooks/usePerpsOICap';
+import type { PerpsStackParamList } from '../../../../types/navigation';
+import { getPerpsChartLibrary } from '../../../../utils/chartAnalytics';
+import {
+  formatPerpsFiat,
+  formatWithSignificantDigits,
+  PRICE_RANGES_MINIMAL_VIEW,
+  PRICE_RANGES_UNIVERSAL,
+} from '../../../../utils/formatUtils';
+import {
+  buildPerpsOrderParams,
+  buildPerpsOrderTrackingData,
+} from '../../../../utils/orderParams';
+import { deriveOrderSizing } from '../../../../utils/orderSizing';
+import { willFlipPosition } from '../../../../utils/orderUtils';
+import {
+  validateReduceOnlyOrder,
+  type ReduceOnlyValidationCode,
+} from '../../../../utils/reduceOnlyValidation';
+import {
+  getPerpsOrderTpSlWarnings,
+  type PerpsOrderTpSlWarnings,
+} from '../../../../utils/tpslValidation';
+import { MAX_PERPS_INPUT_DIGITS } from '../../../../constants/perpsConfig';
+import {
+  finalizeNumericTextInput,
+  normalizeNumericTextInput,
+} from '../../../../../../Base/Keypad/normalizeNumericTextInput';
+import { selectPerpsAdvancedChartEnabledFlag } from '../../../../selectors/featureFlags';
+import type {
+  PerpsProOrderDirection,
+  PerpsProOrderNotice,
+  PerpsProOrderSummaryProps,
+  PerpsProSizeInputModel,
+  PerpsProSizeSliderModel,
+} from './PerpsProOrderForm.types';
+import { usePerpsProSizeInput } from './usePerpsProSizeInput';
+
+const REDUCE_ONLY_ERROR_I18N_KEYS: Record<ReduceOnlyValidationCode, string> = {
+  no_position: 'perps.order.validation.reduce_only_no_position',
+  wrong_side: 'perps.order.validation.reduce_only_wrong_side',
+  too_large: 'perps.order.validation.reduce_only_too_large',
+};
+
+/** Prefix of the interpolated insufficient-balance message (stable across amounts). */
+const INSUFFICIENT_BALANCE_PREFIX = strings(
+  'perps.order.validation.insufficient_balance',
+  { required: '__REQ__', available: '__AVAIL__' },
+).split('__REQ__')[0];
+
+const isMarginValidationError = (message: string): boolean =>
+  message.startsWith(INSUFFICIENT_BALANCE_PREFIX) ||
+  message === strings('perps.order.validation.insufficient_funds') ||
+  message ===
+    strings('perps.order.validation.insufficient_funds_to_cover_trade');
+
+const isLimitPriceValidationError = (message: string): boolean =>
+  message === strings('perps.order.validation.limit_price_required') ||
+  message === strings('perps.order.validation.please_set_a_limit_price') ||
+  message ===
+    strings(
+      'perps.order.validation.limit_price_must_be_set_before_configuring_tpsl',
+    );
+
+const getBlockingNotices = ({
+  reduceOnlyErrorCode,
+  isReduceOnlyPositionLoading,
+  filteredErrors,
+}: {
+  reduceOnlyErrorCode?: ReduceOnlyValidationCode;
+  isReduceOnlyPositionLoading: boolean;
+  filteredErrors: string[];
+}): PerpsProOrderNotice[] => {
+  // Position data is unresolved — skipValidation retains prior errors, so hide
+  // blocking notices until the live reduce-only state can be evaluated.
+  if (isReduceOnlyPositionLoading) {
+    return [];
+  }
+
+  if (reduceOnlyErrorCode) {
+    return [
+      {
+        id: 'reduce-only',
+        variant: 'banner',
+        message: strings(REDUCE_ONLY_ERROR_I18N_KEYS[reduceOnlyErrorCode]),
+      },
+    ];
+  }
+
+  const marginError = filteredErrors.find(isMarginValidationError);
+  if (marginError) {
+    return [{ id: 'margin', variant: 'banner', message: marginError }];
+  }
+
+  const limitPriceError = filteredErrors.find(isLimitPriceValidationError);
+  if (limitPriceError) {
+    return [
+      {
+        id: 'limit-price',
+        variant: 'banner',
+        message: limitPriceError,
+      },
+    ];
+  }
+
+  return filteredErrors.map((message, index) => ({
+    id: `validation-${index}`,
+    variant: 'inline',
+    message,
+  }));
+};
+
+const getTpslNotices = ({
+  reduceOnly,
+  direction,
+  doesStopLossRiskLiquidation,
+  isTakeProfitPriceInvalid,
+  isStopLossPriceInvalid,
+  tpslPriceType,
+}: {
+  reduceOnly: boolean;
+  direction: PerpsProOrderDirection;
+  doesStopLossRiskLiquidation: boolean;
+  isTakeProfitPriceInvalid: boolean;
+  isStopLossPriceInvalid: boolean;
+  tpslPriceType: PerpsOrderTpSlWarnings['tpslPriceType'];
+}): PerpsProOrderNotice[] => {
+  if (reduceOnly) {
+    return [];
+  }
+
+  const notices: PerpsProOrderNotice[] = [];
+  const isLong = direction === 'long';
+
+  if (doesStopLossRiskLiquidation) {
+    notices.push({
+      id: 'sl-liq-risk',
+      variant: 'inline',
+      message: strings('perps.tpsl.stop_loss_order_view_warning', {
+        direction: strings(isLong ? 'perps.tpsl.below' : 'perps.tpsl.above'),
+      }),
+    });
+  }
+
+  if (isTakeProfitPriceInvalid) {
+    notices.push({
+      id: 'tp-invalid',
+      variant: 'inline',
+      message: strings('perps.tpsl.take_profit_wrong_side_warning', {
+        direction: strings(isLong ? 'perps.tpsl.above' : 'perps.tpsl.below'),
+        priceType: tpslPriceType,
+      }),
+    });
+  }
+
+  if (isStopLossPriceInvalid) {
+    notices.push({
+      id: 'sl-invalid',
+      variant: 'inline',
+      message: strings('perps.tpsl.stop_loss_wrong_side_warning', {
+        direction: strings(isLong ? 'perps.tpsl.below' : 'perps.tpsl.above'),
+        priceType: tpslPriceType,
+      }),
+    });
+  }
+
+  return notices;
+};
+
+export interface UsePerpsProOrderFormParams {
+  market: PerpsMarketData;
+}
+
+export interface UsePerpsProOrderFormResult {
+  // Presentational form props
+  direction: PerpsProOrderDirection;
+  onDirectionChange: (direction: PerpsProOrderDirection) => void;
+  leverage: number;
+  onLeveragePress: () => void;
+  orderType: OrderType;
+  onOrderTypeButtonPress: () => void;
+  limitPrice: string;
+  onLimitPriceChange: (value: string) => void;
+  onLimitPriceBlur: () => void;
+  onUseMidPricePress: () => void;
+  sizeInput: PerpsProSizeInputModel;
+  sizeSlider: PerpsProSizeSliderModel;
+  effectiveUsdAmount: string;
+  availableBalance: string;
+  onAddFundsPress: () => void;
+  reduceOnly: boolean;
+  onReduceOnlyChange: (value: boolean) => void;
+  isTPSLConfigured: boolean;
+  onTPSLPress: () => void;
+  notices: PerpsProOrderNotice[];
+  summary: PerpsProOrderSummaryProps;
+  isPlaceOrderDisabled: boolean;
+  isPlaceOrderLoading: boolean;
+  onPlaceOrderPress: () => void;
+  // Leverage sheet
+  isLeverageVisible: boolean;
+  minLeverage: number;
+  maxLeverage: number;
+  currentPrice: number;
+  onLeverageConfirm: (
+    leverage: number,
+    inputMethod?: 'slider' | 'preset',
+  ) => void;
+  closeLeverage: () => void;
+  // Slippage sheet
+  isSlippageVisible: boolean;
+  maxSlippageBps: number;
+  onSlippageSave: (valueBps: number) => void;
+  closeSlippage: () => void;
+  // Order type sheet
+  isOrderTypeVisible: boolean;
+  onOrderTypeSelect: (type: OrderType) => void;
+  closeOrderType: () => void;
+  // Eligibility (geo-block) modal
+  isEligibilityModalVisible: boolean;
+  closeEligibilityModal: () => void;
+  // Fees tooltip
+  selectedTooltip: PerpsTooltipContentKey | null;
+  closeTooltip: () => void;
+  feeMetamaskFeeRate: number | undefined;
+  feeProtocolFeeRate: number | undefined;
+  feeOriginalMetamaskFeeRate: number | undefined;
+  feeDiscountPercentage: number | undefined;
+}
+
+/**
+ * Pro-local orchestration hook for the inline order form.
+ *
+ * Reuses the same business hooks lite (`PerpsOrderView`) uses and composes a
+ * trimmed direct-path submit handler (no navigation-on-success, no
+ * pay-with-any-token deposit branch, no abandonment tracking). Must render
+ * within a `PerpsOrderProvider`.
+ *
+ * NOTE (TAT-3595): Bespoke Pro lifecycle traces (render trace, abandonment)
+ * are intentionally deferred to a follow-up pending the product/analytics sync.
+ */
+export const usePerpsProOrderForm = ({
+  market,
+}: UsePerpsProOrderFormParams): UsePerpsProOrderFormResult => {
+  const symbol = market.symbol;
+
+  const navigation = useNavigation<AppNavigationProp>();
+  const route =
+    useRoute<RouteProp<PerpsStackParamList, 'PerpsMarketDetails'>>();
+  const source = route.params?.source;
+  const sourceSection = route.params?.source_section;
+
+  const isAdvancedChartEnabled = useSelector(
+    selectPerpsAdvancedChartEnabledFlag,
+  );
+  const chartLibrary = getPerpsChartLibrary(isAdvancedChartEnabled);
+
+  const { isInitialized } = usePerpsConnection();
+  const { track } = usePerpsEventTracking();
+  const { showToast, PerpsToastOptions } = usePerpsToasts();
+  const { updatePositionTPSL } = usePerpsTrading();
+
+  const {
+    orderForm,
+    updateOrderForm,
+    setAmount,
+    setLeverage,
+    setDirection,
+    setTakeProfitPrice,
+    setStopLossPrice,
+    setLimitPrice,
+    setOrderType,
+    maxPossibleAmount,
+    balanceForValidation: spendableBalance,
+  } = usePerpsOrderContext();
+
+  // Local (Pro-only) state
+  const [reduceOnly, setReduceOnly] = useState(false);
+  const [isLeverageVisible, setIsLeverageVisible] = useState(false);
+  const [isSlippageVisible, setIsSlippageVisible] = useState(false);
+  const [isOrderTypeVisible, setIsOrderTypeVisible] = useState(false);
+  const [selectedTooltip, setSelectedTooltip] =
+    useState<PerpsTooltipContentKey | null>(null);
+  const isSubmittingRef = useRef(false);
+
+  const { maxSlippageBps, maxSlippageSource, setMaxSlippage } =
+    usePerpsMaxSlippage();
+  const { isAtCap } = usePerpsOICap(symbol);
+  const vipTier = useVipTier();
+
+  const { handleAddFunds, isEligibilityModalVisible, closeEligibilityModal } =
+    usePerpsHomeActions({
+      buttonLocation: PERPS_EVENT_VALUE.BUTTON_LOCATION.PERPS_ASSET_SCREEN,
+    });
+
+  const { marketData, isLoading: isMarketDataLoading } = usePerpsMarketData({
+    asset: symbol,
+    showErrorToast: true,
+  });
+  const szDecimals =
+    marketData?.szDecimals ?? DECIMAL_PRECISION_CONFIG.FallbackSizeDecimals;
+  const maxLeverage =
+    marketData?.maxLeverage ?? PERPS_CONSTANTS.DefaultMaxLeverage;
+  const isLoadingMarketData = isMarketDataLoading && marketData === null;
+
+  const {
+    existingPosition: currentMarketPosition,
+    isLoading: isPositionStreamLoading,
+  } = useHasExistingPosition({
+    asset: symbol,
+    loadOnMount: true,
+  });
+
+  const prices = usePerpsLivePrices({ symbols: [symbol], throttleMs: 1000 });
+  const currentPrice = prices[symbol];
+  const currentTopOfBook = usePerpsTopOfBook({ symbol });
+
+  const assetData = useMemo(() => {
+    if (!currentPrice) {
+      return { price: 0, change: 0, markPrice: 0 };
+    }
+    const price = Number.parseFloat(currentPrice.price || '0');
+    const markPrice = Number.parseFloat(currentPrice.markPrice || '0');
+    const change = Number.parseFloat(currentPrice.percentChange24h || '0');
+    return {
+      price: Number.isNaN(price) ? 0 : price,
+      markPrice: Number.isNaN(markPrice) ? 0 : markPrice,
+      change: Number.isNaN(change) ? 0 : change,
+    };
+  }, [currentPrice]);
+
+  const effectiveInputPrice = useMemo(() => {
+    const parsedLimitPrice =
+      orderForm.type === 'limit' && orderForm.limitPrice
+        ? Number.parseFloat(orderForm.limitPrice)
+        : Number.NaN;
+    return parsedLimitPrice > 0 ? parsedLimitPrice : assetData.price;
+  }, [assetData.price, orderForm.limitPrice, orderForm.type]);
+
+  const {
+    sizeInput,
+    sizeSlider,
+    effectiveUsdAmount,
+    commitPendingSliderPreview,
+  } = usePerpsProSizeInput({
+    usdAmount: orderForm.amount,
+    setAmount,
+    assetSymbol: symbol,
+    effectivePrice: effectiveInputPrice,
+    szDecimals,
+    maxPossibleAmount,
+    maxDigits: MAX_PERPS_INPUT_DIGITS,
+  });
+
+  const feeResults = usePerpsOrderFees({
+    orderType: orderForm.type,
+    amount: effectiveUsdAmount,
+    symbol: orderForm.asset,
+    isClosing: reduceOnly,
+    limitPrice: orderForm.limitPrice,
+    direction: orderForm.direction,
+    currentAskPrice: currentTopOfBook?.bestAsk
+      ? Number.parseFloat(currentTopOfBook.bestAsk)
+      : undefined,
+    currentBidPrice: currentTopOfBook?.bestBid
+      ? Number.parseFloat(currentTopOfBook.bestBid)
+      : undefined,
+  });
+  const estimatedFees = feeResults.totalFee;
+  const undiscountedEstimatedFees = feeResults.undiscountedTotalFee;
+
+  const isMarketOrder = orderForm.type === 'market';
+  const hasValidAmount = Number.parseFloat(effectiveUsdAmount) > 0;
+
+  const orderUsdAmount = useMemo(
+    () => Number.parseFloat(effectiveUsdAmount) || 0,
+    [effectiveUsdAmount],
+  );
+  const { estimatedSlippageBps } = usePerpsEstimatedSlippage({
+    symbol: orderForm.asset,
+    sizeUsd: orderUsdAmount,
+    isBuy: orderForm.direction === 'long',
+    enabled: isMarketOrder && hasValidAmount && isInitialized,
+  });
+  const estimatedSlippagePct: number | null = useMemo(
+    () =>
+      typeof estimatedSlippageBps === 'number'
+        ? bpsToPercent(estimatedSlippageBps)
+        : null,
+    [estimatedSlippageBps],
+  );
+  const estimatedSlippagePctDisplay: string | null = useMemo(
+    () =>
+      estimatedSlippagePct === null ? null : estimatedSlippagePct.toFixed(2),
+    [estimatedSlippagePct],
+  );
+  const exceedsMaxSlippage =
+    isMarketOrder &&
+    typeof estimatedSlippageBps === 'number' &&
+    estimatedSlippageBps > maxSlippageBps;
+
+  const { effectivePrice, positionSize, marginRequired } = useMemo(
+    () =>
+      deriveOrderSizing({
+        amount: effectiveUsdAmount,
+        orderType: orderForm.type,
+        limitPrice: orderForm.limitPrice,
+        marketPrice: assetData.price,
+        markPrice: assetData.markPrice,
+        leverage: orderForm.leverage,
+        szDecimals,
+        isLoadingMarketData,
+      }),
+    [
+      effectiveUsdAmount,
+      orderForm.type,
+      orderForm.limitPrice,
+      orderForm.leverage,
+      assetData.price,
+      assetData.markPrice,
+      szDecimals,
+      isLoadingMarketData,
+    ],
+  );
+
+  const liquidationPriceParams = useMemo(
+    () => ({
+      entryPrice: effectivePrice,
+      leverage: orderForm.leverage,
+      direction: orderForm.direction,
+      asset: orderForm.asset,
+    }),
+    [effectivePrice, orderForm.leverage, orderForm.direction, orderForm.asset],
+  );
+  const { liquidationPrice } = usePerpsLiquidationPrice(liquidationPriceParams);
+
+  const existingPositionLeverageForValidation =
+    currentMarketPosition?.leverage?.value;
+  const effectiveOrderForm = useMemo(
+    () => ({ ...orderForm, amount: effectiveUsdAmount }),
+    [effectiveUsdAmount, orderForm],
+  );
+
+  const isReduceOnlyPositionLoading = reduceOnly && isPositionStreamLoading;
+
+  const reduceOnlyValidation = useMemo(
+    () =>
+      validateReduceOnlyOrder({
+        reduceOnly,
+        direction: orderForm.direction,
+        orderSize: positionSize,
+        position: currentMarketPosition,
+      }),
+    [reduceOnly, orderForm.direction, positionSize, currentMarketPosition],
+  );
+
+  const orderValidation = usePerpsOrderValidation({
+    orderForm: effectiveOrderForm,
+    positionSize,
+    assetPrice: assetData.price,
+    spendableBalance,
+    // Reduce-only orders release margin from the existing position; they don't
+    // draw from spendableBalance. Pass '0' so the balance gate is not triggered
+    // for a valid close/reduce when free collateral is low.
+    marginRequired: reduceOnly ? '0' : marginRequired || '0',
+    existingPositionLeverage: existingPositionLeverageForValidation,
+    // Skip protocol validation until position data is ready so we don't flash
+    // unrelated errors while waiting for the position snapshot.
+    skipValidation: isReduceOnlyPositionLoading,
+    originalUsdAmount: effectiveUsdAmount,
+    reduceOnly,
+    isFullClose: reduceOnlyValidation.isFullClose,
+  });
+
+  const filteredErrors = useMemo(() => {
+    const sizePositiveMsg = strings(
+      'perps.errors.orderValidation.sizePositive',
+    );
+    return orderValidation.errors.filter((err) => err !== sizePositiveMsg);
+  }, [orderValidation.errors]);
+
+  const {
+    doesStopLossRiskLiquidation,
+    isTakeProfitPriceInvalid,
+    isStopLossPriceInvalid,
+    tpslPriceType,
+  } = getPerpsOrderTpSlWarnings({
+    orderType: orderForm.type,
+    limitPrice: orderForm.limitPrice,
+    direction: orderForm.direction,
+    takeProfitPrice: orderForm.takeProfitPrice,
+    stopLossPrice: orderForm.stopLossPrice,
+    liquidationPrice,
+    marketPrice: assetData.price,
+  });
+
+  const { placeOrder: executeOrder, isPlacing } = usePerpsOrderExecution({
+    onSuccess: () => {
+      showToast(
+        PerpsToastOptions.orderManagement[
+          getTriggerExecution(orderForm.type)
+        ].confirmed(orderForm.direction, positionSize, orderForm.asset),
+      );
+    },
+    onError: (error) => {
+      showToast(
+        PerpsToastOptions.orderManagement[
+          getTriggerExecution(orderForm.type)
+        ].creationFailed(error),
+      );
+    },
+  });
+
+  const hasTpslBlocker =
+    !reduceOnly &&
+    (doesStopLossRiskLiquidation ||
+      isTakeProfitPriceInvalid ||
+      isStopLossPriceInvalid);
+  const directionTrackingValue =
+    orderForm.direction === 'long'
+      ? PERPS_EVENT_VALUE.DIRECTION.LONG
+      : PERPS_EVENT_VALUE.DIRECTION.SHORT;
+
+  const handlePlaceOrder = useCallback(async () => {
+    if (isSubmittingRef.current) {
+      return;
+    }
+
+    track(MetaMetricsEvents.PERPS_UI_INTERACTION, {
+      [PERPS_EVENT_PROPERTY.INTERACTION_TYPE]:
+        PERPS_EVENT_VALUE.INTERACTION_TYPE.TAP,
+      [PERPS_EVENT_PROPERTY.BUTTON_CLICKED]:
+        PERPS_EVENT_VALUE.BUTTON_CLICKED.PLACE_ORDER,
+      [PERPS_EVENT_PROPERTY.ASSET]: orderForm.asset,
+      [PERPS_EVENT_PROPERTY.DIRECTION]: directionTrackingValue,
+    });
+
+    if (exceedsMaxSlippage && typeof estimatedSlippageBps === 'number') {
+      const estPct = bpsToPercent(estimatedSlippageBps);
+      const maxPct = bpsToPercent(maxSlippageBps);
+      showToast(
+        PerpsToastOptions.formValidation.orderForm.validationError(
+          strings('perps.slippage.exceeds_max', {
+            est: estPct.toFixed(2),
+            max: maxPct.toFixed(2),
+          }),
+        ),
+      );
+      track(MetaMetricsEvents.PERPS_UI_INTERACTION, {
+        [PERPS_EVENT_PROPERTY.INTERACTION_TYPE]:
+          PERPS_EVENT_VALUE.INTERACTION_TYPE.SLIPPAGE_LIMIT_BLOCKED_ORDER,
+        [PERPS_EVENT_PROPERTY.ASSET]: orderForm.asset,
+        [PERPS_EVENT_PROPERTY.MAX_SLIPPAGE_PCT]: maxPct,
+        [PERPS_EVENT_PROPERTY.ESTIMATED_SLIPPAGE_PCT]: estPct,
+        [PERPS_EVENT_PROPERTY.MAX_SLIPPAGE_SOURCE]: maxSlippageSource,
+      });
+      return;
+    }
+
+    if (hasTpslBlocker) {
+      return;
+    }
+
+    if (
+      isReduceOnlyPositionLoading ||
+      (reduceOnly && !reduceOnlyValidation.isValid)
+    ) {
+      return;
+    }
+
+    isSubmittingRef.current = true;
+
+    try {
+      if (!orderValidation.isValid) {
+        const firstError = orderValidation.errors[0];
+        showToast(
+          PerpsToastOptions.formValidation.orderForm.validationError(
+            firstError,
+          ),
+        );
+        track(MetaMetricsEvents.PERPS_ERROR, {
+          [PERPS_EVENT_PROPERTY.ERROR_TYPE]:
+            PERPS_EVENT_VALUE.ERROR_TYPE.VALIDATION,
+          [PERPS_EVENT_PROPERTY.ERROR_MESSAGE]: firstError,
+          [PERPS_EVENT_PROPERTY.SCREEN_NAME]:
+            PERPS_EVENT_VALUE.SCREEN_NAME.PERPS_ORDER,
+          [PERPS_EVENT_PROPERTY.SCREEN_TYPE]:
+            PERPS_EVENT_VALUE.SCREEN_TYPE.TRADING,
+        });
+        isSubmittingRef.current = false;
+        return;
+      }
+
+      if (currentMarketPosition?.leverage?.type === 'cross') {
+        navigation.navigate(Routes.PERPS.MODALS.ROOT, {
+          screen: Routes.PERPS.MODALS.CROSS_MARGIN_WARNING,
+        });
+        track(MetaMetricsEvents.PERPS_ERROR, {
+          [PERPS_EVENT_PROPERTY.ERROR_TYPE]:
+            PERPS_EVENT_VALUE.ERROR_TYPE.VALIDATION,
+          [PERPS_EVENT_PROPERTY.ERROR_MESSAGE]:
+            'Cross margin position detected',
+          [PERPS_EVENT_PROPERTY.SCREEN_NAME]:
+            PERPS_EVENT_VALUE.SCREEN_NAME.PERPS_ORDER,
+          [PERPS_EVENT_PROPERTY.SCREEN_TYPE]:
+            PERPS_EVENT_VALUE.SCREEN_TYPE.TRADING,
+        });
+        isSubmittingRef.current = false;
+        return;
+      }
+
+      // reduce-only is Pro-specific (TAT-3595); the direct Pro path never
+      // uses pay-with-any-token, so those tracking fields are omitted.
+      // Finalize trailing decimals so Place Order does not depend on blur timing.
+      const finalizedLimitPrice = orderForm.limitPrice
+        ? finalizeNumericTextInput(orderForm.limitPrice)
+        : orderForm.limitPrice;
+
+      const orderParams = buildPerpsOrderParams({
+        asset: orderForm.asset,
+        isBuy: orderForm.direction === 'long',
+        size: positionSize,
+        orderType: orderForm.type,
+        effectivePrice,
+        leverage: orderForm.leverage,
+        usdAmount: effectiveUsdAmount,
+        maxSlippageBps,
+        limitPrice: finalizedLimitPrice,
+        takeProfitPrice: orderForm.takeProfitPrice,
+        stopLossPrice: orderForm.stopLossPrice,
+        reduceOnly,
+        isFullClose: reduceOnly ? reduceOnlyValidation.isFullClose : undefined,
+        trackingData: buildPerpsOrderTrackingData({
+          marginRequired,
+          feeResults,
+          marketPrice: assetData.price,
+          inputMethod: 'default',
+          source,
+          sourceSection,
+          currentMarketPosition,
+          direction: orderForm.direction,
+          chartLibrary,
+          vipTier,
+        }),
+      });
+
+      showToast(
+        PerpsToastOptions.orderManagement[
+          getTriggerExecution(orderForm.type)
+        ].submitted(orderForm.direction, positionSize, orderForm.asset),
+      );
+
+      const shouldHandleTPSLSeparately =
+        !reduceOnly &&
+        (orderForm.takeProfitPrice || orderForm.stopLossPrice) &&
+        ((!currentMarketPosition && orderForm.type === 'market') ||
+          (currentMarketPosition &&
+            willFlipPosition(currentMarketPosition, orderParams)));
+
+      if (shouldHandleTPSLSeparately) {
+        const orderWithoutTPSL = { ...orderParams };
+        delete orderWithoutTPSL.takeProfitPrice;
+        delete orderWithoutTPSL.stopLossPrice;
+
+        const orderResult = await executeOrder(orderWithoutTPSL);
+        if (!orderResult?.success) {
+          return;
+        }
+
+        const tpslResult = await updatePositionTPSL({
+          symbol: orderForm.asset,
+          takeProfitPrice: orderForm.takeProfitPrice,
+          stopLossPrice: orderForm.stopLossPrice,
+        });
+
+        if (!tpslResult.success) {
+          const errorMessage =
+            tpslResult.error || strings('perps.errors.unknown');
+          showToast(
+            PerpsToastOptions.positionManagement.tpsl.updateTPSLError(
+              errorMessage,
+            ),
+          );
+        }
+      } else {
+        const orderResult = await executeOrder(orderParams);
+        if (!orderResult?.success) {
+          return;
+        }
+      }
+
+      Engine.context.PerpsController?.clearPendingTradeConfiguration(
+        orderForm.asset,
+      );
+      updateOrderForm({
+        amount: '',
+        direction: 'long',
+        type: 'market',
+        balancePercent: 0,
+        limitPrice: undefined,
+        takeProfitPrice: undefined,
+        stopLossPrice: undefined,
+      });
+      setReduceOnly(false);
+    } finally {
+      isSubmittingRef.current = false;
+    }
+  }, [
+    track,
+    orderForm.asset,
+    orderForm.direction,
+    orderForm.type,
+    orderForm.leverage,
+    orderForm.limitPrice,
+    orderForm.takeProfitPrice,
+    orderForm.stopLossPrice,
+    effectiveUsdAmount,
+    exceedsMaxSlippage,
+    estimatedSlippageBps,
+    maxSlippageBps,
+    maxSlippageSource,
+    hasTpslBlocker,
+    isReduceOnlyPositionLoading,
+    reduceOnlyValidation.isValid,
+    reduceOnlyValidation.isFullClose,
+    directionTrackingValue,
+    orderValidation.isValid,
+    orderValidation.errors,
+    currentMarketPosition,
+    navigation,
+    positionSize,
+    effectivePrice,
+    reduceOnly,
+    marginRequired,
+    feeResults,
+    assetData.price,
+    source,
+    sourceSection,
+    chartLibrary,
+    vipTier,
+    executeOrder,
+    updateOrderForm,
+    updatePositionTPSL,
+    showToast,
+    PerpsToastOptions.formValidation.orderForm,
+    PerpsToastOptions.orderManagement,
+    PerpsToastOptions.positionManagement.tpsl,
+  ]);
+
+  const onTPSLPress = useCallback(() => {
+    if (orderForm.type === 'limit' && !orderForm.limitPrice) {
+      showToast(PerpsToastOptions.formValidation.orderForm.limitPriceRequired);
+      return;
+    }
+    navigation.navigate(Routes.PERPS.TPSL, {
+      asset: orderForm.asset,
+      currentPrice: assetData.price,
+      direction: orderForm.direction,
+      leverage: orderForm.leverage,
+      orderType: orderForm.type,
+      limitPrice: orderForm.limitPrice,
+      initialTakeProfitPrice: orderForm.takeProfitPrice,
+      initialStopLossPrice: orderForm.stopLossPrice,
+      amount: effectiveUsdAmount,
+      szDecimals,
+      onConfirm: async (
+        _position?: Position,
+        takeProfitPrice?: string,
+        stopLossPrice?: string,
+      ) => {
+        setTakeProfitPrice(takeProfitPrice || undefined);
+        setStopLossPrice(stopLossPrice || undefined);
+      },
+    });
+  }, [
+    PerpsToastOptions.formValidation.orderForm.limitPriceRequired,
+    orderForm.limitPrice,
+    orderForm.type,
+    orderForm.asset,
+    orderForm.direction,
+    orderForm.leverage,
+    orderForm.takeProfitPrice,
+    orderForm.stopLossPrice,
+    effectiveUsdAmount,
+    assetData.price,
+    showToast,
+    navigation,
+    setTakeProfitPrice,
+    setStopLossPrice,
+    szDecimals,
+  ]);
+
+  const onLeverageConfirm = useCallback(
+    (leverage: number, inputMethod?: 'slider' | 'preset') => {
+      setLeverage(leverage);
+
+      const currentAmount = Number.parseFloat(effectiveUsdAmount || '0');
+      const newMaxAmount = spendableBalance * leverage;
+      if (currentAmount > newMaxAmount) {
+        setAmount(Math.floor(newMaxAmount).toString());
+      }
+
+      setIsLeverageVisible(false);
+
+      const eventProperties: Record<string, string | number> = {
+        [PERPS_EVENT_PROPERTY.ASSET]: orderForm.asset,
+        [PERPS_EVENT_PROPERTY.DIRECTION]:
+          orderForm.direction === 'long'
+            ? PERPS_EVENT_VALUE.DIRECTION.LONG
+            : PERPS_EVENT_VALUE.DIRECTION.SHORT,
+        [PERPS_EVENT_PROPERTY.LEVERAGE_USED]: leverage,
+        previousLeverage: orderForm.leverage,
+      };
+      if (inputMethod) {
+        eventProperties[PERPS_EVENT_PROPERTY.INPUT_METHOD] =
+          inputMethod === 'slider'
+            ? PERPS_EVENT_VALUE.INPUT_METHOD.SLIDER
+            : PERPS_EVENT_VALUE.INPUT_METHOD.PRESET;
+      }
+      track(MetaMetricsEvents.PERPS_UI_INTERACTION, {
+        ...eventProperties,
+        [PERPS_EVENT_PROPERTY.INTERACTION_TYPE]:
+          PERPS_EVENT_VALUE.INTERACTION_TYPE.LEVERAGE_CHANGED,
+        [PERPS_EVENT_PROPERTY.SETTING_TYPE]:
+          PERPS_EVENT_VALUE.SETTING_TYPE.LEVERAGE,
+      });
+    },
+    [
+      setLeverage,
+      setAmount,
+      effectiveUsdAmount,
+      orderForm.asset,
+      orderForm.direction,
+      orderForm.leverage,
+      spendableBalance,
+      track,
+    ],
+  );
+
+  const onSlippageSave = useCallback(
+    (valueBps: number) => {
+      setMaxSlippage(valueBps);
+      setIsSlippageVisible(false);
+      track(MetaMetricsEvents.PERPS_UI_INTERACTION, {
+        [PERPS_EVENT_PROPERTY.INTERACTION_TYPE]:
+          PERPS_EVENT_VALUE.INTERACTION_TYPE.SLIPPAGE_CONFIG_CHANGED,
+        [PERPS_EVENT_PROPERTY.ASSET]: orderForm.asset,
+        [PERPS_EVENT_PROPERTY.MAX_SLIPPAGE_PCT]: bpsToPercent(valueBps),
+        [PERPS_EVENT_PROPERTY.MAX_SLIPPAGE_SOURCE]:
+          PERPS_EVENT_VALUE.MAX_SLIPPAGE_SOURCE.USER_CONFIGURED,
+        [PERPS_EVENT_PROPERTY.SETTING_TYPE]:
+          PERPS_EVENT_VALUE.SETTING_TYPE.SLIPPAGE,
+      });
+    },
+    [setMaxSlippage, track, orderForm.asset],
+  );
+
+  const onSlippagePress = useCallback(() => {
+    setIsSlippageVisible(true);
+    track(MetaMetricsEvents.PERPS_UI_INTERACTION, {
+      [PERPS_EVENT_PROPERTY.INTERACTION_TYPE]:
+        PERPS_EVENT_VALUE.INTERACTION_TYPE.SLIPPAGE_CONFIG_OPENED,
+      [PERPS_EVENT_PROPERTY.ASSET]: orderForm.asset,
+      [PERPS_EVENT_PROPERTY.MAX_SLIPPAGE_PCT]: bpsToPercent(maxSlippageBps),
+      [PERPS_EVENT_PROPERTY.MAX_SLIPPAGE_SOURCE]: maxSlippageSource,
+    });
+  }, [track, orderForm.asset, maxSlippageBps, maxSlippageSource]);
+
+  const onOrderTypeSelect = useCallback(
+    (type: OrderType) => {
+      setOrderType(type);
+      setIsOrderTypeVisible(false);
+    },
+    [setOrderType],
+  );
+
+  const onUseMidPricePress = useCallback(() => {
+    if (assetData.price > 0) {
+      setLimitPrice(
+        formatWithSignificantDigits(
+          assetData.price,
+          DECIMAL_PRECISION_CONFIG.MaxSignificantFigures,
+        ).value.toString(),
+      );
+    }
+  }, [assetData.price, setLimitPrice]);
+
+  const availableBalance = useMemo(() => {
+    if (!isInitialized) {
+      return strings('perps.pro_order_form.available_balance_unavailable');
+    }
+
+    return strings('perps.pro_order_form.available_balance', {
+      amount: formatPerpsFiat(spendableBalance, {
+        ranges: PRICE_RANGES_MINIMAL_VIEW,
+      }),
+    });
+  }, [isInitialized, spendableBalance]);
+
+  const notices = useMemo<PerpsProOrderNotice[]>(() => {
+    const list = [
+      ...getBlockingNotices({
+        reduceOnlyErrorCode: reduceOnly
+          ? reduceOnlyValidation.errorCode
+          : undefined,
+        isReduceOnlyPositionLoading,
+        filteredErrors,
+      }),
+      ...getTpslNotices({
+        reduceOnly,
+        direction: orderForm.direction,
+        doesStopLossRiskLiquidation,
+        isTakeProfitPriceInvalid,
+        isStopLossPriceInvalid,
+        tpslPriceType,
+      }),
+    ];
+
+    if (isAtCap) {
+      list.push({
+        id: 'oi-cap',
+        variant: 'banner',
+        message: strings('perps.order.validation.oi_cap_reached'),
+      });
+    }
+
+    return list;
+  }, [
+    reduceOnly,
+    isReduceOnlyPositionLoading,
+    reduceOnlyValidation.errorCode,
+    filteredErrors,
+    doesStopLossRiskLiquidation,
+    isTakeProfitPriceInvalid,
+    isStopLossPriceInvalid,
+    isAtCap,
+    orderForm.direction,
+    tpslPriceType,
+  ]);
+
+  const summary = useMemo<PerpsProOrderSummaryProps>(() => {
+    // Limit orders use a fixed default slippage in buildPerpsOrderParams and
+    // the user-configured cap has no effect. Hide the row entirely for limit
+    // orders so the UI matches what is actually sent, consistent with the
+    // lite form which also skips slippage display for limit orders.
+    let slippage: string | undefined;
+    if (isMarketOrder) {
+      slippage =
+        estimatedSlippagePctDisplay === null
+          ? strings('perps.slippage.row_format_pending', {
+              value: bpsToPercent(maxSlippageBps),
+            })
+          : strings('perps.slippage.row_format', {
+              est: estimatedSlippagePctDisplay,
+              value: bpsToPercent(maxSlippageBps),
+            });
+    }
+    return {
+      margin:
+        marginRequired !== undefined && marginRequired !== null
+          ? formatPerpsFiat(marginRequired, {
+              ranges: PRICE_RANGES_MINIMAL_VIEW,
+            })
+          : PERPS_CONSTANTS.FallbackDataDisplay,
+      liquidationPrice: hasValidAmount
+        ? formatPerpsFiat(liquidationPrice, { ranges: PRICE_RANGES_UNIVERSAL })
+        : PERPS_CONSTANTS.FallbackDataDisplay,
+      slippage,
+      onSlippagePress: isMarketOrder ? onSlippagePress : undefined,
+      fee: hasValidAmount ? estimatedFees : undefined,
+      originalFee: hasValidAmount ? undiscountedEstimatedFees : undefined,
+      feeDiscountPercentage: feeResults.feeDiscountPercentage,
+      onFeesInfoPress: () => setSelectedTooltip('fees'),
+    };
+  }, [
+    isMarketOrder,
+    marginRequired,
+    hasValidAmount,
+    liquidationPrice,
+    estimatedSlippagePctDisplay,
+    maxSlippageBps,
+    estimatedFees,
+    undiscountedEstimatedFees,
+    feeResults.feeDiscountPercentage,
+    onSlippagePress,
+  ]);
+
+  const isPlaceOrderDisabled =
+    !orderValidation.isValid ||
+    isAtCap ||
+    isPlacing ||
+    isLoadingMarketData ||
+    isReduceOnlyPositionLoading ||
+    (reduceOnly && !reduceOnlyValidation.isValid) ||
+    hasTpslBlocker;
+
+  const onDirectionChange = useCallback(
+    (direction: PerpsProOrderDirection) => {
+      setDirection(direction);
+    },
+    [setDirection],
+  );
+
+  const onLimitPriceChange = useCallback(
+    (value: string) => {
+      const result = normalizeNumericTextInput(
+        value,
+        orderForm.limitPrice ?? '',
+        {
+          maxDigits: MAX_PERPS_INPUT_DIGITS,
+          acceptedDecimalSeparators: ['.', ','],
+        },
+      );
+      if (!result.ok) {
+        return;
+      }
+      setLimitPrice(result.value);
+    },
+    [orderForm.limitPrice, setLimitPrice],
+  );
+
+  const onLimitPriceBlur = useCallback(() => {
+    const currentLimitPrice = orderForm.limitPrice ?? '';
+    const finalizedLimitPrice = finalizeNumericTextInput(currentLimitPrice);
+    if (finalizedLimitPrice !== currentLimitPrice) {
+      setLimitPrice(finalizedLimitPrice);
+    }
+  }, [orderForm.limitPrice, setLimitPrice]);
+
+  const onPlaceOrderPress = useCallback(() => {
+    // Gesture cancellation can bypass both onDragEnd and RN onTouchCancel.
+    // Flush a pending preview and wait for canonical order state to re-render
+    // before submitting, matching Lite's interrupted-drag guard.
+    if (commitPendingSliderPreview()) {
+      return;
+    }
+
+    handlePlaceOrder();
+  }, [commitPendingSliderPreview, handlePlaceOrder]);
+
+  const onReduceOnlyChange = useCallback(
+    (value: boolean) => {
+      setReduceOnly(value);
+      if (value) {
+        setTakeProfitPrice(undefined);
+        setStopLossPrice(undefined);
+      }
+    },
+    [setTakeProfitPrice, setStopLossPrice],
+  );
+
+  return {
+    direction: orderForm.direction,
+    onDirectionChange,
+    leverage: orderForm.leverage,
+    onLeveragePress: () => setIsLeverageVisible(true),
+    orderType: orderForm.type,
+    onOrderTypeButtonPress: () => setIsOrderTypeVisible(true),
+    limitPrice: orderForm.limitPrice ?? '',
+    onLimitPriceChange,
+    onLimitPriceBlur,
+    onUseMidPricePress,
+    sizeInput,
+    sizeSlider,
+    effectiveUsdAmount,
+    availableBalance,
+    onAddFundsPress: handleAddFunds,
+    reduceOnly,
+    onReduceOnlyChange,
+    isTPSLConfigured: Boolean(
+      orderForm.takeProfitPrice || orderForm.stopLossPrice,
+    ),
+    onTPSLPress,
+    notices,
+    summary,
+    isPlaceOrderDisabled,
+    isPlaceOrderLoading: isPlacing,
+    onPlaceOrderPress,
+    // Leverage sheet
+    isLeverageVisible,
+    minLeverage: 1,
+    maxLeverage,
+    currentPrice: assetData.price,
+    onLeverageConfirm,
+    closeLeverage: () => setIsLeverageVisible(false),
+    // Slippage sheet
+    isSlippageVisible,
+    maxSlippageBps,
+    onSlippageSave,
+    closeSlippage: () => setIsSlippageVisible(false),
+    // Order type sheet
+    isOrderTypeVisible,
+    onOrderTypeSelect,
+    closeOrderType: () => setIsOrderTypeVisible(false),
+    // Eligibility (geo-block) modal
+    isEligibilityModalVisible,
+    closeEligibilityModal,
+    // Fees tooltip
+    selectedTooltip,
+    closeTooltip: () => setSelectedTooltip(null),
+    feeMetamaskFeeRate: feeResults.metamaskFeeRate,
+    feeProtocolFeeRate: feeResults.protocolFeeRate,
+    feeOriginalMetamaskFeeRate: feeResults.originalMetamaskFeeRate,
+    feeDiscountPercentage: feeResults.feeDiscountPercentage,
+  };
+};
+
+export default usePerpsProOrderForm;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProSizeInput.test.ts b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProSizeInput.test.ts
new file mode 100644
index 000000000000..5ab00bed7335
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProSizeInput.test.ts
@@ -0,0 +1,766 @@
+import { act, renderHook } from '@testing-library/react-native';
+import {
+  usePerpsProSizeInput,
+  type UsePerpsProSizeInputParams,
+} from './usePerpsProSizeInput';
+
+const mockSetAmount = jest.fn();
+
+const createParams = (
+  overrides: Partial<UsePerpsProSizeInputParams> = {},
+): UsePerpsProSizeInputParams => ({
+  usdAmount: '100',
+  setAmount: mockSetAmount,
+  assetSymbol: 'BTC',
+  effectivePrice: 90000,
+  szDecimals: 3,
+  maxPossibleAmount: 1000,
+  maxDigits: 9,
+  ...overrides,
+});
+
+describe('usePerpsProSizeInput', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('starts in USD mode with the canonical amount', () => {
+    const params = createParams();
+
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+
+    expect(result.current.sizeInput.value).toBe('100');
+    expect(result.current.sizeInput.denomination).toEqual({ unit: 'usd' });
+  });
+
+  it('keeps an empty USD draft while committing zero', () => {
+    const params = createParams();
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+
+    act(() => {
+      result.current.sizeInput.onChange('');
+    });
+
+    expect(result.current.sizeInput.value).toBe('');
+    expect(result.current.effectiveUsdAmount).toBe('0');
+    expect(mockSetAmount).toHaveBeenCalledWith('0');
+  });
+
+  it('normalizes leading zeroes before committing USD', () => {
+    const params = createParams();
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+
+    act(() => {
+      result.current.sizeInput.onChange('00.5');
+    });
+
+    expect(result.current.sizeInput.value).toBe('0.5');
+    expect(mockSetAmount).toHaveBeenCalledWith('0.5');
+  });
+
+  it('normalizes comma decimal input before committing USD', () => {
+    const params = createParams();
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+
+    act(() => {
+      result.current.sizeInput.onChange('00,5');
+    });
+
+    expect(result.current.sizeInput.value).toBe('0.5');
+    expect(mockSetAmount).toHaveBeenCalledWith('0.5');
+  });
+
+  it('rejects USD input beyond two decimal places', () => {
+    const params = createParams();
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+
+    act(() => {
+      result.current.sizeInput.onChange('100.123');
+    });
+
+    expect(result.current.sizeInput.value).toBe('100');
+    expect(mockSetAmount).not.toHaveBeenCalled();
+  });
+
+  it('rejects repeated decimal separators without changing the draft', () => {
+    const params = createParams();
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+
+    act(() => {
+      result.current.sizeInput.onChange('1.2.3');
+    });
+
+    expect(result.current.sizeInput.value).toBe('100');
+    expect(mockSetAmount).not.toHaveBeenCalled();
+  });
+
+  it('finalizes a trailing USD decimal on blur', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      { initialProps: createParams() },
+    );
+
+    act(() => {
+      result.current.sizeInput.onChange('12.');
+    });
+
+    rerender(createParams({ usdAmount: '12.' }));
+
+    act(() => {
+      result.current.sizeInput.onBlur();
+    });
+
+    expect(result.current.sizeInput.value).toBe('12');
+    expect(mockSetAmount).toHaveBeenLastCalledWith('12');
+  });
+
+  it('does not update USD amount on blur when already finalized', () => {
+    const { result } = renderHook(() =>
+      usePerpsProSizeInput(createParams({ usdAmount: '12' })),
+    );
+
+    act(() => {
+      result.current.sizeInput.onBlur();
+    });
+
+    expect(result.current.sizeInput.value).toBe('12');
+    expect(mockSetAmount).not.toHaveBeenCalled();
+  });
+
+  it('does not leave a pending commit after an unchanged USD blur', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      { initialProps: createParams({ effectivePrice: 100 }) },
+    );
+
+    act(() => {
+      result.current.sizeInput.onBlur();
+      result.current.sizeInput.onToggleDenomination();
+    });
+    expect(mockSetAmount).not.toHaveBeenCalled();
+
+    rerender(createParams({ effectivePrice: 200 }));
+
+    expect(result.current.sizeInput.value).toBe('0.5');
+  });
+
+  it('keeps a focused asset draft stable across price updates', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      { initialProps: createParams({ effectivePrice: 100 }) },
+    );
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+      result.current.sizeInput.onFocus();
+    });
+    expect(result.current.sizeInput.value).toBe('1');
+
+    rerender(createParams({ effectivePrice: 200 }));
+
+    expect(result.current.sizeInput.value).toBe('1');
+    expect(result.current.effectiveUsdAmount).toBe('100');
+  });
+
+  it('disables the unit toggle without a positive price', () => {
+    const params = createParams({ effectivePrice: 0 });
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+
+    expect(result.current.sizeInput.canToggleDenomination).toBe(false);
+    expect(result.current.sizeInput.denomination.unit).toBe('usd');
+  });
+
+  it('projects USD to asset with size-decimal round down', () => {
+    const params = createParams({ usdAmount: '100', effectivePrice: 30000 });
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+
+    expect(result.current.sizeInput.value).toBe('0.003');
+    expect(result.current.sizeInput.denomination).toEqual({
+      unit: 'asset',
+      symbol: 'BTC',
+    });
+  });
+
+  it('keeps the asset draft empty after an external canonical reset', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      { initialProps: createParams({ effectivePrice: 100 }) },
+    );
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+
+    rerender(createParams({ usdAmount: '', effectivePrice: 100 }));
+
+    expect(result.current.sizeInput.denomination.unit).toBe('asset');
+    expect(result.current.sizeInput.value).toBe('');
+  });
+
+  it('projects an empty USD draft to an empty asset draft', () => {
+    const { result } = renderHook(() =>
+      usePerpsProSizeInput(
+        createParams({ usdAmount: '', effectivePrice: 100 }),
+      ),
+    );
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+
+    expect(result.current.sizeInput.denomination.unit).toBe('asset');
+    expect(result.current.sizeInput.value).toBe('');
+  });
+
+  it('keeps the USD draft empty when toggling from an empty asset draft', () => {
+    const { result } = renderHook(() =>
+      usePerpsProSizeInput(
+        createParams({ usdAmount: '', effectivePrice: 100 }),
+      ),
+    );
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+    expect(result.current.sizeInput.value).toBe('');
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+
+    expect(result.current.sizeInput.denomination.unit).toBe('usd');
+    expect(result.current.sizeInput.value).toBe('');
+    expect(mockSetAmount).not.toHaveBeenCalled();
+  });
+
+  it('does not reconvert an unchanged canonical asset draft on blur', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      { initialProps: createParams({ effectivePrice: 123.456 }) },
+    );
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+      result.current.sizeInput.onBlur();
+    });
+
+    expect(result.current.effectiveUsdAmount).toBe('100');
+    expect(mockSetAmount).not.toHaveBeenCalled();
+
+    rerender(createParams({ effectivePrice: 200 }));
+
+    expect(result.current.sizeInput.value).toBe('0.5');
+    expect(result.current.effectiveUsdAmount).toBe('100');
+  });
+
+  it('converts a trailing asset decimal on blur before committing USD', () => {
+    const { result } = renderHook(() =>
+      usePerpsProSizeInput(createParams({ effectivePrice: 100 })),
+    );
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+    act(() => {
+      result.current.sizeInput.onChange('1.');
+    });
+
+    // Trailing separator must remain until blur (unlike "1.2." which the
+    // normalizer collapses to "1.2" immediately).
+    expect(result.current.sizeInput.value).toBe('1.');
+
+    act(() => {
+      result.current.sizeInput.onBlur();
+    });
+
+    expect(result.current.sizeInput.value).toBe('1');
+    expect(result.current.effectiveUsdAmount).toBe('100');
+    expect(mockSetAmount).not.toHaveBeenCalled();
+  });
+
+  it('projects asset edits to USD rounded to two decimals', () => {
+    const params = createParams({ effectivePrice: 123.456, szDecimals: 4 });
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+
+    act(() => {
+      result.current.sizeInput.onChange('1.2345');
+    });
+
+    expect(result.current.sizeInput.value).toBe('1.2345');
+    expect(result.current.effectiveUsdAmount).toBe('152.41');
+    expect(mockSetAmount).toHaveBeenCalledWith('152.41');
+  });
+
+  it('snaps asset display to the USD round-trip size on blur', () => {
+    const params = createParams({ effectivePrice: 123.456, szDecimals: 4 });
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+    act(() => {
+      result.current.sizeInput.onChange('1.234');
+    });
+
+    expect(result.current.sizeInput.value).toBe('1.234');
+    expect(result.current.effectiveUsdAmount).toBe('152.34');
+
+    act(() => {
+      result.current.sizeInput.onBlur();
+    });
+
+    expect(result.current.sizeInput.value).toBe('1.2339');
+    expect(result.current.effectiveUsdAmount).toBe('152.34');
+    expect(mockSetAmount).toHaveBeenLastCalledWith('152.34');
+  });
+
+  it('refreshes snapped asset projection when price changes after blur', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      {
+        initialProps: createParams({
+          usdAmount: '100',
+          effectivePrice: 123.456,
+          szDecimals: 4,
+        }),
+      },
+    );
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+    act(() => {
+      result.current.sizeInput.onChange('1.234');
+    });
+    act(() => {
+      result.current.sizeInput.onBlur();
+    });
+
+    expect(result.current.sizeInput.value).toBe('1.2339');
+
+    // Echo the blur commit at the same price first (clears pending internal USD).
+    rerender(
+      createParams({
+        usdAmount: '152.34',
+        effectivePrice: 123.456,
+        szDecimals: 4,
+      }),
+    );
+    expect(result.current.sizeInput.value).toBe('1.2339');
+
+    // Clean draft: price-only updates refresh the asset projection.
+    rerender(
+      createParams({
+        usdAmount: '152.34',
+        effectivePrice: 200,
+        szDecimals: 4,
+      }),
+    );
+
+    expect(result.current.sizeInput.value).toBe('0.7617');
+  });
+
+  it('preserves dirty asset text when the price changes', () => {
+    const initialParams = createParams({ effectivePrice: 100 });
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      { initialProps: initialParams },
+    );
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+    act(() => {
+      result.current.sizeInput.onChange('1.234');
+    });
+
+    // Echo the internal USD commit, then change only the conversion price.
+    rerender(createParams({ usdAmount: '123.4', effectivePrice: 200 }));
+
+    expect(result.current.sizeInput.value).toBe('1.234');
+    expect(result.current.effectiveUsdAmount).toBe('246.8');
+  });
+
+  it('updates a clean asset projection when the price changes', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      { initialProps: createParams({ effectivePrice: 100 }) },
+    );
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+
+    rerender(createParams({ effectivePrice: 200 }));
+
+    expect(result.current.sizeInput.value).toBe('0.5');
+  });
+
+  it('updates the USD draft from an external canonical amount', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      { initialProps: createParams({ usdAmount: '100' }) },
+    );
+
+    rerender(createParams({ usdAmount: '250' }));
+
+    expect(result.current.sizeInput.value).toBe('250');
+    expect(result.current.effectiveUsdAmount).toBe('250');
+  });
+
+  it('resyncs a dirty asset draft when canonical USD is clamped externally', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      {
+        initialProps: createParams({
+          usdAmount: '100',
+          effectivePrice: 100,
+          maxPossibleAmount: 1000,
+        }),
+      },
+    );
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+    act(() => {
+      result.current.sizeInput.onChange('5');
+    });
+    rerender(
+      createParams({
+        usdAmount: '500',
+        effectivePrice: 100,
+        maxPossibleAmount: 1000,
+      }),
+    );
+
+    rerender(
+      createParams({
+        usdAmount: '50',
+        effectivePrice: 100,
+        maxPossibleAmount: 50,
+      }),
+    );
+
+    expect(result.current.sizeInput.value).toBe('0.5');
+    expect(result.current.effectiveUsdAmount).toBe('50');
+  });
+
+  it('toggles an asset draft back to canonical USD', () => {
+    const params = createParams({ effectivePrice: 100 });
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+    act(() => {
+      result.current.sizeInput.onChange('1.23');
+    });
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+
+    expect(result.current.sizeInput.value).toBe('123');
+    expect(result.current.sizeInput.denomination.unit).toBe('usd');
+    expect(mockSetAmount).toHaveBeenLastCalledWith('123');
+  });
+
+  it('syncs the amount-domain slider from typed USD input', () => {
+    const { result } = renderHook(() =>
+      usePerpsProSizeInput(
+        createParams({ usdAmount: '0', maxPossibleAmount: 43.55 }),
+      ),
+    );
+
+    act(() => {
+      result.current.sizeInput.onChange('10');
+    });
+
+    expect(result.current.sizeSlider.value).toBe(10);
+    expect(result.current.sizeSlider.maximumValue).toBe(43.55);
+    expect(result.current.effectiveUsdAmount).toBe('10');
+    expect(mockSetAmount).toHaveBeenCalledWith('10');
+  });
+
+  it('updates the slider maximum when maxPossibleAmount changes with leverage', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      {
+        initialProps: createParams({
+          usdAmount: '10',
+          maxPossibleAmount: 43.55,
+        }),
+      },
+    );
+
+    expect(result.current.sizeSlider.value).toBe(10);
+    expect(result.current.sizeSlider.maximumValue).toBe(43.55);
+
+    rerender(
+      createParams({
+        usdAmount: '10',
+        maxPossibleAmount: 87.1,
+      }),
+    );
+
+    expect(result.current.sizeSlider.value).toBe(10);
+    expect(result.current.sizeSlider.maximumValue).toBe(87.1);
+  });
+
+  it('previews slider USD without committing order state', () => {
+    const params = createParams();
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+
+    act(() => {
+      result.current.sizeSlider.onValueChange(250);
+    });
+
+    expect(result.current.sizeSlider.value).toBe(250);
+    expect(result.current.sizeInput.value).toBe('250');
+    expect(result.current.effectiveUsdAmount).toBe('250');
+    expect(mockSetAmount).not.toHaveBeenCalled();
+  });
+
+  it('clamps non-finite and out-of-range slider values', () => {
+    const { result } = renderHook(() => usePerpsProSizeInput(createParams()));
+
+    act(() => {
+      result.current.sizeSlider.onValueChange(Number.NaN);
+    });
+    expect(result.current.sizeSlider.value).toBe(0);
+
+    act(() => {
+      result.current.sizeSlider.onValueChange(1500);
+    });
+    expect(result.current.sizeSlider.value).toBe(1000);
+
+    act(() => {
+      result.current.sizeSlider.onValueChange(-10);
+    });
+    expect(result.current.sizeSlider.value).toBe(0);
+  });
+
+  it('ignores slider cancellation without a preview', () => {
+    const { result } = renderHook(() => usePerpsProSizeInput(createParams()));
+
+    act(() => {
+      result.current.sizeSlider.onDragCancel();
+    });
+
+    expect(mockSetAmount).not.toHaveBeenCalled();
+  });
+
+  it('returns a zeroed amount-domain slider when the maximum amount is zero', () => {
+    const { result } = renderHook(() =>
+      usePerpsProSizeInput(createParams({ maxPossibleAmount: 0 })),
+    );
+
+    expect(result.current.sizeSlider.value).toBe(0);
+    expect(result.current.sizeSlider.maximumValue).toBe(0);
+  });
+
+  it('clamps the visual slider value above the maximum without rewriting typed input', () => {
+    const { result } = renderHook(() =>
+      usePerpsProSizeInput(
+        createParams({ usdAmount: '0', maxPossibleAmount: 43.55 }),
+      ),
+    );
+
+    act(() => {
+      result.current.sizeInput.onChange('50');
+    });
+
+    expect(result.current.sizeInput.value).toBe('50');
+    expect(result.current.effectiveUsdAmount).toBe('50');
+    expect(result.current.sizeSlider.value).toBe(43.55);
+  });
+
+  it('previews and commits slider values in asset mode', () => {
+    const { result } = renderHook(() =>
+      usePerpsProSizeInput(
+        createParams({ usdAmount: '100', effectivePrice: 100 }),
+      ),
+    );
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+      result.current.sizeSlider.onValueChange(250);
+    });
+
+    expect(result.current.sizeInput.value).toBe('2.5');
+    expect(result.current.effectiveUsdAmount).toBe('250');
+
+    act(() => {
+      result.current.sizeSlider.onDragEnd(250);
+    });
+
+    expect(mockSetAmount).toHaveBeenLastCalledWith('250');
+    expect(result.current.sizeInput.value).toBe('2.5');
+  });
+
+  it('falls back to the canonical USD amount when asset conversion becomes unavailable', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      { initialProps: createParams({ usdAmount: '100', effectivePrice: 100 }) },
+    );
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+    rerender(createParams({ usdAmount: '100', effectivePrice: 0 }));
+
+    expect(result.current.sizeInput.canToggleDenomination).toBe(false);
+    expect(result.current.effectiveUsdAmount).toBe('100');
+  });
+
+  it('commits the slider preview on drag end', () => {
+    const params = createParams();
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+    act(() => {
+      result.current.sizeSlider.onValueChange(250);
+    });
+
+    act(() => {
+      result.current.sizeSlider.onDragEnd(250);
+    });
+
+    expect(result.current.sizeInput.value).toBe('250');
+    expect(mockSetAmount).toHaveBeenCalledWith('250');
+  });
+
+  it('commits the terminal drag value instead of an earlier preview', () => {
+    const { result } = renderHook(() => usePerpsProSizeInput(createParams()));
+    act(() => {
+      result.current.sizeSlider.onValueChange(250);
+    });
+
+    act(() => {
+      result.current.sizeSlider.onDragEnd(300);
+    });
+
+    expect(result.current.sizeInput.value).toBe('300');
+    expect(result.current.effectiveUsdAmount).toBe('300');
+    expect(mockSetAmount).toHaveBeenCalledWith('300');
+  });
+
+  it('commits the slider preview on drag cancel', () => {
+    const params = createParams();
+    const { result } = renderHook(() => usePerpsProSizeInput(params));
+    act(() => {
+      result.current.sizeSlider.onValueChange(750);
+    });
+
+    act(() => {
+      result.current.sizeSlider.onDragCancel();
+    });
+
+    expect(result.current.sizeInput.value).toBe('750');
+    expect(mockSetAmount).toHaveBeenCalledWith('750');
+  });
+
+  it('clears an interrupted slider preview when keyboard editing starts', () => {
+    const { result } = renderHook(() => usePerpsProSizeInput(createParams()));
+    act(() => {
+      result.current.sizeSlider.onValueChange(250);
+    });
+    expect(result.current.effectiveUsdAmount).toBe('250');
+
+    act(() => {
+      result.current.sizeInput.onFocus();
+      result.current.sizeInput.onChange('10');
+    });
+
+    expect(result.current.sizeInput.value).toBe('10');
+    expect(result.current.effectiveUsdAmount).toBe('10');
+    expect(result.current.sizeSlider.value).toBe(10);
+  });
+
+  it('preserves an interrupted preview when a keyboard edit is rejected', () => {
+    const { result } = renderHook(() => usePerpsProSizeInput(createParams()));
+    act(() => {
+      result.current.sizeSlider.onValueChange(250);
+    });
+
+    act(() => {
+      result.current.sizeInput.onChange('1.2.3');
+    });
+
+    expect(result.current.sizeInput.value).toBe('250');
+    expect(result.current.effectiveUsdAmount).toBe('250');
+  });
+
+  it('clears an interrupted slider preview when denomination changes', () => {
+    const { result } = renderHook(() =>
+      usePerpsProSizeInput(
+        createParams({ usdAmount: '100', effectivePrice: 100 }),
+      ),
+    );
+    act(() => {
+      result.current.sizeSlider.onValueChange(250);
+    });
+
+    act(() => {
+      result.current.sizeInput.onToggleDenomination();
+    });
+
+    expect(result.current.sizeInput.value).toBe('1');
+    expect(result.current.effectiveUsdAmount).toBe('100');
+    expect(result.current.sizeSlider.value).toBe(100);
+  });
+
+  it('clears an interrupted slider preview for an external canonical clamp', () => {
+    const { result, rerender } = renderHook(
+      (params: UsePerpsProSizeInputParams) => usePerpsProSizeInput(params),
+      { initialProps: createParams({ usdAmount: '100' }) },
+    );
+    act(() => {
+      result.current.sizeSlider.onValueChange(250);
+    });
+
+    rerender(createParams({ usdAmount: '50', maxPossibleAmount: 50 }));
+
+    expect(result.current.sizeInput.value).toBe('50');
+    expect(result.current.effectiveUsdAmount).toBe('50');
+    expect(result.current.sizeSlider.value).toBe(50);
+  });
+
+  it('flushes a pending slider preview exactly once', () => {
+    const { result } = renderHook(() => usePerpsProSizeInput(createParams()));
+    act(() => {
+      result.current.sizeSlider.onValueChange(250);
+    });
+
+    let didCommit = false;
+    act(() => {
+      didCommit = result.current.commitPendingSliderPreview();
+    });
+
+    expect(didCommit).toBe(true);
+    expect(mockSetAmount).toHaveBeenCalledWith('250');
+    expect(result.current.commitPendingSliderPreview()).toBe(false);
+  });
+
+  it('clears an equal slider preview without reporting a canonical commit', () => {
+    const { result } = renderHook(() => usePerpsProSizeInput(createParams()));
+    act(() => {
+      result.current.sizeSlider.onValueChange(100);
+    });
+
+    let didCommit = true;
+    act(() => {
+      didCommit = result.current.commitPendingSliderPreview();
+    });
+
+    expect(didCommit).toBe(false);
+    expect(mockSetAmount).not.toHaveBeenCalled();
+    expect(result.current.commitPendingSliderPreview()).toBe(false);
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProSizeInput.ts b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProSizeInput.ts
new file mode 100644
index 000000000000..1edcf308eb23
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderForm/usePerpsProSizeInput.ts
@@ -0,0 +1,524 @@
+import { BigNumber } from 'bignumber.js';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import {
+  finalizeNumericTextInput,
+  normalizeNumericTextInput,
+  type NormalizeNumericTextInputOptions,
+} from '../../../../../../Base/Keypad/normalizeNumericTextInput';
+import type {
+  PerpsProSizeDenomination,
+  PerpsProSizeInputModel,
+  PerpsProSizeSliderModel,
+} from './PerpsProOrderForm.types';
+
+type SizeDenominationUnit = PerpsProSizeDenomination['unit'];
+
+interface AssetDraftState {
+  value: string;
+  source: 'canonical' | 'user';
+}
+
+export interface UsePerpsProSizeInputParams {
+  usdAmount: string;
+  setAmount: (value: string) => void;
+  assetSymbol: string;
+  effectivePrice: number;
+  szDecimals: number;
+  maxPossibleAmount: number;
+  maxDigits?: number;
+}
+
+export interface UsePerpsProSizeInputResult {
+  sizeInput: PerpsProSizeInputModel;
+  sizeSlider: PerpsProSizeSliderModel;
+  effectiveUsdAmount: string;
+  commitPendingSliderPreview: () => boolean;
+}
+
+const getDecimalPlaces = (szDecimals: number) =>
+  Number.isInteger(szDecimals) && szDecimals >= 0 ? szDecimals : 0;
+
+const getUsdFromAsset = (
+  assetAmount: string,
+  effectivePrice: number,
+): string => {
+  const finalizedAmount = finalizeNumericTextInput(assetAmount);
+  if (!finalizedAmount) {
+    return '';
+  }
+
+  return new BigNumber(finalizedAmount)
+    .times(effectivePrice)
+    .decimalPlaces(2, BigNumber.ROUND_HALF_UP)
+    .toFixed();
+};
+
+const getAssetFromUsd = (
+  usdAmount: string,
+  effectivePrice: number,
+  szDecimals: number,
+): string => {
+  const finalizedAmount = finalizeNumericTextInput(usdAmount);
+  if (!finalizedAmount) {
+    return '';
+  }
+  if (effectivePrice <= 0) {
+    return '0';
+  }
+
+  return new BigNumber(finalizedAmount)
+    .dividedBy(effectivePrice)
+    .decimalPlaces(getDecimalPlaces(szDecimals), BigNumber.ROUND_DOWN)
+    .toFixed();
+};
+
+const clampSliderUsdAmount = (
+  value: number,
+  maxPossibleAmount: number,
+): string => {
+  if (!Number.isFinite(value) || maxPossibleAmount <= 0) {
+    return '0';
+  }
+
+  // Match Lite: the amount-domain slider uses whole-dollar steps.
+  const clamped = Math.min(maxPossibleAmount, Math.max(0, value));
+  return Math.floor(clamped).toString();
+};
+
+const isEmptyUsdAmount = (value: string) => value === '' || value === '0';
+
+const getSliderDisplayValue = (
+  usdAmount: string,
+  maxPossibleAmount: number,
+): number => {
+  if (maxPossibleAmount <= 0) {
+    return 0;
+  }
+
+  const amount = Number.parseFloat(usdAmount || '0');
+  if (!Number.isFinite(amount)) {
+    return 0;
+  }
+
+  return Math.min(maxPossibleAmount, Math.max(0, amount));
+};
+
+/**
+ * Owns the Pro size field's editable draft while keeping order state canonical
+ * in USD. Asset drafts remain stable across live price updates.
+ *
+ * @param params - Canonical amount, market conversion, and sizing constraints.
+ * @returns Size-input model, amount-domain slider, and effective USD amount.
+ */
+export const usePerpsProSizeInput = ({
+  usdAmount,
+  setAmount,
+  assetSymbol,
+  effectivePrice,
+  szDecimals,
+  maxPossibleAmount,
+  maxDigits,
+}: UsePerpsProSizeInputParams): UsePerpsProSizeInputResult => {
+  const canToggleDenomination =
+    Number.isFinite(effectivePrice) && effectivePrice > 0;
+  const [denominationUnit, setDenominationUnit] =
+    useState<SizeDenominationUnit>('usd');
+  const [usdDraft, setUsdDraft] = useState(usdAmount);
+  const [assetDraftState, setAssetDraftState] = useState<AssetDraftState>(
+    () => ({
+      value: canToggleDenomination
+        ? getAssetFromUsd(usdAmount, effectivePrice, szDecimals)
+        : '0',
+      source: 'canonical',
+    }),
+  );
+  const assetDraft = assetDraftState.value;
+  const [isSizeFocused, setIsSizeFocused] = useState(false);
+  const [sliderPreview, setSliderPreview] = useState<string | null>(null);
+  const sliderPreviewRef = useRef<string | null>(null);
+  const lastUsdAmountRef = useRef(usdAmount);
+  // Tracks USD amounts this hook just committed so external clamps (leverage /
+  // balance / payment-token caps) can be distinguished from our own setAmount
+  // echoes and from live price ticks that should keep a dirty asset draft.
+  const pendingInternalUsdRef = useRef<string | null>(null);
+
+  const clearSliderPreview = useCallback(() => {
+    sliderPreviewRef.current = null;
+    setSliderPreview(null);
+  }, []);
+
+  const commitUsdAmount = useCallback(
+    (nextUsdAmount: string) => {
+      if (nextUsdAmount === usdAmount) {
+        pendingInternalUsdRef.current = null;
+        return false;
+      }
+
+      if (isEmptyUsdAmount(nextUsdAmount) && isEmptyUsdAmount(usdAmount)) {
+        pendingInternalUsdRef.current = null;
+        return false;
+      }
+
+      pendingInternalUsdRef.current = nextUsdAmount;
+      setAmount(nextUsdAmount);
+      return true;
+    },
+    [setAmount, usdAmount],
+  );
+
+  useEffect(() => {
+    const amountChanged = lastUsdAmountRef.current !== usdAmount;
+    lastUsdAmountRef.current = usdAmount;
+
+    if (!amountChanged) {
+      // Price/szDecimals-only updates: refresh a clean asset projection, but
+      // keep user-typed asset text stable while the draft is dirty or focused,
+      // and avoid overwriting a blur snap with a stale usdAmount before the
+      // parent echoes the pending internal commit.
+      if (
+        denominationUnit === 'asset' &&
+        canToggleDenomination &&
+        assetDraftState.source === 'canonical' &&
+        !isSizeFocused &&
+        pendingInternalUsdRef.current === null
+      ) {
+        setAssetDraftState({
+          value: getAssetFromUsd(usdAmount, effectivePrice, szDecimals),
+          source: 'canonical',
+        });
+      }
+      return;
+    }
+
+    const pendingInternalUsd = pendingInternalUsdRef.current;
+    pendingInternalUsdRef.current = null;
+    const wasInternalCommit =
+      pendingInternalUsd !== null &&
+      new BigNumber(pendingInternalUsd || 0).eq(new BigNumber(usdAmount || 0));
+
+    if (wasInternalCommit) {
+      return;
+    }
+
+    // External canonical update (amount clamp, reset, payment-token change).
+    clearSliderPreview();
+    setUsdDraft(usdAmount);
+    if (canToggleDenomination) {
+      setAssetDraftState({
+        value: getAssetFromUsd(usdAmount, effectivePrice, szDecimals),
+        source: 'canonical',
+      });
+    }
+  }, [
+    assetDraftState.source,
+    canToggleDenomination,
+    clearSliderPreview,
+    denominationUnit,
+    effectivePrice,
+    isSizeFocused,
+    szDecimals,
+    usdAmount,
+  ]);
+
+  const inputOptions = useMemo<NormalizeNumericTextInputOptions>(
+    () => ({
+      maxDigits,
+      maxDecimalPlaces:
+        denominationUnit === 'usd' ? 2 : getDecimalPlaces(szDecimals),
+      acceptedDecimalSeparators: ['.', ','],
+    }),
+    [denominationUnit, maxDigits, szDecimals],
+  );
+
+  const onChange = useCallback(
+    (text: string) => {
+      const previousValue = denominationUnit === 'usd' ? usdDraft : assetDraft;
+      const result = normalizeNumericTextInput(
+        text,
+        previousValue,
+        inputOptions,
+      );
+      if (!result.ok) {
+        return;
+      }
+
+      // A valid keyboard edit supersedes any preview left by an interrupted
+      // slider gesture. Invalid edits preserve the current displayed value.
+      clearSliderPreview();
+
+      if (denominationUnit === 'usd') {
+        setUsdDraft(result.value);
+        commitUsdAmount(result.value || '0');
+        return;
+      }
+
+      setAssetDraftState({ value: result.value, source: 'user' });
+      if (canToggleDenomination) {
+        const nextUsdAmount = getUsdFromAsset(result.value, effectivePrice);
+        setUsdDraft(nextUsdAmount);
+        commitUsdAmount(nextUsdAmount || '0');
+      }
+    },
+    [
+      assetDraft,
+      canToggleDenomination,
+      clearSliderPreview,
+      commitUsdAmount,
+      denominationUnit,
+      effectivePrice,
+      inputOptions,
+      usdDraft,
+    ],
+  );
+
+  const onBlur = useCallback(() => {
+    setIsSizeFocused(false);
+
+    if (denominationUnit === 'usd') {
+      const finalizedDraft = finalizeNumericTextInput(usdDraft);
+      setUsdDraft(finalizedDraft);
+      commitUsdAmount(finalizedDraft || '0');
+      return;
+    }
+
+    const finalizedDraft = finalizeNumericTextInput(assetDraft);
+    if (!canToggleDenomination) {
+      setAssetDraftState({
+        value: finalizedDraft,
+        source: 'canonical',
+      });
+      return;
+    }
+
+    if (assetDraftState.source === 'canonical') {
+      setAssetDraftState({
+        value: finalizedDraft,
+        source: 'canonical',
+      });
+      return;
+    }
+
+    // Snap the asset field to the USD→asset round-trip so the display matches
+    // deriveOrderSizing / provider size (USD cents half-up, szDecimals down).
+    // Keep the committed USD (not re-derived from the snapped asset) so cents
+    // do not drift a second time after snap.
+    const nextUsdAmount = getUsdFromAsset(finalizedDraft, effectivePrice);
+    const snappedAssetAmount = getAssetFromUsd(
+      nextUsdAmount,
+      effectivePrice,
+      szDecimals,
+    );
+    setUsdDraft(nextUsdAmount);
+    setAssetDraftState({
+      value: snappedAssetAmount,
+      source: 'canonical',
+    });
+    commitUsdAmount(nextUsdAmount || '0');
+  }, [
+    assetDraft,
+    assetDraftState.source,
+    canToggleDenomination,
+    commitUsdAmount,
+    denominationUnit,
+    effectivePrice,
+    szDecimals,
+    usdDraft,
+  ]);
+
+  const onFocus = useCallback(() => {
+    clearSliderPreview();
+    setIsSizeFocused(true);
+  }, [clearSliderPreview]);
+
+  const onToggleDenomination = useCallback(() => {
+    if (!canToggleDenomination) {
+      return;
+    }
+
+    clearSliderPreview();
+
+    if (denominationUnit === 'usd') {
+      const canonicalUsdDraft = finalizeNumericTextInput(usdDraft);
+      setAssetDraftState({
+        value: getAssetFromUsd(canonicalUsdDraft, effectivePrice, szDecimals),
+        source: 'canonical',
+      });
+      setDenominationUnit('asset');
+      return;
+    }
+
+    const nextUsdAmount = getUsdFromAsset(assetDraft, effectivePrice);
+    setUsdDraft(nextUsdAmount);
+    commitUsdAmount(nextUsdAmount || '0');
+    setDenominationUnit('usd');
+  }, [
+    assetDraft,
+    canToggleDenomination,
+    clearSliderPreview,
+    commitUsdAmount,
+    denominationUnit,
+    effectivePrice,
+    szDecimals,
+    usdDraft,
+  ]);
+
+  const effectiveUsdAmount = useMemo(() => {
+    if (sliderPreview !== null) {
+      return sliderPreview;
+    }
+
+    if (denominationUnit === 'usd') {
+      return finalizeNumericTextInput(usdDraft) || '0';
+    }
+
+    if (!canToggleDenomination) {
+      return usdAmount || '0';
+    }
+
+    // Dirty asset drafts re-project against the live price. Once clean (after
+    // blur snap), use the committed USD so szDecimals snap does not re-round
+    // cents and change order sizing.
+    if (assetDraftState.source === 'user') {
+      return getUsdFromAsset(assetDraft, effectivePrice) || '0';
+    }
+
+    return finalizeNumericTextInput(usdDraft) || '0';
+  }, [
+    assetDraft,
+    assetDraftState.source,
+    canToggleDenomination,
+    denominationUnit,
+    effectivePrice,
+    sliderPreview,
+    usdAmount,
+    usdDraft,
+  ]);
+
+  const onSliderValueChange = useCallback(
+    (value: number) => {
+      const nextUsdAmount = clampSliderUsdAmount(value, maxPossibleAmount);
+      sliderPreviewRef.current = nextUsdAmount;
+      setSliderPreview(nextUsdAmount);
+    },
+    [maxPossibleAmount],
+  );
+
+  const commitSliderUsdAmount = useCallback(
+    (nextUsdAmount: string) => {
+      const didCommitCanonicalAmount = commitUsdAmount(nextUsdAmount);
+      setUsdDraft(nextUsdAmount);
+      if (canToggleDenomination) {
+        setAssetDraftState({
+          value: getAssetFromUsd(nextUsdAmount, effectivePrice, szDecimals),
+          source: 'canonical',
+        });
+      }
+      clearSliderPreview();
+      return didCommitCanonicalAmount;
+    },
+    [
+      canToggleDenomination,
+      clearSliderPreview,
+      commitUsdAmount,
+      effectivePrice,
+      szDecimals,
+    ],
+  );
+
+  const onSliderDragEnd = useCallback(
+    (value: number) => {
+      commitSliderUsdAmount(clampSliderUsdAmount(value, maxPossibleAmount));
+    },
+    [commitSliderUsdAmount, maxPossibleAmount],
+  );
+
+  const onSliderDragCancel = useCallback(() => {
+    const nextUsdAmount = sliderPreviewRef.current;
+    if (nextUsdAmount !== null) {
+      commitSliderUsdAmount(nextUsdAmount);
+    }
+  }, [commitSliderUsdAmount]);
+
+  const commitPendingSliderPreview = useCallback((): boolean => {
+    const nextUsdAmount = sliderPreviewRef.current;
+    if (nextUsdAmount === null) {
+      return false;
+    }
+
+    return commitSliderUsdAmount(nextUsdAmount);
+  }, [commitSliderUsdAmount]);
+
+  const value = useMemo(() => {
+    if (sliderPreview === null) {
+      return denominationUnit === 'usd' ? usdDraft : assetDraft;
+    }
+    if (denominationUnit === 'usd') {
+      return sliderPreview;
+    }
+    if (canToggleDenomination) {
+      return getAssetFromUsd(sliderPreview, effectivePrice, szDecimals);
+    }
+    return assetDraft;
+  }, [
+    assetDraft,
+    canToggleDenomination,
+    denominationUnit,
+    effectivePrice,
+    sliderPreview,
+    szDecimals,
+    usdDraft,
+  ]);
+
+  const denomination = useMemo<PerpsProSizeDenomination>(
+    () =>
+      denominationUnit === 'usd'
+        ? { unit: 'usd' }
+        : { unit: 'asset', symbol: assetSymbol },
+    [assetSymbol, denominationUnit],
+  );
+
+  const sizeInput = useMemo<PerpsProSizeInputModel>(
+    () => ({
+      value,
+      denomination,
+      canToggleDenomination,
+      onChange,
+      onFocus,
+      onBlur,
+      onToggleDenomination,
+    }),
+    [
+      canToggleDenomination,
+      denomination,
+      onBlur,
+      onChange,
+      onFocus,
+      onToggleDenomination,
+      value,
+    ],
+  );
+
+  const sizeSlider = useMemo<PerpsProSizeSliderModel>(
+    () => ({
+      value: getSliderDisplayValue(effectiveUsdAmount, maxPossibleAmount),
+      maximumValue: Math.max(0, maxPossibleAmount),
+      onValueChange: onSliderValueChange,
+      onDragEnd: onSliderDragEnd,
+      onDragCancel: onSliderDragCancel,
+    }),
+    [
+      effectiveUsdAmount,
+      maxPossibleAmount,
+      onSliderDragCancel,
+      onSliderDragEnd,
+      onSliderValueChange,
+    ],
+  );
+
+  return {
+    sizeInput,
+    sizeSlider,
+    effectiveUsdAmount,
+    commitPendingSliderPreview,
+  };
+};
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderFormPanel.styles.ts b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderFormPanel.styles.ts
new file mode 100644
index 000000000000..203cf791fbd6
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderFormPanel.styles.ts
@@ -0,0 +1,11 @@
+import { StyleSheet } from 'react-native';
+import type { Theme } from '../../../../../../util/theme/models';
+
+export const createStyles = (_: { theme: Theme }) =>
+  StyleSheet.create({
+    panel: {
+      width: '100%',
+      alignSelf: 'flex-start',
+      paddingTop: 16,
+    },
+  });
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderFormPanel.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderFormPanel.test.tsx
new file mode 100644
index 000000000000..30dca4e335f1
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderFormPanel.test.tsx
@@ -0,0 +1,385 @@
+// Unit test: `usePerpsProOrderForm` is mocked to isolate container → presentational
+// prop/sheet wiring from business logic. A full component-view test (real Redux
+// state + stream fixtures) is deferred until the Pro form's view-test renderer is
+// established alongside PerpsOrderView.view.test.tsx.
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import type { PerpsMarketData } from '@metamask/perps-controller';
+import PerpsProOrderFormPanel from './PerpsProOrderFormPanel';
+import type {
+  PerpsProSizeInputModel,
+  PerpsProSizeSliderModel,
+} from './PerpsProOrderForm/PerpsProOrderForm.types';
+import {
+  PerpsProMarketViewSelectorsIDs,
+  PerpsProOrderFormSelectorsIDs,
+} from '../../../Perps.testIds';
+
+jest.mock('../../../components/PerpsSlider', () => 'PerpsSlider');
+jest.mock('../../../components/PerpsFeesDisplay', () => 'PerpsFeesDisplay');
+
+const host = (name: string) => name as unknown as React.ComponentType<unknown>;
+
+// Provider is a passthrough; the orchestration hook is mocked below so the
+// container test focuses purely on prop/sheet wiring.
+jest.mock('../../../contexts/PerpsOrderContext', () => ({
+  PerpsOrderProvider: ({ children }: { children: React.ReactNode }) => children,
+}));
+
+const DEFAULT_SIZE_INPUT: PerpsProSizeInputModel = {
+  value: '100',
+  denomination: { unit: 'usd' },
+  canToggleDenomination: true,
+  onChange: jest.fn(),
+  onFocus: jest.fn(),
+  onBlur: jest.fn(),
+  onToggleDenomination: jest.fn(),
+};
+
+const DEFAULT_SIZE_SLIDER: PerpsProSizeSliderModel = {
+  value: 100,
+  maximumValue: 500,
+  onValueChange: jest.fn(),
+  onDragEnd: jest.fn(),
+  onDragCancel: jest.fn(),
+};
+
+const DEFAULT_MOCK_HOOK_RESULT = {
+  direction: 'long' as 'long' | 'short',
+  onDirectionChange: jest.fn(),
+  leverage: 5,
+  onLeveragePress: jest.fn(),
+  orderType: 'market' as 'market' | 'limit',
+  onOrderTypeButtonPress: jest.fn(),
+  limitPrice: '',
+  onLimitPriceChange: jest.fn(),
+  onLimitPriceBlur: jest.fn(),
+  onUseMidPricePress: jest.fn(),
+  sizeInput: DEFAULT_SIZE_INPUT,
+  sizeSlider: DEFAULT_SIZE_SLIDER,
+  availableBalance: '$500 available',
+  onAddFundsPress: jest.fn(),
+  reduceOnly: false,
+  onReduceOnlyChange: jest.fn(),
+  isTPSLConfigured: false,
+  onTPSLPress: jest.fn(),
+  notices: [] as { id: string; variant: string; message?: string }[],
+  summary: { margin: '$20.00', liquidationPrice: '$80,000', slippage: '1%' },
+  isPlaceOrderDisabled: false,
+  isPlaceOrderLoading: false,
+  onPlaceOrderPress: jest.fn(),
+  isLeverageVisible: false,
+  minLeverage: 1,
+  maxLeverage: 40,
+  currentPrice: 90000,
+  onLeverageConfirm: jest.fn(),
+  closeLeverage: jest.fn(),
+  isSlippageVisible: false,
+  maxSlippageBps: 100,
+  onSlippageSave: jest.fn(),
+  closeSlippage: jest.fn(),
+  isOrderTypeVisible: false,
+  onOrderTypeSelect: jest.fn(),
+  closeOrderType: jest.fn(),
+  isEligibilityModalVisible: false,
+  closeEligibilityModal: jest.fn(),
+  selectedTooltip: null as string | null,
+  closeTooltip: jest.fn(),
+  feeMetamaskFeeRate: 0.01,
+  feeProtocolFeeRate: 0.02,
+  feeOriginalMetamaskFeeRate: 0.01,
+  feeDiscountPercentage: 10,
+};
+
+// Mutated in place by tests; fully restored in beforeEach via Object.assign so
+// no property mutation leaks across tests. The mock closure below captures this
+// reference, so it must never be reassigned.
+const mockHookResult = { ...DEFAULT_MOCK_HOOK_RESULT };
+
+jest.mock('./PerpsProOrderForm/usePerpsProOrderForm', () => ({
+  usePerpsProOrderForm: () => mockHookResult,
+}));
+
+// Lightweight sheet mocks that surface their key callbacks for wiring assertions.
+jest.mock(
+  '../../../components/PerpsOrderTypeBottomSheet/PerpsOrderTypeBottomSheetView',
+  () => {
+    const { Pressable: P } = jest.requireActual('react-native');
+    const ReactActual = jest.requireActual('react');
+    return {
+      __esModule: true,
+      default: ({
+        isVisible,
+        onSelect,
+      }: {
+        isVisible: boolean;
+        onSelect: (type: string) => void;
+      }) =>
+        isVisible
+          ? ReactActual.createElement(P, {
+              testID: 'mock-order-type-select',
+              onPress: () => onSelect('limit'),
+            })
+          : null,
+    };
+  },
+);
+
+jest.mock('../../../components/PerpsLeverageBottomSheet', () => {
+  const { Pressable: P } = jest.requireActual('react-native');
+  const ReactActual = jest.requireActual('react');
+  return {
+    __esModule: true,
+    default: ({
+      isVisible,
+      onConfirm,
+    }: {
+      isVisible: boolean;
+      onConfirm: (leverage: number) => void;
+    }) =>
+      isVisible
+        ? ReactActual.createElement(P, {
+            testID: 'mock-leverage-confirm',
+            onPress: () => onConfirm(10),
+          })
+        : null,
+  };
+});
+
+jest.mock('../../../components/PerpsSlippageBottomSheet', () => {
+  const { Pressable: P } = jest.requireActual('react-native');
+  const ReactActual = jest.requireActual('react');
+  return {
+    __esModule: true,
+    default: ({
+      isVisible,
+      onSave,
+    }: {
+      isVisible: boolean;
+      onSave: (bps: number) => void;
+    }) =>
+      isVisible
+        ? ReactActual.createElement(P, {
+            testID: 'mock-slippage-save',
+            onPress: () => onSave(200),
+          })
+        : null,
+  };
+});
+
+jest.mock('../../../components/PerpsBottomSheetTooltip', () => {
+  const { View: V } = jest.requireActual('react-native');
+  const ReactActual = jest.requireActual('react');
+  return {
+    __esModule: true,
+    default: ({ contentKey }: { contentKey: string }) =>
+      ReactActual.createElement(V, { testID: `mock-tooltip-${contentKey}` }),
+  };
+});
+
+const market = { symbol: 'BTC', name: 'Bitcoin' } as PerpsMarketData;
+
+const renderPanel = (
+  props: Partial<React.ComponentProps<typeof PerpsProOrderFormPanel>> = {},
+) => render(<PerpsProOrderFormPanel market={market} {...props} />);
+
+describe('PerpsProOrderFormPanel', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // Fully restore every property (not just the few tests currently mutate) so
+    // added tests can safely set any field without bleeding into later tests.
+    Object.assign(mockHookResult, DEFAULT_MOCK_HOOK_RESULT);
+  });
+
+  it('renders the order form panel and presentational form', () => {
+    // Arrange / Act
+    renderPanel();
+
+    // Assert
+    expect(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_FORM_PANEL),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsProOrderFormSelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+  });
+
+  it('uses top inset on the form panel without a book separator border', () => {
+    renderPanel({ isOrderBookCollapsed: false });
+
+    expect(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_FORM_PANEL),
+    ).toHaveStyle({
+      paddingTop: 16,
+    });
+    expect(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_FORM_PANEL),
+    ).not.toHaveStyle({
+      borderRightWidth: 1,
+    });
+    expect(
+      screen.queryByTestId(
+        PerpsProMarketViewSelectorsIDs.ORDER_BOOK_EXPAND_BUTTON,
+      ),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('shows the order book expand control when the order book is collapsed', () => {
+    renderPanel({ isOrderBookCollapsed: true });
+
+    expect(
+      screen.getByTestId(
+        PerpsProMarketViewSelectorsIDs.ORDER_BOOK_EXPAND_BUTTON,
+      ),
+    ).toBeOnTheScreen();
+  });
+
+  it('wires direction changes to the hook', () => {
+    // Arrange
+    renderPanel();
+
+    // Act
+    fireEvent.press(
+      screen.getByTestId(PerpsProOrderFormSelectorsIDs.DIRECTION_SHORT),
+    );
+
+    // Assert
+    expect(mockHookResult.onDirectionChange).toHaveBeenCalledWith('short');
+  });
+
+  it('wires the reduce-only toggle to the hook', () => {
+    // Arrange
+    renderPanel();
+
+    // Act
+    fireEvent.press(
+      screen.getByTestId(PerpsProOrderFormSelectorsIDs.REDUCE_ONLY),
+    );
+
+    // Assert
+    expect(mockHookResult.onReduceOnlyChange).toHaveBeenCalledWith(true);
+  });
+
+  it('wires the order-type button to the hook', () => {
+    // Arrange
+    renderPanel();
+
+    // Act
+    fireEvent.press(
+      screen.getByTestId(PerpsProOrderFormSelectorsIDs.ORDER_TYPE_BUTTON),
+    );
+
+    // Assert
+    expect(mockHookResult.onOrderTypeButtonPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders the size denomination returned by the hook', () => {
+    mockHookResult.sizeInput = {
+      ...mockHookResult.sizeInput,
+      denomination: { unit: 'asset', symbol: 'BTC' },
+    };
+
+    renderPanel();
+
+    expect(
+      screen.getByTestId(PerpsProOrderFormSelectorsIDs.SIZE_UNIT_LABEL),
+    ).toHaveTextContent('Size (BTC)');
+    expect(
+      screen.queryByTestId(PerpsProOrderFormSelectorsIDs.SIZE_PREFIX),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('wires size slider drag completion to the hook', () => {
+    renderPanel();
+    const slider = screen.UNSAFE_getByType(host('PerpsSlider'));
+
+    expect(slider).toHaveProp('value', 100);
+    expect(slider).toHaveProp('maximumValue', 500);
+
+    slider.props.onDragEnd(20);
+
+    expect(mockHookResult.sizeSlider.onDragEnd).toHaveBeenCalledTimes(1);
+  });
+
+  it('wires the TP/SL row to the hook', () => {
+    // Arrange
+    renderPanel();
+
+    // Act
+    fireEvent.press(screen.getByTestId(PerpsProOrderFormSelectorsIDs.TPSL));
+
+    // Assert
+    expect(mockHookResult.onTPSLPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('wires the Place Order button to the hook', () => {
+    // Arrange
+    renderPanel();
+
+    // Act
+    fireEvent.press(
+      screen.getByTestId(PerpsProOrderFormSelectorsIDs.PLACE_ORDER_BUTTON),
+    );
+
+    // Assert
+    expect(mockHookResult.onPlaceOrderPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('confirms leverage from the leverage sheet when visible', () => {
+    // Arrange
+    mockHookResult.isLeverageVisible = true;
+    renderPanel();
+
+    // Act
+    fireEvent.press(screen.getByTestId('mock-leverage-confirm'));
+
+    // Assert
+    expect(mockHookResult.onLeverageConfirm).toHaveBeenCalledWith(10);
+  });
+
+  it('saves slippage from the slippage sheet when visible', () => {
+    // Arrange
+    mockHookResult.isSlippageVisible = true;
+    renderPanel();
+
+    // Act
+    fireEvent.press(screen.getByTestId('mock-slippage-save'));
+
+    // Assert
+    expect(mockHookResult.onSlippageSave).toHaveBeenCalledWith(200);
+  });
+
+  it('selects an order type from the order-type sheet when visible', () => {
+    // Arrange
+    mockHookResult.isOrderTypeVisible = true;
+    renderPanel();
+
+    // Act
+    fireEvent.press(screen.getByTestId('mock-order-type-select'));
+
+    // Assert
+    expect(mockHookResult.onOrderTypeSelect).toHaveBeenCalledWith('limit');
+  });
+
+  it('renders the fees tooltip when a tooltip is selected', () => {
+    // Arrange
+    mockHookResult.selectedTooltip = 'fees';
+
+    // Act
+    renderPanel();
+
+    // Assert
+    expect(screen.getByTestId('mock-tooltip-fees')).toBeOnTheScreen();
+  });
+
+  it('renders the geo-block modal when eligibility is required', () => {
+    // Arrange
+    mockHookResult.isEligibilityModalVisible = true;
+
+    // Act
+    renderPanel();
+
+    // Assert
+    expect(screen.getByTestId('mock-tooltip-geo_block')).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderFormPanel.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderFormPanel.tsx
index 96bbd633e9fe..b4d232b13980 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderFormPanel.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrderFormPanel.tsx
@@ -1,61 +1,262 @@
 import { Box } from '@metamask/design-system-react-native';
-import type { OrderType } from '@metamask/perps-controller';
-import React, { useState } from 'react';
+import { PERPS_EVENT_VALUE } from '@metamask/perps-controller/constants';
+import type { PerpsMarketData } from '@metamask/perps-controller';
+import React, { useCallback, useState } from 'react';
+import { Modal, View } from 'react-native';
 import { strings } from '../../../../../../../locales/i18n';
+import { useStyles } from '../../../../../../component-library/hooks';
 import { PerpsProMarketViewSelectorsIDs } from '../../../Perps.testIds';
+import PerpsBottomSheetTooltip from '../../../components/PerpsBottomSheetTooltip';
+import PerpsLeverageBottomSheet from '../../../components/PerpsLeverageBottomSheet';
+import PerpsMarginModeBottomSheet from '../../../components/PerpsMarginModeBottomSheet';
+import PerpsOrderTypeBottomSheetView from '../../../components/PerpsOrderTypeBottomSheet/PerpsOrderTypeBottomSheetView';
+import PerpsSlippageBottomSheet from '../../../components/PerpsSlippageBottomSheet';
 import PerpsProOrderForm from './PerpsProOrderForm/PerpsProOrderForm';
-import type { PerpsProOrderDirection } from './PerpsProOrderForm/PerpsProOrderForm.types';
+import { createStyles } from './PerpsProOrderFormPanel.styles';
+import { usePerpsProOrderForm } from './PerpsProOrderForm/usePerpsProOrderForm';
 
 export interface PerpsProOrderFormPanelProps {
-  orderType: OrderType;
-  onOrderTypeButtonPress: () => void;
+  market: PerpsMarketData;
+  isOrderBookCollapsed?: boolean;
+  onExpandOrderBook?: () => void;
 }
 
+/**
+ * Inline Pro order form.
+ *
+ * Must render within a `PerpsOrderProvider`. The provider is owned by
+ * `PerpsProMarketView` so it wraps both this panel and the order book column,
+ * letting an order-book row tap prefill the limit price here (TAT-3643).
+ */
 const PerpsProOrderFormPanel = ({
-  orderType,
-  onOrderTypeButtonPress,
+  market,
+  isOrderBookCollapsed,
+  onExpandOrderBook,
 }: PerpsProOrderFormPanelProps) => {
-  const [direction, setDirection] = useState<PerpsProOrderDirection>('long');
-  const [limitPrice, setLimitPrice] = useState('');
-  const [size, setSize] = useState('');
-  const [balancePercentage, setBalancePercentage] = useState(0);
-  const [reduceOnly, setReduceOnly] = useState(false);
+  const {
+    direction,
+    onDirectionChange,
+    leverage,
+    onLeveragePress,
+    orderType,
+    onOrderTypeButtonPress,
+    limitPrice,
+    onLimitPriceChange,
+    onLimitPriceBlur,
+    onUseMidPricePress,
+    sizeInput,
+    sizeSlider,
+    availableBalance,
+    onAddFundsPress,
+    reduceOnly,
+    onReduceOnlyChange,
+    isTPSLConfigured,
+    onTPSLPress,
+    notices,
+    summary,
+    isPlaceOrderDisabled,
+    isPlaceOrderLoading,
+    onPlaceOrderPress,
+    isLeverageVisible,
+    minLeverage,
+    maxLeverage,
+    currentPrice,
+    onLeverageConfirm,
+    closeLeverage,
+    isSlippageVisible,
+    maxSlippageBps,
+    onSlippageSave,
+    closeSlippage,
+    isOrderTypeVisible,
+    onOrderTypeSelect,
+    closeOrderType,
+    isEligibilityModalVisible,
+    closeEligibilityModal,
+    selectedTooltip,
+    closeTooltip,
+    feeMetamaskFeeRate,
+    feeProtocolFeeRate,
+    feeOriginalMetamaskFeeRate,
+    feeDiscountPercentage,
+  } = usePerpsProOrderForm({ market });
+
+  const { styles } = useStyles(createStyles, {});
+
+  const [isMarginModeVisible, setIsMarginModeVisible] = useState(false);
+  const openMarginMode = useCallback(() => setIsMarginModeVisible(true), []);
+  const closeMarginMode = useCallback(() => setIsMarginModeVisible(false), []);
 
   return (
     <Box
       testID={PerpsProMarketViewSelectorsIDs.ORDER_FORM_PANEL}
-      twClassName="flex-1 py-4"
+      collapsable={false}
+      style={styles.panel}
     >
       <PerpsProOrderForm
         direction={direction}
-        onDirectionChange={setDirection}
+        onDirectionChange={onDirectionChange}
+        isOrderBookCollapsed={isOrderBookCollapsed}
+        onExpandOrderBook={onExpandOrderBook}
         marginModeLabel={strings('perps.pro_order_form.isolated')}
-        leverageLabel="3x"
+        onMarginModePress={openMarginMode}
+        leverageLabel={`${leverage}x`}
+        onLeveragePress={onLeveragePress}
         orderType={orderType}
         onOrderTypeButtonPress={onOrderTypeButtonPress}
         limitPrice={limitPrice}
-        onLimitPriceChange={setLimitPrice}
-        size={size}
-        onSizeChange={setSize}
-        balancePercentage={balancePercentage}
-        onBalancePercentageChange={setBalancePercentage}
-        availableBalance={strings(
-          'perps.pro_order_form.available_balance_unavailable',
-        )}
+        onLimitPriceChange={onLimitPriceChange}
+        onLimitPriceBlur={onLimitPriceBlur}
+        onUseMidPricePress={onUseMidPricePress}
+        sizeInput={sizeInput}
+        sizeSlider={sizeSlider}
+        availableBalance={availableBalance}
+        onAddFundsPress={onAddFundsPress}
         reduceOnly={reduceOnly}
-        onReduceOnlyChange={setReduceOnly}
-        isTPSLConfigured={false}
-        notices={[]}
-        summary={{
-          margin: '--',
-          liquidationPrice: '--',
-          slippage: '--',
-        }}
+        onReduceOnlyChange={onReduceOnlyChange}
+        isTPSLConfigured={isTPSLConfigured}
+        onTPSLPress={onTPSLPress}
+        notices={notices}
+        summary={summary}
         placeOrderLabel={strings('perps.pro_order_form.place_order')}
         placeOrderIntent={direction}
-        isPlaceOrderDisabled
-        onPlaceOrderPress={() => undefined}
+        isPlaceOrderDisabled={isPlaceOrderDisabled}
+        isPlaceOrderLoading={isPlaceOrderLoading}
+        onPlaceOrderPress={onPlaceOrderPress}
       />
+      {/*
+        The order form is rendered inside the width-constrained left column of
+        PerpsProMarketLayout. The design-system BottomSheet positions itself with
+        `absolute inset-0`, so without a Modal it would be clipped to that column
+        instead of overlaying the full screen (as it does in lite). Wrapping each
+        sheet in a react-native <Modal> renders it from the root at full width;
+        the <View> wrapper is required for correct Android rendering (see the
+        PerpsBottomSheetTooltip docstring). Context still flows through the Modal.
+      */}
+      {isOrderTypeVisible && (
+        <View>
+          <Modal
+            visible
+            transparent
+            animationType="fade"
+            statusBarTranslucent
+            onRequestClose={closeOrderType}
+          >
+            <PerpsOrderTypeBottomSheetView
+              isVisible
+              onClose={closeOrderType}
+              onSelect={onOrderTypeSelect}
+              currentOrderType={orderType}
+              title={strings('perps.pro_order_form.choose_order_type')}
+              showSelectedIcon
+            />
+          </Modal>
+        </View>
+      )}
+      {isLeverageVisible && (
+        <View>
+          <Modal
+            visible
+            transparent
+            animationType="fade"
+            statusBarTranslucent
+            onRequestClose={closeLeverage}
+          >
+            <PerpsLeverageBottomSheet
+              isVisible
+              onClose={closeLeverage}
+              onConfirm={onLeverageConfirm}
+              leverage={leverage}
+              minLeverage={minLeverage}
+              maxLeverage={maxLeverage}
+              currentPrice={currentPrice}
+              direction={direction}
+              asset={market.symbol}
+              limitPrice={limitPrice}
+              orderType={orderType}
+            />
+          </Modal>
+        </View>
+      )}
+      {isSlippageVisible && (
+        <View>
+          <Modal
+            visible
+            transparent
+            animationType="fade"
+            statusBarTranslucent
+            onRequestClose={closeSlippage}
+          >
+            <PerpsSlippageBottomSheet
+              isVisible
+              currentValueBps={maxSlippageBps}
+              onClose={closeSlippage}
+              onSave={onSlippageSave}
+            />
+          </Modal>
+        </View>
+      )}
+      {selectedTooltip && (
+        <View>
+          <Modal
+            visible
+            transparent
+            animationType="fade"
+            statusBarTranslucent
+            onRequestClose={closeTooltip}
+          >
+            <PerpsBottomSheetTooltip
+              isVisible
+              onClose={closeTooltip}
+              contentKey={selectedTooltip}
+              key={selectedTooltip}
+              buttonLocation={
+                PERPS_EVENT_VALUE.BUTTON_LOCATION.PERPS_ASSET_SCREEN
+              }
+              data={
+                selectedTooltip === 'fees'
+                  ? {
+                      metamaskFeeRate: feeMetamaskFeeRate,
+                      protocolFeeRate: feeProtocolFeeRate,
+                      originalMetamaskFeeRate: feeOriginalMetamaskFeeRate,
+                      feeDiscountPercentage,
+                    }
+                  : undefined
+              }
+            />
+          </Modal>
+        </View>
+      )}
+      {isEligibilityModalVisible && (
+        // Android Compatibility: Wrap the <Modal> in a plain <View> component to prevent rendering issues and freezing.
+        <View>
+          <Modal
+            visible
+            transparent
+            animationType="none"
+            statusBarTranslucent
+            onRequestClose={closeEligibilityModal}
+          >
+            <PerpsBottomSheetTooltip
+              isVisible
+              onClose={closeEligibilityModal}
+              contentKey={'geo_block'}
+            />
+          </Modal>
+        </View>
+      )}
+      {isMarginModeVisible && (
+        <View>
+          <Modal
+            visible
+            transparent
+            animationType="fade"
+            statusBarTranslucent
+            onRequestClose={closeMarginMode}
+          >
+            <PerpsMarginModeBottomSheet isVisible onClose={closeMarginMode} />
+          </Modal>
+        </View>
+      )}
     </Box>
   );
 };
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrdersEmptyState.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrdersEmptyState.tsx
index bfa7f2f360c2..f126bd18c731 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrdersEmptyState.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrdersEmptyState.tsx
@@ -1,35 +1,27 @@
-import { TabEmptyState } from '@metamask/design-system-react-native';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import React from 'react';
-import { Image } from 'react-native';
-import { strings } from '../../../../../../../locales/i18n';
-import { useAssetFromTheme } from '../../../../../../util/theme';
-import emptyStatePerpsLight from '../../../../../../images/empty-state-perps-light.png';
-import emptyStatePerpsDark from '../../../../../../images/empty-state-perps-dark.png';
+import PerpsProTabEmptyState from './PerpsProTabEmptyState';
+
+interface PerpsProOrdersEmptyStateProps {
+  /** When set, shows the ticker-filtered empty copy instead of the global one. */
+  filteredTicker?: string;
+  /** When set, shows side-filtered empty copy instead of the global one. */
+  filteredSideDescriptionKey?: string;
+}
 
 /**
  * Empty state shown in the Pro-mode Orders tab when the user has no open
- * orders. Renders the themed Perps candlestick illustration with a message.
+ * orders (or none matching the active filter).
  */
-const PerpsProOrdersEmptyState = () => {
-  const tw = useTailwind();
-  const perpsImage = useAssetFromTheme(
-    emptyStatePerpsLight,
-    emptyStatePerpsDark,
-  );
-
-  return (
-    <TabEmptyState
-      icon={
-        <Image
-          source={perpsImage}
-          resizeMode="contain"
-          style={tw.style('w-[72px] h-[72px]')}
-        />
-      }
-      description={strings('perps.pro_positions_panel.orders_empty')}
-    />
-  );
-};
+const PerpsProOrdersEmptyState = ({
+  filteredTicker,
+  filteredSideDescriptionKey,
+}: PerpsProOrdersEmptyStateProps) => (
+  <PerpsProTabEmptyState
+    filteredTicker={filteredTicker}
+    filteredSideDescriptionKey={filteredSideDescriptionKey}
+    emptyDescriptionKey="perps.pro_positions_panel.orders_empty"
+    filteredTickerDescriptionKey="perps.pro_positions_panel.orders_empty_filtered"
+  />
+);
 
 export default PerpsProOrdersEmptyState;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrdersSortSheet.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrdersSortSheet.test.tsx
new file mode 100644
index 000000000000..cbd8182f79b3
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrdersSortSheet.test.tsx
@@ -0,0 +1,69 @@
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import React from 'react';
+import { DEFAULT_PRO_ORDER_SORT } from '../utils/proOrderSort';
+import PerpsProOrdersSortSheet from './PerpsProOrdersSortSheet';
+
+jest.mock('../../../../../../../locales/i18n', () => ({
+  strings: jest.fn((key: string) => {
+    const translations: Record<string, string> = {
+      'perps.sort.sort_by': 'Sort by',
+      'perps.sort.apply': 'Apply',
+      'perps.sort.high_to_low': 'High to low',
+      'perps.sort.low_to_high': 'Low to high',
+      'perps.pro_positions_panel.sort.order_value': 'Order value',
+      'perps.pro_positions_panel.sort.size': 'Size',
+      'perps.pro_positions_panel.sort.price': 'Price',
+      'perps.pro_positions_panel.sort.time': 'Time',
+    };
+    return translations[key] || key;
+  }),
+}));
+
+describe('PerpsProOrdersSortSheet', () => {
+  const mockOnClose = jest.fn();
+  const mockOnApply = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders order sort options and newest-first default', () => {
+    render(
+      <PerpsProOrdersSortSheet
+        isVisible
+        sortConfig={DEFAULT_PRO_ORDER_SORT}
+        onClose={mockOnClose}
+        onApply={mockOnApply}
+        testID="orders-sort-sheet"
+      />,
+    );
+
+    expect(
+      screen.getByTestId('orders-sort-sheet-option-orderValue'),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId('orders-sort-sheet-direction-text-time'),
+    ).toHaveTextContent('High to low');
+  });
+
+  it('applies a selected order sort field', () => {
+    render(
+      <PerpsProOrdersSortSheet
+        isVisible
+        sortConfig={DEFAULT_PRO_ORDER_SORT}
+        onClose={mockOnClose}
+        onApply={mockOnApply}
+        testID="orders-sort-sheet"
+      />,
+    );
+
+    fireEvent.press(screen.getByTestId('orders-sort-sheet-option-price'));
+    fireEvent.press(screen.getByTestId('orders-sort-sheet-apply'));
+
+    expect(mockOnApply).toHaveBeenCalledWith({
+      field: 'price',
+      direction: 'desc',
+    });
+    expect(mockOnClose).toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrdersSortSheet.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrdersSortSheet.tsx
new file mode 100644
index 000000000000..cf37dd426afa
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProOrdersSortSheet.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import {
+  DEFAULT_PRO_ORDER_SORT,
+  PRO_ORDER_SORT_OPTIONS,
+  type ProOrderSortConfig,
+} from '../utils/proOrderSort';
+import PerpsProSortSheet from './PerpsProSortSheet';
+
+interface PerpsProOrdersSortSheetProps {
+  isVisible: boolean;
+  sortConfig: ProOrderSortConfig;
+  onApply: (next: ProOrderSortConfig) => void;
+  onClose: () => void;
+  testID?: string;
+}
+
+/**
+ * Bottom sheet for sorting Pro orders by value, size, price, or creation time.
+ */
+const PerpsProOrdersSortSheet = ({
+  isVisible,
+  sortConfig,
+  onApply,
+  onClose,
+  testID = 'perps-pro-orders-sort-sheet',
+}: PerpsProOrdersSortSheetProps) => (
+  <PerpsProSortSheet
+    isVisible={isVisible}
+    sortConfig={sortConfig}
+    options={PRO_ORDER_SORT_OPTIONS}
+    onApply={onApply}
+    onClear={() => onApply(DEFAULT_PRO_ORDER_SORT)}
+    onClose={onClose}
+    testID={testID}
+  />
+);
+
+export default PerpsProOrdersSortSheet;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionCard.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionCard.test.tsx
index 96c69b7ebfd8..5a112c501a6f 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionCard.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionCard.test.tsx
@@ -1,7 +1,8 @@
-import { render, screen } from '@testing-library/react-native';
+import { fireEvent, render, screen } from '@testing-library/react-native';
 import type { Position } from '@metamask/perps-controller';
 import React from 'react';
 import { useSelector } from 'react-redux';
+import { PerpsProMarketViewSelectorsIDs } from '../../../Perps.testIds';
 import PerpsProPositionCard from './PerpsProPositionCard';
 
 jest.mock('../../../components/PerpsTokenLogo', () => 'PerpsTokenLogo');
@@ -64,6 +65,128 @@ describe('PerpsProPositionCard', () => {
     expect(screen.getByText('$3,000')).toBeOnTheScreen();
   });
 
+  it('renders TP/SL edit control when handler is provided', () => {
+    const onEditTpSl = jest.fn();
+
+    render(
+      <PerpsProPositionCard position={position} onEditTpSl={onEditTpSl} />,
+    );
+
+    expect(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITION_EDIT_TPSL),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders margin edit control for isolated positions when handler is provided', () => {
+    const onEditMargin = jest.fn();
+
+    render(
+      <PerpsProPositionCard position={position} onEditMargin={onEditMargin} />,
+    );
+
+    expect(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITION_EDIT_MARGIN),
+    ).toBeOnTheScreen();
+  });
+
+  it('invokes edit TP/SL when the TP/SL value text is pressed', () => {
+    const onEditTpSl = jest.fn();
+
+    render(
+      <PerpsProPositionCard position={position} onEditTpSl={onEditTpSl} />,
+    );
+
+    fireEvent.press(screen.getByText(/\$3,500.*\$2,000/));
+
+    expect(onEditTpSl).toHaveBeenCalledWith(position);
+  });
+
+  it('invokes the market switch handler when the card is pressed', () => {
+    const onPress = jest.fn();
+
+    render(<PerpsProPositionCard position={position} onPress={onPress} />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITION_ROW),
+    );
+
+    expect(onPress).toHaveBeenCalledWith(position);
+  });
+
+  it('exposes the market switch as a labelled action for screen readers', () => {
+    render(<PerpsProPositionCard position={position} onPress={jest.fn()} />);
+
+    expect(screen.getByLabelText('Switch to the ETH market')).toBeOnTheScreen();
+  });
+
+  it('keeps action buttons scoped to their own handler when the card is pressable', () => {
+    const onPress = jest.fn();
+    const onClose = jest.fn();
+
+    render(
+      <PerpsProPositionCard
+        position={position}
+        onPress={onPress}
+        onClose={onClose}
+      />,
+    );
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITION_CLOSE),
+    );
+
+    expect(onClose).toHaveBeenCalledWith(position);
+    expect(onPress).not.toHaveBeenCalled();
+  });
+
+  it('keeps margin edit scoped to its own handler when the card is pressable', () => {
+    const onPress = jest.fn();
+    const onEditMargin = jest.fn();
+
+    render(
+      <PerpsProPositionCard
+        position={position}
+        onPress={onPress}
+        onEditMargin={onEditMargin}
+      />,
+    );
+
+    fireEvent.press(screen.getByText('$1,450'));
+
+    expect(onEditMargin).toHaveBeenCalledWith(position);
+    expect(onPress).not.toHaveBeenCalled();
+  });
+
+  it('keeps TP/SL edit scoped to its own handler when the card is pressable', () => {
+    const onPress = jest.fn();
+    const onEditTpSl = jest.fn();
+
+    render(
+      <PerpsProPositionCard
+        position={position}
+        onPress={onPress}
+        onEditTpSl={onEditTpSl}
+      />,
+    );
+
+    fireEvent.press(screen.getByText(/\$3,500.*\$2,000/));
+
+    expect(onEditTpSl).toHaveBeenCalledWith(position);
+    expect(onPress).not.toHaveBeenCalled();
+  });
+
+  it('invokes edit margin when the margin value text is pressed', () => {
+    const onEditMargin = jest.fn();
+
+    render(
+      <PerpsProPositionCard position={position} onEditMargin={onEditMargin} />,
+    );
+
+    fireEvent.press(screen.getByText('$1,450'));
+
+    expect(onEditMargin).toHaveBeenCalledWith(position);
+  });
+
   it('hides size, value, PnL, and key figures when privacy mode is enabled', () => {
     (useSelector as jest.Mock).mockReturnValue(true);
 
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionCard.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionCard.tsx
index c99573815302..f42b386b091f 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionCard.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionCard.tsx
@@ -7,7 +7,9 @@ import {
   ButtonSize,
   ButtonVariant,
   FontWeight,
+  Icon,
   IconName,
+  IconSize,
   SensitiveText,
   SensitiveTextLength,
   Tag,
@@ -22,6 +24,7 @@ import {
   type Position,
 } from '@metamask/perps-controller';
 import React from 'react';
+import { Pressable } from 'react-native';
 import { useSelector } from 'react-redux';
 import { strings } from '../../../../../../../locales/i18n';
 import { selectPrivacyMode } from '../../../../../../selectors/preferencesController';
@@ -41,6 +44,15 @@ interface PerpsProPositionCardProps {
   position: Position;
   /** Test ID for the card container. */
   testID?: string;
+  /** Switches the Pro screen to this position's market. */
+  onPress?: (position: Position) => void;
+  onClose?: (position: Position) => void;
+  onReverse?: (position: Position) => void;
+  onShare?: (position: Position) => void;
+  onEditTpSl?: (position: Position) => void;
+  isEditTpSlDisabled?: boolean;
+  onEditMargin?: (position: Position) => void;
+  isEditMarginDisabled?: boolean;
 }
 
 const ACTION_BUTTON_CLASS_NAME = 'flex-1 border-muted bg-background-default';
@@ -51,6 +63,11 @@ interface KeyValueItemProps {
   valueColor?: TextColor;
   labelAccessory?: React.ReactNode;
   isHidden?: boolean;
+  onValuePress?: () => void;
+  isValuePressDisabled?: boolean;
+  valuePressTestID?: string;
+  valuePressAccessibilityLabel?: string;
+  showEditIcon?: boolean;
 }
 
 const KeyValueItem = ({
@@ -59,29 +76,67 @@ const KeyValueItem = ({
   valueColor = TextColor.TextDefault,
   labelAccessory,
   isHidden = false,
-}: KeyValueItemProps) => (
-  <Box>
-    <Box
-      flexDirection={BoxFlexDirection.Row}
-      alignItems={BoxAlignItems.Center}
-      twClassName="gap-1"
-    >
-      <Text variant={TextVariant.BodyXs} color={TextColor.TextAlternative}>
-        {label}
-      </Text>
-      {labelAccessory}
+  onValuePress,
+  isValuePressDisabled = false,
+  valuePressTestID,
+  valuePressAccessibilityLabel,
+  showEditIcon = false,
+}: KeyValueItemProps) => {
+  const valueContent = (
+    <>
+      <SensitiveText
+        variant={TextVariant.BodyXs}
+        fontWeight={FontWeight.Medium}
+        color={isHidden ? TextColor.TextDefault : valueColor}
+        isHidden={isHidden}
+        length={SensitiveTextLength.Short}
+      >
+        {value}
+      </SensitiveText>
+      {showEditIcon ? <Icon name={IconName.Edit} size={IconSize.Sm} /> : null}
+    </>
+  );
+
+  return (
+    <Box>
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        twClassName="gap-1"
+      >
+        <Text variant={TextVariant.BodyXs} color={TextColor.TextAlternative}>
+          {label}
+        </Text>
+        {labelAccessory}
+      </Box>
+      {onValuePress ? (
+        <Pressable
+          onPress={onValuePress}
+          disabled={isValuePressDisabled}
+          accessibilityRole="button"
+          accessibilityLabel={valuePressAccessibilityLabel}
+          testID={valuePressTestID}
+        >
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="gap-1"
+          >
+            {valueContent}
+          </Box>
+        </Pressable>
+      ) : (
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          twClassName="gap-1"
+        >
+          {valueContent}
+        </Box>
+      )}
     </Box>
-    <SensitiveText
-      variant={TextVariant.BodyXs}
-      fontWeight={FontWeight.Medium}
-      color={isHidden ? TextColor.TextDefault : valueColor}
-      isHidden={isHidden}
-      length={SensitiveTextLength.Short}
-    >
-      {value}
-    </SensitiveText>
-  </Box>
-);
+  );
+};
 
 /**
  * PerpsProPositionCard
@@ -90,12 +145,19 @@ const KeyValueItem = ({
  * Shows asset, direction/leverage, size, unrealized PnL, and key figures
  * (entry, mark, liquidation prices, margin, TP/SL, funding).
  *
- * Intentionally excludes filters, checkboxes, and close/reverse/share/modify
- * actions — display only.
+ * Action buttons delegate to existing Perps close/reverse/share flows via callbacks.
  */
 const PerpsProPositionCard = ({
   position,
   testID,
+  onPress,
+  onClose,
+  onReverse,
+  onShare,
+  onEditTpSl,
+  isEditTpSlDisabled = false,
+  onEditMargin,
+  isEditMarginDisabled = false,
 }: PerpsProPositionCardProps) => {
   const privacyMode = useSelector(selectPrivacyMode);
   const displaySymbol = getPerpsDisplaySymbol(position.symbol);
@@ -105,7 +167,6 @@ const PerpsProPositionCard = ({
 
   const pnlNum = parseFloat(position.unrealizedPnl);
   const roe = (parseFloat(position.returnOnEquity) || 0) * 100;
-  const pnlSeverity = pnlNum >= 0 ? TagSeverity.Success : TagSeverity.Danger;
 
   const directionLabel = isLong
     ? strings('perps.market.long')
@@ -116,6 +177,8 @@ const PerpsProPositionCard = ({
     position.leverage.type === 'isolated'
       ? strings('perps.pro_positions_panel.card.isolated')
       : strings('perps.pro_positions_panel.card.cross');
+  const canEditMargin =
+    position.leverage.type === 'isolated' && Boolean(onEditMargin);
 
   // Mark price is not stored on the position; derive it from notional.
   // With useLivePnl, enrichPositionsWithLivePnL keeps positionValue in sync
@@ -175,148 +238,221 @@ const PerpsProPositionCard = ({
     ranges: PRICE_RANGES_MINIMAL_VIEW,
   });
 
+  const handlePress = onPress ? () => onPress(position) : undefined;
+
   return (
-    <Box
-      twClassName="gap-3 py-3"
+    // The card owns nested buttons and inline-editable values, so this wrapper
+    // stays out of the accessibility tree to avoid collapsing them into a
+    // single element. The header below repeats the handler as the labelled,
+    // screen-reader-reachable entry point for the same action.
+    <Pressable
+      onPress={handlePress}
+      disabled={!handlePress}
+      accessible={false}
       testID={testID ?? PerpsProMarketViewSelectorsIDs.POSITION_ROW}
     >
-      {/* Header: asset, direction, size, unrealized PnL */}
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Center}
-        justifyContent={BoxJustifyContent.Between}
-        twClassName="gap-4 px-4"
-      >
-        <Box
-          flexDirection={BoxFlexDirection.Row}
-          alignItems={BoxAlignItems.Center}
-          twClassName="flex-1 gap-4"
+      <Box twClassName="gap-3 py-3">
+        {/* Header: asset, direction, size, unrealized PnL */}
+        <Pressable
+          onPress={handlePress}
+          disabled={!handlePress}
+          accessibilityRole={handlePress ? 'button' : undefined}
+          accessibilityLabel={
+            handlePress
+              ? strings('perps.pro_positions_panel.view_market_accessibility', {
+                  symbol: displaySymbol,
+                })
+              : undefined
+          }
         >
-          <PerpsTokenLogo symbol={position.symbol} size={40} />
-          <Box twClassName="flex-1">
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Between}
+            twClassName="gap-4 px-4 py-2"
+          >
             <Box
               flexDirection={BoxFlexDirection.Row}
               alignItems={BoxAlignItems.Center}
-              twClassName="gap-1"
+              twClassName="flex-1 gap-4"
             >
-              <Text
+              <PerpsTokenLogo symbol={position.symbol} size={40} />
+              <Box twClassName="flex-1">
+                <Box
+                  flexDirection={BoxFlexDirection.Row}
+                  alignItems={BoxAlignItems.Center}
+                  twClassName="gap-1"
+                >
+                  <Text
+                    variant={TextVariant.BodyMd}
+                    fontWeight={FontWeight.Medium}
+                    color={TextColor.TextDefault}
+                  >
+                    {displaySymbol}
+                  </Text>
+                  <Tag
+                    severity={directionSeverity}
+                  >{`${position.leverage.value}x ${directionLabel}`}</Tag>
+                </Box>
+                <SensitiveText
+                  variant={TextVariant.BodySm}
+                  fontWeight={FontWeight.Medium}
+                  color={TextColor.TextAlternative}
+                  isHidden={privacyMode}
+                  length={SensitiveTextLength.Short}
+                >
+                  {`${formatPositionSize(
+                    absoluteSize.toString(),
+                  )} ${displaySymbol} • ${positionValueDisplay}`}
+                </SensitiveText>
+              </Box>
+            </Box>
+            <Box twClassName="items-end gap-0">
+              <SensitiveText
                 variant={TextVariant.BodyMd}
                 fontWeight={FontWeight.Medium}
-                color={TextColor.TextDefault}
+                color={
+                  privacyMode
+                    ? TextColor.TextDefault
+                    : pnlNum >= 0
+                      ? TextColor.SuccessDefault
+                      : TextColor.ErrorDefault
+                }
+                isHidden={privacyMode}
+                length={SensitiveTextLength.Short}
+                testID="pnl-text"
               >
-                {displaySymbol}
-              </Text>
-              <Tag
-                severity={directionSeverity}
-              >{`${position.leverage.value}x ${directionLabel}`}</Tag>
+                {formatPnl(pnlNum)}
+              </SensitiveText>
+              <SensitiveText
+                variant={TextVariant.BodySm}
+                color={
+                  privacyMode
+                    ? TextColor.TextDefault
+                    : pnlNum >= 0
+                      ? TextColor.SuccessDefault
+                      : TextColor.ErrorDefault
+                }
+                isHidden={privacyMode}
+                length={SensitiveTextLength.Short}
+              >
+                {formatPercentage(roe, 1)}
+              </SensitiveText>
             </Box>
-            <SensitiveText
-              variant={TextVariant.BodySm}
-              fontWeight={FontWeight.Medium}
-              color={TextColor.TextAlternative}
-              isHidden={privacyMode}
-              length={SensitiveTextLength.Short}
-            >
-              {`${formatPositionSize(
-                absoluteSize.toString(),
-              )} ${displaySymbol} • ${positionValueDisplay}`}
-            </SensitiveText>
           </Box>
-        </Box>
-        <Tag severity={privacyMode ? TagSeverity.Neutral : pnlSeverity}>
-          <SensitiveText
-            variant={TextVariant.BodyXs}
-            fontWeight={FontWeight.Medium}
-            isHidden={privacyMode}
-            length={SensitiveTextLength.Short}
+        </Pressable>
+
+        {/* Summary: key figures in three columns */}
+        <Box twClassName="px-4">
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="gap-4 rounded-xl border border-muted px-4 py-3"
           >
-            {`${formatPnl(pnlNum)} (${formatPercentage(roe, 1)})`}
-          </SensitiveText>
-        </Tag>
-      </Box>
+            <Box twClassName="flex-1 gap-6">
+              <KeyValueItem
+                label={strings('perps.pro_positions_panel.card.entry_price')}
+                value={entryPriceDisplay}
+                isHidden={privacyMode}
+              />
+              <KeyValueItem
+                label={strings('perps.pro_positions_panel.card.margin')}
+                value={marginDisplay}
+                isHidden={privacyMode}
+                labelAccessory={
+                  <Tag severity={TagSeverity.Neutral}>{marginTypeLabel}</Tag>
+                }
+                onValuePress={
+                  canEditMargin ? () => onEditMargin?.(position) : undefined
+                }
+                isValuePressDisabled={isEditMarginDisabled}
+                valuePressTestID={
+                  PerpsProMarketViewSelectorsIDs.POSITION_EDIT_MARGIN
+                }
+                valuePressAccessibilityLabel={strings(
+                  'perps.adjust_margin.title',
+                )}
+                showEditIcon={canEditMargin}
+              />
+            </Box>
+            <Box twClassName="min-w-[128px] gap-6">
+              <KeyValueItem
+                label={strings('perps.pro_positions_panel.card.mark_price')}
+                value={markPriceDisplay}
+                isHidden={privacyMode}
+              />
+              <KeyValueItem
+                label={strings('perps.pro_positions_panel.card.tp_sl')}
+                value={tpSlDisplay}
+                isHidden={privacyMode}
+                onValuePress={
+                  onEditTpSl ? () => onEditTpSl(position) : undefined
+                }
+                isValuePressDisabled={isEditTpSlDisabled}
+                valuePressTestID={
+                  PerpsProMarketViewSelectorsIDs.POSITION_EDIT_TPSL
+                }
+                valuePressAccessibilityLabel={strings(
+                  'perps.position.card.edit_tpsl',
+                )}
+                showEditIcon={Boolean(onEditTpSl)}
+              />
+            </Box>
+            <Box twClassName="gap-6">
+              <KeyValueItem
+                label={strings('perps.pro_positions_panel.card.liq_price')}
+                value={liqPriceDisplay}
+                isHidden={privacyMode}
+              />
+              <KeyValueItem
+                label={strings('perps.pro_positions_panel.card.funding')}
+                value={fundingDisplay}
+                valueColor={fundingColor}
+                isHidden={privacyMode}
+              />
+            </Box>
+          </Box>
+        </Box>
 
-      {/* Summary: key figures in three columns */}
-      <Box twClassName="px-4">
         <Box
           flexDirection={BoxFlexDirection.Row}
           alignItems={BoxAlignItems.Center}
-          twClassName="gap-4 rounded-xl border border-muted px-4 py-2"
+          twClassName="gap-2 px-4"
         >
-          <Box twClassName="flex-1 gap-6">
-            <KeyValueItem
-              label={strings('perps.pro_positions_panel.card.entry_price')}
-              value={entryPriceDisplay}
-              isHidden={privacyMode}
-            />
-            <KeyValueItem
-              label={strings('perps.pro_positions_panel.card.margin')}
-              value={marginDisplay}
-              isHidden={privacyMode}
-              labelAccessory={
-                <Tag severity={TagSeverity.Neutral}>{marginTypeLabel}</Tag>
-              }
-            />
-          </Box>
-          <Box twClassName="min-w-[128px] gap-6">
-            <KeyValueItem
-              label={strings('perps.pro_positions_panel.card.mark_price')}
-              value={markPriceDisplay}
-              isHidden={privacyMode}
-            />
-            <KeyValueItem
-              label={strings('perps.pro_positions_panel.card.tp_sl')}
-              value={tpSlDisplay}
-              isHidden={privacyMode}
-            />
-          </Box>
-          <Box twClassName="gap-6">
-            <KeyValueItem
-              label={strings('perps.pro_positions_panel.card.liq_price')}
-              value={liqPriceDisplay}
-              isHidden={privacyMode}
-            />
-            <KeyValueItem
-              label={strings('perps.pro_positions_panel.card.funding')}
-              value={fundingDisplay}
-              valueColor={fundingColor}
-              isHidden={privacyMode}
-            />
-          </Box>
+          <Button
+            variant={ButtonVariant.Secondary}
+            size={ButtonSize.Sm}
+            isDanger
+            startIconName={IconName.Close}
+            twClassName={ACTION_BUTTON_CLASS_NAME}
+            onPress={() => onClose?.(position)}
+            testID={PerpsProMarketViewSelectorsIDs.POSITION_CLOSE}
+          >
+            {strings('perps.pro_positions_panel.card.close')}
+          </Button>
+          <Button
+            variant={ButtonVariant.Secondary}
+            size={ButtonSize.Sm}
+            startIconName={IconName.Refresh}
+            twClassName={ACTION_BUTTON_CLASS_NAME}
+            onPress={() => onReverse?.(position)}
+            testID={PerpsProMarketViewSelectorsIDs.POSITION_REVERSE}
+          >
+            {strings('perps.pro_positions_panel.card.reverse')}
+          </Button>
+          <Button
+            variant={ButtonVariant.Secondary}
+            size={ButtonSize.Sm}
+            startIconName={IconName.Share}
+            twClassName={ACTION_BUTTON_CLASS_NAME}
+            onPress={() => onShare?.(position)}
+            testID={PerpsProMarketViewSelectorsIDs.POSITION_SHARE}
+          >
+            {strings('perps.pro_positions_panel.card.share')}
+          </Button>
         </Box>
       </Box>
-
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Center}
-        twClassName="gap-2 px-4"
-      >
-        <Button
-          variant={ButtonVariant.Secondary}
-          size={ButtonSize.Sm}
-          isDanger
-          startIconName={IconName.Close}
-          twClassName={ACTION_BUTTON_CLASS_NAME}
-        >
-          {strings('perps.pro_positions_panel.card.close')}
-        </Button>
-        <Button
-          variant={ButtonVariant.Secondary}
-          size={ButtonSize.Sm}
-          startIconName={IconName.Refresh}
-          twClassName={ACTION_BUTTON_CLASS_NAME}
-        >
-          {strings('perps.pro_positions_panel.card.reverse')}
-        </Button>
-        <Button
-          variant={ButtonVariant.Secondary}
-          size={ButtonSize.Sm}
-          startIconName={IconName.Share}
-          twClassName={ACTION_BUTTON_CLASS_NAME}
-        >
-          {strings('perps.pro_positions_panel.card.share')}
-        </Button>
-      </Box>
-    </Box>
+    </Pressable>
   );
 };
 
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsEmptyState.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsEmptyState.tsx
index db9560d7af80..169f7e4bb7cb 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsEmptyState.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsEmptyState.tsx
@@ -1,48 +1,27 @@
-import { TabEmptyState } from '@metamask/design-system-react-native';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import React from 'react';
-import { Image } from 'react-native';
-import { strings } from '../../../../../../../locales/i18n';
-import { useAssetFromTheme } from '../../../../../../util/theme';
-import emptyStatePerpsLight from '../../../../../../images/empty-state-perps-light.png';
-import emptyStatePerpsDark from '../../../../../../images/empty-state-perps-dark.png';
+import PerpsProTabEmptyState from './PerpsProTabEmptyState';
 
 interface PerpsProPositionsEmptyStateProps {
   /** When set, shows the ticker-filtered empty copy instead of the global one. */
   filteredTicker?: string;
+  /** When set, shows side-filtered empty copy instead of the global one. */
+  filteredSideDescriptionKey?: string;
 }
 
 /**
  * Empty state shown in the Pro-mode Positions tab when the user has no open
- * positions (or none matching the ticker filter).
+ * positions (or none matching the active filter).
  */
 const PerpsProPositionsEmptyState = ({
   filteredTicker,
-}: PerpsProPositionsEmptyStateProps) => {
-  const tw = useTailwind();
-  const perpsImage = useAssetFromTheme(
-    emptyStatePerpsLight,
-    emptyStatePerpsDark,
-  );
-
-  const description = filteredTicker
-    ? strings('perps.pro_positions_panel.positions_empty_filtered', {
-        ticker: filteredTicker,
-      })
-    : strings('perps.pro_positions_panel.positions_empty');
-
-  return (
-    <TabEmptyState
-      icon={
-        <Image
-          source={perpsImage}
-          resizeMode="contain"
-          style={tw.style('w-[72px] h-[72px]')}
-        />
-      }
-      description={description}
-    />
-  );
-};
+  filteredSideDescriptionKey,
+}: PerpsProPositionsEmptyStateProps) => (
+  <PerpsProTabEmptyState
+    filteredTicker={filteredTicker}
+    filteredSideDescriptionKey={filteredSideDescriptionKey}
+    emptyDescriptionKey="perps.pro_positions_panel.positions_empty"
+    filteredTickerDescriptionKey="perps.pro_positions_panel.positions_empty_filtered"
+  />
+);
 
 export default PerpsProPositionsEmptyState;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsModalPortal.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsModalPortal.tsx
new file mode 100644
index 000000000000..4ffa21c4c9ce
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsModalPortal.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { Modal, View } from 'react-native';
+
+interface PerpsProPositionsModalPortalProps {
+  children: React.ReactNode;
+  onRequestClose?: () => void;
+}
+
+/**
+ * Renders Pro positions panel overlays in a root Modal so BottomSheet
+ * positioning is not clipped by the parent ScrollView.
+ */
+const PerpsProPositionsModalPortal = ({
+  children,
+  onRequestClose,
+}: PerpsProPositionsModalPortalProps) => (
+  <View>
+    <Modal
+      visible
+      transparent
+      animationType="none"
+      statusBarTranslucent
+      onRequestClose={onRequestClose}
+    >
+      {children}
+    </Modal>
+  </View>
+);
+
+export default PerpsProPositionsModalPortal;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsOptionSheet.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsOptionSheet.test.tsx
new file mode 100644
index 000000000000..68f21fdc2192
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsOptionSheet.test.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import { Text } from '@metamask/design-system-react-native';
+import PerpsProPositionsOptionSheet from './PerpsProPositionsOptionSheet';
+
+jest.mock('../../../../../../../locales/i18n', () => ({
+  strings: jest.fn((key: string) => {
+    const translations: Record<string, string> = {
+      'perps.sort.apply': 'Apply',
+    };
+    return translations[key] || key;
+  }),
+}));
+
+describe('PerpsProPositionsOptionSheet', () => {
+  const mockOnClose = jest.fn();
+  const mockOnApply = jest.fn();
+  const mockOnOpen = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns null when not visible', () => {
+    const { toJSON } = render(
+      <PerpsProPositionsOptionSheet
+        isVisible={false}
+        title="Options"
+        onClose={mockOnClose}
+        onApply={mockOnApply}
+      >
+        <Text>Option</Text>
+      </PerpsProPositionsOptionSheet>,
+    );
+
+    expect(toJSON()).toBeNull();
+  });
+
+  it('renders children and applies on save', () => {
+    render(
+      <PerpsProPositionsOptionSheet
+        isVisible
+        title="Options"
+        onClose={mockOnClose}
+        onApply={mockOnApply}
+        onOpen={mockOnOpen}
+        testID="option-sheet"
+      >
+        <Text>Option</Text>
+      </PerpsProPositionsOptionSheet>,
+    );
+
+    expect(screen.getByText('Options')).toBeOnTheScreen();
+    expect(screen.getByText('Option')).toBeOnTheScreen();
+    expect(mockOnOpen).toHaveBeenCalled();
+
+    fireEvent.press(screen.getByTestId('option-sheet-apply'));
+
+    expect(mockOnApply).toHaveBeenCalled();
+    expect(mockOnClose).toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsOptionSheet.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsOptionSheet.tsx
new file mode 100644
index 000000000000..7831c746f576
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsOptionSheet.tsx
@@ -0,0 +1,121 @@
+import {
+  BottomSheet,
+  BottomSheetFooter,
+  BottomSheetHeader,
+  BottomSheetRef,
+  ButtonsAlignment,
+} from '@metamask/design-system-react-native';
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import { Modal, View } from 'react-native';
+import { strings } from '../../../../../../../locales/i18n';
+
+export interface PerpsProPositionsOptionSheetProps {
+  isVisible: boolean;
+  title: string;
+  onClose: () => void;
+  onApply: () => void;
+  onClear?: () => void;
+  onOpen?: () => void;
+  testID?: string;
+  children: React.ReactNode;
+}
+
+/**
+ * Shared modal bottom sheet shell for Pro positions filter/sort controls.
+ */
+const PerpsProPositionsOptionSheet = ({
+  isVisible,
+  title,
+  onClose,
+  onApply,
+  onClear,
+  onOpen,
+  testID = 'perps-pro-positions-option-sheet',
+  children,
+}: PerpsProPositionsOptionSheetProps) => {
+  const sheetRef = useRef<BottomSheetRef>(null);
+  const wasVisibleRef = useRef(false);
+
+  useEffect(() => {
+    const justOpened = isVisible && !wasVisibleRef.current;
+    wasVisibleRef.current = isVisible;
+
+    if (!justOpened) {
+      return;
+    }
+
+    onOpen?.();
+    sheetRef.current?.onOpenBottomSheet();
+  }, [isVisible, onOpen]);
+
+  const handleClose = useCallback(() => {
+    sheetRef.current?.onCloseBottomSheet(onClose);
+  }, [onClose]);
+
+  const handleApply = useCallback(() => {
+    onApply();
+    handleClose();
+  }, [handleClose, onApply]);
+
+  const primaryButtonProps = useMemo(
+    () => ({
+      children: strings('perps.sort.apply'),
+      onPress: handleApply,
+      testID: `${testID}-apply`,
+    }),
+    [handleApply, testID],
+  );
+
+  const secondaryButtonProps = useMemo(
+    () =>
+      onClear
+        ? {
+            children: strings('perps.sort.clear'),
+            onPress: () => {
+              onClear();
+              handleClose();
+            },
+            testID: `${testID}-clear`,
+          }
+        : undefined,
+    [handleClose, onClear, testID],
+  );
+
+  if (!isVisible) {
+    return null;
+  }
+
+  return (
+    <View>
+      <Modal
+        visible
+        transparent
+        animationType="none"
+        statusBarTranslucent
+        onRequestClose={handleClose}
+      >
+        <BottomSheet ref={sheetRef} onClose={onClose} testID={testID}>
+          <BottomSheetHeader
+            onClose={handleClose}
+            closeButtonProps={{ testID: `${testID}-close` }}
+          >
+            {title}
+          </BottomSheetHeader>
+
+          {children}
+
+          <BottomSheetFooter
+            primaryButtonProps={primaryButtonProps}
+            secondaryButtonProps={secondaryButtonProps}
+            buttonsAlignment={
+              secondaryButtonProps ? ButtonsAlignment.Horizontal : undefined
+            }
+            twClassName="pt-4"
+          />
+        </BottomSheet>
+      </Modal>
+    </View>
+  );
+};
+
+export default PerpsProPositionsOptionSheet;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsPanel.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsPanel.test.tsx
index cd8f9156a617..a2fa456d5c8e 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsPanel.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsPanel.test.tsx
@@ -1,5 +1,10 @@
 import { fireEvent, screen } from '@testing-library/react-native';
-import type { Order, Position } from '@metamask/perps-controller';
+import type {
+  Order,
+  PerpsMarketData,
+  Position,
+} from '@metamask/perps-controller';
+import { PERPS_EVENT_VALUE } from '@metamask/perps-controller/constants';
 import React from 'react';
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../../../util/test/initial-root-state';
@@ -7,7 +12,13 @@ import {
   usePerpsLiveOrders,
   usePerpsLivePositions,
 } from '../../../hooks/stream';
-import { PerpsProMarketViewSelectorsIDs } from '../../../Perps.testIds';
+import { usePerpsProPositionsPanelActions } from '../../../hooks/usePerpsProPositionsPanelActions';
+import { usePerpsMarkets } from '../../../hooks/usePerpsMarkets';
+import {
+  getPerpsProOrderRowSelector,
+  getPerpsProPositionRowSelector,
+  PerpsProMarketViewSelectorsIDs,
+} from '../../../Perps.testIds';
 import PerpsProPositionsPanel from './PerpsProPositionsPanel';
 
 jest.mock('../../../components/PerpsTokenLogo', () => 'PerpsTokenLogo');
@@ -17,8 +28,20 @@ jest.mock('../../../hooks/stream', () => ({
   usePerpsLivePositions: jest.fn(),
 }));
 
+jest.mock('../../../hooks/usePerpsProPositionsPanelActions', () => ({
+  usePerpsProPositionsPanelActions: jest.fn(),
+}));
+
+jest.mock('../../../hooks/usePerpsMarkets', () => ({
+  usePerpsMarkets: jest.fn(),
+}));
+
 const mockUsePerpsLiveOrders = jest.mocked(usePerpsLiveOrders);
 const mockUsePerpsLivePositions = jest.mocked(usePerpsLivePositions);
+const mockUsePerpsProPositionsPanelActions = jest.mocked(
+  usePerpsProPositionsPanelActions,
+);
+const mockUsePerpsMarkets = jest.mocked(usePerpsMarkets);
 
 const makePosition = (overrides: Partial<Position> = {}): Position => ({
   symbol: 'BTC',
@@ -48,23 +71,71 @@ const makeOrder = (overrides: Partial<Order> = {}): Order => ({
   price: '50000',
   orderType: 'limit',
   status: 'open',
-  timestamp: Date.now(),
+  timestamp: 1_711_756_800_000, // 2024-03-30T00:00:00.000Z — fixed for determinism
   reduceOnly: false,
   isTrigger: false,
   detailedOrderType: 'Limit',
   ...overrides,
 });
 
-const renderPanel = (symbol = 'SOL') =>
-  renderWithProvider(<PerpsProPositionsPanel symbol={symbol} />, {
-    state: { engine: { backgroundState } },
-  });
+const renderPanel = (
+  symbol = 'SOL',
+  onSelectMarket?: (
+    market: Partial<PerpsMarketData>,
+    sourceSection: 'positions' | 'orders',
+  ) => void,
+) =>
+  renderWithProvider(
+    <PerpsProPositionsPanel symbol={symbol} onSelectMarket={onSelectMarket} />,
+    {
+      state: { engine: { backgroundState } },
+    },
+  );
 
 const expectTabLabel = (label: string) => {
   expect(screen.getAllByText(label).length).toBeGreaterThan(0);
 };
 
+const openSideFilterSheet = () => {
+  fireEvent.press(
+    screen.getByTestId(
+      PerpsProMarketViewSelectorsIDs.POSITIONS_SIDE_FILTER_BUTTON,
+    ),
+  );
+};
+
+const applySideFilter = (side: 'all' | 'long' | 'short') => {
+  openSideFilterSheet();
+  fireEvent.press(
+    screen.getByTestId(
+      `${PerpsProMarketViewSelectorsIDs.POSITIONS_SIDE_FILTER_SHEET}-option-${side}`,
+    ),
+  );
+};
+
+const applySortByFundingRate = () => {
+  fireEvent.press(
+    screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_SORT_BUTTON),
+  );
+  fireEvent.press(
+    screen.getByTestId(
+      `${PerpsProMarketViewSelectorsIDs.POSITIONS_SORT_SHEET}-option-fundingRate`,
+    ),
+  );
+  fireEvent.press(
+    screen.getByTestId(
+      `${PerpsProMarketViewSelectorsIDs.POSITIONS_SORT_SHEET}-apply`,
+    ),
+  );
+};
+
 describe('PerpsProPositionsPanel', () => {
+  const handleClosePosition = jest.fn();
+  const handleReversePosition = jest.fn();
+  const handleSharePosition = jest.fn();
+  const handleCancelOrder = jest.fn();
+  const handleCloseAllPress = jest.fn();
+
   beforeEach(() => {
     jest.clearAllMocks();
     mockUsePerpsLiveOrders.mockReturnValue({
@@ -75,6 +146,31 @@ describe('PerpsProPositionsPanel', () => {
       positions: [],
       isInitialLoading: false,
     } as ReturnType<typeof usePerpsLivePositions>);
+    mockUsePerpsProPositionsPanelActions.mockReturnValue({
+      handleClosePosition,
+      handleReversePosition,
+      handleSharePosition,
+      handleEditPositionTpSl: jest.fn(),
+      handleEditPositionMargin: jest.fn(),
+      handleCancelOrder,
+      handleEditOrderPrice: jest.fn(),
+      handleEditOrderSize: jest.fn(),
+      handleCloseAllPress,
+      cancelingOrderId: null,
+      editingOrderId: null,
+      isOrderCancelable: () => true,
+      isOrderEditable: () => true,
+      isOrderSizeEditable: () => true,
+      isPositionMarginEditable: () => true,
+      renderActionSheets: () => null,
+    });
+    mockUsePerpsMarkets.mockReturnValue({
+      markets: [],
+      isLoading: false,
+      error: null,
+      refresh: jest.fn(),
+      isRefreshing: false,
+    });
   });
 
   it('shows the global empty state when there are no positions', () => {
@@ -167,7 +263,7 @@ describe('PerpsProPositionsPanel', () => {
     expect(screen.queryByText('+$1,050.00 (+10.0%)')).toBeNull();
   });
 
-  it('does not filter orders when ticker-only is enabled on the positions tab', () => {
+  it('filters orders to the current ticker when ticker-only is enabled', () => {
     mockUsePerpsLivePositions.mockReturnValue({
       positions: [makePosition({ symbol: 'BTC' })],
       isInitialLoading: false,
@@ -191,11 +287,505 @@ describe('PerpsProPositionsPanel', () => {
       ),
     );
 
-    expectTabLabel('Orders (2)');
+    expectTabLabel('Orders (1)');
     expect(
       screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDERS_LIST),
     ).toBeOnTheScreen();
-    expect(screen.getAllByText('BTC').length).toBeGreaterThan(0);
-    expect(screen.getAllByText('SOL').length).toBeGreaterThan(0);
+    expect(screen.getByText('SOL')).toBeOnTheScreen();
+    expect(screen.queryByText('BTC')).toBeNull();
+  });
+
+  it('shows the ticker-only checkbox on the orders tab and filters from there', () => {
+    mockUsePerpsLiveOrders.mockReturnValue({
+      orders: [
+        makeOrder({ orderId: 'btc-1', symbol: 'BTC' }),
+        makeOrder({ orderId: 'sol-1', symbol: 'SOL' }),
+      ],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLiveOrders>);
+
+    renderPanel('SOL');
+
+    fireEvent.press(
+      screen.getByTestId(
+        PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TAB_ORDERS,
+      ),
+    );
+
+    expectTabLabel('Orders (2)');
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_TICKER_ONLY),
+    );
+
+    expectTabLabel('Orders (1)');
+    expect(screen.getByText('SOL')).toBeOnTheScreen();
+    expect(screen.queryByText('BTC')).toBeNull();
+  });
+
+  it('uses filtered count and filtered empty copy for ticker-only orders with no match', () => {
+    mockUsePerpsLiveOrders.mockReturnValue({
+      orders: [makeOrder({ orderId: 'btc-1', symbol: 'BTC' })],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLiveOrders>);
+
+    renderPanel('SOL');
+
+    fireEvent.press(
+      screen.getByTestId(
+        PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TAB_ORDERS,
+      ),
+    );
+
+    expectTabLabel('Orders (1)');
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_TICKER_ONLY),
+    );
+
+    expectTabLabel('Orders');
+    expect(screen.queryAllByText('Orders (1)')).toHaveLength(0);
+    expect(screen.getByText('No open SOL orders.')).toBeOnTheScreen();
+    expect(screen.queryByText('Your open orders will appear here.')).toBeNull();
+  });
+
+  it('matches the ticker-only filter on the full market symbol for HIP-3 orders', () => {
+    mockUsePerpsLiveOrders.mockReturnValue({
+      orders: [
+        makeOrder({ orderId: 'dex-1', symbol: 'dex1:SOL' }),
+        makeOrder({ orderId: 'sol-1', symbol: 'SOL' }),
+      ],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLiveOrders>);
+
+    renderPanel('dex1:SOL');
+
+    fireEvent.press(
+      screen.getByTestId(
+        PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TAB_ORDERS,
+      ),
+    );
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_TICKER_ONLY),
+    );
+
+    expectTabLabel('Orders (1)');
+    expect(
+      screen.getByTestId(getPerpsProOrderRowSelector('dex1:SOL', 0)),
+    ).toBeOnTheScreen();
+    expect(
+      screen.queryByTestId(getPerpsProOrderRowSelector('SOL', 0)),
+    ).toBeNull();
+  });
+
+  it('filters orders by side from the shared filter bar', () => {
+    mockUsePerpsLiveOrders.mockReturnValue({
+      orders: [
+        makeOrder({ orderId: 'long', symbol: 'BTC', side: 'buy' }),
+        makeOrder({ orderId: 'short', symbol: 'SOL', side: 'sell' }),
+      ],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLiveOrders>);
+
+    renderPanel('SOL');
+    fireEvent.press(
+      screen.getByTestId(
+        PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TAB_ORDERS,
+      ),
+    );
+
+    applySideFilter('long');
+
+    expectTabLabel('Orders (1)');
+    expect(screen.getByText('BTC')).toBeOnTheScreen();
+    expect(screen.queryByText('SOL')).toBeNull();
+  });
+
+  it('shows side-filter empty copy when no orders match', () => {
+    mockUsePerpsLiveOrders.mockReturnValue({
+      orders: [makeOrder({ orderId: 'short', symbol: 'SOL', side: 'sell' })],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLiveOrders>);
+
+    renderPanel('SOL');
+    fireEvent.press(
+      screen.getByTestId(
+        PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TAB_ORDERS,
+      ),
+    );
+
+    applySideFilter('long');
+
+    expect(screen.getByText('No long orders.')).toBeOnTheScreen();
+  });
+
+  it('sorts orders by order value from the Orders tab', () => {
+    mockUsePerpsLiveOrders.mockReturnValue({
+      orders: [
+        makeOrder({
+          orderId: 'small',
+          symbol: 'BTC',
+          originalSize: '1',
+          price: '100',
+        }),
+        makeOrder({
+          orderId: 'large',
+          symbol: 'SOL',
+          originalSize: '5',
+          price: '100',
+        }),
+      ],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLiveOrders>);
+
+    renderPanel('SOL');
+    fireEvent.press(
+      screen.getByTestId(
+        PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TAB_ORDERS,
+      ),
+    );
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_SORT_BUTTON),
+    );
+    fireEvent.press(
+      screen.getByTestId(
+        `${PerpsProMarketViewSelectorsIDs.ORDERS_SORT_SHEET}-option-orderValue`,
+      ),
+    );
+    fireEvent.press(
+      screen.getByTestId(
+        `${PerpsProMarketViewSelectorsIDs.ORDERS_SORT_SHEET}-apply`,
+      ),
+    );
+
+    const orderRows = screen
+      .getAllByTestId(/perps-pro-market-order-row-/)
+      .map((node) => node.props.testID);
+
+    expect(orderRows).toEqual([
+      getPerpsProOrderRowSelector('SOL', 0),
+      getPerpsProOrderRowSelector('BTC', 1),
+    ]);
+  });
+
+  it('wires close-all and position action handlers when data is present', () => {
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [makePosition({ symbol: 'SOL' })],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLivePositions>);
+
+    renderPanel('SOL');
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_CLOSE_ALL),
+    );
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITION_CLOSE),
+    );
+
+    expect(handleCloseAllPress).toHaveBeenCalled();
+    expect(handleClosePosition).toHaveBeenCalled();
+  });
+
+  it('wires order cancel handler on the orders tab', () => {
+    mockUsePerpsLiveOrders.mockReturnValue({
+      orders: [makeOrder({ orderId: 'sol-1', symbol: 'SOL' })],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLiveOrders>);
+
+    renderPanel('SOL');
+
+    fireEvent.press(
+      screen.getByTestId(
+        PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TAB_ORDERS,
+      ),
+    );
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_CANCEL),
+    );
+
+    expect(handleCancelOrder).toHaveBeenCalled();
+  });
+
+  it('disables all order cancel buttons while any cancel is in flight', () => {
+    mockUsePerpsLiveOrders.mockReturnValue({
+      orders: [
+        makeOrder({ orderId: 'btc-1', symbol: 'BTC' }),
+        makeOrder({ orderId: 'sol-1', symbol: 'SOL' }),
+      ],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLiveOrders>);
+    mockUsePerpsProPositionsPanelActions.mockReturnValue({
+      handleClosePosition,
+      handleReversePosition,
+      handleSharePosition,
+      handleEditPositionTpSl: jest.fn(),
+      handleEditPositionMargin: jest.fn(),
+      handleCancelOrder,
+      handleEditOrderPrice: jest.fn(),
+      handleEditOrderSize: jest.fn(),
+      handleCloseAllPress,
+      cancelingOrderId: 'btc-1',
+      editingOrderId: null,
+      isOrderCancelable: () => true,
+      isOrderEditable: () => true,
+      isOrderSizeEditable: () => true,
+      isPositionMarginEditable: () => true,
+      renderActionSheets: () => null,
+    });
+
+    renderPanel('SOL');
+
+    fireEvent.press(
+      screen.getByTestId(
+        PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TAB_ORDERS,
+      ),
+    );
+
+    const cancelButtons = screen.getAllByTestId(
+      PerpsProMarketViewSelectorsIDs.ORDER_CANCEL,
+    );
+
+    expect(cancelButtons).toHaveLength(2);
+    cancelButtons.forEach((button) => {
+      expect(button.props.accessibilityState?.disabled).toBe(true);
+    });
+  });
+
+  it('switches to the full market data of a tapped position row', () => {
+    const onSelectMarket = jest.fn();
+    const ethMarket = { symbol: 'ETH', maxLeverage: '25x' };
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [makePosition({ symbol: 'ETH' })],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLivePositions>);
+    mockUsePerpsMarkets.mockReturnValue({
+      markets: [ethMarket],
+      isLoading: false,
+      error: null,
+      refresh: jest.fn(),
+      isRefreshing: false,
+    } as unknown as ReturnType<typeof usePerpsMarkets>);
+
+    renderPanel('SOL', onSelectMarket);
+
+    fireEvent.press(screen.getByTestId(getPerpsProPositionRowSelector('ETH')));
+
+    expect(onSelectMarket).toHaveBeenCalledWith(
+      ethMarket,
+      PERPS_EVENT_VALUE.SOURCE_SECTION.POSITIONS,
+    );
+  });
+
+  it('falls back to a symbol-only market when the row asset is not in the market list', () => {
+    const onSelectMarket = jest.fn();
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [makePosition({ symbol: 'ETH' })],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLivePositions>);
+
+    renderPanel('SOL', onSelectMarket);
+
+    fireEvent.press(screen.getByTestId(getPerpsProPositionRowSelector('ETH')));
+
+    expect(onSelectMarket).toHaveBeenCalledWith(
+      { symbol: 'ETH' },
+      PERPS_EVENT_VALUE.SOURCE_SECTION.POSITIONS,
+    );
+  });
+
+  it('switches to the market of a tapped order row', () => {
+    const onSelectMarket = jest.fn();
+    mockUsePerpsLiveOrders.mockReturnValue({
+      orders: [makeOrder({ orderId: 'eth-1', symbol: 'ETH' })],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLiveOrders>);
+
+    renderPanel('SOL', onSelectMarket);
+
+    fireEvent.press(
+      screen.getByTestId(
+        PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TAB_ORDERS,
+      ),
+    );
+    fireEvent.press(screen.getByTestId(getPerpsProOrderRowSelector('ETH', 0)));
+
+    expect(onSelectMarket).toHaveBeenCalledWith(
+      { symbol: 'ETH' },
+      PERPS_EVENT_VALUE.SOURCE_SECTION.ORDERS,
+    );
+  });
+
+  it('leaves rows non-interactive when no market switch handler is provided', () => {
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [makePosition({ symbol: 'ETH' })],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLivePositions>);
+
+    renderPanel('SOL');
+
+    expect(screen.queryByLabelText('Switch to the ETH market')).toBeNull();
+  });
+
+  it('matches the ticker-only filter on the full market symbol for HIP-3 markets', () => {
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [
+        makePosition({ symbol: 'dex1:SOL' }),
+        makePosition({ symbol: 'SOL' }),
+      ],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLivePositions>);
+
+    renderPanel('dex1:SOL');
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_TICKER_ONLY),
+    );
+
+    expectTabLabel('Positions (1)');
+    expect(
+      screen.getByTestId('perps-pro-market-position-row-dex1:SOL'),
+    ).toBeOnTheScreen();
+    expect(
+      screen.queryByTestId('perps-pro-market-position-row-SOL'),
+    ).toBeNull();
+  });
+
+  it('subscribes to market data for funding-rate sort', () => {
+    renderPanel();
+
+    expect(mockUsePerpsMarkets).toHaveBeenCalled();
+    expect(mockUsePerpsMarkets.mock.calls[0]?.[0]?.skipInitialFetch).not.toBe(
+      true,
+    );
+  });
+
+  it('sorts positions by market funding rate when configured', () => {
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [
+        makePosition({ symbol: 'BTC' }),
+        makePosition({ symbol: 'ETH' }),
+        makePosition({ symbol: 'SOL' }),
+      ],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLivePositions>);
+    mockUsePerpsMarkets.mockReturnValue({
+      markets: [
+        { symbol: 'BTC', fundingRate: 0.015 },
+        { symbol: 'ETH', fundingRate: -0.005 },
+        { symbol: 'SOL', fundingRate: 0.0025 },
+      ],
+      isLoading: false,
+      error: null,
+      refresh: jest.fn(),
+      isRefreshing: false,
+    } as unknown as ReturnType<typeof usePerpsMarkets>);
+
+    renderPanel('SOL');
+
+    applySortByFundingRate();
+
+    const positionRows = screen
+      .getAllByTestId(/perps-pro-market-position-row-/)
+      .map((node) => node.props.testID);
+
+    expect(positionRows).toEqual([
+      'perps-pro-market-position-row-BTC',
+      'perps-pro-market-position-row-SOL',
+      'perps-pro-market-position-row-ETH',
+    ]);
+  });
+
+  it('opens the sort sheet from the positions settings button', () => {
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [makePosition({ symbol: 'SOL' })],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLivePositions>);
+
+    renderPanel('SOL');
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_SORT_BUTTON),
+    );
+
+    expect(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_SORT_SHEET),
+    ).toBeOnTheScreen();
+  });
+
+  it('sorts positions by position value high to low by default', () => {
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [
+        makePosition({ symbol: 'BTC', positionValue: '1000' }),
+        makePosition({ symbol: 'SOL', positionValue: '5000' }),
+      ],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLivePositions>);
+
+    renderPanel('SOL');
+
+    const positionTexts = screen
+      .getAllByTestId(/perps-pro-market-position-row-/)
+      .map((node) => node.props.testID);
+
+    expect(positionTexts[0]).toContain('SOL');
+    expect(positionTexts[1]).toContain('BTC');
+  });
+
+  it('opens the side filter sheet from the all sides button', () => {
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [makePosition({ symbol: 'SOL' })],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLivePositions>);
+
+    renderPanel('SOL');
+
+    expect(screen.getByText('All sides')).toBeOnTheScreen();
+
+    openSideFilterSheet();
+
+    expect(
+      screen.getByTestId(
+        PerpsProMarketViewSelectorsIDs.POSITIONS_SIDE_FILTER_SHEET,
+      ),
+    ).toBeOnTheScreen();
+  });
+
+  it('filters positions to long only when side filter is applied', () => {
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [
+        makePosition({ symbol: 'BTC', size: '1' }),
+        makePosition({ symbol: 'SOL', size: '-1' }),
+      ],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLivePositions>);
+
+    renderPanel('SOL');
+
+    applySideFilter('long');
+
+    expect(screen.getByText('Long')).toBeOnTheScreen();
+    expect(screen.getByText('BTC')).toBeOnTheScreen();
+    expect(screen.queryByText('SOL')).toBeNull();
+  });
+
+  it('shows side-filter empty copy when ticker-only and side filter hide all matches', () => {
+    mockUsePerpsLivePositions.mockReturnValue({
+      positions: [
+        makePosition({ symbol: 'BTC' }),
+        makePosition({ symbol: 'SOL', size: '-1' }),
+      ],
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLivePositions>);
+
+    renderPanel('SOL');
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_TICKER_ONLY),
+    );
+    applySideFilter('long');
+
+    expect(screen.getByText('No long positions.')).toBeOnTheScreen();
+    expect(screen.queryByText('No open SOL positions.')).toBeNull();
   });
 });
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsPanel.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsPanel.tsx
index 904e56d14cfb..aeb186256aca 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsPanel.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsPanel.tsx
@@ -1,9 +1,28 @@
-import { Box, Checkbox } from '@metamask/design-system-react-native';
-import { getPerpsDisplaySymbol } from '@metamask/perps-controller';
-import React, { useMemo, useState } from 'react';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  Button,
+  ButtonIcon,
+  ButtonIconSize,
+  ButtonSize,
+  ButtonVariant,
+  Checkbox,
+  IconName,
+} from '@metamask/design-system-react-native';
+import {
+  getPerpsDisplaySymbol,
+  type Order,
+  type PerpsMarketData,
+  type Position,
+} from '@metamask/perps-controller';
+import { PERPS_EVENT_VALUE } from '@metamask/perps-controller/constants';
+import React, { useCallback, useMemo, useState } from 'react';
 import { strings } from '../../../../../../../locales/i18n';
 import TabsBar from '../../../../../../component-library/components-temp/Tabs/TabsBar';
 import type { TabItem } from '../../../../../../component-library/components-temp/Tabs/TabsBar/TabsBar.types';
+import { usePerpsProPositionsPanelActions } from '../../../hooks/usePerpsProPositionsPanelActions';
+import { usePerpsMarkets } from '../../../hooks/usePerpsMarkets';
 import {
   usePerpsLiveOrders,
   usePerpsLivePositions,
@@ -16,56 +35,193 @@ import {
 import { calculatePositionAggregateTotals } from '../../../utils/pnlCalculations';
 import PerpsProOrderCard from './PerpsProOrderCard';
 import PerpsProOrdersEmptyState from './PerpsProOrdersEmptyState';
+import PerpsProOrdersSortSheet from './PerpsProOrdersSortSheet';
 import PerpsProPositionCard from './PerpsProPositionCard';
 import PerpsProPositionsEmptyState from './PerpsProPositionsEmptyState';
+import PerpsProPositionsSideFilterSheet from './PerpsProPositionsSideFilterSheet';
+import PerpsProPositionsSortSheet from './PerpsProPositionsSortSheet';
 import PerpsProUnrealizedPnl from './PerpsProUnrealizedPnl';
+import {
+  DEFAULT_PRO_POSITION_SIDE_FILTER,
+  filterProOrdersBySide,
+  filterProPositionsBySide,
+  getProOrderSideFilterEmptyDescriptionKey,
+  getProPositionSideFilterButtonLabelKey,
+  getProPositionSideFilterEmptyDescriptionKey,
+  type ProPositionSideFilter,
+} from '../utils/proPositionSideFilter';
+import {
+  DEFAULT_PRO_ORDER_SORT,
+  sortProOrders,
+  type ProOrderSortConfig,
+} from '../utils/proOrderSort';
+import {
+  DEFAULT_PRO_POSITION_SORT,
+  sortProPositions,
+  type ProPositionSortConfig,
+} from '../utils/proPositionSort';
 
 const POSITIONS_TAB_INDEX = 0;
 const ORDERS_TAB_INDEX = 1;
 
+/** Which Pro panel tab a market-switch row tap came from. */
+export type ProPositionsPanelSourceSection =
+  | typeof PERPS_EVENT_VALUE.SOURCE_SECTION.POSITIONS
+  | typeof PERPS_EVENT_VALUE.SOURCE_SECTION.ORDERS;
+
 interface PerpsProPositionsPanelProps {
+  /** Active market symbol, which may carry a `dex:` prefix for HIP-3 markets. */
   symbol: string;
+  /** Switches the screen to the market of a tapped position/order row. */
+  onSelectMarket?: (
+    market: PerpsMarketData | Partial<PerpsMarketData>,
+    sourceSection: ProPositionsPanelSourceSection,
+  ) => void;
+  /** Navigates to the order history screen. */
+  onHistoryPress?: () => void;
 }
 
 /**
  * Pro-mode positions/orders section.
  *
  * Renders the two-tab bar (Positions / Orders) matching the Figma design.
- * The Positions tab shows a read-only list of the user's open positions
- * across all assets, falling back to an empty state when there are none.
- * The `$TICKER only` checkbox filters positions (not orders) to the current
- * market. The Orders tab shows the user's open orders as read-only cards.
+ * The Positions tab shows the user's open positions across all assets,
+ * falling back to an empty state when there are none.
+ * The sort, side, and `$TICKER only` controls apply to both tabs. Positions
+ * and orders use domain-specific sort fields while sharing side and market
+ * filters.
  *
  * Summary P&L and position cards always share one data flow: derive
  * `visiblePositions`, compute `aggregateTotals` from that array, and render
  * both from those results so filter state never swaps data freshness sources.
  */
-const PerpsProPositionsPanel = ({ symbol }: PerpsProPositionsPanelProps) => {
+const PerpsProPositionsPanel = ({
+  symbol,
+  onSelectMarket,
+  onHistoryPress,
+}: PerpsProPositionsPanelProps) => {
   const [activeIndex, setActiveIndex] = useState(POSITIONS_TAB_INDEX);
   const [isTickerOnly, setIsTickerOnly] = useState(false);
+  const [isSortSheetOpen, setIsSortSheetOpen] = useState(false);
+  const [isSideFilterSheetOpen, setIsSideFilterSheetOpen] = useState(false);
+  const [sideFilter, setSideFilter] = useState<ProPositionSideFilter>(
+    DEFAULT_PRO_POSITION_SIDE_FILTER,
+  );
+  const [sortConfig, setSortConfig] = useState<ProPositionSortConfig>(
+    DEFAULT_PRO_POSITION_SORT,
+  );
+  const [orderSortConfig, setOrderSortConfig] = useState<ProOrderSortConfig>(
+    DEFAULT_PRO_ORDER_SORT,
+  );
   const { positions, isInitialLoading } = usePerpsLivePositions({
     throttleMs: 1000,
     useLivePnl: true,
   });
   const { orders, isInitialLoading: areOrdersInitiallyLoading } =
     usePerpsLiveOrders({ throttleMs: 1000 });
+  const {
+    handleClosePosition,
+    handleReversePosition,
+    handleSharePosition,
+    handleEditPositionTpSl,
+    handleEditPositionMargin,
+    handleCancelOrder,
+    handleEditOrderPrice,
+    handleEditOrderSize,
+    handleCloseAllPress,
+    cancelingOrderId,
+    editingOrderId,
+    isOrderCancelable,
+    isOrderEditable,
+    isOrderSizeEditable,
+    isPositionMarginEditable,
+    renderActionSheets,
+  } = usePerpsProPositionsPanelActions();
+  const { markets } = usePerpsMarkets();
+
+  const displaySymbol = getPerpsDisplaySymbol(symbol);
+
+  // Rows carry only a symbol, so resolve the full market here where the list is
+  // already loaded; the caller falls back to enriching a symbol-only market.
+  const selectMarketBySymbol = useCallback(
+    (nextSymbol: string, sourceSection: ProPositionsPanelSourceSection) => {
+      onSelectMarket?.(
+        markets.find((market) => market.symbol === nextSymbol) ?? {
+          symbol: nextSymbol,
+        },
+        sourceSection,
+      );
+    },
+    [markets, onSelectMarket],
+  );
+
+  const handleSelectPositionMarket = useCallback(
+    (position: Position) =>
+      selectMarketBySymbol(
+        position.symbol,
+        PERPS_EVENT_VALUE.SOURCE_SECTION.POSITIONS,
+      ),
+    [selectMarketBySymbol],
+  );
+
+  const handleSelectOrderMarket = useCallback(
+    (order: Order) =>
+      selectMarketBySymbol(
+        order.symbol,
+        PERPS_EVENT_VALUE.SOURCE_SECTION.ORDERS,
+      ),
+    [selectMarketBySymbol],
+  );
+
+  const fundingRatesBySymbol = useMemo(
+    () =>
+      Object.fromEntries(
+        markets.map((market) => [market.symbol, market.fundingRate]),
+      ),
+    [markets],
+  );
 
   const visiblePositions = useMemo(
     () =>
       isTickerOnly
-        ? positions.filter(
-            (position) => getPerpsDisplaySymbol(position.symbol) === symbol,
-          )
+        ? positions.filter((position) => position.symbol === symbol)
         : positions,
     [isTickerOnly, positions, symbol],
   );
 
+  const visibleOrders = useMemo(
+    () =>
+      isTickerOnly ? orders.filter((order) => order.symbol === symbol) : orders,
+    [isTickerOnly, orders, symbol],
+  );
+
+  const sideFilteredPositions = useMemo(
+    () => filterProPositionsBySide(visiblePositions, sideFilter),
+    [sideFilter, visiblePositions],
+  );
+
+  const sideFilteredOrders = useMemo(
+    () => filterProOrdersBySide(visibleOrders, sideFilter),
+    [sideFilter, visibleOrders],
+  );
+
+  const sortedVisiblePositions = useMemo(
+    () =>
+      sortProPositions(sideFilteredPositions, sortConfig, fundingRatesBySymbol),
+    [fundingRatesBySymbol, sideFilteredPositions, sortConfig],
+  );
+
+  const sortedVisibleOrders = useMemo(
+    () => sortProOrders(sideFilteredOrders, orderSortConfig),
+    [orderSortConfig, sideFilteredOrders],
+  );
+
   const aggregateTotals = useMemo(
-    () => calculatePositionAggregateTotals(visiblePositions),
-    [visiblePositions],
+    () => calculatePositionAggregateTotals(sideFilteredPositions),
+    [sideFilteredPositions],
   );
 
-  const openPositionsCount = visiblePositions.length;
+  const openPositionsCount = sideFilteredPositions.length;
   const positionsTabLabel =
     openPositionsCount > 0
       ? strings('perps.pro_positions_panel.positions_with_count', {
@@ -73,7 +229,7 @@ const PerpsProPositionsPanel = ({ symbol }: PerpsProPositionsPanelProps) => {
         })
       : strings('perps.pro_positions_panel.positions');
 
-  const openOrdersCount = orders.length;
+  const openOrdersCount = sideFilteredOrders.length;
   const ordersTabLabel =
     openOrdersCount > 0
       ? strings('perps.pro_positions_panel.orders_with_count', {
@@ -96,8 +252,38 @@ const PerpsProPositionsPanel = ({ symbol }: PerpsProPositionsPanelProps) => {
     },
   ];
 
-  const hasPositions = visiblePositions.length > 0;
+  const hasPositions = sortedVisiblePositions.length > 0;
   const hasAnyPositions = positions.length > 0;
+  const isSideFilterEmpty =
+    sideFilter !== 'all' &&
+    sideFilteredPositions.length === 0 &&
+    visiblePositions.length > 0;
+  const sideFilterEmptyDescriptionKey = isSideFilterEmpty
+    ? getProPositionSideFilterEmptyDescriptionKey(sideFilter)
+    : undefined;
+  const filteredTicker =
+    isTickerOnly &&
+    hasAnyPositions &&
+    visiblePositions.length === 0 &&
+    !isSideFilterEmpty
+      ? displaySymbol
+      : undefined;
+
+  const hasAnyOrders = orders.length > 0;
+  const isOrderSideFilterEmpty =
+    sideFilter !== 'all' &&
+    sideFilteredOrders.length === 0 &&
+    visibleOrders.length > 0;
+  const orderSideFilterEmptyDescriptionKey = isOrderSideFilterEmpty
+    ? getProOrderSideFilterEmptyDescriptionKey(sideFilter)
+    : undefined;
+  const filteredOrdersTicker =
+    isTickerOnly &&
+    hasAnyOrders &&
+    visibleOrders.length === 0 &&
+    !isOrderSideFilterEmpty
+      ? displaySymbol
+      : undefined;
 
   const renderPositionsTab = () => {
     if (hasPositions) {
@@ -106,12 +292,24 @@ const PerpsProPositionsPanel = ({ symbol }: PerpsProPositionsPanelProps) => {
           <PerpsProUnrealizedPnl
             unrealizedPnl={aggregateTotals.unrealizedPnl}
             returnOnEquity={aggregateTotals.returnOnEquity}
+            positionCount={sideFilteredPositions.length}
+            isFiltered={
+              isTickerOnly || sideFilter !== DEFAULT_PRO_POSITION_SIDE_FILTER
+            }
+            onCloseAll={handleCloseAllPress}
           />
-          {visiblePositions.map((position, index) => (
+          {sortedVisiblePositions.map((position) => (
             <PerpsProPositionCard
-              key={`${position.symbol}-${index}`}
+              key={position.symbol}
               position={position}
-              testID={getPerpsProPositionRowSelector(position.symbol, index)}
+              testID={getPerpsProPositionRowSelector(position.symbol)}
+              onPress={onSelectMarket ? handleSelectPositionMarket : undefined}
+              onClose={handleClosePosition}
+              onReverse={handleReversePosition}
+              onShare={handleSharePosition}
+              onEditTpSl={handleEditPositionTpSl}
+              onEditMargin={handleEditPositionMargin}
+              isEditMarginDisabled={!isPositionMarginEditable(position)}
             />
           ))}
         </Box>
@@ -124,23 +322,43 @@ const PerpsProPositionsPanel = ({ symbol }: PerpsProPositionsPanelProps) => {
     }
 
     return (
-      <Box twClassName="items-center justify-center px-4 pt-6">
+      <Box twClassName="items-center justify-center px-2 pt-6">
         <PerpsProPositionsEmptyState
-          filteredTicker={isTickerOnly && hasAnyPositions ? symbol : undefined}
+          filteredTicker={filteredTicker}
+          filteredSideDescriptionKey={sideFilterEmptyDescriptionKey}
         />
       </Box>
     );
   };
 
   const renderOrdersTab = () => {
-    if (orders.length > 0) {
+    if (sortedVisibleOrders.length > 0) {
       return (
         <Box testID={PerpsProMarketViewSelectorsIDs.ORDERS_LIST}>
-          {orders.map((order, index) => (
+          {sortedVisibleOrders.map((order, index) => (
             <PerpsProOrderCard
               key={order.orderId}
               order={order}
               testID={getPerpsProOrderRowSelector(order.symbol, index)}
+              onPress={onSelectMarket ? handleSelectOrderMarket : undefined}
+              onCancel={handleCancelOrder}
+              onEditPrice={handleEditOrderPrice}
+              onEditSize={handleEditOrderSize}
+              isCancelDisabled={
+                !isOrderCancelable(order) ||
+                cancelingOrderId !== null ||
+                editingOrderId !== null
+              }
+              isEditPriceDisabled={
+                !isOrderEditable(order) ||
+                cancelingOrderId !== null ||
+                editingOrderId !== null
+              }
+              isEditSizeDisabled={
+                !isOrderSizeEditable(order) ||
+                cancelingOrderId !== null ||
+                editingOrderId !== null
+              }
             />
           ))}
         </Box>
@@ -152,38 +370,122 @@ const PerpsProPositionsPanel = ({ symbol }: PerpsProPositionsPanelProps) => {
     }
 
     return (
-      <Box twClassName="items-center justify-center px-4 pt-6">
-        <PerpsProOrdersEmptyState />
+      <Box twClassName="items-center justify-center px-2 pt-6">
+        <PerpsProOrdersEmptyState
+          filteredTicker={filteredOrdersTicker}
+          filteredSideDescriptionKey={orderSideFilterEmptyDescriptionKey}
+        />
       </Box>
     );
   };
 
+  const renderTickerOnlyCheckbox = () => (
+    <Checkbox
+      label={strings('perps.pro_positions_panel.ticker_only', {
+        ticker: displaySymbol,
+      })}
+      isSelected={isTickerOnly}
+      onChange={setIsTickerOnly}
+      testID={PerpsProMarketViewSelectorsIDs.POSITIONS_TICKER_ONLY}
+    />
+  );
+
   return (
     <Box
       testID={PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL}
       twClassName="py-3"
     >
-      <TabsBar
-        tabs={tabs}
-        activeIndex={activeIndex}
-        onTabPress={setActiveIndex}
-        testID={PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TABS}
-      />
-      {activeIndex === POSITIONS_TAB_INDEX && (
-        <Box twClassName="items-start px-4 pt-3">
-          <Checkbox
-            label={strings('perps.pro_positions_panel.ticker_only', {
-              ticker: symbol,
-            })}
-            isSelected={isTickerOnly}
-            onChange={setIsTickerOnly}
-            testID={PerpsProMarketViewSelectorsIDs.POSITIONS_TICKER_ONLY}
+      {/* TabsBar hardcodes its own px-4 (16px) internally — 8px more than
+          the px-2 (8px) inset the rest of this panel's rows use below, which
+          reads as extra padding on the tab labels. Pull it back in with a
+          matching negative margin instead of touching the shared component's
+          own padding (used by other tab bars across the app). */}
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        twClassName="pr-2"
+      >
+        <Box twClassName="flex-1">
+          <TabsBar
+            tabs={tabs}
+            activeIndex={activeIndex}
+            onTabPress={setActiveIndex}
+            twClassName="-mx-2"
+            testID={PerpsProMarketViewSelectorsIDs.POSITIONS_PANEL_TABS}
           />
         </Box>
-      )}
+        {onHistoryPress ? (
+          <ButtonIcon
+            iconName={IconName.Clock}
+            size={ButtonIconSize.Md}
+            onPress={onHistoryPress}
+            accessibilityLabel={strings(
+              'perps.pro_positions_panel.order_history',
+            )}
+            testID={PerpsProMarketViewSelectorsIDs.POSITIONS_HISTORY_BUTTON}
+          />
+        ) : null}
+      </Box>
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        twClassName="gap-2 px-2 pt-3"
+        accessible={false}
+      >
+        <Box twClassName="bg-muted rounded-lg">
+          <ButtonIcon
+            iconName={IconName.Customize}
+            accessibilityLabel={strings(
+              activeIndex === ORDERS_TAB_INDEX
+                ? 'perps.pro_positions_panel.sort.orders_settings_accessibility'
+                : 'perps.pro_positions_panel.sort.settings_accessibility',
+            )}
+            size={ButtonIconSize.Md}
+            onPress={() => setIsSortSheetOpen(true)}
+            testID={PerpsProMarketViewSelectorsIDs.POSITIONS_SORT_BUTTON}
+          />
+        </Box>
+        <Button
+          variant={ButtonVariant.Secondary}
+          size={ButtonSize.Sm}
+          endIconName={IconName.ArrowDown}
+          onPress={() => setIsSideFilterSheetOpen(true)}
+          testID={PerpsProMarketViewSelectorsIDs.POSITIONS_SIDE_FILTER_BUTTON}
+        >
+          {strings(getProPositionSideFilterButtonLabelKey(sideFilter))}
+        </Button>
+        <Box twClassName="bg-muted rounded-lg px-2 py-1">
+          {renderTickerOnlyCheckbox()}
+        </Box>
+      </Box>
       {activeIndex === ORDERS_TAB_INDEX
         ? renderOrdersTab()
         : renderPositionsTab()}
+      {renderActionSheets(sideFilteredPositions)}
+      {activeIndex === ORDERS_TAB_INDEX ? (
+        <PerpsProOrdersSortSheet
+          isVisible={isSortSheetOpen}
+          sortConfig={orderSortConfig}
+          onApply={setOrderSortConfig}
+          onClose={() => setIsSortSheetOpen(false)}
+          testID={PerpsProMarketViewSelectorsIDs.ORDERS_SORT_SHEET}
+        />
+      ) : (
+        <PerpsProPositionsSortSheet
+          isVisible={isSortSheetOpen}
+          sortConfig={sortConfig}
+          onApply={setSortConfig}
+          onClose={() => setIsSortSheetOpen(false)}
+          testID={PerpsProMarketViewSelectorsIDs.POSITIONS_SORT_SHEET}
+        />
+      )}
+      <PerpsProPositionsSideFilterSheet
+        isVisible={isSideFilterSheetOpen}
+        sideFilter={sideFilter}
+        onApply={setSideFilter}
+        onClose={() => setIsSideFilterSheetOpen(false)}
+        testID={PerpsProMarketViewSelectorsIDs.POSITIONS_SIDE_FILTER_SHEET}
+      />
     </Box>
   );
 };
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsPanelActions.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsPanelActions.test.tsx
new file mode 100644
index 000000000000..513f53cd5cb8
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsPanelActions.test.tsx
@@ -0,0 +1,700 @@
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react-native';
+import type { Order, Position } from '@metamask/perps-controller';
+import React from 'react';
+import { useSelector } from 'react-redux';
+import Routes from '../../../../../../constants/navigation/Routes';
+import { PerpsProMarketViewSelectorsIDs } from '../../../Perps.testIds';
+import { usePerpsProPositionsPanelActions } from '../../../hooks/usePerpsProPositionsPanelActions';
+import PerpsProPositionCard from './PerpsProPositionCard';
+import PerpsProOrderCard from './PerpsProOrderCard';
+import PerpsProUnrealizedPnl from './PerpsProUnrealizedPnl';
+
+jest.mock('../../../components/PerpsTokenLogo', () => 'PerpsTokenLogo');
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(() => true),
+}));
+
+const mockNavigate = jest.fn();
+const mockNavigateToClosePosition = jest.fn();
+const mockCancelOrder = jest.fn();
+const mockEditOrder = jest.fn();
+const mockShowToast = jest.fn();
+const mockGate = jest.fn((callback: () => void | Promise<void>) => callback());
+
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: () => ({ navigate: mockNavigate }),
+}));
+
+jest.mock('../../../../Compliance', () => ({
+  useComplianceGate: () => ({ gate: mockGate }),
+}));
+
+jest.mock('../../../hooks/usePerpsEventTracking', () => ({
+  usePerpsEventTracking: () => ({ track: jest.fn() }),
+}));
+
+jest.mock('../../../hooks/usePerpsNavigation', () => ({
+  usePerpsNavigation: () => ({
+    navigateToClosePosition: mockNavigateToClosePosition,
+  }),
+}));
+
+jest.mock('../../../hooks/usePerpsTrading', () => ({
+  usePerpsTrading: () => ({
+    cancelOrder: mockCancelOrder,
+    editOrder: mockEditOrder,
+  }),
+}));
+
+const mockHandleUpdateTPSL = jest.fn();
+const mockUpdateOrderOptimistic = jest.fn();
+
+jest.mock('../../../providers/PerpsStreamManager', () => ({
+  usePerpsStream: () => ({
+    orders: {
+      updateOrderOptimistic: mockUpdateOrderOptimistic,
+      getSnapshot: jest.fn(() => null),
+    },
+    positions: {
+      getSnapshot: jest.fn(() => null),
+      subscribe: jest.fn(() => jest.fn()),
+    },
+  }),
+}));
+
+jest.mock('../../../hooks/usePerpsSelector', () => ({
+  usePerpsSelector: () => undefined,
+}));
+
+jest.mock('../../../hooks/usePerpsTPSLUpdate', () => ({
+  usePerpsTPSLUpdate: () => ({
+    handleUpdateTPSL: mockHandleUpdateTPSL,
+    isUpdating: false,
+  }),
+}));
+
+jest.mock('../../../hooks/usePerpsMarketData', () => ({
+  usePerpsMarketData: () => ({
+    marketData: { szDecimals: 3 },
+    isLoading: false,
+    error: null,
+  }),
+}));
+
+jest.mock('../../../hooks/usePerpsToasts', () => ({
+  __esModule: true,
+  default: () => ({
+    showToast: mockShowToast,
+    PerpsToastOptions: {
+      orderManagement: {
+        shared: {
+          submitting: jest.fn(() => ({ title: 'submitting' })),
+          cancellationInProgress: jest.fn(() => ({ title: 'canceling' })),
+          cancellationSuccess: jest.fn(() => ({ title: 'success' })),
+          cancellationFailed: { title: 'failed' },
+        },
+        limit: {
+          confirmed: jest.fn(() => ({ title: 'confirmed' })),
+          creationFailed: jest.fn(() => ({ title: 'creation-failed' })),
+          editSubmitting: jest.fn(() => ({ title: 'edit-submitting' })),
+          editConfirmed: jest.fn(() => ({ title: 'edit-confirmed' })),
+          editFailed: jest.fn(() => ({ title: 'edit-failed' })),
+        },
+      },
+    },
+  }),
+}));
+
+jest.mock(
+  '../../../Views/PerpsCloseAllPositionsView/PerpsCloseAllPositionsView',
+  () => {
+    const { View } = jest.requireActual('react-native');
+    return function PerpsCloseAllPositionsView() {
+      return <View testID="perps-close-all-positions-view" />;
+    };
+  },
+);
+
+jest.mock(
+  '../../../components/PerpsFlipPositionConfirmSheet/PerpsFlipPositionConfirmSheet',
+  () => {
+    const { View } = jest.requireActual('react-native');
+    return function PerpsFlipPositionConfirmSheet() {
+      return <View testID="perps-flip-position-confirm-sheet" />;
+    };
+  },
+);
+
+jest.mock(
+  '../../../Views/PerpsSelectAdjustMarginActionView/PerpsSelectAdjustMarginActionView',
+  () => {
+    const { View } = jest.requireActual('react-native');
+    return function PerpsSelectAdjustMarginActionView() {
+      return <View testID="perps-select-adjust-margin-action-view" />;
+    };
+  },
+);
+
+jest.mock('../../../components/PerpsBottomSheetTooltip', () => {
+  const { View } = jest.requireActual('react-native');
+  return function PerpsBottomSheetTooltip() {
+    return <View testID="perps-bottom-sheet-tooltip" />;
+  };
+});
+
+jest.mock(
+  '../../../components/PerpsLimitPriceBottomSheet/PerpsLimitPriceBottomSheet',
+  () => {
+    const { View, Pressable, Text } = jest.requireActual('react-native');
+    return function PerpsLimitPriceBottomSheet({
+      onConfirm,
+    }: {
+      onConfirm: (price: string) => void;
+    }) {
+      return (
+        <View testID="perps-limit-price-bottom-sheet">
+          <Pressable
+            testID="perps-limit-price-confirm"
+            onPress={() => onConfirm('170')}
+          >
+            <Text>Confirm</Text>
+          </Pressable>
+        </View>
+      );
+    };
+  },
+);
+
+jest.mock(
+  '../../../components/PerpsOrderSizeBottomSheet/PerpsOrderSizeBottomSheet',
+  () => {
+    const { View, Pressable, Text } = jest.requireActual('react-native');
+    return function PerpsOrderSizeBottomSheet({
+      onConfirm,
+    }: {
+      onConfirm: (size: string) => void;
+    }) {
+      return (
+        <View testID="perps-order-size-bottom-sheet">
+          <Pressable
+            testID="perps-order-size-confirm"
+            onPress={() => onConfirm('2')}
+          >
+            <Text>Confirm</Text>
+          </Pressable>
+        </View>
+      );
+    };
+  },
+);
+
+const position: Position = {
+  symbol: 'ETH',
+  size: '1.5',
+  entryPrice: '2900',
+  positionValue: '4350',
+  unrealizedPnl: '150',
+  marginUsed: '1450',
+  leverage: { type: 'isolated', value: 3 },
+  liquidationPrice: '2500',
+  maxLeverage: 50,
+  returnOnEquity: '0.103',
+  cumulativeFunding: { allTime: '0', sinceOpen: '0', sinceChange: '0' },
+  takeProfitCount: 0,
+  stopLossCount: 0,
+};
+
+const order: Order = {
+  orderId: 'order-1',
+  symbol: 'SOL',
+  side: 'buy',
+  size: '1',
+  originalSize: '1',
+  filledSize: '0',
+  remainingSize: '1',
+  price: '160.71',
+  orderType: 'limit',
+  status: 'open',
+  timestamp: 1_711_756_800_000, // 2024-03-30T00:00:00.000Z — fixed for determinism
+  reduceOnly: false,
+  isTrigger: false,
+};
+
+const ActionHarness = ({
+  onReady,
+}: {
+  onReady: (
+    actions: ReturnType<typeof usePerpsProPositionsPanelActions>,
+  ) => void;
+}) => {
+  const actions = usePerpsProPositionsPanelActions();
+  React.useEffect(() => {
+    onReady(actions);
+  }, [actions, onReady]);
+
+  return <>{actions.renderActionSheets()}</>;
+};
+
+describe('usePerpsProPositionsPanelActions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useSelector as jest.Mock).mockReturnValue(true);
+    mockCancelOrder.mockResolvedValue({ success: true });
+    mockEditOrder.mockResolvedValue({ success: true });
+  });
+
+  it('navigates to close position with existing flow attribution', async () => {
+    let actions:
+      | ReturnType<typeof usePerpsProPositionsPanelActions>
+      | undefined;
+
+    render(
+      <ActionHarness
+        onReady={(readyActions) => {
+          actions = readyActions;
+        }}
+      />,
+    );
+
+    await act(async () => {
+      actions?.handleClosePosition(position);
+    });
+
+    expect(mockGate).toHaveBeenCalled();
+    expect(mockNavigateToClosePosition).toHaveBeenCalledWith(
+      position,
+      'perp_asset_screen',
+      expect.objectContaining({
+        buttonClicked: 'close',
+        buttonLocation: 'perp_market_details',
+      }),
+    );
+  });
+
+  it('opens reverse confirmation sheet for the selected position', async () => {
+    let actions:
+      | ReturnType<typeof usePerpsProPositionsPanelActions>
+      | undefined;
+
+    render(
+      <ActionHarness
+        onReady={(readyActions) => {
+          actions = readyActions;
+        }}
+      />,
+    );
+
+    await act(async () => {
+      actions?.handleReversePosition(position);
+    });
+
+    await waitFor(() => {
+      expect(
+        screen.getByTestId('perps-flip-position-confirm-sheet'),
+      ).toBeOnTheScreen();
+    });
+  });
+
+  it('navigates to share PnL with derived mark price', async () => {
+    let actions:
+      | ReturnType<typeof usePerpsProPositionsPanelActions>
+      | undefined;
+
+    render(
+      <ActionHarness
+        onReady={(readyActions) => {
+          actions = readyActions;
+        }}
+      />,
+    );
+
+    await act(async () => {
+      actions?.handleSharePosition(position);
+    });
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.PNL_HERO_CARD, {
+      position,
+      marketPrice: '2900',
+    });
+  });
+
+  it('cancels an order using the existing trading flow', async () => {
+    let actions:
+      | ReturnType<typeof usePerpsProPositionsPanelActions>
+      | undefined;
+
+    render(
+      <ActionHarness
+        onReady={(readyActions) => {
+          actions = readyActions;
+        }}
+      />,
+    );
+
+    await act(async () => {
+      await actions?.handleCancelOrder(order);
+    });
+
+    expect(mockCancelOrder).toHaveBeenCalledWith(
+      expect.objectContaining({
+        orderId: order.orderId,
+        symbol: order.symbol,
+        trackingData: expect.objectContaining({
+          source: 'perp_asset_screen',
+        }),
+      }),
+    );
+    expect(mockShowToast).toHaveBeenCalled();
+  });
+
+  it('edits an order price through the limit price sheet', async () => {
+    let resolveEdit!: (value: { success: boolean }) => void;
+    mockEditOrder.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          resolveEdit = resolve;
+        }),
+    );
+    let actions:
+      | ReturnType<typeof usePerpsProPositionsPanelActions>
+      | undefined;
+
+    render(
+      <ActionHarness
+        onReady={(readyActions) => {
+          actions = readyActions;
+        }}
+      />,
+    );
+
+    await act(async () => {
+      actions?.handleEditOrderPrice(order);
+    });
+
+    await waitFor(() => {
+      expect(
+        screen.getByTestId('perps-limit-price-bottom-sheet'),
+      ).toBeOnTheScreen();
+    });
+
+    await act(async () => {
+      fireEvent.press(screen.getByTestId('perps-limit-price-confirm'));
+    });
+
+    expect(
+      screen.queryByTestId('perps-limit-price-bottom-sheet'),
+    ).not.toBeOnTheScreen();
+    expect(mockUpdateOrderOptimistic).toHaveBeenCalledWith(order.orderId, {
+      limitPrice: '170',
+    });
+    expect(mockEditOrder).toHaveBeenCalledWith(
+      expect.objectContaining({
+        orderId: order.orderId,
+        newOrder: expect.objectContaining({
+          symbol: order.symbol,
+          price: '170',
+          orderType: 'limit',
+        }),
+      }),
+    );
+
+    await act(async () => {
+      resolveEdit({ success: true });
+    });
+
+    expect(mockShowToast).toHaveBeenCalled();
+  });
+
+  it('edits an order size through the size bottom sheet', async () => {
+    let resolveEdit!: (value: { success: boolean }) => void;
+    mockEditOrder.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          resolveEdit = resolve;
+        }),
+    );
+    let actions:
+      | ReturnType<typeof usePerpsProPositionsPanelActions>
+      | undefined;
+
+    render(
+      <ActionHarness
+        onReady={(readyActions) => {
+          actions = readyActions;
+        }}
+      />,
+    );
+
+    await act(async () => {
+      actions?.handleEditOrderSize(order);
+    });
+
+    await waitFor(() => {
+      expect(
+        screen.getByTestId('perps-order-size-bottom-sheet'),
+      ).toBeOnTheScreen();
+    });
+
+    await act(async () => {
+      fireEvent.press(screen.getByTestId('perps-order-size-confirm'));
+    });
+
+    expect(
+      screen.queryByTestId('perps-order-size-bottom-sheet'),
+    ).not.toBeOnTheScreen();
+    expect(mockUpdateOrderOptimistic).toHaveBeenCalledWith(order.orderId, {
+      size: '2',
+    });
+    expect(mockEditOrder).toHaveBeenCalledWith(
+      expect.objectContaining({
+        orderId: order.orderId,
+        newOrder: expect.objectContaining({
+          symbol: order.symbol,
+          size: '2',
+          orderType: 'limit',
+        }),
+      }),
+    );
+
+    await act(async () => {
+      resolveEdit({ success: true });
+    });
+
+    expect(mockShowToast).toHaveBeenCalled();
+  });
+
+  it('renders close-all sheet when handler is invoked', async () => {
+    let actions:
+      | ReturnType<typeof usePerpsProPositionsPanelActions>
+      | undefined;
+
+    render(
+      <ActionHarness
+        onReady={(readyActions) => {
+          actions = readyActions;
+        }}
+      />,
+    );
+
+    await act(async () => {
+      actions?.handleCloseAllPress();
+    });
+
+    expect(mockGate).toHaveBeenCalled();
+    await waitFor(() => {
+      expect(
+        screen.getByTestId('perps-close-all-positions-view'),
+      ).toBeOnTheScreen();
+    });
+  });
+});
+
+describe('PerpsProPositionsPanel action callbacks', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useSelector as jest.Mock).mockReturnValue(true);
+    mockCancelOrder.mockResolvedValue({ success: true });
+    mockEditOrder.mockResolvedValue({ success: true });
+  });
+
+  it('invokes position action callbacks from card controls', () => {
+    const onClose = jest.fn();
+    const onReverse = jest.fn();
+    const onShare = jest.fn();
+
+    render(
+      <PerpsProPositionCard
+        position={position}
+        onClose={onClose}
+        onReverse={onReverse}
+        onShare={onShare}
+      />,
+    );
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITION_CLOSE),
+    );
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITION_REVERSE),
+    );
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITION_SHARE),
+    );
+
+    expect(onClose).toHaveBeenCalledWith(position);
+    expect(onReverse).toHaveBeenCalledWith(position);
+    expect(onShare).toHaveBeenCalledWith(position);
+  });
+
+  it('opens adjust margin sheet when edit margin is pressed', async () => {
+    let actions:
+      | ReturnType<typeof usePerpsProPositionsPanelActions>
+      | undefined;
+
+    render(
+      <ActionHarness
+        onReady={(readyActions) => {
+          actions = readyActions;
+        }}
+      />,
+    );
+
+    await act(async () => {
+      actions?.handleEditPositionMargin(position);
+    });
+
+    await waitFor(() => {
+      expect(
+        screen.getByTestId('perps-select-adjust-margin-action-view'),
+      ).toBeOnTheScreen();
+    });
+  });
+
+  it('navigates to TP/SL screen when edit control is pressed', () => {
+    let actions:
+      | ReturnType<typeof usePerpsProPositionsPanelActions>
+      | undefined;
+
+    render(
+      <ActionHarness
+        onReady={(readyActions) => {
+          actions = readyActions;
+        }}
+      />,
+    );
+
+    actions?.handleEditPositionTpSl(position);
+
+    expect(mockGate).toHaveBeenCalled();
+    expect(mockNavigate).toHaveBeenCalledWith(
+      Routes.PERPS.TPSL,
+      expect.objectContaining({
+        asset: position.symbol,
+        position,
+        initialTakeProfitPrice: position.takeProfitPrice,
+        initialStopLossPrice: position.stopLossPrice,
+        leverage: position.leverage.value,
+      }),
+    );
+  });
+
+  it('invokes edit TP/SL callback from position card control', () => {
+    const onEditTpSl = jest.fn();
+
+    render(
+      <PerpsProPositionCard position={position} onEditTpSl={onEditTpSl} />,
+    );
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITION_EDIT_TPSL),
+    );
+
+    expect(onEditTpSl).toHaveBeenCalledWith(position);
+  });
+
+  it('invokes edit margin callback from position card control', () => {
+    const onEditMargin = jest.fn();
+
+    render(
+      <PerpsProPositionCard position={position} onEditMargin={onEditMargin} />,
+    );
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITION_EDIT_MARGIN),
+    );
+
+    expect(onEditMargin).toHaveBeenCalledWith(position);
+  });
+
+  it('does not render margin edit control for cross margin positions', () => {
+    render(
+      <PerpsProPositionCard
+        position={{
+          ...position,
+          leverage: { type: 'cross', value: 3 },
+        }}
+        onEditMargin={jest.fn()}
+      />,
+    );
+
+    expect(
+      screen.queryByTestId(PerpsProMarketViewSelectorsIDs.POSITION_EDIT_MARGIN),
+    ).toBeNull();
+  });
+
+  it('invokes cancel callback from order card control', () => {
+    const onCancel = jest.fn();
+
+    render(<PerpsProOrderCard order={order} onCancel={onCancel} />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_CANCEL),
+    );
+
+    expect(onCancel).toHaveBeenCalledWith(order);
+  });
+
+  it('invokes edit price callback from order card edit button', () => {
+    const onEditPrice = jest.fn();
+
+    render(<PerpsProOrderCard order={order} onEditPrice={onEditPrice} />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_EDIT),
+    );
+
+    expect(onEditPrice).toHaveBeenCalledWith(order);
+  });
+
+  it('invokes edit price callback from order card price control', () => {
+    const onEditPrice = jest.fn();
+
+    render(<PerpsProOrderCard order={order} onEditPrice={onEditPrice} />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_PRICE_EDIT),
+    );
+
+    expect(onEditPrice).toHaveBeenCalledWith(order);
+  });
+
+  it('invokes edit size callback from order card size control', () => {
+    const onEditSize = jest.fn();
+
+    render(<PerpsProOrderCard order={order} onEditSize={onEditSize} />);
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.ORDER_SIZE_EDIT),
+    );
+
+    expect(onEditSize).toHaveBeenCalledWith(order);
+  });
+
+  it('invokes close-all callback from positions summary header', () => {
+    const onCloseAll = jest.fn();
+
+    render(
+      <PerpsProUnrealizedPnl
+        unrealizedPnl="150"
+        returnOnEquity="10"
+        positionCount={1}
+        onCloseAll={onCloseAll}
+      />,
+    );
+
+    fireEvent.press(
+      screen.getByTestId(PerpsProMarketViewSelectorsIDs.POSITIONS_CLOSE_ALL),
+    );
+
+    expect(onCloseAll).toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSideFilterSheet.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSideFilterSheet.test.tsx
new file mode 100644
index 000000000000..2f9261883ffb
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSideFilterSheet.test.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import PerpsProPositionsSideFilterSheet from './PerpsProPositionsSideFilterSheet';
+import { DEFAULT_PRO_POSITION_SIDE_FILTER } from '../utils/proPositionSideFilter';
+
+jest.mock('./ProPositionSideFilterIcon', () => 'ProPositionSideFilterIcon');
+
+jest.mock('../../../../../../../locales/i18n', () => ({
+  strings: jest.fn((key: string) => {
+    const translations: Record<string, string> = {
+      'perps.market_type.filter_by': 'Filter by',
+      'perps.sort.apply': 'Apply',
+      'perps.pro_positions_panel.side_filter.all_sides': 'All sides',
+      'perps.pro_positions_panel.side_filter.long': 'Long',
+      'perps.pro_positions_panel.side_filter.short': 'Short',
+    };
+    return translations[key] || key;
+  }),
+}));
+
+describe('PerpsProPositionsSideFilterSheet', () => {
+  const mockOnClose = jest.fn();
+  const mockOnApply = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns null when not visible', () => {
+    const { toJSON } = render(
+      <PerpsProPositionsSideFilterSheet
+        isVisible={false}
+        sideFilter={DEFAULT_PRO_POSITION_SIDE_FILTER}
+        onClose={mockOnClose}
+        onApply={mockOnApply}
+      />,
+    );
+
+    expect(toJSON()).toBeNull();
+  });
+
+  it('renders side filter options', () => {
+    render(
+      <PerpsProPositionsSideFilterSheet
+        isVisible
+        sideFilter={DEFAULT_PRO_POSITION_SIDE_FILTER}
+        onClose={mockOnClose}
+        onApply={mockOnApply}
+        testID="positions-side-filter-sheet"
+      />,
+    );
+
+    expect(screen.getByText('Filter by')).toBeOnTheScreen();
+    expect(screen.getByText('All sides')).toBeOnTheScreen();
+    expect(screen.getByText('Long')).toBeOnTheScreen();
+    expect(screen.getByText('Short')).toBeOnTheScreen();
+  });
+
+  it('applies the selected side filter immediately on selection', () => {
+    render(
+      <PerpsProPositionsSideFilterSheet
+        isVisible
+        sideFilter={DEFAULT_PRO_POSITION_SIDE_FILTER}
+        onClose={mockOnClose}
+        onApply={mockOnApply}
+        testID="positions-side-filter-sheet"
+      />,
+    );
+
+    fireEvent.press(
+      screen.getByTestId('positions-side-filter-sheet-option-long'),
+    );
+
+    expect(mockOnApply).toHaveBeenCalledWith('long');
+    expect(mockOnClose).toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSideFilterSheet.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSideFilterSheet.tsx
new file mode 100644
index 000000000000..93ad1d983800
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSideFilterSheet.tsx
@@ -0,0 +1,100 @@
+import {
+  BottomSheet,
+  BottomSheetHeader,
+  ListItemSelect,
+  type BottomSheetRef,
+} from '@metamask/design-system-react-native';
+import React, { useCallback, useEffect, useRef } from 'react';
+import { Modal, View } from 'react-native';
+import { strings } from '../../../../../../../locales/i18n';
+import ProPositionSideFilterIcon from './ProPositionSideFilterIcon';
+import {
+  PRO_POSITION_SIDE_FILTER_OPTIONS,
+  type ProPositionSideFilter,
+} from '../utils/proPositionSideFilter';
+
+export interface PerpsProPositionsSideFilterSheetProps {
+  isVisible: boolean;
+  sideFilter: ProPositionSideFilter;
+  onApply: (next: ProPositionSideFilter) => void;
+  onClose: () => void;
+  testID?: string;
+}
+
+/**
+ * Bottom sheet for filtering Pro positions or orders by all sides, long, or
+ * short. Applies immediately on selection — no separate Apply button.
+ */
+const PerpsProPositionsSideFilterSheet = ({
+  isVisible,
+  sideFilter,
+  onApply,
+  onClose,
+  testID = 'perps-pro-positions-side-filter-sheet',
+}: PerpsProPositionsSideFilterSheetProps) => {
+  const sheetRef = useRef<BottomSheetRef>(null);
+
+  useEffect(() => {
+    if (isVisible) {
+      sheetRef.current?.onOpenBottomSheet();
+    }
+  }, [isVisible]);
+
+  const handleClose = useCallback(() => {
+    sheetRef.current?.onCloseBottomSheet(onClose);
+  }, [onClose]);
+
+  const handleSelect = useCallback(
+    (option: ProPositionSideFilter) => {
+      onApply(option);
+      handleClose();
+    },
+    [onApply, handleClose],
+  );
+
+  if (!isVisible) {
+    return null;
+  }
+
+  return (
+    <View>
+      <Modal
+        visible
+        transparent
+        animationType="none"
+        statusBarTranslucent
+        onRequestClose={handleClose}
+      >
+        <BottomSheet ref={sheetRef} onClose={onClose} testID={testID}>
+          <BottomSheetHeader
+            onClose={handleClose}
+            closeButtonProps={{ testID: `${testID}-close` }}
+          >
+            {strings('perps.market_type.filter_by')}
+          </BottomSheetHeader>
+          {PRO_POSITION_SIDE_FILTER_OPTIONS.map((option) => {
+            const isSelected = sideFilter === option.id;
+
+            return (
+              <ListItemSelect
+                key={option.id}
+                title={strings(option.labelKey)}
+                isSelected={isSelected}
+                showSelectedIcon
+                startAccessory={
+                  <ProPositionSideFilterIcon sideFilter={option.id} />
+                }
+                onPress={() => handleSelect(option.id)}
+                testID={`${testID}-option-${option.id}`}
+                accessibilityRole="radio"
+                accessibilityState={{ selected: isSelected }}
+              />
+            );
+          })}
+        </BottomSheet>
+      </Modal>
+    </View>
+  );
+};
+
+export default PerpsProPositionsSideFilterSheet;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSortSheet.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSortSheet.test.tsx
new file mode 100644
index 000000000000..a8c12069ca15
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSortSheet.test.tsx
@@ -0,0 +1,110 @@
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import PerpsProPositionsSortSheet from './PerpsProPositionsSortSheet';
+import { DEFAULT_PRO_POSITION_SORT } from '../utils/proPositionSort';
+
+jest.mock('../../../../../../../locales/i18n', () => ({
+  strings: jest.fn((key: string) => {
+    const translations: Record<string, string> = {
+      'perps.sort.sort_by': 'Sort by',
+      'perps.sort.apply': 'Apply',
+      'perps.sort.high_to_low': 'High to low',
+      'perps.sort.low_to_high': 'Low to high',
+      'perps.pro_positions_panel.sort.position_value': 'Position value',
+      'perps.pro_positions_panel.sort.unrealized_pnl': 'Unrealized P&L',
+      'perps.pro_positions_panel.sort.funding_rate': 'Funding rate',
+    };
+    return translations[key] || key;
+  }),
+}));
+
+describe('PerpsProPositionsSortSheet', () => {
+  const mockOnClose = jest.fn();
+  const mockOnApply = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns null when not visible', () => {
+    const { toJSON } = render(
+      <PerpsProPositionsSortSheet
+        isVisible={false}
+        sortConfig={DEFAULT_PRO_POSITION_SORT}
+        onClose={mockOnClose}
+        onApply={mockOnApply}
+      />,
+    );
+
+    expect(toJSON()).toBeNull();
+  });
+
+  it('renders sort options and default direction for position value', () => {
+    render(
+      <PerpsProPositionsSortSheet
+        isVisible
+        sortConfig={DEFAULT_PRO_POSITION_SORT}
+        onClose={mockOnClose}
+        onApply={mockOnApply}
+        testID="positions-sort-sheet"
+      />,
+    );
+
+    expect(screen.getByText('Sort by')).toBeOnTheScreen();
+    expect(
+      screen.getByTestId('positions-sort-sheet-option-positionValue'),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId('positions-sort-sheet-direction-text-positionValue'),
+    ).toHaveTextContent('High to low');
+  });
+
+  it('toggles direction when pressing the selected option and applies on save', () => {
+    render(
+      <PerpsProPositionsSortSheet
+        isVisible
+        sortConfig={DEFAULT_PRO_POSITION_SORT}
+        onClose={mockOnClose}
+        onApply={mockOnApply}
+        testID="positions-sort-sheet"
+      />,
+    );
+
+    fireEvent.press(
+      screen.getByTestId('positions-sort-sheet-option-positionValue'),
+    );
+    expect(
+      screen.getByTestId('positions-sort-sheet-direction-text-positionValue'),
+    ).toHaveTextContent('Low to high');
+
+    fireEvent.press(screen.getByTestId('positions-sort-sheet-apply'));
+
+    expect(mockOnApply).toHaveBeenCalledWith({
+      field: 'positionValue',
+      direction: 'asc',
+    });
+    expect(mockOnClose).toHaveBeenCalled();
+  });
+
+  it('selects a new field with high-to-low default when pressing another option', () => {
+    render(
+      <PerpsProPositionsSortSheet
+        isVisible
+        sortConfig={DEFAULT_PRO_POSITION_SORT}
+        onClose={mockOnClose}
+        onApply={mockOnApply}
+        testID="positions-sort-sheet"
+      />,
+    );
+
+    fireEvent.press(
+      screen.getByTestId('positions-sort-sheet-option-unrealizedPnl'),
+    );
+    fireEvent.press(screen.getByTestId('positions-sort-sheet-apply'));
+
+    expect(mockOnApply).toHaveBeenCalledWith({
+      field: 'unrealizedPnl',
+      direction: 'desc',
+    });
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSortSheet.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSortSheet.tsx
new file mode 100644
index 000000000000..8327835090bb
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProPositionsSortSheet.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import {
+  DEFAULT_PRO_POSITION_SORT,
+  PRO_POSITION_SORT_OPTIONS,
+  type ProPositionSortConfig,
+} from '../utils/proPositionSort';
+import PerpsProSortSheet from './PerpsProSortSheet';
+
+export interface PerpsProPositionsSortSheetProps {
+  isVisible: boolean;
+  sortConfig: ProPositionSortConfig;
+  onApply: (next: ProPositionSortConfig) => void;
+  onClose: () => void;
+  testID?: string;
+}
+
+/**
+ * Bottom sheet for sorting Pro positions by value, unrealized P&L, or funding.
+ */
+const PerpsProPositionsSortSheet = ({
+  isVisible,
+  sortConfig,
+  onApply,
+  onClose,
+  testID = 'perps-pro-positions-sort-sheet',
+}: PerpsProPositionsSortSheetProps) => (
+  <PerpsProSortSheet
+    isVisible={isVisible}
+    sortConfig={sortConfig}
+    options={PRO_POSITION_SORT_OPTIONS}
+    onApply={onApply}
+    onClose={onClose}
+    onClear={() => onApply(DEFAULT_PRO_POSITION_SORT)}
+    testID={testID}
+  />
+);
+
+export default PerpsProPositionsSortSheet;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProSortSheet.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProSortSheet.tsx
new file mode 100644
index 000000000000..c8356fa5c7c3
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProSortSheet.tsx
@@ -0,0 +1,135 @@
+import {
+  Box,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  ListItemSelect,
+  ListItemVariant,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import React, { useCallback, useState } from 'react';
+import { strings } from '../../../../../../../locales/i18n';
+import type { ProSortDirection } from '../utils/proSortCompare';
+import PerpsProPositionsOptionSheet from './PerpsProPositionsOptionSheet';
+
+export interface ProSortConfig<TField extends string> {
+  field: TField;
+  direction: ProSortDirection;
+}
+
+export interface ProSortOption<TField extends string> {
+  id: TField;
+  labelKey: string;
+}
+
+export interface PerpsProSortSheetProps<TField extends string> {
+  isVisible: boolean;
+  sortConfig: ProSortConfig<TField>;
+  options: readonly ProSortOption<TField>[];
+  onApply: (next: ProSortConfig<TField>) => void;
+  onClose: () => void;
+  onClear?: () => void;
+  testID?: string;
+}
+
+/**
+ * Shared bottom sheet for Pro positions/orders sorting.
+ * Tapping the active option toggles high-to-low / low-to-high before Apply.
+ */
+const PerpsProSortSheet = <TField extends string>({
+  isVisible,
+  sortConfig,
+  options,
+  onApply,
+  onClose,
+  onClear,
+  testID = 'perps-pro-sort-sheet',
+}: PerpsProSortSheetProps<TField>) => {
+  const [draftField, setDraftField] = useState<TField>(sortConfig.field);
+  const [draftDirection, setDraftDirection] = useState<ProSortDirection>(
+    sortConfig.direction,
+  );
+
+  const resetDraft = useCallback(() => {
+    setDraftField(sortConfig.field);
+    setDraftDirection(sortConfig.direction);
+  }, [sortConfig.direction, sortConfig.field]);
+
+  const handleOptionPress = useCallback(
+    (field: TField) => {
+      if (draftField === field) {
+        setDraftDirection((current) => (current === 'asc' ? 'desc' : 'asc'));
+        return;
+      }
+
+      setDraftField(field);
+      setDraftDirection('desc');
+    },
+    [draftField],
+  );
+
+  const handleApply = useCallback(() => {
+    onApply({ field: draftField, direction: draftDirection });
+  }, [draftDirection, draftField, onApply]);
+
+  return (
+    <PerpsProPositionsOptionSheet
+      isVisible={isVisible}
+      title={strings('perps.sort.sort_by')}
+      onClose={onClose}
+      onApply={handleApply}
+      onClear={onClear}
+      onOpen={resetDraft}
+      testID={testID}
+    >
+      {options.map((option) => {
+        const isSelected = draftField === option.id;
+
+        return (
+          <ListItemSelect
+            key={option.id}
+            title={strings(option.labelKey)}
+            variant={ListItemVariant.OneLine}
+            isSelected={isSelected}
+            showSelectedIcon={false}
+            onPress={() => handleOptionPress(option.id)}
+            endAccessory={
+              isSelected ? (
+                <Box
+                  twClassName="flex-row items-center gap-2"
+                  accessible={false}
+                >
+                  <Text
+                    variant={TextVariant.BodyMd}
+                    color={TextColor.TextAlternative}
+                    testID={`${testID}-direction-text-${option.id}`}
+                  >
+                    {draftDirection === 'asc'
+                      ? strings('perps.sort.low_to_high')
+                      : strings('perps.sort.high_to_low')}
+                  </Text>
+                  <Icon
+                    name={
+                      draftDirection === 'asc'
+                        ? IconName.Arrow2Up
+                        : IconName.Arrow2Down
+                    }
+                    size={IconSize.Md}
+                    color={IconColor.IconAlternative}
+                    testID={`${testID}-direction-indicator-${option.id}`}
+                  />
+                </Box>
+              ) : undefined
+            }
+            testID={`${testID}-option-${option.id}`}
+          />
+        );
+      })}
+    </PerpsProPositionsOptionSheet>
+  );
+};
+
+export default PerpsProSortSheet;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProTabEmptyState.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProTabEmptyState.tsx
new file mode 100644
index 000000000000..c462d215585a
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProTabEmptyState.tsx
@@ -0,0 +1,59 @@
+import { TabEmptyState } from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import React from 'react';
+import { Image } from 'react-native';
+import { strings } from '../../../../../../../locales/i18n';
+import { useAssetFromTheme } from '../../../../../../util/theme';
+import emptyStatePerpsLight from '../../../../../../images/empty-state-perps-light.png';
+import emptyStatePerpsDark from '../../../../../../images/empty-state-perps-dark.png';
+
+export interface PerpsProTabEmptyStateProps {
+  /** When set, shows the ticker-filtered empty copy instead of the global one. */
+  filteredTicker?: string;
+  /** When set, shows side-filtered empty copy instead of the global one. */
+  filteredSideDescriptionKey?: string;
+  /** i18n key for the unfiltered empty description. */
+  emptyDescriptionKey: string;
+  /** i18n key for the ticker-filtered empty description. */
+  filteredTickerDescriptionKey: string;
+}
+
+/**
+ * Shared Perps Pro tab empty state with optional ticker/side-filter copy.
+ */
+const PerpsProTabEmptyState = ({
+  filteredTicker,
+  filteredSideDescriptionKey,
+  emptyDescriptionKey,
+  filteredTickerDescriptionKey,
+}: PerpsProTabEmptyStateProps) => {
+  const tw = useTailwind();
+  const perpsImage = useAssetFromTheme(
+    emptyStatePerpsLight,
+    emptyStatePerpsDark,
+  );
+
+  const description = filteredSideDescriptionKey
+    ? strings(filteredSideDescriptionKey)
+    : filteredTicker
+      ? strings(filteredTickerDescriptionKey, {
+          ticker: filteredTicker,
+        })
+      : strings(emptyDescriptionKey);
+
+  return (
+    <TabEmptyState
+      icon={
+        <Image
+          source={perpsImage}
+          resizeMode="contain"
+          style={tw.style('w-[72px] h-[72px]')}
+          accessible={false}
+        />
+      }
+      description={description}
+    />
+  );
+};
+
+export default PerpsProTabEmptyState;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProUnrealizedPnl.test.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProUnrealizedPnl.test.tsx
index fa082b75bcc5..fa01c0bf583c 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProUnrealizedPnl.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProUnrealizedPnl.test.tsx
@@ -18,7 +18,11 @@ describe('PerpsProUnrealizedPnl', () => {
 
   it('renders aggregate PnL and close-all control', () => {
     render(
-      <PerpsProUnrealizedPnl unrealizedPnl="150.5" returnOnEquity="12.3" />,
+      <PerpsProUnrealizedPnl
+        unrealizedPnl="150.5"
+        returnOnEquity="12.3"
+        positionCount={2}
+      />,
     );
 
     expect(screen.getByText('Unrealized P&L')).toBeOnTheScreen();
@@ -30,7 +34,11 @@ describe('PerpsProUnrealizedPnl', () => {
     (useSelector as jest.Mock).mockReturnValue(true);
 
     render(
-      <PerpsProUnrealizedPnl unrealizedPnl="150.5" returnOnEquity="12.3" />,
+      <PerpsProUnrealizedPnl
+        unrealizedPnl="150.5"
+        returnOnEquity="12.3"
+        positionCount={2}
+      />,
     );
 
     expect(screen.getByText('Unrealized P&L')).toBeOnTheScreen();
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProUnrealizedPnl.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProUnrealizedPnl.tsx
index 7fe3d635a0a3..9372f7675962 100644
--- a/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProUnrealizedPnl.tsx
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/PerpsProUnrealizedPnl.tsx
@@ -17,21 +17,26 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import { strings } from '../../../../../../../locales/i18n';
 import { selectPrivacyMode } from '../../../../../../selectors/preferencesController';
+import { PerpsProMarketViewSelectorsIDs } from '../../../Perps.testIds';
 import { formatPercentage, formatPnl } from '../../../utils/formatUtils';
 
 interface PerpsProUnrealizedPnlProps {
   unrealizedPnl: string;
   returnOnEquity: string;
+  positionCount: number;
+  isFiltered?: boolean;
+  onCloseAll?: () => void;
 }
 
 /**
  * Aggregate Unrealized P&L summary for the Pro positions list.
- *
- * The Close all button is intentionally display-only until its flow is scoped.
  */
 const PerpsProUnrealizedPnl = ({
   unrealizedPnl,
   returnOnEquity,
+  positionCount,
+  isFiltered = false,
+  onCloseAll,
 }: PerpsProUnrealizedPnlProps) => {
   const privacyMode = useSelector(selectPrivacyMode);
   const pnl = parseFloat(unrealizedPnl) || 0;
@@ -45,7 +50,7 @@ const PerpsProUnrealizedPnl = ({
         : TextColor.TextDefault;
 
   return (
-    <Box twClassName="px-4 py-3">
+    <Box twClassName="px-2 py-3">
       <Box
         flexDirection={BoxFlexDirection.Row}
         alignItems={BoxAlignItems.Center}
@@ -72,8 +77,14 @@ const PerpsProUnrealizedPnl = ({
           size={ButtonSize.Sm}
           isDanger
           twClassName="self-center border-muted bg-transparent"
+          onPress={onCloseAll}
+          testID={PerpsProMarketViewSelectorsIDs.POSITIONS_CLOSE_ALL}
         >
-          {strings('perps.home.close_all')}
+          {isFiltered
+            ? strings('perps.pro_positions_panel.close_count', {
+                count: positionCount,
+              })
+            : strings('perps.home.close_all')}
         </Button>
       </Box>
     </Box>
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/components/ProPositionSideFilterIcon.tsx b/app/components/UI/Perps/Views/PerpsProMarketView/components/ProPositionSideFilterIcon.tsx
new file mode 100644
index 000000000000..7553bb355b6e
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/components/ProPositionSideFilterIcon.tsx
@@ -0,0 +1,54 @@
+import { Box, BoxFlexDirection } from '@metamask/design-system-react-native';
+import React from 'react';
+import { StyleSheet, View } from 'react-native';
+import { useTheme } from '../../../../../../util/theme';
+import type { ProPositionSideFilter } from '../utils/proPositionSideFilter';
+
+const styles = StyleSheet.create({
+  bar: {
+    height: 3,
+    borderRadius: 1,
+  },
+});
+
+interface ProPositionSideFilterIconProps {
+  sideFilter: ProPositionSideFilter;
+}
+
+/**
+ * Compact long/short/all-sides glyph for the positions side-filter sheet.
+ */
+const ProPositionSideFilterIcon = ({
+  sideFilter,
+}: ProPositionSideFilterIconProps) => {
+  const { colors } = useTheme();
+  const buyColor = colors.success.default;
+  const sellColor = colors.error.default;
+  const barColors: string[] =
+    sideFilter === 'long'
+      ? [buyColor, buyColor, buyColor]
+      : sideFilter === 'short'
+        ? [sellColor, sellColor, sellColor]
+        : [buyColor, buyColor, sellColor, sellColor];
+  const barWidths = sideFilter === 'all' ? [18, 14, 14, 10] : [18, 14, 10];
+
+  return (
+    <Box flexDirection={BoxFlexDirection.Column} twClassName="gap-0.5">
+      {barWidths.map((width, index) => (
+        <View
+          // eslint-disable-next-line react/no-array-index-key
+          key={`${sideFilter}-${index}`}
+          style={[
+            styles.bar,
+            {
+              width,
+              backgroundColor: barColors[index],
+            },
+          ]}
+        />
+      ))}
+    </Box>
+  );
+};
+
+export default ProPositionSideFilterIcon;
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/utils/proOrderSort.test.ts b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proOrderSort.test.ts
new file mode 100644
index 000000000000..1db0f47ea1f1
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proOrderSort.test.ts
@@ -0,0 +1,90 @@
+import type { Order } from '@metamask/perps-controller';
+import { DEFAULT_PRO_ORDER_SORT, sortProOrders } from './proOrderSort';
+
+const makeOrder = (overrides: Partial<Order> = {}): Order => ({
+  orderId: 'order-1',
+  symbol: 'BTC',
+  side: 'buy',
+  size: '1',
+  originalSize: '1',
+  filledSize: '0',
+  remainingSize: '1',
+  price: '50000',
+  orderType: 'limit',
+  status: 'open',
+  timestamp: 1_711_756_800_000,
+  reduceOnly: false,
+  isTrigger: false,
+  detailedOrderType: 'Limit',
+  ...overrides,
+});
+
+describe('sortProOrders', () => {
+  it('defaults to newest order first', () => {
+    const orders = [
+      makeOrder({ orderId: 'old', timestamp: 100 }),
+      makeOrder({ orderId: 'new', timestamp: 300 }),
+      makeOrder({ orderId: 'middle', timestamp: 200 }),
+    ];
+
+    const result = sortProOrders(orders, DEFAULT_PRO_ORDER_SORT);
+
+    expect(result.map((order) => order.orderId)).toEqual([
+      'new',
+      'middle',
+      'old',
+    ]);
+  });
+
+  it('sorts order value from high to low', () => {
+    const orders = [
+      makeOrder({ orderId: 'small', originalSize: '1', price: '100' }),
+      makeOrder({ orderId: 'large', originalSize: '5', price: '50' }),
+    ];
+
+    const result = sortProOrders(orders, {
+      field: 'orderValue',
+      direction: 'desc',
+    });
+
+    expect(result.map((order) => order.orderId)).toEqual(['large', 'small']);
+  });
+
+  it('sorts absolute size from low to high', () => {
+    const orders = [
+      makeOrder({ orderId: 'large', originalSize: '5' }),
+      makeOrder({ orderId: 'small', originalSize: '1' }),
+    ];
+
+    const result = sortProOrders(orders, {
+      field: 'size',
+      direction: 'asc',
+    });
+
+    expect(result.map((order) => order.orderId)).toEqual(['small', 'large']);
+  });
+
+  it('sorts trigger orders using their displayed trigger price', () => {
+    const orders = [
+      makeOrder({
+        orderId: 'high',
+        isTrigger: true,
+        triggerPrice: '200',
+        price: '100',
+      }),
+      makeOrder({
+        orderId: 'low',
+        isTrigger: true,
+        triggerPrice: '150',
+        price: '300',
+      }),
+    ];
+
+    const result = sortProOrders(orders, {
+      field: 'price',
+      direction: 'asc',
+    });
+
+    expect(result.map((order) => order.orderId)).toEqual(['low', 'high']);
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/utils/proOrderSort.ts b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proOrderSort.ts
new file mode 100644
index 000000000000..e0a0c243381b
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proOrderSort.ts
@@ -0,0 +1,76 @@
+import type { Order } from '@metamask/perps-controller';
+import { resolveOrderDisplayPriceAndLabel } from '../../../utils/orderUtils';
+import { compareProSortValues, type ProSortDirection } from './proSortCompare';
+
+export type ProOrderSortField = 'orderValue' | 'size' | 'price' | 'time';
+
+export type ProOrderSortDirection = ProSortDirection;
+
+export interface ProOrderSortConfig {
+  field: ProOrderSortField;
+  direction: ProOrderSortDirection;
+}
+
+export const DEFAULT_PRO_ORDER_SORT: ProOrderSortConfig = {
+  field: 'time',
+  direction: 'desc',
+};
+
+export const PRO_ORDER_SORT_OPTIONS: {
+  id: ProOrderSortField;
+  labelKey: string;
+}[] = [
+  {
+    id: 'orderValue',
+    labelKey: 'perps.pro_positions_panel.sort.order_value',
+  },
+  {
+    id: 'size',
+    labelKey: 'perps.pro_positions_panel.sort.size',
+  },
+  {
+    id: 'price',
+    labelKey: 'perps.pro_positions_panel.sort.price',
+  },
+  {
+    id: 'time',
+    labelKey: 'perps.pro_positions_panel.sort.time',
+  },
+];
+
+const getOrderSize = (order: Order): number =>
+  Math.abs(Number.parseFloat(order.originalSize || order.size)) || 0;
+
+const getOrderPrice = (order: Order): number =>
+  resolveOrderDisplayPriceAndLabel(order).priceValue ?? 0;
+
+const getSortValue = (order: Order, field: ProOrderSortField): number => {
+  switch (field) {
+    case 'orderValue':
+      return getOrderSize(order) * getOrderPrice(order);
+    case 'size':
+      return getOrderSize(order);
+    case 'price':
+      return getOrderPrice(order);
+    case 'time':
+      return order.timestamp ?? 0;
+    default:
+      return 0;
+  }
+};
+
+/**
+ * Returns a new array of orders sorted by the selected field and direction.
+ */
+export const sortProOrders = (
+  orders: Order[],
+  config: ProOrderSortConfig,
+): Order[] =>
+  [...orders].sort((left, right) =>
+    compareProSortValues(
+      getSortValue(left, config.field),
+      getSortValue(right, config.field),
+      config.direction,
+      () => left.orderId.localeCompare(right.orderId),
+    ),
+  );
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSideFilter.test.ts b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSideFilter.test.ts
new file mode 100644
index 000000000000..33a91b4e2214
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSideFilter.test.ts
@@ -0,0 +1,117 @@
+import type { Order, Position } from '@metamask/perps-controller';
+import {
+  DEFAULT_PRO_POSITION_SIDE_FILTER,
+  filterProOrdersBySide,
+  filterProPositionsBySide,
+} from './proPositionSideFilter';
+
+const makePosition = (overrides: Partial<Position> = {}): Position => ({
+  symbol: 'BTC',
+  size: '1',
+  entryPrice: '50000',
+  positionValue: '51000',
+  unrealizedPnl: '1000',
+  marginUsed: '10000',
+  leverage: { type: 'cross', value: 5 },
+  liquidationPrice: '40000',
+  maxLeverage: 50,
+  returnOnEquity: '0.10',
+  cumulativeFunding: { allTime: '0', sinceOpen: '0', sinceChange: '0' },
+  takeProfitCount: 0,
+  stopLossCount: 0,
+  ...overrides,
+});
+
+const makeOrder = (overrides: Partial<Order> = {}): Order => ({
+  orderId: 'order-1',
+  symbol: 'BTC',
+  side: 'buy',
+  size: '1',
+  originalSize: '1',
+  filledSize: '0',
+  remainingSize: '1',
+  price: '50000',
+  orderType: 'limit',
+  status: 'open',
+  timestamp: 1_711_756_800_000,
+  reduceOnly: false,
+  isTrigger: false,
+  detailedOrderType: 'Limit',
+  ...overrides,
+});
+
+describe('filterProPositionsBySide', () => {
+  it('returns all positions when filter is all', () => {
+    const positions = [
+      makePosition({ symbol: 'BTC', size: '1' }),
+      makePosition({ symbol: 'ETH', size: '-1' }),
+    ];
+
+    expect(
+      filterProPositionsBySide(positions, DEFAULT_PRO_POSITION_SIDE_FILTER),
+    ).toEqual(positions);
+  });
+
+  it('filters long positions only', () => {
+    const positions = [
+      makePosition({ symbol: 'BTC', size: '1' }),
+      makePosition({ symbol: 'ETH', size: '-1' }),
+      makePosition({ symbol: 'SOL', size: '0.5' }),
+    ];
+
+    expect(filterProPositionsBySide(positions, 'long')).toEqual([
+      positions[0],
+      positions[2],
+    ]);
+  });
+
+  it('filters short positions only', () => {
+    const positions = [
+      makePosition({ symbol: 'BTC', size: '1' }),
+      makePosition({ symbol: 'ETH', size: '-1' }),
+    ];
+
+    expect(filterProPositionsBySide(positions, 'short')).toEqual([
+      positions[1],
+    ]);
+  });
+});
+
+describe('filterProOrdersBySide', () => {
+  it('returns all orders when filter is all', () => {
+    const orders = [
+      makeOrder({ orderId: 'long', side: 'buy' }),
+      makeOrder({ orderId: 'short', side: 'sell' }),
+    ];
+
+    const result = filterProOrdersBySide(
+      orders,
+      DEFAULT_PRO_POSITION_SIDE_FILTER,
+    );
+
+    expect(result).toEqual(orders);
+  });
+
+  it('filters orders by their resulting position direction', () => {
+    const longOrder = makeOrder({ orderId: 'long', side: 'buy' });
+    const shortOrder = makeOrder({ orderId: 'short', side: 'sell' });
+
+    const longResult = filterProOrdersBySide([longOrder, shortOrder], 'long');
+    const shortResult = filterProOrdersBySide([longOrder, shortOrder], 'short');
+
+    expect(longResult).toEqual([longOrder]);
+    expect(shortResult).toEqual([shortOrder]);
+  });
+
+  it('uses reduce-only direction when filtering closing orders', () => {
+    const closeLongOrder = makeOrder({
+      orderId: 'close-long',
+      side: 'sell',
+      reduceOnly: true,
+    });
+
+    const result = filterProOrdersBySide([closeLongOrder], 'long');
+
+    expect(result).toEqual([closeLongOrder]);
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSideFilter.ts b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSideFilter.ts
new file mode 100644
index 000000000000..2f975e2e45a1
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSideFilter.ts
@@ -0,0 +1,102 @@
+import type { Order, Position } from '@metamask/perps-controller';
+import { getOrderPositionDirection } from '../../../utils/orderUtils';
+
+export type ProPositionSideFilter = 'all' | 'long' | 'short';
+
+export const DEFAULT_PRO_POSITION_SIDE_FILTER: ProPositionSideFilter = 'all';
+
+export const PRO_POSITION_SIDE_FILTER_OPTIONS: {
+  id: ProPositionSideFilter;
+  labelKey: string;
+}[] = [
+  {
+    id: 'all',
+    labelKey: 'perps.pro_positions_panel.side_filter.all_sides',
+  },
+  {
+    id: 'long',
+    labelKey: 'perps.pro_positions_panel.side_filter.long',
+  },
+  {
+    id: 'short',
+    labelKey: 'perps.pro_positions_panel.side_filter.short',
+  },
+];
+
+const getPositionSide = (position: Position): 'long' | 'short' =>
+  parseFloat(position.size) >= 0 ? 'long' : 'short';
+
+const filterProItemsBySide = <T>(
+  items: T[],
+  sideFilter: ProPositionSideFilter,
+  getSide: (item: T) => 'long' | 'short',
+): T[] => {
+  if (sideFilter === 'all') {
+    return items;
+  }
+
+  return items.filter((item) => getSide(item) === sideFilter);
+};
+
+/**
+ * Filters positions by direction. Returns the original array when filter is `all`.
+ */
+export const filterProPositionsBySide = (
+  positions: Position[],
+  sideFilter: ProPositionSideFilter,
+): Position[] => filterProItemsBySide(positions, sideFilter, getPositionSide);
+
+/**
+ * Filters orders by the position direction they create or reduce.
+ * Returns the original array when filter is `all`.
+ */
+export const filterProOrdersBySide = (
+  orders: Order[],
+  sideFilter: ProPositionSideFilter,
+): Order[] =>
+  filterProItemsBySide(orders, sideFilter, getOrderPositionDirection);
+
+export const getProPositionSideFilterButtonLabelKey = (
+  sideFilter: ProPositionSideFilter,
+): string => {
+  switch (sideFilter) {
+    case 'long':
+      return 'perps.pro_positions_panel.side_filter.long';
+    case 'short':
+      return 'perps.pro_positions_panel.side_filter.short';
+    default:
+      return 'perps.pro_positions_panel.side_filter.all_sides';
+  }
+};
+
+const SIDE_FILTER_EMPTY_DESCRIPTION_KEYS = {
+  positions: {
+    long: 'perps.pro_positions_panel.positions_empty_long',
+    short: 'perps.pro_positions_panel.positions_empty_short',
+  },
+  orders: {
+    long: 'perps.pro_positions_panel.orders_empty_long',
+    short: 'perps.pro_positions_panel.orders_empty_short',
+  },
+} as const;
+
+export const getProSideFilterEmptyDescriptionKey = (
+  sideFilter: ProPositionSideFilter,
+  entity: keyof typeof SIDE_FILTER_EMPTY_DESCRIPTION_KEYS,
+): string | undefined => {
+  if (sideFilter === 'all') {
+    return undefined;
+  }
+
+  return SIDE_FILTER_EMPTY_DESCRIPTION_KEYS[entity][sideFilter];
+};
+
+export const getProPositionSideFilterEmptyDescriptionKey = (
+  sideFilter: ProPositionSideFilter,
+): string | undefined =>
+  getProSideFilterEmptyDescriptionKey(sideFilter, 'positions');
+
+export const getProOrderSideFilterEmptyDescriptionKey = (
+  sideFilter: ProPositionSideFilter,
+): string | undefined =>
+  getProSideFilterEmptyDescriptionKey(sideFilter, 'orders');
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSort.test.ts b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSort.test.ts
new file mode 100644
index 000000000000..efa25bf68743
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSort.test.ts
@@ -0,0 +1,84 @@
+import type { Position } from '@metamask/perps-controller';
+import { DEFAULT_PRO_POSITION_SORT, sortProPositions } from './proPositionSort';
+
+const makePosition = (overrides: Partial<Position> = {}): Position => ({
+  symbol: 'BTC',
+  size: '1',
+  entryPrice: '50000',
+  positionValue: '51000',
+  unrealizedPnl: '1000',
+  marginUsed: '10000',
+  leverage: { type: 'cross', value: 5 },
+  liquidationPrice: '40000',
+  maxLeverage: 50,
+  returnOnEquity: '0.10',
+  cumulativeFunding: { allTime: '0', sinceOpen: '0', sinceChange: '0' },
+  takeProfitCount: 0,
+  stopLossCount: 0,
+  ...overrides,
+});
+
+describe('sortProPositions', () => {
+  it('defaults to position value high to low', () => {
+    const positions = [
+      makePosition({ symbol: 'BTC', positionValue: '1000' }),
+      makePosition({ symbol: 'ETH', positionValue: '5000' }),
+      makePosition({ symbol: 'SOL', positionValue: '3000' }),
+    ];
+
+    const sorted = sortProPositions(positions, DEFAULT_PRO_POSITION_SORT);
+
+    expect(sorted.map((position) => position.symbol)).toEqual([
+      'ETH',
+      'SOL',
+      'BTC',
+    ]);
+  });
+
+  it('sorts unrealized P&L low to high when configured', () => {
+    const positions = [
+      makePosition({ symbol: 'BTC', unrealizedPnl: '100' }),
+      makePosition({ symbol: 'ETH', unrealizedPnl: '-50' }),
+      makePosition({ symbol: 'SOL', unrealizedPnl: '25' }),
+    ];
+
+    const sorted = sortProPositions(positions, {
+      field: 'unrealizedPnl',
+      direction: 'asc',
+    });
+
+    expect(sorted.map((position) => position.symbol)).toEqual([
+      'ETH',
+      'SOL',
+      'BTC',
+    ]);
+  });
+
+  it('sorts by market funding rate high to low when configured', () => {
+    const positions = [
+      makePosition({ symbol: 'BTC' }),
+      makePosition({ symbol: 'ETH' }),
+      makePosition({ symbol: 'SOL' }),
+    ];
+    const fundingRatesBySymbol = {
+      BTC: 0.015,
+      ETH: -0.005,
+      SOL: 0.0025,
+    };
+
+    const sorted = sortProPositions(
+      positions,
+      {
+        field: 'fundingRate',
+        direction: 'desc',
+      },
+      fundingRatesBySymbol,
+    );
+
+    expect(sorted.map((position) => position.symbol)).toEqual([
+      'BTC',
+      'SOL',
+      'ETH',
+    ]);
+  });
+});
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSort.ts b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSort.ts
new file mode 100644
index 000000000000..44b0cd553d11
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proPositionSort.ts
@@ -0,0 +1,72 @@
+import type { Position } from '@metamask/perps-controller';
+import { compareProSortValues, type ProSortDirection } from './proSortCompare';
+
+export type ProPositionSortField =
+  | 'positionValue'
+  | 'unrealizedPnl'
+  | 'fundingRate';
+
+export type ProPositionSortDirection = ProSortDirection;
+
+export interface ProPositionSortConfig {
+  field: ProPositionSortField;
+  direction: ProPositionSortDirection;
+}
+
+export const DEFAULT_PRO_POSITION_SORT: ProPositionSortConfig = {
+  field: 'positionValue',
+  direction: 'desc',
+};
+
+export const PRO_POSITION_SORT_OPTIONS: {
+  id: ProPositionSortField;
+  labelKey: string;
+}[] = [
+  {
+    id: 'positionValue',
+    labelKey: 'perps.pro_positions_panel.sort.position_value',
+  },
+  {
+    id: 'unrealizedPnl',
+    labelKey: 'perps.pro_positions_panel.sort.unrealized_pnl',
+  },
+  {
+    id: 'fundingRate',
+    labelKey: 'perps.pro_positions_panel.sort.funding_rate',
+  },
+];
+
+const getSortValue = (
+  position: Position,
+  field: ProPositionSortField,
+  fundingRatesBySymbol?: Readonly<Record<string, number | undefined>>,
+): number => {
+  switch (field) {
+    case 'positionValue':
+      return parseFloat(position.positionValue) || 0;
+    case 'unrealizedPnl':
+      return parseFloat(position.unrealizedPnl) || 0;
+    case 'fundingRate':
+      return fundingRatesBySymbol?.[position.symbol] ?? 0;
+    default:
+      return 0;
+  }
+};
+
+/**
+ * Returns a new array of positions sorted by the selected field and direction.
+ * Funding-rate sorts use live market funding rates keyed by position symbol.
+ */
+export const sortProPositions = (
+  positions: Position[],
+  config: ProPositionSortConfig,
+  fundingRatesBySymbol?: Readonly<Record<string, number | undefined>>,
+): Position[] =>
+  [...positions].sort((left, right) =>
+    compareProSortValues(
+      getSortValue(left, config.field, fundingRatesBySymbol),
+      getSortValue(right, config.field, fundingRatesBySymbol),
+      config.direction,
+      () => left.symbol.localeCompare(right.symbol),
+    ),
+  );
diff --git a/app/components/UI/Perps/Views/PerpsProMarketView/utils/proSortCompare.ts b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proSortCompare.ts
new file mode 100644
index 000000000000..0d1720af8887
--- /dev/null
+++ b/app/components/UI/Perps/Views/PerpsProMarketView/utils/proSortCompare.ts
@@ -0,0 +1,20 @@
+/**
+ * Shared ascending/descending direction used by Pro positions and orders sorts.
+ */
+export type ProSortDirection = 'asc' | 'desc';
+
+/**
+ * Numeric sort comparator used by Pro positions and orders list sorting.
+ */
+export const compareProSortValues = (
+  leftValue: number,
+  rightValue: number,
+  direction: ProSortDirection,
+  tieBreak: () => number,
+): number => {
+  if (leftValue === rightValue) {
+    return tieBreak();
+  }
+
+  return (leftValue - rightValue) * (direction === 'asc' ? 1 : -1);
+};
diff --git a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView.test.tsx b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView.test.tsx
index 89d0d424b237..eb5ad58f339d 100644
--- a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView.test.tsx
@@ -52,11 +52,6 @@ jest.mock('../../hooks', () => ({
   usePerpsBlockExplorerUrl: jest.fn(),
 }));
 
-// Add the missing navbar mock
-jest.mock('../../../Navbar', () => ({
-  getPerpsTransactionsDetailsNavbar: jest.fn().mockReturnValue({}),
-}));
-
 describe('PerpsOrderTransactionView', () => {
   const mockUsePerpsNetwork = usePerpsNetwork as jest.MockedFunction<
     typeof usePerpsNetwork
diff --git a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView.test.tsx b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView.test.tsx
index bc0b4affeefd..7b2b57a1f18f 100644
--- a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView.test.tsx
@@ -44,11 +44,6 @@ jest.mock('../../hooks', () => ({
   usePerpsBlockExplorerUrl: jest.fn(),
 }));
 
-// Mock the navbar utilities
-jest.mock('../../../Navbar', () => ({
-  getPerpsTransactionsDetailsNavbar: jest.fn(() => ({ title: 'Test Title' })),
-}));
-
 jest.mock('../../../../../selectors/accountsController', () => ({
   selectSelectedInternalAccount: jest.fn(),
   selectSelectedInternalAccountId: jest.fn(() => undefined),
diff --git a/app/components/UI/Perps/components/LivePriceDisplay/LivePriceHeader.test.tsx b/app/components/UI/Perps/components/LivePriceDisplay/LivePriceHeader.test.tsx
index a4373e11a4bb..840cb5bfbf86 100644
--- a/app/components/UI/Perps/components/LivePriceDisplay/LivePriceHeader.test.tsx
+++ b/app/components/UI/Perps/components/LivePriceDisplay/LivePriceHeader.test.tsx
@@ -29,6 +29,11 @@ const mockUsePerpsLivePrices = usePerpsLivePrices as jest.MockedFunction<
   typeof usePerpsLivePrices
 >;
 
+// Fixed epoch (2023-11-14T22:13:20.000Z) — no test asserts on `timestamp`
+// directly, but a pinned constant keeps these fixtures deterministic across
+// runs instead of capturing `Date.now()` at test-execution time.
+const MOCK_TIMESTAMP = 1700000000000;
+
 describe('LivePriceHeader', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -46,7 +51,7 @@ describe('LivePriceHeader', () => {
         symbol: 'ETH',
         price: '0',
         percentChange24h: '5',
-        timestamp: Date.now(),
+        timestamp: MOCK_TIMESTAMP,
         isTradable: true,
       },
     });
@@ -79,7 +84,7 @@ describe('LivePriceHeader', () => {
         symbol: 'ETH',
         price: '3000',
         percentChange24h: '5.5',
-        timestamp: Date.now(),
+        timestamp: MOCK_TIMESTAMP,
         isTradable: true,
       },
     });
@@ -96,7 +101,7 @@ describe('LivePriceHeader', () => {
         symbol: 'ETH',
         price: '2500',
         percentChange24h: '-3.2',
-        timestamp: Date.now(),
+        timestamp: MOCK_TIMESTAMP,
         isTradable: true,
       },
     });
@@ -113,7 +118,7 @@ describe('LivePriceHeader', () => {
         symbol: 'ETH',
         price: '2000',
         percentChange24h: '0',
-        timestamp: Date.now(),
+        timestamp: MOCK_TIMESTAMP,
         isTradable: true,
       },
     });
@@ -130,7 +135,7 @@ describe('LivePriceHeader', () => {
         symbol: 'SOL',
         price: '100',
         percentChange24h: '2.1',
-        timestamp: Date.now(),
+        timestamp: MOCK_TIMESTAMP,
         isTradable: true,
       },
     });
@@ -157,7 +162,7 @@ describe('LivePriceHeader', () => {
           symbol: 'ETH',
           price: '3000',
           percentChange24h: undefined,
-          timestamp: Date.now(),
+          timestamp: MOCK_TIMESTAMP,
           isTradable: true,
         },
       });
@@ -191,7 +196,7 @@ describe('LivePriceHeader', () => {
           symbol: 'ETH',
           price: '3000',
           percentChange24h: '5.5',
-          timestamp: Date.now(),
+          timestamp: MOCK_TIMESTAMP,
           isTradable: true,
         },
       });
@@ -214,7 +219,7 @@ describe('LivePriceHeader', () => {
           symbol: 'ETH',
           price: '2500',
           percentChange24h: '-3.2',
-          timestamp: Date.now(),
+          timestamp: MOCK_TIMESTAMP,
           isTradable: true,
         },
       });
@@ -237,7 +242,7 @@ describe('LivePriceHeader', () => {
           symbol: 'ETH',
           price: '2000',
           percentChange24h: '0',
-          timestamp: Date.now(),
+          timestamp: MOCK_TIMESTAMP,
           isTradable: true,
         },
       });
@@ -262,7 +267,7 @@ describe('LivePriceHeader', () => {
           symbol: 'ETH',
           price: '3000',
           percentChange24h: '5.5',
-          timestamp: Date.now(),
+          timestamp: MOCK_TIMESTAMP,
           isTradable: true,
         },
       });
@@ -308,6 +313,20 @@ describe('LivePriceHeader', () => {
       expect(changeText?.props.color).toBe(TextColor.SuccessDefault);
     });
 
+    it('renders a smaller prominent price for the prominent variant (Pro)', () => {
+      const { UNSAFE_getAllByType } = render(
+        <LivePriceHeader symbol="ETH" currentPrice={3000} size="prominent" />,
+      );
+
+      const textElements = UNSAFE_getAllByType(Text);
+      const priceText = textElements.find(
+        (el) => el.props.children === '$3,000',
+      );
+
+      expect(priceText?.props.variant).toBe(TextVariant.HeadingLg);
+      expect(priceText?.props.color).toBe(TextColor.TextDefault);
+    });
+
     it('shows the absolute change and percentage for the large variant', () => {
       const { UNSAFE_getAllByType } = render(
         <LivePriceHeader symbol="ETH" currentPrice={3000} size="large" />,
@@ -367,7 +386,7 @@ describe('LivePriceHeader', () => {
           symbol: 'ETH',
           price: '3000',
           percentChange24h: undefined,
-          timestamp: Date.now(),
+          timestamp: MOCK_TIMESTAMP,
           isTradable: true,
         },
       });
@@ -385,7 +404,7 @@ describe('LivePriceHeader', () => {
         ETH: {
           symbol: 'ETH',
           price: '2500',
-          timestamp: Date.now(),
+          timestamp: MOCK_TIMESTAMP,
           isTradable: true,
         } as PriceUpdate,
       });
@@ -404,7 +423,7 @@ describe('LivePriceHeader', () => {
           symbol: 'ETH',
           price: '2000',
           percentChange24h: '0',
-          timestamp: Date.now(),
+          timestamp: MOCK_TIMESTAMP,
           isTradable: true,
         },
       });
@@ -435,7 +454,7 @@ describe('LivePriceHeader', () => {
           symbol: 'ETH',
           price: '3100',
           percentChange24h: undefined,
-          timestamp: Date.now(),
+          timestamp: MOCK_TIMESTAMP,
           isTradable: true,
         },
       });
@@ -458,7 +477,7 @@ describe('LivePriceHeader', () => {
           symbol: 'ETH',
           price: '3000',
           percentChange24h: '5.5',
-          timestamp: Date.now(),
+          timestamp: MOCK_TIMESTAMP,
           isTradable: true,
         },
       });
diff --git a/app/components/UI/Perps/components/LivePriceDisplay/LivePriceHeader.tsx b/app/components/UI/Perps/components/LivePriceDisplay/LivePriceHeader.tsx
index 208011a628e1..810e21725abb 100644
--- a/app/components/UI/Perps/components/LivePriceDisplay/LivePriceHeader.tsx
+++ b/app/components/UI/Perps/components/LivePriceDisplay/LivePriceHeader.tsx
@@ -41,9 +41,12 @@ interface LivePriceHeaderProps {
   /**
    * Visual size of the price/change row.
    * - `default`: compact, muted price (used inside the market header).
-   * - `large`: prominent price shown below the market header.
+   * - `large`: prominent price shown below the market header (Lite).
+   * - `prominent`: smaller prominent price used by the Pro market header
+   * (Figma Heading/Lg, 24px) — same stacked layout as `large`, but a step
+   * down in scale to fit Pro's denser summary row.
    */
-  size?: 'default' | 'large';
+  size?: 'default' | 'large' | 'prominent';
 }
 
 const styleSheet = () =>
@@ -86,8 +89,13 @@ const LivePriceHeader: React.FC<LivePriceHeaderProps> = ({
   percentChange24h: percentChange24hOverride,
   size = 'default',
 }) => {
-  const isLarge = size === 'large';
-  const priceVariant = isLarge ? TextVariant.DisplayLg : TextVariant.BodySm;
+  const isLarge = size === 'large' || size === 'prominent';
+  const priceVariant =
+    size === 'large'
+      ? TextVariant.DisplayLg
+      : size === 'prominent'
+        ? TextVariant.HeadingLg
+        : TextVariant.BodySm;
   const priceColor = isLarge
     ? TextColor.TextDefault
     : TextColor.TextAlternative;
diff --git a/app/components/UI/Perps/components/PerpsActionSheet/PerpsActionSheet.tsx b/app/components/UI/Perps/components/PerpsActionSheet/PerpsActionSheet.tsx
index 5aa612729f85..5e9a9818c20f 100644
--- a/app/components/UI/Perps/components/PerpsActionSheet/PerpsActionSheet.tsx
+++ b/app/components/UI/Perps/components/PerpsActionSheet/PerpsActionSheet.tsx
@@ -8,7 +8,6 @@ import {
   IconSize,
   ListItem,
 } from '@metamask/design-system-react-native';
-import { useElevatedSurface } from '../../../../../util/theme/themeUtils';
 import type { PerpsActionSheetProps } from './PerpsActionSheet.types';
 
 function PerpsActionSheet<T extends string>({
@@ -20,7 +19,6 @@ function PerpsActionSheet<T extends string>({
   sheetRef: externalSheetRef,
   testID,
 }: PerpsActionSheetProps<T>) {
-  const surfaceClass = useElevatedSurface();
   const internalSheetRef = useRef<BottomSheetRef>(null);
   const sheetRef = externalSheetRef || internalSheetRef;
 
@@ -46,7 +44,6 @@ function PerpsActionSheet<T extends string>({
       ref={sheetRef}
       goBack={!externalSheetRef ? onClose : undefined}
       onClose={externalSheetRef ? onClose : undefined}
-      twClassName={surfaceClass}
       testID={testID}
     >
       <BottomSheetHeader onClose={handleClose}>{title}</BottomSheetHeader>
diff --git a/app/components/UI/Perps/components/PerpsAdjustMarginActionSheet/PerpsAdjustMarginActionSheet.test.tsx b/app/components/UI/Perps/components/PerpsAdjustMarginActionSheet/PerpsAdjustMarginActionSheet.test.tsx
index e1b00d4990cd..367abf0993ec 100644
--- a/app/components/UI/Perps/components/PerpsAdjustMarginActionSheet/PerpsAdjustMarginActionSheet.test.tsx
+++ b/app/components/UI/Perps/components/PerpsAdjustMarginActionSheet/PerpsAdjustMarginActionSheet.test.tsx
@@ -2,10 +2,6 @@ import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react-native';
 import PerpsAdjustMarginActionSheet from './PerpsAdjustMarginActionSheet';
 
-jest.mock('../../../../../util/theme/themeUtils', () => ({
-  useElevatedSurface: () => 'bg-default',
-}));
-
 jest.mock('../../../../../../locales/i18n', () => ({
   strings: jest.fn((key) => {
     const translations: Record<string, string> = {
diff --git a/app/components/UI/Perps/components/PerpsBalanceBottomSheet/PerpsBalanceBottomSheet.test.tsx b/app/components/UI/Perps/components/PerpsBalanceBottomSheet/PerpsBalanceBottomSheet.test.tsx
new file mode 100644
index 000000000000..e2b6f2fbddb5
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsBalanceBottomSheet/PerpsBalanceBottomSheet.test.tsx
@@ -0,0 +1,244 @@
+import React from 'react';
+import { fireEvent } from '@testing-library/react-native';
+import PerpsBalanceBottomSheet from './PerpsBalanceBottomSheet';
+import { PerpsBalanceBottomSheetSelectorsIDs } from '../../Perps.testIds';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import { backgroundState } from '../../../../../util/test/initial-root-state';
+
+const mockHandleAddFunds = jest.fn();
+const mockHandleWithdraw = jest.fn();
+const mockCloseEligibilityModal = jest.fn();
+let mockIsEligibilityModalVisible = false;
+let mockIsEligible = true;
+
+jest.mock('../../hooks/usePerpsHomeActions', () => ({
+  usePerpsHomeActions: jest.fn(() => ({
+    handleAddFunds: mockHandleAddFunds,
+    handleWithdraw: mockHandleWithdraw,
+    isEligibilityModalVisible: mockIsEligibilityModalVisible,
+    closeEligibilityModal: mockCloseEligibilityModal,
+    isEligible: mockIsEligible,
+    isProcessing: false,
+    error: null,
+  })),
+}));
+
+const mockNavigateToActivity = jest.fn();
+
+jest.mock('../../hooks/usePerpsNavigation', () => ({
+  usePerpsNavigation: jest.fn(() => ({
+    navigateToActivity: mockNavigateToActivity,
+  })),
+}));
+
+let mockPerpsAccount: {
+  totalBalance: string;
+  spendableBalance: string;
+  unrealizedPnl: string;
+  returnOnEquity: string;
+} | null = {
+  totalBalance: '1234.56',
+  spendableBalance: '1000.00',
+  unrealizedPnl: '50.25',
+  returnOnEquity: '5.5',
+};
+
+jest.mock('../../hooks/stream', () => ({
+  usePerpsLiveAccount: jest.fn(() => ({
+    account: mockPerpsAccount,
+    isInitialLoading: false,
+  })),
+}));
+
+jest.mock('../PerpsBottomSheetTooltip', () => {
+  const { View, Text } = jest.requireActual('react-native');
+  return jest.fn(({ isVisible, testID, onClose }) =>
+    isVisible ? (
+      // eslint-disable-next-line react/no-unknown-property
+      <View testID={testID} onTouchEnd={onClose}>
+        <Text>Mock Geo Block Tooltip</Text>
+      </View>
+    ) : null,
+  );
+});
+
+const renderSheet = (
+  props: Partial<React.ComponentProps<typeof PerpsBalanceBottomSheet>> = {},
+  privacyMode = false,
+) =>
+  renderWithProvider(
+    <PerpsBalanceBottomSheet isVisible onClose={jest.fn()} {...props} />,
+    {
+      state: {
+        engine: {
+          backgroundState: {
+            ...backgroundState,
+            PreferencesController: {
+              ...backgroundState.PreferencesController,
+              privacyMode,
+            },
+          },
+        },
+      },
+    },
+  );
+
+describe('PerpsBalanceBottomSheet', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockIsEligibilityModalVisible = false;
+    mockIsEligible = true;
+    mockPerpsAccount = {
+      totalBalance: '1234.56',
+      spendableBalance: '1000.00',
+      unrealizedPnl: '50.25',
+      returnOnEquity: '5.5',
+    };
+  });
+
+  it('renders nothing when not visible', () => {
+    const { queryByTestId } = renderSheet({ isVisible: false });
+
+    expect(
+      queryByTestId(PerpsBalanceBottomSheetSelectorsIDs.CONTAINER),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('renders the sheet with balance, available, and PnL values', () => {
+    const { getByTestId } = renderSheet();
+
+    expect(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+    expect(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.BALANCE_VALUE),
+    ).toHaveTextContent('$1,234.56');
+    expect(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.AVAILABLE_VALUE),
+    ).toHaveTextContent('$1,000');
+    expect(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.PNL_VALUE),
+    ).toHaveTextContent('+$50.25 (+5.5%)');
+  });
+
+  it('defaults balance values to zero when the account has not loaded yet', () => {
+    mockPerpsAccount = null;
+    const { getByTestId } = renderSheet();
+
+    expect(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.BALANCE_VALUE),
+    ).toHaveTextContent('$0');
+    expect(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.AVAILABLE_VALUE),
+    ).toHaveTextContent('$0');
+  });
+
+  it('closes the sheet when the close button is pressed', () => {
+    const onClose = jest.fn();
+    const { getByTestId } = renderSheet({ onClose });
+
+    fireEvent.press(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.CLOSE_BUTTON),
+    );
+
+    expect(onClose).toHaveBeenCalledTimes(1);
+  });
+
+  it('closes the sheet and navigates to activity when the history button is pressed', () => {
+    const onClose = jest.fn();
+    const { getByTestId } = renderSheet({ onClose });
+
+    fireEvent.press(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.HISTORY_BUTTON),
+    );
+
+    expect(onClose).toHaveBeenCalledTimes(1);
+    expect(mockNavigateToActivity).toHaveBeenCalledTimes(1);
+  });
+
+  it('closes the sheet and invokes handleWithdraw when the withdraw button is pressed', () => {
+    const onClose = jest.fn();
+    const { getByTestId } = renderSheet({ onClose });
+
+    fireEvent.press(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.WITHDRAW_BUTTON),
+    );
+
+    expect(onClose).toHaveBeenCalledTimes(1);
+    expect(mockHandleWithdraw).toHaveBeenCalledTimes(1);
+  });
+
+  it('closes the sheet and invokes handleAddFunds when the add funds button is pressed', () => {
+    const onClose = jest.fn();
+    const { getByTestId } = renderSheet({ onClose });
+
+    fireEvent.press(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.ADD_FUNDS_BUTTON),
+    );
+
+    expect(onClose).toHaveBeenCalledTimes(1);
+    expect(mockHandleAddFunds).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not close the sheet when add funds is pressed while geo-blocked, so the eligibility tooltip can still render', () => {
+    mockIsEligible = false;
+    const onClose = jest.fn();
+    const { getByTestId } = renderSheet({ onClose });
+
+    fireEvent.press(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.ADD_FUNDS_BUTTON),
+    );
+
+    expect(onClose).not.toHaveBeenCalled();
+    expect(mockHandleAddFunds).toHaveBeenCalledTimes(1);
+  });
+
+  it('keeps the geo-block tooltip visible after add funds is pressed while ineligible', () => {
+    mockIsEligible = false;
+    mockIsEligibilityModalVisible = true;
+    const { getByTestId } = renderSheet();
+
+    fireEvent.press(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.ADD_FUNDS_BUTTON),
+    );
+
+    expect(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+    expect(
+      getByTestId(
+        PerpsBalanceBottomSheetSelectorsIDs.GEO_BLOCK_BOTTOM_SHEET_TOOLTIP,
+      ),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the geo-block tooltip when the eligibility modal is visible', () => {
+    mockIsEligibilityModalVisible = true;
+    const { getByTestId } = renderSheet();
+
+    expect(
+      getByTestId(
+        PerpsBalanceBottomSheetSelectorsIDs.GEO_BLOCK_BOTTOM_SHEET_TOOLTIP,
+      ),
+    ).toBeOnTheScreen();
+  });
+
+  it('does not render the geo-block tooltip when the eligibility modal is hidden', () => {
+    const { queryByTestId } = renderSheet();
+
+    expect(
+      queryByTestId(
+        PerpsBalanceBottomSheetSelectorsIDs.GEO_BLOCK_BOTTOM_SHEET_TOOLTIP,
+      ),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('hides balance, available, and PnL values when privacy mode is enabled', () => {
+    const { getByTestId, queryByText } = renderSheet({}, true);
+
+    expect(queryByText('$1,234.56')).toBeNull();
+    expect(
+      getByTestId(PerpsBalanceBottomSheetSelectorsIDs.BALANCE_VALUE),
+    ).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/Perps/components/PerpsBalanceBottomSheet/PerpsBalanceBottomSheet.tsx b/app/components/UI/Perps/components/PerpsBalanceBottomSheet/PerpsBalanceBottomSheet.tsx
new file mode 100644
index 000000000000..2febbde481de
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsBalanceBottomSheet/PerpsBalanceBottomSheet.tsx
@@ -0,0 +1,253 @@
+import React, { useCallback, useRef } from 'react';
+import { Modal, View } from 'react-native';
+import { useSelector } from 'react-redux';
+import {
+  BottomSheet,
+  BottomSheetFooter,
+  BottomSheetRef,
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  ButtonIcon,
+  ButtonIconSize,
+  ButtonSize,
+  ButtonsAlignment,
+  FontWeight,
+  IconName,
+  SensitiveText,
+  SensitiveTextLength,
+  Text,
+  TextColor,
+  TextVariant,
+  TitleHub,
+} from '@metamask/design-system-react-native';
+import { PERPS_EVENT_VALUE } from '@metamask/perps-controller';
+import { strings } from '../../../../../../locales/i18n';
+import { selectPrivacyMode } from '../../../../../selectors/preferencesController';
+import { usePerpsLiveAccount } from '../../hooks/stream';
+import { usePerpsHomeActions } from '../../hooks/usePerpsHomeActions';
+import { usePerpsNavigation } from '../../hooks/usePerpsNavigation';
+import {
+  formatPercentage,
+  formatPerpsBalance,
+  formatPnl,
+} from '../../utils/formatUtils';
+import PerpsBottomSheetTooltip from '../PerpsBottomSheetTooltip';
+import { PerpsBalanceBottomSheetSelectorsIDs } from '../../Perps.testIds';
+import { PerpsBalanceBottomSheetProps } from './PerpsBalanceBottomSheet.types';
+
+/**
+ * Perps account balance bottom sheet.
+ *
+ * Shows total balance, available balance, and unrealized P&L, with quick
+ * access to Withdraw / Add funds and Perps activity history. Opened from the
+ * wallet icon in the Pro market header without leaving the market screen.
+ */
+const PerpsBalanceBottomSheet: React.FC<PerpsBalanceBottomSheetProps> = ({
+  isVisible,
+  onClose,
+  testID = PerpsBalanceBottomSheetSelectorsIDs.CONTAINER,
+}) => {
+  const bottomSheetRef = useRef<BottomSheetRef>(null);
+  const privacyMode = useSelector(selectPrivacyMode);
+  const { account: perpsAccount } = usePerpsLiveAccount({ throttleMs: 1000 });
+  const { navigateToActivity } = usePerpsNavigation();
+
+  const {
+    handleAddFunds,
+    handleWithdraw,
+    isEligible,
+    isEligibilityModalVisible,
+    closeEligibilityModal,
+  } = usePerpsHomeActions({
+    buttonLocation: PERPS_EVENT_VALUE.BUTTON_LOCATION.PERP_MARKET_DETAILS,
+  });
+
+  const totalBalance = perpsAccount?.totalBalance || '0';
+  const spendableBalance = perpsAccount?.spendableBalance || '0';
+  const unrealizedPnl = parseFloat(perpsAccount?.unrealizedPnl || '0');
+  const roe = parseFloat(perpsAccount?.returnOnEquity || '0');
+
+  const pnlColor = privacyMode
+    ? TextColor.TextDefault
+    : unrealizedPnl > 0
+      ? TextColor.SuccessDefault
+      : unrealizedPnl < 0
+        ? TextColor.ErrorDefault
+        : TextColor.TextDefault;
+
+  const handleClose = useCallback(() => {
+    bottomSheetRef.current?.onCloseBottomSheet();
+  }, []);
+
+  const handleHistoryPress = useCallback(() => {
+    bottomSheetRef.current?.onCloseBottomSheet(() => {
+      navigateToActivity();
+    });
+  }, [navigateToActivity]);
+
+  // Withdraw always navigates away (to the withdraw screen or into a
+  // confirmation flow), so close the sheet first — same as History above —
+  // instead of leaving it mounted underneath the next screen.
+  const handleWithdrawPress = useCallback(() => {
+    bottomSheetRef.current?.onCloseBottomSheet(() => {
+      handleWithdraw();
+    });
+  }, [handleWithdraw]);
+
+  const handleAddFundsPress = useCallback(() => {
+    if (!isEligible) {
+      // Geo-blocked users never navigate — handleAddFunds only shows the
+      // eligibility tooltip below, in place. That tooltip's visibility is
+      // gated behind `isVisible` (see the early return below), so closing
+      // the sheet first would set `isVisible` to false before the tooltip
+      // ever gets a chance to render.
+      handleAddFunds();
+      return;
+    }
+
+    bottomSheetRef.current?.onCloseBottomSheet(() => {
+      handleAddFunds();
+    });
+  }, [isEligible, handleAddFunds]);
+
+  if (!isVisible) return null;
+
+  return (
+    <>
+      <BottomSheet ref={bottomSheetRef} onClose={onClose} testID={testID}>
+        <Box twClassName="w-full pt-2 pb-3">
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Start}
+            gap={3}
+            twClassName="w-full px-4"
+          >
+            <TitleHub
+              twClassName="flex-1 py-2"
+              title={strings('perps.title')}
+              amount={
+                <SensitiveText
+                  variant={TextVariant.DisplayLg}
+                  color={TextColor.TextDefault}
+                  isHidden={privacyMode}
+                  length={SensitiveTextLength.Medium}
+                  testID={PerpsBalanceBottomSheetSelectorsIDs.BALANCE_VALUE}
+                >
+                  {formatPerpsBalance(totalBalance)}
+                </SensitiveText>
+              }
+              amountWrapperProps={{ twClassName: 'w-full' }}
+              bottomLabel={
+                <Box
+                  flexDirection={BoxFlexDirection.Row}
+                  alignItems={BoxAlignItems.Center}
+                  gap={6}
+                >
+                  <Box>
+                    <Text
+                      variant={TextVariant.BodySm}
+                      color={TextColor.TextAlternative}
+                    >
+                      {strings('perps.balance_bottom_sheet.available')}
+                    </Text>
+                    <SensitiveText
+                      variant={TextVariant.BodySm}
+                      fontWeight={FontWeight.Medium}
+                      color={TextColor.TextDefault}
+                      isHidden={privacyMode}
+                      length={SensitiveTextLength.Short}
+                      testID={
+                        PerpsBalanceBottomSheetSelectorsIDs.AVAILABLE_VALUE
+                      }
+                    >
+                      {formatPerpsBalance(spendableBalance)}
+                    </SensitiveText>
+                  </Box>
+
+                  <Box>
+                    <Text
+                      variant={TextVariant.BodySm}
+                      color={TextColor.TextAlternative}
+                    >
+                      {strings('perps.unrealized_pnl')}
+                    </Text>
+                    <SensitiveText
+                      variant={TextVariant.BodySm}
+                      fontWeight={FontWeight.Medium}
+                      color={pnlColor}
+                      isHidden={privacyMode}
+                      length={SensitiveTextLength.Short}
+                      testID={PerpsBalanceBottomSheetSelectorsIDs.PNL_VALUE}
+                    >
+                      {`${formatPnl(unrealizedPnl)} (${formatPercentage(roe, 1)})`}
+                    </SensitiveText>
+                  </Box>
+                </Box>
+              }
+              bottomLabelWrapperProps={{ twClassName: 'w-full' }}
+            />
+
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+            >
+              <ButtonIcon
+                size={ButtonIconSize.Md}
+                iconName={IconName.Activity}
+                onPress={handleHistoryPress}
+                accessibilityLabel={strings(
+                  'perps.balance_bottom_sheet.history_button',
+                )}
+                testID={PerpsBalanceBottomSheetSelectorsIDs.HISTORY_BUTTON}
+              />
+              <ButtonIcon
+                size={ButtonIconSize.Md}
+                iconName={IconName.Close}
+                onPress={handleClose}
+                accessibilityLabel={strings(
+                  'perps.balance_bottom_sheet.close_button',
+                )}
+                testID={PerpsBalanceBottomSheetSelectorsIDs.CLOSE_BUTTON}
+              />
+            </Box>
+          </Box>
+        </Box>
+
+        <BottomSheetFooter
+          buttonsAlignment={ButtonsAlignment.Horizontal}
+          secondaryButtonProps={{
+            children: strings('perps.withdraw'),
+            onPress: handleWithdrawPress,
+            size: ButtonSize.Lg,
+            testID: PerpsBalanceBottomSheetSelectorsIDs.WITHDRAW_BUTTON,
+          }}
+          primaryButtonProps={{
+            children: strings('perps.add_funds'),
+            onPress: handleAddFundsPress,
+            size: ButtonSize.Lg,
+            testID: PerpsBalanceBottomSheetSelectorsIDs.ADD_FUNDS_BUTTON,
+          }}
+        />
+      </BottomSheet>
+
+      {isEligibilityModalVisible && (
+        // Android Compatibility: Wrap the <Modal> in a plain <View> component to prevent rendering issues and freezing.
+        <View>
+          <Modal visible transparent animationType="none" statusBarTranslucent>
+            <PerpsBottomSheetTooltip
+              isVisible
+              onClose={closeEligibilityModal}
+              contentKey="geo_block"
+              testID={
+                PerpsBalanceBottomSheetSelectorsIDs.GEO_BLOCK_BOTTOM_SHEET_TOOLTIP
+              }
+            />
+          </Modal>
+        </View>
+      )}
+    </>
+  );
+};
+
+export default React.memo(PerpsBalanceBottomSheet);
diff --git a/app/components/UI/Perps/components/PerpsBalanceBottomSheet/PerpsBalanceBottomSheet.types.ts b/app/components/UI/Perps/components/PerpsBalanceBottomSheet/PerpsBalanceBottomSheet.types.ts
new file mode 100644
index 000000000000..27ae51f6dbdf
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsBalanceBottomSheet/PerpsBalanceBottomSheet.types.ts
@@ -0,0 +1,8 @@
+export interface PerpsBalanceBottomSheetProps {
+  /** Whether the bottom sheet is visible. */
+  isVisible: boolean;
+  /** Callback invoked when the sheet is dismissed (swipe, backdrop tap, or close button). */
+  onClose: () => void;
+  /** Optional testID override for the root BottomSheet. */
+  testID?: string;
+}
diff --git a/app/components/UI/Perps/components/PerpsBalanceBottomSheet/index.ts b/app/components/UI/Perps/components/PerpsBalanceBottomSheet/index.ts
new file mode 100644
index 000000000000..98137de9e1b5
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsBalanceBottomSheet/index.ts
@@ -0,0 +1,2 @@
+export { default } from './PerpsBalanceBottomSheet';
+export * from './PerpsBalanceBottomSheet.types';
diff --git a/app/components/UI/Perps/components/PerpsFeesDisplay/PerpsFeesDisplay.styles.ts b/app/components/UI/Perps/components/PerpsFeesDisplay/PerpsFeesDisplay.styles.ts
index 320dd6fcf405..ac1ddbe03d1e 100644
--- a/app/components/UI/Perps/components/PerpsFeesDisplay/PerpsFeesDisplay.styles.ts
+++ b/app/components/UI/Perps/components/PerpsFeesDisplay/PerpsFeesDisplay.styles.ts
@@ -6,7 +6,12 @@ const createStyles = (_colors: Theme['colors']) =>
     feeRowContent: {
       flexDirection: 'row',
       alignItems: 'center',
-      gap: 8,
+      flexShrink: 1,
+      gap: 4,
+    },
+    vipBadgeContainer: {
+      flexShrink: 0,
+      alignSelf: 'center',
     },
   });
 
diff --git a/app/components/UI/Perps/components/PerpsFeesDisplay/PerpsFeesDisplay.tsx b/app/components/UI/Perps/components/PerpsFeesDisplay/PerpsFeesDisplay.tsx
index 03d10ba5f53f..95a868bf9288 100644
--- a/app/components/UI/Perps/components/PerpsFeesDisplay/PerpsFeesDisplay.tsx
+++ b/app/components/UI/Perps/components/PerpsFeesDisplay/PerpsFeesDisplay.tsx
@@ -11,6 +11,7 @@ import {
   Text,
   TextVariant,
   TextColor,
+  FontWeight,
 } from '@metamask/design-system-react-native';
 
 interface PerpsFeesDisplayProps {
@@ -34,6 +35,9 @@ interface PerpsFeesDisplayProps {
   placeholder?: string;
   testID?: string;
   variant?: TextVariant;
+  /** Main fee value color. Defaults to `TextAlternative` for legacy screens. */
+  color?: TextColor;
+  fontWeight?: FontWeight;
 }
 
 const PerpsFeesDisplay: React.FC<PerpsFeesDisplayProps> = ({
@@ -43,6 +47,8 @@ const PerpsFeesDisplay: React.FC<PerpsFeesDisplayProps> = ({
   placeholder = '--',
   testID,
   variant = TextVariant.BodyMd,
+  color = TextColor.TextAlternative,
+  fontWeight,
 }) => {
   const { colors } = useTheme();
   const styles = createStyles(colors);
@@ -71,7 +77,11 @@ const PerpsFeesDisplay: React.FC<PerpsFeesDisplayProps> = ({
 
   return (
     <View style={styles.feeRowContent}>
-      {showVipBadge ? <RewardsVipBadge /> : null}
+      {showVipBadge ? (
+        <View style={styles.vipBadgeContainer}>
+          <RewardsVipBadge />
+        </View>
+      ) : null}
       {originalFeeText !== undefined ? (
         <Text
           variant={variant}
@@ -83,7 +93,12 @@ const PerpsFeesDisplay: React.FC<PerpsFeesDisplayProps> = ({
           {originalFeeText}
         </Text>
       ) : null}
-      <Text variant={variant} color={TextColor.TextAlternative} testID={testID}>
+      <Text
+        variant={variant}
+        color={color}
+        fontWeight={fontWeight}
+        testID={testID}
+      >
         {feeText}
       </Text>
     </View>
diff --git a/app/components/UI/Perps/components/PerpsGTMModal/PerpsGTMModal.test.tsx b/app/components/UI/Perps/components/PerpsGTMModal/PerpsGTMModal.test.tsx
index e3e29f0651fc..b03d91e5c4b3 100644
--- a/app/components/UI/Perps/components/PerpsGTMModal/PerpsGTMModal.test.tsx
+++ b/app/components/UI/Perps/components/PerpsGTMModal/PerpsGTMModal.test.tsx
@@ -8,6 +8,12 @@ import { MetaMetricsEvents } from '../../../../../core/Analytics';
 import { PERPS_GTM_MODAL_SHOWN } from '../../../../../constants/storage';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../../util/test/initial-root-state';
+import { PerpsGTMModalSelectorsIDs } from '../../Perps.testIds';
+import {
+  PERPS_GTM_MODAL_DECLINE,
+  PERPS_GTM_MODAL_ENGAGE,
+  PERPS_GTM_WHATS_NEW_MODAL,
+} from '../../constants/perpsConfig';
 
 jest.mock('../../../../../util/theme', () => {
   const { mockTheme } = jest.requireActual('../../../../../util/theme');
@@ -25,6 +31,14 @@ jest.mock('../../../../../store/storage-wrapper', () => ({
   setItem: jest.fn(),
 }));
 
+jest.mock('../../../../../util/metrics', () => ({
+  __esModule: true,
+  default: jest.fn(() => ({
+    platform: 'ios',
+    deviceModel: 'iPhone 14',
+  })),
+}));
+
 const mockNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
   const actualNav = jest.requireActual('@react-navigation/native');
@@ -38,9 +52,11 @@ jest.mock('@react-navigation/native', () => {
 });
 
 const mockTrackEvent = jest.fn();
+const mockAddProperties = jest.fn().mockReturnThis();
+const mockBuild = jest.fn().mockReturnValue({});
 const mockCreateEventBuilder = jest.fn().mockReturnValue({
-  addProperties: jest.fn().mockReturnThis(),
-  build: jest.fn().mockReturnValue({}),
+  addProperties: mockAddProperties,
+  build: mockBuild,
 });
 jest.mock('../../../../../components/hooks/useAnalytics/useAnalytics');
 
@@ -53,6 +69,12 @@ const initialState = {
 describe('PerpsGTMModal', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockAddProperties.mockReturnThis();
+    mockBuild.mockReturnValue({});
+    mockCreateEventBuilder.mockReturnValue({
+      addProperties: mockAddProperties,
+      build: mockBuild,
+    });
     (StorageWrapper.getItem as jest.Mock).mockResolvedValue('false');
     jest.mocked(useAnalytics).mockReturnValue({
       trackEvent: mockTrackEvent,
@@ -60,7 +82,7 @@ describe('PerpsGTMModal', () => {
     } as unknown as ReturnType<typeof useAnalytics>);
   });
 
-  it('renders correctly with all main elements', async () => {
+  it('renders all main elements', async () => {
     const { getByText, getByTestId } = renderWithProvider(<PerpsGTMModal />, {
       state: initialState,
     });
@@ -70,39 +92,49 @@ describe('PerpsGTMModal', () => {
       expect(getByText('perps.gtm_content.title_description')).toBeTruthy();
       expect(getByText('perps.gtm_content.try_now')).toBeTruthy();
       expect(getByText('perps.gtm_content.not_now')).toBeTruthy();
-      expect(getByTestId('perps-gtm-modal')).toBeTruthy();
+      expect(
+        getByTestId(PerpsGTMModalSelectorsIDs.PERPS_GTM_MODAL),
+      ).toBeTruthy();
     });
   });
 
-  it('handles close button press correctly', async () => {
-    const { getByText } = renderWithProvider(<PerpsGTMModal />, {
+  it('tracks Whats New Link Clicked with decline action when not now is pressed', async () => {
+    const { getByTestId } = renderWithProvider(<PerpsGTMModal />, {
       state: initialState,
     });
 
     await waitFor(() => {
-      const notNowButton = getByText('perps.gtm_content.not_now');
-      fireEvent.press(notNowButton);
+      fireEvent.press(
+        getByTestId(PerpsGTMModalSelectorsIDs.PERPS_NOT_NOW_BUTTON),
+      );
     });
 
     expect(StorageWrapper.setItem).toHaveBeenCalledWith(
       PERPS_GTM_MODAL_SHOWN,
       'true',
     );
-    expect(mockTrackEvent).toHaveBeenCalled();
     expect(mockCreateEventBuilder).toHaveBeenCalledWith(
       MetaMetricsEvents.WHATS_NEW_LINK_CLICKED,
     );
+    expect(mockAddProperties).toHaveBeenCalledWith({
+      platform: 'ios',
+      deviceModel: 'iPhone 14',
+      feature: PERPS_GTM_WHATS_NEW_MODAL,
+      action: PERPS_GTM_MODAL_DECLINE,
+    });
+    expect(mockTrackEvent).toHaveBeenCalled();
     expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
   });
 
-  it('handles try now button press correctly', async () => {
-    const { getByText } = renderWithProvider(<PerpsGTMModal />, {
+  it('tracks Whats New Link Clicked with engage action when try now is pressed', async () => {
+    const { getByTestId } = renderWithProvider(<PerpsGTMModal />, {
       state: initialState,
     });
 
     await waitFor(() => {
-      const tryNowButton = getByText('perps.gtm_content.try_now');
-      fireEvent.press(tryNowButton);
+      fireEvent.press(
+        getByTestId(PerpsGTMModalSelectorsIDs.PERPS_TRY_NOW_BUTTON),
+      );
     });
 
     expect(StorageWrapper.setItem).toHaveBeenCalledWith(
@@ -110,22 +142,30 @@ describe('PerpsGTMModal', () => {
       'true',
       { emitEvent: false },
     );
-    expect(mockTrackEvent).toHaveBeenCalled();
     expect(mockCreateEventBuilder).toHaveBeenCalledWith(
       MetaMetricsEvents.WHATS_NEW_LINK_CLICKED,
     );
+    expect(mockAddProperties).toHaveBeenCalledWith({
+      platform: 'ios',
+      deviceModel: 'iPhone 14',
+      feature: PERPS_GTM_WHATS_NEW_MODAL,
+      action: PERPS_GTM_MODAL_ENGAGE,
+    });
+    expect(mockTrackEvent).toHaveBeenCalled();
     expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.TUTORIAL, {
       isFromGTMModal: true,
     });
   });
 
-  it('renders image correctly', async () => {
+  it('renders image', async () => {
     const { getByTestId } = renderWithProvider(<PerpsGTMModal />, {
       state: initialState,
     });
 
     await waitFor(() => {
-      expect(getByTestId('perps-gtm-modal')).toBeTruthy();
+      expect(
+        getByTestId(PerpsGTMModalSelectorsIDs.PERPS_GTM_MODAL),
+      ).toBeTruthy();
     });
   });
 });
diff --git a/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.styles.ts b/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.styles.ts
index e83f69990048..48215f04a23d 100644
--- a/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.styles.ts
+++ b/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.styles.ts
@@ -1,204 +1,21 @@
-/* eslint-disable react-native/no-color-literals */
-/* eslint-disable @metamask/design-tokens/color-no-hex */
 import { StyleSheet } from 'react-native';
-import { Theme } from '../../../../../util/theme/models';
-import {
-  LEVERAGE_COLORS,
-  LEVERAGE_BACKGROUND_COLORS,
-} from '../../constants/leverageColors';
 
-export const createStyles = (colors: Theme['colors']) =>
+export const createStyles = () =>
   StyleSheet.create({
-    container: {
-      paddingHorizontal: 16,
-      paddingBottom: 16,
+    // Offscreen remount target after a slider gesture — keep StyleSheet for
+    // absoluteFill; Tailwind cannot express this cleanly.
+    sliderIncoming: {
+      ...StyleSheet.absoluteFillObject,
+      opacity: 0,
     },
-    leverageDisplay: {
-      alignItems: 'center',
-      paddingTop: 16,
-      paddingBottom: 24,
-      marginHorizontal: 12,
-    },
-    leverageText: {
-      fontSize: 48,
-      fontWeight: '600',
-      lineHeight: 56,
-    },
-    leverageTextSafe: {
-      color: LEVERAGE_COLORS.SAFE, // Green - safe leverage
-    },
-    leverageTextCaution: {
-      color: LEVERAGE_COLORS.CAUTION, // Yellow - moderate leverage
-    },
-    leverageTextLow: {
-      color: colors.text.default,
-    },
-    leverageTextMedium: {
-      color: LEVERAGE_COLORS.MEDIUM, // Orange - high leverage
-    },
-    leverageTextHigh: {
-      color: colors.error.default, // Red - dangerous leverage
-    },
-    warningContainer: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      padding: 12,
-      borderRadius: 8,
-      marginBottom: 24,
-      marginHorizontal: 12,
-      // Fixed min-height to accommodate two lines of BodySM text (~18px line
-      // height × 2 lines + 24px vertical padding). Prevents layout shift when
-      // the warning text wraps between one and two lines as the percentage
-      // value changes (e.g. "9.0%" → "10.0%").
-      minHeight: 60,
-    },
-    warningContainerSafe: {
-      backgroundColor: LEVERAGE_BACKGROUND_COLORS.SAFE, // Green background
-    },
-    warningContainerCaution: {
-      backgroundColor: LEVERAGE_BACKGROUND_COLORS.CAUTION, // Yellow background
-    },
-    warningContainerMedium: {
-      backgroundColor: LEVERAGE_BACKGROUND_COLORS.MEDIUM, // Orange background
-    },
-    warningContainerHigh: {
-      backgroundColor: LEVERAGE_BACKGROUND_COLORS.HIGH, // Red background
-    },
-    warningIcon: {
-      marginRight: 8,
-      flexShrink: 0,
-    },
-    warningTextContainer: {
-      flex: 1,
-      minWidth: 0,
-      flexDirection: 'row',
-      alignItems: 'center',
-    },
-    warningText: {
-      flex: 1,
-      flexWrap: 'wrap',
-      flexShrink: 1,
-      minWidth: 0,
-    },
-    warningTextSafe: {
-      color: LEVERAGE_COLORS.SAFE, // Green - matches gradient start
-    },
-    warningTextCaution: {
-      color: LEVERAGE_COLORS.CAUTION, // Yellow - matches gradient middle
-    },
-    warningTextLow: {
-      color: colors.text.alternative,
-    },
-    warningTextMedium: {
-      color: LEVERAGE_COLORS.MEDIUM, // Orange - matches gradient
-    },
-    warningTextHigh: {
-      color: colors.error.default, // Red - matches gradient end
+    helpTextContainer: {
+      // Reserve space for up to two lines of HelpText so skeleton ↔ text
+      // swaps (and wrap changes as the % updates) don't shift content below.
+      minHeight: 40,
     },
     priceInfoContainer: {
-      borderRadius: 8,
-      marginBottom: 32,
-      marginHorizontal: 12,
       // Reserve vertical space whether price data is available or not,
       // preventing a layout jump when switching between the two states.
-      minHeight: 100,
-      justifyContent: 'center',
-    },
-    priceRow: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-      paddingVertical: 8,
-    },
-    priceValueContainer: {
-      flexDirection: 'row',
-      alignItems: 'center',
-    },
-    priceIcon: {
-      marginRight: 4,
-    },
-    sliderContainer: {
-      marginBottom: 16,
-      marginHorizontal: 12,
-    },
-    sliderLabels: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      marginTop: 8,
-    },
-    quickSelectButtons: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      marginTop: 24,
-      marginBottom: 16,
-    },
-    quickSelectButton: {
-      flex: 1,
-      marginHorizontal: 4,
-      paddingVertical: 12,
-      alignItems: 'center',
-      backgroundColor: colors.background.section,
-      borderRadius: 8,
-      borderWidth: 1,
-      borderColor: colors.border.muted,
-    },
-    quickSelectButtonActive: {
-      backgroundColor: colors.icon.default,
-      borderColor: colors.icon.default,
-    },
-    quickSelectText: {
-      fontWeight: '500',
-    },
-    leverageSliderContainer: {
-      paddingVertical: 8,
-    },
-    leverageTrack: {
-      height: 8,
-      backgroundColor: colors.border.muted,
-      borderRadius: 20,
-      position: 'relative',
-    },
-    leverageThumb: {
-      width: 32,
-      height: 32,
-      backgroundColor: colors.icon.alternative,
-      borderRadius: 16,
-      position: 'absolute',
-      top: -13,
-      left: -16,
-      elevation: 4,
-      borderWidth: 4,
-      borderColor: colors.icon.default,
-    },
-    leverageGradient: {
-      flex: 1,
-      borderRadius: 3,
-    },
-    progressContainer: {
-      height: 8,
-      borderRadius: 20,
-      overflow: 'hidden',
-      position: 'absolute',
-      left: 0,
-      top: 0,
-    },
-    gradientStyle: {
-      height: 8,
-      borderRadius: 3,
-    },
-    emptyPriceInfo: {
-      textAlign: 'center',
-      paddingVertical: 16,
-    },
-    tickMark: {
-      position: 'absolute',
-      width: 4,
-      height: 4,
-      backgroundColor: colors.border.muted,
-      borderRadius: 2,
-      top: 2,
-    },
-    footerButtonContainer: {
-      marginBottom: 16,
+      minHeight: 80,
     },
   });
diff --git a/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.test.tsx b/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.test.tsx
index b0f6fc08b700..631ad5bff645 100644
--- a/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.test.tsx
+++ b/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.test.tsx
@@ -1,57 +1,32 @@
-import { fireEvent, render, screen } from '@testing-library/react-native';
+import { act, fireEvent, render, screen } from '@testing-library/react-native';
 import React from 'react';
-import { fireGestureHandler } from 'react-native-gesture-handler/jest-utils';
+import { PerpsLeverageBottomSheetSelectorsIDs } from '../../Perps.testIds';
 import PerpsLeverageBottomSheet from './PerpsLeverageBottomSheet';
-// Mock dependencies - only what's absolutely necessary
-jest.mock('react-native-gesture-handler', () => ({
-  GestureHandlerRootView: 'View',
-  GestureDetector: 'View',
-  Gesture: {
-    Pan: jest.fn().mockReturnValue({
-      onBegin: jest.fn().mockReturnThis(),
-      onUpdate: jest.fn().mockReturnThis(),
-      onEnd: jest.fn().mockReturnThis(),
-      onFinalize: jest.fn().mockReturnThis(),
-      withSpring: jest.fn().mockReturnThis(),
-      runOnJS: jest.fn().mockReturnThis(),
-    }),
-    Tap: jest.fn().mockReturnValue({
-      onEnd: jest.fn().mockReturnThis(),
-    }),
-    LongPress: jest.fn().mockReturnValue({
-      onEnd: jest.fn().mockReturnThis(),
-    }),
-    Simultaneous: jest.fn(),
-  },
-}));
 
-jest.mock('react-native-linear-gradient', () => 'LinearGradient');
+const flushSliderPromoteFrames = async () => {
+  await act(async () => {
+    await new Promise<void>((resolve) => {
+      requestAnimationFrame(() => {
+        requestAnimationFrame(() => resolve());
+      });
+    });
+  });
+};
 
-// Mock MMDS Skeleton so loading states are queryable by a stable testID
-jest.mock('../../../../../component-library/components-temp/Skeleton', () => {
-  const { View } = jest.requireActual('react-native');
-  return {
-    Skeleton: (props: { width?: number | string; height?: number }) => (
-      <View testID="skeleton-placeholder" {...props} />
-    ),
-  };
-});
+jest.mock('react-native-reanimated', () =>
+  jest.requireActual('react-native-reanimated/mock'),
+);
 
-// Mock safe area context (required for BottomSheet)
-// Mock theme
-const mockUseTheme = jest.fn();
-jest.mock('../../../../../util/theme', () => {
-  const { mockTheme } = jest.requireActual('../../../../../util/theme');
+jest.mock('@metamask/design-system-twrnc-preset', () => {
+  const actual = jest.requireActual('@metamask/design-system-twrnc-preset');
+  const tw = (..._args: unknown[]) => ({});
+  tw.style = jest.fn(() => ({}));
   return {
-    useTheme: mockUseTheme,
-    mockTheme,
+    ...actual,
+    useTailwind: () => tw,
   };
 });
-const { mockTheme: baseMockTheme } = jest.requireActual(
-  '../../../../../util/theme',
-);
 
-// Mock strings
 jest.mock('../../../../../../locales/i18n', () => ({
   strings: jest.fn((key: string, params?: Record<string, unknown>) => {
     if (key === 'perps.order.leverage_modal.set_leverage' && params?.leverage) {
@@ -77,26 +52,21 @@ jest.mock('../../../../../../locales/i18n', () => ({
   }),
 }));
 
-// Mock DevLogger
 jest.mock('../../../../../core/SDKConnect/utils/DevLogger', () => ({
   DevLogger: {
     log: jest.fn(),
   },
 }));
 
-// Mock usePerpsLiquidationPrice hook
-jest.mock('../../hooks/usePerpsLiquidationPrice', () => ({
-  usePerpsLiquidationPrice: jest.fn((params) => {
-    // Simple calculation for testing
+const mockUsePerpsLiquidationPrice = jest.fn(
+  (params: { entryPrice: number; leverage: number; direction: string }) => {
     const { entryPrice, leverage, direction } = params;
     let liquidationPrice = '0.00';
 
     if (entryPrice > 0 && leverage > 0) {
       if (direction === 'long') {
-        // For long: liquidation = entry * (1 - 1/leverage)
         liquidationPrice = (entryPrice * (1 - 1 / leverage)).toFixed(2);
       } else {
-        // For short: liquidation = entry * (1 + 1/leverage)
         liquidationPrice = (entryPrice * (1 + 1 / leverage)).toFixed(2);
       }
     }
@@ -106,10 +76,17 @@ jest.mock('../../hooks/usePerpsLiquidationPrice', () => ({
       isCalculating: false,
       error: null,
     };
-  }),
+  },
+);
+
+jest.mock('../../hooks/usePerpsLiquidationPrice', () => ({
+  usePerpsLiquidationPrice: (params: {
+    entryPrice: number;
+    leverage: number;
+    direction: string;
+  }) => mockUsePerpsLiquidationPrice(params),
 }));
 
-// Mock usePerpsEventTracking hook
 jest.mock('../../hooks/usePerpsEventTracking', () => ({
   usePerpsEventTracking: jest.fn(() => ({
     track: jest.fn(),
@@ -118,152 +95,23 @@ jest.mock('../../hooks/usePerpsEventTracking', () => ({
 
 jest.mock('../../../../../util/haptics');
 
-// Mock usePerpsLivePrices hook (which uses usePerpsStream internally)
 const mockUsePerpsLivePrices = jest.fn();
 jest.mock('../../hooks', () => ({
   usePerpsLivePrices: (options: { symbols: string[] }) =>
     mockUsePerpsLivePrices(options),
 }));
 
-// usePerpsScreenTracking removed - migrated to usePerpsMeasurement
-
-// Mock BottomSheet components from component library
-jest.mock(
-  '../../../../../component-library/components/BottomSheets/BottomSheet',
-  () => {
-    const { View } = jest.requireActual('react-native');
-    const { forwardRef, useImperativeHandle } = jest.requireActual('react');
-    const MockBottomSheet = forwardRef(
-      (props: { children: React.ReactNode }, ref: React.Ref<unknown>) => {
-        useImperativeHandle(ref, () => ({
-          onOpenBottomSheet: jest.fn(),
-          onCloseBottomSheet: jest.fn(),
-        }));
-
-        return <View {...props}>{props.children}</View>;
-      },
-    );
-
-    return {
-      __esModule: true,
-      default: MockBottomSheet,
-    };
-  },
-);
-
-jest.mock(
-  '../../../../../component-library/components/BottomSheets/BottomSheetHeader',
-  () => {
-    const { View } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: (props: { children: React.ReactNode }) => (
-        <View {...props}>{props.children}</View>
-      ),
-    };
-  },
-);
-
-jest.mock(
-  '../../../../../component-library/components/BottomSheets/BottomSheetFooter',
-  () => {
-    const { View, TouchableOpacity, Text } = jest.requireActual('react-native');
-
-    return {
-      __esModule: true,
-      default: ({
-        buttonPropsArray,
-      }: {
-        buttonPropsArray?: {
-          label: string;
-          onPress: () => void;
-          disabled?: boolean;
-        }[];
-      }) => (
-        <View>
-          {buttonPropsArray?.map((buttonProps, index) => (
-            <TouchableOpacity
-              key={index}
-              onPress={buttonProps.onPress}
-              disabled={buttonProps.disabled}
-              accessibilityState={{ disabled: buttonProps.disabled === true }}
-            >
-              <Text>{buttonProps.label}</Text>
-            </TouchableOpacity>
-          ))}
-        </View>
-      ),
-    };
-  },
-);
-
-// Mock component library Text component
-// Mock Icon component
-jest.mock('../../../../../component-library/components/Icons/Icon', () => {
-  const { View } = jest.requireActual('react-native');
+// Mock only Slider — gesture/reanimated pan is unusable in Jest.
+// Keep real MMDS (BottomSheet, Button, HelpText, KeyValueRow, etc.) so
+// testIDs pass through without stubbing those components.
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
   return {
-    __esModule: true,
-    default: (props: { name: string; size: string; color: string }) => (
-      <View testID={`icon-${props.name}`} />
-    ),
-    IconName: {
-      Danger: 'Danger',
-    },
-    IconSize: {
-      Sm: 'Sm',
-    },
-    IconColor: {
-      Warning: 'Warning',
-      Error: 'Error',
-    },
+    ...actual,
+    Slider: 'Slider',
   };
 });
 
-// Mock Button enums
-jest.mock('../../../../../component-library/components/Buttons/Button', () => ({
-  ButtonSize: {
-    Lg: 'Lg',
-  },
-  ButtonVariants: {
-    Primary: 'Primary',
-  },
-}));
-
-// Mock styles
-jest.mock('./PerpsLeverageBottomSheet.styles', () => ({
-  createStyles: () => ({
-    container: { padding: 16 },
-    leverageDisplay: { alignItems: 'center' },
-    leverageText: { fontSize: 48 },
-    leverageTextLow: { color: 'green' },
-    leverageTextMedium: { color: 'orange' },
-    leverageTextHigh: { color: 'red' },
-    warningContainer: { flexDirection: 'row' },
-    warningIcon: { marginRight: 8 },
-    warningTextLow: { color: 'green' },
-    warningTextMedium: { color: 'orange' },
-    warningTextHigh: { color: 'red' },
-    priceInfoContainer: { marginVertical: 16 },
-    priceRow: { flexDirection: 'row', justifyContent: 'space-between' },
-    emptyPriceInfo: { textAlign: 'center' },
-    sliderContainer: { marginVertical: 24 },
-    leverageSliderContainer: { height: 40 },
-    leverageTrack: { height: 8, backgroundColor: 'rgb(224, 224, 224)' },
-    progressContainer: { height: '100%', overflow: 'hidden' },
-    gradientStyle: { height: '100%' },
-    tickMark: { position: 'absolute', height: 12, width: 2 },
-    leverageThumb: { position: 'absolute', width: 20, height: 20 },
-    sliderLabels: { flexDirection: 'row', justifyContent: 'space-between' },
-    quickSelectButtons: {
-      flexDirection: 'row',
-      justifyContent: 'space-around',
-    },
-    quickSelectButton: { padding: 8, borderRadius: 4 },
-    quickSelectButtonActive: { backgroundColor: 'blue' },
-    quickSelectText: { fontSize: 16 },
-  }),
-}));
-
 describe('PerpsLeverageBottomSheet', () => {
   const defaultProps = {
     isVisible: true,
@@ -279,234 +127,149 @@ describe('PerpsLeverageBottomSheet', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
-    mockUseTheme.mockReturnValue(baseMockTheme);
-    // Default mock for usePerpsLivePrices - returns price of 3000
     mockUsePerpsLivePrices.mockReturnValue({
       'BTC-USD': { price: '3000' },
     });
+    mockUsePerpsLiquidationPrice.mockImplementation(
+      (params: { entryPrice: number; leverage: number; direction: string }) => {
+        const { entryPrice, leverage, direction } = params;
+        let liquidationPrice = '0.00';
+
+        if (entryPrice > 0 && leverage > 0) {
+          if (direction === 'long') {
+            liquidationPrice = (entryPrice * (1 - 1 / leverage)).toFixed(2);
+          } else {
+            liquidationPrice = (entryPrice * (1 + 1 / leverage)).toFixed(2);
+          }
+        }
+
+        return {
+          liquidationPrice,
+          isCalculating: false,
+          error: null,
+        };
+      },
+    );
   });
 
   describe('Component Rendering', () => {
     it('renders when visible', () => {
-      // Act
       render(<PerpsLeverageBottomSheet {...defaultProps} />);
 
-      // Assert
       expect(
         screen.getByText('perps.order.leverage_modal.title'),
       ).toBeOnTheScreen();
-      expect(screen.getByText('Set 5x')).toBeOnTheScreen(); // Confirm button
+      expect(screen.getByText('Set 5x')).toBeOnTheScreen();
     });
 
     it('returns null when not visible', () => {
-      // Act
-      render(<PerpsLeverageBottomSheet {...defaultProps} isVisible={false} />);
+      const { toJSON } = render(
+        <PerpsLeverageBottomSheet {...defaultProps} isVisible={false} />,
+      );
 
-      // Assert
-      expect(screen.queryByText('perps.order.leverage_modal.title')).toBeNull();
-      expect(screen.queryByText('5x')).toBeNull();
+      expect(toJSON()).toBeNull();
     });
 
     it('displays current leverage value', () => {
-      // Arrange
-      const props = { ...defaultProps, leverage: 10 };
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...props} />);
+      render(<PerpsLeverageBottomSheet {...defaultProps} leverage={10} />);
 
-      // Assert
+      expect(screen.getAllByText('10x').length).toBeGreaterThan(0);
       expect(screen.getByText('Set 10x')).toBeOnTheScreen();
     });
   });
 
   describe('Liquidation Calculations', () => {
     it('calculates liquidation percentage correctly for short position', () => {
-      // Arrange
-      const shortProps = {
-        ...defaultProps,
-        direction: 'short' as const,
-        currentPrice: 3000,
-        // With leverage 5 and short, liquidation will be at 3000 * (1 + 1/5) = 3600
-      };
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...shortProps} />);
-
-      // Assert
-      expect(screen.getByText(/20\.0%/)).toBeOnTheScreen(); // Warning text (3600-3000)/3000 = 20%
-      expect(screen.getByText(/rises/)).toBeOnTheScreen(); // Direction text for short
+      render(<PerpsLeverageBottomSheet {...defaultProps} direction="short" />);
+
+      expect(
+        screen.getByText(/You will be liquidated if price rises by/),
+      ).toBeOnTheScreen();
     });
 
     it('handles zero prices gracefully', () => {
-      // Arrange - Mock usePerpsLivePrices to return zero price
       mockUsePerpsLivePrices.mockReturnValue({
         'BTC-USD': { price: '0' },
       });
 
-      // Act
       render(<PerpsLeverageBottomSheet {...defaultProps} />);
 
-      // Assert - Should not crash and show 0.0%
-      expect(screen.getByText(/0\.0%/)).toBeOnTheScreen();
+      expect(
+        screen.getByText('Price information unavailable'),
+      ).toBeOnTheScreen();
     });
 
     it('shows 100% liquidation distance for 1x leverage special case', () => {
-      // Arrange
-      const props1x = {
-        ...defaultProps,
-        leverage: 1,
-        minLeverage: 1,
-        maxLeverage: 20,
-        currentPrice: 3000,
-      };
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...props1x} />);
-
-      // Assert - 1x leverage should show 100% liquidation distance
-      expect(screen.getByText(/100\.0%/)).toBeOnTheScreen();
+      render(<PerpsLeverageBottomSheet {...defaultProps} leverage={1} />);
+
+      expect(
+        screen.getByText('You will be liquidated if price drops by 100.0%'),
+      ).toBeOnTheScreen();
     });
 
     it('caps actual liquidation percentage at 100% for very high values', () => {
-      // Arrange - Mock hook to return liquidation price very far from current price (>99.9%)
-      const mockUsePerpsLiquidationPrice = jest.requireMock(
-        '../../hooks/usePerpsLiquidationPrice',
-      );
-      mockUsePerpsLiquidationPrice.usePerpsLiquidationPrice.mockReturnValueOnce(
-        {
-          liquidationPrice: '1.00', // Very far from current price of 3000, gives (3000-1)/3000 = 99.97% > 99.9%
-          isCalculating: false,
-          error: null,
-        },
-      );
-
-      const props = {
-        ...defaultProps,
-        leverage: 1000,
-        currentPrice: 3000,
-      };
+      mockUsePerpsLivePrices.mockReturnValue({
+        'BTC-USD': { price: '100' },
+      });
+      mockUsePerpsLiquidationPrice.mockReturnValue({
+        liquidationPrice: '0.01',
+        isCalculating: false,
+        error: null,
+      });
 
-      // Act
-      render(<PerpsLeverageBottomSheet {...props} />);
+      render(<PerpsLeverageBottomSheet {...defaultProps} leverage={5} />);
 
-      // Assert - Should cap at 100.0% even for actual liquidation price
-      expect(screen.getByText(/100\.0%/)).toBeOnTheScreen();
+      expect(
+        screen.getByText('You will be liquidated if price drops by 100.0%'),
+      ).toBeOnTheScreen();
     });
 
     it('uses limit price for liquidation calculation when orderType is limit', () => {
-      // Arrange
-      const limitPrice = '2800';
-      const currentPrice = 3000;
-      const mockUsePerpsLiquidationPrice = jest.requireMock(
-        '../../hooks/usePerpsLiquidationPrice',
+      render(
+        <PerpsLeverageBottomSheet
+          {...defaultProps}
+          orderType="limit"
+          limitPrice="2500"
+        />,
       );
 
-      const propsWithLimitOrder = {
-        ...defaultProps,
-        currentPrice,
-        limitPrice,
-        orderType: 'limit' as const,
-      };
-
-      // Mock the liquidation price hook to track what entry price it receives
-      mockUsePerpsLiquidationPrice.usePerpsLiquidationPrice = jest.fn(() => ({
-        liquidationPrice: '2520.00', // Mock calculated based on limit price
-        isCalculating: false,
-        error: null,
-      }));
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...propsWithLimitOrder} />);
-
-      // Assert - Hook should be called with limit price as entry price
-      expect(
-        mockUsePerpsLiquidationPrice.usePerpsLiquidationPrice,
-      ).toHaveBeenCalledWith(
+      expect(mockUsePerpsLiquidationPrice).toHaveBeenCalledWith(
         expect.objectContaining({
-          entryPrice: parseFloat(limitPrice), // Should use limit price, not current price
-          leverage: defaultProps.leverage,
-          direction: defaultProps.direction,
-          asset: defaultProps.asset,
+          entryPrice: 2500,
         }),
-        expect.objectContaining({ debounceMs: 500 }),
       );
     });
 
     it('uses current price for liquidation calculation when orderType is market', () => {
-      // Arrange
-      const limitPrice = '2800';
-      const currentPrice = 3000;
-      const mockUsePerpsLiquidationPrice = jest.requireMock(
-        '../../hooks/usePerpsLiquidationPrice',
-      );
-
-      const propsWithMarketOrder = {
-        ...defaultProps,
-        currentPrice,
-        limitPrice, // Even if limit price is provided
-        orderType: 'market' as const,
-      };
-
-      // Mock the liquidation price hook to track what entry price it receives
-      mockUsePerpsLiquidationPrice.usePerpsLiquidationPrice = jest.fn(() => ({
-        liquidationPrice: '2700.00', // Mock calculated based on current price
-        isCalculating: false,
-        error: null,
-      }));
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...propsWithMarketOrder} />);
+      render(<PerpsLeverageBottomSheet {...defaultProps} orderType="market" />);
 
-      // Assert - Hook should be called with current price as entry price
-      expect(
-        mockUsePerpsLiquidationPrice.usePerpsLiquidationPrice,
-      ).toHaveBeenCalledWith(
+      expect(mockUsePerpsLiquidationPrice).toHaveBeenCalledWith(
         expect.objectContaining({
-          entryPrice: currentPrice, // Should use current price, not limit price
-          leverage: defaultProps.leverage,
-          direction: defaultProps.direction,
-          asset: defaultProps.asset,
+          entryPrice: 3000,
         }),
-        expect.objectContaining({ debounceMs: 500 }),
       );
     });
 
     it('formats liquidation price with PRICE_RANGES_UNIVERSAL', () => {
-      // Arrange - Mock hook to return liquidation price with many decimal places
-      const mockUsePerpsLiquidationPrice = jest.requireMock(
-        '../../hooks/usePerpsLiquidationPrice',
-      );
-      mockUsePerpsLiquidationPrice.usePerpsLiquidationPrice.mockReturnValueOnce(
-        {
-          liquidationPrice: '1234.3552435', // Price above 1 with many decimals
-          isCalculating: false,
-          error: null,
-        },
-      );
-
-      const props = {
-        ...defaultProps,
-        leverage: 5,
-        currentPrice: 3000,
-      };
+      mockUsePerpsLiquidationPrice.mockReturnValue({
+        liquidationPrice: '1234.3552435',
+        isCalculating: false,
+        error: null,
+      });
 
-      // Act
-      render(<PerpsLeverageBottomSheet {...props} />);
+      render(<PerpsLeverageBottomSheet {...defaultProps} leverage={5} />);
 
-      // Assert - Should display formatted price with 5 sig figs, max 1 decimal for $1k-$10k range
+      // $1k–$10k: 5 sig figs, max 1 decimal via PRICE_RANGES_UNIVERSAL
       expect(screen.getByText('$1,234.4')).toBeOnTheScreen();
     });
   });
 
   describe('Price Information Display', () => {
     it('displays unavailable message when currentPrice is missing', () => {
-      // Arrange - Mock usePerpsLivePrices to return no price
       mockUsePerpsLivePrices.mockReturnValue({});
 
-      // Act
       render(<PerpsLeverageBottomSheet {...defaultProps} />);
 
-      // Assert
       expect(
         screen.getByText('Price information unavailable'),
       ).toBeOnTheScreen();
@@ -515,22 +278,18 @@ describe('PerpsLeverageBottomSheet', () => {
 
   describe('Quick Select Buttons', () => {
     it('filters quick select buttons for lower maxLeverage', () => {
-      // Arrange - maxLeverage: 10, should show [2, 5, 10]
       const props = { ...defaultProps, maxLeverage: 10 };
 
-      // Act
       render(<PerpsLeverageBottomSheet {...props} />);
 
-      // Assert
       expect(screen.getByText('2x')).toBeOnTheScreen();
-      expect(screen.queryByText('20x')).toBeNull(); // Should not show 20x in quick select
-      expect(screen.queryByText('40x')).toBeNull(); // Should not show 40x
+      expect(screen.queryByText('20x')).toBeNull();
+      expect(screen.queryByText('40x')).toBeNull();
     });
 
     it('updates leverage when quick select button is pressed', () => {
-      // Arrange
       const mockOnConfirm = jest.fn();
-      render(
+      const { getByTestId } = render(
         <PerpsLeverageBottomSheet
           {...defaultProps}
           leverage={5}
@@ -538,28 +297,149 @@ describe('PerpsLeverageBottomSheet', () => {
         />,
       );
 
-      // Act - Press 10x button (multiple instances exist, get quick select button)
-      const buttons10x = screen.getAllByText('10x');
-      const quickSelectButton = buttons10x[0]; // First one is quick select button
-      fireEvent.press(quickSelectButton);
+      fireEvent.press(
+        screen.getByTestId(
+          `${PerpsLeverageBottomSheetSelectorsIDs.QUICK_SELECT}-10`,
+        ),
+      );
+
+      expect(
+        getByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER).props.value,
+      ).toBe(10);
+      expect(screen.getByText('Set 10x')).toBeOnTheScreen();
+
+      fireEvent.press(screen.getByText(/Set \d+x/));
+
+      expect(mockOnConfirm).toHaveBeenCalledWith(10, 'preset');
+    });
+
+    it('syncs slider value to preset after a prior slider drag', async () => {
+      const { getByTestId } = render(
+        <PerpsLeverageBottomSheet {...defaultProps} leverage={5} />,
+      );
+
+      const slider = () =>
+        getByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER);
+
+      fireEvent(slider(), 'valueChange', 10);
+      fireEvent(slider(), 'valueChange', 20);
+      fireEvent(slider(), 'valueChange', 8);
+      fireEvent(slider(), 'dragEnd', 15);
+
+      fireEvent.press(
+        screen.getByTestId(
+          `${PerpsLeverageBottomSheetSelectorsIDs.QUICK_SELECT}-10`,
+        ),
+      );
+      // Incoming slider lays out offscreen, then is promoted in place.
+      fireEvent(
+        getByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER_INCOMING_WRAP),
+        'layout',
+      );
+      await flushSliderPromoteFrames();
+
+      expect(slider().props.value).toBe(10);
+      expect(screen.getByText('Set 10x')).toBeOnTheScreen();
+
+      // Subsequent chips after remount should update without another remount
+      fireEvent.press(
+        screen.getByTestId(
+          `${PerpsLeverageBottomSheetSelectorsIDs.QUICK_SELECT}-20`,
+        ),
+      );
+
+      expect(slider().props.value).toBe(20);
+      expect(screen.getByText('Set 20x')).toBeOnTheScreen();
+    });
+
+    it('keeps the latest chip value when pressed during slider remount promote', async () => {
+      const { getByTestId, queryByTestId } = render(
+        <PerpsLeverageBottomSheet {...defaultProps} leverage={5} />,
+      );
 
-      // Wait for state update, then confirm
-      const confirmButton = screen.getByText(/Set \d+x/);
-      fireEvent.press(confirmButton);
+      const slider = () =>
+        getByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER);
 
-      // Assert - onConfirm is called with the leverage value
-      expect(mockOnConfirm).toHaveBeenCalled();
+      fireEvent(slider(), 'valueChange', 8);
+      fireEvent(slider(), 'dragEnd', 8);
+
+      fireEvent.press(
+        screen.getByTestId(
+          `${PerpsLeverageBottomSheetSelectorsIDs.QUICK_SELECT}-10`,
+        ),
+      );
+      fireEvent(
+        getByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER_INCOMING_WRAP),
+        'layout',
+      );
+
+      // Second chip during the promote window — must not let the first
+      // incoming value win after promotion.
+      fireEvent.press(
+        screen.getByTestId(
+          `${PerpsLeverageBottomSheetSelectorsIDs.QUICK_SELECT}-20`,
+        ),
+      );
+      fireEvent(
+        getByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER_INCOMING_WRAP),
+        'layout',
+      );
+      await flushSliderPromoteFrames();
+
+      expect(
+        queryByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER_INCOMING),
+      ).toBeNull();
+      expect(slider().props.value).toBe(20);
+      expect(screen.getByText('Set 20x')).toBeOnTheScreen();
+    });
+
+    it('ignores late slider drag during preset remount so confirm matches chip', async () => {
+      const mockOnConfirm = jest.fn();
+      const { getByTestId } = render(
+        <PerpsLeverageBottomSheet
+          {...defaultProps}
+          leverage={5}
+          onConfirm={mockOnConfirm}
+        />,
+      );
+
+      const slider = () =>
+        getByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER);
+
+      fireEvent(slider(), 'valueChange', 8);
+      fireEvent(slider(), 'dragEnd', 8);
+
+      fireEvent.press(
+        screen.getByTestId(
+          `${PerpsLeverageBottomSheetSelectorsIDs.QUICK_SELECT}-10`,
+        ),
+      );
+
+      // Late events from the outgoing active slider in the remount window
+      // must not overwrite the chip's committed leverage.
+      fireEvent(slider(), 'valueChange', 15);
+      fireEvent(slider(), 'dragEnd', 15);
+
+      fireEvent(
+        getByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER_INCOMING_WRAP),
+        'layout',
+      );
+      await flushSliderPromoteFrames();
+
+      expect(slider().props.value).toBe(10);
+      expect(screen.getByText('Set 10x')).toBeOnTheScreen();
+
+      fireEvent.press(screen.getByText(/Set \d+x/));
+
+      expect(mockOnConfirm).toHaveBeenCalledWith(10, 'preset');
     });
 
     it('shows all available quick select options for maxLeverage 40', () => {
-      // Arrange
       const props = { ...defaultProps, maxLeverage: 40 };
 
-      // Act
       render(<PerpsLeverageBottomSheet {...props} />);
 
-      // Assert - Should show all options: 2, 5, 10, 20, 40
-      expect(screen.getByText('2x')).toBeOnTheScreen();
+      expect(screen.getAllByText('2x').length).toBeGreaterThan(0);
       expect(screen.getAllByText('5x').length).toBeGreaterThan(0);
       expect(screen.getAllByText('10x').length).toBeGreaterThan(0);
       expect(screen.getAllByText('20x').length).toBeGreaterThan(0);
@@ -567,126 +447,150 @@ describe('PerpsLeverageBottomSheet', () => {
     });
 
     it('shows both 2x and 3x buttons when maxLeverage is 3', () => {
-      // Arrange - maxLeverage: 3, should show [2, 3] to give users more choice
       const props = { ...defaultProps, maxLeverage: 3, leverage: 2 };
 
-      // Act
       render(<PerpsLeverageBottomSheet {...props} />);
 
-      // Assert - Both buttons should be present (text appears in slider labels too)
-      const twoXElements = screen.getAllByText('2x');
-      const threeXElements = screen.getAllByText('3x');
-      expect(twoXElements.length).toBeGreaterThan(0);
-      expect(threeXElements.length).toBeGreaterThan(0);
-      // 5x should not appear in slider labels or buttons (initial leverage is now 2x)
-      expect(screen.queryByText('5x')).toBeNull();
+      expect(screen.getAllByText('2x').length).toBeGreaterThan(0);
+      expect(screen.getAllByText('3x').length).toBeGreaterThan(0);
     });
 
     it('keeps displaying values when pressing already active quick select button', () => {
-      // Arrange
       render(<PerpsLeverageBottomSheet {...defaultProps} leverage={5} />);
 
-      // Act - Press the currently active 5x button
-      const buttons5x = screen.getAllByText('5x');
-      fireEvent.press(buttons5x[0]);
+      fireEvent.press(
+        screen.getByTestId(
+          `${PerpsLeverageBottomSheetSelectorsIDs.QUICK_SELECT}-5`,
+        ),
+      );
 
-      // Assert - Component continues to render with values (no skeleton blink)
       expect(screen.getByText('Set 5x')).toBeOnTheScreen();
     });
   });
 
-  describe('Leverage Risk Styling', () => {
-    it('displays low risk styling for low leverage', () => {
-      // Arrange - leverage 2 with maxLeverage 20 = 5% = low risk
-      const props = { ...defaultProps, leverage: 2, maxLeverage: 20 };
+  describe('Leverage Display', () => {
+    it('displays low leverage value', () => {
+      render(<PerpsLeverageBottomSheet {...defaultProps} leverage={2} />);
 
-      // Act
-      render(<PerpsLeverageBottomSheet {...props} />);
-
-      // Assert - Component should render without crashes (styling is applied)
+      expect(screen.getAllByText('2x').length).toBeGreaterThan(0);
       expect(screen.getByText('Set 2x')).toBeOnTheScreen();
     });
 
-    it('displays safe risk styling for very low leverage', () => {
-      // Arrange - leverage 1 with maxLeverage 20 = 0% = safe risk
-      const props = { ...defaultProps, leverage: 1, maxLeverage: 20 };
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...props} />);
+    it('displays minimum leverage value', () => {
+      render(<PerpsLeverageBottomSheet {...defaultProps} leverage={1} />);
 
-      // Assert - Component renders with safe styling
+      expect(screen.getAllByText('1x').length).toBeGreaterThan(0);
       expect(screen.getByText('Set 1x')).toBeOnTheScreen();
     });
 
-    it('displays medium risk styling for medium leverage', () => {
-      // Arrange - leverage 10 with maxLeverage 20 = 50% = medium risk
-      const props = { ...defaultProps, leverage: 10, maxLeverage: 20 };
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...props} />);
+    it('displays medium leverage value', () => {
+      render(<PerpsLeverageBottomSheet {...defaultProps} leverage={10} />);
 
-      // Assert
+      expect(screen.getAllByText('10x').length).toBeGreaterThan(0);
       expect(screen.getByText('Set 10x')).toBeOnTheScreen();
     });
 
-    it('displays high risk styling for high leverage', () => {
-      // Arrange - leverage 18 with maxLeverage 20 = 89% = high risk
-      const props = { ...defaultProps, leverage: 18, maxLeverage: 20 };
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...props} />);
+    it('displays high leverage value', () => {
+      render(
+        <PerpsLeverageBottomSheet
+          {...defaultProps}
+          leverage={18}
+          maxLeverage={20}
+        />,
+      );
 
-      // Assert
       expect(screen.getByText('18x')).toBeOnTheScreen();
       expect(screen.getByText('Set 18x')).toBeOnTheScreen();
     });
 
-    it('displays high risk styling for max leverage', () => {
-      // Arrange - leverage 20 with maxLeverage 20 = 100% = high risk
+    it('displays max leverage value', () => {
       const props = { ...defaultProps, leverage: 20, maxLeverage: 20 };
 
-      // Act
       render(<PerpsLeverageBottomSheet {...props} />);
 
-      // Assert - Component renders with high risk styling
       expect(screen.getAllByText('20x').length).toBeGreaterThan(0);
     });
   });
 
   describe('Slider Component', () => {
-    it('renders slider component with tick marks', () => {
-      // Act
+    it('renders MMDS slider with min and max marks', () => {
       render(<PerpsLeverageBottomSheet {...defaultProps} />);
 
-      // Assert - Check that slider labels are rendered
-      expect(screen.getByText('1x')).toBeOnTheScreen(); // Min leverage label (only in slider)
+      const slider = screen.getByTestId(
+        PerpsLeverageBottomSheetSelectorsIDs.SLIDER,
+      );
+
+      expect(slider).toBeOnTheScreen();
+      expect(slider.props.marks).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ label: '1x', value: 1 }),
+          expect.objectContaining({ label: '20x', value: 20 }),
+        ]),
+      );
     });
 
-    it('handles slider layout events', () => {
-      // Arrange
-      render(<PerpsLeverageBottomSheet {...defaultProps} />);
+    it('updates leverage when slider drag ends', () => {
+      const mockOnConfirm = jest.fn();
+      render(
+        <PerpsLeverageBottomSheet
+          {...defaultProps}
+          onConfirm={mockOnConfirm}
+        />,
+      );
 
-      // We can't easily test gesture interactions in unit tests,
-      // but we can verify the component renders without crashing
-      expect(screen.getByText('Set 5x')).toBeOnTheScreen();
+      fireEvent(
+        screen.getByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER),
+        'dragEnd',
+        12,
+      );
+
+      fireEvent.press(screen.getByText(/Set \d+x/));
+
+      expect(mockOnConfirm).toHaveBeenCalledWith(12, 'slider');
     });
 
-    it('generates correct tick marks for different max leverage values', () => {
-      // Test is implicit - if component renders without crashing,
-      // the tick mark generation logic works
-      const props = { ...defaultProps, maxLeverage: 50 };
+    it('refreshes liquidation UI when drag is cancelled mid-gesture', () => {
+      const { getByTestId, queryByTestId, UNSAFE_getAllByType } = render(
+        <PerpsLeverageBottomSheet {...defaultProps} leverage={5} />,
+      );
+      const { Skeleton: SkeletonComponent } = jest.requireActual(
+        '@metamask/design-system-react-native',
+      );
 
-      // Act
-      render(<PerpsLeverageBottomSheet {...props} />);
+      const slider = getByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER);
+      const sliderContainer = slider.parent;
+      if (!sliderContainer) {
+        throw new Error('Expected slider container for touchCancel');
+      }
+
+      fireEvent(slider, 'valueChange', 12);
+      expect(screen.getByText('12x')).toBeOnTheScreen();
 
-      // Assert
-      expect(screen.getByText('50x')).toBeOnTheScreen(); // Max leverage label
+      fireEvent(sliderContainer, 'touchCancel');
+
+      expect(screen.getByText('Set 12x')).toBeOnTheScreen();
+      expect(
+        queryByTestId(PerpsLeverageBottomSheetSelectorsIDs.HELP_TEXT),
+      ).toBeNull();
+      expect(UNSAFE_getAllByType(SkeletonComponent).length).toBeGreaterThan(0);
+    });
+
+    it('passes labeled max mark for high max leverage', () => {
+      render(<PerpsLeverageBottomSheet {...defaultProps} maxLeverage={50} />);
+
+      expect(
+        screen.getByTestId(PerpsLeverageBottomSheetSelectorsIDs.SLIDER).props
+          .marks,
+      ).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ label: '50x', value: 50 }),
+        ]),
+      );
     });
   });
 
   describe('Confirm and Close Actions', () => {
     it('calls onConfirm with current leverage when confirmed', () => {
-      // Arrange
       const mockOnConfirm = jest.fn();
       render(
         <PerpsLeverageBottomSheet
@@ -695,44 +599,59 @@ describe('PerpsLeverageBottomSheet', () => {
         />,
       );
 
-      const confirmButton = screen.getByText('Set 5x');
+      fireEvent.press(screen.getByText('Set 5x'));
 
-      // Act
-      fireEvent.press(confirmButton);
-
-      // Assert
       expect(mockOnConfirm).toHaveBeenCalledWith(5, 'slider');
     });
 
+    it('flushes a stuck live drag value instead of confirming a stale leverage', () => {
+      const mockOnConfirm = jest.fn();
+      render(
+        <PerpsLeverageBottomSheet
+          {...defaultProps}
+          onConfirm={mockOnConfirm}
+        />,
+      );
+
+      const slider = screen.getByTestId(
+        PerpsLeverageBottomSheetSelectorsIDs.SLIDER,
+      );
+      fireEvent(slider, 'valueChange', 12);
+
+      expect(screen.getByText('12x')).toBeOnTheScreen();
+      expect(screen.getByText('Set 12x')).toBeOnTheScreen();
+
+      // Stuck mid-drag (no dragEnd / touchCancel): first confirm only flushes.
+      fireEvent.press(screen.getByText('Set 12x'));
+
+      expect(mockOnConfirm).not.toHaveBeenCalled();
+      expect(screen.getByText('Set 12x')).toBeOnTheScreen();
+
+      // Second tap confirms the flushed live value, not the pre-drag temp.
+      fireEvent.press(screen.getByText('Set 12x'));
+
+      expect(mockOnConfirm).toHaveBeenCalledWith(12, 'slider');
+    });
+
     it('calls onClose after confirm', () => {
-      // Arrange
       const mockOnClose = jest.fn();
       render(
         <PerpsLeverageBottomSheet {...defaultProps} onClose={mockOnClose} />,
       );
 
-      const confirmButton = screen.getByText('Set 5x');
-
-      // Act
-      fireEvent.press(confirmButton);
+      fireEvent.press(screen.getByText('Set 5x'));
 
-      // Assert
       expect(mockOnClose).toHaveBeenCalled();
     });
 
     it('logs leverage confirmation', () => {
-      // Arrange
       const { DevLogger } = jest.requireMock(
         '../../../../../core/SDKConnect/utils/DevLogger',
       );
       render(<PerpsLeverageBottomSheet {...defaultProps} />);
 
-      const confirmButton = screen.getByText('Set 5x');
+      fireEvent.press(screen.getByText('Set 5x'));
 
-      // Act
-      fireEvent.press(confirmButton);
-
-      // Assert
       expect(DevLogger.log).toHaveBeenCalledWith(
         'Confirming leverage: 5, method: slider',
       );
@@ -741,600 +660,111 @@ describe('PerpsLeverageBottomSheet', () => {
 
   describe('Direction-based Logic', () => {
     it('shows correct liquidation text for long positions', () => {
-      // Arrange
-      const longProps = { ...defaultProps, direction: 'long' as const };
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...longProps} />);
+      render(<PerpsLeverageBottomSheet {...defaultProps} direction="long" />);
 
-      // Assert
-      expect(screen.getByText(/drops/)).toBeOnTheScreen();
+      expect(
+        screen.getByText(/You will be liquidated if price drops by/),
+      ).toBeOnTheScreen();
     });
 
     it('shows correct liquidation text for short positions', () => {
-      // Arrange
-      const shortProps = { ...defaultProps, direction: 'short' as const };
+      render(<PerpsLeverageBottomSheet {...defaultProps} direction="short" />);
 
-      // Act
-      render(<PerpsLeverageBottomSheet {...shortProps} />);
-
-      // Assert
-      expect(screen.getByText(/rises/)).toBeOnTheScreen();
+      expect(
+        screen.getByText(/You will be liquidated if price rises by/),
+      ).toBeOnTheScreen();
     });
   });
 
   describe('Edge Cases', () => {
     it('handles extreme leverage values', () => {
-      // Arrange
-      const extremeProps = {
-        ...defaultProps,
-        leverage: 100,
-        maxLeverage: 100,
-      };
-
-      // Act & Assert - Should not crash
-      expect(() =>
-        render(<PerpsLeverageBottomSheet {...extremeProps} />),
-      ).not.toThrow();
+      render(
+        <PerpsLeverageBottomSheet
+          {...defaultProps}
+          leverage={100}
+          maxLeverage={100}
+        />,
+      );
+
+      expect(screen.getByText('Set 100x')).toBeOnTheScreen();
     });
 
     it('handles minimum leverage correctly', () => {
-      // Arrange
-      const minProps = {
-        ...defaultProps,
-        leverage: 1,
-        minLeverage: 1,
-      };
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...minProps} />);
+      render(
+        <PerpsLeverageBottomSheet
+          {...defaultProps}
+          leverage={1}
+          minLeverage={1}
+        />,
+      );
 
-      // Assert
       expect(screen.getByText('Set 1x')).toBeOnTheScreen();
     });
 
     it('handles equal min and max leverage', () => {
-      // Arrange
-      const singleLeverageProps = {
-        ...defaultProps,
-        leverage: 5,
-        minLeverage: 5,
-        maxLeverage: 5,
-      };
-
-      // Act & Assert - Should not crash
-      expect(() =>
-        render(<PerpsLeverageBottomSheet {...singleLeverageProps} />),
-      ).not.toThrow();
+      render(
+        <PerpsLeverageBottomSheet
+          {...defaultProps}
+          leverage={5}
+          minLeverage={5}
+          maxLeverage={5}
+        />,
+      );
+
+      expect(screen.getByText('Set 5x')).toBeOnTheScreen();
     });
   });
 
   describe('Component Memoization', () => {
     it('does not re-render when unrelated props change', () => {
-      // Arrange
       const { rerender } = render(
         <PerpsLeverageBottomSheet {...defaultProps} />,
       );
 
-      // Act - Change a prop that should not trigger re-render according to memo
-      const newProps = {
-        ...defaultProps,
-        onClose: jest.fn(), // Different function reference but component should be memoized
-        onConfirm: jest.fn(), // Different function reference but component should be memoized
-      };
-      rerender(<PerpsLeverageBottomSheet {...newProps} />);
+      rerender(
+        <PerpsLeverageBottomSheet
+          {...defaultProps}
+          currentPrice={3100}
+          asset="ETH-USD"
+        />,
+      );
 
-      // Assert - Component should still work correctly regardless of memoization behavior
       expect(screen.getByText('Set 5x')).toBeOnTheScreen();
     });
 
     it('re-renders when visibility changes', () => {
-      // Arrange
       const { rerender } = render(
         <PerpsLeverageBottomSheet {...defaultProps} />,
       );
 
-      // Act
+      expect(
+        screen.getByText('perps.order.leverage_modal.title'),
+      ).toBeOnTheScreen();
+
       rerender(
         <PerpsLeverageBottomSheet {...defaultProps} isVisible={false} />,
       );
 
-      // Assert - Should render null when not visible
       expect(screen.queryByText('perps.order.leverage_modal.title')).toBeNull();
     });
   });
 
-  describe('Gesture Handlers', () => {
-    describe('Pan Gesture Behavior', () => {
-      it('initializes pan gesture with optional handlers', () => {
-        // Arrange
-        const { Gesture } = jest.requireMock('react-native-gesture-handler');
-        const mockPanGesture = {
-          onBegin: jest.fn().mockReturnThis(),
-          onUpdate: jest.fn().mockReturnThis(),
-          onEnd: jest.fn().mockReturnThis(),
-          onFinalize: jest.fn().mockReturnThis(),
-        };
-        Gesture.Pan.mockReturnValue(mockPanGesture);
-
-        // Act
-        render(<PerpsLeverageBottomSheet {...defaultProps} />);
-
-        // Assert
-        expect(mockPanGesture.onFinalize).toHaveBeenCalledWith(
-          expect.any(Function),
-        );
-        expect(mockPanGesture.onEnd).toHaveBeenCalledWith(expect.any(Function));
-        expect(mockPanGesture.onUpdate).toHaveBeenCalledWith(
-          expect.any(Function),
-        );
-        expect(mockPanGesture.onBegin).toHaveBeenCalledWith(
-          expect.any(Function),
-        );
-      });
-
-      it('triggers haptic feedback and onDragStart callback when pan begins', async () => {
-        // Arrange
-        const { Gesture } = jest.requireMock('react-native-gesture-handler');
-        let capturedOnBegin: (() => void) | null = null;
-
-        const mockPanGesture: {
-          onBegin: jest.Mock;
-          onUpdate: jest.Mock;
-          onEnd: jest.Mock;
-          onFinalize: jest.Mock;
-        } = {
-          onBegin: jest.fn(),
-          onUpdate: jest.fn().mockReturnThis(),
-          onEnd: jest.fn().mockReturnThis(),
-          onFinalize: jest.fn().mockReturnThis(),
-        };
-
-        mockPanGesture.onBegin.mockImplementation((handler: () => void) => {
-          capturedOnBegin = handler;
-          return mockPanGesture;
-        });
-
-        Gesture.Pan.mockReturnValue(mockPanGesture);
-
-        const { act } = jest.requireActual('@testing-library/react-native');
-
-        render(<PerpsLeverageBottomSheet {...defaultProps} />);
-
-        // Act - Invoke the onBegin handler and verify no crash
-        await act(async () => {
-          expect(() => capturedOnBegin?.()).not.toThrow();
-        });
-
-        // Assert - Handler was captured and can be invoked
-        expect(capturedOnBegin).toBeDefined();
-        expect(typeof capturedOnBegin).toBe('function');
-        // Component still renders after handler invocation
-        expect(
-          screen.getByText('perps.order.leverage_modal.title'),
-        ).toBeOnTheScreen();
-      });
-
-      it('updates position and value when pan gesture moves', async () => {
-        // Arrange
-        const { Gesture } = jest.requireMock('react-native-gesture-handler');
-        let capturedOnUpdate: ((event: { x: number }) => void) | null = null;
-
-        const mockPanGesture: {
-          onBegin: jest.Mock;
-          onUpdate: jest.Mock;
-          onEnd: jest.Mock;
-          onFinalize: jest.Mock;
-        } = {
-          onBegin: jest.fn().mockReturnThis(),
-          onUpdate: jest.fn(),
-          onEnd: jest.fn().mockReturnThis(),
-          onFinalize: jest.fn().mockReturnThis(),
-        };
-
-        mockPanGesture.onUpdate.mockImplementation(
-          (handler: (event: { x: number }) => void) => {
-            capturedOnUpdate = handler;
-            return mockPanGesture;
-          },
-        );
-
-        Gesture.Pan.mockReturnValue(mockPanGesture);
-
-        const { act } = jest.requireActual('@testing-library/react-native');
-
-        render(<PerpsLeverageBottomSheet {...defaultProps} />);
-
-        // Trigger layout to set slider width
-        const slider = screen.getByTestId('leverage-slider-track');
-        fireEvent(slider, 'layout', {
-          nativeEvent: { layout: { width: 300, height: 8 } },
-        });
-
-        // Act - Invoke handler with mid-range position
-        await act(async () => {
-          expect(() => capturedOnUpdate?.({ x: 150 })).not.toThrow();
-        });
-
-        // Assert - Handler was captured and can be invoked
-        expect(capturedOnUpdate).toBeDefined();
-        expect(typeof capturedOnUpdate).toBe('function');
-        // Component still renders after handler invocation
-        expect(
-          screen.getByText('perps.order.leverage_modal.title'),
-        ).toBeOnTheScreen();
-      });
-
-      it('triggers haptic feedback and updates value when pan ends', async () => {
-        // Arrange
-        const { Gesture } = jest.requireMock('react-native-gesture-handler');
-        let capturedOnEnd: (() => void) | null = null;
-
-        const mockPanGesture: {
-          onBegin: jest.Mock;
-          onUpdate: jest.Mock;
-          onEnd: jest.Mock;
-          onFinalize: jest.Mock;
-        } = {
-          onBegin: jest.fn().mockReturnThis(),
-          onUpdate: jest.fn().mockReturnThis(),
-          onEnd: jest.fn(),
-          onFinalize: jest.fn().mockReturnThis(),
-        };
-
-        mockPanGesture.onEnd.mockImplementation((handler: () => void) => {
-          capturedOnEnd = handler;
-          return mockPanGesture;
-        });
-
-        Gesture.Pan.mockReturnValue(mockPanGesture);
-
-        const { act } = jest.requireActual('@testing-library/react-native');
-
-        render(<PerpsLeverageBottomSheet {...defaultProps} />);
-
-        // Trigger layout to set slider width
-        const slider = screen.getByTestId('leverage-slider-track');
-        fireEvent(slider, 'layout', {
-          nativeEvent: { layout: { width: 300, height: 8 } },
-        });
-
-        // Act - Invoke the onEnd handler and verify no crash
-        await act(async () => {
-          expect(() => capturedOnEnd?.()).not.toThrow();
-        });
-
-        // Assert - Handler was captured and can be invoked
-        expect(capturedOnEnd).toBeDefined();
-        expect(typeof capturedOnEnd).toBe('function');
-        // Component still renders after handler invocation
-        expect(
-          screen.getByText('perps.order.leverage_modal.title'),
-        ).toBeOnTheScreen();
-      });
-    });
-
-    describe('Gesture Integration', () => {
-      it('renders component with all gesture handlers configured', () => {
-        // Arrange
-        const { Gesture } = jest.requireMock('react-native-gesture-handler');
-
-        // Act
-        render(<PerpsLeverageBottomSheet {...defaultProps} />);
-
-        // Assert - All three gesture types are initialized
-        expect(Gesture.Tap).toHaveBeenCalled();
-        expect(Gesture.LongPress).toHaveBeenCalled();
-        expect(Gesture.Pan).toHaveBeenCalled();
-        expect(Gesture.Simultaneous).toHaveBeenCalled();
-      });
-    });
-
-    describe('handleHoldEnd Behavior', () => {
-      it('updates state when drag ends via slider interaction', () => {
-        // Arrange
-        render(<PerpsLeverageBottomSheet {...defaultProps} leverage={5} />);
-        expect(screen.getByText('Set 5x')).toBeOnTheScreen();
-
-        // Act - Simulate drag end by using quick select (similar state update)
-        const button2x = screen.getByText('2x');
-        fireEvent.press(button2x);
-
-        // Assert - State is updated
-        expect(screen.getByText('Set 2x')).toBeOnTheScreen();
-      });
-
-      it('handles tap gesture end event', () => {
-        // Arrange
-        const { Gesture } = jest.requireMock('react-native-gesture-handler');
-        let tapEndHandler: ((event: { x: number }) => void) | null = null;
-
-        Gesture.Tap.mockImplementation(() => ({
-          onEnd: (handler: (event: { x: number }) => void) => {
-            tapEndHandler = handler;
-            return { onEnd: jest.fn().mockReturnThis() };
-          },
-        }));
-
-        // Act
-        render(<PerpsLeverageBottomSheet {...defaultProps} />);
-
-        // Assert - Tap gesture was configured with end handler
-        expect(tapEndHandler).not.toBeNull();
-      });
-
-      it('handles long press gesture end event', () => {
-        // Arrange
-        const { Gesture } = jest.requireMock('react-native-gesture-handler');
-        let longPressEndHandler: ((event: { x: number }) => void) | null = null;
-
-        Gesture.LongPress.mockImplementation(() => ({
-          onEnd: (handler: (event: { x: number }) => void) => {
-            longPressEndHandler = handler;
-            return { onEnd: jest.fn().mockReturnThis() };
-          },
-        }));
-
-        // Act
-        render(<PerpsLeverageBottomSheet {...defaultProps} />);
-
-        // Assert - Long press gesture was configured with end handler
-        expect(longPressEndHandler).not.toBeNull();
-      });
-
-      it('handles gesture tap without crashing', async () => {
-        // Arrange
-        const { Gesture } = jest.requireMock('react-native-gesture-handler');
-        let capturedHandler: ((event: { x: number }) => void) | null = null;
-
-        Gesture.Tap.mockImplementation(() => ({
-          onEnd: (handler: (event: { x: number }) => void) => {
-            capturedHandler = handler;
-            return { onEnd: jest.fn().mockReturnThis() };
-          },
-        }));
-
-        const { act } = jest.requireActual('@testing-library/react-native');
-
-        render(<PerpsLeverageBottomSheet {...defaultProps} />);
-
-        const slider = screen.getByTestId('leverage-slider-track');
-        fireEvent(slider, 'layout', {
-          nativeEvent: { layout: { width: 300, height: 8 } },
-        });
-
-        // Act - Call handler and verify no crash
-        await act(async () => {
-          expect(() => capturedHandler?.({ x: 150 })).not.toThrow();
-        });
-
-        // Assert - Component still renders after handler invocation
-        expect(
-          screen.getByText('perps.order.leverage_modal.title'),
-        ).toBeOnTheScreen();
-        // Verify button text matches pattern "Set Nx"
-        expect(screen.getByText(/Set \d+x/)).toBeOnTheScreen();
-      });
-    });
-  });
-
-  describe('Liquidation Display Without Skeleton', () => {
-    it('shows placeholder text when liquidation price is not yet available', () => {
-      // Arrange
-      const mockUsePerpsLiquidationPrice = jest.requireMock(
-        '../../hooks/usePerpsLiquidationPrice',
-      );
-      mockUsePerpsLiquidationPrice.usePerpsLiquidationPrice.mockReturnValueOnce(
-        {
-          liquidationPrice: '',
-          isCalculating: true,
-          error: null,
-        },
-      );
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...defaultProps} />);
+  describe('HelpText', () => {
+    it('renders liquidation HelpText without severity', () => {
+      render(<PerpsLeverageBottomSheet {...defaultProps} leverage={1} />);
 
-      // Assert - Shows placeholder '--' instead of skeleton
-      expect(screen.getByText('--')).toBeOnTheScreen();
       expect(
-        screen.getByText('perps.order.leverage_modal.title'),
+        screen.getByTestId(PerpsLeverageBottomSheetSelectorsIDs.HELP_TEXT),
       ).toBeOnTheScreen();
     });
 
-    it('displays liquidation price immediately when available', () => {
-      // Arrange
-      const mockUsePerpsLiquidationPrice = jest.requireMock(
-        '../../hooks/usePerpsLiquidationPrice',
-      );
-      mockUsePerpsLiquidationPrice.usePerpsLiquidationPrice.mockReturnValueOnce(
-        {
-          liquidationPrice: '2400.00',
-          isCalculating: false,
-          error: null,
-        },
-      );
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...defaultProps} />);
-
-      // Assert - Liquidation price displays (format may vary but price is shown)
-      expect(screen.getByText(/\$2,400/)).toBeOnTheScreen();
-    });
-
-    it('renders component during calculating state without skeleton blink', () => {
-      // Arrange
-      const mockUsePerpsLiquidationPrice = jest.requireMock(
-        '../../hooks/usePerpsLiquidationPrice',
-      );
-      mockUsePerpsLiquidationPrice.usePerpsLiquidationPrice.mockReturnValueOnce(
-        {
-          liquidationPrice: '2400.00',
-          isCalculating: true,
-          error: null,
-        },
-      );
-
-      // Act
+    it('renders centered liquidation HelpText without requiring icon', () => {
       render(<PerpsLeverageBottomSheet {...defaultProps} />);
 
-      // Assert - Component renders with price text visible (no skeleton)
       expect(
-        screen.getByText('perps.order.leverage_modal.title'),
+        screen.getByText(/You will be liquidated if price drops by/),
       ).toBeOnTheScreen();
-      expect(screen.getByText('Set 5x')).toBeOnTheScreen();
-      // Price is shown (not replaced by skeleton) since it's a valid value
-      expect(screen.getByText(/\$2,400/)).toBeOnTheScreen();
-    });
-
-    it('shows warning text with percentage when liquidation data is available', () => {
-      // Arrange - Explicitly mock to ensure known liquidation price
-      const mockUsePerpsLiquidationPrice = jest.requireMock(
-        '../../hooks/usePerpsLiquidationPrice',
-      );
-      mockUsePerpsLiquidationPrice.usePerpsLiquidationPrice.mockReturnValueOnce(
-        {
-          liquidationPrice: '2400.00', // 3000 * (1 - 1/5) = 2400, gives 20% drop
-          isCalculating: false,
-          error: null,
-        },
-      );
-
-      // Act
-      render(<PerpsLeverageBottomSheet {...defaultProps} />);
-
-      // Assert - Warning text with percentage is shown, not a skeleton
-      expect(screen.getByText(/20\.0%/)).toBeOnTheScreen();
-      expect(screen.getByText(/drops/)).toBeOnTheScreen();
-    });
-  });
-
-  describe('Stale Cache Prevention After Leverage Change', () => {
-    it('shows skeleton instead of stale cached price when leverage changes via quick select', () => {
-      // Arrange — default mock returns a calculated price for 5x leverage
-      const mockUsePerpsLiquidationPrice = jest.requireMock(
-        '../../hooks/usePerpsLiquidationPrice',
-      );
-      render(<PerpsLeverageBottomSheet {...defaultProps} leverage={5} />);
-
-      // The initial render should show a price (from the default mock), no skeletons
-      expect(screen.queryAllByTestId('skeleton-placeholder')).toHaveLength(0);
-
-      // Simulate the real hook behavior: after leverage changes, the hook
-      // starts a debounced API call and sets isCalculating: true while the
-      // old liquidationPrice persists in state until the new result arrives.
-      mockUsePerpsLiquidationPrice.usePerpsLiquidationPrice.mockReturnValue({
-        liquidationPrice: '2400.00', // Old price still in hook state
-        isCalculating: true,
-        error: null,
-      });
-
-      // Act — press 2x quick select button. We use 2x because it only appears
-      // in the quick select row (not in the slider labels like 10x/20x do),
-      // so getByText('2x') returns a single unambiguous element.
-      const button2x = screen.getByText('2x');
-      fireEvent.press(button2x);
-
-      // Assert — should show skeleton placeholders, NOT the stale cached price from 5x
-      const skeletons = screen.getAllByTestId('skeleton-placeholder');
-      expect(skeletons.length).toBeGreaterThanOrEqual(2); // warning text + price value
-    });
-
-    it('does not show skeleton when pressing the already active leverage', () => {
-      // Arrange — default mock returns calculated price for 5x
-      render(<PerpsLeverageBottomSheet {...defaultProps} leverage={5} />);
-
-      // The initial render should show a calculated price, no skeletons
-      expect(screen.queryAllByTestId('skeleton-placeholder')).toHaveLength(0);
-
-      // Act — press the same leverage that's already selected
-      const buttons5x = screen.getAllByText('5x');
-      fireEvent.press(buttons5x[0]);
-
-      // Assert — cache should NOT be invalidated, no skeletons should appear
-      expect(screen.getByText('Set 5x')).toBeOnTheScreen();
-      expect(screen.queryAllByTestId('skeleton-placeholder')).toHaveLength(0);
-    });
-  });
-
-  describe('Gesture Handler Integration', () => {
-    it('handles pan gesture start event', () => {
-      // Arrange
-      const { getByTestId } = render(
-        <PerpsLeverageBottomSheet {...defaultProps} leverage={5} />,
-      );
-
-      const slider = getByTestId('leverage-slider-track');
-
-      // Act - Simulate pan gesture beginning
-      fireGestureHandler(slider, [
-        { state: 2 }, // BEGAN state
-      ]);
-
-      // Assert - Component still renders (gesture initiated)
-      expect(slider).toBeOnTheScreen();
-    });
-
-    it('handles pan gesture update with position changes', () => {
-      // Arrange
-      const { getByTestId } = render(
-        <PerpsLeverageBottomSheet {...defaultProps} leverage={5} />,
-      );
-
-      const slider = getByTestId('leverage-slider-track');
-
-      // Act - Simulate pan gesture with updates
-      fireGestureHandler(slider, [
-        { state: 2 }, // BEGAN
-        { state: 4, x: 50 }, // ACTIVE with position
-        { state: 4, x: 100 }, // ACTIVE with new position
-      ]);
-
-      // Assert - Slider processes gesture updates
-      expect(slider).toBeOnTheScreen();
-    });
-
-    it('handles pan gesture end event', () => {
-      // Arrange
-      const { getByTestId } = render(
-        <PerpsLeverageBottomSheet {...defaultProps} leverage={5} />,
-      );
-
-      const slider = getByTestId('leverage-slider-track');
-
-      // Act - Complete pan gesture
-      fireGestureHandler(slider, [
-        { state: 2 }, // BEGAN
-        { state: 4, x: 100 }, // ACTIVE
-        { state: 5 }, // END
-      ]);
-
-      // Assert - Gesture completes successfully
-      expect(slider).toBeOnTheScreen();
-    });
-
-    it('processes layout and gesture sequence together', () => {
-      // Arrange
-      const { getByTestId } = render(
-        <PerpsLeverageBottomSheet {...defaultProps} leverage={5} />,
-      );
-
-      const slider = getByTestId('leverage-slider-track');
-
-      // Trigger layout
-      fireEvent(slider, 'layout', {
-        nativeEvent: { layout: { width: 300, height: 8 } },
-      });
-
-      // Act - Now perform gesture with known width
-      fireGestureHandler(slider, [
-        { state: 2 }, // BEGAN
-        { state: 4, x: 150 }, // ACTIVE at midpoint
-        { state: 5 }, // END
-      ]);
-
-      // Assert - Layout and gesture work together
-      expect(slider).toBeOnTheScreen();
+      expect(screen.queryByTestId('help-text-icon')).toBeNull();
     });
   });
 });
diff --git a/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.tsx b/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.tsx
index edd0f6ff6d8a..d4fda08106d3 100644
--- a/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.tsx
+++ b/app/components/UI/Perps/components/PerpsLeverageBottomSheet/PerpsLeverageBottomSheet.tsx
@@ -1,9 +1,7 @@
-/* eslint-disable @metamask/design-tokens/color-no-hex */
 import {
   playImpact,
   playSelection,
   ImpactMoment,
-  type HapticImpactMoment,
 } from '../../../../../util/haptics';
 import React, {
   memo,
@@ -13,56 +11,44 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import { ScrollView, TouchableOpacity, View } from 'react-native';
-import {
-  Gesture,
-  GestureDetector,
-  GestureHandlerRootView,
-} from 'react-native-gesture-handler';
-import LinearGradient from 'react-native-linear-gradient';
-import Animated, {
-  runOnJS,
-  useAnimatedStyle,
-  useSharedValue,
-} from 'react-native-reanimated';
+import { ScrollView } from 'react-native';
 import { strings } from '../../../../../../locales/i18n';
 import { DevLogger } from '../../../../../core/SDKConnect/utils/DevLogger';
-import { useTheme } from '../../../../../util/theme';
-import { Theme } from '../../../../../util/theme/models';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
 import {
   PERPS_EVENT_PROPERTY,
   PERPS_EVENT_VALUE,
   PERFORMANCE_CONFIG,
+  type OrderType,
 } from '@metamask/perps-controller';
-import {
-  getLeverageRiskLevel,
-  LEVERAGE_COLORS,
-} from '../../constants/leverageColors';
-import { LEVERAGE_SLIDER_CONFIG } from '../../constants/perpsConfig';
 import { usePerpsEventTracking } from '../../hooks/usePerpsEventTracking';
 import { usePerpsLiquidationPrice } from '../../hooks/usePerpsLiquidationPrice';
 import {
   formatPerpsFiat,
   PRICE_RANGES_UNIVERSAL,
 } from '../../utils/formatUtils';
-import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
 import { createStyles } from './PerpsLeverageBottomSheet.styles';
 import { usePerpsLivePrices } from '../../hooks';
+import { PerpsLeverageBottomSheetSelectorsIDs } from '../../Perps.testIds';
 import {
+  Box,
   BottomSheet,
   BottomSheetFooter,
   BottomSheetHeader,
   BottomSheetRef,
+  Button,
   ButtonSize,
-  FontWeight,
-  Icon,
-  IconColor,
-  IconName,
-  IconSize,
+  ButtonVariant,
+  HelpText,
+  KeyValueRow,
+  KeyValueRowVariant,
+  Skeleton,
+  Slider,
+  SliderMarkColor,
   Text,
   TextColor,
   TextVariant,
+  type SliderMark,
 } from '@metamask/design-system-react-native';
 
 interface PerpsLeverageBottomSheetProps {
@@ -76,247 +62,24 @@ interface PerpsLeverageBottomSheetProps {
   direction: 'long' | 'short';
   asset?: string;
   limitPrice?: string;
-  orderType?: 'market' | 'limit';
+  orderType?: OrderType;
 }
 
-/**
- * LeverageSlider Component
- * A custom slider for selecting leverage values with visual risk indication
- *
- * @param value - Current leverage value
- * @param onValueChange - Callback when leverage changes
- * @param minValue - Minimum leverage (typically 1)
- * @param maxValue - Maximum leverage (varies by market)
- * @param colors - Theme colors
- * @param onInteraction - Optional callback when user interacts with slider
- *
- * Features:
- * - Gradient background indicating risk levels (green to red)
- * - Smooth drag and tap gestures
- * - Dynamic tick marks based on max leverage
- * - Real-time value updates during drag
- */
-const LeverageSlider: React.FC<{
+interface LeverageSliderEntry {
+  key: number;
   value: number;
-  onValueChange: (value: number) => void;
-  onDragStart: () => void;
-  onDragEnd: (value: number) => void;
-  minValue: number;
-  maxValue: number;
-  colors: Theme['colors'];
-  onInteraction?: () => void;
-}> = ({
-  value,
-  onValueChange,
-  onDragStart,
-  onDragEnd,
-  minValue,
-  maxValue,
-  colors,
-  onInteraction,
-}) => {
-  const styles = createStyles(colors);
-  const sliderWidth = useSharedValue(0);
-  const translateX = useSharedValue(0);
-  const isPressed = useSharedValue(false);
-  const thumbScale = useSharedValue(1);
-  const widthRef = useRef(0);
-  const [gradientWidth, setGradientWidth] = useState(300);
-  // Track previous value for threshold detection
-  const previousValueRef = useRef(value);
-
-  const positionToValue = useCallback(
-    (position: number, width: number) => {
-      'worklet';
-      if (width === 0) return minValue;
-      const percentage = Math.max(0, Math.min(1, position / width)); // Clamp percentage to 0-1
-      const rawValue = percentage * (maxValue - minValue) + minValue;
-      // Ensure value stays within bounds and round to integer
-      const clampedValue = Math.max(
-        minValue,
-        Math.min(maxValue, Math.round(rawValue)),
-      );
-      return clampedValue;
-    },
-    [minValue, maxValue],
-  );
-
-  const handleLayout = useCallback(
-    (event: { nativeEvent: { layout: { width: number } } }) => {
-      const { width } = event.nativeEvent.layout;
-      widthRef.current = width;
-      sliderWidth.value = width;
-      // Make gradient wider than the track to ensure full color coverage
-      setGradientWidth(width * 1.5);
-      const percentage = (value - minValue) / (maxValue - minValue);
-      translateX.value = percentage * width;
-    },
-    [value, minValue, maxValue, sliderWidth, translateX],
-  );
-
-  useEffect(() => {
-    if (widthRef.current > 0) {
-      const percentage = (value - minValue) / (maxValue - minValue);
-      const newPosition = percentage * widthRef.current;
-      // Direct assignment for instant update, no spring animation
-      translateX.value = newPosition;
-    }
-    // Update previous value ref when value changes externally
-    previousValueRef.current = value;
-  }, [value, minValue, maxValue, translateX]);
-
-  const progressStyle = useAnimatedStyle(() => ({
-    width: translateX.value,
-  }));
-
-  const thumbStyle = useAnimatedStyle(() => ({
-    transform: [{ translateX: translateX.value }, { scale: thumbScale.value }],
-  }));
-
-  const updateValue = useCallback(
-    (newValue: number) => {
-      onValueChange(newValue);
-      onInteraction?.();
-    },
-    [onValueChange, onInteraction],
-  );
-
-  const triggerHapticFeedback = useCallback((moment: HapticImpactMoment) => {
-    playImpact(moment);
-  }, []);
-
-  // Check if value crosses leverage thresholds
-  const checkThresholdCrossing = useCallback(
-    (newValue: number) => {
-      const prevValue = previousValueRef.current;
-      // Define leverage thresholds based on risk levels
-      const thresholds = [2, 5, 10];
-
-      for (const threshold of thresholds) {
-        // Check if we crossed the threshold in either direction
-        if (
-          (prevValue < threshold && newValue >= threshold) ||
-          (prevValue > threshold && newValue <= threshold)
-        ) {
-          runOnJS(triggerHapticFeedback)(ImpactMoment.SliderTick);
-          break;
-        }
-      }
-
-      previousValueRef.current = newValue;
-    },
-    [triggerHapticFeedback],
-  );
-
-  const panGesture = Gesture.Pan()
-    .onBegin(() => {
-      isPressed.value = true;
-      runOnJS(triggerHapticFeedback)(ImpactMoment.SliderGrip);
-      runOnJS(onDragStart)();
-    })
-    .onUpdate((event) => {
-      const newPosition = Math.max(0, Math.min(event.x, sliderWidth.value));
-      translateX.value = newPosition;
-      // Real-time value update during drag
-      const currentValue = positionToValue(newPosition, sliderWidth.value);
-      runOnJS(updateValue)(currentValue);
-      runOnJS(checkThresholdCrossing)(currentValue);
-    })
-    .onEnd(() => {
-      isPressed.value = false;
-      thumbScale.value = 1; // Direct assignment, no spring
-      const currentValue = positionToValue(translateX.value, sliderWidth.value);
-      runOnJS(updateValue)(currentValue);
-      runOnJS(triggerHapticFeedback)(ImpactMoment.SliderGrip);
-      runOnJS(onDragEnd)(currentValue);
-    })
-    .onFinalize(() => {
-      isPressed.value = false;
-      thumbScale.value = 1; // Direct assignment, no spring
-    });
-
-  const handleHoldEnd = (event: { x: number }) => {
-    const newPosition = Math.max(0, Math.min(event.x, sliderWidth.value));
-    translateX.value = newPosition; // Direct assignment for instant response
-    const newValue = positionToValue(newPosition, sliderWidth.value);
-    runOnJS(updateValue)(newValue);
-    runOnJS(checkThresholdCrossing)(newValue);
-    runOnJS(triggerHapticFeedback)(ImpactMoment.SliderTick);
-    runOnJS(onDragEnd)(newValue);
-  };
-
-  const tapGesture = Gesture.Tap().onEnd(handleHoldEnd);
-
-  const holdGesture = Gesture.LongPress().onEnd(handleHoldEnd);
-
-  const composed = Gesture.Simultaneous(tapGesture, panGesture, holdGesture);
-
-  // Generate tick marks based on max leverage using configuration constants
-  const tickMarks = useMemo(() => {
-    const marks = [];
-    let step: number = LEVERAGE_SLIDER_CONFIG.TickStepMedium;
-
-    if (maxValue <= LEVERAGE_SLIDER_CONFIG.MaxLeverageLowThreshold) {
-      step = LEVERAGE_SLIDER_CONFIG.TickStepLow;
-    } else if (maxValue <= LEVERAGE_SLIDER_CONFIG.MaxLeverageMediumThreshold) {
-      step = LEVERAGE_SLIDER_CONFIG.TickStepMedium;
-    } else {
-      step = LEVERAGE_SLIDER_CONFIG.TickStepHigh;
-    }
-
-    // Ensure we don't generate marks beyond maxValue
-    for (let i = step; i < maxValue; i += step) {
-      if (i >= maxValue) break; // Extra safety check
-      const percentage = (i - minValue) / (maxValue - minValue);
-      marks.push({ value: i, percentage });
-    }
-
-    return marks;
-  }, [minValue, maxValue]);
+  role: 'active' | 'incoming';
+}
 
-  return (
-    <GestureHandlerRootView style={styles.leverageSliderContainer}>
-      <GestureDetector gesture={composed}>
-        <View
-          style={styles.leverageTrack}
-          onLayout={handleLayout}
-          testID="leverage-slider-track"
-        >
-          {/* Progress bar with clipped gradient */}
-          <Animated.View style={[styles.progressContainer, progressStyle]}>
-            {/* Using leverage risk colors - will be replaced with design tokens */}
-            <LinearGradient
-              colors={[
-                LEVERAGE_COLORS.SAFE,
-                LEVERAGE_COLORS.SAFE_LIGHT,
-                LEVERAGE_COLORS.CAUTION,
-                colors.warning.default,
-                LEVERAGE_COLORS.MEDIUM,
-                colors.error.default,
-              ]}
-              start={{ x: 0, y: 0 }}
-              end={{ x: 1, y: 0 }}
-              style={[styles.gradientStyle, { width: gradientWidth || 300 }]}
-            />
-          </Animated.View>
-
-          {/* Tick marks */}
-          {tickMarks.map((mark) => (
-            <View
-              key={mark.value}
-              style={[styles.tickMark, { left: `${mark.percentage * 100}%` }]}
-            />
-          ))}
-
-          {/* Thumb */}
-          <Animated.View
-            style={[styles.leverageThumb, thumbStyle]}
-            hitSlop={{ top: 20, bottom: 20, left: 20, right: 20 }}
-          />
-        </View>
-      </GestureDetector>
-    </GestureHandlerRootView>
-  );
+const leverageToTrackStep = (
+  value: number,
+  minLeverage: number,
+  maxLeverage: number,
+): number => {
+  if (maxLeverage === minLeverage) {
+    return 0;
+  }
+  return ((value - minLeverage) / (maxLeverage - minLeverage)) * 100;
 };
 
 const PerpsLeverageBottomSheet: React.FC<PerpsLeverageBottomSheetProps> = ({
@@ -331,13 +94,26 @@ const PerpsLeverageBottomSheet: React.FC<PerpsLeverageBottomSheetProps> = ({
   limitPrice,
   orderType = 'market',
 }) => {
-  const { colors } = useTheme();
-  const styles = createStyles(colors);
+  const styles = createStyles();
   const bottomSheetRef = useRef<BottomSheetRef>(null);
   const [tempLeverage, setTempLeverage] = useState(initialLeverage);
   const [draggingLeverage, setDraggingLeverage] = useState(initialLeverage);
   const [isDragging, setIsDragging] = useState(false);
   const [inputMethod, setInputMethod] = useState<'slider' | 'preset'>('slider');
+  // After a slider gesture, MMDS can leave drag/echo state stuck so chip
+  // prop updates won't move the thumb. Remount via a hidden "incoming"
+  // instance, then promote it in place (same React key) so the old thumb
+  // stays visible until the new one is laid out — no opacity flash, no
+  // translateX=0 jerk.
+  const [sliderEntries, setSliderEntries] = useState<LeverageSliderEntry[]>([
+    { key: 0, value: initialLeverage, role: 'active' },
+  ]);
+  const hasSliderDraggedRef = useRef(false);
+  const promoteFrameRef = useRef<number | null>(null);
+  // While an incoming slider is mounting after a preset chip, ignore late
+  // drag events from the outgoing active instance so tempLeverage cannot
+  // desync from the chip value that will be promoted.
+  const isSliderRemountingRef = useRef(false);
 
   // Cache last valid liquidation price to avoid skeleton blinking when the
   // price updates passively (market price ticks). The cache is intentionally
@@ -405,35 +181,17 @@ const PerpsLeverageBottomSheet: React.FC<PerpsLeverageBottomSheetProps> = ({
 
   // Clear leverageChanged when the hook is done calculating, but enforce a
   // minimum display time after user-initiated leverage changes.
-  //
-  // Why: usePerpsLiquidationPrice's debounce.cancel() only cancels the
-  // debounce timer, not in-flight async API calls. A stale call completing
-  // after a leverage change sets isCalculating = false with the old
-  // leverage's price still in hook state. Without the minimum time guard,
-  // the skeleton would disappear and show the stale price.
-  //
-  // By waiting at least debounceMs + buffer, we ensure the new debounced
-  // calculation has had time to fire and complete, so the first
-  // isCalculating = false we act on is from the correct leverage.
   useEffect(() => {
     if (!leverageChanged) return;
 
     if (isCalculating) {
-      // A calculation is running — keep showing the skeleton.
       return;
     }
 
-    // isCalculating is false. Check if enough time has passed since the
-    // leverage change for this to be the *new* calculation's completion
-    // rather than a stale in-flight call.
     const elapsed = Date.now() - leverageChangeTime.current;
     const minSkeletonMs = PERFORMANCE_CONFIG.LiquidationPriceDebounceMs + 200;
 
     if (leverageChangeTime.current > 0 && elapsed < minSkeletonMs) {
-      // Too soon — likely a stale completion. Keep the skeleton and
-      // schedule a deferred clear. If isCalculating goes back to true
-      // before the timer fires (new calculation started), the cleanup
-      // function cancels this timer and the effect re-runs.
       const remaining = minSkeletonMs - elapsed;
       const timer = setTimeout(() => {
         setLeverageChanged(false);
@@ -441,7 +199,6 @@ const PerpsLeverageBottomSheet: React.FC<PerpsLeverageBottomSheetProps> = ({
       return () => clearTimeout(timer);
     }
 
-    // Enough time has passed — safe to clear.
     setLeverageChanged(false);
   }, [isCalculating, leverageChanged]);
 
@@ -451,16 +208,22 @@ const PerpsLeverageBottomSheet: React.FC<PerpsLeverageBottomSheetProps> = ({
       setDraggingLeverage(initialLeverage);
       setIsDragging(false);
       setLeverageChanged(false);
+      setSliderEntries([{ key: 0, value: initialLeverage, role: 'active' }]);
+      hasSliderDraggedRef.current = false;
+      isSliderRemountingRef.current = false;
+      if (promoteFrameRef.current !== null) {
+        cancelAnimationFrame(promoteFrameRef.current);
+        promoteFrameRef.current = null;
+      }
       lastValidLiquidationPrice.current = null;
       leverageChangeTime.current = 0;
     }
   }, [isVisible, initialLeverage]);
 
-  // Track leverage screen viewed event
   usePerpsEventTracking({
     eventName: MetaMetricsEvents.PERPS_SCREEN_VIEWED,
     conditions: [isVisible],
-    resetConditions: [!isVisible], // Auto-reset when modal closes
+    resetConditions: [!isVisible],
     properties: {
       [PERPS_EVENT_PROPERTY.SCREEN_TYPE]:
         PERPS_EVENT_VALUE.SCREEN_TYPE.LEVERAGE,
@@ -473,49 +236,23 @@ const PerpsLeverageBottomSheet: React.FC<PerpsLeverageBottomSheetProps> = ({
     },
   });
 
-  const handleConfirm = () => {
-    DevLogger.log(
-      `Confirming leverage: ${tempLeverage}, method: ${inputMethod}`,
-    );
-
-    onConfirm(tempLeverage, inputMethod);
-    onClose();
-  };
-
-  /**
-   * Calculate liquidation percentage distance from current price
-   * This is protocol-agnostic, using the provider's calculated liquidation price
-   *
-   * @returns Percentage distance to liquidation (e.g., 20 means 20% price movement to liquidation)
-   *
-   * For long positions: Shows how much price needs to drop to trigger liquidation
-   * For short positions: Shows how much price needs to rise to trigger liquidation
-   */
   const liquidationDropPercentage = useMemo(() => {
-    // Use display leverage (dragging or final)
     const leverageToUse = isDragging ? draggingLeverage : tempLeverage;
 
-    // Validate inputs
     if (currentPrice === 0 || !currentPrice) return 0;
 
-    // Special case for 1x leverage - theoretical 100% price movement to liquidation
     if (leverageToUse === 1) {
-      return 100; // Show 100% for 1x leverage
+      return 100;
     }
 
-    // If liquidation price is invalid/still calculating, use theoretical calculation
     if (!dynamicLiquidationPrice || dynamicLiquidationPrice === 0) {
-      // Theoretical calculation: 1 / leverage * 100
-      // For 2x: 50%, for 5x: 20%, for 10x: 10%, etc.
       const theoreticalPercentage = (1 / leverageToUse) * 100;
       return theoreticalPercentage >= 99.9 ? 100 : theoreticalPercentage;
     }
 
-    // Use actual liquidation price when available
     const percentageDrop =
       (Math.abs(currentPrice - dynamicLiquidationPrice) / currentPrice) * 100;
 
-    // Return 100% for very high percentages, otherwise return calculated value
     return percentageDrop >= 99.9 ? 100 : percentageDrop;
   }, [
     currentPrice,
@@ -525,160 +262,246 @@ const PerpsLeverageBottomSheet: React.FC<PerpsLeverageBottomSheetProps> = ({
     draggingLeverage,
   ]);
 
-  // True when user changed leverage and the API hasn't returned fresh data yet.
-  // Used to render skeleton shimmer placeholders in the liquidation rows.
-  // The flag is checked FIRST so that the old API price (which persists in
-  // state until the debounced call completes) is never shown alongside
-  // the new leverage value.
   const isRecalculating = leverageChanged;
 
-  // Resolve display values: prefer live API data, fall back to cached value.
-  //
-  // When recalculating after a leverage change, both values are null so the
-  // JSX renders skeleton placeholders instead of stale data.
-  //
-  // When the price is updating passively (market ticks, no leverage change),
-  // the cache is used as before to avoid skeleton blink.
   const hasValidApiPrice =
     !Number.isNaN(dynamicLiquidationPrice) && dynamicLiquidationPrice > 0;
 
   const displayLiquidationPrice = isRecalculating
-    ? null // Show skeleton — old price is from previous leverage
+    ? null
     : hasValidApiPrice
       ? dynamicLiquidationPrice
       : lastValidLiquidationPrice.current;
 
   const displayLiquidationPercentage = isRecalculating
-    ? null // Show skeleton — percentage would be stale/mismatched
+    ? null
     : `${liquidationDropPercentage.toFixed(1)}%`;
 
-  // Generate dynamic leverage options based on maxLeverage
   const quickSelectValues = useMemo(() => {
     DevLogger.log(
       `Generating leverage options for maxLeverage: ${maxLeverage}`,
     );
     const baseOptions = [2, 5, 10, 20, 40];
     const filtered = baseOptions.filter((option) => option <= maxLeverage);
-
-    // Special case: when maxLeverage is 3, show both 2x and 3x buttons
     const options = maxLeverage === 3 ? [2, 3] : filtered;
 
     DevLogger.log(`Available leverage options: ${options.join(', ')}`);
     return options;
   }, [maxLeverage]);
 
-  /**
-   * Determine leverage risk level for text color
-   * Maps leverage percentage to appropriate style matching the gradient colors
-   * @returns Style object for leverage text color
-   */
-  const getLeverageTextStyle = useCallback(() => {
-    const leverageToUse = isDragging ? draggingLeverage : tempLeverage;
-    const percentage =
-      (leverageToUse - minLeverage) / (maxLeverage - minLeverage);
-    const riskLevel = getLeverageRiskLevel(percentage);
-
-    switch (riskLevel) {
-      case 'safe':
-        return styles.leverageTextSafe;
-      case 'caution':
-        return styles.leverageTextCaution;
-      case 'medium':
-        return styles.leverageTextMedium;
-      case 'high':
-      default:
-        return styles.leverageTextHigh;
+  const midLeverage =
+    maxLeverage >= 40 ? 20 : Math.floor((minLeverage + maxLeverage) / 2);
+
+  const sliderMarks = useMemo((): SliderMark[] => {
+    const toStep = (value: number) =>
+      leverageToTrackStep(value, minLeverage, maxLeverage);
+
+    const marks: SliderMark[] = [
+      {
+        step: toStep(minLeverage),
+        label: `${minLeverage}x`,
+        value: minLeverage,
+        color: SliderMarkColor.SuccessDefault,
+      },
+    ];
+
+    if (midLeverage > minLeverage && midLeverage < maxLeverage) {
+      marks.push({
+        step: toStep(midLeverage),
+        label: `${midLeverage}x`,
+        value: midLeverage,
+        color: SliderMarkColor.WarningDefault,
+      });
     }
-  }, [
-    tempLeverage,
-    isDragging,
-    draggingLeverage,
-    minLeverage,
-    maxLeverage,
-    styles,
-  ]);
 
-  /**
-   * Determine warning styles based on leverage risk level
-   * Returns appropriate styles for warning container, text, icon, and price colors
-   * Colors match the gradient to provide visual consistency
-   *
-   * @returns Object containing textStyle, containerStyle, iconColor, and priceColor
-   */
-  const getWarningStyles = useCallback(() => {
-    const leverageToUse = isDragging ? draggingLeverage : tempLeverage;
-    const percentage =
-      (leverageToUse - minLeverage) / (maxLeverage - minLeverage);
-    const riskLevel = getLeverageRiskLevel(percentage);
-
-    switch (riskLevel) {
-      case 'safe':
-        return {
-          textStyle: styles.warningTextSafe,
-          containerStyle: styles.warningContainerSafe,
-          iconColor: IconColor.SuccessDefault,
-          priceColor: colors.text.alternative,
-        };
-      case 'caution':
-        return {
-          textStyle: styles.warningTextCaution,
-          containerStyle: styles.warningContainerCaution,
-          iconColor: IconColor.WarningDefault,
-          priceColor: LEVERAGE_COLORS.CAUTION,
-        };
-      case 'medium':
-        return {
-          textStyle: styles.warningTextMedium,
-          containerStyle: styles.warningContainerMedium,
-          iconColor: IconColor.WarningDefault,
-          priceColor: LEVERAGE_COLORS.MEDIUM,
-        };
-      case 'high':
-      default:
-        return {
-          textStyle: styles.warningTextHigh,
-          containerStyle: styles.warningContainerHigh,
-          iconColor: IconColor.ErrorDefault,
-          priceColor: colors.error.default,
-        };
+    if (maxLeverage !== minLeverage) {
+      marks.push({
+        step: toStep(maxLeverage),
+        label: `${maxLeverage}x`,
+        value: maxLeverage,
+        color: SliderMarkColor.ErrorDefault,
+      });
+    }
+
+    return marks;
+  }, [minLeverage, maxLeverage, midLeverage]);
+
+  const displayLeverage = isDragging ? draggingLeverage : tempLeverage;
+  const hasIncomingSlider = sliderEntries.some(
+    (entry) => entry.role === 'incoming',
+  );
+
+  const syncActiveSliderValue = useCallback((value: number) => {
+    setSliderEntries((prev) =>
+      prev.map((entry) =>
+        entry.role === 'active' ? { ...entry, value } : entry,
+      ),
+    );
+  }, []);
+
+  const handleSliderChange = useCallback((value: number) => {
+    if (isSliderRemountingRef.current) {
+      return;
+    }
+    hasSliderDraggedRef.current = true;
+    setIsDragging(true);
+    setDraggingLeverage(value);
+  }, []);
+
+  const handleSliderDragEnd = useCallback(
+    (value: number) => {
+      if (isSliderRemountingRef.current) {
+        return;
+      }
+      setIsDragging(false);
+      if (value !== tempLeverage) {
+        leverageChangeTime.current = Date.now();
+        setLeverageChanged(true);
+        lastValidLiquidationPrice.current = null;
+      }
+      setTempLeverage(value);
+      syncActiveSliderValue(value);
+      setInputMethod('slider');
+    },
+    [syncActiveSliderValue, tempLeverage],
+  );
+
+  // ScrollView / gesture arbitration can finalize the MMDS pan without
+  // onDragEnd; mirror drag-end so liquidation UI refreshes for the settled value.
+  const handleSliderDragCancel = useCallback(() => {
+    if (isSliderRemountingRef.current) {
+      return;
     }
+    if (isDragging) {
+      setIsDragging(false);
+      if (draggingLeverage !== tempLeverage) {
+        leverageChangeTime.current = Date.now();
+        setLeverageChanged(true);
+        lastValidLiquidationPrice.current = null;
+      }
+      setTempLeverage(draggingLeverage);
+      syncActiveSliderValue(draggingLeverage);
+      setInputMethod('slider');
+    }
+  }, [draggingLeverage, isDragging, syncActiveSliderValue, tempLeverage]);
+
+  const handleConfirm = useCallback(() => {
+    // Guard against confirming a stale committed `tempLeverage` while
+    // `isDragging` is (or is stuck) true — e.g. a cancelled gesture
+    // that never reached handleSliderDragEnd (see handleSliderDragCancel
+    // above). Flush the last live value and bail; `tempLeverage`
+    // reflects it on the next render, so the very next tap confirms the
+    // leverage shown on the numeral/footer instead of racing a same-tick
+    // confirm against a state update.
+    if (isDragging) {
+      handleSliderDragCancel();
+      return;
+    }
+
+    DevLogger.log(
+      `Confirming leverage: ${tempLeverage}, method: ${inputMethod}`,
+    );
+
+    onConfirm(tempLeverage, inputMethod);
+    onClose();
   }, [
-    tempLeverage,
+    handleSliderDragCancel,
+    inputMethod,
     isDragging,
-    draggingLeverage,
-    minLeverage,
-    maxLeverage,
-    styles,
-    colors,
+    onClose,
+    onConfirm,
+    tempLeverage,
   ]);
 
-  const warningStyles = getWarningStyles();
+  const handleSliderGrip = useCallback(() => {
+    playImpact(ImpactMoment.SliderGrip);
+  }, []);
 
-  const displayLeverage = isDragging ? draggingLeverage : tempLeverage;
+  const handleSliderMark = useCallback(() => {
+    playImpact(ImpactMoment.SliderTick);
+  }, []);
+
+  const promoteIncomingSlider = useCallback((incomingKey: number) => {
+    if (promoteFrameRef.current !== null) {
+      cancelAnimationFrame(promoteFrameRef.current);
+    }
+    // Wait until the incoming Slider has applied its layout-driven thumb
+    // position, then promote that same instance (same key) to active.
+    promoteFrameRef.current = requestAnimationFrame(() => {
+      promoteFrameRef.current = requestAnimationFrame(() => {
+        promoteFrameRef.current = null;
+        setSliderEntries((prev) => {
+          const incoming = prev.find((entry) => entry.key === incomingKey);
+          if (!incoming) {
+            return prev;
+          }
+          return [{ key: incoming.key, value: incoming.value, role: 'active' }];
+        });
+        isSliderRemountingRef.current = false;
+      });
+    });
+  }, []);
+
+  const handleQuickSelect = useCallback(
+    (value: number) => {
+      // A second chip during the promote window must cancel the pending
+      // promote and remount again; otherwise the first chip's incoming value
+      // is restored after the sync-only path updates tempLeverage.
+      if (promoteFrameRef.current !== null) {
+        cancelAnimationFrame(promoteFrameRef.current);
+        promoteFrameRef.current = null;
+      }
+
+      const wasDragging = isDragging;
+      setIsDragging(false);
+      if (value !== tempLeverage) {
+        leverageChangeTime.current = Date.now();
+        setLeverageChanged(true);
+        lastValidLiquidationPrice.current = null;
+      }
+      setTempLeverage(value);
+      setDraggingLeverage(value);
+      setInputMethod('preset');
+
+      // Arm the guard before the remount state flush so any late drag
+      // callbacks queued in this tick cannot overwrite tempLeverage.
+      if (wasDragging || hasSliderDraggedRef.current) {
+        isSliderRemountingRef.current = true;
+      }
 
-  // const footerButtonProps = [
-  //   {
-  //     label: strings('perps.order.leverage_modal.set_leverage', {
-  //       leverage: displayLeverage,
-  //     }),
-  //     variant: ButtonVariant.Primary,
-  //     size: ButtonSize.Lg,
-  //     onPress: handleConfirm,
-  //   },
-  // ];
+      setSliderEntries((prev) => {
+        const hasIncoming = prev.some((entry) => entry.role === 'incoming');
+        const shouldRemountSlider =
+          wasDragging || hasSliderDraggedRef.current || hasIncoming;
+
+        if (!shouldRemountSlider) {
+          isSliderRemountingRef.current = false;
+          return prev.map((entry) =>
+            entry.role === 'active' ? { ...entry, value } : entry,
+          );
+        }
+
+        isSliderRemountingRef.current = true;
+        hasSliderDraggedRef.current = false;
+        const active = prev.find((entry) => entry.role === 'active') ?? prev[0];
+        const nextKey = Math.max(...prev.map((entry) => entry.key)) + 1;
+        return [
+          { key: active.key, value: active.value, role: 'active' },
+          { key: nextKey, value, role: 'incoming' },
+        ];
+      });
+
+      playSelection();
+    },
+    [isDragging, tempLeverage],
+  );
 
   if (!isVisible) return null;
 
   return (
-    <BottomSheet
-      ref={bottomSheetRef}
-      // shouldNavigateBack={false}
-      onClose={onClose}
-    >
+    <BottomSheet ref={bottomSheetRef} onClose={onClose}>
       <BottomSheetHeader onClose={onClose}>
-        <Text variant={TextVariant.HeadingMd} fontWeight={FontWeight.Bold}>
-          {strings('perps.order.leverage_modal.title')}
-        </Text>
+        {strings('perps.order.leverage_modal.title')}
       </BottomSheetHeader>
 
       <ScrollView
@@ -686,191 +509,150 @@ const PerpsLeverageBottomSheet: React.FC<PerpsLeverageBottomSheetProps> = ({
         showsVerticalScrollIndicator={false}
         keyboardShouldPersistTaps="handled"
       >
-        <View style={styles.container}>
-          {/* Large leverage display */}
-          <View style={styles.leverageDisplay}>
-            <Text
-              variant={TextVariant.DisplayLg}
-              fontWeight={FontWeight.Bold}
-              style={getLeverageTextStyle()}
-            >
+        <Box twClassName="pb-4">
+          <Box twClassName="items-center px-4 py-4">
+            <Text variant={TextVariant.DisplayLg} color={TextColor.TextDefault}>
               {displayLeverage}x
             </Text>
-          </View>
-
-          {/* Liquidation warning */}
-          <View style={[styles.warningContainer, warningStyles.containerStyle]}>
-            <Icon
-              name={IconName.Danger}
-              size={IconSize.Sm}
-              color={warningStyles.iconColor}
-              style={styles.warningIcon}
-            />
-            <View style={styles.warningTextContainer}>
-              {isRecalculating ? (
-                <Skeleton width="80%" height={14} />
-              ) : (
-                <Text
-                  variant={TextVariant.BodySm}
-                  style={[warningStyles.textStyle, styles.warningText]}
+          </Box>
+
+          <Box
+            twClassName="relative px-4"
+            onTouchCancel={handleSliderDragCancel}
+          >
+            {sliderEntries.map((entry) => {
+              const isActive = entry.role === 'active';
+              // Outgoing active slider must not accept input during remount;
+              // late dragEnd would overwrite the chip's tempLeverage.
+              const acceptsInput = isActive && !hasIncomingSlider;
+              const sliderValue =
+                acceptsInput && isDragging ? draggingLeverage : entry.value;
+
+              return (
+                <Box
+                  key={entry.key}
+                  testID={
+                    isActive
+                      ? undefined
+                      : PerpsLeverageBottomSheetSelectorsIDs.SLIDER_INCOMING_WRAP
+                  }
+                  style={isActive ? undefined : styles.sliderIncoming}
+                  pointerEvents={acceptsInput ? 'auto' : 'none'}
+                  onLayout={
+                    isActive
+                      ? undefined
+                      : () => {
+                          promoteIncomingSlider(entry.key);
+                        }
+                  }
                 >
-                  {strings('perps.order.leverage_modal.liquidation_warning', {
-                    direction:
-                      direction === 'long'
-                        ? strings('perps.order.leverage_modal.drops')
-                        : strings('perps.order.leverage_modal.rises'),
-                    percentage: displayLiquidationPercentage ?? '--',
-                  })}
-                </Text>
-              )}
-            </View>
-          </View>
-
-          {/* Price information */}
+                  <Slider
+                    testID={
+                      isActive
+                        ? PerpsLeverageBottomSheetSelectorsIDs.SLIDER
+                        : PerpsLeverageBottomSheetSelectorsIDs.SLIDER_INCOMING
+                    }
+                    value={sliderValue}
+                    onValueChange={
+                      acceptsInput ? handleSliderChange : () => undefined
+                    }
+                    onDragEnd={acceptsInput ? handleSliderDragEnd : undefined}
+                    minimumValue={minLeverage}
+                    maximumValue={maxLeverage}
+                    step={1}
+                    marks={sliderMarks}
+                    showRangeLabels
+                    showRangeDots
+                    onGrip={acceptsInput ? handleSliderGrip : undefined}
+                    onMark={acceptsInput ? handleSliderMark : undefined}
+                  />
+                </Box>
+              );
+            })}
+          </Box>
+
+          <Box twClassName="flex-row justify-between gap-2 px-4 mt-1 mb-4">
+            {quickSelectValues.map((value) => (
+              <Button
+                key={value}
+                variant={ButtonVariant.Secondary}
+                size={ButtonSize.Md}
+                onPress={() => handleQuickSelect(value)}
+                testID={`${PerpsLeverageBottomSheetSelectorsIDs.QUICK_SELECT}-${value}`}
+                twClassName="flex-1"
+              >
+                {`${value}x`}
+              </Button>
+            ))}
+          </Box>
+
+          <Box
+            twClassName="items-center justify-center px-4 mb-4"
+            style={styles.helpTextContainer}
+          >
+            {isRecalculating ? (
+              <Skeleton width="80%" height={14} />
+            ) : (
+              <HelpText
+                testID={PerpsLeverageBottomSheetSelectorsIDs.HELP_TEXT}
+                twClassName="w-full justify-center text-center"
+              >
+                {strings('perps.order.leverage_modal.liquidation_warning', {
+                  direction:
+                    direction === 'long'
+                      ? strings('perps.order.leverage_modal.drops')
+                      : strings('perps.order.leverage_modal.rises'),
+                  percentage: displayLiquidationPercentage ?? '--',
+                })}
+              </HelpText>
+            )}
+          </Box>
+
           {currentPrice ? (
-            <View style={styles.priceInfoContainer}>
-              <View style={styles.priceRow}>
-                <Text
-                  variant={TextVariant.BodyMd}
-                  style={{ color: warningStyles.priceColor }}
-                >
-                  {strings('perps.order.leverage_modal.liquidation_price')}
-                </Text>
-                <View style={styles.priceValueContainer}>
-                  {isRecalculating ? (
+            <Box
+              twClassName="mb-2 justify-center"
+              style={styles.priceInfoContainer}
+            >
+              <KeyValueRow
+                variant={KeyValueRowVariant.Summary}
+                keyLabel={strings(
+                  'perps.order.leverage_modal.liquidation_price',
+                )}
+                value={
+                  isRecalculating ? (
                     <Skeleton width={80} height={16} />
+                  ) : displayLiquidationPrice ? (
+                    formatPerpsFiat(displayLiquidationPrice, {
+                      ranges: PRICE_RANGES_UNIVERSAL,
+                    })
                   ) : (
-                    <Text
-                      variant={TextVariant.BodyMd}
-                      style={{ color: warningStyles.priceColor }}
-                    >
-                      {displayLiquidationPrice
-                        ? formatPerpsFiat(displayLiquidationPrice, {
-                            ranges: PRICE_RANGES_UNIVERSAL,
-                          })
-                        : '--'}
-                    </Text>
-                  )}
-                </View>
-              </View>
-              <View style={styles.priceRow}>
-                <Text
-                  variant={TextVariant.BodyMd}
-                  color={TextColor.TextAlternative}
-                >
-                  {strings('perps.order.leverage_modal.current_price')}
-                </Text>
-                <Text
-                  variant={TextVariant.BodyMd}
-                  color={TextColor.TextDefault}
-                >
-                  {formatPerpsFiat(currentPrice, {
-                    ranges: PRICE_RANGES_UNIVERSAL,
-                  })}
-                </Text>
-              </View>
-            </View>
+                    '--'
+                  )
+                }
+              />
+              <KeyValueRow
+                variant={KeyValueRowVariant.Summary}
+                keyLabel={strings('perps.order.leverage_modal.current_price')}
+                value={formatPerpsFiat(currentPrice, {
+                  ranges: PRICE_RANGES_UNIVERSAL,
+                })}
+              />
+            </Box>
           ) : (
-            <View style={styles.priceInfoContainer}>
+            <Box
+              twClassName="mb-2 justify-center"
+              style={styles.priceInfoContainer}
+            >
               <Text
                 variant={TextVariant.BodyMd}
                 color={TextColor.TextAlternative}
-                style={styles.emptyPriceInfo}
+                twClassName="text-center px-4 py-4"
               >
                 {strings('perps.order.leverage_modal.price_unavailable')}
               </Text>
-            </View>
+            </Box>
           )}
-
-          {/* Custom Leverage Slider */}
-          <View style={styles.sliderContainer}>
-            <LeverageSlider
-              value={isDragging ? draggingLeverage : tempLeverage}
-              onValueChange={(newValue) => {
-                if (isDragging) {
-                  setDraggingLeverage(newValue);
-                } else {
-                  setTempLeverage(newValue);
-                }
-              }}
-              onDragStart={() => {
-                setIsDragging(true);
-                setDraggingLeverage(tempLeverage);
-              }}
-              onDragEnd={(finalValue) => {
-                setIsDragging(false);
-                if (finalValue !== tempLeverage) {
-                  leverageChangeTime.current = Date.now();
-                  setLeverageChanged(true);
-                  lastValidLiquidationPrice.current = null;
-                }
-                setTempLeverage(finalValue);
-                setInputMethod('slider');
-              }}
-              minValue={minLeverage}
-              maxValue={maxLeverage}
-              colors={colors}
-              onInteraction={() => setInputMethod('slider')}
-            />
-            <View style={styles.sliderLabels}>
-              <Text
-                variant={TextVariant.BodySm}
-                color={TextColor.TextAlternative}
-              >
-                {minLeverage}x
-              </Text>
-              <Text
-                variant={TextVariant.BodySm}
-                color={TextColor.TextAlternative}
-              >
-                {Math.floor((minLeverage + maxLeverage) / 2)}x
-              </Text>
-              <Text
-                variant={TextVariant.BodySm}
-                color={TextColor.TextAlternative}
-              >
-                {maxLeverage}x
-              </Text>
-            </View>
-          </View>
-
-          {/* Quick select buttons */}
-          <View style={styles.quickSelectButtons}>
-            {quickSelectValues.map((value) => (
-              <TouchableOpacity
-                key={value}
-                style={[
-                  styles.quickSelectButton,
-                  tempLeverage === value && styles.quickSelectButtonActive,
-                ]}
-                onPress={() => {
-                  setIsDragging(false); // Ensure we're not in dragging state
-                  if (value !== tempLeverage) {
-                    leverageChangeTime.current = Date.now();
-                    setLeverageChanged(true);
-                    lastValidLiquidationPrice.current = null;
-                  }
-                  setTempLeverage(value);
-                  setInputMethod('preset');
-                  // Add haptic feedback for quick select buttons
-                  playSelection();
-                }}
-              >
-                <Text
-                  variant={TextVariant.BodyMd}
-                  color={
-                    tempLeverage === value
-                      ? TextColor.PrimaryInverse
-                      : TextColor.TextDefault
-                  }
-                  style={styles.quickSelectText}
-                >
-                  {value}x
-                </Text>
-              </TouchableOpacity>
-            ))}
-          </View>
-        </View>
+        </Box>
       </ScrollView>
 
       <BottomSheetFooter
@@ -880,7 +662,7 @@ const PerpsLeverageBottomSheet: React.FC<PerpsLeverageBottomSheetProps> = ({
           children: strings('perps.order.leverage_modal.set_leverage', {
             leverage: displayLeverage,
           }),
-          style: styles.footerButtonContainer,
+          twClassName: 'mb-4',
         }}
       />
     </BottomSheet>
diff --git a/app/components/UI/Perps/components/PerpsLimitPriceBottomSheet/PerpsLimitPriceBottomSheet.test.tsx b/app/components/UI/Perps/components/PerpsLimitPriceBottomSheet/PerpsLimitPriceBottomSheet.test.tsx
index 7665036b61c2..7ab48519637f 100644
--- a/app/components/UI/Perps/components/PerpsLimitPriceBottomSheet/PerpsLimitPriceBottomSheet.test.tsx
+++ b/app/components/UI/Perps/components/PerpsLimitPriceBottomSheet/PerpsLimitPriceBottomSheet.test.tsx
@@ -26,6 +26,10 @@ jest.mock('../../hooks/stream', () => ({
     bestBid: '2995',
     bestAsk: '3005',
   })),
+  usePerpsLiveAccount: jest.fn(() => ({
+    account: { spendableBalance: '1000' },
+    isInitialLoading: false,
+  })),
 }));
 
 jest.mock('../../hooks/usePerpsEventTracking', () => ({
@@ -588,6 +592,21 @@ describe('PerpsLimitPriceBottomSheet', () => {
         screen.queryByText('perps.order.limit_price_modal.title'),
       ).toBeNull();
     });
+
+    it('reseeds the keypad when the target order limit price changes while open', () => {
+      const { rerender } = render(
+        <PerpsLimitPriceBottomSheet {...defaultProps} limitPrice="160.71" />,
+      );
+
+      fireEvent.press(screen.getByTestId('keypad-button-1'));
+      expect(screen.getByTestId('keypad-value')).toHaveTextContent('160.711');
+
+      rerender(
+        <PerpsLimitPriceBottomSheet {...defaultProps} limitPrice="200.5" />,
+      );
+
+      expect(screen.getByTestId('keypad-value')).toHaveTextContent('200.5');
+    });
   });
 
   describe('Accessibility', () => {
diff --git a/app/components/UI/Perps/components/PerpsLimitPriceBottomSheet/PerpsLimitPriceBottomSheet.tsx b/app/components/UI/Perps/components/PerpsLimitPriceBottomSheet/PerpsLimitPriceBottomSheet.tsx
index abb8b4e92a48..38cb6190ba47 100644
--- a/app/components/UI/Perps/components/PerpsLimitPriceBottomSheet/PerpsLimitPriceBottomSheet.tsx
+++ b/app/components/UI/Perps/components/PerpsLimitPriceBottomSheet/PerpsLimitPriceBottomSheet.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState, memo } from 'react';
+import React, { useCallback, useEffect, useMemo, useState, memo } from 'react';
 import { strings } from '../../../../../../locales/i18n';
 import {
   BottomSheet,
@@ -14,7 +14,6 @@ import {
   TextColor,
   TextField,
   TextVariant,
-  type BottomSheetRef,
 } from '@metamask/design-system-react-native';
 import Keypad from '../../../../Base/Keypad';
 import {
@@ -30,8 +29,16 @@ import {
   PERPS_EVENT_VALUE,
 } from '@metamask/perps-controller';
 import { PerpsLimitPriceBottomSheetSelectorsIDs } from '../../Perps.testIds';
-import { usePerpsLivePrices, usePerpsTopOfBook } from '../../hooks/stream';
-import { LIMIT_PRICE_CONFIG } from '../../constants/perpsConfig';
+import {
+  usePerpsLiveAccount,
+  usePerpsLivePrices,
+  usePerpsTopOfBook,
+} from '../../hooks/stream';
+import {
+  LIMIT_PRICE_CONFIG,
+  MAX_PERPS_INPUT_DIGITS,
+} from '../../constants/perpsConfig';
+import { getIncrementalMarginInsufficientBalanceError } from '../../utils/openOrderMarginValidation';
 import { isPriceOutsideDeviationBand } from '../../utils/orderUtils';
 import { BigNumber } from 'bignumber.js';
 import { usePerpsEventTracking } from '../../hooks/usePerpsEventTracking';
@@ -46,6 +53,14 @@ interface PerpsLimitPriceBottomSheetProps {
   currentPrice?: number;
   direction?: 'long' | 'short';
   isClosingPosition?: boolean;
+  /** When set (open-order price edit), enable incremental margin validation. */
+  restingOrderSize?: string;
+  /** Effective asset leverage for open-order margin validation. */
+  leverage?: number;
+  /** Skip margin validation for reduce-only close orders. */
+  reduceOnly?: boolean;
+  /** When false during open-order edit, hold confirm until market leverage is ready. */
+  isMarketDataReady?: boolean;
 }
 
 /**
@@ -67,9 +82,11 @@ const PerpsLimitPriceBottomSheet: React.FC<PerpsLimitPriceBottomSheetProps> = ({
   currentPrice: passedCurrentPrice = 0,
   direction = 'long',
   isClosingPosition = false,
+  restingOrderSize,
+  leverage = PERPS_CONSTANTS.DefaultMaxLeverage,
+  reduceOnly = false,
+  isMarketDataReady = true,
 }) => {
-  const bottomSheetRef = useRef<BottomSheetRef>(null);
-
   // Initialize with initial limit price or empty to show placeholder
   const [limitPrice, setLimitPrice] = useState(initialLimitPrice || '');
 
@@ -79,6 +96,13 @@ const PerpsLimitPriceBottomSheet: React.FC<PerpsLimitPriceBottomSheetProps> = ({
   // MetaMetrics tracking
   const { track } = usePerpsEventTracking();
 
+  const isOpenOrderPriceEdit = restingOrderSize !== undefined;
+  const { account, isInitialLoading: isAccountLoading } = usePerpsLiveAccount({
+    enabled: isVisible && isOpenOrderPriceEdit,
+  });
+  const isAccountReady = !isAccountLoading && account !== null;
+  const spendableBalance = Number.parseFloat(account?.spendableBalance ?? '0');
+
   // Get real-time price data with 1000ms throttle for limit price bottom sheet
   // Only subscribe when visible
   const priceData = usePerpsLivePrices({
@@ -112,10 +136,13 @@ const PerpsLimitPriceBottomSheet: React.FC<PerpsLimitPriceBottomSheetProps> = ({
 
   useEffect(() => {
     if (isVisible) {
+      // Re-seed from props whenever visibility or the target order's price
+      // changes — otherwise switching edit targets while mounted keeps the
+      // previous order's typed keypad value.
+      setLimitPrice(initialLimitPrice || '');
       setInputMethod(null); // Reset input method tracking for new session
-      bottomSheetRef.current?.onOpenBottomSheet();
     }
-  }, [isVisible]);
+  }, [initialLimitPrice, isVisible]);
 
   const handleConfirm = () => {
     // Remove any formatting (commas, dollar signs) before passing the value
@@ -140,10 +167,10 @@ const PerpsLimitPriceBottomSheet: React.FC<PerpsLimitPriceBottomSheetProps> = ({
 
   const handleKeypadChange = useCallback(
     ({ value }: { value: string; valueAsNumber: number }) => {
-      // Enforce 9-digit limit (ignore non-digits like '.' or ',')
+      // Enforce digit limit (ignore non-digits like '.' or ',')
       const digitCount = (value.match(/\d/g) || []).length;
-      if (digitCount > 9) {
-        return; // Ignore input that would exceed 9 digits
+      if (digitCount > MAX_PERPS_INPUT_DIGITS) {
+        return; // Ignore input that would exceed the max digit limit
       }
       setLimitPrice(value || '');
       setInputMethod(PERPS_EVENT_VALUE.INPUT_METHOD.KEYBOARD);
@@ -330,14 +357,62 @@ const PerpsLimitPriceBottomSheet: React.FC<PerpsLimitPriceBottomSheetProps> = ({
     [applyLimitPrice, calculatePriceForPercentage],
   );
 
+  const marginError = useMemo(() => {
+    if (!isOpenOrderPriceEdit || !isAccountReady || !isMarketDataReady) {
+      return '';
+    }
+
+    const parsedEditedPrice = parseFloat(limitPrice.replace(/[$,]/g, ''));
+    const parsedInitialPrice = parseFloat(
+      (initialLimitPrice ?? '').replace(/[$,]/g, ''),
+    );
+    const parsedSize = parseFloat((restingOrderSize ?? '').replace(/,/g, ''));
+    if (
+      !Number.isFinite(parsedEditedPrice) ||
+      parsedEditedPrice <= 0 ||
+      !Number.isFinite(parsedSize) ||
+      parsedSize <= 0
+    ) {
+      return '';
+    }
+
+    const editedNotionalUsd = parsedSize * parsedEditedPrice;
+    const currentNotionalUsd =
+      Number.isFinite(parsedInitialPrice) && parsedInitialPrice > 0
+        ? parsedSize * parsedInitialPrice
+        : 0;
+
+    return getIncrementalMarginInsufficientBalanceError({
+      editedNotionalUsd,
+      currentNotionalUsd,
+      spendableBalance,
+      leverage,
+      reduceOnly,
+    });
+  }, [
+    initialLimitPrice,
+    isAccountReady,
+    isMarketDataReady,
+    isOpenOrderPriceEdit,
+    leverage,
+    limitPrice,
+    reduceOnly,
+    restingOrderSize,
+    spendableBalance,
+  ]);
+
   const isConfirmDisabled =
     !limitPrice ||
     limitPrice === '' ||
     limitPrice === '0' ||
     parseFloat(limitPrice.replace(/[$,]/g, '')) <= 0 ||
-    exceedsMaxDeviation;
+    exceedsMaxDeviation ||
+    (isOpenOrderPriceEdit && (!isAccountReady || !isMarketDataReady)) ||
+    Boolean(marginError);
 
-  const hasInputError = Boolean(exceedsMaxDeviation || limitPriceWarning);
+  const hasInputError = Boolean(
+    exceedsMaxDeviation || limitPriceWarning || marginError,
+  );
   const formattedLimitPrice = formatLimitPriceValue(limitPrice);
   const isLong = direction === 'long';
   const percentagePresets = isLong
@@ -347,7 +422,7 @@ const PerpsLimitPriceBottomSheet: React.FC<PerpsLimitPriceBottomSheetProps> = ({
   if (!isVisible) return null;
 
   return (
-    <BottomSheet ref={bottomSheetRef} onClose={onClose}>
+    <BottomSheet onClose={onClose}>
       <BottomSheetHeader onClose={onClose}>
         {strings('perps.order.limit_price_modal.title')}
       </BottomSheetHeader>
@@ -377,7 +452,7 @@ const PerpsLimitPriceBottomSheet: React.FC<PerpsLimitPriceBottomSheetProps> = ({
           <HelpText severity={HelpTextSeverity.Danger} showIcon>
             {exceedsMaxDeviation
               ? strings('perps.order.limit_price_modal.limit_price_too_far')
-              : limitPriceWarning}
+              : marginError || limitPriceWarning}
           </HelpText>
         ) : (
           <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
@@ -479,6 +554,12 @@ export default memo(PerpsLimitPriceBottomSheet, (prevProps, nextProps) => {
     prevProps.isVisible === nextProps.isVisible &&
     prevProps.asset === nextProps.asset &&
     prevProps.limitPrice === nextProps.limitPrice &&
-    prevProps.direction === nextProps.direction
+    prevProps.direction === nextProps.direction &&
+    prevProps.restingOrderSize === nextProps.restingOrderSize &&
+    prevProps.leverage === nextProps.leverage &&
+    prevProps.reduceOnly === nextProps.reduceOnly &&
+    prevProps.isMarketDataReady === nextProps.isMarketDataReady &&
+    prevProps.onConfirm === nextProps.onConfirm &&
+    prevProps.onClose === nextProps.onClose
   );
 });
diff --git a/app/components/UI/Perps/components/PerpsMarginModeBottomSheet/PerpsMarginModeBottomSheet.test.tsx b/app/components/UI/Perps/components/PerpsMarginModeBottomSheet/PerpsMarginModeBottomSheet.test.tsx
new file mode 100644
index 000000000000..b670ea878812
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsMarginModeBottomSheet/PerpsMarginModeBottomSheet.test.tsx
@@ -0,0 +1,101 @@
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import PerpsMarginModeBottomSheet from './PerpsMarginModeBottomSheet';
+import { PerpsMarginModeBottomSheetSelectorsIDs } from '../../Perps.testIds';
+
+jest.mock('@metamask/design-system-twrnc-preset', () => {
+  const tw = (..._args: unknown[]) => ({});
+  tw.style = jest.fn(() => ({}));
+  return { useTailwind: () => tw };
+});
+
+// Use a plain function (not jest.fn()) so jest.clearAllMocks() cannot wipe its implementation
+jest.mock('../../../../../../locales/i18n', () => ({
+  strings: (key: string) => {
+    const translations: Record<string, string> = {
+      'perps.margin_mode.title': 'Choose margin mode',
+      'perps.margin_mode.isolated_title': 'Isolated',
+      'perps.margin_mode.isolated_description':
+        'Each position uses only its allocated margin.',
+      'perps.margin_mode.cross_title': 'Cross',
+      'perps.margin_mode.cross_description':
+        'Your full account balance is shared across all positions.',
+    };
+    return translations[key] || key;
+  },
+}));
+
+describe('PerpsMarginModeBottomSheet', () => {
+  // Declare inside beforeEach so each test gets a fresh jest.fn() instance
+  let defaultProps: { isVisible: boolean; onClose: jest.Mock };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    defaultProps = {
+      isVisible: true,
+      onClose: jest.fn(),
+    };
+  });
+
+  it('renders Isolated and Cross rows when visible', () => {
+    render(<PerpsMarginModeBottomSheet {...defaultProps} />);
+    expect(
+      screen.getByTestId(
+        PerpsMarginModeBottomSheetSelectorsIDs.ISOLATED_OPTION,
+      ),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsMarginModeBottomSheetSelectorsIDs.CROSS_OPTION),
+    ).toBeOnTheScreen();
+  });
+
+  it('returns null when not visible', () => {
+    render(<PerpsMarginModeBottomSheet {...defaultProps} isVisible={false} />);
+    expect(
+      screen.queryByTestId(PerpsMarginModeBottomSheetSelectorsIDs.CONTAINER),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('calls onClose when the Isolated row is pressed', () => {
+    const onClose = jest.fn();
+    render(<PerpsMarginModeBottomSheet {...defaultProps} onClose={onClose} />);
+    fireEvent.press(
+      screen.getByTestId(
+        PerpsMarginModeBottomSheetSelectorsIDs.ISOLATED_OPTION,
+      ),
+    );
+    expect(onClose).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders the margin mode title', () => {
+    render(<PerpsMarginModeBottomSheet {...defaultProps} />);
+    expect(
+      screen.getByTestId(PerpsMarginModeBottomSheetSelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the bottom sheet container', () => {
+    render(<PerpsMarginModeBottomSheet {...defaultProps} />);
+    expect(
+      screen.getByTestId(PerpsMarginModeBottomSheetSelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+  });
+
+  it('does not call onClose when the disabled Cross row is pressed', () => {
+    const onClose = jest.fn();
+    render(<PerpsMarginModeBottomSheet {...defaultProps} onClose={onClose} />);
+    fireEvent.press(
+      screen.getByTestId(PerpsMarginModeBottomSheetSelectorsIDs.CROSS_OPTION),
+    );
+    expect(onClose).not.toHaveBeenCalled();
+  });
+
+  it('calls onClose when the header close button is pressed', () => {
+    const onClose = jest.fn();
+    render(<PerpsMarginModeBottomSheet {...defaultProps} onClose={onClose} />);
+    fireEvent.press(
+      screen.getByTestId(PerpsMarginModeBottomSheetSelectorsIDs.CLOSE_BUTTON),
+    );
+    expect(onClose).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/app/components/UI/Perps/components/PerpsMarginModeBottomSheet/PerpsMarginModeBottomSheet.tsx b/app/components/UI/Perps/components/PerpsMarginModeBottomSheet/PerpsMarginModeBottomSheet.tsx
new file mode 100644
index 000000000000..12edd54f31bc
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsMarginModeBottomSheet/PerpsMarginModeBottomSheet.tsx
@@ -0,0 +1,81 @@
+import React, { useCallback, useEffect, useRef } from 'react';
+import {
+  BottomSheet,
+  BottomSheetHeader,
+  ListItemSelect,
+  type BottomSheetRef,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import { PerpsMarginModeBottomSheetSelectorsIDs } from '../../Perps.testIds';
+
+interface PerpsMarginModeBottomSheetProps {
+  isVisible?: boolean;
+  onClose: () => void;
+  sheetRef?: React.RefObject<BottomSheetRef | null>;
+}
+
+const PerpsMarginModeBottomSheet: React.FC<PerpsMarginModeBottomSheetProps> = ({
+  isVisible = true,
+  onClose,
+  sheetRef: externalSheetRef,
+}) => {
+  const internalSheetRef = useRef<BottomSheetRef>(null);
+  const sheetRef = externalSheetRef ?? internalSheetRef;
+
+  useEffect(() => {
+    if (isVisible && !externalSheetRef) {
+      sheetRef.current?.onOpenBottomSheet();
+    }
+  }, [isVisible, externalSheetRef, sheetRef]);
+
+  const handleClose = useCallback(() => {
+    sheetRef.current?.onCloseBottomSheet();
+  }, [sheetRef]);
+
+  const handleIsolatedPress = useCallback(() => {
+    handleClose();
+  }, [handleClose]);
+
+  if (!isVisible) {
+    return null;
+  }
+
+  return (
+    <BottomSheet
+      ref={sheetRef}
+      testID={PerpsMarginModeBottomSheetSelectorsIDs.CONTAINER}
+      goBack={!externalSheetRef ? onClose : undefined}
+      onClose={externalSheetRef ? onClose : undefined}
+    >
+      <BottomSheetHeader
+        onClose={handleClose}
+        closeButtonProps={{
+          testID: PerpsMarginModeBottomSheetSelectorsIDs.CLOSE_BUTTON,
+        }}
+      >
+        {strings('perps.margin_mode.title')}
+      </BottomSheetHeader>
+      <ListItemSelect
+        title={strings('perps.margin_mode.isolated_title')}
+        description={strings('perps.margin_mode.isolated_description')}
+        isSelected
+        showSelectedIcon
+        onPress={handleIsolatedPress}
+        testID={PerpsMarginModeBottomSheetSelectorsIDs.ISOLATED_OPTION}
+      />
+      <ListItemSelect
+        title={strings('perps.margin_mode.cross_title')}
+        description={strings('perps.margin_mode.cross_description')}
+        isSelected={false}
+        showSelectedIcon
+        disabled
+        twClassName="opacity-50"
+        testID={PerpsMarginModeBottomSheetSelectorsIDs.CROSS_OPTION}
+      />
+    </BottomSheet>
+  );
+};
+
+PerpsMarginModeBottomSheet.displayName = 'PerpsMarginModeBottomSheet';
+
+export default PerpsMarginModeBottomSheet;
diff --git a/app/components/UI/Perps/components/PerpsMarginModeBottomSheet/index.ts b/app/components/UI/Perps/components/PerpsMarginModeBottomSheet/index.ts
new file mode 100644
index 000000000000..e2150c404dcc
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsMarginModeBottomSheet/index.ts
@@ -0,0 +1 @@
+export { default } from './PerpsMarginModeBottomSheet';
diff --git a/app/components/UI/Perps/components/PerpsMarketHeader/PerpsMarketHeader.test.tsx b/app/components/UI/Perps/components/PerpsMarketHeader/PerpsMarketHeader.test.tsx
index d343bbde1aa6..2b92196f7502 100644
--- a/app/components/UI/Perps/components/PerpsMarketHeader/PerpsMarketHeader.test.tsx
+++ b/app/components/UI/Perps/components/PerpsMarketHeader/PerpsMarketHeader.test.tsx
@@ -1,10 +1,17 @@
 import React from 'react';
-import { fireEvent } from '@testing-library/react-native';
-import PerpsMarketHeader from './';
+import { Text } from '@metamask/design-system-react-native';
+import { act, fireEvent } from '@testing-library/react-native';
+import { PerpsMode, type PerpsMarketData } from '@metamask/perps-controller';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../../util/test/initial-root-state';
-import { PerpsMarketHeaderSelectorsIDs } from '../../Perps.testIds';
-import { PerpsMarketData } from '@metamask/perps-controller';
+import {
+  PerpsMarketHeaderSelectorsIDs,
+  PerpsModeToggleSelectorsIDs,
+  PerpsProMarketViewSelectorsIDs,
+} from '../../Perps.testIds';
+import PerpsMarketHeader from './PerpsMarketHeader';
+import { createProMarketHeaderTestIDs } from './perpsMarketHeaderTestIds';
+import { GLOW_TOTAL_MS } from '../PerpsModeToggle/PerpsModeSwitchPill';
 
 jest.mock('../../providers/PerpsStreamManager');
 
@@ -24,68 +31,254 @@ const initialState = {
   },
 };
 
+const renderHeader = (
+  overrides: Partial<React.ComponentProps<typeof PerpsMarketHeader>> = {},
+) =>
+  renderWithProvider(
+    <PerpsMarketHeader
+      market={mockMarket}
+      testIDs={createProMarketHeaderTestIDs()}
+      mode={PerpsMode.Pro}
+      {...overrides}
+    />,
+    { state: initialState },
+  );
+
 describe('PerpsMarketHeader', () => {
-  it('renders correctly', () => {
-    const { getByTestId } = renderWithProvider(
-      <PerpsMarketHeader
-        market={mockMarket}
-        testID={PerpsMarketHeaderSelectorsIDs.CONTAINER}
-        currentPrice={45000}
-      />,
-      { state: initialState },
-    );
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('renders the asset name, leverage, and ticker subtitle', () => {
+    const { getByTestId, getByText } = renderHeader();
+
+    expect(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL),
+    ).toHaveTextContent('Bitcoin');
+    expect(getByText('40x')).toBeOnTheScreen();
+    expect(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SUBTITLE),
+    ).toHaveTextContent('BTC-USD perp');
+  });
+
+  it('falls back to the display symbol when the market has no name', () => {
+    const { getByTestId, queryByText } = renderHeader({
+      market: { symbol: 'ETH', maxLeverage: '25x' },
+    });
 
-    expect(getByTestId(PerpsMarketHeaderSelectorsIDs.CONTAINER)).toBeTruthy();
+    expect(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL),
+    ).toHaveTextContent('ETH');
+    expect(queryByText('Bitcoin')).not.toBeOnTheScreen();
   });
 
-  it('handles back button press', () => {
+  it('hides the leverage tag when maxLeverage is missing', () => {
+    const { getByTestId, queryByText } = renderHeader({
+      market: { symbol: 'BTC', name: 'Bitcoin' },
+    });
+
+    expect(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL),
+    ).toHaveTextContent('Bitcoin');
+    expect(queryByText('40x')).not.toBeOnTheScreen();
+  });
+
+  it('strips HIP-3 dex prefixes from the ticker subtitle', () => {
+    const { getByTestId } = renderHeader({
+      market: { symbol: 'xyz:TSLA', name: 'Tesla', maxLeverage: '10x' },
+    });
+
+    expect(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL),
+    ).toHaveTextContent('Tesla');
+    expect(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SUBTITLE),
+    ).toHaveTextContent('TSLA-USD perp');
+  });
+
+  it('fires onBackPress from the back button', () => {
     const onBackPress = jest.fn();
-    const { getByTestId } = renderWithProvider(
-      <PerpsMarketHeader
-        market={mockMarket}
-        onBackPress={onBackPress}
-        testID={PerpsMarketHeaderSelectorsIDs.CONTAINER}
-        currentPrice={45000}
-      />,
-      { state: initialState },
+    const { getByTestId } = renderHeader({ onBackPress });
+
+    fireEvent.press(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_BACK_BUTTON),
     );
 
-    fireEvent.press(getByTestId(PerpsMarketHeaderSelectorsIDs.BACK_BUTTON));
-    expect(onBackPress).toHaveBeenCalled();
+    expect(onBackPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('omits the back button when onBackPress is not provided', () => {
+    const { queryByTestId } = renderHeader();
+
+    expect(
+      queryByTestId(PerpsProMarketViewSelectorsIDs.HEADER_BACK_BUTTON),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('fires onIdentityPress from the market identity and shows the caret', () => {
+    const onIdentityPress = jest.fn();
+    const { getByTestId } = renderHeader({ onIdentityPress });
+
+    fireEvent.press(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_MARKET_LIST_BUTTON),
+    );
+
+    expect(onIdentityPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders a non-interactive identity when onIdentityPress is omitted', () => {
+    const { queryByTestId, getByTestId } = renderHeader();
+
+    expect(
+      queryByTestId(PerpsProMarketViewSelectorsIDs.HEADER_MARKET_LIST_BUTTON),
+    ).not.toBeOnTheScreen();
+    expect(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL),
+    ).toBeOnTheScreen();
+  });
+
+  it('hides the market identity for the Lite header layout', () => {
+    const { queryByTestId } = renderHeader({
+      showMarketIdentity: false,
+    });
+
+    expect(
+      queryByTestId(PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL),
+    ).not.toBeOnTheScreen();
+    expect(
+      queryByTestId(PerpsProMarketViewSelectorsIDs.HEADER_ASSET_ICON),
+    ).not.toBeOnTheScreen();
   });
 
-  it('handles more button press', () => {
-    const onMorePress = jest.fn();
-    const { getByTestId } = renderWithProvider(
-      <PerpsMarketHeader
-        market={mockMarket}
-        onMorePress={onMorePress}
-        testID={PerpsMarketHeaderSelectorsIDs.CONTAINER}
-        currentPrice={45000}
-      />,
-      { state: initialState },
+  it('fires onWalletPress from the wallet button', () => {
+    const onWalletPress = jest.fn();
+    const { getByTestId } = renderHeader({ onWalletPress });
+
+    fireEvent.press(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_WALLET_BUTTON),
     );
 
-    fireEvent.press(getByTestId(PerpsMarketHeaderSelectorsIDs.MORE_BUTTON));
-    expect(onMorePress).toHaveBeenCalled();
+    expect(onWalletPress).toHaveBeenCalledTimes(1);
   });
 
-  it('renders correctly without maxLeverage', () => {
-    const marketWithoutLeverage = {
-      ...mockMarket,
-      maxLeverage: undefined,
-    };
+  it('fires onFavoritePress from the favorite button', () => {
+    const onFavoritePress = jest.fn();
+    const { getByTestId } = renderHeader({ onFavoritePress });
 
-    const { getByTestId, queryByText } = renderWithProvider(
-      <PerpsMarketHeader
-        market={marketWithoutLeverage as unknown as PerpsMarketData}
-        testID={PerpsMarketHeaderSelectorsIDs.CONTAINER}
-        currentPrice={45000}
-      />,
-      { state: initialState },
+    fireEvent.press(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_FAVORITE_BUTTON),
     );
 
-    expect(getByTestId(PerpsMarketHeaderSelectorsIDs.CONTAINER)).toBeTruthy();
-    expect(queryByText('40x')).toBeNull();
+    expect(onFavoritePress).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders the filled star when the market is favorited', () => {
+    const { getByTestId } = renderHeader({
+      onFavoritePress: jest.fn(),
+      isFavorite: true,
+    });
+
+    expect(
+      getByTestId(PerpsProMarketViewSelectorsIDs.HEADER_FAVORITE_BUTTON),
+    ).toBeOnTheScreen();
+  });
+
+  it('fires onModeChange from the active Pro mode pill once the shimmer finishes', () => {
+    jest.useFakeTimers();
+    const onModeChange = jest.fn();
+    const { getByTestId } = renderHeader({ onModeChange });
+
+    fireEvent.press(getByTestId(PerpsModeToggleSelectorsIDs.PRO_SEGMENT));
+
+    expect(onModeChange).not.toHaveBeenCalled();
+    act(() => {
+      jest.advanceTimersByTime(GLOW_TOTAL_MS);
+    });
+
+    expect(onModeChange).toHaveBeenCalledWith(PerpsMode.Lite);
+  });
+
+  it('omits the mode pill when mode is not provided', () => {
+    const { queryByTestId } = renderHeader({
+      mode: undefined,
+      onModeChange: jest.fn(),
+    });
+
+    expect(
+      queryByTestId(PerpsModeToggleSelectorsIDs.PRO_SEGMENT),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('exposes accessibility labels on back, wallet, and favorite buttons', () => {
+    const { getByLabelText } = renderHeader({
+      onBackPress: jest.fn(),
+      onWalletPress: jest.fn(),
+      onFavoritePress: jest.fn(),
+      isFavorite: false,
+    });
+
+    expect(getByLabelText('Back')).toBeOnTheScreen();
+    expect(getByLabelText('Perps balance')).toBeOnTheScreen();
+    expect(getByLabelText('Add to watchlist')).toBeOnTheScreen();
+  });
+
+  it('uses a state-aware accessibility label for the favorite toggle', () => {
+    const { getByLabelText } = renderHeader({
+      onFavoritePress: jest.fn(),
+      isFavorite: true,
+    });
+
+    expect(getByLabelText('Remove from watchlist')).toBeOnTheScreen();
+  });
+
+  it('omits end actions when their handlers are not provided', () => {
+    const { queryByTestId } = renderHeader();
+
+    expect(
+      queryByTestId(PerpsProMarketViewSelectorsIDs.HEADER_WALLET_BUTTON),
+    ).not.toBeOnTheScreen();
+    expect(
+      queryByTestId(PerpsProMarketViewSelectorsIDs.HEADER_FAVORITE_BUTTON),
+    ).not.toBeOnTheScreen();
+    expect(
+      queryByTestId(PerpsModeToggleSelectorsIDs.PRO_SEGMENT),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('renders wallet and favorite actions when handlers exist even without testIDs', () => {
+    const onWalletPress = jest.fn();
+    const onFavoritePress = jest.fn();
+    const {
+      walletButton: _walletButton,
+      favoriteButton: _favoriteButton,
+      ...testIDsWithoutActions
+    } = createProMarketHeaderTestIDs();
+    const { getByLabelText } = renderHeader({
+      testIDs: testIDsWithoutActions,
+      onWalletPress,
+      onFavoritePress,
+    });
+
+    fireEvent.press(getByLabelText('Perps balance'));
+    fireEvent.press(getByLabelText('Add to watchlist'));
+
+    expect(onWalletPress).toHaveBeenCalledTimes(1);
+    expect(onFavoritePress).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders endAccessory instead of default actions when provided', () => {
+    const onFavoritePress = jest.fn();
+    const { getByTestId, queryByTestId } = renderHeader({
+      onFavoritePress,
+      endAccessory: <Text testID="lite-custom-actions">custom</Text>,
+    });
+
+    expect(getByTestId('lite-custom-actions')).toBeOnTheScreen();
+    expect(
+      queryByTestId(PerpsMarketHeaderSelectorsIDs.FAVORITE_BUTTON),
+    ).toBeNull();
+    expect(
+      queryByTestId(PerpsProMarketViewSelectorsIDs.HEADER_FAVORITE_BUTTON),
+    ).toBeNull();
   });
 });
diff --git a/app/components/UI/Perps/components/PerpsMarketHeader/PerpsMarketHeader.tsx b/app/components/UI/Perps/components/PerpsMarketHeader/PerpsMarketHeader.tsx
index 3e2cc50d02c0..f70bf0153bc7 100644
--- a/app/components/UI/Perps/components/PerpsMarketHeader/PerpsMarketHeader.tsx
+++ b/app/components/UI/Perps/components/PerpsMarketHeader/PerpsMarketHeader.tsx
@@ -1,22 +1,301 @@
-import React, { type ReactNode } from 'react';
-import type { PerpsMarketData } from '@metamask/perps-controller';
-import PerpsMarketInlineHeader from '../PerpsMarketInlineHeader';
-
-interface PerpsMarketHeaderProps {
-  market: PerpsMarketData;
-  onBackPress?: () => void;
-  onMorePress?: () => void;
-  onFavoritePress?: () => void;
-  isFavorite?: boolean;
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  ButtonIcon,
+  ButtonIconSize,
+  FontWeight,
+  IconName,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { AnimationDuration } from '@metamask/design-tokens';
+import { getPerpsDisplaySymbol } from '@metamask/perps-controller';
+import { PERPS_EVENT_VALUE } from '@metamask/perps-controller/constants';
+import React from 'react';
+import { StyleSheet } from 'react-native';
+import Animated, {
+  useAnimatedReaction,
+  useAnimatedStyle,
+  useSharedValue,
+  withTiming,
+} from 'react-native-reanimated';
+import { strings } from '../../../../../../locales/i18n';
+import { PERPS_COLLATERAL_SYMBOL } from '../../constants/perpsConfig';
+import LivePriceHeader from '../LivePriceDisplay/LivePriceHeader';
+import PerpsMarketIdentity from '../PerpsMarketIdentity';
+import PerpsModeToggle from '../PerpsModeToggle';
+import { usePerpsLivePrices } from '../../hooks/stream';
+import {
+  PERPS_MARKET_HEADER_HEIGHT,
+  type PerpsMarketHeaderProps,
+} from './PerpsMarketHeader.types';
+
+export { PERPS_MARKET_HEADER_HEIGHT };
+
+const COMPACT_PRICE_ENTER_OFFSET_PX = 8;
+const SUBTITLE_CROSSFADE_HEIGHT = 20;
+
+const styles = StyleSheet.create({
+  container: {
+    height: PERPS_MARKET_HEADER_HEIGHT,
+  },
+  subtitleCrossfade: {
+    height: SUBTITLE_CROSSFADE_HEIGHT,
+    justifyContent: 'center',
+  },
+  crossfadeLayer: {
+    ...StyleSheet.absoluteFill,
+    justifyContent: 'center',
+  },
+  sizer: {
+    opacity: 0,
+  },
+});
+
+const PerpsMarketIdentitySubtitle = ({
+  symbol,
+  testID,
+}: {
+  symbol: string;
   testID?: string;
-  /** Current price from candle stream - syncs header with chart */
-  currentPrice: number;
-  endAccessory?: ReactNode;
-  useDetailLayout?: boolean;
-}
+}) => (
+  <Text
+    variant={TextVariant.BodySm}
+    fontWeight={FontWeight.Medium}
+    color={TextColor.TextAlternative}
+    numberOfLines={1}
+    testID={testID}
+  >
+    {strings('perps.market_details.perp_pair', {
+      ticker: getPerpsDisplaySymbol(symbol),
+      collateral: PERPS_COLLATERAL_SYMBOL,
+    })}
+  </Text>
+);
 
-const PerpsMarketHeader: React.FC<PerpsMarketHeaderProps> = (props) => (
-  <PerpsMarketInlineHeader {...props} />
+const PerpsMarketHeaderCompactPrice = ({
+  symbol,
+  currentPrice,
+  percentChange24h,
+  testIDPrice,
+  testIDChange,
+}: {
+  symbol: string;
+  currentPrice: number;
+  percentChange24h?: number;
+  testIDPrice?: string;
+  testIDChange?: string;
+}) => (
+  <LivePriceHeader
+    symbol={symbol}
+    currentPrice={currentPrice}
+    percentChange24h={percentChange24h}
+    testIDPrice={testIDPrice}
+    testIDChange={testIDChange}
+  />
 );
 
+/**
+ * Fixed market-detail header shared by Lite and Pro screens.
+ *
+ * Left: back button. Center: tappable asset identity with optional
+ * subtitle/compact-price crossfade. Right: default action row or
+ * `endAccessory` override.
+ */
+const PerpsMarketHeader = ({
+  market,
+  testIDs,
+  onBackPress,
+  onIdentityPress,
+  showMarketIdentity = true,
+  endAccessory,
+  onWalletPress,
+  onFavoritePress,
+  isFavorite = false,
+  mode,
+  onModeChange,
+  scrollY,
+  priceSectionHeight,
+}: PerpsMarketHeaderProps) => {
+  const fallbackScrollY = useSharedValue(0);
+  const fallbackPriceSectionHeight = useSharedValue(0);
+  const scrollYSv = scrollY ?? fallbackScrollY;
+  const priceSectionHeightSv = priceSectionHeight ?? fallbackPriceSectionHeight;
+
+  const compactProgress = useSharedValue(0);
+
+  useAnimatedReaction(
+    () => {
+      const hasMeasured = priceSectionHeightSv.value > 0;
+      return hasMeasured && scrollYSv.value >= priceSectionHeightSv.value;
+    },
+    (isCompact, previousIsCompact) => {
+      if (isCompact === previousIsCompact) return;
+      compactProgress.value = withTiming(isCompact ? 1 : 0, {
+        duration: AnimationDuration.Fast,
+      });
+    },
+  );
+
+  const subtitleLayerStyle = useAnimatedStyle(() => ({
+    opacity: 1 - compactProgress.value,
+    transform: [
+      {
+        translateY: compactProgress.value * COMPACT_PRICE_ENTER_OFFSET_PX,
+      },
+    ],
+  }));
+
+  const priceLayerStyle = useAnimatedStyle(() => ({
+    opacity: compactProgress.value,
+    transform: [
+      {
+        translateY: (1 - compactProgress.value) * COMPACT_PRICE_ENTER_OFFSET_PX,
+      },
+    ],
+  }));
+
+  const livePrices = usePerpsLivePrices({
+    symbols: [market.symbol],
+    throttleMs: 1000,
+  });
+  const priceData = livePrices[market.symbol];
+  const currentPrice = priceData?.price ? parseFloat(priceData.price) : 0;
+  const percentChange24h =
+    priceData?.percentChange24h !== undefined
+      ? parseFloat(priceData.percentChange24h)
+      : undefined;
+
+  const displaySubtitleAndPrice = (
+    <Box style={styles.subtitleCrossfade}>
+      <Box style={styles.sizer} pointerEvents="none">
+        <PerpsMarketIdentitySubtitle symbol={market.symbol} testID="" />
+        <PerpsMarketHeaderCompactPrice
+          symbol={market.symbol}
+          currentPrice={currentPrice}
+          percentChange24h={percentChange24h}
+          testIDPrice=""
+          testIDChange=""
+        />
+      </Box>
+      <Animated.View style={[styles.crossfadeLayer, subtitleLayerStyle]}>
+        <PerpsMarketIdentitySubtitle
+          symbol={market.symbol}
+          testID={testIDs.subtitle}
+        />
+      </Animated.View>
+      <Animated.View style={[styles.crossfadeLayer, priceLayerStyle]}>
+        <PerpsMarketHeaderCompactPrice
+          symbol={market.symbol}
+          currentPrice={currentPrice}
+          percentChange24h={percentChange24h}
+          testIDPrice={testIDs.headerPrice}
+          testIDChange={testIDs.headerPriceChange}
+        />
+      </Animated.View>
+    </Box>
+  );
+
+  const rightActions =
+    endAccessory ??
+    (onWalletPress || onFavoritePress || (onModeChange && mode) ? (
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        twClassName="gap-1"
+      >
+        {onWalletPress ? (
+          <Box
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Center}
+            twClassName="size-10"
+          >
+            <ButtonIcon
+              iconName={IconName.Wallet}
+              size={ButtonIconSize.Md}
+              onPress={onWalletPress}
+              accessibilityLabel={strings('perps.market_details.wallet')}
+              testID={testIDs.walletButton}
+            />
+          </Box>
+        ) : null}
+        {onFavoritePress ? (
+          <Box
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Center}
+            twClassName="size-10"
+          >
+            <ButtonIcon
+              iconName={isFavorite ? IconName.StarFilled : IconName.Star}
+              size={ButtonIconSize.Md}
+              onPress={onFavoritePress}
+              accessibilityLabel={strings(
+                isFavorite
+                  ? 'perps.market_details.remove_from_watchlist'
+                  : 'perps.market_details.add_to_watchlist',
+              )}
+              testID={testIDs.favoriteButton}
+            />
+          </Box>
+        ) : null}
+        {onModeChange && mode ? (
+          <Box justifyContent={BoxJustifyContent.Center} twClassName="h-10">
+            <PerpsModeToggle
+              mode={mode}
+              variant="active"
+              onChange={onModeChange}
+              source={PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN}
+            />
+          </Box>
+        ) : null}
+      </Box>
+    ) : null);
+
+  return (
+    <Box
+      testID={testIDs.container}
+      style={styles.container}
+      twClassName="border-b border-muted bg-default px-4"
+      flexDirection={BoxFlexDirection.Row}
+      alignItems={BoxAlignItems.Center}
+      gap={2}
+    >
+      {onBackPress ? (
+        <ButtonIcon
+          iconName={IconName.ArrowLeft}
+          size={ButtonIconSize.Sm}
+          onPress={onBackPress}
+          accessibilityLabel={strings('perps.market_details.back')}
+          testID={testIDs.backButton}
+        />
+      ) : null}
+
+      <Box twClassName="flex-1">
+        {showMarketIdentity ? (
+          <PerpsMarketIdentity
+            symbol={market.symbol}
+            name={market.name}
+            maxLeverage={market.maxLeverage}
+            size={32}
+            gap={2}
+            onPress={onIdentityPress}
+            subtitleContent={displaySubtitleAndPrice}
+            testIDs={{
+              assetIcon: testIDs.assetIcon,
+              assetName: testIDs.assetName,
+              subtitle: testIDs.subtitle,
+              marketListButton: testIDs.marketListButton,
+            }}
+          />
+        ) : null}
+      </Box>
+
+      {rightActions}
+    </Box>
+  );
+};
+
 export default PerpsMarketHeader;
diff --git a/app/components/UI/Perps/components/PerpsMarketHeader/PerpsMarketHeader.types.ts b/app/components/UI/Perps/components/PerpsMarketHeader/PerpsMarketHeader.types.ts
new file mode 100644
index 000000000000..76cc1806ec35
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsMarketHeader/PerpsMarketHeader.types.ts
@@ -0,0 +1,50 @@
+import type { ReactNode } from 'react';
+import type { SharedValue } from 'react-native-reanimated';
+import type { PerpsMarketData, PerpsMode } from '@metamask/perps-controller';
+
+/** Fixed header height, in px. */
+export const PERPS_MARKET_HEADER_HEIGHT = 64;
+
+export interface PerpsMarketHeaderTestIDs {
+  container: string;
+  backButton: string;
+  assetIcon: string;
+  assetName: string;
+  subtitle: string;
+  marketListButton: string;
+  headerPrice: string;
+  headerPriceChange: string;
+  walletButton?: string;
+  favoriteButton?: string;
+}
+
+export interface PerpsMarketHeaderProps {
+  market: Partial<PerpsMarketData> & { symbol: string };
+  testIDs: PerpsMarketHeaderTestIDs;
+  onBackPress?: () => void;
+  /**
+   * When provided, the asset identity (icon + name + leverage) becomes a tap
+   * target that opens the market list, and a trailing caret is shown.
+   */
+  onIdentityPress?: () => void;
+  /** Whether to render the market identity content in the header. */
+  showMarketIdentity?: boolean;
+  /** When set, replaces the default right-side action row entirely. */
+  endAccessory?: ReactNode;
+  /** Default action row — ignored when `endAccessory` is provided. */
+  onWalletPress?: () => void;
+  onFavoritePress?: () => void;
+  isFavorite?: boolean;
+  mode?: PerpsMode;
+  onModeChange?: (mode: PerpsMode) => void;
+  /**
+   * Scroll offset from the parent's `Animated.ScrollView`, shared via
+   * `useHeaderStandardAnimated()`. Drives the subtitle/price crossfade.
+   */
+  scrollY?: SharedValue<number>;
+  /**
+   * Height of the scrollable price section above the header's threshold
+   * (e.g. `PRICE_SECTION_HEIGHT` from `PerpsMarketSummary`).
+   */
+  priceSectionHeight?: SharedValue<number>;
+}
diff --git a/app/components/UI/Perps/components/PerpsMarketHeader/index.ts b/app/components/UI/Perps/components/PerpsMarketHeader/index.ts
index 4145b06d386e..615078a556c5 100644
--- a/app/components/UI/Perps/components/PerpsMarketHeader/index.ts
+++ b/app/components/UI/Perps/components/PerpsMarketHeader/index.ts
@@ -1 +1,10 @@
 export { default } from './PerpsMarketHeader';
+export { PERPS_MARKET_HEADER_HEIGHT } from './PerpsMarketHeader';
+export type {
+  PerpsMarketHeaderProps,
+  PerpsMarketHeaderTestIDs,
+} from './PerpsMarketHeader.types';
+export {
+  createLiteMarketHeaderTestIDs,
+  createProMarketHeaderTestIDs,
+} from './perpsMarketHeaderTestIds';
diff --git a/app/components/UI/Perps/components/PerpsMarketHeader/perpsMarketHeaderTestIds.ts b/app/components/UI/Perps/components/PerpsMarketHeader/perpsMarketHeaderTestIds.ts
new file mode 100644
index 000000000000..b74d088d4bba
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsMarketHeader/perpsMarketHeaderTestIds.ts
@@ -0,0 +1,31 @@
+import {
+  PerpsMarketDetailsViewSelectorsIDs,
+  PerpsMarketHeaderSelectorsIDs,
+  PerpsProMarketViewSelectorsIDs,
+} from '../../Perps.testIds';
+import type { PerpsMarketHeaderTestIDs } from './PerpsMarketHeader.types';
+
+export const createProMarketHeaderTestIDs = (): PerpsMarketHeaderTestIDs => ({
+  container: PerpsProMarketViewSelectorsIDs.HEADER,
+  backButton: PerpsProMarketViewSelectorsIDs.HEADER_BACK_BUTTON,
+  assetIcon: PerpsProMarketViewSelectorsIDs.HEADER_ASSET_ICON,
+  assetName: PerpsProMarketViewSelectorsIDs.HEADER_SYMBOL,
+  subtitle: PerpsProMarketViewSelectorsIDs.HEADER_SUBTITLE,
+  marketListButton: PerpsProMarketViewSelectorsIDs.HEADER_MARKET_LIST_BUTTON,
+  headerPrice: PerpsProMarketViewSelectorsIDs.HEADER_PRICE,
+  headerPriceChange: PerpsProMarketViewSelectorsIDs.HEADER_PRICE_CHANGE,
+  walletButton: PerpsProMarketViewSelectorsIDs.HEADER_WALLET_BUTTON,
+  favoriteButton: PerpsProMarketViewSelectorsIDs.HEADER_FAVORITE_BUTTON,
+});
+
+export const createLiteMarketHeaderTestIDs = (): PerpsMarketHeaderTestIDs => ({
+  container: PerpsMarketDetailsViewSelectorsIDs.HEADER,
+  backButton: PerpsMarketHeaderSelectorsIDs.BACK_BUTTON,
+  assetIcon: PerpsMarketHeaderSelectorsIDs.ASSET_ICON,
+  assetName: PerpsMarketHeaderSelectorsIDs.ASSET_NAME,
+  subtitle: PerpsMarketHeaderSelectorsIDs.SUBTITLE,
+  marketListButton: PerpsMarketHeaderSelectorsIDs.MARKET_LIST_BUTTON,
+  headerPrice: PerpsMarketHeaderSelectorsIDs.COMPACT_PRICE,
+  headerPriceChange: PerpsMarketHeaderSelectorsIDs.COMPACT_PRICE_CHANGE,
+  favoriteButton: PerpsMarketHeaderSelectorsIDs.FAVORITE_BUTTON,
+});
diff --git a/app/components/UI/Perps/components/PerpsMarketIdentity/PerpsMarketIdentity.test.tsx b/app/components/UI/Perps/components/PerpsMarketIdentity/PerpsMarketIdentity.test.tsx
index 539ee2ac497e..fb14fc25f096 100644
--- a/app/components/UI/Perps/components/PerpsMarketIdentity/PerpsMarketIdentity.test.tsx
+++ b/app/components/UI/Perps/components/PerpsMarketIdentity/PerpsMarketIdentity.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { fireEvent } from '@testing-library/react-native';
+import { Icon, IconName, Text } from '@metamask/design-system-react-native';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../../util/test/initial-root-state';
 import PerpsMarketIdentity from './PerpsMarketIdentity';
@@ -61,6 +62,41 @@ describe('PerpsMarketIdentity', () => {
     expect(onPress).toHaveBeenCalledTimes(1);
   });
 
+  it('renders a down arrow when onPress is provided', () => {
+    const { UNSAFE_getAllByType } = renderWithProvider(
+      <PerpsMarketIdentity
+        symbol="BTC"
+        name="Bitcoin"
+        onPress={jest.fn()}
+        testIDs={{ marketListButton: 'identity-pressable' }}
+      />,
+      { state: initialState },
+    );
+
+    const icons = UNSAFE_getAllByType(Icon);
+    const downArrow = icons.find(
+      (icon) => icon.props.name === IconName.ArrowDown,
+    );
+
+    expect(downArrow).toBeDefined();
+    expect(icons.some((icon) => icon.props.name === IconName.ArrowRight)).toBe(
+      false,
+    );
+  });
+
+  it('does not render a market-list arrow when onPress is omitted', () => {
+    const { UNSAFE_queryAllByType } = renderWithProvider(
+      <PerpsMarketIdentity
+        symbol="BTC"
+        name="Bitcoin"
+        testIDs={{ assetName: 'identity-name' }}
+      />,
+      { state: initialState },
+    );
+
+    expect(UNSAFE_queryAllByType(Icon)).toHaveLength(0);
+  });
+
   it('renders a non-interactive identity when onPress is omitted', () => {
     const { queryByTestId, getByTestId } = renderWithProvider(
       <PerpsMarketIdentity
@@ -77,4 +113,19 @@ describe('PerpsMarketIdentity', () => {
     expect(queryByTestId('identity-pressable')).not.toBeOnTheScreen();
     expect(getByTestId('identity-name')).toBeOnTheScreen();
   });
+
+  it('renders subtitleContent instead of the default subtitle when provided', () => {
+    const { getByTestId, queryByTestId } = renderWithProvider(
+      <PerpsMarketIdentity
+        symbol="BTC"
+        name="Bitcoin"
+        testIDs={{ subtitle: 'identity-subtitle' }}
+        subtitleContent={<Text testID="custom-subtitle">$45,000</Text>}
+      />,
+      { state: initialState },
+    );
+
+    expect(getByTestId('custom-subtitle')).toHaveTextContent('$45,000');
+    expect(queryByTestId('identity-subtitle')).not.toBeOnTheScreen();
+  });
 });
diff --git a/app/components/UI/Perps/components/PerpsMarketIdentity/PerpsMarketIdentity.tsx b/app/components/UI/Perps/components/PerpsMarketIdentity/PerpsMarketIdentity.tsx
index 8b560683d4e8..e3c1dd0ec2c1 100644
--- a/app/components/UI/Perps/components/PerpsMarketIdentity/PerpsMarketIdentity.tsx
+++ b/app/components/UI/Perps/components/PerpsMarketIdentity/PerpsMarketIdentity.tsx
@@ -39,10 +39,15 @@ export interface PerpsMarketIdentityProps {
   nameStyle?: StyleProp<TextStyle>;
   /**
    * When provided, the identity becomes a content-hugging pressable that opens
-   * the market list and shows a trailing caret.
+   * the market list and shows a trailing down chevron.
    */
   onPress?: () => void;
   testIDs?: PerpsMarketIdentityTestIDs;
+  /**
+   * When provided, replaces the default `[Ticker]-[collateral] perp`
+   * subtitle row entirely (e.g. Pro's scroll-linked live price crossfade).
+   */
+  subtitleContent?: React.ReactNode;
 }
 
 /**
@@ -60,6 +65,7 @@ const PerpsMarketIdentity = ({
   nameStyle,
   onPress,
   testIDs,
+  subtitleContent,
 }: PerpsMarketIdentityProps) => {
   const displaySymbol = getPerpsDisplaySymbol(symbol);
   const displayTitle = name || displaySymbol;
@@ -73,20 +79,22 @@ const PerpsMarketIdentity = ({
       flexDirection={BoxFlexDirection.Row}
       alignItems={BoxAlignItems.Center}
       gap={gap}
-      twClassName={`self-start rounded-lg p-1 ${pressed ? 'bg-pressed' : ''}`}
+      twClassName={`rounded-lg p-1 ${pressed ? 'bg-pressed' : ''}`}
     >
       <PerpsTokenLogo symbol={symbol} size={size} testID={testIDs?.assetIcon} />
-      <Box flexDirection={BoxFlexDirection.Column}>
+      <Box flexDirection={BoxFlexDirection.Column} twClassName="flex-1 min-w-0">
         <Box
           flexDirection={BoxFlexDirection.Row}
           alignItems={BoxAlignItems.Center}
           gap={1}
+          twClassName="min-w-0"
         >
           <Text
             variant={TextVariant.BodyMd}
             fontWeight={FontWeight.Medium}
             numberOfLines={1}
-            style={nameStyle}
+            // eslint-disable-next-line react-native/no-inline-styles
+            style={[{ flexShrink: 1 }, nameStyle]}
             testID={testIDs?.assetName}
           >
             {displayTitle}
@@ -94,21 +102,23 @@ const PerpsMarketIdentity = ({
           {maxLeverage ? <PerpsLeverage maxLeverage={maxLeverage} /> : null}
           {onPress ? (
             <Icon
-              name={IconName.ArrowRight}
+              name={IconName.ArrowDown}
               size={IconSize.Xs}
               color={IconColor.IconAlternative}
             />
           ) : null}
         </Box>
-        <Text
-          variant={TextVariant.BodySm}
-          fontWeight={FontWeight.Medium}
-          color={TextColor.TextAlternative}
-          numberOfLines={1}
-          testID={testIDs?.subtitle}
-        >
-          {subtitle}
-        </Text>
+        {subtitleContent ?? (
+          <Text
+            variant={TextVariant.BodySm}
+            fontWeight={FontWeight.Medium}
+            color={TextColor.TextAlternative}
+            numberOfLines={1}
+            testID={testIDs?.subtitle}
+          >
+            {subtitle}
+          </Text>
+        )}
       </Box>
     </Box>
   );
diff --git a/app/components/UI/Perps/components/PerpsMarketInlineHeader/PerpsMarketInlineHeader.test.tsx b/app/components/UI/Perps/components/PerpsMarketInlineHeader/PerpsMarketInlineHeader.test.tsx
index 0bf7658de214..1caa34f8fe2b 100644
--- a/app/components/UI/Perps/components/PerpsMarketInlineHeader/PerpsMarketInlineHeader.test.tsx
+++ b/app/components/UI/Perps/components/PerpsMarketInlineHeader/PerpsMarketInlineHeader.test.tsx
@@ -95,90 +95,6 @@ describe('PerpsMarketInlineHeader', () => {
     expect(onFavoritePress).toHaveBeenCalled();
   });
 
-  describe('useDetailLayout layout', () => {
-    it('renders the full asset name as title and the market pair subtitle', () => {
-      const { getByTestId, getByText, queryByTestId } = renderWithProvider(
-        <PerpsMarketInlineHeader
-          market={mockMarket}
-          useDetailLayout
-          testID={PerpsMarketHeaderSelectorsIDs.CONTAINER}
-          currentPrice={45000}
-        />,
-        { state: initialState },
-      );
-
-      // Title shows the full asset name, subtitle shows the [ticker]-[collateral] perp pair
-      expect(getByText('Bitcoin')).toBeTruthy();
-      expect(getByTestId(PerpsMarketHeaderSelectorsIDs.SUBTITLE)).toBeTruthy();
-      expect(getByText('BTC-USD perp')).toBeTruthy();
-
-      // Price/24h change are not rendered inside the header in this layout
-      expect(queryByTestId(PerpsMarketHeaderSelectorsIDs.PRICE)).toBeNull();
-      expect(
-        queryByTestId(PerpsMarketHeaderSelectorsIDs.PRICE_CHANGE),
-      ).toBeNull();
-    });
-
-    it('falls back to the ticker when the market has no name', () => {
-      const marketWithoutName = {
-        ...mockMarket,
-        name: '',
-      } as unknown as PerpsMarketData;
-
-      const { getByText } = renderWithProvider(
-        <PerpsMarketInlineHeader
-          market={marketWithoutName}
-          useDetailLayout
-          testID={PerpsMarketHeaderSelectorsIDs.CONTAINER}
-          currentPrice={45000}
-        />,
-        { state: initialState },
-      );
-
-      expect(getByText('BTC')).toBeTruthy();
-    });
-
-    it('opens the market list when the identity box is pressed', () => {
-      const onIdentityPress = jest.fn();
-      const { getByTestId } = renderWithProvider(
-        <PerpsMarketInlineHeader
-          market={mockMarket}
-          useDetailLayout
-          onIdentityPress={onIdentityPress}
-          testID={PerpsMarketHeaderSelectorsIDs.CONTAINER}
-          currentPrice={45000}
-        />,
-        { state: initialState },
-      );
-
-      fireEvent.press(
-        getByTestId(PerpsMarketHeaderSelectorsIDs.MARKET_LIST_BUTTON),
-      );
-
-      expect(onIdentityPress).toHaveBeenCalled();
-    });
-
-    it('does not make the identity a button without an onIdentityPress handler', () => {
-      const { queryByTestId, getByTestId } = renderWithProvider(
-        <PerpsMarketInlineHeader
-          market={mockMarket}
-          useDetailLayout
-          testID={PerpsMarketHeaderSelectorsIDs.CONTAINER}
-          currentPrice={45000}
-        />,
-        { state: initialState },
-      );
-
-      // Identity content still renders, but not as an interactive button.
-      expect(
-        getByTestId(PerpsMarketHeaderSelectorsIDs.ASSET_NAME),
-      ).toBeTruthy();
-      expect(
-        queryByTestId(PerpsMarketHeaderSelectorsIDs.MARKET_LIST_BUTTON),
-      ).toBeNull();
-    });
-  });
-
   it('renders endAccessory when provided', () => {
     const { getByTestId } = renderWithProvider(
       <PerpsMarketInlineHeader
diff --git a/app/components/UI/Perps/components/PerpsMarketInlineHeader/PerpsMarketInlineHeader.tsx b/app/components/UI/Perps/components/PerpsMarketInlineHeader/PerpsMarketInlineHeader.tsx
index c13a147f3906..aeec63d3b7b2 100644
--- a/app/components/UI/Perps/components/PerpsMarketInlineHeader/PerpsMarketInlineHeader.tsx
+++ b/app/components/UI/Perps/components/PerpsMarketInlineHeader/PerpsMarketInlineHeader.tsx
@@ -14,7 +14,6 @@ import { PERPS_COLLATERAL_SYMBOL } from '../../constants/perpsConfig';
 import { PerpsMarketHeaderSelectorsIDs } from '../../Perps.testIds';
 import LivePriceHeader from '../LivePriceDisplay/LivePriceHeader';
 import PerpsLeverage from '../PerpsLeverage/PerpsLeverage';
-import PerpsMarketIdentity from '../PerpsMarketIdentity';
 import PerpsTokenLogo from '../PerpsTokenLogo';
 
 export interface PerpsMarketInlineHeaderProps {
@@ -27,22 +26,6 @@ export interface PerpsMarketInlineHeaderProps {
   isFavorite?: boolean;
   testID?: string;
   endAccessory?: ReactNode;
-  /**
-   * When true, renders the redesigned market-detail layout instead of the
-   * compact one: title becomes the full asset name, a leverage pill is added
-   * on the first row, the description becomes the static
-   * `[Ticker]-[collateral] perp` pair on the second row, and the live
-   * price/24h change are removed from the header (relocated below by the
-   * parent). When false, the compact layout (pair title + live price) renders.
-   */
-  useDetailLayout?: boolean;
-  /**
-   * Detail layout only. When provided, the market identity (icon + name +
-   * ticker + leverage) becomes a tightly-bounded pressable box that hugs its
-   * content — pressing it fires this callback and shows a button-like pressed
-   * background. The surrounding header row stays non-interactive.
-   */
-  onIdentityPress?: () => void;
 }
 
 export const PerpsMarketInlineHeader = ({
@@ -54,14 +37,9 @@ export const PerpsMarketInlineHeader = ({
   isFavorite = false,
   testID,
   endAccessory,
-  useDetailLayout = false,
-  onIdentityPress,
 }: PerpsMarketInlineHeaderProps) => {
   const displaySymbol = getPerpsDisplaySymbol(market.symbol);
-
-  const displayTitle = useDetailLayout
-    ? market.name || displaySymbol
-    : `${displaySymbol}-${PERPS_COLLATERAL_SYMBOL}`;
+  const displayTitle = `${displaySymbol}-${PERPS_COLLATERAL_SYMBOL}`;
 
   const leverageBadge = useMemo(
     () =>
@@ -71,35 +49,6 @@ export const PerpsMarketInlineHeader = ({
     [market.maxLeverage],
   );
 
-  const detailIdentity = useMemo(() => {
-    if (!useDetailLayout) {
-      return null;
-    }
-
-    return (
-      <PerpsMarketIdentity
-        symbol={market.symbol}
-        name={market.name}
-        maxLeverage={market.maxLeverage}
-        size={40}
-        gap={3}
-        onPress={onIdentityPress}
-        testIDs={{
-          assetIcon: PerpsMarketHeaderSelectorsIDs.ASSET_ICON,
-          assetName: PerpsMarketHeaderSelectorsIDs.ASSET_NAME,
-          subtitle: PerpsMarketHeaderSelectorsIDs.SUBTITLE,
-          marketListButton: PerpsMarketHeaderSelectorsIDs.MARKET_LIST_BUTTON,
-        }}
-      />
-    );
-  }, [
-    useDetailLayout,
-    market.symbol,
-    market.name,
-    market.maxLeverage,
-    onIdentityPress,
-  ]);
-
   const compactDescription = useMemo(
     () => (
       <LivePriceHeader
@@ -156,24 +105,16 @@ export const PerpsMarketInlineHeader = ({
       endAccessory={endAccessory}
       endButtonIconProps={endAccessory ? undefined : endButtonIconProps}
       avatar={
-        useDetailLayout ? (
-          detailIdentity
-        ) : (
-          <PerpsTokenLogo
-            symbol={market.symbol}
-            size={40}
-            testID={PerpsMarketHeaderSelectorsIDs.ASSET_ICON}
-          />
-        )
-      }
-      title={useDetailLayout ? undefined : displayTitle}
-      titleProps={
-        useDetailLayout
-          ? undefined
-          : { testID: PerpsMarketHeaderSelectorsIDs.ASSET_NAME }
+        <PerpsTokenLogo
+          symbol={market.symbol}
+          size={40}
+          testID={PerpsMarketHeaderSelectorsIDs.ASSET_ICON}
+        />
       }
-      titleEndAccessory={useDetailLayout ? undefined : leverageBadge}
-      description={useDetailLayout ? undefined : compactDescription}
+      title={displayTitle}
+      titleProps={{ testID: PerpsMarketHeaderSelectorsIDs.ASSET_NAME }}
+      titleEndAccessory={leverageBadge}
+      description={compactDescription}
     />
   );
 };
diff --git a/app/components/UI/Perps/components/PerpsMarketRowItem/PerpsMarketRowItem.tsx b/app/components/UI/Perps/components/PerpsMarketRowItem/PerpsMarketRowItem.tsx
index 78ee2fdb98de..076e7c781ee8 100644
--- a/app/components/UI/Perps/components/PerpsMarketRowItem/PerpsMarketRowItem.tsx
+++ b/app/components/UI/Perps/components/PerpsMarketRowItem/PerpsMarketRowItem.tsx
@@ -196,6 +196,10 @@ const PerpsMarketRowItem = ({
       titleProps={{
         testID: getPerpsMarketRowItemSelector.assetLabel(displayMarket.symbol),
         numberOfLines: 1,
+        // flexShrink lets the title text yield space to the leverage badge so
+        // it doesn't overflow into the price column on long asset names.
+        // eslint-disable-next-line react-native/no-inline-styles
+        style: { flexShrink: 1 },
       }}
       titleEndAccessory={
         <PerpsLeverage maxLeverage={displayMarket.maxLeverage} />
diff --git a/app/components/UI/Perps/components/PerpsMarketSummary/PerpsMarketSummary.tsx b/app/components/UI/Perps/components/PerpsMarketSummary/PerpsMarketSummary.tsx
new file mode 100644
index 000000000000..084ab102ae45
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsMarketSummary/PerpsMarketSummary.tsx
@@ -0,0 +1,92 @@
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+} from '@metamask/design-system-react-native';
+import React from 'react';
+import type { LayoutChangeEvent } from 'react-native';
+import LivePriceHeader from '../LivePriceDisplay/LivePriceHeader';
+
+export interface PerpsMarketSummaryProps {
+  symbol: string;
+  currentPrice: number;
+  testID: string;
+  testIDPrice: string;
+  testIDChange: string;
+  size?: 'prominent' | 'large';
+  endAccessory?: React.ReactNode;
+  /** Used by Lite to sync the header scroll crossfade with the measured row height. */
+  onLayout?: (event: LayoutChangeEvent) => void;
+}
+
+/**
+ * Fixed height of the Pro (`prominent`) summary row, in px (keep in sync with
+ * the `h-[76px]` class below). The market header uses this as the scroll
+ * threshold for its price crossfade.
+ */
+export const PRICE_SECTION_HEIGHT = 76;
+
+/**
+ * Scroll-contained live market price and 24-hour change.
+ */
+const PerpsMarketSummary = ({
+  symbol,
+  currentPrice,
+  testID,
+  testIDPrice,
+  testIDChange,
+  size = 'prominent',
+  endAccessory,
+  onLayout,
+}: PerpsMarketSummaryProps) => {
+  if (size === 'large') {
+    // Lite: content-hugging row — DisplayLg needs more vertical space than Pro's
+    // fixed 76px summary (HeadingLg). Matches the pre-unification layout.
+    return (
+      <Box
+        testID={testID}
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        justifyContent={BoxJustifyContent.Between}
+        gap={2}
+        twClassName="px-4 py-2"
+        onLayout={onLayout}
+      >
+        <Box twClassName="flex-1">
+          <LivePriceHeader
+            symbol={symbol}
+            currentPrice={currentPrice}
+            size="large"
+            testIDPrice={testIDPrice}
+            testIDChange={testIDChange}
+          />
+        </Box>
+        {endAccessory}
+      </Box>
+    );
+  }
+
+  return (
+    <Box
+      testID={testID}
+      flexDirection={BoxFlexDirection.Row}
+      alignItems={BoxAlignItems.Center}
+      twClassName="h-[76px] gap-4 px-4"
+      onLayout={onLayout}
+    >
+      <Box twClassName="h-full flex-1 justify-start py-2">
+        <LivePriceHeader
+          symbol={symbol}
+          currentPrice={currentPrice}
+          size="prominent"
+          testIDPrice={testIDPrice}
+          testIDChange={testIDChange}
+        />
+      </Box>
+      {endAccessory}
+    </Box>
+  );
+};
+
+export default PerpsMarketSummary;
diff --git a/app/components/UI/Perps/components/PerpsMarketSummary/index.ts b/app/components/UI/Perps/components/PerpsMarketSummary/index.ts
new file mode 100644
index 000000000000..f87c80785cb8
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsMarketSummary/index.ts
@@ -0,0 +1,2 @@
+export { default, PRICE_SECTION_HEIGHT } from './PerpsMarketSummary';
+export type { PerpsMarketSummaryProps } from './PerpsMarketSummary';
diff --git a/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.styles.ts b/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.styles.ts
deleted file mode 100644
index 9750015af5dc..000000000000
--- a/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.styles.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/* eslint-disable @metamask/design-tokens/color-no-hex */
-import { Platform, StyleSheet } from 'react-native';
-
-/**
- * Perps mode-switch flash colors (TAT-3551).
- *
- * These accent values are taken directly from the Figma spec and are not yet
- * part of the shared design-token palette, so they are defined locally.
- * - `accent/02/dark`    → flash background
- * - `accent/02/light`   → gradient start of the "Pro" title
- * - `accent/02/normal`  → gradient end of the "Pro" title / solid "Lite" title
- */
-export const PERPS_MODE_FLASH_BACKGROUND = '#3d065f';
-export const PERPS_MODE_FLASH_TEXT = '#d075ff';
-export const PERPS_MODE_FLASH_PRO_GRADIENT = ['#eac2ff', '#d075ff'];
-
-const styleSheet = () =>
-  StyleSheet.create({
-    container: {
-      position: 'absolute',
-      top: 0,
-      left: 0,
-      right: 0,
-      bottom: 0,
-      alignItems: 'center',
-      justifyContent: 'center',
-      paddingHorizontal: 24,
-      backgroundColor: PERPS_MODE_FLASH_BACKGROUND,
-      // Sit above every Perps screen while the flash is visible.
-      zIndex: 1000,
-      elevation: 1000,
-    },
-    title: {
-      textAlign: 'center',
-      color: PERPS_MODE_FLASH_TEXT,
-      fontSize: 56,
-      lineHeight: 60,
-      fontFamily: 'MMPoly-Regular',
-      fontWeight: Platform.OS === 'ios' ? '900' : 'normal',
-      includeFontPadding: false,
-    },
-    // The gradient fill is masked by the title text; the underlying text is
-    // transparent so only the gradient shows through the glyphs.
-    gradientFill: {
-      alignItems: 'center',
-    },
-    gradientTextMask: {
-      opacity: 0,
-    },
-  });
-
-export default styleSheet;
diff --git a/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.test.tsx b/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.test.tsx
deleted file mode 100644
index 36529b091648..000000000000
--- a/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.test.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import React from 'react';
-import { render, renderHook, act } from '@testing-library/react-native';
-import { PerpsMode } from '@metamask/perps-controller';
-import { strings } from '../../../../../../locales/i18n';
-import {
-  hidePerpsModeFlash,
-  showPerpsModeFlash,
-  usePerpsModeFlash,
-} from '../../utils/perpsModeFlash';
-import { PerpsModeFlashSelectorsIDs } from '../../Perps.testIds';
-import PerpsModeFlashContainer from './PerpsModeFlashContainer';
-
-describe('PerpsModeFlashContainer', () => {
-  beforeEach(() => {
-    hidePerpsModeFlash();
-  });
-
-  afterEach(() => {
-    jest.useRealTimers();
-    hidePerpsModeFlash();
-  });
-
-  it('renders nothing when no mode is set', () => {
-    // Arrange - store cleared in beforeEach
-
-    // Act
-    const { queryByTestId } = render(<PerpsModeFlashContainer />);
-
-    // Assert
-    expect(queryByTestId(PerpsModeFlashSelectorsIDs.CONTAINER)).toBeNull();
-  });
-
-  it('renders the Lite mode title when flashing Lite', () => {
-    // Arrange
-    showPerpsModeFlash(PerpsMode.Lite);
-
-    // Act
-    const { getByTestId } = render(<PerpsModeFlashContainer />);
-
-    // Assert
-    expect(getByTestId(PerpsModeFlashSelectorsIDs.CONTAINER)).toBeOnTheScreen();
-    expect(getByTestId(PerpsModeFlashSelectorsIDs.TITLE)).toHaveTextContent(
-      strings('perps.mode.lite_transition_title'),
-    );
-  });
-
-  it('renders the gradient Pro mode title when flashing Pro', () => {
-    // Arrange
-    showPerpsModeFlash(PerpsMode.Pro);
-
-    // Act
-    const { getByTestId } = render(<PerpsModeFlashContainer />);
-
-    // Assert
-    expect(getByTestId(PerpsModeFlashSelectorsIDs.CONTAINER)).toBeOnTheScreen();
-    expect(getByTestId(PerpsModeFlashSelectorsIDs.TITLE)).toHaveTextContent(
-      strings('perps.mode.pro_transition_title'),
-    );
-  });
-
-  it('auto-dismisses the flash after the configured duration', () => {
-    // Arrange
-    jest.useFakeTimers();
-    showPerpsModeFlash(PerpsMode.Pro);
-    const probe = renderHook(() => usePerpsModeFlash());
-    render(<PerpsModeFlashContainer durationMs={500} />);
-    expect(probe.result.current).toBe(PerpsMode.Pro);
-
-    // Act
-    act(() => {
-      jest.advanceTimersByTime(500);
-    });
-
-    // Assert
-    expect(probe.result.current).toBeNull();
-  });
-
-  it('clears any lingering flash on unmount', () => {
-    // Arrange
-    showPerpsModeFlash(PerpsMode.Pro);
-    const probe = renderHook(() => usePerpsModeFlash());
-    const { unmount } = render(<PerpsModeFlashContainer />);
-    expect(probe.result.current).toBe(PerpsMode.Pro);
-
-    // Act
-    act(() => {
-      unmount();
-    });
-
-    // Assert
-    expect(probe.result.current).toBeNull();
-  });
-});
diff --git a/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.tsx b/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.tsx
deleted file mode 100644
index 6f9ba02dff9c..000000000000
--- a/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import MaskedView from '@react-native-masked-view/masked-view';
-import React, { useEffect } from 'react';
-import { Text, View } from 'react-native';
-import LinearGradient from 'react-native-linear-gradient';
-import Animated, {
-  FadeIn,
-  FadeOut,
-  useAnimatedStyle,
-  useSharedValue,
-  withSpring,
-} from 'react-native-reanimated';
-import { PerpsMode } from '@metamask/perps-controller';
-import { strings } from '../../../../../../locales/i18n';
-import { useStyles } from '../../../../../component-library/hooks';
-import {
-  hidePerpsModeFlash,
-  usePerpsModeFlash,
-} from '../../utils/perpsModeFlash';
-import { PerpsModeFlashSelectorsIDs } from '../../Perps.testIds';
-import styleSheet, {
-  PERPS_MODE_FLASH_PRO_GRADIENT,
-} from './PerpsModeFlashContainer.styles';
-import type { PerpsModeFlashContainerProps } from './PerpsModeFlashContainer.types';
-
-const DEFAULT_DURATION_MS = 1200;
-
-// Spring mirrors the QuickBuy Buy/Sell toggle feel (TAT-3551): a snappy,
-// lightly-damped entrance for the mode title.
-const TITLE_SPRING_CONFIG = {
-  duration: 300,
-  dampingRatio: 0.7,
-} as const;
-
-/**
- * Global Perps Lite ⇄ Pro mode-switch flash (TAT-3551).
- *
- * Rendered once at the root of the Perps stack. It subscribes to the transient
- * `perpsModeFlash` store; whenever a mode is set (by any entry point that
- * toggles Lite/Pro) it briefly flashes the destination mode name on top of the
- * current Perps screen — mimicking the QuickBuy Buy/Sell transition feel — then
- * clears the state so the flash disappears. Navigation to the destination
- * screen is handled by the caller, so this component is purely presentational.
- */
-const PerpsModeFlashContainer: React.FC<PerpsModeFlashContainerProps> = ({
-  durationMs = DEFAULT_DURATION_MS,
-}) => {
-  const { styles } = useStyles(styleSheet, {});
-  const mode = usePerpsModeFlash();
-
-  const titleProgress = useSharedValue(0);
-  const titleAnimatedStyle = useAnimatedStyle(() => ({
-    opacity: titleProgress.value,
-    transform: [
-      { scale: 0.85 + titleProgress.value * 0.15 },
-      { translateY: (1 - titleProgress.value) * 12 },
-    ],
-  }));
-
-  // Auto-dismiss after the flash has been shown for `durationMs`. Restarting
-  // the timer whenever `mode` changes keeps the flash duration consistent even
-  // if the user toggles again mid-flash.
-  useEffect(() => {
-    if (!mode) {
-      return undefined;
-    }
-    titleProgress.value = 0;
-    titleProgress.value = withSpring(1, TITLE_SPRING_CONFIG);
-    const timer = setTimeout(() => {
-      hidePerpsModeFlash();
-    }, durationMs);
-    return () => clearTimeout(timer);
-  }, [mode, durationMs, titleProgress]);
-
-  // Clear any lingering flash when leaving the Perps stack so it never replays
-  // on re-entry.
-  useEffect(() => () => hidePerpsModeFlash(), []);
-
-  if (!mode) {
-    return null;
-  }
-
-  const isPro = mode === PerpsMode.Pro;
-  const title = isPro
-    ? strings('perps.mode.pro_transition_title')
-    : strings('perps.mode.lite_transition_title');
-
-  return (
-    <Animated.View
-      style={styles.container}
-      entering={FadeIn.duration(180)}
-      exiting={FadeOut.duration(180)}
-      pointerEvents="none"
-      testID={PerpsModeFlashSelectorsIDs.CONTAINER}
-    >
-      <Animated.View style={titleAnimatedStyle}>
-        {isPro ? (
-          <MaskedView
-            maskElement={
-              <Text
-                style={styles.title}
-                testID={PerpsModeFlashSelectorsIDs.TITLE}
-              >
-                {title}
-              </Text>
-            }
-          >
-            <LinearGradient
-              colors={PERPS_MODE_FLASH_PRO_GRADIENT}
-              start={{ x: 0, y: 0 }}
-              end={{ x: 1, y: 1 }}
-              style={styles.gradientFill}
-            >
-              <Text style={[styles.title, styles.gradientTextMask]}>
-                {title}
-              </Text>
-            </LinearGradient>
-          </MaskedView>
-        ) : (
-          <View>
-            <Text
-              style={styles.title}
-              testID={PerpsModeFlashSelectorsIDs.TITLE}
-            >
-              {title}
-            </Text>
-          </View>
-        )}
-      </Animated.View>
-    </Animated.View>
-  );
-};
-
-export default PerpsModeFlashContainer;
diff --git a/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.types.ts b/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.types.ts
deleted file mode 100644
index 70ff86998b36..000000000000
--- a/app/components/UI/Perps/components/PerpsModeFlashContainer/PerpsModeFlashContainer.types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface PerpsModeFlashContainerProps {
-  /**
-   * How long the flash stays on screen before it auto-dismisses, in ms.
-   *
-   * @default 1200
-   */
-  durationMs?: number;
-}
diff --git a/app/components/UI/Perps/components/PerpsModeFlashContainer/index.ts b/app/components/UI/Perps/components/PerpsModeFlashContainer/index.ts
deleted file mode 100644
index a5034091a40e..000000000000
--- a/app/components/UI/Perps/components/PerpsModeFlashContainer/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default } from './PerpsModeFlashContainer';
-export type { PerpsModeFlashContainerProps } from './PerpsModeFlashContainer.types';
diff --git a/app/components/UI/Perps/components/PerpsModeSelectionBottomSheet/PerpsModeSelectionBottomSheet.test.tsx b/app/components/UI/Perps/components/PerpsModeSelectionBottomSheet/PerpsModeSelectionBottomSheet.test.tsx
new file mode 100644
index 000000000000..e3a7d0933cfa
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsModeSelectionBottomSheet/PerpsModeSelectionBottomSheet.test.tsx
@@ -0,0 +1,119 @@
+import { PerpsMode } from '@metamask/perps-controller';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import React from 'react';
+import { PerpsModeSelectionBottomSheetSelectorsIDs } from '../../Perps.testIds';
+import PerpsModeSelectionBottomSheet from './PerpsModeSelectionBottomSheet';
+
+jest.mock('@metamask/design-system-twrnc-preset', () => {
+  const tw = (..._args: unknown[]) => ({});
+  tw.style = jest.fn(() => ({}));
+  return { useTailwind: () => tw };
+});
+
+jest.mock('../../../../../../locales/i18n', () => ({
+  strings: jest.fn((key: string) => {
+    const translations: Record<string, string> = {
+      'perps.mode.selection_title': 'Choose how you trade',
+      'perps.mode.lite': 'Lite',
+      'perps.mode.lite_description':
+        'One-tap longs or shorts. Simple by design.',
+      'perps.mode.pro': 'Pro',
+      'perps.mode.pro_description':
+        'Order book, advanced order types, and leverage.',
+    };
+    return translations[key] ?? key;
+  }),
+}));
+
+describe('PerpsModeSelectionBottomSheet', () => {
+  const defaultProps = {
+    selectedMode: PerpsMode.Lite,
+    onSelect: jest.fn(),
+    onClose: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the mode options and their visual assets', () => {
+    render(<PerpsModeSelectionBottomSheet {...defaultProps} />);
+
+    expect(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.TITLE),
+    ).toHaveTextContent('Choose how you trade');
+    expect(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.LITE_ICON),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.PRO_ICON),
+    ).toBeOnTheScreen();
+  });
+
+  it('marks only the selected mode', () => {
+    render(
+      <PerpsModeSelectionBottomSheet
+        {...defaultProps}
+        selectedMode={PerpsMode.Pro}
+      />,
+    );
+
+    expect(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.LITE_OPTION)
+        .props.accessibilityState,
+    ).toEqual({ selected: false });
+    expect(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.PRO_OPTION)
+        .props.accessibilityState,
+    ).toEqual({ selected: true });
+    expect(
+      screen.getAllByTestId(
+        PerpsModeSelectionBottomSheetSelectorsIDs.SELECTED_INDICATOR,
+      ),
+    ).toHaveLength(1);
+  });
+
+  it('defaults to Lite mode when selectedMode is omitted', () => {
+    const { selectedMode: _selectedMode, ...propsWithoutSelectedMode } =
+      defaultProps;
+
+    render(<PerpsModeSelectionBottomSheet {...propsWithoutSelectedMode} />);
+
+    expect(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.LITE_OPTION)
+        .props.accessibilityState,
+    ).toEqual({ selected: true });
+    expect(
+      screen.getByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.PRO_OPTION)
+        .props.accessibilityState,
+    ).toEqual({ selected: false });
+  });
+
+  it.each([
+    [PerpsModeSelectionBottomSheetSelectorsIDs.LITE_OPTION, PerpsMode.Lite],
+    [PerpsModeSelectionBottomSheetSelectorsIDs.PRO_OPTION, PerpsMode.Pro],
+  ])('calls onSelect with the pressed mode for %s', (testID, mode) => {
+    const onSelect = jest.fn();
+    render(
+      <PerpsModeSelectionBottomSheet {...defaultProps} onSelect={onSelect} />,
+    );
+
+    fireEvent.press(screen.getByTestId(testID));
+
+    expect(onSelect).toHaveBeenCalledTimes(1);
+    expect(onSelect).toHaveBeenCalledWith(mode);
+  });
+
+  it('renders nothing when hidden', () => {
+    render(
+      <PerpsModeSelectionBottomSheet {...defaultProps} isVisible={false} />,
+    );
+
+    expect(
+      screen.queryByTestId(PerpsModeSelectionBottomSheetSelectorsIDs.CONTAINER),
+    ).not.toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/Perps/components/PerpsModeSelectionBottomSheet/PerpsModeSelectionBottomSheet.tsx b/app/components/UI/Perps/components/PerpsModeSelectionBottomSheet/PerpsModeSelectionBottomSheet.tsx
new file mode 100644
index 000000000000..448f78ef43e4
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsModeSelectionBottomSheet/PerpsModeSelectionBottomSheet.tsx
@@ -0,0 +1,187 @@
+import {
+  BottomSheet,
+  BottomSheetHeader,
+  type BottomSheetRef,
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  ButtonBase,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { PerpsMode } from '@metamask/perps-controller';
+import React, { useEffect, useRef } from 'react';
+import { Image } from 'react-native';
+import { strings } from '../../../../../../locales/i18n';
+import foxLogo from '../../../../../images/branding/fox.png';
+import { PerpsModeSelectionBottomSheetSelectorsIDs } from '../../Perps.testIds';
+
+export interface PerpsModeSelectionBottomSheetProps {
+  isVisible?: boolean;
+  /** Defaults to Lite so first-time presentation matches product default. */
+  selectedMode?: PerpsMode;
+  onSelect: (mode: PerpsMode) => void;
+  onClose: () => void;
+}
+
+interface ModeCardProps {
+  mode: PerpsMode;
+  title: string;
+  description: string;
+  isSelected: boolean;
+  onPress: () => void;
+}
+
+const ModeCard = ({
+  mode,
+  title,
+  description,
+  isSelected,
+  onPress,
+}: ModeCardProps) => {
+  const tw = useTailwind();
+  const isLite = mode === PerpsMode.Lite;
+  const optionTestID = isLite
+    ? PerpsModeSelectionBottomSheetSelectorsIDs.LITE_OPTION
+    : PerpsModeSelectionBottomSheetSelectorsIDs.PRO_OPTION;
+
+  return (
+    <ButtonBase
+      onPress={onPress}
+      accessibilityLabel={title}
+      accessibilityHint={description}
+      accessibilityState={{ selected: isSelected }}
+      testID={optionTestID}
+      twClassName={(pressed) =>
+        `h-[186px] flex-1 items-stretch rounded-xl border p-4 ${
+          isSelected ? 'border-default' : 'border-transparent'
+        } ${pressed ? 'bg-pressed' : 'bg-muted'}`
+      }
+      contentWrapperProps={{
+        twClassName: 'h-full w-full items-stretch',
+      }}
+    >
+      <Box twClassName="h-full w-full">
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Start}
+          justifyContent={BoxJustifyContent.Between}
+        >
+          <Box
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Center}
+            twClassName={`size-14 rounded-full ${
+              isLite ? 'bg-error-muted' : 'bg-warning-muted'
+            }`}
+          >
+            {isLite ? (
+              <Image
+                source={foxLogo}
+                resizeMode="contain"
+                style={tw.style('size-8')}
+                testID={PerpsModeSelectionBottomSheetSelectorsIDs.LITE_ICON}
+              />
+            ) : (
+              <Icon
+                name={IconName.Candlestick}
+                size={IconSize.Xl}
+                color={IconColor.WarningDefault}
+                testID={PerpsModeSelectionBottomSheetSelectorsIDs.PRO_ICON}
+              />
+            )}
+          </Box>
+          {isSelected ? (
+            <Icon
+              name={IconName.Confirmation}
+              size={IconSize.Md}
+              color={IconColor.IconDefault}
+              testID={
+                PerpsModeSelectionBottomSheetSelectorsIDs.SELECTED_INDICATOR
+              }
+            />
+          ) : null}
+        </Box>
+        <Text
+          variant={TextVariant.BodyMd}
+          fontWeight={FontWeight.Medium}
+          color={TextColor.TextDefault}
+          twClassName="mt-4"
+        >
+          {title}
+        </Text>
+        <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
+          {description}
+        </Text>
+      </Box>
+    </ButtonBase>
+  );
+};
+
+/**
+ * Presents the Lite and Pro Perps modes without owning or persisting selection
+ * state. The parent supplies the selected mode and handles selection changes.
+ */
+const PerpsModeSelectionBottomSheet = ({
+  isVisible = true,
+  selectedMode = PerpsMode.Lite,
+  onSelect,
+  onClose,
+}: PerpsModeSelectionBottomSheetProps) => {
+  const sheetRef = useRef<BottomSheetRef>(null);
+
+  useEffect(() => {
+    if (isVisible) {
+      sheetRef.current?.onOpenBottomSheet();
+    }
+  }, [isVisible]);
+
+  if (!isVisible) {
+    return null;
+  }
+
+  return (
+    <BottomSheet
+      ref={sheetRef}
+      goBack={onClose}
+      testID={PerpsModeSelectionBottomSheetSelectorsIDs.CONTAINER}
+    >
+      <BottomSheetHeader
+        testID={PerpsModeSelectionBottomSheetSelectorsIDs.TITLE}
+      >
+        {strings('perps.mode.selection_title')}
+      </BottomSheetHeader>
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        gap={3}
+        paddingHorizontal={4}
+        paddingTop={3}
+        paddingBottom={4}
+      >
+        <ModeCard
+          mode={PerpsMode.Lite}
+          title={strings('perps.mode.lite')}
+          description={strings('perps.mode.lite_description')}
+          isSelected={selectedMode === PerpsMode.Lite}
+          onPress={() => onSelect(PerpsMode.Lite)}
+        />
+        <ModeCard
+          mode={PerpsMode.Pro}
+          title={strings('perps.mode.pro')}
+          description={strings('perps.mode.pro_description')}
+          isSelected={selectedMode === PerpsMode.Pro}
+          onPress={() => onSelect(PerpsMode.Pro)}
+        />
+      </Box>
+    </BottomSheet>
+  );
+};
+
+export default PerpsModeSelectionBottomSheet;
diff --git a/app/components/UI/Perps/components/PerpsModeSelectionBottomSheet/index.ts b/app/components/UI/Perps/components/PerpsModeSelectionBottomSheet/index.ts
new file mode 100644
index 000000000000..c20566ca4322
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsModeSelectionBottomSheet/index.ts
@@ -0,0 +1,2 @@
+export { default } from './PerpsModeSelectionBottomSheet';
+export type { PerpsModeSelectionBottomSheetProps } from './PerpsModeSelectionBottomSheet';
diff --git a/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeSwitchPill.tsx b/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeSwitchPill.tsx
new file mode 100644
index 000000000000..b9ce02f029d0
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeSwitchPill.tsx
@@ -0,0 +1,271 @@
+import MaskedView from '@react-native-masked-view/masked-view';
+import {
+  Box,
+  ButtonBase,
+  ButtonBaseSize,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { StyleSheet, Text } from 'react-native';
+import LinearGradient from 'react-native-linear-gradient';
+import Animated, {
+  Easing,
+  interpolate,
+  useAnimatedStyle,
+  useSharedValue,
+  withDelay,
+  withSequence,
+  withTiming,
+} from 'react-native-reanimated';
+
+export const GLOW_TOTAL_MS = 750;
+const GLOW_SWEEP_MS = 700;
+const GLOW_FADE_MS = 120;
+const GLOW_HOLD_MS = GLOW_TOTAL_MS - GLOW_FADE_MS * 2;
+const BORDER_WIDTH = 1.5;
+
+// CSS 105deg translated to react-native-linear-gradient coordinates.
+const SHIMMER_START = { x: 0, y: 0.37 };
+const SHIMMER_END = { x: 1, y: 0.63 };
+const SHIMMER_LOCATIONS = [0.3, 0.45, 0.55, 0.7];
+const PRO_GRADIENT_LOCATIONS = [0, 0.203, 0.406, 0.609, 0.812];
+
+// Figma TAT-2536 ModeSwitchPill gradient tokens are not shared tokens yet.
+/* eslint-disable @metamask/design-tokens/color-no-hex */
+const SHIMMER_COLORS = ['transparent', '#DDC598', '#D99D2C', 'transparent'];
+const PRO_GRADIENT_COLORS = [
+  '#D99D2C',
+  '#DDC598',
+  '#D99D2C',
+  '#DDC598',
+  '#D99D2C',
+];
+const LITE_LABEL_COLOR = '#9b9b9b';
+const BORDER_COLOR = '#858b9a33';
+/* eslint-enable @metamask/design-tokens/color-no-hex */
+
+const styles = StyleSheet.create({
+  // Colors are fixed by the ModeSwitchPill Figma spec and are not tokens.
+  /* eslint-disable @metamask/design-tokens/color-no-hex, react-native/no-color-literals */
+  label: {
+    fontSize: 14,
+    lineHeight: 22,
+    fontWeight: '500',
+    color: LITE_LABEL_COLOR,
+  },
+  maskLabel: {
+    fontSize: 14,
+    lineHeight: 22,
+    fontWeight: '500',
+    color: '#ffffff',
+  },
+  /* eslint-enable @metamask/design-tokens/color-no-hex, react-native/no-color-literals */
+  transparentLabel: {
+    fontSize: 14,
+    lineHeight: 22,
+    fontWeight: '500',
+    opacity: 0,
+  },
+});
+
+interface ModeLabelProps {
+  children: string;
+  isPro: boolean;
+  isMask?: boolean;
+}
+
+const ModeLabel = ({ children, isPro, isMask = false }: ModeLabelProps) => {
+  const text = (
+    <Text style={isMask ? styles.maskLabel : styles.label}>{children}</Text>
+  );
+
+  if (!isPro || isMask) {
+    return text;
+  }
+
+  return (
+    <MaskedView maskElement={text}>
+      <LinearGradient
+        colors={PRO_GRADIENT_COLORS}
+        locations={PRO_GRADIENT_LOCATIONS}
+        start={{ x: 0, y: 0 }}
+        end={{ x: 1, y: 1 }}
+      >
+        <Text style={styles.transparentLabel}>{children}</Text>
+      </LinearGradient>
+    </MaskedView>
+  );
+};
+
+interface PerpsModeSwitchPillProps {
+  currentModeLabel: string;
+  isPro: boolean;
+  onSwitchRequest: () => void;
+  accessibilityLabel: string;
+  accessibilityHint: string;
+  testID: string;
+}
+
+const PerpsModeSwitchPill = ({
+  currentModeLabel,
+  isPro,
+  onSwitchRequest,
+  accessibilityLabel,
+  accessibilityHint,
+  testID,
+}: PerpsModeSwitchPillProps) => {
+  const tw = useTailwind();
+  const [width, setWidth] = useState(0);
+  const [isShimmering, setIsShimmering] = useState(false);
+  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const sweepProgress = useSharedValue(0);
+  const overlayOpacity = useSharedValue(0);
+
+  useEffect(
+    () => () => {
+      if (timerRef.current) {
+        clearTimeout(timerRef.current);
+      }
+    },
+    [],
+  );
+
+  const sweepStyle = useAnimatedStyle(() => ({
+    transform: [
+      {
+        translateX: interpolate(sweepProgress.value, [0, 1], [-2 * width, 0]),
+      },
+    ],
+  }));
+
+  const overlayStyle = useAnimatedStyle(() => ({
+    opacity: overlayOpacity.value,
+  }));
+
+  const handlePress = useCallback(() => {
+    if (timerRef.current) {
+      return;
+    }
+
+    setIsShimmering(true);
+    sweepProgress.value = 0;
+    overlayOpacity.value = 0;
+    sweepProgress.value = withTiming(1, {
+      duration: GLOW_SWEEP_MS,
+      easing: Easing.inOut(Easing.ease),
+    });
+    overlayOpacity.value = withSequence(
+      withTiming(1, { duration: GLOW_FADE_MS }),
+      withDelay(GLOW_HOLD_MS, withTiming(0, { duration: GLOW_FADE_MS })),
+    );
+
+    timerRef.current = setTimeout(() => {
+      timerRef.current = null;
+      setIsShimmering(false);
+      onSwitchRequest();
+    }, GLOW_TOTAL_MS);
+  }, [onSwitchRequest, overlayOpacity, sweepProgress]);
+
+  const gradient = (
+    <LinearGradient
+      colors={SHIMMER_COLORS}
+      locations={SHIMMER_LOCATIONS}
+      start={SHIMMER_START}
+      end={SHIMMER_END}
+      style={tw.style('flex-1')}
+    />
+  );
+
+  return (
+    <Box
+      accessible={false}
+      twClassName="relative h-8"
+      onLayout={(event) => setWidth(event.nativeEvent.layout.width)}
+    >
+      <ButtonBase
+        size={ButtonBaseSize.Sm}
+        twClassName={(pressed) =>
+          `h-8 rounded-lg border bg-default px-3 ${pressed ? 'bg-pressed' : ''}`
+        }
+        style={{ borderColor: BORDER_COLOR, borderWidth: BORDER_WIDTH }}
+        onPress={handlePress}
+        disabled={isShimmering}
+        accessibilityLabel={accessibilityLabel}
+        accessibilityHint={accessibilityHint}
+        accessibilityRole="button"
+        testID={testID}
+      >
+        <ModeLabel isPro={isPro}>{currentModeLabel}</ModeLabel>
+      </ButtonBase>
+
+      {isShimmering && width > 0 ? (
+        <Animated.View
+          accessible={false}
+          pointerEvents="none"
+          style={[
+            tw.style('absolute inset-0 overflow-hidden rounded-lg'),
+            overlayStyle,
+          ]}
+        >
+          <Animated.View
+            accessible={false}
+            style={[
+              tw.style('absolute bottom-0 top-0'),
+              { width: width * 3 },
+              sweepStyle,
+            ]}
+          >
+            {gradient}
+          </Animated.View>
+
+          <Box
+            accessible={false}
+            twClassName="absolute bg-default"
+            style={{
+              top: BORDER_WIDTH,
+              right: BORDER_WIDTH,
+              bottom: BORDER_WIDTH,
+              left: BORDER_WIDTH,
+              borderRadius: 8 - BORDER_WIDTH,
+            }}
+          />
+
+          <Box
+            twClassName="absolute inset-0 items-center justify-center"
+            accessible={false}
+          >
+            <ModeLabel isPro={isPro}>{currentModeLabel}</ModeLabel>
+          </Box>
+
+          <MaskedView
+            accessible={false}
+            style={tw.style('absolute inset-0')}
+            maskElement={
+              <Box
+                accessible={false}
+                twClassName="flex-1 items-center justify-center"
+              >
+                <ModeLabel isPro={isPro} isMask>
+                  {currentModeLabel}
+                </ModeLabel>
+              </Box>
+            }
+          >
+            <Animated.View
+              accessible={false}
+              style={[
+                tw.style('absolute bottom-0 top-0'),
+                { width: width * 3 },
+                sweepStyle,
+              ]}
+            >
+              {gradient}
+            </Animated.View>
+          </MaskedView>
+        </Animated.View>
+      ) : null}
+    </Box>
+  );
+};
+
+export default PerpsModeSwitchPill;
diff --git a/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.test.tsx b/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.test.tsx
index 40615e97df26..c1ae871dfc5c 100644
--- a/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.test.tsx
+++ b/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, fireEvent } from '@testing-library/react-native';
+import { act, render, fireEvent } from '@testing-library/react-native';
 import {
   PERPS_EVENT_PROPERTY,
   PERPS_EVENT_VALUE,
@@ -8,6 +8,7 @@ import {
 import PerpsModeToggle from './PerpsModeToggle';
 import { PerpsModeToggleSelectorsIDs } from '../../Perps.testIds';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import { GLOW_TOTAL_MS } from './PerpsModeSwitchPill';
 
 const mockTrack = jest.fn();
 jest.mock('../../hooks/usePerpsEventTracking', () => ({
@@ -36,24 +37,39 @@ jest.mock('@metamask/design-system-react-native', () => {
       children,
       testID,
       onPress,
+      disabled,
       accessibilityLabel,
       accessibilityHint,
     }: {
       children: React.ReactNode;
       testID?: string;
       onPress?: () => void;
+      disabled?: boolean;
       accessibilityLabel?: string;
       accessibilityHint?: string;
     }) => (
       <TouchableOpacity
         testID={testID}
         onPress={onPress}
+        disabled={disabled}
         accessibilityLabel={accessibilityLabel}
         accessibilityHint={accessibilityHint}
       >
         <Text>{children}</Text>
       </TouchableOpacity>
     ),
+    Box: ({
+      children,
+      onLayout,
+      ...props
+    }: {
+      children?: React.ReactNode;
+      onLayout?: () => void;
+    }) => (
+      <View onLayout={onLayout} {...props}>
+        {children}
+      </View>
+    ),
     SegmentedControl: ({
       value,
       onChange,
@@ -97,11 +113,44 @@ jest.mock('@metamask/design-system-react-native', () => {
   };
 });
 
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({
+    style: (...args: unknown[]) => args,
+  }),
+}));
+
+jest.mock('@react-native-masked-view/masked-view', () => {
+  const { View } = jest.requireActual('react-native');
+  return ({
+    children,
+    maskElement,
+  }: {
+    children?: React.ReactNode;
+    maskElement?: React.ReactNode;
+  }) => (
+    <View>
+      {maskElement}
+      {children}
+    </View>
+  );
+});
+
+jest.mock('react-native-linear-gradient', () => {
+  const { View } = jest.requireActual('react-native');
+  return ({ children }: { children?: React.ReactNode }) => (
+    <View>{children}</View>
+  );
+});
+
 describe('PerpsModeToggle', () => {
   beforeEach(() => {
     mockTrack.mockClear();
   });
 
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
   it('renders both Lite and Pro segments in the default toggle variant', () => {
     const { getByTestId, getByText, getAllByText } = render(
       <PerpsModeToggle mode={PerpsMode.Lite} onChange={jest.fn()} />,
@@ -199,11 +248,11 @@ describe('PerpsModeToggle', () => {
       getByTestId(PerpsModeToggleSelectorsIDs.PRO_SEGMENT),
     ).toBeOnTheScreen();
     expect(queryByTestId(PerpsModeToggleSelectorsIDs.LITE_SEGMENT)).toBeNull();
-    // Gradient label renders the string twice (mask + sizing text).
     expect(getAllByText('Pro').length).toBeGreaterThan(0);
   });
 
-  it('flips to the opposite mode and tracks the change when the active pill is pressed', () => {
+  it('finishes the active-pill animation before changing mode', () => {
+    jest.useFakeTimers();
     const onChange = jest.fn();
     const { getByTestId } = render(
       <PerpsModeToggle
@@ -216,6 +265,12 @@ describe('PerpsModeToggle', () => {
 
     fireEvent.press(getByTestId(PerpsModeToggleSelectorsIDs.PRO_SEGMENT));
 
+    expect(onChange).not.toHaveBeenCalled();
+    expect(getByTestId(PerpsModeToggleSelectorsIDs.PRO_SEGMENT)).toBeDisabled();
+    act(() => {
+      jest.advanceTimersByTime(GLOW_TOTAL_MS);
+    });
+
     expect(onChange).toHaveBeenCalledTimes(1);
     expect(onChange).toHaveBeenCalledWith(PerpsMode.Lite);
     expect(mockTrack).toHaveBeenCalledTimes(1);
diff --git a/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.tsx b/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.tsx
index ebda7d239d38..c1abf96ad0ce 100644
--- a/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.tsx
+++ b/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.tsx
@@ -1,7 +1,5 @@
 import React, { useCallback } from 'react';
 import {
-  ButtonBase,
-  ButtonBaseSize,
   FilterButton,
   SegmentedControl,
   SegmentedControlSize,
@@ -17,6 +15,7 @@ import { PerpsModeToggleSelectorsIDs } from '../../Perps.testIds';
 import { usePerpsEventTracking } from '../../hooks/usePerpsEventTracking';
 import { type PerpsModeToggleProps } from './PerpsModeToggle.types';
 import PerpsProGradientLabel from './PerpsProGradientLabel';
+import PerpsModeSwitchPill from './PerpsModeSwitchPill';
 
 /**
  * Selected "Pro" segment fill from Figma — `accent/02/normal` at ~18% over
@@ -30,7 +29,6 @@ const PERPS_PRO_ACCENT_SELECTED_BG = '#382b43';
  *
  * Rendered as a two-segment pill built on the design-system `SegmentedControl`
  * / `FilterButton`. A single component powers every entry point:
- * - Trade bottom-sheet menu (Perps row)
  * - Perps home header
  * - Market header (`variant="active"` shows only the active mode)
  */
@@ -70,19 +68,19 @@ const PerpsModeToggle: React.FC<PerpsModeToggleProps> = ({
     <PerpsProGradientLabel>{proLabel}</PerpsProGradientLabel>
   );
 
-  // Market header: single outlined pill showing only the active mode, per Figma
-  // (transparent fill, `border/muted` border, gradient "Pro" text). Pressing it
-  // flips to the opposite mode (same analytics + onChange path as the full
-  // toggle).
+  // Market header: single outlined pill showing only the active mode. Pro uses
+  // the theme-specific gold treatment from Figma; Lite uses neutral tokens.
   if (variant === 'active') {
     const isPro = mode === PerpsMode.Pro;
     const nextModeLabel = isPro ? liteLabel : proLabel;
     const currentModeLabel = isPro ? proLabel : liteLabel;
     return (
-      <ButtonBase
-        size={ButtonBaseSize.Sm}
-        twClassName="bg-transparent border border-border-muted"
-        onPress={() => handleChange(isPro ? PerpsMode.Lite : PerpsMode.Pro)}
+      <PerpsModeSwitchPill
+        currentModeLabel={currentModeLabel}
+        isPro={isPro}
+        onSwitchRequest={() =>
+          handleChange(isPro ? PerpsMode.Lite : PerpsMode.Pro)
+        }
         accessibilityLabel={strings(
           'perps.mode.active_pill_accessibility_label',
           { mode: currentModeLabel },
@@ -96,9 +94,7 @@ const PerpsModeToggle: React.FC<PerpsModeToggleProps> = ({
             ? PerpsModeToggleSelectorsIDs.PRO_SEGMENT
             : PerpsModeToggleSelectorsIDs.LITE_SEGMENT
         }
-      >
-        {isPro ? proGradientLabel : liteLabel}
-      </ButtonBase>
+      />
     );
   }
 
diff --git a/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.types.ts b/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.types.ts
index e89993a95cc8..3f43c9c68ef8 100644
--- a/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.types.ts
+++ b/app/components/UI/Perps/components/PerpsModeToggle/PerpsModeToggle.types.ts
@@ -4,11 +4,11 @@ import type { PerpsMode } from '@metamask/perps-controller';
 /**
  * How the toggle presents itself.
  *
- * `'toggle'` (default) renders the interactive two-segment pill ("Lite" / "Pro")
- * used in the Trade menu and Perps home header.
+ * `'toggle'` (default) renders the interactive two-segment pill ("Lite" / "Pro").
  *
  * `'active'` renders a single pill showing only the currently active mode, used
- * in the Market header (AC #6.3). Pressing it flips to the opposite mode.
+ * in Perps headers. Pressing it plays the shimmer and flips to the opposite
+ * mode.
  */
 export type PerpsModeToggleVariant = 'toggle' | 'active';
 
@@ -22,7 +22,7 @@ export interface PerpsModeToggleProps {
    * Called when the user selects a different mode. In the `'active'` variant,
    * this fires with the opposite mode when the pill is pressed.
    */
-  onChange?: (mode: PerpsMode) => void;
+  onChange?: (mode: PerpsMode) => void | Promise<void>;
 
   /**
    * @default 'toggle'
diff --git a/app/components/UI/Perps/components/PerpsModifyActionSheet/PerpsModifyActionSheet.test.tsx b/app/components/UI/Perps/components/PerpsModifyActionSheet/PerpsModifyActionSheet.test.tsx
index c4a1c9f688aa..cff1baaba45b 100644
--- a/app/components/UI/Perps/components/PerpsModifyActionSheet/PerpsModifyActionSheet.test.tsx
+++ b/app/components/UI/Perps/components/PerpsModifyActionSheet/PerpsModifyActionSheet.test.tsx
@@ -4,10 +4,6 @@ import PerpsModifyActionSheet from './PerpsModifyActionSheet';
 import { type Position } from '@metamask/perps-controller';
 import { PerpsModifyActionSheetSelectorsIDs } from '../../Perps.testIds';
 
-jest.mock('../../../../../util/theme/themeUtils', () => ({
-  useElevatedSurface: () => 'bg-default',
-}));
-
 jest.mock('../../../../../../locales/i18n', () => ({
   strings: jest.fn((key) => {
     const translations: Record<string, string> = {
diff --git a/app/components/UI/Perps/components/PerpsOrderSizeBottomSheet/PerpsOrderSizeBottomSheet.test.tsx b/app/components/UI/Perps/components/PerpsOrderSizeBottomSheet/PerpsOrderSizeBottomSheet.test.tsx
new file mode 100644
index 000000000000..886444592b61
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsOrderSizeBottomSheet/PerpsOrderSizeBottomSheet.test.tsx
@@ -0,0 +1,391 @@
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import React from 'react';
+import PerpsOrderSizeBottomSheet from './PerpsOrderSizeBottomSheet';
+import { PerpsOrderSizeBottomSheetSelectorsIDs } from '../../Perps.testIds';
+
+jest.mock('../../../../Base/Keypad', () => {
+  const { Pressable, Text, View } = jest.requireActual('react-native');
+  return function Keypad({
+    onChange,
+    value,
+  }: {
+    onChange: (payload: { value: string; valueAsNumber: number }) => void;
+    value: string;
+  }) {
+    return (
+      <View testID="mock-keypad">
+        <Pressable
+          testID="mock-keypad-set-size"
+          onPress={() => onChange({ value: '2', valueAsNumber: 2 })}
+        >
+          <Text>Set 2</Text>
+        </Pressable>
+        <Pressable
+          testID="mock-keypad-set-huge-size"
+          onPress={() =>
+            onChange({ value: '555555555', valueAsNumber: 555555555 })
+          }
+        >
+          <Text>Set huge</Text>
+        </Pressable>
+        <Text>{value}</Text>
+      </View>
+    );
+  };
+});
+
+jest.mock('../../hooks/useMinimumOrderAmount', () => ({
+  useMinimumOrderAmount: () => ({
+    minimumOrderAmount: 10,
+    isLoading: false,
+    error: null,
+  }),
+}));
+
+const mockUsePerpsLiveAccount = jest.fn(
+  (): {
+    account: { spendableBalance: string } | null;
+    isInitialLoading: boolean;
+  } => ({
+    account: { spendableBalance: '1000' },
+    isInitialLoading: false,
+  }),
+);
+
+jest.mock('../../hooks/stream', () => ({
+  usePerpsLiveAccount: () => mockUsePerpsLiveAccount(),
+}));
+
+describe('PerpsOrderSizeBottomSheet', () => {
+  const onConfirm = jest.fn();
+  const onClose = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: { spendableBalance: '1000' },
+      isInitialLoading: false,
+    });
+  });
+
+  it('renders and confirms a new size', () => {
+    render(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="SOL"
+        orderSize="1"
+        limitPrice="160"
+        szDecimals={3}
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    fireEvent.press(screen.getByTestId('mock-keypad-set-size'));
+    fireEvent.press(
+      screen.getByTestId(PerpsOrderSizeBottomSheetSelectorsIDs.CONFIRM_BUTTON),
+    );
+
+    expect(onConfirm).toHaveBeenCalledWith('2');
+  });
+
+  it('returns null when not visible', () => {
+    render(
+      <PerpsOrderSizeBottomSheet
+        isVisible={false}
+        asset="SOL"
+        orderSize="1"
+        limitPrice="160"
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    expect(
+      screen.queryByTestId(PerpsOrderSizeBottomSheetSelectorsIDs.SIZE_DISPLAY),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('formats large sizes with thousand separators', () => {
+    render(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="CASHCAT"
+        orderSize="205020"
+        limitPrice="0.04888"
+        szDecimals={2}
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    expect(screen.getByDisplayValue('205,020')).toBeOnTheScreen();
+  });
+
+  it('shows a single dollar sign in the minimum size error', () => {
+    render(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="SOL"
+        orderSize="0.001"
+        limitPrice="1"
+        szDecimals={3}
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    expect(screen.getByText('Minimum order size is $10')).toBeOnTheScreen();
+  });
+
+  it('warns and disables Set when a size increase needs more margin than is available', () => {
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: { spendableBalance: '0.51' },
+      isInitialLoading: false,
+    });
+
+    render(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="CASHCAT"
+        orderSize="205"
+        limitPrice="0.04888"
+        szDecimals={2}
+        leverage={40}
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    fireEvent.press(screen.getByTestId('mock-keypad-set-huge-size'));
+
+    expect(
+      screen.getByText(/Insufficient balance\. Required:/),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsOrderSizeBottomSheetSelectorsIDs.CONFIRM_BUTTON),
+    ).toBeDisabled();
+  });
+
+  it('does not warn when decreasing size even with a low available balance', () => {
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: { spendableBalance: '0.51' },
+      isInitialLoading: false,
+    });
+
+    render(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="SOL"
+        orderSize="10"
+        limitPrice="160"
+        szDecimals={3}
+        leverage={40}
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    fireEvent.press(screen.getByTestId('mock-keypad-set-size'));
+
+    expect(
+      screen.queryByText(/Insufficient balance\. Required:/),
+    ).not.toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsOrderSizeBottomSheetSelectorsIDs.CONFIRM_BUTTON),
+    ).not.toBeDisabled();
+  });
+
+  it('skips the margin check for reduce-only orders', () => {
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: { spendableBalance: '0.51' },
+      isInitialLoading: false,
+    });
+
+    render(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="CASHCAT"
+        orderSize="205"
+        limitPrice="0.04888"
+        szDecimals={2}
+        leverage={40}
+        reduceOnly
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    fireEvent.press(screen.getByTestId('mock-keypad-set-huge-size'));
+
+    expect(
+      screen.queryByText(/Insufficient balance\. Required:/),
+    ).not.toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsOrderSizeBottomSheetSelectorsIDs.CONFIRM_BUTTON),
+    ).not.toBeDisabled();
+  });
+
+  it('does not warn when the size is comfortably within available margin', () => {
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: { spendableBalance: '1000' },
+      isInitialLoading: false,
+    });
+
+    render(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="SOL"
+        orderSize="1"
+        limitPrice="160"
+        szDecimals={3}
+        leverage={3}
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    expect(
+      screen.queryByText(/Insufficient balance\. Required:/),
+    ).not.toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsOrderSizeBottomSheetSelectorsIDs.CONFIRM_BUTTON),
+    ).not.toBeDisabled();
+  });
+
+  it('holds keypad and confirm while market data is loading', () => {
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: { spendableBalance: '0.51' },
+      isInitialLoading: false,
+    });
+
+    render(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="CASHCAT"
+        orderSize="555555555"
+        limitPrice="0.04888"
+        szDecimals={6}
+        leverage={3}
+        isMarketDataReady={false}
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    expect(screen.queryByTestId('mock-keypad')).not.toBeOnTheScreen();
+    expect(
+      screen.queryByText(/Insufficient balance\. Required:/),
+    ).not.toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsOrderSizeBottomSheetSelectorsIDs.CONFIRM_BUTTON),
+    ).toBeDisabled();
+  });
+
+  it('holds keypad and confirm while account balance is still loading', () => {
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: null,
+      isInitialLoading: true,
+    });
+
+    render(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="CASHCAT"
+        orderSize="555555555"
+        limitPrice="0.04888"
+        szDecimals={2}
+        leverage={40}
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    expect(screen.queryByTestId('mock-keypad')).not.toBeOnTheScreen();
+    expect(
+      screen.queryByText(/Insufficient balance\. Required:/),
+    ).not.toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsOrderSizeBottomSheetSelectorsIDs.CONFIRM_BUTTON),
+    ).toBeDisabled();
+  });
+
+  it('warns and disables Set when spendable balance is zero on a size increase', () => {
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: { spendableBalance: '0' },
+      isInitialLoading: false,
+    });
+
+    render(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="CASHCAT"
+        orderSize="205"
+        limitPrice="0.04888"
+        szDecimals={2}
+        leverage={40}
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    fireEvent.press(screen.getByTestId('mock-keypad-set-huge-size'));
+
+    expect(
+      screen.getByText(/Insufficient balance\. Required:/),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsOrderSizeBottomSheetSelectorsIDs.CONFIRM_BUTTON),
+    ).toBeDisabled();
+  });
+
+  it('uses effective leverage so lower leverage can block a size increase max leverage would allow', () => {
+    // additional notional for huge size ≈ 555555555 * 0.04888
+    // at 40x: margin ≈ 678k; at 3x: margin ≈ 9.05M
+    // spendable 700k clears 40x but not 3x
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: { spendableBalance: '700000' },
+      isInitialLoading: false,
+    });
+
+    const { rerender } = render(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="CASHCAT"
+        orderSize="205"
+        limitPrice="0.04888"
+        szDecimals={2}
+        leverage={40}
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    fireEvent.press(screen.getByTestId('mock-keypad-set-huge-size'));
+    expect(
+      screen.queryByText(/Insufficient balance\. Required:/),
+    ).not.toBeOnTheScreen();
+
+    // Keep resting orderSize prop at 205 so current notional stays the original
+    // order; only effective leverage changes.
+    rerender(
+      <PerpsOrderSizeBottomSheet
+        isVisible
+        asset="CASHCAT"
+        orderSize="205"
+        limitPrice="0.04888"
+        szDecimals={2}
+        leverage={3}
+        onClose={onClose}
+        onConfirm={onConfirm}
+      />,
+    );
+
+    expect(
+      screen.getByText(/Insufficient balance\. Required:/),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PerpsOrderSizeBottomSheetSelectorsIDs.CONFIRM_BUTTON),
+    ).toBeDisabled();
+  });
+});
diff --git a/app/components/UI/Perps/components/PerpsOrderSizeBottomSheet/PerpsOrderSizeBottomSheet.tsx b/app/components/UI/Perps/components/PerpsOrderSizeBottomSheet/PerpsOrderSizeBottomSheet.tsx
new file mode 100644
index 000000000000..0eb44eb6f626
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsOrderSizeBottomSheet/PerpsOrderSizeBottomSheet.tsx
@@ -0,0 +1,315 @@
+import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
+import { strings } from '../../../../../../locales/i18n';
+import {
+  BottomSheet,
+  BottomSheetFooter,
+  BottomSheetHeader,
+  Box,
+  ButtonSize,
+  HelpText,
+  HelpTextSeverity,
+  Text,
+  TextColor,
+  TextField,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import Keypad from '../../../../Base/Keypad';
+import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
+import {
+  DECIMAL_PRECISION_CONFIG,
+  getPerpsDisplaySymbol,
+  PERPS_CONSTANTS,
+} from '@metamask/perps-controller';
+import { PerpsOrderSizeBottomSheetSelectorsIDs } from '../../Perps.testIds';
+import { formatPerpsFiat } from '../../utils/formatUtils';
+import { MAX_PERPS_INPUT_DIGITS } from '../../constants/perpsConfig';
+import { useMinimumOrderAmount } from '../../hooks/useMinimumOrderAmount';
+import { usePerpsLiveAccount } from '../../hooks/stream';
+import { getIncrementalMarginInsufficientBalanceError } from '../../utils/openOrderMarginValidation';
+
+interface PerpsOrderSizeBottomSheetProps {
+  isVisible: boolean;
+  onClose: () => void;
+  onConfirm: (size: string) => void;
+  asset: string;
+  orderSize?: string;
+  limitPrice?: string;
+  szDecimals?: number;
+  /** Effective asset leverage (position or saved trade config) used to estimate
+   * additional margin for a size increase. Prefer this over market max. */
+  leverage?: number;
+  /** When true, the resting order is reduce-only (close) and needs little or
+   * no additional margin on size edits — skip the incremental margin check. */
+  reduceOnly?: boolean;
+  /** When false, market szDecimals/leverage inputs are still loading — hold
+   * confirm and skip margin checks that would use misleading fallbacks. */
+  isMarketDataReady?: boolean;
+}
+
+/**
+ * Formats a raw size string for display with thousand separators on the
+ * integer part while preserving in-progress typing (trailing "." or partial
+ * decimals), matching the live-formatting behavior of the limit price sheet.
+ */
+const formatOrderSizeDisplay = (value: string): string => {
+  const raw = value.replace(/,/g, '');
+  if (!raw || raw === '0') {
+    return '';
+  }
+
+  const [integerPart, decimalPart] = raw.split('.');
+  const formattedInteger = (integerPart || '0').replace(
+    /\B(?=(\d{3})+(?!\d))/g,
+    ',',
+  );
+
+  return decimalPart !== undefined
+    ? `${formattedInteger}.${decimalPart}`
+    : formattedInteger;
+};
+
+/**
+ * Bottom sheet for editing an open limit order's size in token units.
+ */
+const PerpsOrderSizeBottomSheet: React.FC<PerpsOrderSizeBottomSheetProps> = ({
+  isVisible,
+  onClose,
+  onConfirm,
+  asset,
+  orderSize: initialOrderSize,
+  limitPrice,
+  szDecimals = DECIMAL_PRECISION_CONFIG.FallbackSizeDecimals,
+  leverage = PERPS_CONSTANTS.DefaultMaxLeverage,
+  reduceOnly = false,
+  isMarketDataReady = true,
+}) => {
+  const [orderSize, setOrderSize] = useState(initialOrderSize || '');
+  const displaySymbol = getPerpsDisplaySymbol(asset);
+  const { minimumOrderAmount } = useMinimumOrderAmount({ asset });
+  // Only subscribe while the sheet is open; balance is only needed to warn
+  // when an edited size would require more margin than is available.
+  const { account, isInitialLoading: isAccountLoading } = usePerpsLiveAccount({
+    enabled: isVisible,
+  });
+  // Treat a still-loading / missing account like unloaded market data — hold
+  // confirm rather than coercing null → 0 and skipping the margin check.
+  const isAccountReady = !isAccountLoading && account !== null;
+  const spendableBalance = Number.parseFloat(account?.spendableBalance ?? '0');
+  const isInputReady = isMarketDataReady && isAccountReady;
+
+  useEffect(() => {
+    if (isVisible) {
+      setOrderSize(initialOrderSize || '');
+    }
+  }, [initialOrderSize, isVisible]);
+
+  const handleConfirm = () => {
+    const cleanSize = orderSize.replace(/,/g, '');
+    onConfirm(cleanSize);
+  };
+
+  const handleKeypadChange = useCallback(
+    ({ value }: { value: string; valueAsNumber: number }) => {
+      const digitCount = (value.match(/\d/g) || []).length;
+      if (digitCount > MAX_PERPS_INPUT_DIGITS) {
+        return;
+      }
+      setOrderSize(value || '');
+    },
+    [],
+  );
+
+  const parsedSize = parseFloat(orderSize.replace(/,/g, ''));
+  const parsedLimitPrice = parseFloat(limitPrice ?? '');
+  const parsedInitialSize = parseFloat(
+    (initialOrderSize ?? '').replace(/,/g, ''),
+  );
+  const notionalUsd =
+    Number.isFinite(parsedSize) &&
+    parsedSize > 0 &&
+    Number.isFinite(parsedLimitPrice) &&
+    parsedLimitPrice > 0
+      ? parsedSize * parsedLimitPrice
+      : 0;
+  const currentNotionalUsd =
+    Number.isFinite(parsedInitialSize) &&
+    parsedInitialSize > 0 &&
+    Number.isFinite(parsedLimitPrice) &&
+    parsedLimitPrice > 0
+      ? parsedInitialSize * parsedLimitPrice
+      : 0;
+
+  const minimumSizeError = useMemo(() => {
+    if (
+      !Number.isFinite(parsedSize) ||
+      parsedSize <= 0 ||
+      minimumOrderAmount <= 0
+    ) {
+      return '';
+    }
+
+    if (notionalUsd > 0 && notionalUsd < minimumOrderAmount) {
+      // `minimum_amount` already includes a literal "$" prefix, so the
+      // amount is passed as a plain number (matches other call sites of
+      // this string) rather than a pre-formatted fiat value.
+      return strings('perps.order.validation.minimum_amount', {
+        amount: minimumOrderAmount.toString(),
+      });
+    }
+
+    return '';
+  }, [minimumOrderAmount, notionalUsd, parsedSize]);
+
+  // For open-order edits, margin already reserved by the resting order is
+  // released on modify — only the incremental notional (size increase) can
+  // require additional margin. Reduce-only close orders need little or no
+  // extra margin, so skip this check for them entirely.
+  const maximumSizeError = useMemo(() => {
+    if (!isMarketDataReady || !isAccountReady) {
+      return '';
+    }
+
+    if (
+      !Number.isFinite(parsedSize) ||
+      parsedSize <= 0 ||
+      !Number.isFinite(parsedLimitPrice) ||
+      parsedLimitPrice <= 0 ||
+      notionalUsd <= 0
+    ) {
+      return '';
+    }
+
+    return getIncrementalMarginInsufficientBalanceError({
+      editedNotionalUsd: notionalUsd,
+      currentNotionalUsd,
+      spendableBalance,
+      leverage,
+      reduceOnly,
+    });
+  }, [
+    currentNotionalUsd,
+    isAccountReady,
+    isMarketDataReady,
+    leverage,
+    notionalUsd,
+    parsedLimitPrice,
+    parsedSize,
+    reduceOnly,
+    spendableBalance,
+  ]);
+
+  const sizeError = minimumSizeError || maximumSizeError;
+
+  const formattedOrderSize = formatOrderSizeDisplay(orderSize);
+
+  const isConfirmDisabled =
+    !isInputReady ||
+    !orderSize ||
+    orderSize === '' ||
+    orderSize === '0' ||
+    !Number.isFinite(parsedSize) ||
+    parsedSize <= 0 ||
+    Boolean(sizeError);
+
+  if (!isVisible) {
+    return null;
+  }
+
+  return (
+    <BottomSheet onClose={onClose}>
+      <BottomSheetHeader onClose={onClose}>
+        {strings('perps.order.size_modal.title')}
+      </BottomSheetHeader>
+
+      <Box twClassName="gap-2 px-4">
+        <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+          {strings('perps.pro_positions_panel.order_card.size')}
+        </Text>
+        <TextField
+          testID={PerpsOrderSizeBottomSheetSelectorsIDs.SIZE_DISPLAY}
+          value={formattedOrderSize}
+          isReadOnly
+          isError={Boolean(sizeError)}
+          endAccessory={
+            <Text
+              variant={TextVariant.BodyMd}
+              color={TextColor.TextAlternative}
+            >
+              {displaySymbol}
+            </Text>
+          }
+          inputProps={{
+            showSoftInputOnFocus: false,
+          }}
+        />
+        {sizeError ? (
+          <HelpText severity={HelpTextSeverity.Danger} showIcon>
+            {sizeError}
+          </HelpText>
+        ) : (
+          <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
+            {strings('perps.order.size_modal.order_value', {
+              value:
+                notionalUsd > 0
+                  ? formatPerpsFiat(notionalUsd, {
+                      ranges: [
+                        {
+                          condition: () => true,
+                          threshold: 0,
+                          maximumDecimals: 2,
+                          minimumDecimals: 2,
+                        },
+                      ],
+                    })
+                  : PERPS_CONSTANTS.FallbackPriceDisplay,
+            })}
+          </Text>
+        )}
+      </Box>
+
+      <Box twClassName="mb-4 mt-4 px-4">
+        {isInputReady ? (
+          <Keypad
+            value={orderSize}
+            currency="USD_PERPS"
+            onChange={handleKeypadChange}
+            decimals={szDecimals}
+          />
+        ) : (
+          <Skeleton height={240} width="100%" />
+        )}
+      </Box>
+
+      <BottomSheetFooter
+        primaryButtonProps={{
+          children: strings('perps.order.size_modal.set'),
+          onPress: handleConfirm,
+          size: ButtonSize.Lg,
+          isDisabled: isConfirmDisabled,
+          testID: PerpsOrderSizeBottomSheetSelectorsIDs.CONFIRM_BUTTON,
+        }}
+      />
+    </BottomSheet>
+  );
+};
+
+PerpsOrderSizeBottomSheet.displayName = 'PerpsOrderSizeBottomSheet';
+
+export default memo(PerpsOrderSizeBottomSheet, (prevProps, nextProps) => {
+  if (!prevProps.isVisible && !nextProps.isVisible) {
+    return true;
+  }
+
+  return (
+    prevProps.isVisible === nextProps.isVisible &&
+    prevProps.asset === nextProps.asset &&
+    prevProps.orderSize === nextProps.orderSize &&
+    prevProps.limitPrice === nextProps.limitPrice &&
+    prevProps.szDecimals === nextProps.szDecimals &&
+    prevProps.leverage === nextProps.leverage &&
+    prevProps.reduceOnly === nextProps.reduceOnly &&
+    prevProps.isMarketDataReady === nextProps.isMarketDataReady &&
+    prevProps.onConfirm === nextProps.onConfirm &&
+    prevProps.onClose === nextProps.onClose
+  );
+});
diff --git a/app/components/UI/Perps/components/PerpsOrderSizeBottomSheet/index.ts b/app/components/UI/Perps/components/PerpsOrderSizeBottomSheet/index.ts
new file mode 100644
index 000000000000..f60add8764f1
--- /dev/null
+++ b/app/components/UI/Perps/components/PerpsOrderSizeBottomSheet/index.ts
@@ -0,0 +1 @@
+export { default } from './PerpsOrderSizeBottomSheet';
diff --git a/app/components/UI/Perps/components/PerpsProMarketStatsBar/PerpsProMarketStatsBar.tsx b/app/components/UI/Perps/components/PerpsProMarketStatsBar/PerpsProMarketStatsBar.tsx
index 88642ca2f709..19200083677d 100644
--- a/app/components/UI/Perps/components/PerpsProMarketStatsBar/PerpsProMarketStatsBar.tsx
+++ b/app/components/UI/Perps/components/PerpsProMarketStatsBar/PerpsProMarketStatsBar.tsx
@@ -27,6 +27,7 @@ import type { PerpsProMarketStatsBarProps } from './PerpsProMarketStatsBar.types
 interface StatItemProps {
   label: string;
   value: string;
+  valueColor?: TextColor;
   testID?: string;
   valueTestID?: string;
 }
@@ -41,6 +42,7 @@ interface StatItemProps {
 const StatItem: React.FC<StatItemProps> = ({
   label,
   value,
+  valueColor,
   testID,
   valueTestID,
 }) => (
@@ -61,7 +63,7 @@ const StatItem: React.FC<StatItemProps> = ({
     <Text
       variant={TextVariant.BodyMd}
       fontWeight={FontWeight.Medium}
-      color={TextColor.TextDefault}
+      color={valueColor ?? TextColor.TextDefault}
       numberOfLines={1}
       testID={valueTestID}
     >
@@ -143,6 +145,13 @@ const PerpsProMarketStatsBar: React.FC<PerpsProMarketStatsBarProps> = ({
 
   const fundingValue = `${fundingRateDisplay} / ${fundingCountdown}`;
 
+  const fundingValueColor: TextColor = useMemo(() => {
+    const rate = liveFunding ?? parseFloat(marketStats.fundingRate ?? '');
+    if (isNaN(rate) || rate === 0) return TextColor.TextDefault;
+    if (rate > 0) return TextColor.SuccessDefault;
+    return TextColor.ErrorDefault;
+  }, [liveFunding, marketStats.fundingRate]);
+
   // PriceUpdate exposes a single markPrice field. Lite's statistics card uses
   // it as "Oracle price"; Pro Figma shows both Mark and Oracle, so both read
   // markPrice until a distinct oraclePx is streamed.
@@ -167,6 +176,7 @@ const PerpsProMarketStatsBar: React.FC<PerpsProMarketStatsBarProps> = ({
           <StatItem
             label={strings('perps.market.funding')}
             value={fundingValue}
+            valueColor={fundingValueColor}
             testID={PerpsProMarketViewSelectorsIDs.STATS_BAR_FUNDING_RATE}
             valueTestID={
               PerpsProMarketViewSelectorsIDs.STATS_BAR_FUNDING_COUNTDOWN
diff --git a/app/components/UI/Perps/components/PerpsSlider/PerpsSlider.test.tsx b/app/components/UI/Perps/components/PerpsSlider/PerpsSlider.test.tsx
index 33074bc1fb1d..6d276fde8088 100644
--- a/app/components/UI/Perps/components/PerpsSlider/PerpsSlider.test.tsx
+++ b/app/components/UI/Perps/components/PerpsSlider/PerpsSlider.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { render } from '@testing-library/react-native';
+import type { ReactTestRendererJSON } from 'react-test-renderer';
 import { Slider } from '@metamask/design-system-react-native';
 import PerpsSlider from './PerpsSlider';
 import { playImpact, ImpactMoment } from '../../../../../util/haptics';
@@ -149,23 +150,46 @@ describe('PerpsSlider', () => {
   });
 
   describe('variant', () => {
-    it('defaults to the default variant (no track inset override, no dense spacing)', () => {
+    it('defaults to the default variant (no track inset override)', () => {
       render(<PerpsSlider {...defaultProps} />);
 
       expect(getSliderProps()).toMatchObject({
         trackInset: undefined,
-        twClassName: undefined,
       });
     });
 
-    it('removes the track inset and applies dense vertical spacing for the compact variant', () => {
+    it('removes the track inset for the compact variant', () => {
       render(<PerpsSlider {...defaultProps} variant="compact" />);
 
       expect(getSliderProps()).toMatchObject({
         trackInset: 0,
-        twClassName: '-my-1.5',
       });
     });
+
+    it('wraps the compact variant in a single double-width, scaled-down container so the track still spans the full row', () => {
+      const { toJSON } = render(
+        <PerpsSlider {...defaultProps} variant="compact" />,
+      );
+
+      const wrapper = toJSON() as ReactTestRendererJSON;
+      // A single View declares the post-scale height/width; the Slider child
+      // renders at its natural (pre-scale) size and overflows it by exactly
+      // 2x, which `transform: scale(0.5)` (anchored top-left) shrinks back
+      // down to precisely fit — no separate clipping container needed.
+      expect(wrapper.props.style).toMatchObject({
+        height: 17.5,
+        width: '200%',
+        transform: [{ scale: 0.5 }],
+        transformOrigin: 'left top',
+      });
+    });
+
+    it('does not wrap the default variant in a scaling container', () => {
+      const { toJSON } = render(<PerpsSlider {...defaultProps} />);
+
+      // The mocked Slider renders null, so an unwrapped render produces no tree.
+      expect(toJSON()).toBeNull();
+    });
   });
 
   it('forwards testID and accessibilityLabel', () => {
diff --git a/app/components/UI/Perps/components/PerpsSlider/PerpsSlider.tsx b/app/components/UI/Perps/components/PerpsSlider/PerpsSlider.tsx
index 5224fbd4a2e2..a083df18f128 100644
--- a/app/components/UI/Perps/components/PerpsSlider/PerpsSlider.tsx
+++ b/app/components/UI/Perps/components/PerpsSlider/PerpsSlider.tsx
@@ -1,7 +1,38 @@
 import React, { useCallback } from 'react';
+import { StyleSheet, View } from 'react-native';
 import { Slider } from '@metamask/design-system-react-native';
 import { playImpact, ImpactMoment } from '../../../../../util/haptics';
 
+/**
+ * Mirrors `@metamask/design-system-react-native`'s Slider geometry constants
+ * (`Slider.constants.mjs`) — not part of that package's public API, so
+ * duplicated here to size the `compact` variant's scale-down wrapper below.
+ * Keep in sync if that package's Slider geometry changes.
+ */
+const SLIDER_VERTICAL_PADDING = 8;
+const THUMB_SIZE = 32;
+const THUMB_TOP_OFFSET = -13;
+const THUMB_BOTTOM_OFFSET = THUMB_TOP_OFFSET + THUMB_SIZE;
+/** Natural (unscaled) height of the track+thumb area, no range labels. */
+const SLIDER_TRACK_AREA_HEIGHT =
+  SLIDER_VERTICAL_PADDING * 2 + THUMB_BOTTOM_OFFSET;
+/**
+ * Visual scale applied to the `compact` variant so it matches Figma's small
+ * slider (16px thumb, 4px track, 2px dots — exactly half of the design
+ * system's hardcoded 32px/8px/4px). See the `variant` doc below for why this
+ * can't just be a prop on the design system `Slider`.
+ */
+const COMPACT_SCALE = 0.5;
+
+const styles = StyleSheet.create({
+  compactScaler: {
+    height: SLIDER_TRACK_AREA_HEIGHT * COMPACT_SCALE,
+    width: '200%',
+    transform: [{ scale: COMPACT_SCALE }],
+    transformOrigin: 'left top',
+  },
+});
+
 interface PerpsSliderProps {
   value: number;
   onValueChange: (value: number) => void;
@@ -19,10 +50,22 @@ interface PerpsSliderProps {
   showPercentageMarkers?: boolean;
   disabled?: boolean;
   /**
-   * `'compact'` tightens the vertical spacing and removes the horizontal
-   * track inset for dense layouts (e.g. footer sliders). The design system
-   * `Slider` does not expose a smaller track/thumb size, so `compact` only
-   * adjusts the spacing it can control via `trackInset`/`twClassName`.
+   * `'compact'` visually shrinks the whole slider (thumb/track/dots) to
+   * match Figma's small variant and removes the horizontal track inset, for
+   * dense layouts (e.g. footer sliders). The design system `Slider` has no
+   * size prop and only exposes one root `style`/`twClassName` covering its
+   * whole subtree, so this wraps it in a single `View` that declares
+   * `width: '200%'` (double, so the `Slider` — which stretches to fill its
+   * parent — still spans the full row after shrinking) and `height` equal
+   * to the target *post-scale* size (half the `Slider`'s natural height, so
+   * it overflows the declared box by exactly 2x). `transform: scale(0.5)`
+   * with `transformOrigin: 'left top'` then shrinks that whole overflowing
+   * render back down, anchored at the top-left corner — the declared box
+   * and the shrunk content end up pixel-identical, so no separate clipping
+   * container is needed. The drag/tap gesture math still runs against the
+   * pre-scale (double-size) layout box, so the hit-region stays exactly as
+   * large as the `'default'` variant's even though it now looks half the
+   * size.
    */
   variant?: 'default' | 'compact';
   testID?: string;
@@ -57,7 +100,7 @@ const PerpsSlider: React.FC<PerpsSliderProps> = ({
 
   const isCompact = variant === 'compact';
 
-  return (
+  const slider = (
     <Slider
       value={value}
       onValueChange={onValueChange}
@@ -71,11 +114,16 @@ const PerpsSlider: React.FC<PerpsSliderProps> = ({
       onMark={handleMark}
       isDisabled={disabled}
       trackInset={isCompact ? 0 : undefined}
-      twClassName={isCompact ? '-my-1.5' : undefined}
       testID={testID}
       accessibilityLabel={accessibilityLabel}
     />
   );
+
+  if (!isCompact) {
+    return slider;
+  }
+
+  return <View style={styles.compactScaler}>{slider}</View>;
 };
 
 export default PerpsSlider;
diff --git a/app/components/UI/Perps/constants/perpsConfig.ts b/app/components/UI/Perps/constants/perpsConfig.ts
index 047a49320abe..2340ea4e54dd 100644
--- a/app/components/UI/Perps/constants/perpsConfig.ts
+++ b/app/components/UI/Perps/constants/perpsConfig.ts
@@ -95,6 +95,12 @@ export const LEVERAGE_SLIDER_CONFIG = {
   MaxLeverageMediumThreshold: 50,
 } as const;
 
+/**
+ * Maximum number of digits allowed in any perps price/size/percentage input.
+ * Prevents overflow and keeps inputs within safe numeric range.
+ */
+export const MAX_PERPS_INPUT_DIGITS = 9;
+
 /**
  * TP/SL View UI configuration
  * Controls the Take Profit / Stop Loss screen behavior and display options
@@ -112,7 +118,7 @@ export const TP_SL_VIEW_CONFIG = {
 
   // Maximum number of digits allowed in price/percentage input fields
   // Prevents overflow and maintains reasonable input constraints
-  MaxInputDigits: 9,
+  MaxInputDigits: MAX_PERPS_INPUT_DIGITS,
 
   // Keypad configuration for price inputs
   // USD_PERPS is not a real currency - it's a custom configuration
@@ -153,6 +159,22 @@ export const PERPS_GTM_WHATS_NEW_MODAL = 'perps-gtm-whats-new-modal';
 export const PERPS_GTM_MODAL_ENGAGE = 'engage';
 export const PERPS_GTM_MODAL_DECLINE = 'decline';
 
+/**
+ * Retry policy for per-asset market-data fetches (TAT-3645).
+ *
+ * `getMarkets` throws while the Perps connection is still initialising (e.g.
+ * `CLIENT_NOT_INITIALIZED` right after unlocking, or during a reconnect). That
+ * is transient, not a verdict about the asset, so the fetch is retried across
+ * the initialisation window instead of being surfaced as a failure. The total
+ * budget comfortably covers a provider re-initialisation, which is ~1.5s.
+ */
+export const MARKET_DATA_FETCH_RETRY_CONFIG = {
+  /** Extra attempts after the first, when the fetch throws. */
+  MaxRetries: 3,
+  /** Delay between attempts. */
+  RetryDelayMs: 1000,
+} as const;
+
 /**
  * Development-only configuration for testing and debugging
  * These constants are only active when __DEV__ is true
diff --git a/app/components/UI/Perps/contexts/PerpsOrderContext.tsx b/app/components/UI/Perps/contexts/PerpsOrderContext.tsx
index ff79c0ef1d36..dbc3091a01d1 100644
--- a/app/components/UI/Perps/contexts/PerpsOrderContext.tsx
+++ b/app/components/UI/Perps/contexts/PerpsOrderContext.tsx
@@ -16,6 +16,7 @@ interface PerpsOrderProviderProps {
   initialAsset?: string;
   initialDirection?: 'long' | 'short';
   initialAmount?: string;
+  fallbackAmount?: string;
   initialLeverage?: number;
   initialType?: OrderType;
   existingPosition?: Position;
@@ -28,6 +29,7 @@ export const PerpsOrderProvider = ({
   initialAsset,
   initialDirection,
   initialAmount,
+  fallbackAmount,
   initialLeverage,
   initialType,
   existingPosition,
@@ -37,6 +39,7 @@ export const PerpsOrderProvider = ({
     initialAsset,
     initialDirection,
     initialAmount,
+    fallbackAmount,
     initialLeverage: initialLeverage ?? existingPosition?.leverage?.value,
     initialType,
     effectiveAvailableBalance,
diff --git a/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.test.ts b/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.test.ts
index 01c158f0e626..97be543afc62 100644
--- a/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.test.ts
+++ b/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.test.ts
@@ -42,6 +42,14 @@ describe('usePerpsLiveAccount', () => {
   });
 
   describe('default state', () => {
+    it('does not subscribe when disabled', () => {
+      renderHookWithProvider(() => usePerpsLiveAccount({ enabled: false }), {
+        state: {},
+      });
+
+      expect(mockSubscribe).not.toHaveBeenCalled();
+    });
+
     it('returns null account when PerpsController is undefined', () => {
       // Mock the subscription to not call the callback (simulating no data)
       mockSubscribe.mockImplementation(() => jest.fn());
diff --git a/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.ts b/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.ts
index 69ea1038da57..04072008ff4e 100644
--- a/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.ts
+++ b/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.ts
@@ -4,6 +4,8 @@ import { type AccountState } from '@metamask/perps-controller';
 import { hasPreloadedData, getPreloadedData } from './hasCachedPerpsData';
 
 export interface UsePerpsLiveAccountOptions {
+  /** Whether to subscribe to account updates. */
+  enabled?: boolean;
   /** Throttle delay in milliseconds (default: 1000ms for balance updates) */
   throttleMs?: number;
 }
@@ -28,7 +30,7 @@ export interface UsePerpsLiveAccountReturn {
 export function usePerpsLiveAccount(
   options: UsePerpsLiveAccountOptions = {},
 ): UsePerpsLiveAccountReturn {
-  const { throttleMs = 1000 } = options;
+  const { enabled = true, throttleMs = 1000 } = options;
   const streamManager = usePerpsStream();
   const initialChannelAccount = streamManager.account.getSnapshot();
   const [account, setAccount] = useState<AccountState | null>(() => {
@@ -46,7 +48,7 @@ export function usePerpsLiveAccount(
   });
 
   useEffect(() => {
-    if (!streamManager) return;
+    if (!enabled || !streamManager) return;
 
     // Mark as no longer loading once we get first update
     const handleAccountUpdate = (newAccount: AccountState | null) => {
@@ -63,7 +65,7 @@ export function usePerpsLiveAccount(
     });
 
     return unsubscribe;
-  }, [streamManager, throttleMs]);
+  }, [enabled, streamManager, throttleMs]);
 
   return { account, isInitialLoading };
 }
diff --git a/app/components/UI/Perps/hooks/usePerpsCancelAllOrders.test.ts b/app/components/UI/Perps/hooks/usePerpsCancelAllOrders.test.ts
index 6f89bc968b27..20d1d0038d88 100644
--- a/app/components/UI/Perps/hooks/usePerpsCancelAllOrders.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsCancelAllOrders.test.ts
@@ -29,6 +29,11 @@ jest.mock('../../../../../locales/i18n', () => ({
   }),
 }));
 
+const mockNavigateToPerpsHome = jest.fn();
+jest.mock('../utils/perpsModeSwitch', () => ({
+  useNavigateToPerpsHome: () => mockNavigateToPerpsHome,
+}));
+
 const createMockOrder = (overrides: Partial<Order> = {}): Order => ({
   orderId: 'order-1',
   symbol: 'BTC',
@@ -53,6 +58,7 @@ describe('usePerpsCancelAllOrders', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockNavigation.canGoBack.mockReturnValue(true);
     (useNavigation as jest.Mock).mockReturnValue(mockNavigation);
   });
 
@@ -328,6 +334,23 @@ describe('usePerpsCancelAllOrders', () => {
     expect(mockNavigation.goBack).toHaveBeenCalled();
   });
 
+  it('falls back to the mode-aware Perps home when there is nothing to go back to', () => {
+    // Arrange - a hardcoded Perps Home fallback would drop Pro-mode users into
+    // the Lite hub.
+    mockNavigation.canGoBack.mockReturnValue(false);
+    const orders = [createMockOrder()];
+    const { result } = renderHook(() => usePerpsCancelAllOrders(orders));
+
+    // Act
+    act(() => {
+      result.current.handleKeepOrders();
+    });
+
+    // Assert
+    expect(mockNavigateToPerpsHome).toHaveBeenCalled();
+    expect(mockNavigation.navigate).not.toHaveBeenCalled();
+  });
+
   it('does nothing when handleCancelAll called with no orders', async () => {
     // Arrange
     const { result } = renderHook(() => usePerpsCancelAllOrders(null));
diff --git a/app/components/UI/Perps/hooks/usePerpsCancelAllOrders.ts b/app/components/UI/Perps/hooks/usePerpsCancelAllOrders.ts
index bf5667e8ca50..8068812f8399 100644
--- a/app/components/UI/Perps/hooks/usePerpsCancelAllOrders.ts
+++ b/app/components/UI/Perps/hooks/usePerpsCancelAllOrders.ts
@@ -9,7 +9,7 @@ import {
   type CancelOrdersResult,
 } from '@metamask/perps-controller';
 import { strings } from '../../../../../locales/i18n';
-import Routes from '../../../../constants/navigation/Routes';
+import { useNavigateToPerpsHome } from '../utils/perpsModeSwitch';
 
 export interface UsePerpsCancelAllOrdersOptions {
   /** Callback invoked when cancellation succeeds */
@@ -52,6 +52,7 @@ export const usePerpsCancelAllOrders = (
   options?: UsePerpsCancelAllOrdersOptions,
 ): UsePerpsCancelAllOrdersReturn => {
   const navigation = useNavigation<AppNavigationProp>();
+  const navigateToPerpsHome = useNavigateToPerpsHome();
   const [isCanceling, setIsCanceling] = useState(false);
   const [error, setError] = useState<Error | null>(null);
 
@@ -93,10 +94,7 @@ export const usePerpsCancelAllOrders = (
         if (navigation.canGoBack()) {
           navigation.goBack();
         } else {
-          // Fallback: navigate to Markets view if can't go back
-          navigation.navigate(Routes.PERPS.ROOT, {
-            screen: Routes.PERPS.PERPS_HOME,
-          });
+          navigateToPerpsHome();
         }
       }
 
@@ -123,19 +121,23 @@ export const usePerpsCancelAllOrders = (
     } finally {
       setIsCanceling(false);
     }
-  }, [orders, onSuccess, onError, navigateBackOnSuccess, navigation]);
+  }, [
+    orders,
+    onSuccess,
+    onError,
+    navigateBackOnSuccess,
+    navigation,
+    navigateToPerpsHome,
+  ]);
 
   const handleKeepOrders = useCallback(() => {
     DevLogger.log('[usePerpsCancelAllOrders] User chose to keep orders');
     if (navigation.canGoBack()) {
       navigation.goBack();
     } else {
-      // Fallback: navigate to Markets view if can't go back
-      navigation.navigate(Routes.PERPS.ROOT, {
-        screen: Routes.PERPS.PERPS_HOME,
-      });
+      navigateToPerpsHome();
     }
-  }, [navigation]);
+  }, [navigation, navigateToPerpsHome]);
 
   return {
     isCanceling,
diff --git a/app/components/UI/Perps/hooks/usePerpsCloseAllPositions.test.ts b/app/components/UI/Perps/hooks/usePerpsCloseAllPositions.test.ts
index b56abfc2aa20..ab973e0e4048 100644
--- a/app/components/UI/Perps/hooks/usePerpsCloseAllPositions.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsCloseAllPositions.test.ts
@@ -26,6 +26,11 @@ jest.mock('../../../../../locales/i18n', () => ({
   }),
 }));
 
+const mockNavigateToPerpsHome = jest.fn();
+jest.mock('../utils/perpsModeSwitch', () => ({
+  useNavigateToPerpsHome: () => mockNavigateToPerpsHome,
+}));
+
 const createMockPosition = (overrides: Partial<Position> = {}): Position => ({
   symbol: 'BTC',
   size: '0.5',
@@ -58,6 +63,7 @@ describe('usePerpsCloseAllPositions', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockNavigation.canGoBack.mockReturnValue(true);
     (useNavigation as jest.Mock).mockReturnValue(mockNavigation);
   });
 
@@ -122,7 +128,7 @@ describe('usePerpsCloseAllPositions', () => {
       expect(result.current.isClosing).toBe(false);
     });
     expect(Engine.context.PerpsController.closePositions).toHaveBeenCalledWith({
-      closeAll: true,
+      symbols: positions.map((p) => p.symbol),
     });
     expect(mockNavigation.goBack).toHaveBeenCalled();
     expect(result.current.error).toBeNull();
@@ -345,6 +351,23 @@ describe('usePerpsCloseAllPositions', () => {
     expect(mockNavigation.goBack).toHaveBeenCalled();
   });
 
+  it('falls back to the mode-aware Perps home when there is nothing to go back to', () => {
+    // Arrange - a hardcoded Perps Home fallback would drop Pro-mode users into
+    // the Lite hub.
+    mockNavigation.canGoBack.mockReturnValue(false);
+    const positions = [createMockPosition()];
+    const { result } = renderHook(() => usePerpsCloseAllPositions(positions));
+
+    // Act
+    act(() => {
+      result.current.handleKeepPositions();
+    });
+
+    // Assert
+    expect(mockNavigateToPerpsHome).toHaveBeenCalled();
+    expect(mockNavigation.navigate).not.toHaveBeenCalled();
+  });
+
   it('does nothing when handleCloseAll called with no positions', async () => {
     // Arrange
     const { result } = renderHook(() => usePerpsCloseAllPositions(null));
diff --git a/app/components/UI/Perps/hooks/usePerpsCloseAllPositions.ts b/app/components/UI/Perps/hooks/usePerpsCloseAllPositions.ts
index bbcfde1247ca..460df23f60e2 100644
--- a/app/components/UI/Perps/hooks/usePerpsCloseAllPositions.ts
+++ b/app/components/UI/Perps/hooks/usePerpsCloseAllPositions.ts
@@ -9,7 +9,7 @@ import {
   type ClosePositionsResult,
 } from '@metamask/perps-controller';
 import { strings } from '../../../../../locales/i18n';
-import Routes from '../../../../constants/navigation/Routes';
+import { useNavigateToPerpsHome } from '../utils/perpsModeSwitch';
 
 export interface UsePerpsCloseAllPositionsOptions {
   /** Callback invoked when closing succeeds */
@@ -60,6 +60,7 @@ export const usePerpsCloseAllPositions = (
   options?: UsePerpsCloseAllPositionsOptions,
 ): UsePerpsCloseAllPositionsReturn => {
   const navigation = useNavigation<AppNavigationProp>();
+  const navigateToPerpsHome = useNavigateToPerpsHome();
   const [isClosing, setIsClosing] = useState(false);
   const [error, setError] = useState<Error | null>(null);
 
@@ -92,7 +93,7 @@ export const usePerpsCloseAllPositions = (
 
     try {
       const result = await Engine.context.PerpsController.closePositions({
-        closeAll: true,
+        symbols: positions.map((p) => p.symbol),
       });
 
       const executionTime = Date.now() - startTime;
@@ -114,10 +115,7 @@ export const usePerpsCloseAllPositions = (
         if (navigation.canGoBack()) {
           navigation.goBack();
         } else {
-          // Fallback: navigate to Markets view if can't go back
-          navigation.navigate(Routes.PERPS.ROOT, {
-            screen: Routes.PERPS.PERPS_HOME,
-          });
+          navigateToPerpsHome();
         }
       }
 
@@ -154,6 +152,7 @@ export const usePerpsCloseAllPositions = (
     onError,
     navigateBackOnSuccess,
     navigation,
+    navigateToPerpsHome,
   ]);
 
   const handleKeepPositions = useCallback(() => {
@@ -161,12 +160,9 @@ export const usePerpsCloseAllPositions = (
     if (navigation.canGoBack()) {
       navigation.goBack();
     } else {
-      // Fallback: navigate to Markets view if can't go back
-      navigation.navigate(Routes.PERPS.ROOT, {
-        screen: Routes.PERPS.PERPS_HOME,
-      });
+      navigateToPerpsHome();
     }
-  }, [navigation]);
+  }, [navigation, navigateToPerpsHome]);
 
   return {
     isClosing,
diff --git a/app/components/UI/Perps/hooks/usePerpsClosePosition.ts b/app/components/UI/Perps/hooks/usePerpsClosePosition.ts
index 18ad4661e1e8..024bc664304b 100644
--- a/app/components/UI/Perps/hooks/usePerpsClosePosition.ts
+++ b/app/components/UI/Perps/hooks/usePerpsClosePosition.ts
@@ -5,6 +5,7 @@ import Logger from '../../../../util/Logger';
 import {
   PERPS_CONSTANTS,
   type OrderResult,
+  type OrderType,
   type Position,
   type TrackingData,
 } from '@metamask/perps-controller';
@@ -36,7 +37,7 @@ interface ClosePositionParams {
 
   // Core parameters
   size?: string;
-  orderType?: 'market' | 'limit';
+  orderType?: OrderType;
   limitPrice?: string;
 
   // Tracking data
diff --git a/app/components/UI/Perps/hooks/usePerpsMarketData.test.ts b/app/components/UI/Perps/hooks/usePerpsMarketData.test.ts
index 8a327f3a9abd..94354432eb09 100644
--- a/app/components/UI/Perps/hooks/usePerpsMarketData.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsMarketData.test.ts
@@ -1,12 +1,18 @@
-import { renderHook, waitFor } from '@testing-library/react-native';
+import { act, renderHook, waitFor } from '@testing-library/react-native';
 import { usePerpsMarketData } from './usePerpsMarketData';
 import { usePerpsTrading } from './usePerpsTrading';
 import usePerpsToasts, { type PerpsToastOptionsConfig } from './usePerpsToasts';
-import { type MarketInfo } from '@metamask/perps-controller';
+import { type MarketInfo, wait } from '@metamask/perps-controller';
 
 // Mock the usePerpsTrading hook
 jest.mock('./usePerpsTrading');
 
+// Keep the retry policy real but make its delay instant.
+jest.mock('@metamask/perps-controller', () => ({
+  ...jest.requireActual('@metamask/perps-controller'),
+  wait: jest.fn().mockResolvedValue(undefined),
+}));
+
 // Mock usePerpsToasts hook
 jest.mock('./usePerpsToasts', () => ({
   __esModule: true,
@@ -186,55 +192,103 @@ describe('usePerpsMarketData', () => {
       // Toast should not be called
     });
 
-    it('should show toast when showErrorToast is true and error occurs', async () => {
+    it('does not show the not-tradable toast when the fetch itself fails', async () => {
+      // TAT-3645: a thrown error (e.g. CLIENT_NOT_INITIALIZED while the Perps
+      // connection is still initialising) says nothing about tradability, so it
+      // must never be reported as "<asset> is not a tradable asset".
+      const mockShowToast = jest.fn();
+      const mockMarketDataUnavailable = jest.fn(() => ({
+        variant: 'error' as const,
+        hasNoTimeout: false,
+      }));
+      const mockedUsePerpsToasts = jest.mocked(usePerpsToasts);
+      mockedUsePerpsToasts.mockReturnValue({
+        showToast: mockShowToast,
+        PerpsToastOptions: {
+          dataFetching: {
+            market: {
+              error: { marketDataUnavailable: mockMarketDataUnavailable },
+            },
+          },
+        } as unknown as PerpsToastOptionsConfig,
+      });
+      mockGetMarkets.mockRejectedValue(new Error('CLIENT_NOT_INITIALIZED'));
+
+      const { result } = renderHook(() =>
+        usePerpsMarketData({ asset: 'BTC', showErrorToast: true }),
+      );
+
+      await waitFor(() => {
+        expect(result.current.error).toBe('CLIENT_NOT_INITIALIZED');
+      });
+
+      expect(mockMarketDataUnavailable).not.toHaveBeenCalled();
+      expect(mockShowToast).not.toHaveBeenCalled();
+    });
+
+    it('shows the not-tradable toast when the market list comes back without the asset', async () => {
+      // The only legitimate trigger: the fetch succeeded and the asset is
+      // genuinely absent from the returned market list.
       const mockShowToast = jest.fn();
       const mockToastConfig = {
         variant: 'error' as const,
         hasNoTimeout: false,
       };
       const mockMarketDataUnavailable = jest.fn(() => mockToastConfig);
-
-      // Override the mock for this test (use mockReturnValue for all calls in this test)
       const mockedUsePerpsToasts = jest.mocked(usePerpsToasts);
       mockedUsePerpsToasts.mockReturnValue({
         showToast: mockShowToast,
         PerpsToastOptions: {
           dataFetching: {
             market: {
-              error: {
-                marketDataUnavailable: mockMarketDataUnavailable,
-              },
+              error: { marketDataUnavailable: mockMarketDataUnavailable },
             },
           },
         } as unknown as PerpsToastOptionsConfig,
       });
-
-      const error = new Error('Network error');
-      mockGetMarkets.mockRejectedValue(error);
+      mockGetMarkets.mockResolvedValue([{ ...mockMarketData, name: 'ETH' }]);
 
       const { result } = renderHook(() =>
-        usePerpsMarketData({ asset: 'BTC', showErrorToast: true }),
+        usePerpsMarketData({ asset: 'NOTREAL', showErrorToast: true }),
       );
 
       await waitFor(() => {
-        expect(result.current.error).toBe('Network error');
+        expect(result.current.error).toBe('Asset NOTREAL is not tradable');
       });
-      expect(mockMarketDataUnavailable).toHaveBeenCalledWith('BTC');
+
+      expect(mockMarketDataUnavailable).toHaveBeenCalledWith('NOTREAL');
       expect(mockShowToast).toHaveBeenCalledWith(mockToastConfig);
+    });
 
-      // Reset mock to default for other tests
+    it('recovers without a toast when a retry succeeds after a transient failure', async () => {
+      // The connection finishes initialising mid-flight, so the market loads.
+      const mockShowToast = jest.fn();
+      const mockMarketDataUnavailable = jest.fn();
+      const mockedUsePerpsToasts = jest.mocked(usePerpsToasts);
       mockedUsePerpsToasts.mockReturnValue({
-        showToast: jest.fn(),
+        showToast: mockShowToast,
         PerpsToastOptions: {
           dataFetching: {
             market: {
-              error: {
-                marketDataUnavailable: jest.fn(),
-              },
+              error: { marketDataUnavailable: mockMarketDataUnavailable },
             },
           },
         } as unknown as PerpsToastOptionsConfig,
       });
+      mockGetMarkets
+        .mockRejectedValueOnce(new Error('CLIENT_NOT_INITIALIZED'))
+        .mockResolvedValue([mockMarketData]);
+
+      const { result } = renderHook(() =>
+        usePerpsMarketData({ asset: 'BTC', showErrorToast: true }),
+      );
+
+      await waitFor(() => {
+        expect(result.current.marketData).toEqual(mockMarketData);
+      });
+
+      expect(result.current.error).toBe(null);
+      expect(mockShowToast).not.toHaveBeenCalled();
     });
 
     it('should support both string and object parameter formats', async () => {
@@ -257,4 +311,127 @@ describe('usePerpsMarketData', () => {
       });
     });
   });
+
+  describe('lifecycle races (TAT-3645 retry loop)', () => {
+    // A deferred promise keeps a request in flight across an asset change,
+    // which the instant-delay retry mock otherwise makes impossible to observe.
+    const createDeferred = () => {
+      let resolve!: (value: MarketInfo[]) => void;
+      let reject!: (reason: Error) => void;
+      const promise = new Promise<MarketInfo[]>((res, rej) => {
+        resolve = res;
+        reject = rej;
+      });
+      return { promise, resolve, reject };
+    };
+
+    const ethMarket: MarketInfo = { ...mockMarketData, name: 'ETH' };
+
+    // Let every pending continuation run, so a stale write would land here if
+    // the guards did not stop it. Without this the assertions pass vacuously.
+    const flushPendingContinuations = async () => {
+      await act(async () => {
+        for (let i = 0; i < 5; i++) {
+          await Promise.resolve();
+        }
+      });
+    };
+
+    it('ignores a superseded asset request that resolves after the current one', async () => {
+      const btcDeferred = createDeferred();
+      const ethDeferred = createDeferred();
+      mockGetMarkets
+        .mockReturnValueOnce(btcDeferred.promise)
+        .mockReturnValueOnce(ethDeferred.promise);
+
+      const { result, rerender } = renderHook(
+        ({ asset }) => usePerpsMarketData(asset),
+        { initialProps: { asset: 'BTC' } },
+      );
+      rerender({ asset: 'ETH' });
+      ethDeferred.resolve([ethMarket]);
+      await waitFor(() => {
+        expect(result.current.marketData).toEqual(ethMarket);
+      });
+      btcDeferred.resolve([mockMarketData]);
+      await flushPendingContinuations();
+
+      expect(result.current.marketData).toEqual(ethMarket);
+      expect(result.current.error).toBe(null);
+    });
+
+    it('does not let a superseded asset request raise a not-tradable verdict for the current asset', async () => {
+      // BTC's list comes back without BTC — a real verdict, but for an asset
+      // the user already navigated away from. Attributing it to ETH is exactly
+      // what the toast effect would format.
+      const btcDeferred = createDeferred();
+      const ethDeferred = createDeferred();
+      mockGetMarkets
+        .mockReturnValueOnce(btcDeferred.promise)
+        .mockReturnValueOnce(ethDeferred.promise);
+
+      const { result, rerender } = renderHook(
+        ({ asset }) => usePerpsMarketData(asset),
+        { initialProps: { asset: 'BTC' } },
+      );
+      rerender({ asset: 'ETH' });
+      ethDeferred.resolve([ethMarket]);
+      await waitFor(() => {
+        expect(result.current.marketData).toEqual(ethMarket);
+      });
+      btcDeferred.resolve([]);
+      await flushPendingContinuations();
+
+      expect(result.current.marketData).toEqual(ethMarket);
+      expect(result.current.error).toBe(null);
+    });
+
+    it('ignores a superseded asset request that fails after the current one succeeds', async () => {
+      const btcDeferred = createDeferred();
+      const ethDeferred = createDeferred();
+      mockGetMarkets
+        .mockReturnValueOnce(btcDeferred.promise)
+        .mockReturnValueOnce(ethDeferred.promise);
+
+      const { result, rerender } = renderHook(
+        ({ asset }) => usePerpsMarketData(asset),
+        { initialProps: { asset: 'BTC' } },
+      );
+      rerender({ asset: 'ETH' });
+      ethDeferred.resolve([ethMarket]);
+      await waitFor(() => {
+        expect(result.current.marketData).toEqual(ethMarket);
+      });
+      btcDeferred.reject(new Error('CLIENT_NOT_INITIALIZED'));
+      await flushPendingContinuations();
+
+      expect(result.current.marketData).toEqual(ethMarket);
+      expect(result.current.error).toBe(null);
+    });
+
+    it('stops retrying once the component unmounts', async () => {
+      // Park the loop inside its retry delay so the unmount lands while a
+      // retry is genuinely pending — with an instant delay the loop would
+      // already have finished and the assertion would be vacuous.
+      const retryGate = createDeferred();
+      jest
+        .mocked(wait)
+        .mockImplementationOnce(
+          () => retryGate.promise as unknown as Promise<void>,
+        );
+      mockGetMarkets.mockRejectedValue(new Error('CLIENT_NOT_INITIALIZED'));
+
+      const { unmount } = renderHook(() =>
+        usePerpsMarketData({ asset: 'BTC', showErrorToast: true }),
+      );
+      await flushPendingContinuations();
+      const callsWhileParked = mockGetMarkets.mock.calls.length;
+
+      unmount();
+      retryGate.resolve([]);
+      await flushPendingContinuations();
+
+      expect(mockGetMarkets.mock.calls.length).toBe(callsWhileParked);
+    });
+  });
 });
diff --git a/app/components/UI/Perps/hooks/usePerpsMarketData.ts b/app/components/UI/Perps/hooks/usePerpsMarketData.ts
index 92d86aca8689..722e5c5cf582 100644
--- a/app/components/UI/Perps/hooks/usePerpsMarketData.ts
+++ b/app/components/UI/Perps/hooks/usePerpsMarketData.ts
@@ -1,6 +1,7 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import DevLogger from '../../../../core/SDKConnect/utils/DevLogger';
-import { type MarketInfo } from '@metamask/perps-controller';
+import { type MarketInfo, wait } from '@metamask/perps-controller';
+import { MARKET_DATA_FETCH_RETRY_CONFIG } from '../constants/perpsConfig';
 import usePerpsToasts from './usePerpsToasts';
 import { usePerpsTrading } from './usePerpsTrading';
 
@@ -38,10 +39,21 @@ export const usePerpsMarketData = (
   const [marketData, setMarketData] = useState<MarketInfo | null>(null);
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
+  // Distinguishes "the market list says this asset is not tradable" from "the
+  // market list could not be fetched". Only the former may be shown to the
+  // user as a tradability verdict.
+  const [isAssetUntradable, setIsAssetUntradable] = useState(false);
 
   // Always call hook (Rules of Hooks requirement)
   const { showToast, PerpsToastOptions } = usePerpsToasts();
 
+  // The retry loop below awaits between attempts, so a fetch for a previous
+  // asset can still be in flight when a newer one starts. Track the latest
+  // request and the mounted state so only the current request may write state
+  // — same guards as `usePerpsMarketForAsset`.
+  const isMountedRef = useRef(true);
+  const requestIdRef = useRef(0);
+
   const fetchMarketData = useCallback(async () => {
     if (!asset) {
       setMarketData(null);
@@ -49,44 +61,93 @@ export const usePerpsMarketData = (
       return;
     }
 
-    try {
-      setIsLoading(true);
-      setError(null);
+    // Any request started here supersedes every earlier one.
+    const requestId = ++requestIdRef.current;
+    const isCurrentRequest = () =>
+      requestIdRef.current === requestId && isMountedRef.current;
+
+    setIsLoading(true);
+    setError(null);
+
+    // `getMarkets` throws while the Perps connection is still initialising —
+    // after unlocking, or during a reconnect. That says nothing about whether
+    // the asset is tradable, so retry across the initialisation window rather
+    // than reporting a failure the user cannot act on (TAT-3645).
+    for (
+      let attempt = 0;
+      attempt <= MARKET_DATA_FETCH_RETRY_CONFIG.MaxRetries;
+      attempt++
+    ) {
+      try {
+        const markets = await getMarkets({ symbols: [asset] });
+        if (!isCurrentRequest()) {
+          return;
+        }
+
+        const assetMarket = markets.find((market) => market.name === asset);
+
+        // The market list came back, so its contents are a real verdict on
+        // whether this asset can be traded.
+        setIsAssetUntradable(assetMarket === undefined);
+        setError(
+          assetMarket === undefined ? `Asset ${asset} is not tradable` : null,
+        );
+        setMarketData(assetMarket ?? null);
+        setIsLoading(false);
+        return;
+      } catch (err) {
+        if (!isCurrentRequest()) {
+          return;
+        }
 
-      const markets = await getMarkets({ symbols: [asset] });
-      const assetMarket = markets.find((market) => market.name === asset);
+        if (attempt < MARKET_DATA_FETCH_RETRY_CONFIG.MaxRetries) {
+          await wait(MARKET_DATA_FETCH_RETRY_CONFIG.RetryDelayMs);
+          if (!isCurrentRequest()) {
+            return;
+          }
+          continue;
+        }
 
-      if (assetMarket === undefined) {
-        setError(`Asset ${asset} is not tradable`);
+        DevLogger.log('Error fetching market data:', err);
+        // Never a tradability verdict: the market list was never retrieved.
+        setIsAssetUntradable(false);
+        setError(
+          err instanceof Error ? err.message : 'Failed to fetch market data',
+        );
         setMarketData(null);
-      } else {
-        setMarketData(assetMarket);
+        setIsLoading(false);
       }
-    } catch (err) {
-      DevLogger.log('Error fetching market data:', err);
-      setError(
-        err instanceof Error ? err.message : 'Failed to fetch market data',
-      );
-      setMarketData(null);
-    } finally {
-      setIsLoading(false);
     }
   }, [getMarkets, asset]);
 
   useEffect(() => {
+    isMountedRef.current = true;
     fetchMarketData();
+
+    return () => {
+      isMountedRef.current = false;
+    };
   }, [fetchMarketData]);
 
-  // Show error toast if enabled (only for persistent failures, not initial load)
+  // Show the "not tradable" toast only when the market list actually came back
+  // without this asset. A failed fetch is transient and must not be reported as
+  // a tradability verdict (TAT-3645).
   useEffect(() => {
-    if (showErrorToast && error && !isLoading) {
+    if (showErrorToast && isAssetUntradable && !isLoading) {
       showToast(
         PerpsToastOptions.dataFetching.market.error.marketDataUnavailable(
           asset,
         ),
       );
     }
-  }, [showErrorToast, error, isLoading, asset, showToast, PerpsToastOptions]);
+  }, [
+    showErrorToast,
+    isAssetUntradable,
+    isLoading,
+    asset,
+    showToast,
+    PerpsToastOptions,
+  ]);
 
   return {
     marketData,
diff --git a/app/components/UI/Perps/hooks/usePerpsMarketHeaderActions.ts b/app/components/UI/Perps/hooks/usePerpsMarketHeaderActions.ts
new file mode 100644
index 000000000000..87357101a804
--- /dev/null
+++ b/app/components/UI/Perps/hooks/usePerpsMarketHeaderActions.ts
@@ -0,0 +1,148 @@
+import { useCallback, useMemo } from 'react';
+import { useNavigation } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import {
+  PerpsMode,
+  PERPS_EVENT_PROPERTY,
+  PERPS_EVENT_VALUE,
+} from '@metamask/perps-controller';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
+import { usePerpsEventTracking } from './usePerpsEventTracking';
+import { usePerpsMode } from './usePerpsMode';
+import { usePerpsNavigation } from './usePerpsNavigation';
+import { usePerpsWatchlistActions } from './usePerpsWatchlistActions';
+import { createSelectIsWatchlistMarket } from '../selectors/perpsController';
+import { useDropPerpsHomeFromStackHistory } from '../utils/perpsModeSwitch';
+import { openPerpsModeSelectionIfNeeded } from '../utils/openPerpsModeSelection';
+
+export interface UsePerpsMarketHeaderActionsParams {
+  /** Market symbol from route params; undefined when the screen is in an error state. */
+  symbol?: string;
+}
+
+export interface UsePerpsMarketHeaderActionsResult {
+  /** Current Lite/Pro mode for the active-mode pill. */
+  perpsMode: PerpsMode;
+  /** Whether the current market is on the watchlist. */
+  isWatchlist: boolean;
+  handleBackPress: () => void;
+  handleMarketListPress: () => void;
+  handleFavoritePress: () => void;
+  handlePerpsModeChange: (nextMode: PerpsMode) => void | Promise<void>;
+}
+
+/**
+ * Header action handlers for Perps market detail screens (Lite and Pro).
+ *
+ * Keeps back / market-list / watchlist / mode-switch wiring out of market
+ * views so screens stay layout-focused and the handlers can be unit-tested in
+ * isolation. The wallet icon's balance-sheet visibility is owned by
+ * `PerpsProMarketView` directly since it's local UI state, not a navigation
+ * side effect.
+ */
+export const usePerpsMarketHeaderActions = ({
+  symbol,
+}: UsePerpsMarketHeaderActionsParams): UsePerpsMarketHeaderActionsResult => {
+  const {
+    navigateBack,
+    navigateToWallet,
+    navigateToMarketListFromHeader,
+    canGoBack,
+  } = usePerpsNavigation();
+  const navigation = useNavigation();
+  const { mode: perpsMode, setMode: setPerpsMode } = usePerpsMode();
+  const dropPerpsHomeFromStackHistory = useDropPerpsHomeFromStackHistory();
+  const { track } = usePerpsEventTracking();
+  const { addToWatchlist, removeFromWatchlist } = usePerpsWatchlistActions(
+    PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
+  );
+
+  const selectIsWatchlist = useMemo(
+    () => createSelectIsWatchlistMarket(symbol || ''),
+    [symbol],
+  );
+  const isWatchlist = useSelector(selectIsWatchlist);
+
+  const handleBackPress = useCallback(() => {
+    if (canGoBack) {
+      navigateBack();
+    } else {
+      // No back stack (e.g. this is the Pro-mode stack root): "home" while
+      // Pro mode is active is itself a market screen, so falling back to it
+      // here would often be a no-op. Leave Perps entirely instead.
+      navigateToWallet();
+    }
+  }, [canGoBack, navigateBack, navigateToWallet]);
+
+  const handleMarketListPress = useCallback(() => {
+    if (!symbol) {
+      return;
+    }
+
+    track(MetaMetricsEvents.PERPS_UI_INTERACTION, {
+      [PERPS_EVENT_PROPERTY.INTERACTION_TYPE]:
+        PERPS_EVENT_VALUE.INTERACTION_TYPE.BUTTON_CLICKED,
+      [PERPS_EVENT_PROPERTY.BUTTON_CLICKED]:
+        PERPS_EVENT_VALUE.BUTTON_CLICKED.MARKET_LIST,
+      [PERPS_EVENT_PROPERTY.BUTTON_LOCATION]:
+        PERPS_EVENT_VALUE.BUTTON_LOCATION.PERP_MARKET_DETAILS,
+      [PERPS_EVENT_PROPERTY.ASSET]: symbol,
+    });
+
+    navigateToMarketListFromHeader({
+      source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
+    });
+  }, [symbol, track, navigateToMarketListFromHeader]);
+
+  const handleFavoritePress = useCallback(() => {
+    if (!symbol) {
+      return;
+    }
+
+    // Fire-and-forget: watchlist actions apply an optimistic Redux update and
+    // swallow their own errors (toast on failure). Do not await here.
+    if (isWatchlist) {
+      // eslint-disable-next-line no-void
+      void removeFromWatchlist(symbol);
+      return;
+    }
+
+    // eslint-disable-next-line no-void
+    void addToWatchlist(symbol);
+  }, [symbol, isWatchlist, addToWatchlist, removeFromWatchlist]);
+
+  const handlePerpsModeChange = useCallback(
+    async (nextMode: PerpsMode) => {
+      // The market-header pill owns the shimmer delay; this fires once it ends.
+      // The chooser gates every header toggle, so a user who reaches a market
+      // without ever seeing it gets the sheet here and it owns the switch.
+      const openedChooser = await openPerpsModeSelectionIfNeeded(navigation, {
+        entry: 'market',
+        source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
+      });
+      if (openedChooser) {
+        return;
+      }
+
+      // Chooser already completed — flip immediately without the sheet.
+      setPerpsMode(nextMode);
+      // Drop Home so back cannot reveal the Lite hub while Pro is active
+      // (TAT-3612).
+      if (nextMode === PerpsMode.Pro) {
+        dropPerpsHomeFromStackHistory();
+      }
+    },
+    [navigation, setPerpsMode, dropPerpsHomeFromStackHistory],
+  );
+
+  return {
+    perpsMode,
+    isWatchlist,
+    handleBackPress,
+    handleMarketListPress,
+    handleFavoritePress,
+    handlePerpsModeChange,
+  };
+};
+
+export default usePerpsMarketHeaderActions;
diff --git a/app/components/UI/Perps/hooks/usePerpsNavigation.test.ts b/app/components/UI/Perps/hooks/usePerpsNavigation.test.ts
index 72fe00e5dd8f..ef4d5cd2154c 100644
--- a/app/components/UI/Perps/hooks/usePerpsNavigation.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsNavigation.test.ts
@@ -1,6 +1,6 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { waitFor } from '@testing-library/react-native';
-import { useNavigation } from '@react-navigation/native';
+import { StackActions, useNavigation } from '@react-navigation/native';
 import { useSelector } from 'react-redux';
 import { PerpsMode } from '@metamask/perps-controller';
 import { usePerpsNavigation } from './usePerpsNavigation';
@@ -13,6 +13,7 @@ import { selectPerpsProModeEnabledFlag } from '../selectors/featureFlags';
 import { selectPerpsMode } from '../selectors/perpsController';
 
 jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
   useNavigation: jest.fn(),
 }));
 
@@ -54,6 +55,8 @@ describe('usePerpsNavigation', () => {
   const mockNavigate = jest.fn();
   const mockCanGoBack = jest.fn();
   const mockGoBack = jest.fn();
+  const mockDispatch = jest.fn();
+  const mockGetState = jest.fn();
   const mockUseNavigation = useNavigation as jest.MockedFunction<
     typeof useNavigation
   >;
@@ -97,10 +100,15 @@ describe('usePerpsNavigation', () => {
     mockUsePerpsEventTracking.mockReturnValue({
       track: mockTrack,
     });
+    // Default to a navigator that doesn't own the Perps screens, so
+    // navigateToMarketList takes the cross-stack `navigate(PERPS.ROOT)` path.
+    mockGetState.mockReturnValue({ routeNames: [] });
     mockUseNavigation.mockReturnValue({
       navigate: mockNavigate,
       canGoBack: mockCanGoBack,
       goBack: mockGoBack,
+      dispatch: mockDispatch,
+      getState: mockGetState,
     } as Partial<ReturnType<typeof useNavigation>> as ReturnType<
       typeof useNavigation
     >);
@@ -271,7 +279,7 @@ describe('usePerpsNavigation', () => {
       );
     });
 
-    it('navigates to market list without params', () => {
+    it('navigates to market list through the Perps root from outside the stack', () => {
       const { result } = renderHook(() => usePerpsNavigation());
 
       result.current.navigateToMarketList();
@@ -280,9 +288,10 @@ describe('usePerpsNavigation', () => {
         screen: Routes.PERPS.MARKET_LIST,
         params: undefined,
       });
+      expect(mockDispatch).not.toHaveBeenCalled();
     });
 
-    it('navigates to market list with params', () => {
+    it('navigates to market list with params from outside the stack', () => {
       const { result } = renderHook(() => usePerpsNavigation());
       const params = { source: 'test', variant: 'full' as const };
 
@@ -294,6 +303,43 @@ describe('usePerpsNavigation', () => {
       });
     });
 
+    it('pushes the market list when already inside the Perps stack', () => {
+      // Arrange - navigate() would pop back to an existing market list entry,
+      // animating backwards when the user reached this screen through it.
+      mockGetState.mockReturnValue({
+        routeNames: [Routes.PERPS.MARKET_LIST, Routes.PERPS.MARKET_DETAILS],
+      });
+      const { result } = renderHook(() => usePerpsNavigation());
+      const params = { source: 'perp_asset_screen' };
+
+      // Act
+      result.current.navigateToMarketList(params);
+
+      // Assert
+      expect(mockDispatch).toHaveBeenCalledWith(
+        StackActions.push(Routes.PERPS.MARKET_LIST, params),
+      );
+      expect(mockNavigate).not.toHaveBeenCalled();
+    });
+
+    it('pushes market list from header so details stay beneath the slide-up', () => {
+      const { result } = renderHook(() => usePerpsNavigation());
+      const params = { source: 'perp_asset_screen' };
+
+      result.current.navigateToMarketListFromHeader(params);
+
+      // Must push (not ROOT navigate) so MARKET_LIST → MARKET_DETAILS keeps
+      // details under the picker; navigate() would pop back to the existing list.
+      expect(mockDispatch).toHaveBeenCalledWith(
+        StackActions.push(Routes.PERPS.MARKET_LIST, {
+          ...params,
+          animation: 'slide_from_bottom',
+          replaceOnSelect: true,
+        }),
+      );
+      expect(mockNavigate).not.toHaveBeenCalled();
+    });
+
     it('navigates to order screen with direction and asset', async () => {
       const { result } = renderHook(() => usePerpsNavigation());
       const params = { direction: 'long' as const, asset: 'BTC' };
diff --git a/app/components/UI/Perps/hooks/usePerpsNavigation.ts b/app/components/UI/Perps/hooks/usePerpsNavigation.ts
index d17f8f516f8a..10277dc9e9d5 100644
--- a/app/components/UI/Perps/hooks/usePerpsNavigation.ts
+++ b/app/components/UI/Perps/hooks/usePerpsNavigation.ts
@@ -1,5 +1,5 @@
 import { useCallback } from 'react';
-import { useNavigation } from '@react-navigation/native';
+import { StackActions, useNavigation } from '@react-navigation/native';
 import type { AppNavigationProp } from '../../../../core/NavigationService/types';
 
 import Routes from '../../../../constants/navigation/Routes';
@@ -49,6 +49,9 @@ export interface PerpsNavigationHandlers {
   navigateToMarketList: (
     params?: PerpsNavigationParamList['PerpsMarketListView'],
   ) => void;
+  navigateToMarketListFromHeader: (
+    params?: PerpsNavigationParamList['PerpsMarketListView'],
+  ) => void;
   navigateToOrder: (params: PerpsNavigationParamList['PerpsOrder']) => void;
   navigateToTutorial: (
     params?: PerpsNavigationParamList['PerpsTutorial'],
@@ -159,9 +162,22 @@ export const usePerpsNavigation = (): PerpsNavigationHandlers => {
 
   const navigateToMarketList = useCallback(
     (params?: PerpsNavigationParamList['PerpsMarketListView']) => {
-      // Navigate via the Perps root so this works from both contexts:
-      // 1. When PerpsHomeView is embedded as a tab in the main navigator (wallet home)
-      // 2. When PerpsHomeView is a stack screen inside PerpsScreenStack
+      // Inside the Perps stack, push rather than navigate. `navigate()` reuses
+      // an existing market-list entry and pops everything above it, so opening
+      // the list from a market screen the user reached *through* the list
+      // animates backwards — the market → list → market loop reported in
+      // TAT-3649.
+      if (
+        navigation.getState()?.routeNames?.includes(Routes.PERPS.MARKET_LIST)
+      ) {
+        navigation.dispatch(
+          StackActions.push(Routes.PERPS.MARKET_LIST, params),
+        );
+        return;
+      }
+
+      // Outside the Perps stack (e.g. PerpsHomeView embedded as a tab in the
+      // main navigator) the list is only reachable through the Perps root.
       navigation.navigate(Routes.PERPS.ROOT, {
         screen: Routes.PERPS.MARKET_LIST,
         params,
@@ -170,6 +186,25 @@ export const usePerpsNavigation = (): PerpsNavigationHandlers => {
     [navigation],
   );
 
+  const navigateToMarketListFromHeader = useCallback(
+    (params?: PerpsNavigationParamList['PerpsMarketListView']) => {
+      // Push a new MARKET_LIST over MARKET_DETAILS so the common
+      // MARKET_LIST → MARKET_DETAILS stack keeps details beneath the slide-up
+      // picker. navigate() would jump back to the existing list entry and pop
+      // details, breaking Back-to-dismiss behavior.
+      navigation.dispatch(
+        StackActions.push(Routes.PERPS.MARKET_LIST, {
+          ...params,
+          animation: 'slide_from_bottom',
+          // Selecting a market should replace the details beneath this picker
+          // rather than pushing another MARKET_DETAILS on top of the stack.
+          replaceOnSelect: true,
+        }),
+      );
+    },
+    [navigation],
+  );
+
   const { depositWithOrder } = usePerpsTrading();
   const { showToast, PerpsToastOptions } = usePerpsToasts();
   const { track } = usePerpsEventTracking();
@@ -277,6 +312,7 @@ export const usePerpsNavigation = (): PerpsNavigationHandlers => {
     navigateToMarketDetails,
     navigateToHome,
     navigateToMarketList,
+    navigateToMarketListFromHeader,
     navigateToOrder,
     navigateToTutorial,
     navigateToAdjustMargin,
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderExecution.ts b/app/components/UI/Perps/hooks/usePerpsOrderExecution.ts
index 27ee7fa8a2e5..c96c9ba081fc 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderExecution.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderExecution.ts
@@ -41,7 +41,7 @@ interface UsePerpsOrderExecutionParams {
 }
 
 interface UsePerpsOrderExecutionReturn {
-  placeOrder: (params: OrderParams) => Promise<void>;
+  placeOrder: (params: OrderParams) => Promise<OrderResult | undefined>;
   isPlacing: boolean;
   lastResult?: OrderResult;
   error?: string;
@@ -90,7 +90,7 @@ export function usePerpsOrderExecution(
   });
 
   const placeOrder = useCallback(
-    async (orderParams: OrderParams) => {
+    async (orderParams: OrderParams): Promise<OrderResult | undefined> => {
       // Market orders measure submit -> position rendered (toast coupled to the
       // same stream render) via PerpsPlaceOrderToPositionRendered. Limit orders
       // measure submit -> resting order rendered in the orders stream (no
@@ -319,6 +319,8 @@ export function usePerpsOrderExecution(
 
           onError?.(errorMessage);
         }
+
+        return result;
       } catch (err) {
         controllerSettled = true;
         endCuf({
@@ -359,6 +361,8 @@ export function usePerpsOrderExecution(
         });
 
         onError?.(errorMessage);
+
+        return undefined;
       } finally {
         setIsPlacing(false);
       }
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderFees.test.ts b/app/components/UI/Perps/hooks/usePerpsOrderFees.test.ts
index 5e36c3e7e7e2..d4a2a86f4763 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderFees.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderFees.test.ts
@@ -9,7 +9,10 @@ import {
   formatFeeRate,
   clearRewardsCaches,
 } from './usePerpsOrderFees';
-import { type FeeCalculationResult } from '@metamask/perps-controller';
+import {
+  type FeeCalculationParams,
+  type FeeCalculationResult,
+} from '@metamask/perps-controller';
 
 jest.mock('./usePerpsTrading');
 
@@ -74,7 +77,7 @@ const createWrapper = () => {
 describe('usePerpsOrderFees', () => {
   const mockCalculateFees = jest.fn<
     Promise<FeeCalculationResult>,
-    [{ orderType: 'market' | 'limit'; isMaker?: boolean; amount?: string }]
+    [FeeCalculationParams]
   >();
 
   beforeEach(() => {
@@ -148,6 +151,7 @@ describe('usePerpsOrderFees', () => {
       calculateFees: mockCalculateFees,
       placeOrder: jest.fn(),
       cancelOrder: jest.fn(),
+      editOrder: jest.fn(),
       closePosition: jest.fn(),
       getMarkets: jest.fn(),
       getPositions: jest.fn(),
@@ -774,7 +778,7 @@ describe('clearRewardsCaches', () => {
 describe('usePerpsOrderFees - Maker/Taker Determination', () => {
   const mockCalculateFees = jest.fn<
     Promise<FeeCalculationResult>,
-    [{ orderType: 'market' | 'limit'; isMaker?: boolean; amount?: string }]
+    [FeeCalculationParams]
   >();
 
   beforeEach(() => {
@@ -846,6 +850,7 @@ describe('usePerpsOrderFees - Maker/Taker Determination', () => {
       calculateFees: mockCalculateFees,
       placeOrder: jest.fn(),
       cancelOrder: jest.fn(),
+      editOrder: jest.fn(),
       closePosition: jest.fn(),
       getMarkets: jest.fn(),
       getPositions: jest.fn(),
@@ -1545,17 +1550,19 @@ describe('usePerpsOrderFees - Maker/Taker Determination', () => {
 describe('usePerpsOrderFees - Enhanced Error Handling', () => {
   const mockCalculateFees = jest.fn<
     Promise<FeeCalculationResult>,
-    [{ orderType: 'market' | 'limit'; isMaker?: boolean; amount?: string }]
+    [FeeCalculationParams]
   >();
 
   beforeEach(() => {
     jest.clearAllMocks();
+    clearRewardsCaches();
     // Reset controller messenger mock
     mockControllerMessenger.call.mockReset();
     mockUsePerpsTrading.mockReturnValue({
       calculateFees: mockCalculateFees,
       placeOrder: jest.fn(),
       cancelOrder: jest.fn(),
+      editOrder: jest.fn(),
       closePosition: jest.fn(),
       getMarkets: jest.fn(),
       getPositions: jest.fn(),
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderFees.ts b/app/components/UI/Perps/hooks/usePerpsOrderFees.ts
index cddaca3bfda1..97d5098e4fa7 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderFees.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderFees.ts
@@ -18,6 +18,7 @@ import {
   PerpsMeasurementName,
   PERFORMANCE_CONFIG,
   formatAccountToCaipAccountId,
+  type OrderType,
 } from '@metamask/perps-controller';
 import { DEVELOPMENT_CONFIG } from '../constants/perpsConfig';
 import { usePerpsTrading } from './usePerpsTrading';
@@ -75,8 +76,8 @@ export interface OrderFeesResult {
 }
 
 interface UsePerpsOrderFeesParams {
-  /** Order type - market or limit */
-  orderType: 'market' | 'limit';
+  /** Order placement type */
+  orderType: OrderType;
   /** Order amount in USD */
   amount: string;
   /** Symbol for the trade (e.g., 'BTC', 'ETH') */
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts b/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts
index b6f62a3398cf..b8c6fc5fc927 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts
@@ -202,6 +202,71 @@ describe('usePerpsOrderForm', () => {
       });
     });
 
+    it('keeps an empty surface fallback empty', () => {
+      const { result } = renderHook(
+        () => usePerpsOrderForm({ fallbackAmount: '' }),
+        {
+          wrapper: createWrapper(),
+        },
+      );
+
+      expect(result.current.orderForm.amount).toBe('');
+      expect(result.current.orderForm.balancePercent).toBe(0);
+    });
+
+    it('prioritizes a pending amount over an empty surface fallback', () => {
+      const mockStoreWithPendingConfig = configureStore({
+        reducer: {
+          engine: (
+            state = {
+              backgroundState: {
+                PerpsController: {
+                  isTestnet: false,
+                  tradeConfigurations: {
+                    mainnet: {
+                      BTC: {
+                        pendingConfig: {
+                          amount: '125',
+                          timestamp: Date.now(),
+                        },
+                      },
+                    },
+                    testnet: {},
+                  },
+                },
+              },
+            },
+          ) => state,
+        },
+      });
+      const WrapperWithPendingConfig = ({
+        children,
+      }: {
+        children: React.ReactNode;
+      }) => {
+        const streamProvider = React.createElement(PerpsStreamProvider, {
+          testStreamManager: createMockStreamManager(),
+          children,
+        } as React.ComponentProps<typeof PerpsStreamProvider>);
+
+        return React.createElement(Provider, {
+          store: mockStoreWithPendingConfig,
+          children: streamProvider,
+        });
+      };
+
+      const { result } = renderHook(
+        () =>
+          usePerpsOrderForm({
+            initialAsset: 'BTC',
+            fallbackAmount: '',
+          }),
+        { wrapper: WrapperWithPendingConfig },
+      );
+
+      expect(result.current.orderForm.amount).toBe('125');
+    });
+
     it('prioritizes existing position leverage over saved config', () => {
       // Mock existing position with 10x leverage
       mockUsePerpsLivePositions.mockReturnValue({
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderForm.ts b/app/components/UI/Perps/hooks/usePerpsOrderForm.ts
index 210521d4c540..bb320a84b45a 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderForm.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderForm.ts
@@ -21,6 +21,8 @@ interface UsePerpsOrderFormParams {
   initialAsset?: string;
   initialDirection?: 'long' | 'short';
   initialAmount?: string;
+  /** Surface-specific fallback used when no explicit or pending amount exists. */
+  fallbackAmount?: string;
   initialLeverage?: number;
   initialType?: OrderType;
   /** When paying with a custom token, the selected token amount in USD; used to cap maxPossibleAmount and handlers */
@@ -57,6 +59,7 @@ export function usePerpsOrderForm(
     initialAsset = 'BTC',
     initialDirection = 'long',
     initialAmount,
+    fallbackAmount: fallbackAmountParam,
     initialLeverage,
     initialType = 'market',
     effectiveAvailableBalance: effectiveAvailableBalanceParam,
@@ -103,6 +106,7 @@ export function usePerpsOrderForm(
     currentNetwork === 'mainnet'
       ? TRADING_DEFAULTS.amount.mainnet
       : TRADING_DEFAULTS.amount.testnet;
+  const fallbackAmount = fallbackAmountParam ?? defaultAmount.toString();
 
   // Priority for leverage: navigation param > existing position leverage > pending config > saved config > default (3x)
   const defaultLeverage =
@@ -126,7 +130,11 @@ export function usePerpsOrderForm(
 
     // Don't calculate if price is not available yet to avoid temporary 0 values
     if (!currentPrice?.price) {
-      return defaultAmount.toString();
+      return fallbackAmount;
+    }
+
+    if (fallbackAmount === '') {
+      return '';
     }
 
     const tempMaxAmount = getMaxAllowedAmount({
@@ -136,19 +144,24 @@ export function usePerpsOrderForm(
       leverage: defaultLeverage, // Use default leverage for initial calculation
     });
 
-    // Return the target amount directly (USD as source of truth, no optimization)
-    // Use conservative default ($10) unless explicitly provided via navigation param
+    const numericFallbackAmount = Number.parseFloat(fallbackAmount);
+    if (!Number.isFinite(numericFallbackAmount)) {
+      return fallbackAmount;
+    }
+
+    // Return the target amount directly (USD as source of truth, no optimization).
+    // Lite uses its conservative network default; other surfaces can opt out.
     const targetAmount =
-      tempMaxAmount < defaultAmount
+      tempMaxAmount < numericFallbackAmount
         ? tempMaxAmount.toString()
-        : defaultAmount.toString();
+        : fallbackAmount;
 
     return targetAmount;
   }, [
     initialAmount,
     pendingConfig?.amount,
     balanceForMax,
-    defaultAmount,
+    fallbackAmount,
     currentPrice?.price,
     marketData?.szDecimals,
     defaultLeverage,
@@ -158,8 +171,10 @@ export function usePerpsOrderForm(
   const defaultOrderType = pendingConfig?.orderType || initialType || 'market';
 
   // Calculate initial balance percentage
-  const initialMarginRequired =
-    Number.parseFloat(initialAmountValue) / defaultLeverage;
+  const parsedInitialAmount = Number.parseFloat(initialAmountValue);
+  const initialMarginRequired = Number.isFinite(parsedInitialAmount)
+    ? parsedInitialAmount / defaultLeverage
+    : 0;
   const initialBalancePercent =
     spendableBalance > 0
       ? Math.min((initialMarginRequired / spendableBalance) * 100, 100)
@@ -259,7 +274,8 @@ export function usePerpsOrderForm(
   useEffect(() => {
     const currentAmount = Number.parseFloat(orderForm.amount);
     if (
-      currentAmount === 0 ||
+      !Number.isFinite(currentAmount) ||
+      currentAmount <= 0 ||
       maxPossibleAmount === 0 ||
       currentAmount < maxPossibleAmount
     )
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderValidation.test.ts b/app/components/UI/Perps/hooks/usePerpsOrderValidation.test.ts
index 10f5ba025e5c..6c12f53a41a1 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderValidation.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderValidation.test.ts
@@ -26,6 +26,7 @@ jest.mock('../../../../../locales/i18n', () => ({
     const translations: Record<string, string> = {
       'perps.order.validation.existing_position': `Existing position for ${values?.asset}`,
       'perps.order.validation.insufficient_balance': `Insufficient balance: need ${values?.required}, have ${values?.available}`,
+      'perps.order.validation.minimum_amount': `Minimum order size is $${values?.amount}`,
       'perps.order.validation.high_leverage_warning': 'High leverage warning',
       'perps.order.validation.limit_price_required': 'Limit price required',
       'perps.order.validation.error': 'Validation error',
@@ -75,6 +76,35 @@ describe('usePerpsOrderValidation', () => {
   };
 
   describe('protocol validation', () => {
+    it('clears existing errors when position size changes to zero', async () => {
+      // Arrange
+      mockValidateOrder.mockResolvedValue({
+        isValid: false,
+        error: 'Minimum order size is $10.00',
+      });
+      const { result, rerender } = renderHook(
+        (params) => usePerpsOrderValidation(params),
+        { initialProps: defaultParams },
+      );
+      await act(async () => {
+        await Promise.resolve();
+      });
+      await fastWaitFor(() => {
+        expect(result.current.errors).toContain('Minimum order size is $10.00');
+      });
+
+      // Act
+      rerender({
+        ...defaultParams,
+        positionSize: '0',
+      });
+
+      // Assert
+      expect(mockValidateOrder).toHaveBeenCalledTimes(1);
+      expect(result.current.errors).toEqual([]);
+      expect(result.current.isValid).toBe(false);
+    });
+
     it('should pass when protocol validation passes', async () => {
       mockValidateOrder.mockResolvedValue({ isValid: true });
 
@@ -455,4 +485,62 @@ describe('usePerpsOrderValidation', () => {
       );
     });
   });
+
+  describe('reduce-only full close', () => {
+    it('passes reduceOnly and isFullClose through to protocol validation', async () => {
+      mockValidateOrder.mockResolvedValue({ isValid: true });
+
+      renderHook(() =>
+        usePerpsOrderValidation({
+          ...defaultParams,
+          orderForm: { ...defaultOrderForm, amount: '5' },
+          originalUsdAmount: '5',
+          reduceOnly: true,
+          isFullClose: true,
+          marginRequired: '0',
+        }),
+      );
+
+      act(() => {
+        jest.advanceTimersByTime(1000);
+      });
+
+      await fastWaitFor(() => {
+        expect(mockValidateOrder).toHaveBeenCalled();
+      });
+
+      expect(mockValidateOrder).toHaveBeenCalledWith(
+        expect.objectContaining({
+          reduceOnly: true,
+          isFullClose: true,
+        }),
+      );
+    });
+
+    it('skips the UI minimum-amount error for a full reduce-only close', async () => {
+      mockValidateOrder.mockResolvedValue({ isValid: true });
+
+      const { result } = renderHook(() =>
+        usePerpsOrderValidation({
+          ...defaultParams,
+          orderForm: { ...defaultOrderForm, amount: '5' },
+          originalUsdAmount: '5',
+          reduceOnly: true,
+          isFullClose: true,
+          marginRequired: '0',
+        }),
+      );
+
+      act(() => {
+        jest.advanceTimersByTime(1000);
+      });
+
+      await fastWaitFor(() => {
+        expect(result.current.isValidating).toBe(false);
+      });
+
+      expect(result.current.isValid).toBe(true);
+      expect(result.current.errors).not.toContain('Minimum order size is $10');
+    });
+  });
 });
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderValidation.ts b/app/components/UI/Perps/hooks/usePerpsOrderValidation.ts
index a3365ec03dfc..769767343ce9 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderValidation.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderValidation.ts
@@ -27,6 +27,13 @@ interface UsePerpsOrderValidationParams {
   existingPositionLeverage?: number;
   skipValidation?: boolean;
   originalUsdAmount?: string; // Original USD input for validation (prevents precision loss from recalculation)
+  /** When true, passes reduceOnly through to protocol validation. */
+  reduceOnly?: boolean;
+  /**
+   * When true with reduceOnly, skips the UI minimum-amount check and tells the
+   * controller to apply its full-close minimum exemption.
+   */
+  isFullClose?: boolean;
 }
 
 interface ValidationResult {
@@ -59,6 +66,8 @@ export function usePerpsOrderValidation(
     existingPositionLeverage,
     skipValidation,
     originalUsdAmount,
+    reduceOnly,
+    isFullClose,
   } = params;
 
   const { validateOrder } = usePerpsTrading();
@@ -111,7 +120,10 @@ export function usePerpsOrderValidation(
         ? TRADING_DEFAULTS.amount.mainnet
         : TRADING_DEFAULTS.amount.testnet;
 
-    if (usdAmount > 0 && usdAmount < minimumOrderSize) {
+    // Full reduce-only closes may be below the normal minimum notional (dust);
+    // the controller skips ORDER_SIZE_MIN when reduceOnly && isFullClose.
+    const skipMinimumAmount = Boolean(reduceOnly && isFullClose);
+    if (!skipMinimumAmount && usdAmount > 0 && usdAmount < minimumOrderSize) {
       immediateErrors.push(
         strings('perps.order.validation.minimum_amount', {
           amount: minimumOrderSize.toString(),
@@ -131,6 +143,8 @@ export function usePerpsOrderValidation(
         currentPrice: assetPrice,
         existingPositionLeverage,
         usdAmount: originalUsdAmount, // Pass USD as source of truth for validation
+        ...(reduceOnly !== undefined ? { reduceOnly } : {}),
+        ...(isFullClose !== undefined ? { isFullClose } : {}),
       };
 
       // Get protocol-specific validation
@@ -233,6 +247,8 @@ export function usePerpsOrderValidation(
     marginRequired,
     existingPositionLeverage,
     originalUsdAmount,
+    reduceOnly,
+    isFullClose,
     validateOrder,
     network,
   ]);
@@ -244,7 +260,18 @@ export function usePerpsOrderValidation(
     }
 
     // Skip validation if critical data is missing
-    if (!positionSize || assetPrice === 0) {
+    const numericPositionSize = Number.parseFloat(positionSize);
+    if (!Number.isFinite(numericPositionSize) || numericPositionSize <= 0) {
+      setValidation((prev) => ({
+        ...prev,
+        errors: EMPTY_ERRORS,
+        isValidating: false,
+        isValid: false,
+      }));
+      return;
+    }
+
+    if (assetPrice === 0) {
       setValidation((prev) => ({
         ...prev,
         isValidating: false,
diff --git a/app/components/UI/Perps/hooks/usePerpsPositionForAsset.test.ts b/app/components/UI/Perps/hooks/usePerpsPositionForAsset.test.ts
index c71931cd3b18..36a32c47501d 100644
--- a/app/components/UI/Perps/hooks/usePerpsPositionForAsset.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsPositionForAsset.test.ts
@@ -151,6 +151,7 @@ describe('usePerpsPositionForAsset', () => {
       getAccountState: jest.fn(),
       placeOrder: jest.fn(),
       cancelOrder: jest.fn(),
+      editOrder: jest.fn(),
       closePosition: jest.fn(),
       getMarkets: jest.fn(),
       subscribeToPrices: jest.fn(),
diff --git a/app/components/UI/Perps/hooks/usePerpsProMarketHeaderActions.test.ts b/app/components/UI/Perps/hooks/usePerpsProMarketHeaderActions.test.ts
index 9afc79ab6870..b47754c106cf 100644
--- a/app/components/UI/Perps/hooks/usePerpsProMarketHeaderActions.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsProMarketHeaderActions.test.ts
@@ -10,6 +10,7 @@ import { usePerpsProMarketHeaderActions } from './usePerpsProMarketHeaderActions
 const mockNavigateBack = jest.fn();
 const mockNavigateToWallet = jest.fn();
 const mockNavigateToMarketList = jest.fn();
+const mockNavigateToMarketListFromHeader = jest.fn();
 let mockCanGoBack = true;
 
 jest.mock('./usePerpsNavigation', () => ({
@@ -17,7 +18,10 @@ jest.mock('./usePerpsNavigation', () => ({
     navigateBack: mockNavigateBack,
     navigateToWallet: mockNavigateToWallet,
     navigateToMarketList: mockNavigateToMarketList,
-    canGoBack: mockCanGoBack,
+    navigateToMarketListFromHeader: mockNavigateToMarketListFromHeader,
+    get canGoBack() {
+      return mockCanGoBack;
+    },
   })),
 }));
 
@@ -44,9 +48,23 @@ jest.mock('./usePerpsWatchlistActions', () => ({
   })),
 }));
 
-const mockShowPerpsModeFlash = jest.fn();
-jest.mock('../utils/perpsModeFlash', () => ({
-  showPerpsModeFlash: (...args: unknown[]) => mockShowPerpsModeFlash(...args),
+const mockDropPerpsHomeFromStackHistory = jest.fn();
+jest.mock('../utils/perpsModeSwitch', () => ({
+  useDropPerpsHomeFromStackHistory: () => mockDropPerpsHomeFromStackHistory,
+}));
+
+const mockNavigate = jest.fn();
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: () => ({ navigate: mockNavigate }),
+}));
+
+const mockOpenPerpsModeSelectionIfNeeded = jest.fn(() =>
+  Promise.resolve(false),
+);
+jest.mock('../utils/openPerpsModeSelection', () => ({
+  openPerpsModeSelectionIfNeeded: (...args: unknown[]) =>
+    mockOpenPerpsModeSelectionIfNeeded(...(args as [])),
 }));
 
 let mockIsWatchlist = false;
@@ -60,6 +78,7 @@ describe('usePerpsProMarketHeaderActions', () => {
     jest.clearAllMocks();
     mockCanGoBack = true;
     mockIsWatchlist = false;
+    mockOpenPerpsModeSelectionIfNeeded.mockResolvedValue(false);
   });
 
   it('navigates back when the stack can go back', () => {
@@ -98,7 +117,7 @@ describe('usePerpsProMarketHeaderActions', () => {
       result.current.handleMarketListPress();
     });
 
-    expect(mockNavigateToMarketList).toHaveBeenCalledWith({
+    expect(mockNavigateToMarketListFromHeader).toHaveBeenCalledWith({
       source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
     });
     expect(mockTrack).toHaveBeenCalledWith(
@@ -120,22 +139,10 @@ describe('usePerpsProMarketHeaderActions', () => {
       result.current.handleMarketListPress();
     });
 
-    expect(mockNavigateToMarketList).not.toHaveBeenCalled();
+    expect(mockNavigateToMarketListFromHeader).not.toHaveBeenCalled();
     expect(mockTrack).not.toHaveBeenCalled();
   });
 
-  it('leaves Perps for the main wallet from the wallet action', () => {
-    const { result } = renderHook(() =>
-      usePerpsProMarketHeaderActions({ symbol: 'BTC' }),
-    );
-
-    act(() => {
-      result.current.handleWalletPress();
-    });
-
-    expect(mockNavigateToWallet).toHaveBeenCalledTimes(1);
-  });
-
   it('adds the market to the watchlist when it is not favorited', () => {
     mockIsWatchlist = false;
     const { result } = renderHook(() =>
@@ -177,17 +184,51 @@ describe('usePerpsProMarketHeaderActions', () => {
     expect(mockRemoveFromWatchlist).not.toHaveBeenCalled();
   });
 
-  it('switches mode and flashes the mode transition', () => {
+  it('switches mode directly when the chooser is already completed', async () => {
     const { result } = renderHook(() =>
       usePerpsProMarketHeaderActions({ symbol: 'BTC' }),
     );
 
-    act(() => {
+    await act(async () => {
       result.current.handlePerpsModeChange(PerpsMode.Lite);
     });
 
     expect(mockSetPerpsMode).toHaveBeenCalledWith(PerpsMode.Lite);
-    expect(mockShowPerpsModeFlash).toHaveBeenCalledWith(PerpsMode.Lite);
+    expect(mockDropPerpsHomeFromStackHistory).not.toHaveBeenCalled();
+  });
+
+  it('drops Perps Home from history when switching to Pro', async () => {
+    const { result } = renderHook(() =>
+      usePerpsProMarketHeaderActions({ symbol: 'BTC' }),
+    );
+
+    await act(async () => {
+      result.current.handlePerpsModeChange(PerpsMode.Pro);
+    });
+
+    expect(mockSetPerpsMode).toHaveBeenCalledWith(PerpsMode.Pro);
+    expect(mockDropPerpsHomeFromStackHistory).toHaveBeenCalledTimes(1);
+  });
+
+  it('opens the mode chooser instead of switching when it has not been completed', async () => {
+    mockOpenPerpsModeSelectionIfNeeded.mockResolvedValue(true);
+    const { result } = renderHook(() =>
+      usePerpsProMarketHeaderActions({ symbol: 'BTC' }),
+    );
+
+    await act(async () => {
+      result.current.handlePerpsModeChange(PerpsMode.Lite);
+    });
+
+    expect(mockOpenPerpsModeSelectionIfNeeded).toHaveBeenCalledWith(
+      expect.anything(),
+      {
+        entry: 'market',
+        source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
+      },
+    );
+    expect(mockSetPerpsMode).not.toHaveBeenCalled();
+    expect(mockDropPerpsHomeFromStackHistory).not.toHaveBeenCalled();
   });
 
   it('exposes the current mode and watchlist state', () => {
diff --git a/app/components/UI/Perps/hooks/usePerpsProMarketHeaderActions.ts b/app/components/UI/Perps/hooks/usePerpsProMarketHeaderActions.ts
index 1de9e35da509..e70253c53110 100644
--- a/app/components/UI/Perps/hooks/usePerpsProMarketHeaderActions.ts
+++ b/app/components/UI/Perps/hooks/usePerpsProMarketHeaderActions.ts
@@ -1,128 +1,9 @@
-import { useCallback, useMemo } from 'react';
-import { useSelector } from 'react-redux';
-import {
-  PerpsMode,
-  PERPS_EVENT_PROPERTY,
-  PERPS_EVENT_VALUE,
-} from '@metamask/perps-controller';
-import { MetaMetricsEvents } from '../../../../core/Analytics';
-import { usePerpsEventTracking } from './usePerpsEventTracking';
-import { usePerpsMode } from './usePerpsMode';
-import { usePerpsNavigation } from './usePerpsNavigation';
-import { usePerpsWatchlistActions } from './usePerpsWatchlistActions';
-import { createSelectIsWatchlistMarket } from '../selectors/perpsController';
-import { showPerpsModeFlash } from '../utils/perpsModeFlash';
-
-export interface UsePerpsProMarketHeaderActionsParams {
-  /** Market symbol from route params; undefined when the screen is in an error state. */
-  symbol?: string;
-}
-
-export interface UsePerpsProMarketHeaderActionsResult {
-  /** Current Lite/Pro mode for the active-mode pill. */
-  perpsMode: PerpsMode;
-  /** Whether the current market is on the watchlist. */
-  isWatchlist: boolean;
-  handleBackPress: () => void;
-  handleMarketListPress: () => void;
-  handleWalletPress: () => void;
-  handleFavoritePress: () => void;
-  handlePerpsModeChange: (nextMode: PerpsMode) => void;
-}
-
 /**
- * Header action handlers for the Pro market detail screen.
- *
- * Keeps back / market-list / wallet / watchlist / mode-switch wiring out of
- * `PerpsProMarketView` so the screen stays layout-focused and the handlers can
- * be unit-tested in isolation.
+ * @deprecated Import `usePerpsMarketHeaderActions` from `./usePerpsMarketHeaderActions` instead.
  */
-export const usePerpsProMarketHeaderActions = ({
-  symbol,
-}: UsePerpsProMarketHeaderActionsParams): UsePerpsProMarketHeaderActionsResult => {
-  const { navigateBack, navigateToWallet, navigateToMarketList, canGoBack } =
-    usePerpsNavigation();
-  const { mode: perpsMode, setMode: setPerpsMode } = usePerpsMode();
-  const { track } = usePerpsEventTracking();
-  const { addToWatchlist, removeFromWatchlist } = usePerpsWatchlistActions(
-    PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
-  );
-
-  const selectIsWatchlist = useMemo(
-    () => createSelectIsWatchlistMarket(symbol || ''),
-    [symbol],
-  );
-  const isWatchlist = useSelector(selectIsWatchlist);
-
-  const handleBackPress = useCallback(() => {
-    if (canGoBack) {
-      navigateBack();
-    } else {
-      // No back stack (e.g. this is the Pro-mode stack root): "home" while
-      // Pro mode is active is itself a market screen, so falling back to it
-      // here would often be a no-op. Leave Perps entirely instead.
-      navigateToWallet();
-    }
-  }, [canGoBack, navigateBack, navigateToWallet]);
-
-  const handleMarketListPress = useCallback(() => {
-    if (!symbol) {
-      return;
-    }
-
-    track(MetaMetricsEvents.PERPS_UI_INTERACTION, {
-      [PERPS_EVENT_PROPERTY.INTERACTION_TYPE]:
-        PERPS_EVENT_VALUE.INTERACTION_TYPE.BUTTON_CLICKED,
-      [PERPS_EVENT_PROPERTY.BUTTON_CLICKED]:
-        PERPS_EVENT_VALUE.BUTTON_CLICKED.MARKET_LIST,
-      [PERPS_EVENT_PROPERTY.BUTTON_LOCATION]:
-        PERPS_EVENT_VALUE.BUTTON_LOCATION.PERP_MARKET_DETAILS,
-      [PERPS_EVENT_PROPERTY.ASSET]: symbol,
-    });
-
-    navigateToMarketList({
-      source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
-    });
-  }, [symbol, track, navigateToMarketList]);
-
-  const handleWalletPress = useCallback(() => {
-    navigateToWallet();
-  }, [navigateToWallet]);
-
-  const handleFavoritePress = useCallback(() => {
-    if (!symbol) {
-      return;
-    }
-
-    // Fire-and-forget: watchlist actions apply an optimistic Redux update and
-    // swallow their own errors (toast on failure). Do not await here.
-    if (isWatchlist) {
-      // eslint-disable-next-line no-void
-      void removeFromWatchlist(symbol);
-      return;
-    }
-
-    // eslint-disable-next-line no-void
-    void addToWatchlist(symbol);
-  }, [symbol, isWatchlist, addToWatchlist, removeFromWatchlist]);
-
-  const handlePerpsModeChange = useCallback(
-    (nextMode: PerpsMode) => {
-      setPerpsMode(nextMode);
-      showPerpsModeFlash(nextMode);
-    },
-    [setPerpsMode],
-  );
-
-  return {
-    perpsMode,
-    isWatchlist,
-    handleBackPress,
-    handleMarketListPress,
-    handleWalletPress,
-    handleFavoritePress,
-    handlePerpsModeChange,
-  };
-};
-
-export default usePerpsProMarketHeaderActions;
+export {
+  usePerpsMarketHeaderActions as usePerpsProMarketHeaderActions,
+  type UsePerpsMarketHeaderActionsParams as UsePerpsProMarketHeaderActionsParams,
+  type UsePerpsMarketHeaderActionsResult as UsePerpsProMarketHeaderActionsResult,
+  default,
+} from './usePerpsMarketHeaderActions';
diff --git a/app/components/UI/Perps/hooks/usePerpsProOrderEdit.test.tsx b/app/components/UI/Perps/hooks/usePerpsProOrderEdit.test.tsx
new file mode 100644
index 000000000000..0984dc13f263
--- /dev/null
+++ b/app/components/UI/Perps/hooks/usePerpsProOrderEdit.test.tsx
@@ -0,0 +1,479 @@
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react-native';
+import type { Order, OrderResult } from '@metamask/perps-controller';
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { usePerpsProOrderEdit } from './usePerpsProOrderEdit';
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(() => true),
+}));
+
+const mockEditOrder = jest.fn();
+const mockShowToast = jest.fn();
+const mockUpdateOrderOptimistic = jest.fn();
+const mockGetSnapshot = jest.fn(() => null as Order[] | null);
+const mockRunGatedEligibleAction = jest.fn(
+  (_source: string, action: () => void) => action(),
+);
+const mockEditSubmittingToast = jest.fn(() => ({ type: 'edit-submitting' }));
+const mockEditConfirmedToast = jest.fn(() => ({ type: 'edit-confirmed' }));
+const mockEditFailedToast = jest.fn(() => ({ type: 'edit-failed' }));
+
+jest.mock('./usePerpsTrading', () => ({
+  usePerpsTrading: () => ({
+    editOrder: mockEditOrder,
+  }),
+}));
+
+jest.mock('../providers/PerpsStreamManager', () => ({
+  usePerpsStream: () => ({
+    orders: {
+      updateOrderOptimistic: mockUpdateOrderOptimistic,
+      getSnapshot: mockGetSnapshot,
+    },
+  }),
+}));
+
+jest.mock('./usePerpsMarketData', () => ({
+  usePerpsMarketData: () => ({
+    marketData: { szDecimals: 3, maxLeverage: 25 },
+    isLoading: false,
+    error: null,
+  }),
+}));
+
+jest.mock('./stream', () => ({
+  usePerpsLivePositions: () => ({
+    positions: [],
+    isInitialLoading: false,
+  }),
+}));
+
+jest.mock('./usePerpsSelector', () => ({
+  usePerpsSelector: () => undefined,
+}));
+
+jest.mock('./usePerpsToasts', () => ({
+  __esModule: true,
+  default: () => ({
+    showToast: mockShowToast,
+    PerpsToastOptions: {
+      orderManagement: {
+        limit: {
+          editSubmitting: mockEditSubmittingToast,
+          editConfirmed: mockEditConfirmedToast,
+          editFailed: mockEditFailedToast,
+        },
+      },
+    },
+  }),
+}));
+
+jest.mock(
+  '../Views/PerpsProMarketView/components/PerpsProOrderEditSheets',
+  () => {
+    const { View, Pressable, Text } = jest.requireActual('react-native');
+    return function PerpsProOrderEditSheets({
+      editingOrderSheet,
+      editingOrderLeverage,
+      onConfirmPrice,
+      onConfirmSize,
+    }: {
+      editingOrderSheet: 'price' | 'size' | null;
+      editingOrderLeverage: number;
+      onConfirmPrice: (price: string) => void;
+      onConfirmSize: (size: string) => void;
+    }) {
+      if (!editingOrderSheet) {
+        return null;
+      }
+
+      return (
+        <View testID={`perps-order-edit-sheet-${editingOrderSheet}`}>
+          <Text testID="perps-order-edit-leverage">{editingOrderLeverage}</Text>
+          <Pressable
+            testID={`perps-order-edit-confirm-${editingOrderSheet}`}
+            onPress={() =>
+              editingOrderSheet === 'price'
+                ? onConfirmPrice('170')
+                : onConfirmSize('2')
+            }
+          >
+            <Text>Confirm</Text>
+          </Pressable>
+          <Pressable
+            testID={`perps-order-edit-confirm-same-${editingOrderSheet}`}
+            onPress={() =>
+              editingOrderSheet === 'price'
+                ? onConfirmPrice('160.71')
+                : onConfirmSize('1')
+            }
+          >
+            <Text>Confirm same</Text>
+          </Pressable>
+        </View>
+      );
+    };
+  },
+);
+
+const order: Order = {
+  orderId: 'order-1',
+  symbol: 'SOL',
+  side: 'buy',
+  size: '1',
+  originalSize: '1',
+  filledSize: '0',
+  remainingSize: '1',
+  price: '160.71',
+  orderType: 'limit',
+  status: 'open',
+  timestamp: 1_711_756_800_000, // 2024-03-30T00:00:00.000Z — fixed for determinism
+  reduceOnly: false,
+  isTrigger: false,
+};
+
+const EditHarness = ({
+  isMutationBlocked = false,
+  onReady,
+}: {
+  isMutationBlocked?: boolean;
+  onReady: (value: ReturnType<typeof usePerpsProOrderEdit>) => void;
+}) => {
+  const orderEdit = usePerpsProOrderEdit({
+    isMutationBlocked,
+    runGatedEligibleAction: mockRunGatedEligibleAction,
+  });
+
+  React.useEffect(() => {
+    onReady(orderEdit);
+  }, [onReady, orderEdit]);
+
+  return <>{orderEdit.renderOrderEditSheets()}</>;
+};
+
+const renderOrderEditHarness = async (isMutationBlocked = false) => {
+  let orderEdit: ReturnType<typeof usePerpsProOrderEdit> | undefined;
+
+  render(
+    <EditHarness
+      isMutationBlocked={isMutationBlocked}
+      onReady={(readyOrderEdit) => {
+        orderEdit = readyOrderEdit;
+      }}
+    />,
+  );
+
+  await waitFor(() => {
+    expect(orderEdit).toBeDefined();
+  });
+
+  if (!orderEdit) {
+    throw new Error('orderEdit harness failed to initialize');
+  }
+
+  return orderEdit;
+};
+
+const openEditSheet = async (
+  orderEdit: ReturnType<typeof usePerpsProOrderEdit>,
+  field: 'price' | 'size',
+  targetOrder: Order = order,
+) => {
+  await act(async () => {
+    if (field === 'price') {
+      orderEdit.handleEditOrderPrice(targetOrder);
+    } else {
+      orderEdit.handleEditOrderSize(targetOrder);
+    }
+  });
+
+  await waitFor(() => {
+    expect(
+      screen.getByTestId(`perps-order-edit-sheet-${field}`),
+    ).toBeOnTheScreen();
+  });
+};
+
+const confirmEdit = async (field: 'price' | 'size') => {
+  await act(async () => {
+    fireEvent.press(screen.getByTestId(`perps-order-edit-confirm-${field}`));
+  });
+};
+
+describe('usePerpsProOrderEdit', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useSelector as jest.Mock).mockReturnValue(true);
+    mockEditOrder.mockResolvedValue({ success: true });
+    mockGetSnapshot.mockReturnValue(null);
+  });
+
+  it('forwards the effective leverage to the edit sheets', async () => {
+    const orderEdit = await renderOrderEditHarness();
+
+    await openEditSheet(orderEdit, 'size');
+
+    expect(screen.getByTestId('perps-order-edit-leverage')).toHaveTextContent(
+      '25',
+    );
+  });
+
+  it.each(['price', 'size'] as const)(
+    'submits a %s edit through the shared flow',
+    async (field) => {
+      const orderEdit = await renderOrderEditHarness();
+
+      await openEditSheet(orderEdit, field);
+      await confirmEdit(field);
+
+      expect(mockUpdateOrderOptimistic).toHaveBeenCalledWith(
+        order.orderId,
+        field === 'price' ? { limitPrice: '170' } : { size: '2' },
+      );
+      expect(mockEditOrder).toHaveBeenCalledWith(
+        expect.objectContaining({
+          orderId: order.orderId,
+          watchPriceUpdate: field === 'price',
+          newOrder: expect.objectContaining({
+            symbol: order.symbol,
+            orderType: 'limit',
+            ...(field === 'price' ? { price: '170' } : { size: '2' }),
+          }),
+        }),
+      );
+      expect(mockEditSubmittingToast).toHaveBeenCalled();
+      expect(mockEditConfirmedToast).toHaveBeenCalled();
+      expect(mockEditFailedToast).not.toHaveBeenCalled();
+    },
+  );
+
+  it.each(['price', 'size'] as const)(
+    'rolls back optimistic %s edit when editOrder fails',
+    async (field) => {
+      mockEditOrder.mockResolvedValue({ success: false, error: 'edit failed' });
+      const orderEdit = await renderOrderEditHarness();
+
+      await openEditSheet(orderEdit, field);
+      await confirmEdit(field);
+
+      await waitFor(() => {
+        expect(mockEditOrder).toHaveBeenCalled();
+      });
+
+      expect(mockUpdateOrderOptimistic).toHaveBeenNthCalledWith(
+        1,
+        order.orderId,
+        field === 'price' ? { limitPrice: '170' } : { size: '2' },
+      );
+      expect(mockUpdateOrderOptimistic).toHaveBeenNthCalledWith(
+        2,
+        order.orderId,
+        field === 'price' ? { limitPrice: order.price } : { size: '1' },
+      );
+      expect(mockEditFailedToast).toHaveBeenCalled();
+      expect(mockEditConfirmedToast).not.toHaveBeenCalled();
+    },
+  );
+
+  it.each(['price', 'size'] as const)(
+    'rolls back optimistic %s edit when editOrder throws',
+    async (field) => {
+      mockEditOrder.mockRejectedValue(new Error('network error'));
+      const orderEdit = await renderOrderEditHarness();
+
+      await openEditSheet(orderEdit, field);
+      await confirmEdit(field);
+
+      await waitFor(() => {
+        expect(mockEditOrder).toHaveBeenCalled();
+      });
+
+      expect(mockUpdateOrderOptimistic).toHaveBeenNthCalledWith(
+        1,
+        order.orderId,
+        field === 'price' ? { limitPrice: '170' } : { size: '2' },
+      );
+      expect(mockUpdateOrderOptimistic).toHaveBeenNthCalledWith(
+        2,
+        order.orderId,
+        field === 'price' ? { limitPrice: order.price } : { size: '1' },
+      );
+      expect(mockEditFailedToast).toHaveBeenCalled();
+      expect(mockEditConfirmedToast).not.toHaveBeenCalled();
+    },
+  );
+
+  it('ignores a second confirm tap while an edit is in flight', async () => {
+    let resolveEdit: (value: OrderResult) => void = () => undefined;
+    mockEditOrder.mockImplementation(
+      () =>
+        new Promise<OrderResult>((resolve) => {
+          resolveEdit = resolve;
+        }),
+    );
+    const orderEdit = await renderOrderEditHarness();
+    await openEditSheet(orderEdit, 'price');
+
+    // Two presses fired without an intervening await: both reuse the same
+    // `editingOrder` closure before React flushes the state update from the
+    // first tap, which is exactly the race the isSubmittingEditRef guards.
+    await act(async () => {
+      fireEvent.press(screen.getByTestId('perps-order-edit-confirm-price'));
+      fireEvent.press(screen.getByTestId('perps-order-edit-confirm-price'));
+    });
+
+    expect(mockEditOrder).toHaveBeenCalledTimes(1);
+
+    await act(async () => {
+      resolveEdit({ success: true, orderId: order.orderId });
+    });
+  });
+
+  it('closes the sheet without submitting when the value is unchanged', async () => {
+    const orderEdit = await renderOrderEditHarness();
+    await openEditSheet(orderEdit, 'price');
+
+    await act(async () => {
+      fireEvent.press(
+        screen.getByTestId('perps-order-edit-confirm-same-price'),
+      );
+    });
+
+    expect(mockEditOrder).not.toHaveBeenCalled();
+    expect(mockUpdateOrderOptimistic).not.toHaveBeenCalled();
+    await waitFor(() => {
+      expect(
+        screen.queryByTestId('perps-order-edit-sheet-price'),
+      ).not.toBeOnTheScreen();
+    });
+  });
+
+  it('does not open the sheet when a mutation is blocked', async () => {
+    const orderEdit = await renderOrderEditHarness(true);
+
+    await act(async () => {
+      orderEdit.handleEditOrderPrice(order);
+    });
+
+    expect(
+      screen.queryByTestId('perps-order-edit-sheet-price'),
+    ).not.toBeOnTheScreen();
+    expect(mockRunGatedEligibleAction).not.toHaveBeenCalled();
+  });
+
+  it('aborts confirm when a mutation becomes blocked while the sheet is open', async () => {
+    let orderEdit: ReturnType<typeof usePerpsProOrderEdit> | undefined;
+    const { rerender } = render(
+      <EditHarness
+        isMutationBlocked={false}
+        onReady={(readyOrderEdit) => {
+          orderEdit = readyOrderEdit;
+        }}
+      />,
+    );
+
+    await waitFor(() => {
+      expect(orderEdit).toBeDefined();
+    });
+    if (!orderEdit) {
+      throw new Error('orderEdit harness failed to initialize');
+    }
+
+    await openEditSheet(orderEdit, 'price');
+
+    rerender(
+      <EditHarness
+        isMutationBlocked
+        onReady={(readyOrderEdit) => {
+          orderEdit = readyOrderEdit;
+        }}
+      />,
+    );
+
+    await waitFor(() => {
+      expect(orderEdit).toBeDefined();
+    });
+    await confirmEdit('price');
+
+    expect(mockEditOrder).not.toHaveBeenCalled();
+    expect(mockUpdateOrderOptimistic).not.toHaveBeenCalled();
+    await waitFor(() => {
+      expect(
+        screen.queryByTestId('perps-order-edit-sheet-price'),
+      ).not.toBeOnTheScreen();
+    });
+  });
+
+  it('does not open the size sheet for orders with attached TP/SL', async () => {
+    const orderEdit = await renderOrderEditHarness();
+    const orderWithTpSl: Order = {
+      ...order,
+      takeProfitPrice: '200',
+      stopLossPrice: '100',
+    };
+
+    await act(async () => {
+      orderEdit.handleEditOrderSize(orderWithTpSl);
+    });
+
+    expect(
+      screen.queryByTestId('perps-order-edit-sheet-size'),
+    ).not.toBeOnTheScreen();
+    expect(mockRunGatedEligibleAction).not.toHaveBeenCalled();
+  });
+
+  it('re-checks live order eligibility from the stream snapshot on confirm', async () => {
+    mockGetSnapshot.mockReturnValue([
+      {
+        ...order,
+        filledSize: '0.5',
+        remainingSize: '0.5',
+      },
+    ]);
+    const orderEdit = await renderOrderEditHarness();
+    await openEditSheet(orderEdit, 'price');
+    await confirmEdit('price');
+
+    expect(mockEditOrder).not.toHaveBeenCalled();
+    expect(mockUpdateOrderOptimistic).not.toHaveBeenCalled();
+  });
+
+  it('aborts confirm when the order is absent from a loaded snapshot', async () => {
+    // Snapshot exists but the editing order was cancelled/filled while open —
+    // must not fall back to the stale open-time editingOrder and submit.
+    mockGetSnapshot.mockReturnValue([]);
+    const orderEdit = await renderOrderEditHarness();
+    await openEditSheet(orderEdit, 'price');
+    await confirmEdit('price');
+
+    expect(mockEditOrder).not.toHaveBeenCalled();
+    expect(mockUpdateOrderOptimistic).not.toHaveBeenCalled();
+    await waitFor(() => {
+      expect(
+        screen.queryByTestId('perps-order-edit-sheet-price'),
+      ).not.toBeOnTheScreen();
+    });
+  });
+
+  it('submits using the open-time order when the stream snapshot is unavailable', async () => {
+    mockGetSnapshot.mockReturnValue(null);
+    const orderEdit = await renderOrderEditHarness();
+    await openEditSheet(orderEdit, 'price');
+    await confirmEdit('price');
+
+    expect(mockEditOrder).toHaveBeenCalledWith(
+      expect.objectContaining({
+        orderId: order.orderId,
+        newOrder: expect.objectContaining({ price: '170' }),
+      }),
+    );
+  });
+});
diff --git a/app/components/UI/Perps/hooks/usePerpsProOrderEdit.tsx b/app/components/UI/Perps/hooks/usePerpsProOrderEdit.tsx
new file mode 100644
index 000000000000..1194fc4111b6
--- /dev/null
+++ b/app/components/UI/Perps/hooks/usePerpsProOrderEdit.tsx
@@ -0,0 +1,329 @@
+import {
+  DECIMAL_PRECISION_CONFIG,
+  PERPS_CONSTANTS,
+  PERPS_EVENT_VALUE,
+  selectTradeConfiguration,
+  type Order,
+} from '@metamask/perps-controller';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
+import PerpsProOrderEditSheets from '../Views/PerpsProMarketView/components/PerpsProOrderEditSheets';
+import { usePerpsStream } from '../providers/PerpsStreamManager';
+import {
+  buildOrderEditParams,
+  buildOrderOptimisticEdit,
+  getOrderEditConfirmedSize,
+  getOrderEditMarketPrice,
+  getOrderEditPreviousValue,
+  hasOrderEditValueChanged,
+  type OrderEditField,
+} from '../utils/orderEditUtils';
+import {
+  getOrderPositionDirection,
+  isLimitOrderEditable,
+  isLimitOrderSizeEditable,
+} from '../utils/orderUtils';
+import { usePerpsLivePositions } from './stream';
+import { usePerpsMarketData } from './usePerpsMarketData';
+import { usePerpsSelector } from './usePerpsSelector';
+import { usePerpsTrading } from './usePerpsTrading';
+import usePerpsToasts from './usePerpsToasts';
+
+const PRO_MARKET_SOURCE = PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN;
+
+export interface UsePerpsProOrderEditParams {
+  isMutationBlocked: boolean;
+  runGatedEligibleAction: (
+    source: string,
+    action: () => void | Promise<void>,
+  ) => void;
+}
+
+export interface UsePerpsProOrderEditReturn {
+  editingOrderId: string | null;
+  isOrderEditable: (order: Order) => boolean;
+  isOrderSizeEditable: (order: Order) => boolean;
+  handleEditOrderPrice: (order: Order) => void;
+  handleEditOrderSize: (order: Order) => void;
+  renderOrderEditSheets: () => React.ReactNode;
+}
+
+const isFieldEditable = (order: Order, field: OrderEditField): boolean =>
+  field === 'price'
+    ? isLimitOrderEditable(order)
+    : isLimitOrderSizeEditable(order);
+
+/**
+ * Shared Pro open-order edit flow for limit price and size.
+ */
+export const usePerpsProOrderEdit = ({
+  isMutationBlocked,
+  runGatedEligibleAction,
+}: UsePerpsProOrderEditParams): UsePerpsProOrderEditReturn => {
+  const { editOrder } = usePerpsTrading();
+  const stream = usePerpsStream();
+  const { showToast, PerpsToastOptions } = usePerpsToasts();
+
+  const [editingOrder, setEditingOrder] = useState<Order | null>(null);
+  const [editingOrderSheet, setEditingOrderSheet] =
+    useState<OrderEditField | null>(null);
+  const [editingOrderId, setEditingOrderId] = useState<string | null>(null);
+  // React state updates are batched/async, so a fast double-tap on confirm can
+  // re-enter handleConfirmEdit before editingOrderId reflects the first call.
+  // This ref is set synchronously to block that race regardless of render timing.
+  const isSubmittingEditRef = useRef(false);
+
+  const {
+    marketData: editingOrderMarketData,
+    isLoading: isEditingOrderMarketDataLoading,
+  } = usePerpsMarketData(editingOrder?.symbol ?? '');
+  const isEditingOrderMarketDataReady =
+    Boolean(editingOrderMarketData) && !isEditingOrderMarketDataLoading;
+  // Only expose real market precision/leverage once loaded — fallbacks are
+  // more permissive (decimals) or stricter (leverage) than most markets and
+  // must not drive keypad/confirm while loading.
+  const editingOrderSzDecimals = isEditingOrderMarketDataReady
+    ? (editingOrderMarketData?.szDecimals ??
+      DECIMAL_PRECISION_CONFIG.FallbackSizeDecimals)
+    : DECIMAL_PRECISION_CONFIG.FallbackSizeDecimals;
+  const editingOrderMaxLeverage = isEditingOrderMarketDataReady
+    ? (editingOrderMarketData?.maxLeverage ??
+      PERPS_CONSTANTS.DefaultMaxLeverage)
+    : PERPS_CONSTANTS.DefaultMaxLeverage;
+
+  // Prefer position leverage, then saved trade-config leverage, then market max.
+  // Max alone understates required margin when the user trades below the cap.
+  const { positions } = usePerpsLivePositions({ throttleMs: 1000 });
+  const savedTradeConfig = usePerpsSelector((state) =>
+    selectTradeConfiguration(state, editingOrder?.symbol ?? ''),
+  );
+  const editingOrderLeverage = useMemo(() => {
+    const symbol = editingOrder?.symbol;
+    if (!symbol) {
+      return editingOrderMaxLeverage;
+    }
+    const positionLeverage = positions.find((p) => p.symbol === symbol)
+      ?.leverage?.value;
+    if (typeof positionLeverage === 'number' && positionLeverage > 0) {
+      return positionLeverage;
+    }
+    const configLeverage = savedTradeConfig?.leverage;
+    if (typeof configLeverage === 'number' && configLeverage > 0) {
+      return configLeverage;
+    }
+    return editingOrderMaxLeverage;
+  }, [
+    editingOrder?.symbol,
+    editingOrderMaxLeverage,
+    positions,
+    savedTradeConfig?.leverage,
+  ]);
+
+  const isOrderEditable = useCallback(
+    (order: Order) => isLimitOrderEditable(order),
+    [],
+  );
+
+  const isOrderSizeEditable = useCallback(
+    (order: Order) => isLimitOrderSizeEditable(order),
+    [],
+  );
+
+  const closeEditSheet = useCallback(() => {
+    setEditingOrder(null);
+    setEditingOrderSheet(null);
+  }, []);
+
+  const openEditSheet = useCallback(
+    (order: Order, field: OrderEditField) => {
+      if (
+        !isFieldEditable(order, field) ||
+        isMutationBlocked ||
+        editingOrderId
+      ) {
+        return;
+      }
+
+      runGatedEligibleAction(
+        PERPS_EVENT_VALUE.SOURCE.MODIFY_POSITION_ACTION,
+        () => {
+          setEditingOrder(order);
+          setEditingOrderSheet(field);
+        },
+      );
+    },
+    [editingOrderId, isMutationBlocked, runGatedEligibleAction],
+  );
+
+  const handleEditOrderPrice = useCallback(
+    (order: Order) => openEditSheet(order, 'price'),
+    [openEditSheet],
+  );
+
+  const handleEditOrderSize = useCallback(
+    (order: Order) => openEditSheet(order, 'size'),
+    [openEditSheet],
+  );
+
+  const handleConfirmEdit = useCallback(
+    async (field: OrderEditField, newValue: string) => {
+      if (isSubmittingEditRef.current) {
+        return;
+      }
+
+      if (!editingOrder) {
+        return;
+      }
+
+      // Cancel (or another mutation) in flight — do not race editOrder against it.
+      if (isMutationBlocked || editingOrderId) {
+        closeEditSheet();
+        return;
+      }
+
+      // Re-read live order state at confirm — the sheet seed is a snapshot from
+      // open time and can miss partial fills / cancels that arrived while open.
+      const snapshot = stream.orders.getSnapshot?.() ?? null;
+      const liveOrder = snapshot?.find(
+        (cachedOrder) => cachedOrder.orderId === editingOrder.orderId,
+      );
+
+      // Snapshot loaded and order absent → cancelled/filled while sheet was open.
+      if (snapshot !== null && !liveOrder) {
+        closeEditSheet();
+        return;
+      }
+
+      const orderToEdit = liveOrder ?? editingOrder;
+      if (!isFieldEditable(orderToEdit, field)) {
+        closeEditSheet();
+        return;
+      }
+
+      if (!hasOrderEditValueChanged(orderToEdit, field, newValue)) {
+        closeEditSheet();
+        return;
+      }
+
+      const orderDirection = getOrderPositionDirection(orderToEdit);
+      const previousValue = getOrderEditPreviousValue(orderToEdit, field);
+      const optimisticEdit = buildOrderOptimisticEdit(field, newValue);
+
+      isSubmittingEditRef.current = true;
+      closeEditSheet();
+      setEditingOrderId(orderToEdit.orderId);
+      stream.orders.updateOrderOptimistic(orderToEdit.orderId, optimisticEdit);
+      showToast(PerpsToastOptions.orderManagement.limit.editSubmitting());
+
+      try {
+        const result = await editOrder({
+          orderId: orderToEdit.orderId,
+          newOrder: buildOrderEditParams(
+            orderToEdit,
+            field,
+            newValue,
+            editingOrderLeverage,
+            {
+              totalFee: 0,
+              marketPrice: getOrderEditMarketPrice(
+                orderToEdit,
+                field,
+                newValue,
+              ),
+              source: PRO_MARKET_SOURCE,
+            },
+          ),
+          // Size-only edits still send price (venue needs it) but the price
+          // does not change — skip the ORDER_PRICE_UPDATED watcher so CUF
+          // does not end on an unrelated orders refresh.
+          watchPriceUpdate: field === 'price',
+        });
+
+        if (result.success) {
+          showToast(
+            PerpsToastOptions.orderManagement.limit.editConfirmed(
+              orderDirection,
+              getOrderEditConfirmedSize(orderToEdit, field, newValue),
+              orderToEdit.symbol,
+            ),
+          );
+        } else {
+          if (previousValue) {
+            stream.orders.updateOrderOptimistic(
+              orderToEdit.orderId,
+              buildOrderOptimisticEdit(field, previousValue),
+            );
+          }
+          showToast(
+            PerpsToastOptions.orderManagement.limit.editFailed(result.error),
+          );
+        }
+      } catch {
+        if (previousValue) {
+          stream.orders.updateOrderOptimistic(
+            orderToEdit.orderId,
+            buildOrderOptimisticEdit(field, previousValue),
+          );
+        }
+        showToast(PerpsToastOptions.orderManagement.limit.editFailed());
+      } finally {
+        setEditingOrderId(null);
+        isSubmittingEditRef.current = false;
+      }
+    },
+    [
+      closeEditSheet,
+      editOrder,
+      editingOrder,
+      editingOrderId,
+      editingOrderLeverage,
+      isMutationBlocked,
+      PerpsToastOptions,
+      showToast,
+      stream,
+    ],
+  );
+
+  const handleConfirmEditPrice = useCallback(
+    (newLimitPrice: string) => handleConfirmEdit('price', newLimitPrice),
+    [handleConfirmEdit],
+  );
+
+  const handleConfirmEditSize = useCallback(
+    (newSize: string) => handleConfirmEdit('size', newSize),
+    [handleConfirmEdit],
+  );
+
+  const renderOrderEditSheets = useCallback(
+    () => (
+      <PerpsProOrderEditSheets
+        editingOrder={editingOrder}
+        editingOrderSheet={editingOrderSheet}
+        editingOrderSzDecimals={editingOrderSzDecimals}
+        editingOrderLeverage={editingOrderLeverage}
+        isEditingOrderMarketDataReady={isEditingOrderMarketDataReady}
+        onClose={closeEditSheet}
+        onConfirmPrice={handleConfirmEditPrice}
+        onConfirmSize={handleConfirmEditSize}
+      />
+    ),
+    [
+      closeEditSheet,
+      editingOrder,
+      editingOrderSheet,
+      editingOrderSzDecimals,
+      editingOrderLeverage,
+      handleConfirmEditPrice,
+      handleConfirmEditSize,
+      isEditingOrderMarketDataReady,
+    ],
+  );
+
+  return {
+    editingOrderId,
+    isOrderEditable,
+    isOrderSizeEditable,
+    handleEditOrderPrice,
+    handleEditOrderSize,
+    renderOrderEditSheets,
+  };
+};
diff --git a/app/components/UI/Perps/hooks/usePerpsProPositionsPanelActions.tsx b/app/components/UI/Perps/hooks/usePerpsProPositionsPanelActions.tsx
new file mode 100644
index 000000000000..a9db5a42515a
--- /dev/null
+++ b/app/components/UI/Perps/hooks/usePerpsProPositionsPanelActions.tsx
@@ -0,0 +1,430 @@
+import type { BottomSheetRef } from '@metamask/design-system-react-native';
+import {
+  PERPS_EVENT_PROPERTY,
+  PERPS_EVENT_VALUE,
+  type Order,
+  type Position,
+  type TPSLTrackingData,
+} from '@metamask/perps-controller';
+import { useNavigation } from '@react-navigation/native';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import PerpsProPositionsModalPortal from '../Views/PerpsProMarketView/components/PerpsProPositionsModalPortal';
+import { useSelector } from 'react-redux';
+import Routes from '../../../../constants/navigation/Routes';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
+import type { AppNavigationProp } from '../../../../core/NavigationService/types';
+import { selectSelectedInternalAccountAddress } from '../../../../selectors/accountsController';
+import { useComplianceGate } from '../../Compliance';
+import PerpsBottomSheetTooltip from '../components/PerpsBottomSheetTooltip';
+import PerpsFlipPositionConfirmSheet from '../components/PerpsFlipPositionConfirmSheet/PerpsFlipPositionConfirmSheet';
+import { selectPerpsEligibility } from '../selectors/perpsController';
+import { toPerpsEntryAttribution } from '../utils/perpsAnalyticsAttribution';
+import {
+  getOrderPositionDirection,
+  getValidOrderPrice,
+  getValidTriggerPrice,
+  isSyntheticOrderCancelable,
+} from '../utils/orderUtils';
+import PerpsCloseAllPositionsView from '../Views/PerpsCloseAllPositionsView/PerpsCloseAllPositionsView';
+import PerpsSelectAdjustMarginActionView from '../Views/PerpsSelectAdjustMarginActionView/PerpsSelectAdjustMarginActionView';
+import { usePerpsEventTracking } from './usePerpsEventTracking';
+import { usePerpsNavigation } from './usePerpsNavigation';
+import { usePerpsProOrderEdit } from './usePerpsProOrderEdit';
+import { usePerpsTPSLUpdate } from './usePerpsTPSLUpdate';
+import { usePerpsTrading } from './usePerpsTrading';
+import usePerpsToasts from './usePerpsToasts';
+
+const PRO_MARKET_SOURCE = PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN;
+const PRO_MARKET_BUTTON_LOCATION =
+  PERPS_EVENT_VALUE.BUTTON_LOCATION.PERP_MARKET_DETAILS;
+
+const getPositionMarkPrice = (position: Position): string => {
+  const absoluteSize = Math.abs(parseFloat(position.size));
+  if (absoluteSize <= 0) {
+    return '0';
+  }
+
+  const markPriceNum = parseFloat(position.positionValue) / absoluteSize;
+  return Number.isFinite(markPriceNum) ? markPriceNum.toString() : '0';
+};
+
+export interface UsePerpsProPositionsPanelActionsReturn {
+  handleClosePosition: (position: Position) => void;
+  handleReversePosition: (position: Position) => void;
+  handleSharePosition: (position: Position) => void;
+  handleEditPositionTpSl: (position: Position) => void;
+  handleEditPositionMargin: (position: Position) => void;
+  isPositionMarginEditable: (position: Position) => boolean;
+  handleCancelOrder: (order: Order) => Promise<void>;
+  handleEditOrderPrice: (order: Order) => void;
+  handleEditOrderSize: (order: Order) => void;
+  handleCloseAllPress: () => void;
+  cancelingOrderId: string | null;
+  editingOrderId: string | null;
+  isOrderCancelable: (order: Order) => boolean;
+  isOrderEditable: (order: Order) => boolean;
+  isOrderSizeEditable: (order: Order) => boolean;
+  renderActionSheets: (filteredPositions?: Position[]) => React.ReactNode;
+}
+
+/**
+ * Wires Pro positions/orders panel actions to existing Perps flows.
+ */
+export const usePerpsProPositionsPanelActions =
+  (): UsePerpsProPositionsPanelActionsReturn => {
+    const navigation = useNavigation<AppNavigationProp>();
+    const { navigateToClosePosition } = usePerpsNavigation();
+    const isEligible = useSelector(selectPerpsEligibility);
+    const selectedAddress = useSelector(selectSelectedInternalAccountAddress);
+    const { gate } = useComplianceGate(selectedAddress ?? '');
+    const { track } = usePerpsEventTracking();
+    const { cancelOrder } = usePerpsTrading();
+    const { handleUpdateTPSL } = usePerpsTPSLUpdate();
+    const { showToast, PerpsToastOptions } = usePerpsToasts();
+
+    const [showCloseAllSheet, setShowCloseAllSheet] = useState(false);
+    const [reversePosition, setReversePosition] = useState<Position | null>(
+      null,
+    );
+    const [adjustMarginPosition, setAdjustMarginPosition] =
+      useState<Position | null>(null);
+    const [isGeoBlockVisible, setIsGeoBlockVisible] = useState(false);
+    const [cancelingOrderId, setCancelingOrderId] = useState<string | null>(
+      null,
+    );
+
+    const closeAllSheetRef = useRef<BottomSheetRef>(null);
+    const reversePositionSheetRef = useRef<BottomSheetRef>(null);
+    const adjustMarginSheetRef = useRef<BottomSheetRef>(null);
+
+    const closeGeoBlockModal = useCallback(() => {
+      setIsGeoBlockVisible(false);
+    }, []);
+
+    const showGeoBlockForSource = useCallback(
+      (source: string) => {
+        track(MetaMetricsEvents.PERPS_SCREEN_VIEWED, {
+          [PERPS_EVENT_PROPERTY.SCREEN_TYPE]:
+            PERPS_EVENT_VALUE.SCREEN_TYPE.GEO_BLOCK_NOTIF,
+          [PERPS_EVENT_PROPERTY.SOURCE]: source,
+        });
+        setIsGeoBlockVisible(true);
+      },
+      [track],
+    );
+
+    const runGatedEligibleAction = useCallback(
+      (source: string, action: () => void | Promise<void>) => {
+        gate(async () => {
+          if (!isEligible) {
+            showGeoBlockForSource(source);
+            return;
+          }
+
+          await action();
+        });
+      },
+      [gate, isEligible, showGeoBlockForSource],
+    );
+
+    const {
+      editingOrderId,
+      isOrderEditable,
+      isOrderSizeEditable,
+      handleEditOrderPrice,
+      handleEditOrderSize,
+      renderOrderEditSheets,
+    } = usePerpsProOrderEdit({
+      isMutationBlocked: Boolean(cancelingOrderId),
+      runGatedEligibleAction,
+    });
+
+    const handleCloseAllSheetClose = useCallback(() => {
+      setShowCloseAllSheet(false);
+    }, []);
+
+    const handleReverseSheetClose = useCallback(() => {
+      setReversePosition(null);
+    }, []);
+
+    const handleAdjustMarginSheetClose = useCallback(() => {
+      setAdjustMarginPosition(null);
+    }, []);
+
+    useEffect(() => {
+      if (showCloseAllSheet) {
+        closeAllSheetRef.current?.onOpenBottomSheet();
+      }
+    }, [showCloseAllSheet]);
+
+    useEffect(() => {
+      if (reversePosition) {
+        reversePositionSheetRef.current?.onOpenBottomSheet();
+      }
+    }, [reversePosition]);
+
+    useEffect(() => {
+      if (adjustMarginPosition) {
+        adjustMarginSheetRef.current?.onOpenBottomSheet();
+      }
+    }, [adjustMarginPosition]);
+
+    const handleClosePosition = useCallback(
+      (position: Position) => {
+        runGatedEligibleAction(
+          PERPS_EVENT_VALUE.SOURCE.CLOSE_POSITION_ACTION,
+          () =>
+            navigateToClosePosition(position, PRO_MARKET_SOURCE, {
+              buttonClicked: PERPS_EVENT_VALUE.BUTTON_CLICKED.CLOSE,
+              buttonLocation: PRO_MARKET_BUTTON_LOCATION,
+            }),
+        );
+      },
+      [navigateToClosePosition, runGatedEligibleAction],
+    );
+
+    const handleReversePosition = useCallback(
+      (position: Position) => {
+        runGatedEligibleAction(
+          PERPS_EVENT_VALUE.SOURCE.MODIFY_POSITION_ACTION,
+          () => setReversePosition(position),
+        );
+      },
+      [runGatedEligibleAction],
+    );
+
+    const handleSharePosition = useCallback(
+      (position: Position) => {
+        navigation.navigate(Routes.PERPS.PNL_HERO_CARD, {
+          position,
+          marketPrice: getPositionMarkPrice(position),
+        });
+      },
+      [navigation],
+    );
+
+    const handleEditPositionTpSl = useCallback(
+      (position: Position) => {
+        runGatedEligibleAction(
+          PERPS_EVENT_VALUE.SOURCE.AUTO_CLOSE_ACTION,
+          () => {
+            const markPrice = parseFloat(getPositionMarkPrice(position));
+            const currentPrice =
+              Number.isFinite(markPrice) && markPrice > 0
+                ? markPrice
+                : parseFloat(position.entryPrice);
+
+            navigation.navigate(Routes.PERPS.TPSL, {
+              asset: position.symbol,
+              currentPrice,
+              position,
+              initialTakeProfitPrice: position.takeProfitPrice,
+              initialStopLossPrice: position.stopLossPrice,
+              leverage: position.leverage.value,
+              onConfirm: async (
+                positionFromRoute?: Position,
+                takeProfitPrice?: string,
+                stopLossPrice?: string,
+                trackingData?: TPSLTrackingData,
+              ) => {
+                const positionToUse = positionFromRoute ?? position;
+                return handleUpdateTPSL(
+                  positionToUse,
+                  takeProfitPrice,
+                  stopLossPrice,
+                  trackingData,
+                );
+              },
+            });
+          },
+        );
+      },
+      [handleUpdateTPSL, navigation, runGatedEligibleAction],
+    );
+
+    const isPositionMarginEditable = useCallback(
+      (position: Position) => position.leverage.type === 'isolated',
+      [],
+    );
+
+    const handleEditPositionMargin = useCallback(
+      (position: Position) => {
+        if (!isPositionMarginEditable(position)) {
+          return;
+        }
+
+        runGatedEligibleAction(
+          PERPS_EVENT_VALUE.SOURCE.ADJUST_MARGIN_ACTION,
+          () => setAdjustMarginPosition(position),
+        );
+      },
+      [isPositionMarginEditable, runGatedEligibleAction],
+    );
+
+    const isOrderCancelable = useCallback(
+      (order: Order) => isSyntheticOrderCancelable(order),
+      [],
+    );
+
+    const handleCancelOrder = useCallback(
+      async (order: Order) => {
+        // Mirror openEditSheet: block cancel while another cancel or edit is in flight.
+        if (!isOrderCancelable(order) || cancelingOrderId || editingOrderId) {
+          return;
+        }
+
+        setCancelingOrderId(order.orderId);
+
+        const orderDirection = getOrderPositionDirection(order);
+        const effectivePrice =
+          getValidOrderPrice(order) ?? getValidTriggerPrice(order);
+
+        showToast(
+          PerpsToastOptions.orderManagement.shared.cancellationInProgress(
+            orderDirection,
+            order.size,
+            order.symbol,
+            order.orderType,
+          ),
+        );
+
+        try {
+          const result = await cancelOrder({
+            orderId: order.orderId,
+            symbol: order.symbol,
+            trackingData: {
+              totalFee: 0,
+              marketPrice: effectivePrice ?? 0,
+              source: PRO_MARKET_SOURCE,
+              ...toPerpsEntryAttribution({
+                source: PRO_MARKET_SOURCE,
+              }),
+            },
+          });
+
+          if (result.success) {
+            showToast(
+              PerpsToastOptions.orderManagement.shared.cancellationSuccess(
+                order.reduceOnly,
+                order.orderType,
+                orderDirection,
+                order.size,
+                order.symbol,
+              ),
+            );
+          } else {
+            showToast(
+              PerpsToastOptions.orderManagement.shared.cancellationFailed,
+            );
+          }
+        } catch {
+          showToast(
+            PerpsToastOptions.orderManagement.shared.cancellationFailed,
+          );
+        } finally {
+          setCancelingOrderId(null);
+        }
+      },
+      [
+        PerpsToastOptions,
+        cancelOrder,
+        cancelingOrderId,
+        editingOrderId,
+        isOrderCancelable,
+        showToast,
+      ],
+    );
+
+    const handleCloseAllPress = useCallback(() => {
+      runGatedEligibleAction(
+        PERPS_EVENT_VALUE.SOURCE.CLOSE_ALL_POSITIONS_BUTTON,
+        () => setShowCloseAllSheet(true),
+      );
+    }, [runGatedEligibleAction]);
+
+    const renderActionSheets = useCallback(
+      (filteredPositions?: Position[]) => (
+        <>
+          {showCloseAllSheet && (
+            <PerpsProPositionsModalPortal
+              onRequestClose={handleCloseAllSheetClose}
+            >
+              <PerpsCloseAllPositionsView
+                sheetRef={closeAllSheetRef}
+                onClose={handleCloseAllSheetClose}
+                positions={filteredPositions}
+              />
+            </PerpsProPositionsModalPortal>
+          )}
+
+          {reversePosition && (
+            <PerpsProPositionsModalPortal
+              onRequestClose={handleReverseSheetClose}
+            >
+              <PerpsFlipPositionConfirmSheet
+                position={reversePosition}
+                sheetRef={reversePositionSheetRef}
+                onClose={handleReverseSheetClose}
+                onConfirm={handleReverseSheetClose}
+              />
+            </PerpsProPositionsModalPortal>
+          )}
+
+          {adjustMarginPosition && (
+            <PerpsProPositionsModalPortal
+              onRequestClose={handleAdjustMarginSheetClose}
+            >
+              <PerpsSelectAdjustMarginActionView
+                sheetRef={adjustMarginSheetRef}
+                position={adjustMarginPosition}
+                onClose={handleAdjustMarginSheetClose}
+              />
+            </PerpsProPositionsModalPortal>
+          )}
+
+          {renderOrderEditSheets()}
+
+          {isGeoBlockVisible && (
+            <PerpsProPositionsModalPortal onRequestClose={closeGeoBlockModal}>
+              <PerpsBottomSheetTooltip
+                isVisible
+                onClose={closeGeoBlockModal}
+                contentKey="geo_block"
+                testID="perps-pro-positions-panel-geo-block-tooltip"
+              />
+            </PerpsProPositionsModalPortal>
+          )}
+        </>
+      ),
+      [
+        adjustMarginPosition,
+        closeGeoBlockModal,
+        handleAdjustMarginSheetClose,
+        handleCloseAllSheetClose,
+        handleReverseSheetClose,
+        isGeoBlockVisible,
+        renderOrderEditSheets,
+        reversePosition,
+        showCloseAllSheet,
+      ],
+    );
+
+    return {
+      handleClosePosition,
+      handleReversePosition,
+      handleSharePosition,
+      handleEditPositionTpSl,
+      handleEditPositionMargin,
+      handleCancelOrder,
+      handleEditOrderPrice,
+      handleEditOrderSize,
+      handleCloseAllPress,
+      cancelingOrderId,
+      editingOrderId,
+      isOrderCancelable,
+      isOrderEditable,
+      isOrderSizeEditable,
+      isPositionMarginEditable,
+      renderActionSheets,
+    };
+  };
diff --git a/app/components/UI/Perps/hooks/usePerpsTPSLForm.ts b/app/components/UI/Perps/hooks/usePerpsTPSLForm.ts
index 3d6fa74c9d4b..f1c1ba3bf3f8 100644
--- a/app/components/UI/Perps/hooks/usePerpsTPSLForm.ts
+++ b/app/components/UI/Perps/hooks/usePerpsTPSLForm.ts
@@ -6,6 +6,7 @@ import { regex } from '../../../../util/regex';
 import {
   DECIMAL_PRECISION_CONFIG,
   calculatePositionSize,
+  type OrderType,
   type Position,
 } from '@metamask/perps-controller';
 import { formatPerpsFiat, PRICE_RANGES_UNIVERSAL } from '../utils/formatUtils';
@@ -40,7 +41,7 @@ interface UsePerpsTPSLFormParams {
   entryPrice?: number;
   isVisible?: boolean;
   liquidationPrice?: string;
-  orderType?: 'market' | 'limit';
+  orderType?: OrderType;
   amount?: string; // For new orders - USD amount to calculate position size
   szDecimals?: number; // For new orders - asset decimal precision
 }
diff --git a/app/components/UI/Perps/hooks/usePerpsToasts.test.tsx b/app/components/UI/Perps/hooks/usePerpsToasts.test.tsx
index 0cc923030935..1e7bf3a93a0f 100644
--- a/app/components/UI/Perps/hooks/usePerpsToasts.test.tsx
+++ b/app/components/UI/Perps/hooks/usePerpsToasts.test.tsx
@@ -59,6 +59,26 @@ jest.mock('@metamask/design-system-react-native', () => ({
   },
 }));
 
+let mockTransactionsRedesignEnabled = false;
+let mockDepositMeta: { chainId: string } | undefined;
+
+jest.mock(
+  '../../../../selectors/featureFlagController/activityRedesign',
+  () => ({
+    selectIsTransactionsRedesignEnabled: jest.fn(
+      () => mockTransactionsRedesignEnabled,
+    ),
+  }),
+);
+
+jest.mock('../../../../selectors/transactionController', () => ({
+  selectTransactionMetadataById: jest.fn(() => mockDepositMeta),
+}));
+
+jest.mock('../../../../store', () => ({
+  store: { getState: jest.fn(() => ({})) },
+}));
+
 jest.mock('../utils/translatePerpsError', () => ({
   handlePerpsError: ({
     error,
@@ -82,6 +102,8 @@ describe('usePerpsToasts', () => {
   beforeEach(() => {
     jest.clearAllMocks();
 
+    mockTransactionsRedesignEnabled = false;
+    mockDepositMeta = undefined;
     mockShowToast = jest.fn();
     mockCloseToast = jest.fn();
     mockNavigate = jest.fn();
@@ -195,6 +217,48 @@ describe('usePerpsToasts', () => {
         expect(typeof config.closeButtonOptions?.onPress).toBe('function');
       });
 
+      it('tracks to the redesigned details screen when the redesign is enabled', () => {
+        mockTransactionsRedesignEnabled = true;
+        mockDepositMeta = { chainId: '0xa4b1' };
+        const { result } = renderHook(() => usePerpsToasts());
+        const config =
+          result.current.PerpsToastOptions.accountManagement.deposit.inProgress(
+            60,
+            mockTransactionId,
+          );
+
+        act(() => {
+          config.closeButtonOptions?.onPress?.();
+        });
+
+        expect(mockNavigate).toHaveBeenCalledWith(Routes.ACTIVITY_DETAILS, {
+          chainId: 'eip155:42161',
+          txIdentifier: mockTransactionId,
+        });
+        expect(mockNavigate).not.toHaveBeenCalledWith(
+          Routes.TRANSACTION_DETAILS,
+          expect.anything(),
+        );
+      });
+
+      it('tracks to the legacy details screen when the redesign is disabled', () => {
+        mockDepositMeta = { chainId: '0xa4b1' };
+        const { result } = renderHook(() => usePerpsToasts());
+        const config =
+          result.current.PerpsToastOptions.accountManagement.deposit.inProgress(
+            60,
+            mockTransactionId,
+          );
+
+        act(() => {
+          config.closeButtonOptions?.onPress?.();
+        });
+
+        expect(mockNavigate).toHaveBeenCalledWith(Routes.TRANSACTION_DETAILS, {
+          transactionId: mockTransactionId,
+        });
+      });
+
       it('returns in progress configuration without processing time', () => {
         const { result } = renderHook(() => usePerpsToasts());
         const config =
diff --git a/app/components/UI/Perps/hooks/usePerpsToasts.tsx b/app/components/UI/Perps/hooks/usePerpsToasts.tsx
index b60efeaabb28..a7f74294148b 100644
--- a/app/components/UI/Perps/hooks/usePerpsToasts.tsx
+++ b/app/components/UI/Perps/hooks/usePerpsToasts.tsx
@@ -6,6 +6,7 @@ import {
   FontWeight,
 } from '@metamask/design-system-react-native';
 import { useNavigation } from '@react-navigation/native';
+import { toEvmCaipChainId } from '@metamask/multichain-network-controller';
 import type { AppNavigationProp } from '../../../../core/NavigationService/types';
 
 import {
@@ -28,6 +29,9 @@ import {
 } from '../../../../component-library/components/Toast/Toast.types';
 import Routes from '../../../../constants/navigation/Routes';
 import { navigateToTransactionDetails } from '../../../../util/navigation/navigateToTransactionDetails';
+import { selectIsTransactionsRedesignEnabled } from '../../../../selectors/featureFlagController/activityRedesign';
+import { selectTransactionMetadataById } from '../../../../selectors/transactionController';
+import { store } from '../../../../store';
 // eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): shared activity type-filter; route-isolation backlog
 import {
   ActivityTypeFilter,
@@ -128,6 +132,13 @@ export interface PerpsToastOptionsConfig {
         assetSymbol: string,
       ) => PerpsToastOptions;
       creationFailed: (error?: string) => PerpsToastOptions;
+      editSubmitting: () => PerpsToastOptions;
+      editConfirmed: (
+        direction: OrderDirection,
+        amount: string,
+        assetSymbol: string,
+      ) => PerpsToastOptions;
+      editFailed: (error?: string) => PerpsToastOptions;
     };
   };
   positionManagement: {
@@ -307,10 +318,17 @@ const usePerpsToasts = (): {
         perpsFilter?: PerpsActivityFilter,
       ) => {
         toastRef?.current?.closeToast();
+        const state = store.getState();
+        const depositMeta = selectTransactionMetadataById(state, transactionId);
         navigateToTransactionDetails(navigation, {
           transactionId,
           initialTypeFilter: ActivityTypeFilter.Perps,
           ...(perpsFilter ? { initialPerpsFilter: perpsFilter } : {}),
+          isTransactionsRedesignEnabled:
+            selectIsTransactionsRedesignEnabled(state),
+          ...(depositMeta?.chainId
+            ? { chainId: toEvmCaipChainId(depositMeta.chainId) }
+            : {}),
         });
       },
       goToPnlHeroCard: (position: Position, marketPrice?: string) => {
@@ -606,6 +624,40 @@ const usePerpsToasts = (): {
               }),
             ),
           }),
+          editSubmitting: () => ({
+            ...perpsBaseToastOptions.inProgress,
+            hasNoTimeout: true,
+            labelOptions: getPerpsToastLabels(
+              strings('perps.order.updating_your_order'),
+            ),
+          }),
+          editConfirmed: (
+            direction: OrderDirection,
+            amount: string,
+            assetSymbol: string,
+          ) => ({
+            ...perpsBaseToastOptions.success,
+            labelOptions: getPerpsToastLabels(
+              strings('perps.order.order_updated'),
+              strings('perps.order.order_placement_subtitle', {
+                direction: capitalize(direction),
+                amount,
+                assetSymbol: getPerpsDisplaySymbol(assetSymbol),
+              }),
+            ),
+          }),
+          editFailed: (error?: string) => ({
+            ...perpsBaseToastOptions.error,
+            labelOptions: getPerpsToastLabels(
+              strings('perps.order.order_update_failed'),
+              handlePerpsError({
+                error,
+                fallbackMessage: strings(
+                  'perps.order.order_update_failed_subtitle',
+                ),
+              }),
+            ),
+          }),
         },
         // Used for both market and limit orders.
         shared: {
diff --git a/app/components/UI/Perps/hooks/usePerpsTrading.test.ts b/app/components/UI/Perps/hooks/usePerpsTrading.test.ts
index 33d378c3cb56..be013c7db8b6 100644
--- a/app/components/UI/Perps/hooks/usePerpsTrading.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsTrading.test.ts
@@ -21,6 +21,29 @@ import {
 } from '@metamask/perps-controller';
 import { usePerpsTrading } from './usePerpsTrading';
 import { selectPerpsTerminalBackendEnabledFlag } from '../selectors/featureFlags';
+import { PERPS_CUF_TAG } from '../constants/perpsCufTags';
+import {
+  acceptPerpsCufRequest,
+  endPerpsCufTrace,
+  startPerpsCufTrace,
+  watchPerpsCufOrderPriceUpdated,
+} from '../utils/perpsCufTrace';
+
+jest.mock('../utils/perpsCufTrace', () => ({
+  ...jest.requireActual('../utils/perpsCufTrace'),
+  startPerpsCufTrace: jest.fn(() => 'edit-cuf-op'),
+  endPerpsCufTrace: jest.fn(),
+  endPerpsCufRequestAfter: jest.fn(),
+  watchPerpsCufOrderPriceUpdated: jest.fn(),
+  watchPerpsCufOrderAbsent: jest.fn(),
+  acceptPerpsCufRequest: jest.fn(),
+}));
+
+const mockStartPerpsCufTrace = startPerpsCufTrace as jest.Mock;
+const mockEndPerpsCufTrace = endPerpsCufTrace as jest.Mock;
+const mockWatchPerpsCufOrderPriceUpdated =
+  watchPerpsCufOrderPriceUpdated as jest.Mock;
+const mockAcceptPerpsCufRequest = acceptPerpsCufRequest as jest.Mock;
 
 const mockEnsureArbitrumNetworkExists = jest.fn().mockResolvedValue(undefined);
 jest.mock('./usePerpsNetworkManagement', () => ({
@@ -43,6 +66,7 @@ jest.mock('../../../../core/Engine', () => ({
     PerpsController: {
       placeOrder: jest.fn(),
       cancelOrder: jest.fn(),
+      editOrder: jest.fn(),
       closePosition: jest.fn(),
       getMarkets: jest.fn(),
       getPositions: jest.fn(),
@@ -161,6 +185,135 @@ describe('usePerpsTrading', () => {
     });
   });
 
+  describe('editOrder', () => {
+    it('calls PerpsController.editOrder with correct parameters', async () => {
+      const mockEditResult: OrderResult = {
+        success: true,
+        orderId: 'order123',
+      };
+
+      (Engine.context.PerpsController.editOrder as jest.Mock).mockResolvedValue(
+        mockEditResult,
+      );
+
+      const { result } = renderHook(() => usePerpsTrading());
+
+      const editParams = {
+        orderId: 'order123',
+        newOrder: {
+          symbol: 'BTC',
+          isBuy: true,
+          size: '1',
+          orderType: 'limit' as const,
+          price: '51000',
+        },
+      };
+
+      const response = await result.current.editOrder(editParams);
+
+      expect(Engine.context.PerpsController.editOrder).toHaveBeenCalledWith(
+        editParams,
+      );
+      expect(response).toEqual(mockEditResult);
+    });
+
+    it('strips watchPriceUpdate before calling the controller', async () => {
+      (Engine.context.PerpsController.editOrder as jest.Mock).mockResolvedValue(
+        {
+          success: true,
+          orderId: 'order123',
+        },
+      );
+
+      const { result } = renderHook(() => usePerpsTrading());
+
+      await result.current.editOrder({
+        orderId: 'order123',
+        newOrder: {
+          symbol: 'BTC',
+          isBuy: true,
+          size: '1',
+          orderType: 'limit',
+          price: '51000',
+        },
+        watchPriceUpdate: false,
+      });
+
+      expect(Engine.context.PerpsController.editOrder).toHaveBeenCalledWith({
+        orderId: 'order123',
+        newOrder: {
+          symbol: 'BTC',
+          isBuy: true,
+          size: '1',
+          orderType: 'limit',
+          price: '51000',
+        },
+      });
+    });
+
+    it('arms an ORDER_PRICE_UPDATED watcher by default when price is set', async () => {
+      (Engine.context.PerpsController.editOrder as jest.Mock).mockResolvedValue(
+        {
+          success: true,
+          orderId: 'order123',
+        },
+      );
+
+      const { result } = renderHook(() => usePerpsTrading());
+
+      await result.current.editOrder({
+        orderId: 'order123',
+        newOrder: {
+          symbol: 'BTC',
+          isBuy: true,
+          size: '1',
+          orderType: 'limit',
+          price: '51000',
+        },
+      });
+
+      expect(mockStartPerpsCufTrace).toHaveBeenCalled();
+      expect(mockWatchPerpsCufOrderPriceUpdated).toHaveBeenCalledWith(
+        'edit-cuf-op',
+        'order123',
+        '51000',
+      );
+      expect(mockAcceptPerpsCufRequest).toHaveBeenCalledWith('edit-cuf-op');
+    });
+
+    it('skips the price watcher for size-only edits and ends CUF on success', async () => {
+      (Engine.context.PerpsController.editOrder as jest.Mock).mockResolvedValue(
+        {
+          success: true,
+          orderId: 'order123',
+        },
+      );
+
+      const { result } = renderHook(() => usePerpsTrading());
+
+      await result.current.editOrder({
+        orderId: 'order123',
+        newOrder: {
+          symbol: 'BTC',
+          isBuy: true,
+          size: '2',
+          orderType: 'limit',
+          price: '51000',
+        },
+        watchPriceUpdate: false,
+      });
+
+      expect(mockWatchPerpsCufOrderPriceUpdated).not.toHaveBeenCalled();
+      expect(mockAcceptPerpsCufRequest).not.toHaveBeenCalled();
+      expect(mockEndPerpsCufTrace).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: 'edit-cuf-op',
+          data: expect.objectContaining({ [PERPS_CUF_TAG.SUCCESS]: true }),
+        }),
+      );
+    });
+  });
+
   describe('closePosition', () => {
     it('should call PerpsController.closePosition with correct parameters', async () => {
       const mockCloseResult: OrderResult = {
diff --git a/app/components/UI/Perps/hooks/usePerpsTrading.ts b/app/components/UI/Perps/hooks/usePerpsTrading.ts
index 5ac03eeaf6bd..0ad40b353f27 100644
--- a/app/components/UI/Perps/hooks/usePerpsTrading.ts
+++ b/app/components/UI/Perps/hooks/usePerpsTrading.ts
@@ -8,6 +8,7 @@ import {
   type CancelOrderParams,
   type CancelOrderResult,
   type ClosePositionParams,
+  type EditOrderParams,
   type FeeCalculationParams,
   type FeeCalculationResult,
   type FlipPositionParams,
@@ -41,6 +42,7 @@ import {
   endPerpsCufTrace,
   endPerpsCufRequestAfter,
   watchPerpsCufOrderAbsent,
+  watchPerpsCufOrderPriceUpdated,
   acceptPerpsCufRequest,
 } from '../utils/perpsCufTrace';
 import {
@@ -123,6 +125,73 @@ export function usePerpsTrading() {
     [],
   );
 
+  const editOrder = useCallback(
+    async (
+      params: EditOrderParams & {
+        /**
+         * When true (default if `newOrder.price` is set), arm an
+         * ORDER_PRICE_UPDATED stream watcher. Pass false for size-only edits
+         * that still send an unchanged limit price to the venue.
+         */
+        watchPriceUpdate?: boolean;
+      },
+    ): Promise<OrderResult> => {
+      const { watchPriceUpdate, ...controllerParams } = params;
+      const controller = Engine.context.PerpsController;
+      const editCufOpId = startPerpsCufTrace({
+        name: TraceName.PerpsEditOrder,
+      });
+      const expectedPrice = controllerParams.newOrder.price;
+      const shouldWatchPriceUpdate = watchPriceUpdate ?? Boolean(expectedPrice);
+      if (expectedPrice && shouldWatchPriceUpdate) {
+        watchPerpsCufOrderPriceUpdated(
+          editCufOpId,
+          String(controllerParams.orderId),
+          expectedPrice,
+        );
+      }
+      let controllerSettled = false;
+      endPerpsCufRequestAfter(
+        editCufOpId,
+        () => controllerSettled,
+        PERPS_CUF_STREAM_TIMEOUT_MS,
+      );
+      try {
+        const result = await controller.editOrder(controllerParams);
+        controllerSettled = true;
+        if (!result?.success) {
+          endPerpsCufTrace({
+            id: editCufOpId,
+            data: {
+              [PERPS_CUF_TAG.SUCCESS]: false,
+              [PERPS_CUF_TAG.REASON]: PERPS_CUF_END_REASON.REQUEST_FAILED,
+            },
+          });
+        } else if (expectedPrice && shouldWatchPriceUpdate) {
+          acceptPerpsCufRequest(editCufOpId);
+        } else {
+          endPerpsCufTrace({
+            id: editCufOpId,
+            data: {
+              [PERPS_CUF_TAG.SUCCESS]: true,
+            },
+          });
+        }
+        return result;
+      } catch (error) {
+        endPerpsCufTrace({
+          id: editCufOpId,
+          data: {
+            [PERPS_CUF_TAG.SUCCESS]: false,
+            [PERPS_CUF_TAG.REASON]: PERPS_CUF_END_REASON.EXCEPTION,
+          },
+        });
+        throw error;
+      }
+    },
+    [],
+  );
+
   const closePosition = useCallback(
     async (params: ClosePositionParams): Promise<OrderResult> => {
       const controller = Engine.context.PerpsController;
@@ -326,6 +395,7 @@ export function usePerpsTrading() {
   return {
     placeOrder,
     cancelOrder,
+    editOrder,
     closePosition,
     getMarkets,
     getPositions,
diff --git a/app/components/UI/Perps/hooks/usePerpsWithdrawConfirmation.test.ts b/app/components/UI/Perps/hooks/usePerpsWithdrawConfirmation.test.ts
index 4063bff4e86b..b1bf491c5f87 100644
--- a/app/components/UI/Perps/hooks/usePerpsWithdrawConfirmation.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsWithdrawConfirmation.test.ts
@@ -3,7 +3,7 @@ import { useNavigation } from '@react-navigation/native';
 import { CHAIN_IDS, TransactionType } from '@metamask/transaction-controller';
 import { Hex } from '@metamask/utils';
 import { providerErrors } from '@metamask/rpc-errors';
-import { renderHook, act, waitFor } from '@testing-library/react-native';
+import { renderHook, act } from '@testing-library/react-native';
 import { useSelector } from 'react-redux';
 import { selectSelectedInternalAccountAddress } from '../../../../selectors/accountsController';
 import { selectSelectedInternalAccountByScope } from '../../../../selectors/multichainAccounts/accounts';
@@ -158,6 +158,7 @@ describe('usePerpsWithdrawConfirmation', () => {
       networkClientId: MOCK_NETWORK_CLIENT_ID,
       disableHook: true,
       disableSequential: true,
+      overwriteUpgrade: true,
       transactions: [
         {
           params: {
@@ -191,11 +192,11 @@ describe('usePerpsWithdrawConfirmation', () => {
 
     const { result } = renderHook(() => usePerpsWithdrawConfirmation());
 
-    await expect(
-      act(async () => {
-        await result.current.withdrawWithConfirmation();
-      }),
-    ).rejects.toThrow('batch failed');
+    await act(async () => {
+      await expect(result.current.withdrawWithConfirmation()).rejects.toThrow(
+        'batch failed',
+      );
+    });
 
     expect(mockGoBack).toHaveBeenCalledTimes(1);
     expect(mockWithdrawalStartFailed).toHaveBeenCalledWith(
@@ -203,8 +204,8 @@ describe('usePerpsWithdrawConfirmation', () => {
     );
     expect(mockShowToast).toHaveBeenCalledWith(mockWithdrawalStartFailedToast);
 
-    act(() => {
-      retryWithdraw?.();
+    await act(async () => {
+      await retryWithdraw?.();
     });
 
     expect(mockNavigateToConfirmation).toHaveBeenCalledTimes(2);
@@ -216,11 +217,11 @@ describe('usePerpsWithdrawConfirmation', () => {
 
     const { result } = renderHook(() => usePerpsWithdrawConfirmation());
 
-    await expect(
-      act(async () => {
-        await result.current.withdrawWithConfirmation();
-      }),
-    ).rejects.toThrow('batch failed');
+    await act(async () => {
+      await expect(result.current.withdrawWithConfirmation()).rejects.toThrow(
+        'batch failed',
+      );
+    });
 
     expect(mockGoBack).toHaveBeenCalledTimes(1);
     expect(mockShowToast).toHaveBeenCalledWith(mockWithdrawalStartFailedToast);
@@ -232,11 +233,11 @@ describe('usePerpsWithdrawConfirmation', () => {
 
     const { result } = renderHook(() => usePerpsWithdrawConfirmation());
 
-    await expect(
-      act(async () => {
-        await result.current.withdrawWithConfirmation();
-      }),
-    ).rejects.toThrow(error.message);
+    await act(async () => {
+      await expect(result.current.withdrawWithConfirmation()).rejects.toThrow(
+        error.message,
+      );
+    });
 
     expect(mockGoBack).not.toHaveBeenCalled();
     expect(mockWithdrawalStartFailed).not.toHaveBeenCalled();
@@ -250,20 +251,17 @@ describe('usePerpsWithdrawConfirmation', () => {
 
     const { result } = renderHook(() => usePerpsWithdrawConfirmation());
 
-    await expect(
-      act(async () => {
-        await result.current.withdrawWithConfirmation();
-      }),
-    ).rejects.toThrow('batch failed');
-
-    act(() => {
-      retryWithdraw?.();
+    await act(async () => {
+      await expect(result.current.withdrawWithConfirmation()).rejects.toThrow(
+        'batch failed',
+      );
     });
 
-    await waitFor(() => {
-      expect(mockGoBack).toHaveBeenCalledTimes(2);
+    await act(async () => {
+      await retryWithdraw?.();
     });
 
+    expect(mockGoBack).toHaveBeenCalledTimes(2);
     expect(mockNavigateToConfirmation).toHaveBeenCalledTimes(2);
     expect(mockShowToast).toHaveBeenCalledTimes(2);
     expect(mockWithdrawalStartFailed).toHaveBeenCalledTimes(2);
diff --git a/app/components/UI/Perps/hooks/usePerpsWithdrawConfirmation.ts b/app/components/UI/Perps/hooks/usePerpsWithdrawConfirmation.ts
index 5d894d37106e..01f93129210c 100644
--- a/app/components/UI/Perps/hooks/usePerpsWithdrawConfirmation.ts
+++ b/app/components/UI/Perps/hooks/usePerpsWithdrawConfirmation.ts
@@ -99,6 +99,7 @@ export function usePerpsWithdrawConfirmation() {
           networkClientId,
           disableHook: true,
           disableSequential: true,
+          overwriteUpgrade: true,
           transactions: [
             {
               params: {
@@ -122,9 +123,7 @@ export function usePerpsWithdrawConfirmation() {
         navigation.goBack();
         showToast(
           PerpsToastOptions.accountManagement.withdrawal.withdrawalStartFailed(
-            () => {
-              runWithdrawWithConfirmation().catch(() => undefined);
-            },
+            () => runWithdrawWithConfirmation().catch(() => undefined),
           ),
         );
         throw errorObj;
diff --git a/app/components/UI/Perps/providers/PerpsConnectionProvider.test.tsx b/app/components/UI/Perps/providers/PerpsConnectionProvider.test.tsx
index 956d2a6c2b71..a692d93b153d 100644
--- a/app/components/UI/Perps/providers/PerpsConnectionProvider.test.tsx
+++ b/app/components/UI/Perps/providers/PerpsConnectionProvider.test.tsx
@@ -147,6 +147,16 @@ describe('PerpsConnectionProvider', () => {
     expect(getByText('Child Component')).toBeDefined();
   });
 
+  it('does not poll connection state when disabled', () => {
+    render(
+      <PerpsConnectionProvider isEnabled={false} suppressErrorView>
+        <Text>Child Component</Text>
+      </PerpsConnectionProvider>,
+    );
+
+    expect(jest.getTimerCount()).toBe(0);
+  });
+
   it('renders children immediately even while connecting', () => {
     // Children should render even when isInitialized is false and isConnecting is true
     // Individual sections handle their own loading states with per-row skeletons
diff --git a/app/components/UI/Perps/providers/PerpsConnectionProvider.tsx b/app/components/UI/Perps/providers/PerpsConnectionProvider.tsx
index f5e5bf0f2879..5f4fab41b5ce 100644
--- a/app/components/UI/Perps/providers/PerpsConnectionProvider.tsx
+++ b/app/components/UI/Perps/providers/PerpsConnectionProvider.tsx
@@ -34,6 +34,8 @@ export const PerpsConnectionContext =
 
 interface PerpsConnectionProviderProps {
   children: React.ReactNode;
+  /** Whether connection-state polling is active. */
+  isEnabled?: boolean;
   isFullScreen?: boolean;
   /** When true, silently renders children instead of showing the error view on connection failure. */
   suppressErrorView?: boolean;
@@ -47,7 +49,12 @@ interface PerpsConnectionProviderProps {
  */
 export const PerpsConnectionProvider: React.FC<
   PerpsConnectionProviderProps
-> = ({ children, isFullScreen = false, suppressErrorView = false }) => {
+> = ({
+  children,
+  isEnabled = true,
+  isFullScreen = false,
+  suppressErrorView = false,
+}) => {
   const [connectionState, setConnectionState] = useState(() =>
     PerpsConnectionManager.getConnectionState(),
   );
@@ -57,6 +64,10 @@ export const PerpsConnectionProvider: React.FC<
 
   // Poll connection state to sync with singleton
   useEffect(() => {
+    if (!isEnabled) {
+      return;
+    }
+
     // Skip polling in E2E mode to prevent timer interference
     if (hasTestOverrides) {
       // Set mock connected state for E2E
@@ -97,10 +108,10 @@ export const PerpsConnectionProvider: React.FC<
         clearInterval(pollIntervalRef.current);
       }
     };
-  }, []);
+  }, [isEnabled]);
 
   useEffect(() => {
-    if (hasTestOverrides || suppressErrorView) {
+    if (!isEnabled || hasTestOverrides || suppressErrorView) {
       return;
     }
 
@@ -140,6 +151,7 @@ export const PerpsConnectionProvider: React.FC<
     connectionState.isConnecting,
     connectionState.isDisconnecting,
     connectionState.isInGracePeriod,
+    isEnabled,
     suppressErrorView,
   ]);
 
diff --git a/app/components/UI/Perps/providers/PerpsStreamManager.test.tsx b/app/components/UI/Perps/providers/PerpsStreamManager.test.tsx
index daaa22a485cf..4346e0de5be0 100644
--- a/app/components/UI/Perps/providers/PerpsStreamManager.test.tsx
+++ b/app/components/UI/Perps/providers/PerpsStreamManager.test.tsx
@@ -104,6 +104,7 @@ describe('PerpsStreamManager', () => {
     jest.clearAllMocks();
     jest.clearAllTimers();
     jest.useFakeTimers();
+    jest.setSystemTime(new Date('2024-01-01T12:00:00.000Z'));
     resetPerpsLifecycleContextForTests();
 
     // Restore the default Terminal flag state (enabled) after any per-test override.
@@ -1493,11 +1494,12 @@ describe('PerpsStreamManager', () => {
       expect(mockSubscribeToPrices).toHaveBeenCalled();
     });
 
+    const FIXED_TS = new Date('2024-01-01T12:00:00.000Z').getTime();
     const firstUpdate: PriceUpdate = {
       symbol: 'BTC-PERP',
 
       price: '50000',
-      timestamp: Date.now(),
+      timestamp: FIXED_TS,
       isTradable: true,
     };
 
@@ -1514,7 +1516,7 @@ describe('PerpsStreamManager', () => {
       symbol: 'BTC-PERP',
 
       price: '50100',
-      timestamp: Date.now() + 10,
+      timestamp: FIXED_TS + 10,
       isTradable: true,
     };
 
@@ -1522,7 +1524,7 @@ describe('PerpsStreamManager', () => {
       symbol: 'BTC-PERP',
 
       price: '50200',
-      timestamp: Date.now() + 20,
+      timestamp: FIXED_TS + 20,
       isTradable: true,
     };
 
@@ -4167,6 +4169,182 @@ describe('PerpsStreamManager', () => {
     });
   });
 
+  describe('OrderStreamChannel.updateOrderOptimistic', () => {
+    let mockOrdersSubscribe: jest.Mock;
+    let mockOrdersUnsubscribe: jest.Mock;
+
+    const createMockOrder = (overrides: Partial<Order> = {}): Order => ({
+      orderId: 'order-1',
+      symbol: 'ETH',
+      side: 'buy',
+      orderType: 'limit',
+      size: '1.0',
+      originalSize: '1.0',
+      price: '3000',
+      filledSize: '0',
+      remainingSize: '1.0',
+      status: 'open',
+      timestamp: Date.now(),
+      detailedOrderType: 'Limit',
+      isTrigger: false,
+      reduceOnly: false,
+      ...overrides,
+    });
+
+    beforeEach(() => {
+      mockOrdersUnsubscribe = jest.fn();
+      mockOrdersSubscribe = jest.fn().mockReturnValue(mockOrdersUnsubscribe);
+      mockEngine.context.PerpsController.subscribeToOrders =
+        mockOrdersSubscribe;
+      mockEngine.context.PerpsController.isCurrentlyReinitializing = jest
+        .fn()
+        .mockReturnValue(false);
+    });
+
+    const seedOrdersAndSubscribe = async (
+      initialOrders: Order[],
+    ): Promise<{
+      callback: jest.Mock;
+      unsubscribe: () => void;
+    }> => {
+      let orderCallback: ((orders: Order[]) => void) | null = null;
+      mockOrdersSubscribe.mockImplementation(
+        (params: { callback: (orders: Order[]) => void }) => {
+          orderCallback = params.callback;
+          return mockOrdersUnsubscribe;
+        },
+      );
+
+      const callback = jest.fn();
+      const unsubscribe = testStreamManager.orders.subscribe({
+        callback,
+        throttleMs: 0,
+      });
+
+      await waitFor(() => {
+        expect(mockOrdersSubscribe).toHaveBeenCalled();
+      });
+
+      act(() => {
+        orderCallback?.(initialOrders);
+      });
+
+      await waitFor(() => {
+        expect(callback).toHaveBeenCalledWith(initialOrders);
+      });
+
+      callback.mockClear();
+      return { callback, unsubscribe };
+    };
+
+    it('updates limit price in the cached order', async () => {
+      const { callback, unsubscribe } = await seedOrdersAndSubscribe([
+        createMockOrder(),
+      ]);
+
+      act(() => {
+        testStreamManager.orders.updateOrderOptimistic('order-1', {
+          limitPrice: '3100',
+        });
+      });
+
+      expect(callback).toHaveBeenCalledWith([
+        expect.objectContaining({
+          orderId: 'order-1',
+          price: '3100',
+          size: '1.0',
+        }),
+      ]);
+
+      unsubscribe();
+    });
+
+    it('updates size, originalSize, and remainingSize together', async () => {
+      const { callback, unsubscribe } = await seedOrdersAndSubscribe([
+        createMockOrder(),
+      ]);
+
+      act(() => {
+        testStreamManager.orders.updateOrderOptimistic('order-1', {
+          size: '2.5',
+        });
+      });
+
+      expect(callback).toHaveBeenCalledWith([
+        expect.objectContaining({
+          orderId: 'order-1',
+          size: '2.5',
+          originalSize: '2.5',
+          remainingSize: '2.5',
+          price: '3000',
+        }),
+      ]);
+
+      unsubscribe();
+    });
+
+    it('updates price and size in one optimistic patch', async () => {
+      const { callback, unsubscribe } = await seedOrdersAndSubscribe([
+        createMockOrder(),
+      ]);
+
+      act(() => {
+        testStreamManager.orders.updateOrderOptimistic('order-1', {
+          limitPrice: '3200',
+          size: '1.5',
+        });
+      });
+
+      expect(callback).toHaveBeenCalledWith([
+        expect.objectContaining({
+          orderId: 'order-1',
+          price: '3200',
+          size: '1.5',
+          originalSize: '1.5',
+          remainingSize: '1.5',
+        }),
+      ]);
+
+      unsubscribe();
+    });
+
+    it('no-ops when neither limitPrice nor size is provided', async () => {
+      const { callback, unsubscribe } = await seedOrdersAndSubscribe([
+        createMockOrder(),
+      ]);
+
+      act(() => {
+        testStreamManager.orders.updateOrderOptimistic('order-1', {});
+      });
+
+      expect(callback).not.toHaveBeenCalled();
+      unsubscribe();
+    });
+
+    it('no-ops when the order is not in the cache', async () => {
+      const { callback, unsubscribe } = await seedOrdersAndSubscribe([
+        createMockOrder(),
+      ]);
+
+      act(() => {
+        testStreamManager.orders.updateOrderOptimistic('missing-order', {
+          limitPrice: '3100',
+        });
+      });
+
+      expect(callback).not.toHaveBeenCalled();
+      unsubscribe();
+    });
+
+    it('no-ops when there is no cached orders list', () => {
+      expect(() => {
+        testStreamManager.orders.updateOrderOptimistic('order-1', {
+          limitPrice: '3100',
+        });
+      }).not.toThrow();
+    });
+  });
+
   describe('clearAllChannels', () => {
     it('disconnects all channels when called', () => {
       // Arrange - spy on disconnect methods
diff --git a/app/components/UI/Perps/providers/PerpsStreamManager.tsx b/app/components/UI/Perps/providers/PerpsStreamManager.tsx
index 538fa0785202..6d9d23c40217 100644
--- a/app/components/UI/Perps/providers/PerpsStreamManager.tsx
+++ b/app/components/UI/Perps/providers/PerpsStreamManager.tsx
@@ -1017,6 +1017,64 @@ class OrderStreamChannel extends StreamChannel<Order[] | null> {
     return this.cache.get('orders') ?? null;
   }
 
+  /**
+   * Apply optimistic price and/or size updates to an open order before the
+   * venue confirms the edit. WebSocket delivery reconciles the cache afterward.
+   */
+  public updateOrderOptimistic(
+    orderId: string,
+    edit: { limitPrice?: string; size?: string },
+  ): void {
+    const { limitPrice, size } = edit;
+    if (limitPrice === undefined && size === undefined) {
+      return;
+    }
+
+    const cachedOrders = this.cache.get('orders');
+    if (!cachedOrders) {
+      DevLogger.log(
+        'OrderStreamChannel: Cannot apply optimistic update - no cached orders',
+      );
+      return;
+    }
+
+    const orderIndex = cachedOrders.findIndex(
+      (order) => order.orderId === orderId,
+    );
+    if (orderIndex === -1) {
+      DevLogger.log(
+        `OrderStreamChannel: Cannot apply optimistic update - order not found for ${orderId}`,
+      );
+      return;
+    }
+
+    const updatedOrders = cachedOrders.map((order, index) => {
+      if (index !== orderIndex) {
+        return order;
+      }
+
+      return {
+        ...order,
+        ...(limitPrice !== undefined ? { price: limitPrice } : {}),
+        ...(size !== undefined
+          ? { size, originalSize: size, remainingSize: size }
+          : {}),
+      };
+    });
+
+    DevLogger.log('OrderStreamChannel: Applying optimistic order edit', {
+      orderId,
+      limitPrice,
+      size,
+    });
+
+    this.cache.set('orders', updatedOrders);
+    // Notify UI subscribers only — do NOT call handlePerpsCufOrdersDelivered.
+    // The WS delivery path (:994) ends PerpsEditOrder spans; optimistic paint
+    // must not, or CUF would measure local cache updates instead of venue confirmation.
+    this.notifySubscribers(updatedOrders);
+  }
+
   /**
    * Pre-warm the channel by creating a persistent subscription
    * This keeps the WebSocket connection alive and caches data continuously
diff --git a/app/components/UI/Perps/routes/index.tsx b/app/components/UI/Perps/routes/index.tsx
index 7d8d26c61e05..ae6fecace051 100644
--- a/app/components/UI/Perps/routes/index.tsx
+++ b/app/components/UI/Perps/routes/index.tsx
@@ -20,7 +20,6 @@ import { PerpsGlobalErrorGate } from '../components/PerpsGlobalErrorGate';
 import { PerpsStreamProvider } from '../providers/PerpsStreamManager';
 import PerpsHomeView from '../Views/PerpsHomeView/PerpsHomeView';
 import PerpsMarketDetailsRouter from '../Views/PerpsMarketDetailsRouter';
-import PerpsModeFlashContainer from '../components/PerpsModeFlashContainer';
 import PerpsMarketListView from '../Views/PerpsMarketListView';
 import PerpsRedirect from '../Views/PerpsRedirect';
 import PerpsOrderRedirect from '../Views/PerpsOrderRedirect';
@@ -46,6 +45,7 @@ import PerpsStreamBridge from '../components/PerpsStreamBridge';
 import { HIP3DebugView } from '../Debug';
 import PerpsCrossMarginWarningBottomSheet from '../components/PerpsCrossMarginWarningBottomSheet';
 import PerpsSelectProviderView from '../Views/PerpsSelectProviderView';
+import PerpsModeSelectionView from '../Views/PerpsModeSelectionView';
 import { PayWithModal } from '../../../Views/confirmations/components/modals/pay-with-modal/pay-with-modal';
 import { PayWithBottomSheet } from '../../../Views/confirmations/components/modals/pay-with-bottom-sheet/pay-with-bottom-sheet';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
@@ -188,6 +188,13 @@ const PerpsModalStack = () => {
               title: strings('perps.provider_selector.title'),
             }}
           />
+          <ModalStack.Screen
+            name={Routes.PERPS.MODALS.MODE_SELECTION}
+            component={PerpsModeSelectionView}
+            options={{
+              title: strings('perps.mode.selection_title'),
+            }}
+          />
           {/* Action Selection Modals */}
           <ModalStack.Screen
             name={Routes.PERPS.SELECT_MODIFY_ACTION}
@@ -293,10 +300,11 @@ const PerpsScreenStack = () => {
               <Stack.Screen
                 name={Routes.PERPS.MARKET_LIST}
                 component={PerpsMarketListView}
-                options={{
+                options={({ route }) => ({
                   title: strings('perps.home.markets'),
                   headerShown: false,
-                }}
+                  animation: route.params?.animation ?? 'slide_from_right',
+                })}
                 initialParams={{
                   variant: 'full',
                   title: strings('perps.home.markets'),
@@ -476,10 +484,6 @@ const PerpsScreenStack = () => {
                 }
               />
             </Stack.Navigator>
-            {/* Lite/Pro mode-switch flash overlay (TAT-3551). Mounted once at the
-              stack root so it can be triggered from any Perps entry point and
-              flashes on top of the active screen. */}
-            <PerpsModeFlashContainer />
           </View>
         </PerpsStreamProvider>
       </PerpsConnectionProvider>
diff --git a/app/components/UI/Perps/selectors/featureFlags/index.test.ts b/app/components/UI/Perps/selectors/featureFlags/index.test.ts
index b33323c01a4d..d07d98a8ef4a 100644
--- a/app/components/UI/Perps/selectors/featureFlags/index.test.ts
+++ b/app/components/UI/Perps/selectors/featureFlags/index.test.ts
@@ -2085,6 +2085,21 @@ describe('Perps Feature Flag Selectors', () => {
       );
       expect(result).toBe(false);
     });
+
+    it('returns false when remote flag is missing', () => {
+      const result = selectPerpsProModeEnabledFlag({
+        engine: {
+          backgroundState: {
+            RemoteFeatureFlagController: {
+              remoteFeatureFlags: {},
+              cacheTimestamp: 0,
+            },
+          },
+        },
+      });
+
+      expect(result).toBe(false);
+    });
   });
 
   describe('selectPerpsRecentlyAddedEnabledFlag', () => {
diff --git a/app/components/UI/Perps/services/PerpsConnectionManager.test.ts b/app/components/UI/Perps/services/PerpsConnectionManager.test.ts
index 57dcf7577ab7..9e3b3d32e7fc 100644
--- a/app/components/UI/Perps/services/PerpsConnectionManager.test.ts
+++ b/app/components/UI/Perps/services/PerpsConnectionManager.test.ts
@@ -130,10 +130,15 @@ const mockClearPendingPerpsCufTraces =
 const mockEndPerpsCufTrace = endPerpsCufTrace as jest.MockedFunction<
   typeof endPerpsCufTrace
 >;
-import { TradingReadinessCache } from '@metamask/perps-controller';
+import {
+  PERPS_CONSTANTS,
+  TradingReadinessCache,
+} from '@metamask/perps-controller';
 
 // Import PerpsConnectionManager after mocks are set up
 // This is imported here after mocks to ensure store.subscribe is mocked before the singleton is created
+import { AppState } from 'react-native';
+import Device from '../../../../util/device';
 import { PerpsConnectionManager } from './PerpsConnectionManager';
 import { PERPS_CONNECTION_SOURCE } from '../constants/perpsConfig';
 
@@ -736,15 +741,15 @@ describe('PerpsConnectionManager', () => {
       mockPerpsController.getAccountState.mockResolvedValue({});
       await PerpsConnectionManager.connect();
 
-      const storeCallback = storeCallbacks[storeCallbacks.length - 1];
+      const latestStoreCallback = storeCallbacks[storeCallbacks.length - 1];
 
       // Simulate two rapid state changes within 50ms
       (selectPerpsNetwork as unknown as jest.Mock).mockReturnValue('testnet');
-      storeCallback();
+      latestStoreCallback();
       (
         selectSelectedInternalAccountByScope as unknown as jest.Mock
       ).mockReturnValue(() => ({ address: '0xnew' }));
-      storeCallback();
+      latestStoreCallback();
 
       // Advance past the 50ms debounce window
       jest.advanceTimersByTime(60);
@@ -799,9 +804,9 @@ describe('PerpsConnectionManager', () => {
       mockPerpsController.getAccountState.mockResolvedValue({});
       await PerpsConnectionManager.connect();
 
-      const storeCallback = storeCallbacks[storeCallbacks.length - 1];
+      const latestStoreCallback = storeCallbacks[storeCallbacks.length - 1];
       (selectPerpsNetwork as unknown as jest.Mock).mockReturnValue('testnet');
-      storeCallback();
+      latestStoreCallback();
 
       const m = PerpsConnectionManager as unknown as {
         stateChangeDebounceTimer: ReturnType<typeof setTimeout> | null;
@@ -997,6 +1002,10 @@ describe('PerpsConnectionManager', () => {
     describe('clearAllDexAbstractionCache (deprecated)', () => {
       it('delegates to clearAllSigningCache for backward compatibility', () => {
         // Act
+        // The deprecation warning is the point of this test: the deprecated
+        // alias must keep delegating until it is removed, so calling it here is
+        // unavoidable.
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
         PerpsConnectionManager.clearAllDexAbstractionCache();
 
         // Assert - should still clear all, just with new log message
@@ -1328,6 +1337,110 @@ describe('PerpsConnectionManager', () => {
     });
   });
 
+  describe('scheduleGracePeriodDisconnection — stale iOS timer (TAT-3645)', () => {
+    interface SchedulableManager {
+      connectionRefCount: number;
+      scheduleGracePeriodDisconnection: () => void;
+    }
+
+    const armGracePeriodWhileAppIs = (
+      appState: 'active' | 'inactive' | 'background',
+    ): void => {
+      const manager = PerpsConnectionManager as unknown as SchedulableManager;
+      manager.connectionRefCount = 0;
+      AppState.currentState = appState;
+      manager.scheduleGracePeriodDisconnection();
+    };
+
+    beforeEach(async () => {
+      mockPerpsController.init.mockResolvedValue();
+      mockPerpsController.disconnect.mockResolvedValue();
+      await PerpsConnectionManager.connect();
+      mockPerpsController.disconnect.mockClear();
+      jest.mocked(Device.isIos).mockReturnValue(true);
+      jest.mocked(Device.isAndroid).mockReturnValue(false);
+      jest.useFakeTimers();
+    });
+
+    afterEach(() => {
+      jest.useRealTimers();
+      // Device mock return values survive jest.clearAllMocks(), so reset them
+      // here or every later describe inherits isIos() === true.
+      jest.mocked(Device.isIos).mockReset();
+      jest.mocked(Device.isAndroid).mockReset();
+      AppState.currentState = 'active';
+    });
+
+    it('ignores a timer armed while backgrounded, because iOS can only run it once the app resumes', async () => {
+      armGracePeriodWhileAppIs('background');
+
+      jest.advanceTimersByTime(PERPS_CONSTANTS.ConnectionGracePeriodMs);
+      await Promise.resolve();
+
+      expect(mockPerpsController.disconnect).not.toHaveBeenCalled();
+      expect(PerpsConnectionManager.getConnectionState().isInGracePeriod).toBe(
+        false,
+      );
+      expect(mockDevLogger.log).toHaveBeenCalledWith(
+        expect.stringContaining('Ignoring stale grace period timer'),
+      );
+    });
+
+    it('ignores a timer armed on the inactive edge, which is what a real iOS lock arms on', async () => {
+      // PerpsAlwaysOnProvider disconnects on the `active -> inactive` edge and
+      // iOS backgrounding fires active -> inactive -> background, so `inactive`
+      // is the state production actually arms in.
+      armGracePeriodWhileAppIs('inactive');
+
+      jest.advanceTimersByTime(PERPS_CONSTANTS.ConnectionGracePeriodMs);
+      await Promise.resolve();
+
+      expect(mockPerpsController.disconnect).not.toHaveBeenCalled();
+      expect(PerpsConnectionManager.getConnectionState().isInGracePeriod).toBe(
+        false,
+      );
+    });
+
+    it('ignores a backgrounded timer even for a lock barely longer than the grace period', async () => {
+      // A 20-25s lock overshoots the deadline by only a few seconds. Arm-time
+      // state still identifies it as a resume, so there is no blind band.
+      armGracePeriodWhileAppIs('background');
+
+      jest.advanceTimersByTime(PERPS_CONSTANTS.ConnectionGracePeriodMs + 1000);
+      await Promise.resolve();
+
+      expect(mockPerpsController.disconnect).not.toHaveBeenCalled();
+    });
+
+    it('keeps the live connection usable after a stale timer is ignored', async () => {
+      armGracePeriodWhileAppIs('background');
+
+      jest.advanceTimersByTime(PERPS_CONSTANTS.ConnectionGracePeriodMs);
+      await Promise.resolve();
+
+      // Nothing was torn down, so a screen mounting right after unlock still
+      // reads market data instead of failing with CLIENT_NOT_INITIALIZED.
+      const state = PerpsConnectionManager.getConnectionState();
+      expect(state.isConnected).toBe(true);
+      expect(state.isInitialized).toBe(true);
+      expect(
+        mockStreamManagerInstance.marketData.clearCache,
+      ).not.toHaveBeenCalled();
+    });
+
+    it('still disconnects when the grace period was armed while the app is active', async () => {
+      // In-app reference-count drop: the timer runs on schedule, so the normal
+      // grace-period disconnection must be preserved.
+      armGracePeriodWhileAppIs('active');
+
+      jest.advanceTimersByTime(PERPS_CONSTANTS.ConnectionGracePeriodMs);
+      await Promise.resolve();
+      await Promise.resolve();
+
+      expect(mockPerpsController.disconnect).toHaveBeenCalled();
+    });
+  });
+
   describe('NetInfo isInternetReachable null handling', () => {
     type NetInfoCallback = (state: {
       isInternetReachable: boolean | null;
diff --git a/app/components/UI/Perps/services/PerpsConnectionManager.ts b/app/components/UI/Perps/services/PerpsConnectionManager.ts
index 20d8890d8227..41022914428a 100644
--- a/app/components/UI/Perps/services/PerpsConnectionManager.ts
+++ b/app/components/UI/Perps/services/PerpsConnectionManager.ts
@@ -1,3 +1,4 @@
+import { AppState } from 'react-native';
 import {
   addEventListener as netInfoAddEventListener,
   type NetInfoState,
@@ -567,8 +568,52 @@ class PerpsConnectionManagerClass {
 
     if (Device.isIos()) {
       // iOS: Start background timer, schedule with setTimeout, then stop immediately
+      //
+      // `BackgroundTimer.stop()` below ends the background task as soon as the
+      // timer is armed, so iOS suspends the JS thread for the rest of the
+      // background period. A grace period armed *because the app left the
+      // foreground* therefore cannot run its callback on schedule — it can only
+      // run once the app resumes, and it does so ahead of the AppState `active`
+      // event. Disconnecting there tears down a connection the user has just
+      // come back to, and every Perps read taken during the re-initialisation
+      // that follows fails with CLIENT_NOT_INITIALIZED — surfaced to the user as
+      // "<asset> is not a tradable asset" (TAT-3645).
+      //
+      // Checking whether the app is active *at fire time* does not work:
+      // `AppState.currentState` still reads `background` at that instant. So
+      // capture the state at ARM time instead. Armed while backgrounded means
+      // the callback is by definition running on a resume, whatever the lock
+      // lasted, and `resumeFromForeground` owns the connection from here — it
+      // pings and soft-reconnects only if the socket really did die. A grace
+      // period armed while the app is still active (an in-app reference-count
+      // drop) is unaffected: it runs on schedule and disconnects normally.
+      //
+      // Net effect on iOS: a grace period armed by backgrounding never
+      // disconnects. That is not a behaviour regression — the timer never ran
+      // during the background window before this change either, it only ran
+      // late, on resume, which is the bug. Teardown while backgrounded is the
+      // OS's job (it suspends the process and the socket with it), and
+      // `resumeFromForeground` re-validates on the way back.
+      //
+      // Known consequence: iOS also reports `inactive` for transient states
+      // where JS keeps running (control centre, app switcher, an incoming
+      // call). A grace period armed in one of those windows is inert too, so
+      // the socket outlives it. That is a resource nicety rather than a
+      // correctness issue — `resumeFromForeground` still re-validates — and it
+      // is deliberate: distinguishing it would need an elapsed-time threshold,
+      // which is exactly what left a 20-25s blind band in an earlier revision.
+      const armedWhileBackgrounded = AppState.currentState !== 'active';
       BackgroundTimer.start();
       this.gracePeriodTimer = setTimeout(() => {
+        if (armedWhileBackgrounded) {
+          DevLogger.log(
+            'PerpsConnectionManager: Ignoring stale grace period timer (armed on background, fired after resume)',
+          );
+          this.gracePeriodTimer = null;
+          this.isInGracePeriod = false;
+          return;
+        }
+
         this.performActualDisconnection().catch((error) => {
           Logger.error(
             ensureError(
diff --git a/app/components/UI/Perps/types/navigation.ts b/app/components/UI/Perps/types/navigation.ts
index 992a0e1ad583..eaff0787abc7 100644
--- a/app/components/UI/Perps/types/navigation.ts
+++ b/app/components/UI/Perps/types/navigation.ts
@@ -1,4 +1,5 @@
 import type { NavigatorScreenParams } from '@react-navigation/native';
+import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 import {
   type Position,
   type Order,
@@ -23,6 +24,7 @@ export type PerpsModalsNavigationParamList = {
   PerpsCancelAllOrders: undefined;
   PerpsCrossMarginWarning: undefined;
   PerpsSelectProvider: undefined;
+  PerpsModeSelection: undefined;
   PerpsSelectModifyAction: {
     position: Position;
   };
@@ -138,12 +140,25 @@ export type PerpsStackParamList = {
         button_clicked?: string;
         button_location?: string;
         transactionActiveAbTests?: TransactionActiveAbTestEntry[];
+        animation?: NativeStackNavigationOptions['animation'];
+        /**
+         * When true, selecting a market replaces the underlying MARKET_DETAILS
+         * (and dismisses this list) instead of pushing another details screen.
+         * Used by the header slide-up picker.
+         */
+        replaceOnSelect?: boolean;
       }
     | undefined;
 
   PerpsMarketDetails: {
     /** Full market when available; Partial is accepted for trade-details deep entries. */
     market: PerpsMarketData | Partial<PerpsMarketData>;
+    /**
+     * Preselects a side in Pro mode's inline order form. Set by entry points
+     * that already express a trade intent, e.g. the spot token details
+     * Long/Short buttons. Ignored by the Lite market screen.
+     */
+    direction?: 'long' | 'short';
     initialTab?: 'position' | 'orders' | 'info';
     monitoringIntent?: Partial<DataMonitorParams>;
     source?: string;
@@ -232,7 +247,7 @@ export type PerpsStackParamList = {
     initialTakeProfitPrice?: string;
     initialStopLossPrice?: string;
     leverage?: number;
-    orderType?: 'market' | 'limit';
+    orderType?: OrderType;
     limitPrice?: string;
     amount?: string; // For new orders - USD amount to calculate position size for P&L
     szDecimals?: number; // For new orders - asset decimal precision for P&L
@@ -309,6 +324,7 @@ export type PerpsStackParamList = {
         button_clicked?: string;
         button_location?: string;
         transactionActiveAbTests?: TransactionActiveAbTestEntry[];
+        animation?: NativeStackNavigationOptions['animation'];
       }
     | undefined;
   PerpsOrderDetailsView: {
diff --git a/app/components/UI/Perps/utils/hyperLiquidAdapter.test.ts b/app/components/UI/Perps/utils/hyperLiquidAdapter.test.ts
index 9a704cddcc94..b85daa59d34d 100644
--- a/app/components/UI/Perps/utils/hyperLiquidAdapter.test.ts
+++ b/app/components/UI/Perps/utils/hyperLiquidAdapter.test.ts
@@ -339,6 +339,9 @@ describe('hyperLiquidAdapter', () => {
         reduceOnly: true,
         isPositionTpsl: false,
         triggerPrice: '25.50',
+        // perps-controller v11 normalizes the venue's placement type onto
+        // Order.triggerOrderType alongside the existing trigger fields.
+        triggerOrderType: 'stop_market',
       });
     });
 
diff --git a/app/components/UI/Perps/utils/openOrderMarginValidation.test.ts b/app/components/UI/Perps/utils/openOrderMarginValidation.test.ts
new file mode 100644
index 000000000000..e56f77e9a97a
--- /dev/null
+++ b/app/components/UI/Perps/utils/openOrderMarginValidation.test.ts
@@ -0,0 +1,33 @@
+import { getIncrementalMarginInsufficientBalanceError } from './openOrderMarginValidation';
+
+describe('openOrderMarginValidation', () => {
+  it('returns insufficient balance only when an edit increases required margin', () => {
+    expect(
+      getIncrementalMarginInsufficientBalanceError({
+        editedNotionalUsd: 200,
+        currentNotionalUsd: 100,
+        spendableBalance: 1,
+        leverage: 10,
+      }),
+    ).toMatch(/Insufficient balance/);
+
+    expect(
+      getIncrementalMarginInsufficientBalanceError({
+        editedNotionalUsd: 50,
+        currentNotionalUsd: 100,
+        spendableBalance: 0,
+        leverage: 10,
+      }),
+    ).toBe('');
+
+    expect(
+      getIncrementalMarginInsufficientBalanceError({
+        editedNotionalUsd: 200,
+        currentNotionalUsd: 100,
+        spendableBalance: 0,
+        leverage: 10,
+        reduceOnly: true,
+      }),
+    ).toBe('');
+  });
+});
diff --git a/app/components/UI/Perps/utils/openOrderMarginValidation.ts b/app/components/UI/Perps/utils/openOrderMarginValidation.ts
new file mode 100644
index 000000000000..339b137c427f
--- /dev/null
+++ b/app/components/UI/Perps/utils/openOrderMarginValidation.ts
@@ -0,0 +1,54 @@
+import { strings } from '../../../../../locales/i18n';
+
+export interface IncrementalMarginCheckParams {
+  editedNotionalUsd: number;
+  currentNotionalUsd: number;
+  spendableBalance: number;
+  /** Effective leverage for the asset (position/config), not market max. */
+  leverage: number;
+  reduceOnly?: boolean;
+}
+
+/**
+ * Insufficient-balance message when an open-order edit increases notional
+ * beyond what spendable balance can collateralize at the given leverage.
+ * Size decreases and reduce-only closes return an empty string.
+ */
+export const getIncrementalMarginInsufficientBalanceError = ({
+  editedNotionalUsd,
+  currentNotionalUsd,
+  spendableBalance,
+  leverage,
+  reduceOnly = false,
+}: IncrementalMarginCheckParams): string => {
+  if (reduceOnly) {
+    return '';
+  }
+
+  if (
+    !Number.isFinite(editedNotionalUsd) ||
+    editedNotionalUsd <= 0 ||
+    !Number.isFinite(leverage) ||
+    leverage <= 0
+  ) {
+    return '';
+  }
+
+  const additionalNotionalUsd = editedNotionalUsd - currentNotionalUsd;
+  if (additionalNotionalUsd <= 0) {
+    return '';
+  }
+
+  const availableBalance = Number.isFinite(spendableBalance)
+    ? spendableBalance
+    : 0;
+  const additionalMarginRequired = additionalNotionalUsd / leverage;
+  if (additionalMarginRequired > availableBalance) {
+    return strings('perps.order.validation.insufficient_balance', {
+      required: additionalMarginRequired.toFixed(2),
+      available: availableBalance.toFixed(2),
+    });
+  }
+
+  return '';
+};
diff --git a/app/components/UI/Perps/utils/openPerpsModeSelection.test.ts b/app/components/UI/Perps/utils/openPerpsModeSelection.test.ts
new file mode 100644
index 000000000000..3506f7234ef4
--- /dev/null
+++ b/app/components/UI/Perps/utils/openPerpsModeSelection.test.ts
@@ -0,0 +1,96 @@
+import { PERPS_EVENT_VALUE } from '@metamask/perps-controller/constants';
+import Routes from '../../../../constants/navigation/Routes';
+import {
+  openPerpsModeSelection,
+  openPerpsModeSelectionIfNeeded,
+} from './openPerpsModeSelection';
+
+const mockHasCompletedPerpsModeSelection = jest.fn();
+jest.mock('./perpsModeSelectionStorage', () => ({
+  hasCompletedPerpsModeSelection: () => mockHasCompletedPerpsModeSelection(),
+}));
+
+describe('openPerpsModeSelection', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockHasCompletedPerpsModeSelection.mockResolvedValue(false);
+  });
+
+  it('navigates to the mode selection modal with defaults', () => {
+    const navigate = jest.fn();
+
+    openPerpsModeSelection({ navigate });
+
+    expect(navigate).toHaveBeenCalledWith(Routes.PERPS.MODALS.ROOT, {
+      screen: Routes.PERPS.MODALS.MODE_SELECTION,
+      params: {
+        entry: 'trade',
+        source: PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION,
+      },
+    });
+  });
+
+  it('forwards entry and source overrides', () => {
+    const navigate = jest.fn();
+
+    openPerpsModeSelection(
+      { navigate },
+      {
+        entry: 'home',
+        source: PERPS_EVENT_VALUE.SOURCE.PERPS_HOME,
+      },
+    );
+
+    expect(navigate).toHaveBeenCalledWith(Routes.PERPS.MODALS.ROOT, {
+      screen: Routes.PERPS.MODALS.MODE_SELECTION,
+      params: {
+        entry: 'home',
+        source: PERPS_EVENT_VALUE.SOURCE.PERPS_HOME,
+      },
+    });
+  });
+});
+
+describe('openPerpsModeSelectionIfNeeded', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('opens the chooser and returns true when selection is incomplete', async () => {
+    mockHasCompletedPerpsModeSelection.mockResolvedValue(false);
+    const navigate = jest.fn();
+
+    const opened = await openPerpsModeSelectionIfNeeded(
+      { navigate },
+      {
+        entry: 'home',
+        source: PERPS_EVENT_VALUE.SOURCE.PERPS_HOME,
+      },
+    );
+
+    expect(opened).toBe(true);
+    expect(navigate).toHaveBeenCalledWith(Routes.PERPS.MODALS.ROOT, {
+      screen: Routes.PERPS.MODALS.MODE_SELECTION,
+      params: {
+        entry: 'home',
+        source: PERPS_EVENT_VALUE.SOURCE.PERPS_HOME,
+      },
+    });
+  });
+
+  it('skips the chooser and returns false when selection is already completed', async () => {
+    mockHasCompletedPerpsModeSelection.mockResolvedValue(true);
+    const navigate = jest.fn();
+
+    const opened = await openPerpsModeSelectionIfNeeded(
+      { navigate },
+      {
+        entry: 'market',
+        source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
+      },
+    );
+
+    expect(opened).toBe(false);
+    expect(navigate).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/Perps/utils/openPerpsModeSelection.ts b/app/components/UI/Perps/utils/openPerpsModeSelection.ts
new file mode 100644
index 000000000000..7039c3a17b60
--- /dev/null
+++ b/app/components/UI/Perps/utils/openPerpsModeSelection.ts
@@ -0,0 +1,65 @@
+import Routes from '../../../../constants/navigation/Routes';
+import { PERPS_EVENT_VALUE } from '@metamask/perps-controller/constants';
+import { hasCompletedPerpsModeSelection } from './perpsModeSelectionStorage';
+
+/**
+ * Where the Lite/Pro chooser was opened from. Drives post-selection navigation.
+ *
+ * - `trade`: first-entry chooser from the Trade menu
+ * - `home`: Perps home header toggle
+ * - `market`: Lite/Pro market header pill
+ */
+export type PerpsModeSelectionEntry = 'trade' | 'home' | 'market';
+
+export interface PerpsModeSelectionRouteParams {
+  entry?: PerpsModeSelectionEntry;
+  source?: string;
+}
+
+/**
+ * Minimal navigation surface so callers can pass `AppNavigationProp`, root
+ * `useNavigation()` results, or test doubles without fighting the
+ * `getState(): State | undefined` override on MetaMask's navigation types.
+ *
+ * Method syntax (not a property) keeps `navigate` parameter-bivariant so
+ * strongly typed navigators remain assignable under `strictFunctionTypes`.
+ */
+export interface OpenPerpsModeSelectionNavigation {
+  navigate(name: string, params?: object): void;
+}
+
+/**
+ * Opens the Lite/Pro chooser modal unconditionally (e.g. Trade menu first
+ * entry, which already gates on {@link hasCompletedPerpsModeSelection}).
+ */
+export const openPerpsModeSelection = (
+  navigation: OpenPerpsModeSelectionNavigation,
+  params: PerpsModeSelectionRouteParams = {},
+): void => {
+  navigation.navigate(Routes.PERPS.MODALS.ROOT, {
+    screen: Routes.PERPS.MODALS.MODE_SELECTION,
+    params: {
+      entry: params.entry ?? 'trade',
+      source: params.source ?? PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION,
+    },
+  });
+};
+
+/**
+ * Opens the one-time Lite/Pro chooser when the user has not completed it yet
+ * (shared with Trade → Perps). Returns whether the sheet was opened.
+ *
+ * Header toggles use this so the sheet appears at most once across Trade and
+ * nav-bar entry points.
+ */
+export const openPerpsModeSelectionIfNeeded = async (
+  navigation: OpenPerpsModeSelectionNavigation,
+  params: PerpsModeSelectionRouteParams = {},
+): Promise<boolean> => {
+  if (await hasCompletedPerpsModeSelection()) {
+    return false;
+  }
+
+  openPerpsModeSelection(navigation, params);
+  return true;
+};
diff --git a/app/components/UI/Perps/utils/orderBookGrouping.test.ts b/app/components/UI/Perps/utils/orderBookGrouping.test.ts
index ff9416f18f73..8c79b0d03f37 100644
--- a/app/components/UI/Perps/utils/orderBookGrouping.test.ts
+++ b/app/components/UI/Perps/utils/orderBookGrouping.test.ts
@@ -9,6 +9,8 @@ import {
   getDepthWidth,
   formatSpreadPercent,
   formatColumnValue,
+  formatOrderBookPrice,
+  getOrderBookPriceFormat,
 } from './orderBookGrouping';
 import type { OrderBookLevel } from '../hooks/stream/usePerpsLiveOrderBook';
 import type { OrderBookData } from '@metamask/perps-controller';
@@ -413,4 +415,232 @@ describe('orderBookGrouping', () => {
       ).toContain('300');
     });
   });
+
+  describe('formatColumnValue compact notation', () => {
+    const level = (overrides: Partial<OrderBookLevel>): OrderBookLevel => ({
+      price: '1',
+      size: '1',
+      total: '1',
+      notional: '1',
+      totalNotional: '1',
+      ...overrides,
+    });
+
+    it.each([
+      ['95', '$95'],
+      ['999.4', '$999.4'],
+      // Reported case: 2097 used to render as "$2,097".
+      ['2097', '$2.1K'],
+      ['121000', '$121.0K'],
+      ['604930', '$604.9K'],
+      ['1234567', '$1.2M'],
+      ['2500000000', '$2.5B'],
+    ])('abbreviates USD size %s as %s', (notional, expected) => {
+      expect(formatColumnValue(level({ notional }), 'usd', 'size')).toBe(
+        expected,
+      );
+    });
+
+    it.each([
+      // Low-priced assets (PUMP, PEPE) trade in millions of base units.
+      ['2097000', '2.1M'],
+      ['604930000', '604.9M'],
+    ])('abbreviates base size %s as %s', (size, expected) => {
+      expect(formatColumnValue(level({ size }), 'base', 'size', 0)).toBe(
+        expected,
+      );
+    });
+
+    it('leaves sub-threshold base sizes at the asset precision', () => {
+      expect(formatColumnValue(level({ size: '1.5' }), 'base', 'size', 4)).toBe(
+        '1.5',
+      );
+      expect(formatColumnValue(level({ size: '999' }), 'base', 'size', 4)).toBe(
+        '999',
+      );
+    });
+
+    it('abbreviates the cumulative total the same way as per-level size', () => {
+      expect(
+        formatColumnValue(level({ totalNotional: '2097' }), 'usd', 'total'),
+      ).toBe('$2.1K');
+    });
+  });
+
+  describe('getOrderBookPriceFormat', () => {
+    it.each([
+      // [grouping, midPrice, szDecimals, expected decimals]
+      [0.01, 33.45, 2, 2],
+      [0.002, 0.5, 0, 3],
+      [0.000001, 0.002097, 0, 6],
+    ])(
+      'matches the grouping step below the abbreviation threshold (grouping %p)',
+      (grouping, midPrice, szDecimals, expected) => {
+        expect(getOrderBookPriceFormat(grouping, midPrice, szDecimals)).toEqual(
+          { divisor: 1, suffix: '', decimals: expected },
+        );
+      },
+    );
+
+    it('caps at the asset price precision Hyperliquid allows (6 - szDecimals)', () => {
+      expect(getOrderBookPriceFormat(0.0000001, 0.5, 0)?.decimals).toBe(6);
+      expect(getOrderBookPriceFormat(0.001, 0.5, 5)?.decimals).toBe(1);
+    });
+
+    it('caps at 6 decimals when szDecimals is unknown', () => {
+      expect(getOrderBookPriceFormat(0.0000001, 0.5)?.decimals).toBe(6);
+    });
+
+    it.each([
+      // [grouping, midPrice, expected]
+      [1000, 64500, { divisor: 1000, suffix: 'K', decimals: 0 }],
+      [100, 64500, { divisor: 1000, suffix: 'K', decimals: 1 }],
+      [10, 61470, { divisor: 1000, suffix: 'K', decimals: 2 }],
+      [10000, 5000000, { divisor: 1000000, suffix: 'M', decimals: 2 }],
+      [100000, 52000000, { divisor: 1000000, suffix: 'M', decimals: 1 }],
+    ])(
+      'scales up while the grouping step still fits (grouping %p, mid %p)',
+      (grouping, midPrice, expected) => {
+        expect(getOrderBookPriceFormat(grouping, midPrice, 5)).toEqual(
+          expected,
+        );
+      },
+    );
+
+    it.each([
+      // [grouping, midPrice] — the default grouping at each of these mids.
+      [1000, 5000000],
+      [1000, 1250000],
+    ])(
+      'never drops to a smaller scale than the mid price warrants (grouping %p, mid %p)',
+      (grouping, midPrice) => {
+        // Falling through from M to K produced "$5,000K": thousand separators
+        // inside an abbreviation, and a suffix understating the magnitude.
+        const format = getOrderBookPriceFormat(grouping, midPrice, 2);
+
+        expect(format?.suffix).toBe('M');
+        expect(formatOrderBookPrice(midPrice, format)).not.toContain(',');
+      },
+    );
+
+    it('spends a third decimal when it keeps the honest scale and still saves width', () => {
+      expect(getOrderBookPriceFormat(1000, 5000000, 2)).toEqual({
+        divisor: 1000000,
+        suffix: 'M',
+        decimals: 3,
+      });
+    });
+
+    it('stays unabbreviated when the suffix would cost more width than it saves', () => {
+      // "$61.470K" is longer than "$61,470" and no clearer.
+      expect(getOrderBookPriceFormat(1, 61470, 5)).toEqual({
+        divisor: 1,
+        suffix: '',
+        decimals: 0,
+      });
+    });
+
+    it('stays unabbreviated when the mantissa would need unreadable precision', () => {
+      // "$3.4521K" saves nothing over "$3,452.1" and reads worse.
+      expect(getOrderBookPriceFormat(0.1, 3452, 4)).toEqual({
+        divisor: 1,
+        suffix: '',
+        decimals: 1,
+      });
+    });
+
+    it('never abbreviates assets priced below the smallest scale', () => {
+      expect(getOrderBookPriceFormat(0.1, 999, 4)?.suffix).toBe('');
+    });
+
+    it('ignores the mid price when it is unusable', () => {
+      expect(getOrderBookPriceFormat(1000, null, 5)).toEqual({
+        divisor: 1,
+        suffix: '',
+        decimals: 0,
+      });
+    });
+
+    it.each([[null], [0], [-1], [Number.NaN]])(
+      'returns null for unusable grouping %p',
+      (grouping) => {
+        expect(getOrderBookPriceFormat(grouping, 64500, 0)).toBeNull();
+      },
+    );
+  });
+
+  describe('formatOrderBookPrice', () => {
+    it('abbreviates a BTC ladder grouped in thousands', () => {
+      const format = getOrderBookPriceFormat(1000, 64500, 5);
+
+      // Every level ended in ",000", so three characters per row were padding.
+      expect(
+        [69000, 68000, 67000, 60000].map((price) =>
+          formatOrderBookPrice(price, format),
+        ),
+      ).toEqual(['$69K', '$68K', '$67K', '$60K']);
+    });
+
+    it('keeps the grouping step visible inside the abbreviation', () => {
+      const format = getOrderBookPriceFormat(10, 61470, 5);
+
+      expect(
+        [61470, 61460, 61450].map((price) =>
+          formatOrderBookPrice(price, format),
+        ),
+      ).toEqual(['$61.47K', '$61.46K', '$61.45K']);
+    });
+
+    it('abbreviates a million-dollar ladder at its true magnitude', () => {
+      const format = getOrderBookPriceFormat(1000, 5000000, 2);
+
+      expect(
+        [5000000, 4999000, 4998000].map((price) =>
+          formatOrderBookPrice(price, format),
+        ),
+      ).toEqual(['$5.000M', '$4.999M', '$4.998M']);
+    });
+
+    it('renders every level of a PUMP ladder at the same precision', () => {
+      const format = getOrderBookPriceFormat(0.000001, 0.0021, 0);
+
+      // Trailing-zero stripping previously produced "$0.0021" between
+      // "$0.002099" and "$0.002101", so the column never lined up.
+      expect(
+        ['0.002099', '0.0021', '0.002101'].map((price) =>
+          formatOrderBookPrice(price, format),
+        ),
+      ).toEqual(['$0.002099', '$0.002100', '$0.002101']);
+    });
+
+    it('keeps neighbouring low-priced levels distinguishable', () => {
+      const format = getOrderBookPriceFormat(0.000001, 0.0098, 0);
+      const prices = ['0.0098', '0.009801', '0.009802'].map((price) =>
+        formatOrderBookPrice(price, format),
+      );
+
+      // Magnitude-based formatting collapsed all three into one string.
+      expect(new Set(prices).size).toBe(3);
+    });
+
+    it('drops decimals entirely for coarse groupings', () => {
+      const format = getOrderBookPriceFormat(1, 61470, 5);
+
+      expect(formatOrderBookPrice('61470', format)).toBe('$61,470');
+    });
+
+    it('falls back to magnitude-based formatting when precision is unknown', () => {
+      expect(formatOrderBookPrice('0.002097', null)).toBe('$0.002097');
+    });
+
+    it('returns the fallback display for unparseable prices', () => {
+      expect(
+        formatOrderBookPrice('not-a-number', {
+          divisor: 1,
+          suffix: '',
+          decimals: 2,
+        }),
+      ).toBe('—');
+    });
+  });
 });
diff --git a/app/components/UI/Perps/utils/orderBookGrouping.ts b/app/components/UI/Perps/utils/orderBookGrouping.ts
index d9044e1b11de..4ffc65175c81 100644
--- a/app/components/UI/Perps/utils/orderBookGrouping.ts
+++ b/app/components/UI/Perps/utils/orderBookGrouping.ts
@@ -3,6 +3,7 @@ import {
   type OrderBookLevel,
 } from '@metamask/perps-controller';
 import {
+  type FiatRangeConfig,
   formatPerpsFiat,
   formatPositionSize,
   formatLargeNumber,
@@ -39,9 +40,41 @@ export type OrderBookListCurrency = 'base' | 'usd';
 /** Metric shown in the value column: per-level size or cumulative total. */
 export type OrderBookListMetric = 'size' | 'total';
 
-/** Compact-notation thresholds for USD amounts. */
-const USD_COMPACT_MILLIONS_THRESHOLD = 1_000_000;
-const USD_COMPACT_THOUSANDS_THRESHOLD = 10_000;
+/**
+ * Size/total values switch to compact K/M/B/T notation at or above this
+ * amount. The value column is only 62px wide, so anything with more than four
+ * digits has to be abbreviated — low-priced assets (PUMP, PEPE) otherwise
+ * render 7-10 digit sizes that overflow or shrink the price column.
+ */
+const COMPACT_NOTATION_THRESHOLD = 1_000;
+
+/**
+ * Decimals kept on compacted values ("$2.1K", "604.9K", "$1.2M"). Fixed
+ * rather than magnitude-dependent so the right-aligned column stays aligned.
+ */
+const COMPACT_NOTATION_DECIMALS = 1;
+
+/** Hyperliquid's absolute cap on perp price decimals (`MaxPriceDecimals`). */
+const MAX_PRICE_DECIMALS = 6;
+
+/** Gap between adjacent magnitude scales; also the mantissa's upper bound. */
+const SCALE_STEP = 1000;
+
+/**
+ * Magnitude scales a ladder price can be shown in, largest first.
+ */
+const PRICE_SCALES = [
+  { divisor: 1_000_000_000_000, suffix: 'T' },
+  { divisor: 1_000_000_000, suffix: 'B' },
+  { divisor: 1_000_000, suffix: 'M' },
+  { divisor: 1_000, suffix: 'K' },
+] as const;
+
+/**
+ * Most decimals an abbreviated price may carry. Past this the number reads as
+ * noise ("$3.4521K") whatever it saves, so the ladder stays unabbreviated.
+ */
+const MAX_ABBREVIATED_PRICE_DECIMALS = 3;
 
 /** Decimal places kept when rendering the spread as a percentage. */
 const SPREAD_PERCENT_DECIMALS = 3;
@@ -273,11 +306,10 @@ function formatUsd(value: number): string {
   if (!Number.isFinite(value)) {
     return ORDER_BOOK_FALLBACK_DISPLAY;
   }
-  if (value >= USD_COMPACT_MILLIONS_THRESHOLD) {
-    return `$${formatLargeNumber(value, { decimals: 1 })}`;
-  }
-  if (value >= USD_COMPACT_THOUSANDS_THRESHOLD) {
-    return `$${formatLargeNumber(value, { decimals: 0 })}`;
+  if (Math.abs(value) >= COMPACT_NOTATION_THRESHOLD) {
+    return `$${formatLargeNumber(value, {
+      decimals: COMPACT_NOTATION_DECIMALS,
+    })}`;
   }
   return formatPerpsFiat(value, { ranges: PRICE_RANGES_UNIVERSAL });
 }
@@ -286,11 +318,174 @@ function formatBase(value: number, szDecimals?: number): string {
   if (!Number.isFinite(value)) {
     return ORDER_BOOK_FALLBACK_DISPLAY;
   }
+  if (Math.abs(value) >= COMPACT_NOTATION_THRESHOLD) {
+    return formatLargeNumber(value, { decimals: COMPACT_NOTATION_DECIMALS });
+  }
   return formatPositionSize(value, szDecimals);
 }
 
+/**
+ * Exact decimal-place count for a number, via its exponential form so values
+ * like 1e-7 and 0.002 are read off the mantissa/exponent instead of a
+ * `Math.log10` result that can land just under an integer boundary.
+ */
+function countDecimalPlaces(value: number): number {
+  const [mantissa, exponent] = Math.abs(value).toExponential().split('e');
+  const mantissaDecimals = (mantissa.split('.')[1] ?? '').length;
+  return Math.max(0, mantissaDecimals - Number(exponent));
+}
+
+/**
+ * How every price in the ladder should be rendered.
+ *
+ * @property divisor - Value the price is divided by before formatting.
+ * @property suffix - Magnitude suffix appended after the number.
+ * @property decimals - Fixed decimals shown after dividing.
+ */
+export interface OrderBookPriceFormat {
+  divisor: number;
+  suffix: string;
+  decimals: number;
+}
+
+/**
+ * Resolve the one price format the whole ladder renders with.
+ *
+ * Everything is driven by the **active grouping increment**, because that is
+ * the price step actually on screen and therefore the only precision that
+ * carries information. Two rules fall out of it:
+ *
+ * Decimals match the grouping, capped at Hyperliquid's price precision for the
+ * asset (`6 - szDecimals`). Fewer decimals collapses neighbouring levels into
+ * one identical string (every PEPE level rendered as "$0.00001"); more is
+ * noise, and letting it vary per row makes the column wobble — that is what
+ * trailing-zero stripping caused: "$0.0021" between "$0.002099" and
+ * "$0.002101".
+ *
+ * Magnitude is the one scale that leaves a mantissa in [1, 1000), so the suffix
+ * always states the true magnitude — never a smaller scale, which is how
+ * "$5,000K" (thousand separators inside an abbreviation) used to slip out. The
+ * abbreviation is then kept only when it is no longer than the plain form.
+ * Grouping by 1,000 means the last three digits never change, so "$69,000"
+ * spends three characters on padding where "$69K" says the same thing, and
+ * grouping by 10 needs two decimals to keep the step visible ("$61.47K"). The
+ * same grouping of 1,000 against a $5M mid needs three decimals to stay at M
+ * scale, which still beats "$5,000,000" and so renders "$5.000M"; against a
+ * $61,470 mid it would give "$61.470K", longer than "$61,470", so that ladder
+ * stays unabbreviated.
+ *
+ * The scale is resolved once from the mid price rather than per row, otherwise
+ * levels either side of a boundary would render at different magnitudes.
+ * Assets priced under $1,000 never reach a scale, so small-price ladders
+ * (PUMP, PEPE) keep their full decimal form.
+ *
+ * @param grouping - Active price grouping increment, or null when unknown.
+ * @param midPrice - Ladder mid price, used to pick the magnitude.
+ * @param szDecimals - Asset base-size precision from Hyperliquid metadata.
+ * @returns The shared format, or null to fall back to magnitude-based rules.
+ */
+export function getOrderBookPriceFormat(
+  grouping: number | null,
+  midPrice?: number | null,
+  szDecimals?: number,
+): OrderBookPriceFormat | null {
+  if (grouping === null || !Number.isFinite(grouping) || grouping <= 0) {
+    return null;
+  }
+
+  const maxDecimals =
+    typeof szDecimals === 'number' && Number.isFinite(szDecimals)
+      ? Math.max(0, MAX_PRICE_DECIMALS - szDecimals)
+      : MAX_PRICE_DECIMALS;
+  const plain: OrderBookPriceFormat = {
+    divisor: 1,
+    suffix: '',
+    decimals: Math.min(countDecimalPlaces(grouping), maxDecimals),
+  };
+
+  if (typeof midPrice !== 'number' || !Number.isFinite(midPrice)) {
+    return plain;
+  }
+
+  const magnitude = Math.abs(midPrice);
+  const scale = PRICE_SCALES.find(
+    (candidate) =>
+      magnitude >= candidate.divisor &&
+      magnitude < candidate.divisor * SCALE_STEP,
+  );
+  if (!scale) {
+    return plain;
+  }
+
+  const decimals = countDecimalPlaces(grouping / scale.divisor);
+  if (decimals > MAX_ABBREVIATED_PRICE_DECIMALS) {
+    return plain;
+  }
+
+  const abbreviated: OrderBookPriceFormat = {
+    divisor: scale.divisor,
+    suffix: scale.suffix,
+    decimals,
+  };
+  const isWorthIt =
+    formatOrderBookPrice(midPrice, abbreviated).length <=
+    formatOrderBookPrice(midPrice, plain).length;
+  return isWorthIt ? abbreviated : plain;
+}
+
+/**
+ * Range configs are rebuilt per decimal count, so cache them — the ladder
+ * reformats every price on each live tick.
+ */
+const fixedDecimalRanges = new Map<number, FiatRangeConfig[]>();
+
+function getFixedDecimalRanges(decimals: number): FiatRangeConfig[] {
+  const cached = fixedDecimalRanges.get(decimals);
+  if (cached) {
+    return cached;
+  }
+  const ranges: FiatRangeConfig[] = [
+    {
+      condition: () => true,
+      minimumDecimals: decimals,
+      maximumDecimals: decimals,
+      // 0 disables the "<$x" small-value substitution, which would otherwise
+      // mask genuine sub-cent ladder prices.
+      threshold: 0,
+    },
+  ];
+  fixedDecimalRanges.set(decimals, ranges);
+  return ranges;
+}
+
+/**
+ * Format a ladder price with the shared format from `getOrderBookPriceFormat`.
+ * Falls back to magnitude-based formatting when the format is unknown.
+ */
+export function formatOrderBookPrice(
+  price: string | number,
+  format: OrderBookPriceFormat | null,
+): string {
+  const value = typeof price === 'number' ? price : Number.parseFloat(price);
+  if (!Number.isFinite(value)) {
+    return ORDER_BOOK_FALLBACK_DISPLAY;
+  }
+  if (format === null) {
+    return formatPerpsFiat(value, { ranges: PRICE_RANGES_UNIVERSAL });
+  }
+  const formatted = formatPerpsFiat(value / format.divisor, {
+    ranges: getFixedDecimalRanges(format.decimals),
+    stripTrailingZeros: false,
+  });
+  return `${formatted}${format.suffix}`;
+}
+
 /**
  * Format the value shown in the metric column based on currency + metric.
+ *
+ * Anything at or above 1,000 is abbreviated to one decimal ("$2.1K", "1.2M")
+ * in both denominations; below that, USD uses fiat rules and base sizes use
+ * the asset's `szDecimals`.
  */
 export function formatColumnValue(
   level: OrderBookLevel,
diff --git a/app/components/UI/Perps/utils/orderEditUtils.test.ts b/app/components/UI/Perps/utils/orderEditUtils.test.ts
new file mode 100644
index 000000000000..19399844d7ac
--- /dev/null
+++ b/app/components/UI/Perps/utils/orderEditUtils.test.ts
@@ -0,0 +1,75 @@
+import type { Order } from '@metamask/perps-controller';
+import {
+  buildOrderEditParams,
+  buildOrderOptimisticEdit,
+  getOrderEditConfirmedSize,
+  getOrderEditMarketPrice,
+  getOrderEditPreviousValue,
+  getOrderEditableLimitPrice,
+  getOrderEditableSize,
+  hasOrderEditValueChanged,
+} from './orderEditUtils';
+
+const baseOrder: Order = {
+  orderId: 'order-1',
+  symbol: 'ETH',
+  side: 'sell',
+  size: '2',
+  originalSize: '2',
+  remainingSize: '2',
+  filledSize: '0',
+  price: '3000',
+  orderType: 'limit',
+  status: 'open',
+  timestamp: 1_711_756_800_000, // 2024-03-30T00:00:00.000Z — fixed for determinism
+  reduceOnly: true,
+  isTrigger: false,
+};
+
+describe('orderEditUtils', () => {
+  it('reads editable limit price and size from the order', () => {
+    expect(getOrderEditableLimitPrice(baseOrder)).toBe('3000');
+    expect(getOrderEditableSize(baseOrder)).toBe('2');
+  });
+
+  it('detects unchanged price and size edits', () => {
+    expect(hasOrderEditValueChanged(baseOrder, 'price', '3000')).toBe(false);
+    expect(hasOrderEditValueChanged(baseOrder, 'size', '2')).toBe(false);
+    expect(hasOrderEditValueChanged(baseOrder, 'price', '3100')).toBe(true);
+    expect(hasOrderEditValueChanged(baseOrder, 'size', '1.5')).toBe(true);
+  });
+
+  it('builds optimistic patches and controller params per field', () => {
+    expect(buildOrderOptimisticEdit('price', '3100')).toEqual({
+      limitPrice: '3100',
+    });
+    expect(buildOrderOptimisticEdit('size', '1.5')).toEqual({ size: '1.5' });
+
+    const trackingData = { totalFee: 0, marketPrice: 3100, source: 'test' };
+    expect(
+      buildOrderEditParams(baseOrder, 'price', '3100', 10, trackingData),
+    ).toEqual(
+      expect.objectContaining({
+        price: '3100',
+        size: '2',
+      }),
+    );
+    expect(
+      buildOrderEditParams(baseOrder, 'size', '1.5', 10, trackingData),
+    ).toEqual(
+      expect.objectContaining({
+        price: '3000',
+        size: '1.5',
+      }),
+    );
+  });
+
+  it('resolves market price, rollback value, and confirmed size', () => {
+    expect(getOrderEditMarketPrice(baseOrder, 'price', '3100')).toBe(3100);
+    expect(getOrderEditMarketPrice(baseOrder, 'size', '1.5')).toBe(3000);
+    expect(getOrderEditPreviousValue(baseOrder, 'price')).toBe('3000');
+    expect(getOrderEditPreviousValue(baseOrder, 'size')).toBe('2');
+    expect(getOrderEditConfirmedSize(baseOrder, 'size', '1.5')).toBe('1.5');
+    expect(getOrderEditConfirmedSize(baseOrder, 'price', '3100')).toBe('2');
+  });
+});
diff --git a/app/components/UI/Perps/utils/orderEditUtils.ts b/app/components/UI/Perps/utils/orderEditUtils.ts
new file mode 100644
index 000000000000..6cc9a1149184
--- /dev/null
+++ b/app/components/UI/Perps/utils/orderEditUtils.ts
@@ -0,0 +1,110 @@
+import type { Order, OrderParams } from '@metamask/perps-controller';
+import { buildEditOrderParamsFromOrder } from './orderParams';
+import { getValidOrderPrice } from './orderUtils';
+
+export type OrderEditField = 'price' | 'size';
+
+type OrderTrackingData = OrderParams['trackingData'];
+
+export interface OrderOptimisticEdit {
+  limitPrice?: string;
+  size?: string;
+}
+
+/** Resting limit price for an editable open order. */
+export const getOrderEditableLimitPrice = (order: Order): string =>
+  getValidOrderPrice(order)?.toString() ?? order.price ?? '';
+
+/** Remaining token size for an editable open order. */
+export const getOrderEditableSize = (order: Order): string =>
+  order.remainingSize ?? order.originalSize ?? order.size;
+
+/** Whether the submitted value differs from the order's current field value. */
+export const hasOrderEditValueChanged = (
+  order: Order,
+  field: OrderEditField,
+  newValue: string,
+): boolean => {
+  if (field === 'price') {
+    const currentPrice = getValidOrderPrice(order);
+    const parsedNewPrice = Number.parseFloat(newValue);
+    return !(
+      currentPrice !== null &&
+      Number.isFinite(parsedNewPrice) &&
+      currentPrice === parsedNewPrice
+    );
+  }
+
+  const currentSize = getOrderEditableSize(order);
+  const parsedNewSize = Number.parseFloat(newValue);
+  const parsedCurrentSize = Number.parseFloat(currentSize);
+  return !(
+    Number.isFinite(parsedNewSize) &&
+    Number.isFinite(parsedCurrentSize) &&
+    parsedNewSize === parsedCurrentSize
+  );
+};
+
+/** Previous value to restore after a failed optimistic edit. */
+export const getOrderEditPreviousValue = (
+  order: Order,
+  field: OrderEditField,
+): string | undefined => {
+  if (field === 'price') {
+    // Prefer validated price so rollback matches change-detection input.
+    return getValidOrderPrice(order)?.toString() ?? order.price;
+  }
+
+  return getOrderEditableSize(order);
+};
+
+/** Market price used in edit-order tracking for the given field update. */
+export const getOrderEditMarketPrice = (
+  order: Order,
+  field: OrderEditField,
+  newValue: string,
+): number => {
+  if (field === 'price') {
+    const parsedNewPrice = Number.parseFloat(newValue);
+    const currentPrice = getValidOrderPrice(order);
+    return Number.isFinite(parsedNewPrice) && parsedNewPrice > 0
+      ? parsedNewPrice
+      : (currentPrice ?? 0);
+  }
+
+  const parsedLimitPrice = Number.parseFloat(getOrderEditableLimitPrice(order));
+  return Number.isFinite(parsedLimitPrice) && parsedLimitPrice > 0
+    ? parsedLimitPrice
+    : 0;
+};
+
+/** Size string included in the post-edit success toast. */
+export const getOrderEditConfirmedSize = (
+  order: Order,
+  field: OrderEditField,
+  newValue: string,
+): string => (field === 'size' ? newValue : order.size);
+
+/** Builds the optimistic cache patch for a single-field order edit. */
+export const buildOrderOptimisticEdit = (
+  field: OrderEditField,
+  newValue: string,
+): OrderOptimisticEdit =>
+  field === 'price' ? { limitPrice: newValue } : { size: newValue };
+
+/** Builds controller params for a single-field order edit. */
+export const buildOrderEditParams = (
+  order: Order,
+  field: OrderEditField,
+  newValue: string,
+  leverage: number,
+  trackingData: OrderTrackingData,
+): OrderParams =>
+  buildEditOrderParamsFromOrder({
+    order,
+    leverage,
+    ...(field === 'price'
+      ? { newLimitPrice: newValue }
+      : { newSize: newValue }),
+    trackingData,
+  });
diff --git a/app/components/UI/Perps/utils/orderParams.test.ts b/app/components/UI/Perps/utils/orderParams.test.ts
new file mode 100644
index 000000000000..4a5b0b451a62
--- /dev/null
+++ b/app/components/UI/Perps/utils/orderParams.test.ts
@@ -0,0 +1,270 @@
+import { ORDER_SLIPPAGE_CONFIG } from '@metamask/perps-controller';
+import {
+  buildPerpsOrderParams,
+  buildPerpsOrderTrackingData,
+  buildEditOrderParamsFromOrder,
+} from './orderParams';
+
+const trackingData = buildPerpsOrderTrackingData({
+  marginRequired: '20',
+  feeResults: {
+    totalFee: 5,
+    metamaskFee: 1,
+    metamaskFeeRate: 0.01,
+    feeDiscountPercentage: 10,
+    estimatedPoints: 100,
+  },
+  marketPrice: 90000,
+  inputMethod: 'default' as const,
+  direction: 'long',
+  chartLibrary: 'lightweight',
+});
+
+describe('buildPerpsOrderParams', () => {
+  const base = {
+    asset: 'BTC',
+    isBuy: true,
+    size: '0.001',
+    effectivePrice: 90000,
+    leverage: 5,
+    usdAmount: '100',
+    maxSlippageBps: 100,
+    trackingData,
+  };
+
+  it('builds a market order without a price and with the user max slippage', () => {
+    // Arrange / Act
+    const params = buildPerpsOrderParams({ ...base, orderType: 'market' });
+
+    // Assert
+    expect(params).toMatchObject({
+      symbol: 'BTC',
+      isBuy: true,
+      orderType: 'market',
+      currentPrice: 90000,
+      priceAtCalculation: 90000,
+      usdAmount: '100',
+      maxSlippageBps: 100,
+    });
+    expect(params).not.toHaveProperty('price');
+    expect(params).not.toHaveProperty('reduceOnly');
+    expect(params).not.toHaveProperty('takeProfitPrice');
+  });
+
+  it('builds a limit order with the price and the fixed default slippage', () => {
+    // Arrange / Act
+    const params = buildPerpsOrderParams({
+      ...base,
+      orderType: 'limit',
+      limitPrice: '80000',
+    });
+
+    // Assert
+    expect(params.price).toBe('80000');
+    expect(params.maxSlippageBps).toBe(
+      ORDER_SLIPPAGE_CONFIG.DefaultLimitSlippageBps,
+    );
+  });
+
+  it('includes reduceOnly when provided (including false)', () => {
+    // Arrange / Act
+    const on = buildPerpsOrderParams({
+      ...base,
+      orderType: 'market',
+      reduceOnly: true,
+    });
+    const off = buildPerpsOrderParams({
+      ...base,
+      orderType: 'market',
+      reduceOnly: false,
+    });
+
+    // Assert
+    expect(on.reduceOnly).toBe(true);
+    expect(off.reduceOnly).toBe(false);
+  });
+
+  it('includes TP/SL only when non-empty after trimming', () => {
+    // Arrange / Act
+    const withTpSl = buildPerpsOrderParams({
+      ...base,
+      orderType: 'market',
+      takeProfitPrice: '95000',
+      stopLossPrice: ' ',
+    });
+
+    // Assert
+    expect(withTpSl.takeProfitPrice).toBe('95000');
+    expect(withTpSl).not.toHaveProperty('stopLossPrice');
+  });
+
+  it('omits TP/SL when reduceOnly is true even if values are present', () => {
+    const params = buildPerpsOrderParams({
+      ...base,
+      orderType: 'market',
+      reduceOnly: true,
+      isFullClose: true,
+      takeProfitPrice: '95000',
+      stopLossPrice: '80000',
+    });
+
+    expect(params.reduceOnly).toBe(true);
+    expect(params.isFullClose).toBe(true);
+    expect(params).not.toHaveProperty('takeProfitPrice');
+    expect(params).not.toHaveProperty('stopLossPrice');
+  });
+});
+
+describe('buildPerpsOrderTrackingData', () => {
+  const base = {
+    marginRequired: '20',
+    feeResults: {
+      totalFee: 5,
+      metamaskFee: 1,
+      metamaskFeeRate: 0.01,
+      feeDiscountPercentage: 10,
+      estimatedPoints: 100,
+    },
+    marketPrice: 90000,
+    inputMethod: 'default' as const,
+    direction: 'long' as const,
+    chartLibrary: 'lightweight',
+  };
+
+  it('marks trades without a custom token and omits pay-token fields', () => {
+    // Arrange / Act
+    const result = buildPerpsOrderTrackingData(base) as Record<string, unknown>;
+
+    // Assert
+    expect(result.tradeWithToken).toBe(false);
+    expect(result).not.toHaveProperty('mmPayTokenSelected');
+    expect(result.marginUsed).toBe(20);
+  });
+
+  it('includes pay-token fields when a custom token is selected', () => {
+    // Arrange / Act
+    const result = buildPerpsOrderTrackingData({
+      ...base,
+      hasCustomTokenSelected: true,
+      payToken: { symbol: 'USDC', chainId: 42161 },
+    }) as Record<string, unknown>;
+
+    // Assert
+    expect(result.tradeWithToken).toBe(true);
+    expect(result.mmPayTokenSelected).toBe('USDC');
+    expect(result.mmPayNetworkSelected).toBe('42161');
+  });
+
+  it('includes hlFeeRate only when the protocol fee rate is defined', () => {
+    // Arrange / Act
+    const withRate = buildPerpsOrderTrackingData({
+      ...base,
+      feeResults: { ...base.feeResults, protocolFeeRate: 0.02 },
+    }) as Record<string, unknown>;
+    const withoutRate = buildPerpsOrderTrackingData(base) as Record<
+      string,
+      unknown
+    >;
+
+    // Assert
+    expect(withRate.hlFeeRate).toBe(0.02);
+    expect(withoutRate).not.toHaveProperty('hlFeeRate');
+  });
+});
+
+describe('buildEditOrderParamsFromOrder', () => {
+  const order = {
+    orderId: 'order-1',
+    symbol: 'ETH',
+    side: 'sell' as const,
+    size: '2',
+    originalSize: '2',
+    remainingSize: '2',
+    filledSize: '0',
+    price: '3000',
+    orderType: 'limit' as const,
+    status: 'open' as const,
+    timestamp: 1_711_756_800_000, // 2024-03-30T00:00:00.000Z — fixed for determinism
+    reduceOnly: true,
+    isTrigger: false,
+  };
+
+  it('builds limit edit params with updated price and reduce-only flag', () => {
+    const params = buildEditOrderParamsFromOrder({
+      order,
+      newLimitPrice: '3100',
+      trackingData: { totalFee: 0, marketPrice: 3100, source: 'test' },
+    });
+
+    expect(params).toEqual(
+      expect.objectContaining({
+        symbol: 'ETH',
+        isBuy: false,
+        size: '2',
+        orderType: 'limit',
+        price: '3100',
+        reduceOnly: true,
+        currentPrice: 3100,
+        priceAtCalculation: 3100,
+        trackingData: expect.objectContaining({ source: 'test' }),
+      }),
+    );
+  });
+
+  it('builds limit edit params with updated size', () => {
+    const params = buildEditOrderParamsFromOrder({
+      order,
+      newSize: '1.5',
+      trackingData: { totalFee: 0, marketPrice: 3000, source: 'test' },
+    });
+
+    expect(params).toEqual(
+      expect.objectContaining({
+        symbol: 'ETH',
+        isBuy: false,
+        size: '1.5',
+        orderType: 'limit',
+        price: '3000',
+        reduceOnly: true,
+        currentPrice: 3000,
+        priceAtCalculation: 3000,
+      }),
+    );
+  });
+
+  it('includes effective leverage in edit params when provided', () => {
+    const params = buildEditOrderParamsFromOrder({
+      order,
+      newLimitPrice: '3100',
+      leverage: 5,
+      trackingData: { totalFee: 0, marketPrice: 3100, source: 'test' },
+    });
+
+    expect(params).toEqual(
+      expect.objectContaining({
+        leverage: 5,
+        price: '3100',
+      }),
+    );
+  });
+
+  it('preserves attached take-profit and stop-loss prices on edit', () => {
+    const params = buildEditOrderParamsFromOrder({
+      order: {
+        ...order,
+        takeProfitPrice: '3500',
+        stopLossPrice: '2500',
+      },
+      newLimitPrice: '3100',
+      trackingData: { totalFee: 0, marketPrice: 3100, source: 'test' },
+    });
+
+    expect(params).toEqual(
+      expect.objectContaining({
+        takeProfitPrice: '3500',
+        stopLossPrice: '2500',
+        price: '3100',
+      }),
+    );
+  });
+});
diff --git a/app/components/UI/Perps/utils/orderParams.ts b/app/components/UI/Perps/utils/orderParams.ts
new file mode 100644
index 000000000000..8f9fa3e98758
--- /dev/null
+++ b/app/components/UI/Perps/utils/orderParams.ts
@@ -0,0 +1,206 @@
+import {
+  ORDER_SLIPPAGE_CONFIG,
+  type InputMethod,
+  type Order,
+  type OrderParams,
+  type OrderType,
+  type Position,
+} from '@metamask/perps-controller';
+import { derivePerpsTradeAction } from './deriveTradeAction';
+import { toPerpsEntryAttribution } from './perpsAnalyticsAttribution';
+
+type OrderTrackingData = OrderParams['trackingData'];
+
+export interface BuildPerpsOrderTrackingDataInput {
+  /** Required margin string (converted to a number for the event). */
+  marginRequired: string | undefined;
+  feeResults: {
+    totalFee: number;
+    metamaskFee: number;
+    metamaskFeeRate: number | undefined;
+    feeDiscountPercentage?: number;
+    estimatedPoints?: number;
+    protocolFeeRate?: number;
+  };
+  /** Mid/market price at submission. */
+  marketPrice: number;
+  /** Input method that produced the amount ('default' for the Pro inline form). */
+  inputMethod: InputMethod;
+  source?: string;
+  sourceSection?: string;
+  currentMarketPosition?: Position | null;
+  direction: 'long' | 'short';
+  chartLibrary: string;
+  vipTier?: number | null;
+  /** Pay-with-any-token context (lite only); omit for the direct Pro path. */
+  hasCustomTokenSelected?: boolean;
+  payToken?: { symbol?: string; chainId?: string | number } | null;
+}
+
+/**
+ * Pure assembly of the Perps order `trackingData` MetaMetrics payload shared by
+ * the lite (`PerpsOrderView`) and Pro (`usePerpsProOrderForm`) order forms. The
+ * pay-with-any-token fields are optional so the direct Pro path can omit them.
+ * Mirrors the lite form's original inline object exactly.
+ *
+ * @param input - Tracking data inputs.
+ * @returns The controller `trackingData` payload.
+ */
+export const buildPerpsOrderTrackingData = ({
+  marginRequired,
+  feeResults,
+  marketPrice,
+  inputMethod,
+  source,
+  sourceSection,
+  currentMarketPosition,
+  direction,
+  chartLibrary,
+  vipTier,
+  hasCustomTokenSelected,
+  payToken,
+}: BuildPerpsOrderTrackingDataInput): OrderTrackingData => ({
+  marginUsed: Number(marginRequired),
+  totalFee: feeResults.totalFee,
+  marketPrice,
+  metamaskFee: feeResults.metamaskFee,
+  metamaskFeeRate: feeResults.metamaskFeeRate,
+  feeDiscountPercentage: feeResults.feeDiscountPercentage,
+  estimatedPoints: feeResults.estimatedPoints,
+  inputMethod,
+  source,
+  ...toPerpsEntryAttribution({ source, sourceSection }),
+  ...(feeResults.protocolFeeRate !== undefined
+    ? { hlFeeRate: feeResults.protocolFeeRate }
+    : {}),
+  tradeAction: derivePerpsTradeAction(currentMarketPosition, direction),
+  chartLibrary,
+  tradeWithToken: Boolean(hasCustomTokenSelected),
+  ...(hasCustomTokenSelected && payToken
+    ? {
+        mmPayTokenSelected: payToken.symbol ?? '',
+        mmPayNetworkSelected: String(payToken.chainId ?? ''),
+      }
+    : {}),
+  vipTier: vipTier ?? undefined,
+  vipDiscount: feeResults.feeDiscountPercentage,
+});
+
+export interface BuildPerpsOrderParamsInput {
+  asset: string;
+  isBuy: boolean;
+  /** Position size (token units) — kept for backward compat; provider recalculates from usdAmount. */
+  size: string;
+  orderType: OrderType;
+  /** Effective price used for both `currentPrice` and `priceAtCalculation`. */
+  effectivePrice: number;
+  leverage: number;
+  usdAmount: string;
+  /** User-configured max slippage (bps); limit orders override to the fixed default. */
+  maxSlippageBps: number;
+  limitPrice?: string;
+  takeProfitPrice?: string;
+  stopLossPrice?: string;
+  /** Reduce-only flag (Pro only); omitted for lite. */
+  reduceOnly?: boolean;
+  /**
+   * True when the order consumes the full open position.
+   * Enables the controller's minimum-notional exemption for dust closes.
+   */
+  isFullClose?: boolean;
+  trackingData: OrderTrackingData;
+}
+
+/**
+ * Pure assembly of the controller `OrderParams` shared by the lite
+ * (`PerpsOrderView`) and Pro (`usePerpsProOrderForm`) order forms. Limit orders
+ * use the fixed default slippage; TP/SL/limit price and `reduceOnly` are only
+ * included when present. TP/SL are never attached to reduce-only orders.
+ *
+ * @param input - Order params inputs.
+ * @returns The controller `OrderParams`.
+ */
+export const buildPerpsOrderParams = ({
+  asset,
+  isBuy,
+  size,
+  orderType,
+  effectivePrice,
+  leverage,
+  usdAmount,
+  maxSlippageBps,
+  limitPrice,
+  takeProfitPrice,
+  stopLossPrice,
+  reduceOnly,
+  isFullClose,
+  trackingData,
+}: BuildPerpsOrderParamsInput): OrderParams => ({
+  symbol: asset,
+  isBuy,
+  size,
+  orderType,
+  currentPrice: effectivePrice,
+  leverage,
+  usdAmount,
+  priceAtCalculation: effectivePrice,
+  maxSlippageBps:
+    orderType === 'limit'
+      ? ORDER_SLIPPAGE_CONFIG.DefaultLimitSlippageBps
+      : maxSlippageBps,
+  ...(reduceOnly !== undefined ? { reduceOnly } : {}),
+  ...(isFullClose !== undefined ? { isFullClose } : {}),
+  ...(orderType === 'limit' && limitPrice ? { price: limitPrice } : {}),
+  // Reduce-only closes cannot attach TP/SL — omit even if stale values remain.
+  ...(!reduceOnly && takeProfitPrice?.trim() ? { takeProfitPrice } : {}),
+  ...(!reduceOnly && stopLossPrice?.trim() ? { stopLossPrice } : {}),
+  trackingData,
+});
+
+export interface BuildEditOrderParamsInput {
+  order: Order;
+  newLimitPrice?: string;
+  newSize?: string;
+  leverage?: number;
+  trackingData: OrderTrackingData;
+}
+
+/**
+ * Builds controller `OrderParams` for editing an existing limit order.
+ * Unspecified fields are taken from the open order.
+ */
+export const buildEditOrderParamsFromOrder = ({
+  order,
+  newLimitPrice,
+  newSize,
+  leverage,
+  trackingData,
+}: BuildEditOrderParamsInput): OrderParams => {
+  const limitPrice = newLimitPrice ?? order.price ?? '';
+  const parsedPrice = Number.parseFloat(limitPrice);
+  const size =
+    newSize ?? order.remainingSize ?? order.originalSize ?? order.size;
+
+  return {
+    symbol: order.symbol,
+    isBuy: order.side === 'buy',
+    size,
+    orderType: 'limit',
+    currentPrice: parsedPrice,
+    priceAtCalculation: parsedPrice,
+    maxSlippageBps: ORDER_SLIPPAGE_CONFIG.DefaultLimitSlippageBps,
+    price: limitPrice,
+    ...(typeof leverage === 'number' && leverage > 0 ? { leverage } : {}),
+    ...(order.reduceOnly ? { reduceOnly: true } : {}),
+    // Carry TP/SL prices through params for parity with placement flows. The
+    // HyperLiquid modify wire payload does not read these fields today; size
+    // edits on orders with attached TP/SL are blocked separately in the app.
+    ...(order.takeProfitPrice?.trim()
+      ? { takeProfitPrice: order.takeProfitPrice }
+      : {}),
+    ...(order.stopLossPrice?.trim()
+      ? { stopLossPrice: order.stopLossPrice }
+      : {}),
+    trackingData,
+  };
+};
diff --git a/app/components/UI/Perps/utils/orderSizing.test.ts b/app/components/UI/Perps/utils/orderSizing.test.ts
new file mode 100644
index 000000000000..59ece5be7bd5
--- /dev/null
+++ b/app/components/UI/Perps/utils/orderSizing.test.ts
@@ -0,0 +1,101 @@
+import { PERPS_CONSTANTS } from '@metamask/perps-controller';
+import { deriveOrderSizing } from './orderSizing';
+
+describe('deriveOrderSizing', () => {
+  const base = {
+    amount: '100',
+    marketPrice: 90000,
+    markPrice: 90050,
+    leverage: 5,
+    szDecimals: 3,
+    isLoadingMarketData: false,
+  };
+
+  it('uses the market price as the effective price for market orders', () => {
+    // Arrange / Act
+    const result = deriveOrderSizing({ ...base, orderType: 'market' });
+
+    // Assert
+    expect(result.effectivePrice).toBe(90000);
+    expect(result.positionSize).not.toBe(PERPS_CONSTANTS.FallbackDataDisplay);
+    expect(result.marginRequired).toBeDefined();
+  });
+
+  it('uses a valid limit price as the effective price for limit orders', () => {
+    // Arrange / Act
+    const result = deriveOrderSizing({
+      ...base,
+      orderType: 'limit',
+      limitPrice: '80000',
+    });
+
+    // Assert
+    expect(result.effectivePrice).toBe(80000);
+  });
+
+  it('falls back to the market price when a limit order has no/zero limit price', () => {
+    // Arrange / Act
+    const result = deriveOrderSizing({
+      ...base,
+      orderType: 'limit',
+      limitPrice: '0',
+    });
+
+    // Assert
+    expect(result.effectivePrice).toBe(90000);
+  });
+
+  it('returns the fallback position size and no margin while market data loads', () => {
+    // Arrange / Act
+    const result = deriveOrderSizing({
+      ...base,
+      orderType: 'market',
+      isLoadingMarketData: true,
+    });
+
+    // Assert
+    expect(result.positionSize).toBe(PERPS_CONSTANTS.FallbackDataDisplay);
+    expect(result.marginRequired).toBeUndefined();
+  });
+
+  it('returns no margin when the amount is empty', () => {
+    // Arrange / Act
+    const result = deriveOrderSizing({
+      ...base,
+      amount: '',
+      orderType: 'market',
+    });
+
+    // Assert
+    expect(result.marginRequired).toBeUndefined();
+  });
+
+  it('uses the mark price (not market price) as the margin basis for market orders', () => {
+    // Arrange / Act: with a distinct markPrice, margin reflects the oracle basis
+    const withMark = deriveOrderSizing({
+      ...base,
+      orderType: 'market',
+      markPrice: 100000,
+    });
+    const withoutMark = deriveOrderSizing({
+      ...base,
+      orderType: 'market',
+      markPrice: 90000,
+    });
+
+    // Assert
+    expect(withMark.marginRequired).not.toBe(withoutMark.marginRequired);
+  });
+
+  it('falls back to default size decimals when szDecimals is null', () => {
+    // Arrange / Act
+    const result = deriveOrderSizing({
+      ...base,
+      orderType: 'market',
+      szDecimals: null,
+    });
+
+    // Assert
+    expect(result.positionSize).not.toBe(PERPS_CONSTANTS.FallbackDataDisplay);
+  });
+});
diff --git a/app/components/UI/Perps/utils/orderSizing.ts b/app/components/UI/Perps/utils/orderSizing.ts
new file mode 100644
index 000000000000..8369719cb5f1
--- /dev/null
+++ b/app/components/UI/Perps/utils/orderSizing.ts
@@ -0,0 +1,84 @@
+import {
+  DECIMAL_PRECISION_CONFIG,
+  PERPS_CONSTANTS,
+  calculateMarginRequired,
+  calculatePositionSize,
+  type OrderType,
+} from '@metamask/perps-controller';
+import { BigNumber } from 'bignumber.js';
+
+export interface DeriveOrderSizingInput {
+  /** USD amount the user intends to trade (order form `amount`). */
+  amount: string;
+  orderType: OrderType;
+  /** Limit price string when the order type is `limit`. */
+  limitPrice?: string;
+  /** Mid/market price used for market orders and display. */
+  marketPrice: number;
+  /** Oracle mark price used as the standard margin basis. */
+  markPrice: number;
+  leverage: number;
+  /** Asset size decimals from market data; falls back when unknown. */
+  szDecimals: number | null;
+  /** True while market data is still loading (defers derived values). */
+  isLoadingMarketData: boolean;
+}
+
+export interface DeriveOrderSizingResult {
+  /** Price used for size/margin math: the limit price for priced limit orders, else market. */
+  effectivePrice: number;
+  /** Position size (token units) as a display string, or the fallback placeholder while loading. */
+  positionSize: string;
+  /** Required margin in USD, or `undefined` while loading / when no amount is set. */
+  marginRequired: string | undefined;
+}
+
+/**
+ * Pure derivation of the order-form sizing values (effective price, position
+ * size, margin required) shared by the lite (`PerpsOrderView`) and Pro
+ * (`usePerpsProOrderForm`) order forms.
+ *
+ * For limit orders with a valid limit price, that price is used for sizing and
+ * (implicitly) as the margin basis; otherwise the market price is used for
+ * sizing and the oracle mark price is used for margin — mirroring the lite
+ * form's original inline logic exactly.
+ *
+ * @param input - Order sizing inputs.
+ * @returns The effective price, position size, and margin required.
+ */
+export const deriveOrderSizing = ({
+  amount,
+  orderType,
+  limitPrice,
+  marketPrice,
+  markPrice,
+  leverage,
+  szDecimals,
+  isLoadingMarketData,
+}: DeriveOrderSizingInput): DeriveOrderSizingResult => {
+  const parsedLimitPrice =
+    orderType === 'limit' && limitPrice
+      ? Number.parseFloat(limitPrice)
+      : Number.NaN;
+  const hasValidLimitPrice = parsedLimitPrice > 0;
+  const effectivePrice = hasValidLimitPrice ? parsedLimitPrice : marketPrice;
+
+  const positionSize = isLoadingMarketData
+    ? PERPS_CONSTANTS.FallbackDataDisplay
+    : calculatePositionSize({
+        amount,
+        price: effectivePrice,
+        szDecimals: szDecimals ?? DECIMAL_PRECISION_CONFIG.FallbackSizeDecimals,
+      });
+
+  let marginRequired: string | undefined;
+  if (!isLoadingMarketData && amount) {
+    const priceForMargin = hasValidLimitPrice ? effectivePrice : markPrice;
+    marginRequired = calculateMarginRequired({
+      amount: BigNumber(priceForMargin).times(positionSize).toString(),
+      leverage,
+    });
+  }
+
+  return { effectivePrice, positionSize, marginRequired };
+};
diff --git a/app/components/UI/Perps/utils/orderUtils.test.ts b/app/components/UI/Perps/utils/orderUtils.test.ts
index 76550bc163cc..faace42b9b17 100644
--- a/app/components/UI/Perps/utils/orderUtils.test.ts
+++ b/app/components/UI/Perps/utils/orderUtils.test.ts
@@ -3,9 +3,12 @@ import {
   inferTriggerConditionKey,
   isOrderAssociatedWithFullPosition,
   isSyntheticOrderCancelable,
+  isLimitOrderEditable,
+  isLimitOrderSizeEditable,
   isSyntheticPlaceholderOrderId,
   shouldDisplayOrderInMarketDetailsOrders,
   formatOrderLabel,
+  formatOrderTypeLabel,
   resolveOrderDisplayPriceAndLabel,
   getOrderLabelDirection,
   getOrderPositionDirection,
@@ -14,7 +17,7 @@ import {
   determineMakerStatus,
   isPriceOutsideDeviationBand,
 } from './orderUtils';
-import { Order, OrderParams } from '@metamask/perps-controller';
+import { Order, OrderParams, type OrderType } from '@metamask/perps-controller';
 import { Position } from '../hooks';
 
 // Mock DevLogger
@@ -209,6 +212,55 @@ describe('orderUtils', () => {
     });
   });
 
+  describe('formatOrderTypeLabel', () => {
+    it('returns detailed order type when available', () => {
+      const order: Order = {
+        orderId: '1',
+        symbol: 'BTC',
+        side: 'buy',
+        orderType: 'market',
+        detailedOrderType: 'Stop Market',
+        size: '1',
+        originalSize: '1',
+        price: '50000',
+        filledSize: '0',
+        remainingSize: '1',
+        status: 'open',
+        timestamp: Date.now(),
+        reduceOnly: true,
+        isTrigger: true,
+      };
+
+      expect(formatOrderTypeLabel(order)).toBe('Stop market');
+    });
+
+    it('falls back to translated limit or market when detailed type is absent', () => {
+      const limitOrder: Order = {
+        orderId: '1',
+        symbol: 'BTC',
+        side: 'buy',
+        orderType: 'limit',
+        size: '1',
+        originalSize: '1',
+        price: '50000',
+        filledSize: '0',
+        remainingSize: '1',
+        status: 'open',
+        timestamp: Date.now(),
+        reduceOnly: false,
+        isTrigger: false,
+      };
+
+      const marketOrder: Order = {
+        ...limitOrder,
+        orderType: 'market',
+      };
+
+      expect(formatOrderTypeLabel(limitOrder)).toBe('Limit');
+      expect(formatOrderTypeLabel(marketOrder)).toBe('Market');
+    });
+  });
+
   describe('getOrderLabelDirection', () => {
     it('should return "long" for opening buy order', () => {
       const order: Order = {
@@ -992,6 +1044,107 @@ describe('orderUtils', () => {
     });
   });
 
+  describe('isLimitOrderEditable', () => {
+    const editableLimit: Order = {
+      orderId: 'limit-1',
+      symbol: 'BTC',
+      side: 'buy',
+      size: '1',
+      originalSize: '1',
+      filledSize: '0',
+      remainingSize: '1',
+      price: '50000',
+      orderType: 'limit',
+      status: 'open',
+      timestamp: Date.now(),
+      reduceOnly: false,
+      isTrigger: false,
+    };
+
+    it('allows editing open non-trigger limit orders with no fills', () => {
+      expect(isLimitOrderEditable(editableLimit)).toBe(true);
+    });
+
+    it('rejects trigger orders', () => {
+      expect(
+        isLimitOrderEditable({
+          ...editableLimit,
+          isTrigger: true,
+          detailedOrderType: 'Stop Limit',
+        }),
+      ).toBe(false);
+    });
+
+    it('rejects partially filled orders', () => {
+      expect(
+        isLimitOrderEditable({
+          ...editableLimit,
+          filledSize: '0.5',
+          remainingSize: '0.5',
+        }),
+      ).toBe(false);
+    });
+
+    it('rejects market orders', () => {
+      expect(
+        isLimitOrderEditable({
+          ...editableLimit,
+          orderType: 'market',
+        }),
+      ).toBe(false);
+    });
+
+    it('allows price editing when the order has attached TP/SL', () => {
+      expect(
+        isLimitOrderEditable({
+          ...editableLimit,
+          takeProfitPrice: '60000',
+          stopLossPrice: '40000',
+        }),
+      ).toBe(true);
+    });
+  });
+
+  describe('isLimitOrderSizeEditable', () => {
+    const editableLimit: Order = {
+      orderId: 'limit-1',
+      symbol: 'BTC',
+      side: 'buy',
+      size: '1',
+      originalSize: '1',
+      filledSize: '0',
+      remainingSize: '1',
+      price: '50000',
+      orderType: 'limit',
+      status: 'open',
+      timestamp: Date.now(),
+      reduceOnly: false,
+      isTrigger: false,
+    };
+
+    it('allows size editing for open limits without attached TP/SL', () => {
+      expect(isLimitOrderSizeEditable(editableLimit)).toBe(true);
+    });
+
+    it('rejects size editing when the order has attached take profit', () => {
+      expect(
+        isLimitOrderSizeEditable({
+          ...editableLimit,
+          takeProfitPrice: '60000',
+        }),
+      ).toBe(false);
+    });
+
+    it('rejects size editing when the order has attached stop loss', () => {
+      expect(
+        isLimitOrderSizeEditable({
+          ...editableLimit,
+          stopLossPrice: '40000',
+        }),
+      ).toBe(false);
+    });
+  });
+
   describe('willFlipPosition', () => {
     const mockPosition: Position = {
       size: '100',
@@ -1292,6 +1445,65 @@ describe('orderUtils', () => {
         expect(result).toBe(false);
       });
     });
+
+    // These cover the widened OrderType contract, not a reachable regression.
+    // HyperLiquid's adapter resolves Order.orderType through getTriggerExecution
+    // before it reaches this function, so today only 'market' and 'limit' arrive
+    // at runtime; these pin the behaviour for the trigger types the signature
+    // now accepts.
+    describe('Trigger Orders', () => {
+      it('treats a stop market trigger as taker', () => {
+        const result = determineMakerStatus({
+          orderType: 'stop_market',
+          direction: 'long',
+          limitPrice: '49500',
+          bestAsk: 50001,
+          bestBid: 49999,
+          symbol: 'BTC',
+        });
+
+        expect(result).toBe(false);
+      });
+
+      it('treats a take profit market trigger as taker', () => {
+        const result = determineMakerStatus({
+          orderType: 'take_profit_market',
+          direction: 'short',
+          limitPrice: '50500',
+          bestAsk: 50001,
+          bestBid: 49999,
+          symbol: 'BTC',
+        });
+
+        expect(result).toBe(false);
+      });
+
+      it('treats a stop limit trigger resting below the ask as maker', () => {
+        const result = determineMakerStatus({
+          orderType: 'stop_limit',
+          direction: 'long',
+          limitPrice: '49500',
+          bestAsk: 50001,
+          bestBid: 49999,
+          symbol: 'BTC',
+        });
+
+        expect(result).toBe(true);
+      });
+
+      it('treats a take profit limit trigger crossing the book as taker', () => {
+        const result = determineMakerStatus({
+          orderType: 'take_profit_limit',
+          direction: 'long',
+          limitPrice: '50100',
+          bestAsk: 50001,
+          bestBid: 49999,
+          symbol: 'BTC',
+        });
+
+        expect(result).toBe(false);
+      });
+    });
   });
 
   describe('isPriceOutsideDeviationBand', () => {
diff --git a/app/components/UI/Perps/utils/orderUtils.ts b/app/components/UI/Perps/utils/orderUtils.ts
index ec929ea54adc..45996c583acc 100644
--- a/app/components/UI/Perps/utils/orderUtils.ts
+++ b/app/components/UI/Perps/utils/orderUtils.ts
@@ -1,12 +1,15 @@
 import { capitalize } from 'lodash';
 import {
+  isLimitExecutionOrderType,
   isTPSLOrder,
   type OrderParams,
   type Order,
   type OrderDirection,
+  type OrderType,
   type PerpsDebugLogger,
 } from '@metamask/perps-controller';
 import BigNumber from 'bignumber.js';
+import { strings } from '../../../../../locales/i18n';
 import { Position } from '../hooks';
 import { resolveOrderDirection, isClosingOrder } from './orderDirection';
 
@@ -362,6 +365,61 @@ export const isSyntheticOrderCancelable = (order: Order): boolean => {
   return !isSyntheticPlaceholderOrderId(order.orderId);
 };
 
+/**
+ * Whether an open limit order has attached take-profit / stop-loss children
+ * that were set at placement. Size edits do not resize those children, so
+ * size editing is blocked when either is present.
+ */
+export const orderHasAttachedTpSl = (order: Order): boolean => {
+  const takeProfit = order.takeProfitPrice?.trim();
+  const stopLoss = order.stopLossPrice?.trim();
+  return Boolean(takeProfit) || Boolean(stopLoss);
+};
+
+/**
+ * Whether an open limit order can be edited in place (price) in Pro mode.
+ * Trigger/TP-SL rows and partially filled limits are excluded.
+ */
+export const isLimitOrderEditable = (order: Order): boolean => {
+  if (!isSyntheticOrderCancelable(order)) {
+    return false;
+  }
+
+  if (order.status !== 'open' || order.orderType !== 'limit') {
+    return false;
+  }
+
+  if (isTriggerOrder(order)) {
+    return false;
+  }
+
+  const filledSize = parseFloat(order.filledSize ?? '0');
+  if (Number.isFinite(filledSize) && filledSize > 0) {
+    return false;
+  }
+
+  const originalSize = parseFloat(order.originalSize ?? order.size ?? '0');
+  const remainingSize = parseFloat(order.remainingSize ?? order.size ?? '0');
+  if (
+    Number.isFinite(originalSize) &&
+    Number.isFinite(remainingSize) &&
+    remainingSize < originalSize
+  ) {
+    return false;
+  }
+
+  return true;
+};
+
+/**
+ * Whether an open limit order's size can be edited in place in Pro mode.
+ * Orders with attached TP/SL are excluded: a size change would leave child
+ * trigger orders at the old size (trading-safety gap; TP/SL edit is out of
+ * scope for this flow).
+ */
+export const isLimitOrderSizeEditable = (order: Order): boolean =>
+  isLimitOrderEditable(order) && !orderHasAttachedTpSl(order);
+
 const buildSyntheticTriggerOrder = (
   parentOrder: Order,
   triggerType: 'tp' | 'sl',
@@ -540,6 +598,36 @@ export const willFlipPosition = (
 export const getOrderPositionDirection = (order: Order): OrderDirection =>
   resolveOrderDirection(order.side, isClosingOrder(order));
 
+/**
+ * Resolves the raw order type token from provider data before i18n or
+ * title-casing. Prefers `detailedOrderType` when present; otherwise maps
+ * `orderType` to canonical limit/market tokens shared by label formatters.
+ */
+const resolveOrderTypeString = (order: Order): string => {
+  const detailedType = order.detailedOrderType?.trim();
+  if (detailedType) {
+    return detailedType;
+  }
+
+  return order.orderType === 'limit' ? 'limit' : 'market';
+};
+
+/**
+ * Formats a resolved order type token for compact UI pills with i18n for
+ * canonical limit/market types and title-casing for provider-specific names.
+ */
+const formatOrderTypeString = (typeString: string): string => {
+  const normalized = typeString.toLowerCase();
+  if (normalized === 'limit') {
+    return strings('perps.order.limit');
+  }
+  if (normalized === 'market') {
+    return strings('perps.order.market');
+  }
+
+  return capitalize(typeString);
+};
+
 /**
  * Format an order label following the pattern: [Type] [Close?] [Direction]
  *
@@ -555,16 +643,11 @@ export const getOrderPositionDirection = (order: Order): OrderDirection =>
  * @returns Formatted order label string
  */
 export const formatOrderLabel = (order: Order): string => {
-  const { side, detailedOrderType, orderType } = order;
+  const { side } = order;
 
   const isClosing = isClosingOrder(order);
   const direction = resolveOrderDirection(side, isClosing);
-
-  // Get the order type string
-  // Use detailedOrderType if available (e.g., "Stop Market", "Take Profit Limit")
-  // Otherwise fall back to basic orderType
-  const typeString =
-    detailedOrderType || (orderType === 'limit' ? 'Limit' : 'Market');
+  const typeString = resolveOrderTypeString(order);
 
   // Build the label: [Type] [Close?] [Direction]
   if (isClosing) {
@@ -574,6 +657,17 @@ export const formatOrderLabel = (order: Order): string => {
   return capitalize(`${typeString} ${direction}`);
 };
 
+/**
+ * Format just the order type portion of an order label (no direction/close).
+ *
+ * Examples: "Limit", "Stop market", "Take profit limit"
+ *
+ * @param order - The order object
+ * @returns Formatted order type string for compact UI pills
+ */
+export const formatOrderTypeLabel = (order: Order): string =>
+  formatOrderTypeString(resolveOrderTypeString(order));
+
 /**
  * Get just the direction portion of an order label
  * Used for compatibility with existing code that expects just "long" or "short"
@@ -597,12 +691,12 @@ export const getOrderLabelDirection = (order: Order): string => {
  *
  * Logic:
  * 1. Validates price data freshness and market state
- * 2. Market orders are always taker
+ * 2. Market-executing orders are always taker
  * 3. Limit orders that would execute immediately are taker
  * 4. Limit orders that go into order book are maker
  *
  * @param params - Order parameters
- * @param params.orderType - The order type (market or limit)
+ * @param params.orderType - The order placement type
  * @param params.limitPrice - The limit price for limit orders
  * @param params.direction - The order direction (long or short)
  * @param params.bestAsk - The best ask price from order book
@@ -613,7 +707,7 @@ export const getOrderLabelDirection = (order: Order): string => {
  */
 export function determineMakerStatus(
   params: {
-    orderType: 'market' | 'limit';
+    orderType: OrderType;
     limitPrice?: string;
     direction: 'long' | 'short';
     bestAsk?: number;
@@ -623,8 +717,10 @@ export function determineMakerStatus(
   debugLogger?: OrderUtilsDebugLogger,
 ): boolean {
   const { orderType, limitPrice, direction, bestAsk, bestBid, symbol } = params;
-  // Market orders are always taker
-  if (orderType === 'market') {
+  // Only an order that executes as a limit order can rest on the book and earn
+  // the maker fee. Market orders, and trigger orders that fire as market orders,
+  // are always taker.
+  if (!isLimitExecutionOrderType(orderType)) {
     return false;
   }
 
diff --git a/app/components/UI/Perps/utils/perpsCufTrace.test.ts b/app/components/UI/Perps/utils/perpsCufTrace.test.ts
index 7c4f927fb909..e6077dd4090b 100644
--- a/app/components/UI/Perps/utils/perpsCufTrace.test.ts
+++ b/app/components/UI/Perps/utils/perpsCufTrace.test.ts
@@ -16,6 +16,7 @@ import {
   watchPerpsCufPositionClosed,
   watchPerpsCufTpSlChanged,
   watchPerpsCufOrderAbsent,
+  watchPerpsCufOrderPriceUpdated,
   watchPerpsCufLimitRendered,
   watchPerpsCufAnyPositions,
   acceptPerpsCufRequest,
@@ -55,6 +56,10 @@ describe('perpsCufTrace', () => {
     resetPerpsCufTraceForTests();
   });
 
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
   describe('isPerpsFillRendered (shared fill predicate)', () => {
     const pos = (size: string) => ({ symbol: 'BTC', size });
 
@@ -933,4 +938,79 @@ describe('perpsCufTrace', () => {
 
     expect(flush).not.toHaveBeenCalled();
   });
+
+  describe('PerpsEditOrder ORDER_PRICE_UPDATED', () => {
+    it('ends the edit span once the order reflects the expected price', () => {
+      const opId = startPerpsCufTrace({ name: TraceName.PerpsEditOrder });
+      watchPerpsCufOrderPriceUpdated(opId, 'o-1', '51000');
+      acceptPerpsCufRequest(opId);
+
+      handlePerpsCufOrdersDelivered([{ orderId: 'o-1', price: '50000' }]);
+      expect(mockEndTrace).not.toHaveBeenCalled();
+
+      handlePerpsCufOrdersDelivered([{ orderId: 'o-1', price: '51000' }]);
+      expect(mockEndTrace).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: opId,
+          data: expect.objectContaining({
+            [PERPS_CUF_TAG.BOUNDARY]: PERPS_CUF_BOUNDARY.STREAM,
+          }),
+        }),
+      );
+    });
+
+    it('treats financially equal prices as a match', () => {
+      const opId = startPerpsCufTrace({ name: TraceName.PerpsEditOrder });
+      watchPerpsCufOrderPriceUpdated(opId, 'o-1', '51000.00');
+      acceptPerpsCufRequest(opId);
+
+      handlePerpsCufOrdersDelivered([{ orderId: 'o-1', price: '51000' }]);
+      expect(mockEndTrace).toHaveBeenCalledWith(
+        expect.objectContaining({ id: opId }),
+      );
+    });
+
+    it('does not end when the delivered price is non-finite', () => {
+      const opId = startPerpsCufTrace({ name: TraceName.PerpsEditOrder });
+      watchPerpsCufOrderPriceUpdated(opId, 'o-1', '51000');
+      acceptPerpsCufRequest(opId);
+
+      handlePerpsCufOrdersDelivered([{ orderId: 'o-1', price: 'not-a-price' }]);
+      expect(mockEndTrace).not.toHaveBeenCalled();
+    });
+
+    it('defers ending until the edit request is accepted', () => {
+      const opId = startPerpsCufTrace({ name: TraceName.PerpsEditOrder });
+      watchPerpsCufOrderPriceUpdated(opId, 'o-1', '51000');
+
+      handlePerpsCufOrdersDelivered([{ orderId: 'o-1', price: '51000' }]);
+      expect(mockEndTrace).not.toHaveBeenCalled();
+
+      acceptPerpsCufRequest(opId);
+      expect(mockEndTrace).toHaveBeenCalledWith(
+        expect.objectContaining({ id: opId }),
+      );
+    });
+
+    it('ends the edit span when the order fills and leaves the stream', () => {
+      const opId = startPerpsCufTrace({ name: TraceName.PerpsEditOrder });
+      watchPerpsCufOrderPriceUpdated(opId, 'o-1', '51000');
+      acceptPerpsCufRequest(opId);
+
+      // Order is absent — it filled immediately at the marketable price.
+      handlePerpsCufOrdersDelivered([]);
+      expect(mockEndTrace).toHaveBeenCalledWith(
+        expect.objectContaining({ id: opId }),
+      );
+    });
+
+    it('does not end on fill when the edit request is still awaiting acceptance', () => {
+      const opId = startPerpsCufTrace({ name: TraceName.PerpsEditOrder });
+      watchPerpsCufOrderPriceUpdated(opId, 'o-1', '51000');
+      // Not yet accepted — do not end even if order is absent.
+
+      handlePerpsCufOrdersDelivered([]);
+      expect(mockEndTrace).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/app/components/UI/Perps/utils/perpsCufTrace.ts b/app/components/UI/Perps/utils/perpsCufTrace.ts
index c1e757b3b3c5..bba5914817ff 100644
--- a/app/components/UI/Perps/utils/perpsCufTrace.ts
+++ b/app/components/UI/Perps/utils/perpsCufTrace.ts
@@ -2,6 +2,7 @@ import {
   PERPS_CONSTANTS,
   PERFORMANCE_CONFIG,
 } from '@metamask/perps-controller';
+import { BigNumber } from 'bignumber.js';
 import DevLogger from '../../../../core/SDKConnect/utils/DevLogger';
 import {
   trace,
@@ -60,6 +61,8 @@ const PERPS_CUF_WATCH = {
   ORDER_ABSENT: 'order_absent',
   /** Limit place: the order rests in the orders stream OR fills into a position. */
   ORDER_PRESENT_OR_FILLED: 'order_present_or_filled',
+  /** Edit: the order's resting limit price updated to the requested value. */
+  ORDER_PRICE_UPDATED: 'order_price_updated',
   ANY_POSITIONS: 'any_positions',
 } as const;
 
@@ -457,6 +460,20 @@ export function watchPerpsCufOrderAbsent(opId: string, orderId: string): void {
   });
 }
 
+/** Watch for an open order to reflect the edited limit price before ending `opId`. */
+export function watchPerpsCufOrderPriceUpdated(
+  opId: string,
+  orderId: string,
+  expectedPrice: string,
+): void {
+  setPerpsCufMeta(opId, {
+    [CUF_META.WATCH]: PERPS_CUF_WATCH.ORDER_PRICE_UPDATED,
+    [CUF_META.ORDER_ID]: orderId,
+    [CUF_META.SNAPSHOT]: expectedPrice,
+    [CUF_META.AWAIT_ACCEPT]: true,
+  });
+}
+
 /**
  * Limit place confirmation: end `opId` when the order renders as resting in the
  * orders stream OR fills into a position (a marketable limit never rests).
@@ -673,13 +690,28 @@ export function handlePerpsCufPositionsDelivered(
   }
 }
 
+function orderPriceMatches(expected: string, actual?: string): boolean {
+  const expectedBn = new BigNumber(expected);
+  const actualBn = new BigNumber(actual ?? '');
+  if (!expectedBn.isFinite() || !actualBn.isFinite()) {
+    return false;
+  }
+  if (expectedBn.eq(actualBn)) {
+    return true;
+  }
+  // Venue modify may round the submitted price; treat near-equal values as a
+  // match so ORDER_PRICE_UPDATED CUF does not time out on tick rounding.
+  const maxMagnitude = BigNumber.max(expectedBn.abs(), actualBn.abs(), 1);
+  return expectedBn.minus(actualBn).abs().div(maxMagnitude).lte(1e-8);
+}
+
 /**
  * Orders just rendered to stream subscribers: close pending cancel spans once
  * their order is absent, and pending limit-order-render spans once their order
  * is present. Flushes throttled subscribers once before ending, as above.
  */
 export function handlePerpsCufOrdersDelivered(
-  orders: readonly { orderId: string }[] | null,
+  orders: readonly { orderId: string; price?: string }[] | null,
   flushThrottled?: () => void,
 ): void {
   if (!orders) {
@@ -715,6 +747,27 @@ export function handlePerpsCufOrdersDelivered(
       toEnd.push(opId);
     }
   }
+  for (const opId of pendingOpIdsForName(TraceName.PerpsEditOrder)) {
+    const meta = pendingCufMeta.get(opId);
+    const orderId = meta?.[CUF_META.ORDER_ID];
+    const expectedPrice = meta?.[CUF_META.SNAPSHOT];
+    if (
+      meta?.[CUF_META.WATCH] !== PERPS_CUF_WATCH.ORDER_PRICE_UPDATED ||
+      typeof orderId !== 'string' ||
+      typeof expectedPrice !== 'string'
+    ) {
+      continue;
+    }
+    const updatedOrder = orders.find((o) => o.orderId === orderId);
+    if (updatedOrder && orderPriceMatches(expectedPrice, updatedOrder.price)) {
+      deferred = confirmOrDefer(opId, meta, toEnd) || deferred;
+    } else if (!updatedOrder && meta[CUF_META.AWAIT_ACCEPT] !== true) {
+      // A marketable price edit can fill immediately, removing the resting
+      // order from the stream before its updated price is observed. End the
+      // span successfully rather than letting it time out as a failure.
+      toEnd.push(opId);
+    }
+  }
 
   if (flushThrottled && (toEnd.length > 0 || deferred)) {
     flushThrottled();
diff --git a/app/components/UI/Perps/utils/perpsModeFlash.test.ts b/app/components/UI/Perps/utils/perpsModeFlash.test.ts
deleted file mode 100644
index 8f881991cffa..000000000000
--- a/app/components/UI/Perps/utils/perpsModeFlash.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { renderHook, act } from '@testing-library/react-native';
-import { PerpsMode } from '@metamask/perps-controller';
-import {
-  hidePerpsModeFlash,
-  showPerpsModeFlash,
-  usePerpsModeFlash,
-} from './perpsModeFlash';
-
-describe('perpsModeFlash store', () => {
-  afterEach(() => {
-    hidePerpsModeFlash();
-  });
-
-  it('starts with no flashing mode', () => {
-    // Act
-    const { result } = renderHook(() => usePerpsModeFlash());
-
-    // Assert
-    expect(result.current).toBeNull();
-  });
-
-  it('surfaces the mode passed to showPerpsModeFlash', () => {
-    // Arrange
-    const { result } = renderHook(() => usePerpsModeFlash());
-
-    // Act
-    act(() => showPerpsModeFlash(PerpsMode.Pro));
-
-    // Assert
-    expect(result.current).toBe(PerpsMode.Pro);
-  });
-
-  it('clears the mode on hidePerpsModeFlash', () => {
-    // Arrange
-    const { result } = renderHook(() => usePerpsModeFlash());
-    act(() => showPerpsModeFlash(PerpsMode.Lite));
-
-    // Act
-    act(() => hidePerpsModeFlash());
-
-    // Assert
-    expect(result.current).toBeNull();
-  });
-
-  it('notifies all subscribers when the mode changes', () => {
-    // Arrange
-    const a = renderHook(() => usePerpsModeFlash());
-    const b = renderHook(() => usePerpsModeFlash());
-
-    // Act
-    act(() => showPerpsModeFlash(PerpsMode.Pro));
-
-    // Assert
-    expect(a.result.current).toBe(PerpsMode.Pro);
-    expect(b.result.current).toBe(PerpsMode.Pro);
-  });
-});
diff --git a/app/components/UI/Perps/utils/perpsModeFlash.ts b/app/components/UI/Perps/utils/perpsModeFlash.ts
deleted file mode 100644
index e27225ee729e..000000000000
--- a/app/components/UI/Perps/utils/perpsModeFlash.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useSyncExternalStore } from 'react';
-import type { PerpsMode } from '@metamask/perps-controller';
-
-/**
- * Tiny module-level store for the Perps Lite ⇄ Pro mode-switch "flash" overlay
- * (TAT-3551).
- *
- * This is transient, throw-away UI state: a mode is flashed on top of the
- * current Perps screen for ~1s and then cleared. It never needs to live in the
- * global Redux store (no persistence, no cross-cutting reads), so a minimal
- * observable subscribed via {@link useSyncExternalStore} keeps the wiring
- * lightweight while still allowing any entry point — including the Trade menu,
- * which lives outside the Perps navigation stack — to trigger it.
- */
-let currentMode: PerpsMode | null = null;
-const listeners = new Set<() => void>();
-
-const emit = (): void => {
-  listeners.forEach((listener) => listener());
-};
-
-/** Flash the given destination mode on top of the current Perps screen. */
-export const showPerpsModeFlash = (mode: PerpsMode): void => {
-  currentMode = mode;
-  emit();
-};
-
-/** Clear any visible flash. No-op when nothing is showing. */
-export const hidePerpsModeFlash = (): void => {
-  if (currentMode === null) {
-    return;
-  }
-  currentMode = null;
-  emit();
-};
-
-const subscribe = (listener: () => void): (() => void) => {
-  listeners.add(listener);
-  return () => {
-    listeners.delete(listener);
-  };
-};
-
-const getSnapshot = (): PerpsMode | null => currentMode;
-
-/** Subscribe to the currently flashing mode (or `null` when nothing shows). */
-export const usePerpsModeFlash = (): PerpsMode | null =>
-  useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
diff --git a/app/components/UI/Perps/utils/perpsModeSelectionStorage.test.ts b/app/components/UI/Perps/utils/perpsModeSelectionStorage.test.ts
new file mode 100644
index 000000000000..e5b0754c992e
--- /dev/null
+++ b/app/components/UI/Perps/utils/perpsModeSelectionStorage.test.ts
@@ -0,0 +1,48 @@
+import StorageWrapper from '../../../../store/storage-wrapper';
+import { PERPS_MODE_SELECTION_COMPLETED } from '../../../../constants/storage';
+import {
+  hasCompletedPerpsModeSelection,
+  markPerpsModeSelectionCompleted,
+} from './perpsModeSelectionStorage';
+
+jest.mock('../../../../store/storage-wrapper', () => ({
+  __esModule: true,
+  default: {
+    getItem: jest.fn(),
+    setItem: jest.fn(),
+  },
+}));
+
+describe('perpsModeSelectionStorage', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('hasCompletedPerpsModeSelection', () => {
+    it('returns false when the storage key is unset', async () => {
+      jest.mocked(StorageWrapper.getItem).mockResolvedValue(null);
+
+      await expect(hasCompletedPerpsModeSelection()).resolves.toBe(false);
+      expect(StorageWrapper.getItem).toHaveBeenCalledWith(
+        PERPS_MODE_SELECTION_COMPLETED,
+      );
+    });
+
+    it('returns true when the storage key is "true"', async () => {
+      jest.mocked(StorageWrapper.getItem).mockResolvedValue('true');
+
+      await expect(hasCompletedPerpsModeSelection()).resolves.toBe(true);
+    });
+  });
+
+  describe('markPerpsModeSelectionCompleted', () => {
+    it('persists the completed flag', async () => {
+      await markPerpsModeSelectionCompleted();
+
+      expect(StorageWrapper.setItem).toHaveBeenCalledWith(
+        PERPS_MODE_SELECTION_COMPLETED,
+        'true',
+      );
+    });
+  });
+});
diff --git a/app/components/UI/Perps/utils/perpsModeSelectionStorage.ts b/app/components/UI/Perps/utils/perpsModeSelectionStorage.ts
new file mode 100644
index 000000000000..e47f36302eec
--- /dev/null
+++ b/app/components/UI/Perps/utils/perpsModeSelectionStorage.ts
@@ -0,0 +1,16 @@
+import { PERPS_MODE_SELECTION_COMPLETED } from '../../../../constants/storage';
+import StorageWrapper from '../../../../store/storage-wrapper';
+
+/**
+ * Whether the user has completed the one-time Lite/Pro mode chooser
+ * ("Choose how you trade"). Orthogonal to tutorial first-time state.
+ */
+export const hasCompletedPerpsModeSelection = async (): Promise<boolean> => {
+  const value = await StorageWrapper.getItem(PERPS_MODE_SELECTION_COMPLETED);
+  return value === 'true';
+};
+
+/** Persist that the user has completed the Lite/Pro mode chooser. */
+export const markPerpsModeSelectionCompleted = async (): Promise<void> => {
+  await StorageWrapper.setItem(PERPS_MODE_SELECTION_COMPLETED, 'true');
+};
diff --git a/app/components/UI/Perps/utils/perpsModeSwitch.test.ts b/app/components/UI/Perps/utils/perpsModeSwitch.test.ts
index 03fc678228de..09a86c50fbbd 100644
--- a/app/components/UI/Perps/utils/perpsModeSwitch.test.ts
+++ b/app/components/UI/Perps/utils/perpsModeSwitch.test.ts
@@ -12,6 +12,8 @@ import {
   useIsPerpsProModeActive,
   getPerpsHomeNavigationTarget,
   useGetPerpsHomeNavigationTarget,
+  useNavigateToPerpsHome,
+  useDropPerpsHomeFromStackHistory,
 } from './perpsModeSwitch';
 
 jest.mock('react-redux', () => ({
@@ -19,6 +21,18 @@ jest.mock('react-redux', () => ({
   useSelector: jest.fn(),
 }));
 
+const mockNavigate = jest.fn();
+const mockReset = jest.fn();
+const mockGetState = jest.fn();
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: () => ({
+    navigate: mockNavigate,
+    reset: mockReset,
+    getState: mockGetState,
+  }),
+}));
+
 jest.mock('../selectors/featureFlags', () => ({
   selectPerpsProModeEnabledFlag: jest.fn(),
 }));
@@ -191,4 +205,123 @@ describe('perpsModeSwitch', () => {
       expect(result.current).toBe(firstReference);
     });
   });
+
+  describe('useNavigateToPerpsHome', () => {
+    it('enters the Perps stack at Perps Home when Pro mode is inactive', () => {
+      // Arrange
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectPerpsProModeEnabledFlag) return false;
+        if (selector === selectPerpsMode) return PerpsMode.Lite;
+        return undefined;
+      });
+
+      const { result } = renderHook(() => useNavigateToPerpsHome());
+
+      // Act
+      result.current({ source: 'activity_details' });
+
+      // Assert
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+        screen: Routes.PERPS.PERPS_HOME,
+        params: { source: 'activity_details' },
+      });
+    });
+
+    it('enters the Perps stack at the default Pro market when Pro mode is active', () => {
+      // Arrange - Perps Home must never be shown while Pro mode is active.
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectPerpsProModeEnabledFlag) return true;
+        if (selector === selectPerpsMode) return PerpsMode.Pro;
+        return undefined;
+      });
+
+      const { result } = renderHook(() => useNavigateToPerpsHome());
+
+      // Act
+      result.current();
+
+      // Assert
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+        screen: Routes.PERPS.MARKET_DETAILS,
+        params: { market: buildDefaultProMarket() },
+      });
+    });
+  });
+
+  describe('useDropPerpsHomeFromStackHistory', () => {
+    const buildRoute = (name: string, key: string) => ({ name, key });
+
+    it('removes Perps Home while keeping the rest of the stack and the focused screen', () => {
+      // Arrange - Home → market list → market, focused on the market.
+      mockGetState.mockReturnValue({
+        index: 2,
+        routes: [
+          buildRoute(Routes.PERPS.PERPS_HOME, 'home-1'),
+          buildRoute(Routes.PERPS.MARKET_LIST, 'list-1'),
+          buildRoute(Routes.PERPS.MARKET_DETAILS, 'market-1'),
+        ],
+      });
+
+      const { result } = renderHook(() => useDropPerpsHomeFromStackHistory());
+
+      // Act
+      result.current();
+
+      // Assert - Home is gone and the market stays focused at its new index.
+      expect(mockReset).toHaveBeenCalledWith(
+        expect.objectContaining({
+          index: 1,
+          routes: [
+            buildRoute(Routes.PERPS.MARKET_LIST, 'list-1'),
+            buildRoute(Routes.PERPS.MARKET_DETAILS, 'market-1'),
+          ],
+        }),
+      );
+    });
+
+    it('leaves the stack alone when Perps Home is not in history', () => {
+      // Arrange - Pro entry points never seed Home beneath the market.
+      mockGetState.mockReturnValue({
+        index: 0,
+        routes: [buildRoute(Routes.PERPS.MARKET_DETAILS, 'market-1')],
+      });
+
+      const { result } = renderHook(() => useDropPerpsHomeFromStackHistory());
+
+      // Act
+      result.current();
+
+      // Assert
+      expect(mockReset).not.toHaveBeenCalled();
+    });
+
+    it('leaves the stack alone when Perps Home is the only entry', () => {
+      // Arrange - dropping it would leave the navigator with nothing to render.
+      mockGetState.mockReturnValue({
+        index: 0,
+        routes: [buildRoute(Routes.PERPS.PERPS_HOME, 'home-1')],
+      });
+
+      const { result } = renderHook(() => useDropPerpsHomeFromStackHistory());
+
+      // Act
+      result.current();
+
+      // Assert
+      expect(mockReset).not.toHaveBeenCalled();
+    });
+
+    it('does nothing when the navigator has no state yet', () => {
+      // Arrange
+      mockGetState.mockReturnValue(undefined);
+
+      const { result } = renderHook(() => useDropPerpsHomeFromStackHistory());
+
+      // Act
+      result.current();
+
+      // Assert
+      expect(mockReset).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/app/components/UI/Perps/utils/perpsModeSwitch.ts b/app/components/UI/Perps/utils/perpsModeSwitch.ts
index b8dafe6d040b..fc9a25c2cc2c 100644
--- a/app/components/UI/Perps/utils/perpsModeSwitch.ts
+++ b/app/components/UI/Perps/utils/perpsModeSwitch.ts
@@ -1,7 +1,11 @@
 import { useCallback } from 'react';
 import { PerpsMode, type PerpsMarketData } from '@metamask/perps-controller';
 import { useSelector } from 'react-redux';
-import type { NavigatorScreenParams } from '@react-navigation/native';
+import {
+  useNavigation,
+  type NavigationState,
+  type NavigatorScreenParams,
+} from '@react-navigation/native';
 import type { RootState } from '../../../../reducers';
 import Routes from '../../../../constants/navigation/Routes';
 import { selectPerpsMode } from '../selectors/perpsController';
@@ -56,13 +60,17 @@ export interface PerpsHomeNavigationTarget {
  * Resolves where a "go to Perps home" action should actually land, given
  * whether Pro mode is currently active.
  *
+ * Takes `isProModeActive` explicitly so callers that just changed the mode can
+ * pass the mode they selected rather than reading it back from a selector that
+ * has not re-rendered yet.
+ *
  * While Pro mode is active, `PerpsHomeView` must never be shown (TAT-3612):
  * every entry point instead lands on the default Pro market, so the user
  * only ever moves between a market page and the market list. Centralizing
  * this here keeps every entry point (Trade sheet, Wallet actions, Homepage
  * grid/pill, deeplinks, etc.) consistent.
  */
-const resolvePerpsHomeNavigationTarget = (
+export const resolvePerpsHomeNavigationTarget = (
   isProModeActive: boolean,
   extraParams: Record<string, unknown> = {},
 ): PerpsHomeNavigationTarget => {
@@ -140,3 +148,98 @@ export const navigateToPerpsHomeTarget = (
     target.params,
   );
 };
+
+/**
+ * Removes `PerpsHomeView` from a Perps stack's history, leaving every other
+ * entry (e.g. the market list) untouched.
+ *
+ * Switching to Pro from a market screen swaps the rendered layout in place —
+ * `PerpsMarketDetailsRouter` keeps the same route — so a Perps Home entry the
+ * user came through stays in history and the back button would reveal the Lite
+ * hub while Pro is active (TAT-3612). Screens that switch mode by navigating
+ * (Perps Home itself, the Trade sheet) already avoid seeding Home instead.
+ */
+export const dropPerpsHomeFromStackHistory = (navigation: {
+  getState: () => NavigationState | undefined;
+  // Callers cast through `unknown` at the reset boundary (same as the hook).
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  reset: (state: any) => void;
+}): void => {
+  const state = navigation.getState();
+
+  if (!state) {
+    return;
+  }
+
+  const routes = state.routes.filter(
+    (route) => route.name !== Routes.PERPS.PERPS_HOME,
+  );
+
+  // Nothing to drop, or Home is the only entry — resetting to an empty
+  // history would leave the navigator with no screen to render.
+  if (routes.length === state.routes.length || routes.length === 0) {
+    return;
+  }
+
+  // Keep the user on the screen they're looking at: its position shifts when
+  // an earlier route is removed.
+  const focusedKey = state.routes[state.index]?.key;
+  const focusedIndex = routes.findIndex((route) => route.key === focusedKey);
+
+  // Same assertion rationale as `toPerpsNavigatorScreenParams`: route names
+  // are plain `string`s here, so they can't be correlated with the
+  // navigator's param list keys.
+  const reset = navigation.reset as unknown as (state: NavigationState) => void;
+
+  reset({
+    ...state,
+    routes,
+    index: focusedIndex >= 0 ? focusedIndex : routes.length - 1,
+  });
+};
+
+/**
+ * Hook wrapper around {@link dropPerpsHomeFromStackHistory} for screens that
+ * already sit on the Perps stack (not a nested modal navigator).
+ */
+export const useDropPerpsHomeFromStackHistory = (): (() => void) => {
+  const navigation = useNavigation();
+
+  return useCallback(() => {
+    dropPerpsHomeFromStackHistory(navigation);
+  }, [navigation]);
+};
+
+/**
+ * Returns a function that jumps into the Perps stack at its Pro-aware "home"
+ * screen, entering through `Routes.PERPS.ROOT`.
+ *
+ * For call sites outside the Perps stack — other navigators (Activity details,
+ * the in-app browser, transaction confirmations) and the Perps modal stack —
+ * which cannot reach `Routes.PERPS.PERPS_HOME` directly. Screens already inside
+ * the stack should use `usePerpsNavigation().navigateToHome` instead.
+ */
+export const useNavigateToPerpsHome = (): ((
+  extraParams?: Record<string, unknown>,
+) => void) => {
+  const navigation = useNavigation();
+  const getTarget = useGetPerpsHomeNavigationTarget();
+
+  return useCallback(
+    (extraParams?: Record<string, unknown>) => {
+      // Same assertion rationale as `navigateToPerpsHomeTarget`: the nested
+      // screen name is resolved at runtime, so `navigate()`'s overloads can't
+      // correlate it with its params.
+      const navigate = navigation.navigate as unknown as (
+        screen: string,
+        params: NavigatorScreenParams<PerpsStackParamList>,
+      ) => void;
+
+      navigate(
+        Routes.PERPS.ROOT,
+        toPerpsNavigatorScreenParams(getTarget(extraParams)),
+      );
+    },
+    [navigation, getTarget],
+  );
+};
diff --git a/app/components/UI/Perps/utils/reduceOnlyValidation.test.ts b/app/components/UI/Perps/utils/reduceOnlyValidation.test.ts
new file mode 100644
index 000000000000..91da4e6611b3
--- /dev/null
+++ b/app/components/UI/Perps/utils/reduceOnlyValidation.test.ts
@@ -0,0 +1,145 @@
+import type { Position } from '@metamask/perps-controller';
+import { validateReduceOnlyOrder } from './reduceOnlyValidation';
+
+const createPosition = (overrides: Partial<Position> = {}): Position =>
+  ({
+    symbol: 'BTC',
+    size: '1',
+    entryPrice: '50000',
+    positionValue: '50000',
+    unrealizedPnl: '0',
+    marginUsed: '5000',
+    leverage: { type: 'isolated', value: 10 },
+    liquidationPrice: '45000',
+    maxLeverage: 50,
+    returnOnEquity: '0',
+    cumulativeFunding: { allTime: '0', sinceOpen: '0', sinceChange: '0' },
+    takeProfitCount: 0,
+    stopLossCount: 0,
+    ...overrides,
+  }) as Position;
+
+describe('validateReduceOnlyOrder', () => {
+  it('returns valid when reduceOnly is false', () => {
+    const result = validateReduceOnlyOrder({
+      reduceOnly: false,
+      direction: 'long',
+      orderSize: '10',
+      position: null,
+    });
+
+    expect(result).toEqual({
+      isValid: true,
+      isFullClose: false,
+    });
+  });
+
+  it('returns no_position when there is no open position', () => {
+    const result = validateReduceOnlyOrder({
+      reduceOnly: true,
+      direction: 'short',
+      orderSize: '0.1',
+      position: null,
+    });
+
+    expect(result.errorCode).toBe('no_position');
+    expect(result.isValid).toBe(false);
+    expect(result.isFullClose).toBe(false);
+  });
+
+  it('returns no_position when position size is zero', () => {
+    const result = validateReduceOnlyOrder({
+      reduceOnly: true,
+      direction: 'short',
+      orderSize: '0.1',
+      position: createPosition({ size: '0' }),
+    });
+
+    expect(result.errorCode).toBe('no_position');
+    expect(result.isValid).toBe(false);
+  });
+
+  it('returns wrong_side when the order matches a long position', () => {
+    const result = validateReduceOnlyOrder({
+      reduceOnly: true,
+      direction: 'long',
+      orderSize: '0.1',
+      position: createPosition({ size: '1' }),
+    });
+
+    expect(result.errorCode).toBe('wrong_side');
+    expect(result.isValid).toBe(false);
+  });
+
+  it('returns wrong_side when the order matches a short position', () => {
+    const result = validateReduceOnlyOrder({
+      reduceOnly: true,
+      direction: 'short',
+      orderSize: '0.1',
+      position: createPosition({ size: '-1' }),
+    });
+
+    expect(result.errorCode).toBe('wrong_side');
+    expect(result.isValid).toBe(false);
+  });
+
+  it('returns too_large when order size exceeds the open position', () => {
+    const result = validateReduceOnlyOrder({
+      reduceOnly: true,
+      direction: 'short',
+      orderSize: '1.1',
+      position: createPosition({ size: '1' }),
+    });
+
+    expect(result.errorCode).toBe('too_large');
+    expect(result.isValid).toBe(false);
+  });
+
+  it('accepts an order smaller than the open position', () => {
+    const result = validateReduceOnlyOrder({
+      reduceOnly: true,
+      direction: 'short',
+      orderSize: '0.9',
+      position: createPosition({ size: '1' }),
+    });
+
+    expect(result.isValid).toBe(true);
+    expect(result.isFullClose).toBe(false);
+  });
+
+  it('marks an order equal to the open position as a full close', () => {
+    const result = validateReduceOnlyOrder({
+      reduceOnly: true,
+      direction: 'short',
+      orderSize: '1',
+      position: createPosition({ size: '1' }),
+    });
+
+    expect(result.isValid).toBe(true);
+    expect(result.isFullClose).toBe(true);
+  });
+
+  it('accepts a partial reduce-only order against a short position', () => {
+    const result = validateReduceOnlyOrder({
+      reduceOnly: true,
+      direction: 'long',
+      orderSize: '0.25',
+      position: createPosition({ size: '-1' }),
+    });
+
+    expect(result.isValid).toBe(true);
+    expect(result.isFullClose).toBe(false);
+  });
+
+  it('treats an empty order size as valid for the closing side', () => {
+    const result = validateReduceOnlyOrder({
+      reduceOnly: true,
+      direction: 'short',
+      orderSize: '',
+      position: createPosition({ size: '1' }),
+    });
+
+    expect(result.isValid).toBe(true);
+    expect(result.isFullClose).toBe(false);
+  });
+});
diff --git a/app/components/UI/Perps/utils/reduceOnlyValidation.ts b/app/components/UI/Perps/utils/reduceOnlyValidation.ts
new file mode 100644
index 000000000000..8713e1d50ba2
--- /dev/null
+++ b/app/components/UI/Perps/utils/reduceOnlyValidation.ts
@@ -0,0 +1,101 @@
+import type { Position } from '@metamask/perps-controller';
+import { getPositionDirection } from './positionCalculations';
+
+/** Tolerance for token-size comparisons (covers floating-point / szDecimals noise). */
+const SIZE_EPSILON = 1e-10;
+
+export type ReduceOnlyValidationCode =
+  | 'no_position'
+  | 'wrong_side'
+  | 'too_large';
+
+export type ReduceOnlyOrderDirection = 'long' | 'short';
+
+export interface ValidateReduceOnlyOrderParams {
+  reduceOnly: boolean;
+  /** Form direction: long = buy, short = sell. */
+  direction: ReduceOnlyOrderDirection;
+  /** Proposed order size in token units. */
+  orderSize: string;
+  /** Current position for the market, if any. */
+  position: Position | null;
+}
+
+export interface ValidateReduceOnlyOrderResult {
+  isValid: boolean;
+  errorCode?: ReduceOnlyValidationCode;
+  /**
+   * True when the order consumes the full open position.
+   * Callers may pass `isFullClose` to the controller so dust closes skip the
+   * minimum-notional gate.
+   */
+  isFullClose: boolean;
+}
+
+/**
+ * Validates reduce-only order semantics against the live position. Returns the
+ * first blocking error in priority order:
+ * no-position → wrong-side → too-large.
+ *
+ * When `reduceOnly` is false, the result is always valid.
+ */
+export const validateReduceOnlyOrder = ({
+  reduceOnly,
+  direction,
+  orderSize,
+  position,
+}: ValidateReduceOnlyOrderParams): ValidateReduceOnlyOrderResult => {
+  if (!reduceOnly) {
+    return {
+      isValid: true,
+      isFullClose: false,
+    };
+  }
+
+  const positionDirection = position
+    ? getPositionDirection(position.size)
+    : 'unknown';
+
+  if (!position || positionDirection === 'unknown') {
+    return {
+      isValid: false,
+      errorCode: 'no_position',
+      isFullClose: false,
+    };
+  }
+
+  if (direction === positionDirection) {
+    return {
+      isValid: false,
+      errorCode: 'wrong_side',
+      isFullClose: false,
+    };
+  }
+
+  const absolutePositionSize = Math.abs(Number.parseFloat(position.size));
+
+  const parsedOrderSize = Number.parseFloat(orderSize);
+  // Empty/zero size is not `too_large`; usePerpsOrderValidation already marks
+  // the form invalid when positionSize <= 0 before controller validation runs.
+  const orderSizeValue =
+    Number.isFinite(parsedOrderSize) && parsedOrderSize > 0
+      ? parsedOrderSize
+      : 0;
+
+  if (orderSizeValue > absolutePositionSize + SIZE_EPSILON) {
+    return {
+      isValid: false,
+      errorCode: 'too_large',
+      isFullClose: false,
+    };
+  }
+
+  const isFullClose =
+    absolutePositionSize > 0 &&
+    orderSizeValue + SIZE_EPSILON >= absolutePositionSize;
+
+  return {
+    isValid: true,
+    isFullClose,
+  };
+};
diff --git a/app/components/UI/Perps/utils/tpslValidation.test.ts b/app/components/UI/Perps/utils/tpslValidation.test.ts
index d11f943c9295..aa513e897fd9 100644
--- a/app/components/UI/Perps/utils/tpslValidation.test.ts
+++ b/app/components/UI/Perps/utils/tpslValidation.test.ts
@@ -16,6 +16,7 @@ import {
   getMaxStopLossPercentage,
   isValidStopLossPercentage,
   sanitizePercentageInput,
+  getPerpsOrderTpSlWarnings,
 } from './tpslValidation';
 
 // Note: countSignificantFigures, hasExceededSignificantFigures, and roundToSignificantFigures
@@ -1494,4 +1495,77 @@ describe('TPSL Validation Utilities', () => {
       expect(parseFloat(result)).toBeLessThan(0);
     });
   });
+
+  describe('getPerpsOrderTpSlWarnings', () => {
+    const base = {
+      direction: 'long' as const,
+      liquidationPrice: '0',
+      marketPrice: 3000,
+    };
+
+    it('returns all-clear with current reference for a market order without TP/SL', () => {
+      // Arrange / Act
+      const result = getPerpsOrderTpSlWarnings({
+        ...base,
+        orderType: 'market',
+      });
+
+      // Assert
+      expect(result).toEqual({
+        doesStopLossRiskLiquidation: false,
+        isTakeProfitPriceInvalid: false,
+        isStopLossPriceInvalid: false,
+        tpslPriceType: 'current',
+      });
+    });
+
+    it('uses the entry reference type for a priced limit order', () => {
+      // Arrange / Act
+      const result = getPerpsOrderTpSlWarnings({
+        ...base,
+        orderType: 'limit',
+        limitPrice: '2500',
+      });
+
+      // Assert
+      expect(result.tpslPriceType).toBe('entry');
+    });
+
+    it('flags a take profit on the wrong side of the reference price', () => {
+      // Arrange / Act: long TP below market is invalid
+      const result = getPerpsOrderTpSlWarnings({
+        ...base,
+        orderType: 'market',
+        takeProfitPrice: '2000',
+      });
+
+      // Assert
+      expect(result.isTakeProfitPriceInvalid).toBe(true);
+    });
+
+    it('flags a stop loss on the wrong side of the reference price', () => {
+      // Arrange / Act: long SL above market is invalid
+      const result = getPerpsOrderTpSlWarnings({
+        ...base,
+        orderType: 'market',
+        stopLossPrice: '4000',
+      });
+
+      // Assert
+      expect(result.isStopLossPriceInvalid).toBe(true);
+    });
+
+    it('flags a stop loss that risks liquidation', () => {
+      // Arrange / Act: long SL below the liquidation price is unsafe
+      const result = getPerpsOrderTpSlWarnings({
+        ...base,
+        orderType: 'market',
+        stopLossPrice: '2000',
+        liquidationPrice: '2500',
+      });
+
+      // Assert
+      expect(result.doesStopLossRiskLiquidation).toBe(true);
+    });
+  });
 });
diff --git a/app/components/UI/Perps/utils/tpslValidation.ts b/app/components/UI/Perps/utils/tpslValidation.ts
index 2fdaf8916592..0ce77ef62d38 100644
--- a/app/components/UI/Perps/utils/tpslValidation.ts
+++ b/app/components/UI/Perps/utils/tpslValidation.ts
@@ -11,7 +11,10 @@
  */
 
 import DevLogger from '../../../../core/SDKConnect/utils/DevLogger';
-import { DECIMAL_PRECISION_CONFIG } from '@metamask/perps-controller';
+import {
+  DECIMAL_PRECISION_CONFIG,
+  type OrderType,
+} from '@metamask/perps-controller';
 // Re-export significant figures utilities from controller for backwards compatibility
 export {
   countSignificantFigures,
@@ -101,6 +104,88 @@ export const isStopLossSafeFromLiquidation = (
     : slPriceNum < liquidationPriceNum;
 };
 
+export interface PerpsOrderTpSlWarningsInput {
+  orderType: OrderType;
+  limitPrice?: string;
+  direction: 'long' | 'short';
+  takeProfitPrice?: string;
+  stopLossPrice?: string;
+  /** Current liquidation price for the prospective order. */
+  liquidationPrice: string;
+  /** Mid/market price used as the validation reference for market orders. */
+  marketPrice: number;
+}
+
+export interface PerpsOrderTpSlWarnings {
+  /** Stop loss sits at/beyond the liquidation price. */
+  doesStopLossRiskLiquidation: boolean;
+  /** Take profit is on the wrong side of the reference price. */
+  isTakeProfitPriceInvalid: boolean;
+  /** Stop loss is on the wrong side of the reference price. */
+  isStopLossPriceInvalid: boolean;
+  /** Which price the warnings validated against ('entry' for priced limit, else 'current'). */
+  tpslPriceType: 'entry' | 'current';
+}
+
+/**
+ * Pure derivation of the order-form TP/SL warning flags shared by the lite
+ * (`PerpsOrderView`) and Pro (`usePerpsProOrderForm`) order forms. For priced
+ * limit orders the limit price is the validation reference; otherwise the
+ * market price is used. Mirrors the lite form's original inline logic exactly.
+ *
+ * @param input - TP/SL warning inputs.
+ * @returns The three warning flags plus the reference price type.
+ */
+export const getPerpsOrderTpSlWarnings = ({
+  orderType,
+  limitPrice,
+  direction,
+  takeProfitPrice,
+  stopLossPrice,
+  liquidationPrice,
+  marketPrice,
+}: PerpsOrderTpSlWarningsInput): PerpsOrderTpSlWarnings => {
+  const doesStopLossRiskLiquidation = Boolean(
+    stopLossPrice &&
+      !isStopLossSafeFromLiquidation(
+        stopLossPrice,
+        liquidationPrice,
+        direction,
+      ),
+  );
+
+  const isLimitWithPrice = orderType === 'limit' && Boolean(limitPrice);
+  const validationReferencePrice = isLimitWithPrice
+    ? Number.parseFloat(String(limitPrice))
+    : marketPrice;
+  const tpslPriceType = isLimitWithPrice ? 'entry' : 'current';
+
+  const isTakeProfitPriceInvalid = Boolean(
+    takeProfitPrice?.trim() &&
+      validationReferencePrice > 0 &&
+      !isValidTakeProfitPrice(takeProfitPrice, {
+        currentPrice: validationReferencePrice,
+        direction,
+      }),
+  );
+
+  const isStopLossPriceInvalid = Boolean(
+    stopLossPrice?.trim() &&
+      validationReferencePrice > 0 &&
+      !isValidStopLossPrice(stopLossPrice, {
+        currentPrice: validationReferencePrice,
+        direction,
+      }),
+  );
+
+  return {
+    doesStopLossRiskLiquidation,
+    isTakeProfitPriceInvalid,
+    isStopLossPriceInvalid,
+    tpslPriceType,
+  };
+};
+
 /**
  * Validates both take profit and stop loss prices.
  *
diff --git a/app/components/UI/Perps/utils/translatePerpsError.ts b/app/components/UI/Perps/utils/translatePerpsError.ts
index 4d7436dacd32..c0380ab714bb 100644
--- a/app/components/UI/Perps/utils/translatePerpsError.ts
+++ b/app/components/UI/Perps/utils/translatePerpsError.ts
@@ -74,9 +74,40 @@ export const ERROR_CODE_TO_I18N_KEY: Record<PerpsErrorCode, string> = {
     'perps.order.validation.leverage_below_position',
   [PERPS_ERROR_CODES.ORDER_MAX_VALUE_EXCEEDED]:
     'perps.order.validation.max_order_value',
+  // Trigger placement validation errors (stop / take profit order types)
+  [PERPS_ERROR_CODES.ORDER_TRIGGER_PRICE_REQUIRED]:
+    'perps.errors.orderValidation.triggerPriceRequired',
+  [PERPS_ERROR_CODES.ORDER_TRIGGER_PRICE_POSITIVE]:
+    'perps.errors.orderValidation.triggerPricePositive',
+  [PERPS_ERROR_CODES.ORDER_TRIGGER_PRICE_NOT_SUPPORTED]:
+    'perps.errors.orderValidation.triggerPriceNotSupported',
+  [PERPS_ERROR_CODES.ORDER_TRIGGER_TPSL_UNSUPPORTED]:
+    'perps.errors.orderValidation.triggerTpslUnsupported',
+  [PERPS_ERROR_CODES.ORDER_TIME_IN_FORCE_NOT_SUPPORTED]:
+    'perps.errors.orderValidation.timeInForceNotSupported',
+  // Attached TP/SL validation errors
+  [PERPS_ERROR_CODES.ORDER_TPSL_SIZE_INVALID]:
+    'perps.errors.orderValidation.tpslSizeInvalid',
+  [PERPS_ERROR_CODES.ORDER_TPSL_LINKAGE_CONFLICT]:
+    'perps.errors.orderValidation.tpslLinkageConflict',
+  [PERPS_ERROR_CODES.ORDER_TPSL_LINKAGE_REQUIRED]:
+    'perps.errors.orderValidation.tpslLinkageRequired',
+  [PERPS_ERROR_CODES.ORDER_TPSL_POSITION_LINKAGE_UNSUPPORTED]:
+    'perps.errors.orderValidation.tpslPositionLinkageUnsupported',
+  // Order edit errors
+  [PERPS_ERROR_CODES.ORDER_EDIT_TRIGGER_UNSUPPORTED]:
+    'perps.errors.orderValidation.editTriggerUnsupported',
+  [PERPS_ERROR_CODES.ORDER_EDIT_ORDER_UNVERIFIABLE]:
+    'perps.errors.orderValidation.editOrderUnverifiable',
   // HyperLiquid client/service errors
   [PERPS_ERROR_CODES.EXCHANGE_CLIENT_NOT_AVAILABLE]:
     'perps.errors.exchangeClientNotAvailable',
+  [PERPS_ERROR_CODES.EXCHANGE_ACCOUNT_NOT_FOUND]:
+    'perps.errors.exchangeAccountNotFound',
+  [PERPS_ERROR_CODES.EXCHANGE_MULTI_SIG_REQUIRED]:
+    'perps.errors.exchangeMultiSigRequired',
+  [PERPS_ERROR_CODES.EXCHANGE_INVALID_NONCE]:
+    'perps.errors.exchangeInvalidNonce',
   [PERPS_ERROR_CODES.INFO_CLIENT_NOT_AVAILABLE]:
     'perps.errors.infoClientNotAvailable',
   [PERPS_ERROR_CODES.SUBSCRIPTION_CLIENT_NOT_AVAILABLE]:
diff --git a/app/components/UI/Perps/utils/translatePerpsErrorCoverage.test.ts b/app/components/UI/Perps/utils/translatePerpsErrorCoverage.test.ts
new file mode 100644
index 000000000000..513ff32d24f5
--- /dev/null
+++ b/app/components/UI/Perps/utils/translatePerpsErrorCoverage.test.ts
@@ -0,0 +1,67 @@
+import { PERPS_ERROR_CODES } from '@metamask/perps-controller';
+import { ERROR_CODE_TO_I18N_KEY } from './translatePerpsError';
+import enTranslations from '../../../../../locales/languages/en.json';
+
+/**
+ * Lives apart from `translatePerpsError.test.ts` on purpose: that file mocks
+ * `PERPS_ERROR_CODES` down to a subset to keep its import chain light, so the
+ * map it builds cannot answer whether every real code is covered. These tests
+ * read the installed controller's full code list.
+ *
+ * A controller upgrade that widens `PerpsErrorCode` — as v11 did with the
+ * trigger-order, TP/SL linkage and exchange codes — fails here rather than
+ * shipping an untranslated code to users.
+ */
+const resolveTranslation = (i18nKey: string): string | undefined => {
+  let node: unknown = enTranslations;
+
+  for (const segment of i18nKey.split('.')) {
+    if (typeof node !== 'object' || node === null || !(segment in node)) {
+      return undefined;
+    }
+    node = (node as Record<string, unknown>)[segment];
+  }
+
+  return typeof node === 'string' ? node : undefined;
+};
+
+describe('ERROR_CODE_TO_I18N_KEY', () => {
+  const errorCodes = Object.values(PERPS_ERROR_CODES);
+
+  it('maps every error code the controller exports', () => {
+    const unmapped = errorCodes.filter((code) => !ERROR_CODE_TO_I18N_KEY[code]);
+
+    expect(unmapped).toStrictEqual([]);
+  });
+
+  it('maps the v11 trigger, TP/SL linkage and exchange codes', () => {
+    const v11Codes = [
+      PERPS_ERROR_CODES.ORDER_TRIGGER_PRICE_REQUIRED,
+      PERPS_ERROR_CODES.ORDER_TRIGGER_PRICE_POSITIVE,
+      PERPS_ERROR_CODES.ORDER_TRIGGER_PRICE_NOT_SUPPORTED,
+      PERPS_ERROR_CODES.ORDER_TRIGGER_TPSL_UNSUPPORTED,
+      PERPS_ERROR_CODES.ORDER_TPSL_SIZE_INVALID,
+      PERPS_ERROR_CODES.ORDER_TPSL_LINKAGE_CONFLICT,
+      PERPS_ERROR_CODES.ORDER_TPSL_LINKAGE_REQUIRED,
+      PERPS_ERROR_CODES.ORDER_TPSL_POSITION_LINKAGE_UNSUPPORTED,
+      PERPS_ERROR_CODES.ORDER_TIME_IN_FORCE_NOT_SUPPORTED,
+      PERPS_ERROR_CODES.ORDER_EDIT_TRIGGER_UNSUPPORTED,
+      PERPS_ERROR_CODES.ORDER_EDIT_ORDER_UNVERIFIABLE,
+      PERPS_ERROR_CODES.EXCHANGE_ACCOUNT_NOT_FOUND,
+      PERPS_ERROR_CODES.EXCHANGE_MULTI_SIG_REQUIRED,
+      PERPS_ERROR_CODES.EXCHANGE_INVALID_NONCE,
+    ];
+
+    const unmapped = v11Codes.filter((code) => !ERROR_CODE_TO_I18N_KEY[code]);
+
+    expect(unmapped).toStrictEqual([]);
+  });
+
+  it('resolves every mapped i18n key to English copy', () => {
+    const unresolved = errorCodes
+      .map((code) => ERROR_CODE_TO_I18N_KEY[code])
+      .filter((i18nKey) => i18nKey && !resolveTranslation(i18nKey));
+
+    expect(unresolved).toStrictEqual([]);
+  });
+});
diff --git a/app/components/UI/Predict/assets/world-cup-main-feed-banner-compact.png b/app/components/UI/Predict/assets/world-cup-main-feed-banner-compact.png
deleted file mode 100644
index 2a68228d31b4..000000000000
Binary files a/app/components/UI/Predict/assets/world-cup-main-feed-banner-compact.png and /dev/null differ
diff --git a/app/components/UI/Predict/assets/world-cup-main-feed-banner.png b/app/components/UI/Predict/assets/world-cup-main-feed-banner.png
deleted file mode 100644
index 7b34c80da549..000000000000
Binary files a/app/components/UI/Predict/assets/world-cup-main-feed-banner.png and /dev/null differ
diff --git a/app/components/UI/Predict/components/PredictFeedBanner/PredictFeedBanner.test.tsx b/app/components/UI/Predict/components/PredictFeedBanner/PredictFeedBanner.test.tsx
index 6caa04b893bf..22c08df05c6b 100644
--- a/app/components/UI/Predict/components/PredictFeedBanner/PredictFeedBanner.test.tsx
+++ b/app/components/UI/Predict/components/PredictFeedBanner/PredictFeedBanner.test.tsx
@@ -24,7 +24,7 @@ const bannerConfig = {
   id: MESSAGE_ID,
   title: 'Service update',
   description: 'Some Predict markets are temporarily unavailable.',
-  position: PredictFeedBannerPosition.AfterWorldCupBanner,
+  position: PredictFeedBannerPosition.AfterFeaturedCarousel,
   severity: PredictFeedBannerSeverity.Warning,
   dismissible: true,
 };
@@ -53,7 +53,7 @@ describe('PredictFeedBanner', () => {
   it('renders remote content when the flag and position are enabled', () => {
     const { getByTestId } = renderWithProvider(
       <PredictFeedBanner
-        position={PredictFeedBannerPosition.AfterWorldCupBanner}
+        position={PredictFeedBannerPosition.AfterFeaturedCarousel}
       />,
       { state: createState() },
     );
@@ -69,7 +69,7 @@ describe('PredictFeedBanner', () => {
   it('does not render when the feature flag is disabled', () => {
     const { queryByTestId } = renderWithProvider(
       <PredictFeedBanner
-        position={PredictFeedBannerPosition.AfterWorldCupBanner}
+        position={PredictFeedBannerPosition.AfterFeaturedCarousel}
       />,
       { state: createState({ ...bannerConfig, enabled: false }) },
     );
@@ -93,7 +93,7 @@ describe('PredictFeedBanner', () => {
   it('does not render a close button for a non-dismissible message', () => {
     const { queryByTestId } = renderWithProvider(
       <PredictFeedBanner
-        position={PredictFeedBannerPosition.AfterWorldCupBanner}
+        position={PredictFeedBannerPosition.AfterFeaturedCarousel}
       />,
       { state: createState({ ...bannerConfig, dismissible: false }) },
     );
@@ -106,7 +106,7 @@ describe('PredictFeedBanner', () => {
   it('persists dismissal by message ID and hides the banner', () => {
     const { getByTestId, queryByTestId, store } = renderWithProvider(
       <PredictFeedBanner
-        position={PredictFeedBannerPosition.AfterWorldCupBanner}
+        position={PredictFeedBannerPosition.AfterFeaturedCarousel}
       />,
       { state: createState() },
     );
@@ -124,7 +124,7 @@ describe('PredictFeedBanner', () => {
   it('does not render a previously dismissed message', () => {
     const { queryByTestId } = renderWithProvider(
       <PredictFeedBanner
-        position={PredictFeedBannerPosition.AfterWorldCupBanner}
+        position={PredictFeedBannerPosition.AfterFeaturedCarousel}
       />,
       {
         state: createState(undefined, [
@@ -141,7 +141,7 @@ describe('PredictFeedBanner', () => {
   it('renders a new message ID after an older message was dismissed', () => {
     const { getByTestId } = renderWithProvider(
       <PredictFeedBanner
-        position={PredictFeedBannerPosition.AfterWorldCupBanner}
+        position={PredictFeedBannerPosition.AfterFeaturedCarousel}
       />,
       {
         state: createState(undefined, [
diff --git a/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.test.tsx b/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.test.tsx
index 6bb877f87852..c30174b8af97 100644
--- a/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.test.tsx
+++ b/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.test.tsx
@@ -9,6 +9,12 @@ import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../../util/test/initial-root-state';
 import { useAnalytics } from '../../../../../components/hooks/useAnalytics/useAnalytics';
 import { createMockUseAnalyticsHook } from '../../../../../util/test/analyticsMock';
+import {
+  PREDICT_GTM_MODAL_DECLINE,
+  PREDICT_GTM_MODAL_ENGAGE,
+  PREDICT_GTM_WHATS_NEW_MODAL,
+} from '../../constants/eventNames';
+import { PREDICT_GTM_MODAL_TEST_IDS } from './PredictGTMModal.testIds';
 
 jest.mock('../../../../../util/theme', () => {
   const { mockTheme } = jest.requireActual('../../../../../util/theme');
@@ -39,9 +45,11 @@ jest.mock('@react-navigation/native', () => {
 });
 
 const mockTrackEvent = jest.fn();
+const mockAddProperties = jest.fn().mockReturnThis();
+const mockBuild = jest.fn().mockReturnValue({});
 const mockCreateEventBuilder = jest.fn().mockReturnValue({
-  addProperties: jest.fn().mockReturnThis(),
-  build: jest.fn().mockReturnValue({}),
+  addProperties: mockAddProperties,
+  build: mockBuild,
 });
 jest.mock('../../../../../components/hooks/useAnalytics/useAnalytics');
 
@@ -62,6 +70,12 @@ const initialState = {
 describe('PredictGTMModal', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockAddProperties.mockReturnThis();
+    mockBuild.mockReturnValue({});
+    mockCreateEventBuilder.mockReturnValue({
+      addProperties: mockAddProperties,
+      build: mockBuild,
+    });
     jest.mocked(useAnalytics).mockReturnValue(
       createMockUseAnalyticsHook({
         trackEvent: mockTrackEvent,
@@ -71,7 +85,7 @@ describe('PredictGTMModal', () => {
     jest.mocked(StorageWrapper.getItem).mockResolvedValue('false');
   });
 
-  it('renders correctly with all main elements', async () => {
+  it('renders all main elements', async () => {
     const { getByText, getByTestId } = renderWithProvider(<PredictGTMModal />, {
       state: initialState,
     });
@@ -81,39 +95,45 @@ describe('PredictGTMModal', () => {
       expect(getByText('predict.gtm_content.title_description')).toBeTruthy();
       expect(getByText('predict.gtm_content.get_started')).toBeTruthy();
       expect(getByText('predict.gtm_content.not_now')).toBeTruthy();
-      expect(getByTestId('predict-gtm-modal-container')).toBeTruthy();
+      expect(getByTestId(PREDICT_GTM_MODAL_TEST_IDS.CONTAINER)).toBeTruthy();
     });
   });
 
-  it('handles close button press correctly', async () => {
-    const { getByText } = renderWithProvider(<PredictGTMModal />, {
+  it('tracks Whats New Link Clicked with decline action when not now is pressed', async () => {
+    const { getByTestId } = renderWithProvider(<PredictGTMModal />, {
       state: initialState,
     });
 
     await waitFor(() => {
-      const notNowButton = getByText('predict.gtm_content.not_now');
-      fireEvent.press(notNowButton);
+      fireEvent.press(getByTestId(PREDICT_GTM_MODAL_TEST_IDS.NOT_NOW_BUTTON));
     });
 
     expect(StorageWrapper.setItem).toHaveBeenCalledWith(
       PREDICT_GTM_MODAL_SHOWN,
       'true',
     );
-    expect(mockTrackEvent).toHaveBeenCalled();
     expect(mockCreateEventBuilder).toHaveBeenCalledWith(
       MetaMetricsEvents.WHATS_NEW_LINK_CLICKED,
     );
+    expect(mockAddProperties).toHaveBeenCalledWith({
+      platform: 'ios',
+      deviceModel: 'iPhone 14',
+      feature: PREDICT_GTM_WHATS_NEW_MODAL,
+      action: PREDICT_GTM_MODAL_DECLINE,
+    });
+    expect(mockTrackEvent).toHaveBeenCalled();
     expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
   });
 
-  it('handles get started button press correctly', async () => {
-    const { getByText } = renderWithProvider(<PredictGTMModal />, {
+  it('tracks Whats New Link Clicked with engage action when get started is pressed', async () => {
+    const { getByTestId } = renderWithProvider(<PredictGTMModal />, {
       state: initialState,
     });
 
     await waitFor(() => {
-      const getStartedButton = getByText('predict.gtm_content.get_started');
-      fireEvent.press(getStartedButton);
+      fireEvent.press(
+        getByTestId(PREDICT_GTM_MODAL_TEST_IDS.GET_STARTED_BUTTON),
+      );
     });
 
     expect(StorageWrapper.setItem).toHaveBeenCalledWith(
@@ -121,10 +141,16 @@ describe('PredictGTMModal', () => {
       'true',
       { emitEvent: false },
     );
-    expect(mockTrackEvent).toHaveBeenCalled();
     expect(mockCreateEventBuilder).toHaveBeenCalledWith(
       MetaMetricsEvents.WHATS_NEW_LINK_CLICKED,
     );
+    expect(mockAddProperties).toHaveBeenCalledWith({
+      platform: 'ios',
+      deviceModel: 'iPhone 14',
+      feature: PREDICT_GTM_WHATS_NEW_MODAL,
+      action: PREDICT_GTM_MODAL_ENGAGE,
+    });
+    expect(mockTrackEvent).toHaveBeenCalled();
     expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
     expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
       screen: Routes.PREDICT.MARKET_LIST,
@@ -134,13 +160,13 @@ describe('PredictGTMModal', () => {
     });
   });
 
-  it('renders image correctly', async () => {
+  it('renders image', async () => {
     const { getByTestId } = renderWithProvider(<PredictGTMModal />, {
       state: initialState,
     });
 
     await waitFor(() => {
-      expect(getByTestId('predict-gtm-modal-container')).toBeTruthy();
+      expect(getByTestId(PREDICT_GTM_MODAL_TEST_IDS.CONTAINER)).toBeTruthy();
     });
   });
 });
diff --git a/app/components/UI/Predict/components/PredictMarket/PredictMarket.tsx b/app/components/UI/Predict/components/PredictMarket/PredictMarket.tsx
index 762c70a947a7..361a31c18777 100644
--- a/app/components/UI/Predict/components/PredictMarket/PredictMarket.tsx
+++ b/app/components/UI/Predict/components/PredictMarket/PredictMarket.tsx
@@ -24,9 +24,9 @@ interface PredictMarketProps {
   onCardPress?: () => void;
   /** Called when the user taps a buy button (before betslip opens). */
   onBuyButtonPress?: PredictMarketBuyButtonPress;
-  /** Active feed tab key forwarded to trade analytics (e.g. "trending", "world-cup"). */
+  /** Active feed tab key forwarded to trade analytics (e.g. "trending"). */
   predictFeedTab?: string;
-  /** Screen context forwarded to trade analytics (e.g. "world_cup"). */
+  /** Screen context forwarded to trade analytics. */
   predictScreen?: string;
   transactionActiveAbTests?: TransactionActiveAbTestEntry[];
 }
diff --git a/app/components/UI/Predict/components/PredictMarketSingle/PredictMarketSingle.test.tsx b/app/components/UI/Predict/components/PredictMarketSingle/PredictMarketSingle.test.tsx
index aebee9f29125..d9b09b55acd6 100644
--- a/app/components/UI/Predict/components/PredictMarketSingle/PredictMarketSingle.test.tsx
+++ b/app/components/UI/Predict/components/PredictMarketSingle/PredictMarketSingle.test.tsx
@@ -383,8 +383,8 @@ describe('PredictMarketSingle', () => {
     const { getByText } = renderWithProvider(
       <PredictMarketSingle
         market={mockMarket}
-        predictFeedTab="world-cup"
-        predictScreen="world_cup"
+        predictFeedTab="sports"
+        predictScreen="predict_positions_screen"
       />,
       { state: initialState },
     );
@@ -396,8 +396,8 @@ describe('PredictMarketSingle', () => {
       params: {
         marketId: mockMarket.id,
         entryPoint: PredictEventValues.ENTRY_POINT.PREDICT_FEED,
-        predictFeedTab: 'world-cup',
-        predictScreen: 'world_cup',
+        predictFeedTab: 'sports',
+        predictScreen: 'predict_positions_screen',
         title: mockMarket.title,
         image: mockMarket.image,
       },
diff --git a/app/components/UI/Predict/components/PredictWorldCupBannerCard/PredictWorldCupBannerCard.test.tsx b/app/components/UI/Predict/components/PredictWorldCupBannerCard/PredictWorldCupBannerCard.test.tsx
deleted file mode 100644
index eade0d81e616..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupBannerCard/PredictWorldCupBannerCard.test.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import React from 'react';
-import { StyleSheet } from 'react-native';
-import { fireEvent, render } from '@testing-library/react-native';
-import PredictWorldCupBannerCard from './PredictWorldCupBannerCard';
-
-const testIDs = {
-  container: 'banner-card',
-  image: 'banner-card-image',
-  arrow: 'banner-card-arrow',
-};
-
-const baseProps = {
-  imageSource: 1 as never,
-  title: 'Title',
-  description: 'Description',
-  testIDs,
-};
-
-describe('PredictWorldCupBannerCard', () => {
-  it('renders the title and description', () => {
-    const { getByText } = render(
-      <PredictWorldCupBannerCard {...baseProps} onPress={jest.fn()} />,
-    );
-
-    expect(getByText('Title')).toBeOnTheScreen();
-    expect(getByText('Description')).toBeOnTheScreen();
-  });
-
-  it('uses a fixed 80x80 image for the compact variant', () => {
-    const { getByTestId } = render(
-      <PredictWorldCupBannerCard
-        {...baseProps}
-        variant="compact"
-        onPress={jest.fn()}
-      />,
-    );
-
-    expect(
-      StyleSheet.flatten(getByTestId(testIDs.image).props.style),
-    ).toMatchObject({ height: 80, width: 80 });
-  });
-
-  it('uses the provided image height for the default variant', () => {
-    const { getByTestId } = render(
-      <PredictWorldCupBannerCard
-        {...baseProps}
-        variant="default"
-        imageHeight={123}
-        onPress={jest.fn()}
-      />,
-    );
-
-    expect(
-      StyleSheet.flatten(getByTestId(testIDs.image).props.style).height,
-    ).toBe(123);
-  });
-
-  it('hides the decorative arrow from the accessibility tree', () => {
-    const { queryByTestId } = render(
-      <PredictWorldCupBannerCard {...baseProps} onPress={jest.fn()} />,
-    );
-
-    expect(queryByTestId(testIDs.arrow)).toBeNull();
-  });
-
-  it('calls onPress when the card is pressed', () => {
-    const onPress = jest.fn();
-    const { getByTestId } = render(
-      <PredictWorldCupBannerCard {...baseProps} onPress={onPress} />,
-    );
-
-    fireEvent.press(getByTestId(testIDs.container));
-
-    expect(onPress).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/app/components/UI/Predict/components/PredictWorldCupBannerCard/PredictWorldCupBannerCard.tsx b/app/components/UI/Predict/components/PredictWorldCupBannerCard/PredictWorldCupBannerCard.tsx
deleted file mode 100644
index 6bb0f5018040..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupBannerCard/PredictWorldCupBannerCard.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import React from 'react';
-import { Image, ImageSourcePropType, Pressable, View } from 'react-native';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import {
-  ButtonIcon,
-  ButtonIconSize,
-  ButtonIconVariant,
-  FontWeight,
-  IconName,
-  IconSize,
-  Text,
-  TextColor,
-  TextVariant,
-} from '@metamask/design-system-react-native';
-
-export const PREDICT_WORLD_CUP_BANNER_CARD_COMPACT_IMAGE_SIZE = 80;
-
-export type PredictWorldCupBannerCardVariant = 'default' | 'compact';
-
-export interface PredictWorldCupBannerCardTestIDs {
-  container: string;
-  image: string;
-  arrow?: string;
-}
-
-interface PredictWorldCupBannerCardProps {
-  imageSource: ImageSourcePropType;
-  title: string;
-  description: string;
-  onPress: () => void;
-  testIDs: PredictWorldCupBannerCardTestIDs;
-  /**
-   * `compact` renders a fixed 80x80 image on the leading edge; `default`
-   * renders a full-width image on top sized via `imageHeight`.
-   */
-  variant?: PredictWorldCupBannerCardVariant;
-  /** Image height for the `default` variant (ignored when `compact`). */
-  imageHeight?: number;
-  accessibilityLabel?: string;
-  /** Tailwind classes for the outer Pressable (margins/spacing). */
-  containerClassName?: string;
-}
-
-/**
- * Shared presentational card for World Cup promotional banners. Renders a
- * pressable card with an image, a title/description block, and a decorative
- * trailing arrow. The arrow is hidden from the accessibility tree so the whole
- * card is announced as a single button via `accessibilityLabel`.
- *
- * Stateless by design: visibility gating, analytics, and navigation/deeplink
- * behavior live in the consuming banner components.
- */
-const PredictWorldCupBannerCard: React.FC<PredictWorldCupBannerCardProps> = ({
-  imageSource,
-  title,
-  description,
-  onPress,
-  testIDs,
-  variant = 'compact',
-  imageHeight,
-  accessibilityLabel,
-  containerClassName = 'mx-4 pb-3',
-}) => {
-  const tw = useTailwind();
-  const isCompact = variant === 'compact';
-
-  return (
-    <Pressable
-      accessibilityRole="button"
-      accessibilityLabel={accessibilityLabel}
-      onPress={onPress}
-      style={tw.style(containerClassName)}
-      testID={testIDs.container}
-    >
-      <View
-        style={tw.style(
-          'bg-muted rounded-xl overflow-hidden',
-          isCompact && 'flex-row items-center',
-        )}
-      >
-        <Image
-          source={imageSource}
-          resizeMode="cover"
-          testID={testIDs.image}
-          style={tw.style(
-            isCompact ? 'rounded-l-xl' : 'w-full rounded-t-xl',
-            isCompact
-              ? {
-                  height: PREDICT_WORLD_CUP_BANNER_CARD_COMPACT_IMAGE_SIZE,
-                  width: PREDICT_WORLD_CUP_BANNER_CARD_COMPACT_IMAGE_SIZE,
-                }
-              : { height: imageHeight },
-          )}
-        />
-        <View
-          style={tw.style(
-            'flex-row items-center justify-between p-3',
-            isCompact && 'flex-1',
-          )}
-        >
-          <View style={tw.style('flex-shrink')}>
-            <Text
-              variant={TextVariant.BodyMd}
-              color={TextColor.TextDefault}
-              fontWeight={FontWeight.Medium}
-            >
-              {title}
-            </Text>
-            <Text
-              variant={TextVariant.BodySm}
-              color={TextColor.TextAlternative}
-            >
-              {description}
-            </Text>
-          </View>
-          <View
-            accessibilityElementsHidden
-            importantForAccessibility="no-hide-descendants"
-          >
-            <ButtonIcon
-              onPress={onPress}
-              iconName={IconName.ArrowRight}
-              iconProps={{ size: IconSize.Md }}
-              size={ButtonIconSize.Md}
-              variant={ButtonIconVariant.Filled}
-              testID={testIDs.arrow}
-            />
-          </View>
-        </View>
-      </View>
-    </Pressable>
-  );
-};
-
-export default PredictWorldCupBannerCard;
diff --git a/app/components/UI/Predict/components/PredictWorldCupBannerCard/index.ts b/app/components/UI/Predict/components/PredictWorldCupBannerCard/index.ts
deleted file mode 100644
index 87129d643e00..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupBannerCard/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { default } from './PredictWorldCupBannerCard';
-export type {
-  PredictWorldCupBannerCardTestIDs,
-  PredictWorldCupBannerCardVariant,
-} from './PredictWorldCupBannerCard';
diff --git a/app/components/UI/Predict/components/PredictWorldCupHubBanner/PredictWorldCupHubBanner.test.tsx b/app/components/UI/Predict/components/PredictWorldCupHubBanner/PredictWorldCupHubBanner.test.tsx
deleted file mode 100644
index 6163c368a5a7..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupHubBanner/PredictWorldCupHubBanner.test.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import React from 'react';
-import { fireEvent, render } from '@testing-library/react-native';
-import { useSelector } from 'react-redux';
-import { PredictEventValues } from '../../constants/eventNames';
-import PredictWorldCupHubBanner from './PredictWorldCupHubBanner';
-import { PredictWorldCupHubBannerSelectorsIDs } from './PredictWorldCupHubBanner.testIds';
-
-jest.mock('react-redux', () => ({
-  useSelector: jest.fn(),
-}));
-
-const mockUseSelector = useSelector as jest.Mock;
-const mockTrackBannerAction = jest.fn();
-const mockHandleRewardsUrl = jest.fn();
-
-jest.mock('../../../../../core/Engine', () => ({
-  __esModule: true,
-  default: {
-    context: {
-      PredictController: {
-        trackBannerAction: (
-          ...args: Parameters<typeof mockTrackBannerAction>
-        ) => mockTrackBannerAction(...args),
-      },
-    },
-  },
-}));
-
-jest.mock(
-  '../../../../../core/DeeplinkManager/handlers/legacy/handleRewardsUrl',
-  () => ({
-    handleRewardsUrl: (...args: Parameters<typeof mockHandleRewardsUrl>) =>
-      mockHandleRewardsUrl(...args),
-  }),
-);
-
-describe('PredictWorldCupHubBanner', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockUseSelector.mockReturnValue(true);
-  });
-
-  it('renders the banner image and container when enabled', () => {
-    const { getByTestId } = render(<PredictWorldCupHubBanner />);
-
-    expect(
-      getByTestId(PredictWorldCupHubBannerSelectorsIDs.CONTAINER),
-    ).toBeOnTheScreen();
-    expect(
-      getByTestId(PredictWorldCupHubBannerSelectorsIDs.IMAGE),
-    ).toBeOnTheScreen();
-  });
-
-  it('does not render when the hub banner flag is disabled', () => {
-    mockUseSelector.mockReturnValue(false);
-
-    const { queryByTestId } = render(<PredictWorldCupHubBanner />);
-
-    expect(
-      queryByTestId(PredictWorldCupHubBannerSelectorsIDs.CONTAINER),
-    ).toBeNull();
-  });
-
-  it('tracks banner viewed once per render lifecycle', () => {
-    const { rerender } = render(<PredictWorldCupHubBanner />);
-
-    expect(mockTrackBannerAction).toHaveBeenCalledTimes(1);
-    expect(mockTrackBannerAction).toHaveBeenCalledWith({
-      actionType: PredictEventValues.ACTION_TYPE.VIEWED,
-      bannerType: PredictEventValues.BANNER_TYPE.PREDICT_THE_PITCH,
-    });
-
-    rerender(<PredictWorldCupHubBanner />);
-
-    expect(mockTrackBannerAction).toHaveBeenCalledTimes(1);
-  });
-
-  it('does not track viewed when disabled', () => {
-    mockUseSelector.mockReturnValue(false);
-
-    render(<PredictWorldCupHubBanner />);
-
-    expect(mockTrackBannerAction).not.toHaveBeenCalled();
-  });
-
-  it('tracks clicked and routes to the rewards deeplink when pressed', () => {
-    const { getByTestId } = render(<PredictWorldCupHubBanner />);
-
-    fireEvent.press(
-      getByTestId(PredictWorldCupHubBannerSelectorsIDs.CONTAINER),
-    );
-
-    expect(mockTrackBannerAction).toHaveBeenCalledWith({
-      actionType: PredictEventValues.ACTION_TYPE.CLICKED,
-      bannerType: PredictEventValues.BANNER_TYPE.PREDICT_THE_PITCH,
-    });
-    expect(mockHandleRewardsUrl).toHaveBeenCalledWith({
-      rewardsPath: '/rewards?campaign=predict-the-pitch',
-    });
-  });
-
-  it('fires a single clicked event and navigation per tap (no double-fire)', () => {
-    const { getByTestId } = render(<PredictWorldCupHubBanner />);
-
-    fireEvent.press(
-      getByTestId(PredictWorldCupHubBannerSelectorsIDs.CONTAINER),
-    );
-
-    const clickedCalls = mockTrackBannerAction.mock.calls.filter(
-      ([args]) => args?.actionType === PredictEventValues.ACTION_TYPE.CLICKED,
-    );
-    expect(clickedCalls).toHaveLength(1);
-    expect(mockHandleRewardsUrl).toHaveBeenCalledTimes(1);
-  });
-
-  it('hides the decorative arrow from the accessibility tree', () => {
-    const { queryByTestId } = render(<PredictWorldCupHubBanner />);
-
-    expect(
-      queryByTestId(PredictWorldCupHubBannerSelectorsIDs.ARROW),
-    ).toBeNull();
-  });
-
-  it('routes to the rewards deeplink when the arrow affordance is pressed', () => {
-    const { getByTestId } = render(<PredictWorldCupHubBanner />);
-
-    fireEvent.press(
-      getByTestId(PredictWorldCupHubBannerSelectorsIDs.ARROW, {
-        includeHiddenElements: true,
-      }),
-    );
-
-    expect(mockTrackBannerAction).toHaveBeenCalledWith({
-      actionType: PredictEventValues.ACTION_TYPE.CLICKED,
-      bannerType: PredictEventValues.BANNER_TYPE.PREDICT_THE_PITCH,
-    });
-    expect(mockHandleRewardsUrl).toHaveBeenCalledWith({
-      rewardsPath: '/rewards?campaign=predict-the-pitch',
-    });
-  });
-});
diff --git a/app/components/UI/Predict/components/PredictWorldCupHubBanner/PredictWorldCupHubBanner.testIds.ts b/app/components/UI/Predict/components/PredictWorldCupHubBanner/PredictWorldCupHubBanner.testIds.ts
deleted file mode 100644
index 94f7309b500e..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupHubBanner/PredictWorldCupHubBanner.testIds.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const PredictWorldCupHubBannerSelectorsIDs = {
-  CONTAINER: 'predict-world-cup-hub-banner',
-  IMAGE: 'predict-world-cup-hub-banner-image',
-  ARROW: 'predict-world-cup-hub-banner-arrow',
-} as const;
diff --git a/app/components/UI/Predict/components/PredictWorldCupHubBanner/PredictWorldCupHubBanner.tsx b/app/components/UI/Predict/components/PredictWorldCupHubBanner/PredictWorldCupHubBanner.tsx
deleted file mode 100644
index 4fac4c722e5c..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupHubBanner/PredictWorldCupHubBanner.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React, { useCallback, useEffect, useRef } from 'react';
-import { useSelector } from 'react-redux';
-import { strings } from '../../../../../../locales/i18n';
-import Engine from '../../../../../core/Engine';
-import { handleRewardsUrl } from '../../../../../core/DeeplinkManager/handlers/legacy/handleRewardsUrl';
-import { selectPredictWorldCupHubBannerEnabledFlag } from '../../selectors/featureFlags';
-import { PredictEventValues } from '../../constants/eventNames';
-import PredictWorldCupBannerCard from '../PredictWorldCupBannerCard';
-import { PredictWorldCupHubBannerSelectorsIDs } from './PredictWorldCupHubBanner.testIds';
-
-import predictThePitchImage from '../../assets/predict-the-pitch-hub-banner.png';
-
-const PREDICT_THE_PITCH_REWARDS_PATH = '/rewards?campaign=predict-the-pitch';
-
-/**
- * Promotional "$75K up for grabs" banner for the Predict the Pitch leaderboard
- * campaign, rendered directly below the World Cup Hub header. Visibility is
- * gated behind the `showHubBanner` sub-flag of the `predictWorldCup` LD flag.
- * Tapping routes internally to the Rewards view via `handleRewardsUrl` to avoid
- * the Safari-opens-universal-link pitfall of `Linking.openURL`.
- */
-const PredictWorldCupHubBanner: React.FC = () => {
-  const isEnabled = useSelector(selectPredictWorldCupHubBannerEnabledFlag);
-  const hasTrackedBannerViewed = useRef(false);
-
-  useEffect(() => {
-    if (!isEnabled || hasTrackedBannerViewed.current) {
-      return;
-    }
-
-    Engine.context.PredictController.trackBannerAction({
-      actionType: PredictEventValues.ACTION_TYPE.VIEWED,
-      bannerType: PredictEventValues.BANNER_TYPE.PREDICT_THE_PITCH,
-    });
-    hasTrackedBannerViewed.current = true;
-  }, [isEnabled]);
-
-  const handlePress = useCallback(() => {
-    Engine.context.PredictController.trackBannerAction({
-      actionType: PredictEventValues.ACTION_TYPE.CLICKED,
-      bannerType: PredictEventValues.BANNER_TYPE.PREDICT_THE_PITCH,
-    });
-    handleRewardsUrl({ rewardsPath: PREDICT_THE_PITCH_REWARDS_PATH });
-  }, []);
-
-  if (!isEnabled) {
-    return null;
-  }
-
-  const title = strings('predict.world_cup.hub_banner_title');
-  const description = strings('predict.world_cup.hub_banner_description');
-
-  return (
-    <PredictWorldCupBannerCard
-      variant="compact"
-      imageSource={predictThePitchImage}
-      title={title}
-      description={description}
-      onPress={handlePress}
-      accessibilityLabel={`${title}. ${description}`}
-      containerClassName="mx-4 mb-3"
-      testIDs={{
-        container: PredictWorldCupHubBannerSelectorsIDs.CONTAINER,
-        image: PredictWorldCupHubBannerSelectorsIDs.IMAGE,
-        arrow: PredictWorldCupHubBannerSelectorsIDs.ARROW,
-      }}
-    />
-  );
-};
-
-export default PredictWorldCupHubBanner;
diff --git a/app/components/UI/Predict/components/PredictWorldCupHubBanner/index.ts b/app/components/UI/Predict/components/PredictWorldCupHubBanner/index.ts
deleted file mode 100644
index 3c22eaff3c03..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupHubBanner/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default } from './PredictWorldCupHubBanner';
-export { PredictWorldCupHubBannerSelectorsIDs } from './PredictWorldCupHubBanner.testIds';
diff --git a/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/PredictWorldCupMainFeedBanner.test.tsx b/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/PredictWorldCupMainFeedBanner.test.tsx
deleted file mode 100644
index 9d762edc3f83..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/PredictWorldCupMainFeedBanner.test.tsx
+++ /dev/null
@@ -1,211 +0,0 @@
-import React from 'react';
-import { Dimensions, StyleSheet } from 'react-native';
-import { fireEvent, render } from '@testing-library/react-native';
-import { useNavigation } from '@react-navigation/native';
-import { useSelector } from 'react-redux';
-import Routes from '../../../../../constants/navigation/Routes';
-import { DEFAULT_PREDICT_WORLD_CUP_FLAG } from '../../constants/flags';
-import { PredictEventValues } from '../../constants/eventNames';
-import PredictWorldCupMainFeedBanner, {
-  getPredictWorldCupBannerImageAspectRatio,
-  getPredictWorldCupBannerSource,
-} from './PredictWorldCupMainFeedBanner';
-import { PredictWorldCupMainFeedBannerSelectorsIDs } from './PredictWorldCupMainFeedBanner.testIds';
-
-jest.mock('@react-navigation/native', () => ({
-  useNavigation: jest.fn(),
-}));
-
-jest.mock('react-redux', () => ({
-  useSelector: jest.fn(),
-}));
-
-const mockUseNavigation = useNavigation as jest.Mock;
-const mockUseSelector = useSelector as jest.Mock;
-const mockNavigate = jest.fn();
-const mockTrackBannerAction = jest.fn();
-
-jest.mock('../../../../../core/Engine', () => ({
-  __esModule: true,
-  default: {
-    context: {
-      PredictController: {
-        trackBannerAction: (
-          ...args: Parameters<typeof mockTrackBannerAction>
-        ) => mockTrackBannerAction(...args),
-      },
-    },
-  },
-}));
-
-const enabledConfig = {
-  ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-  enabled: true,
-  showMainFeedBanner: true,
-  showWorldCupScreen: true,
-};
-
-describe('PredictWorldCupMainFeedBanner', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockUseNavigation.mockReturnValue({ navigate: mockNavigate });
-    mockUseSelector.mockReturnValue(enabledConfig);
-  });
-
-  it('renders when the banner and World Cup screen are enabled and fallback image exists', () => {
-    const { getByTestId } = render(<PredictWorldCupMainFeedBanner />);
-
-    expect(
-      getByTestId(PredictWorldCupMainFeedBannerSelectorsIDs.CONTAINER),
-    ).toBeOnTheScreen();
-    expect(
-      getByTestId(PredictWorldCupMainFeedBannerSelectorsIDs.IMAGE),
-    ).toBeOnTheScreen();
-  });
-
-  it('uses the compact image dimensions when compact', () => {
-    const { getByTestId } = render(
-      <PredictWorldCupMainFeedBanner variant="compact" />,
-    );
-    const image = getByTestId(PredictWorldCupMainFeedBannerSelectorsIDs.IMAGE);
-
-    expect(StyleSheet.flatten(image.props.style)).toMatchObject({
-      height: 80,
-      width: 80,
-    });
-  });
-
-  it('uses the remote banner image URL and configured dimensions when configured', () => {
-    const bannerImageUrl = 'https://example.com/world-cup-banner.png';
-    mockUseSelector.mockReturnValue({
-      ...enabledConfig,
-      bannerImage: {
-        url: bannerImageUrl,
-        width: 300,
-        height: 100,
-      },
-    });
-
-    const { getByTestId } = render(<PredictWorldCupMainFeedBanner />);
-    const image = getByTestId(PredictWorldCupMainFeedBannerSelectorsIDs.IMAGE);
-
-    expect(image.props.source).toStrictEqual({ uri: bannerImageUrl });
-    expect(StyleSheet.flatten(image.props.style).height).toBeCloseTo(
-      (Dimensions.get('window').width - 32) / 3,
-    );
-  });
-
-  it('does not render when the main feed banner is disabled', () => {
-    mockUseSelector.mockReturnValue({
-      ...enabledConfig,
-      showMainFeedBanner: false,
-    });
-
-    const { queryByTestId } = render(<PredictWorldCupMainFeedBanner />);
-
-    expect(
-      queryByTestId(PredictWorldCupMainFeedBannerSelectorsIDs.CONTAINER),
-    ).toBeNull();
-  });
-
-  it('does not render when the World Cup screen is disabled', () => {
-    mockUseSelector.mockReturnValue({
-      ...enabledConfig,
-      showWorldCupScreen: false,
-    });
-
-    const { queryByTestId } = render(<PredictWorldCupMainFeedBanner />);
-
-    expect(
-      queryByTestId(PredictWorldCupMainFeedBannerSelectorsIDs.CONTAINER),
-    ).toBeNull();
-  });
-
-  it('does not render when there is no remote image URL or fallback image', () => {
-    const { queryByTestId } = render(
-      <PredictWorldCupMainFeedBanner fallbackImageSource={null} />,
-    );
-
-    expect(
-      queryByTestId(PredictWorldCupMainFeedBannerSelectorsIDs.CONTAINER),
-    ).toBeNull();
-  });
-
-  it('tracks banner viewed once per render lifecycle', () => {
-    const { rerender } = render(<PredictWorldCupMainFeedBanner />);
-
-    expect(mockTrackBannerAction).toHaveBeenCalledTimes(1);
-    expect(mockTrackBannerAction).toHaveBeenCalledWith({
-      actionType: PredictEventValues.ACTION_TYPE.VIEWED,
-      bannerType: PredictEventValues.BANNER_TYPE.WORLD_CUP,
-    });
-
-    rerender(<PredictWorldCupMainFeedBanner />);
-
-    expect(mockTrackBannerAction).toHaveBeenCalledTimes(1);
-  });
-
-  it('navigates to the World Cup screen when pressed', () => {
-    const { getByTestId } = render(<PredictWorldCupMainFeedBanner />);
-
-    fireEvent.press(
-      getByTestId(PredictWorldCupMainFeedBannerSelectorsIDs.CONTAINER),
-    );
-
-    expect(mockTrackBannerAction).toHaveBeenCalledWith({
-      actionType: PredictEventValues.ACTION_TYPE.CLICKED,
-      bannerType: PredictEventValues.BANNER_TYPE.WORLD_CUP,
-    });
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
-      screen: Routes.PREDICT.WORLD_CUP,
-      params: {
-        entryPoint: PredictEventValues.ENTRY_POINT.PREDICT_FEED,
-      },
-    });
-  });
-});
-
-describe('getPredictWorldCupBannerImageAspectRatio', () => {
-  it('returns configured image aspect ratio when dimensions are provided', () => {
-    expect(
-      getPredictWorldCupBannerImageAspectRatio({
-        url: 'https://example.com/banner.png',
-        width: 300,
-        height: 100,
-      }),
-    ).toBe(3);
-  });
-
-  it('returns default image aspect ratio when dimensions are missing', () => {
-    expect(getPredictWorldCupBannerImageAspectRatio()).toBe(360 / 177);
-  });
-
-  it('returns default image aspect ratio when dimensions are invalid', () => {
-    expect(
-      getPredictWorldCupBannerImageAspectRatio({
-        url: 'https://example.com/banner.png',
-        width: 0,
-        height: -200,
-      }),
-    ).toBe(360 / 177);
-  });
-});
-
-describe('getPredictWorldCupBannerSource', () => {
-  it('returns a trimmed remote URI source before the fallback image source', () => {
-    expect(
-      getPredictWorldCupBannerSource(
-        { url: ' https://example.com/banner.png ', width: 400, height: 200 },
-        1,
-      ),
-    ).toStrictEqual({ uri: 'https://example.com/banner.png' });
-  });
-
-  it('returns the fallback image source when remote URL is missing', () => {
-    expect(getPredictWorldCupBannerSource(undefined, 1)).toBe(1);
-  });
-
-  it('returns undefined when remote URL and fallback are both missing', () => {
-    expect(getPredictWorldCupBannerSource()).toBeUndefined();
-  });
-});
diff --git a/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/PredictWorldCupMainFeedBanner.testIds.ts b/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/PredictWorldCupMainFeedBanner.testIds.ts
deleted file mode 100644
index af699290a922..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/PredictWorldCupMainFeedBanner.testIds.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const PredictWorldCupMainFeedBannerSelectorsIDs = {
-  CONTAINER: 'predict-world-cup-main-feed-banner',
-  IMAGE: 'predict-world-cup-main-feed-banner-image',
-} as const;
diff --git a/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/PredictWorldCupMainFeedBanner.tsx b/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/PredictWorldCupMainFeedBanner.tsx
deleted file mode 100644
index 720d4dc3c288..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/PredictWorldCupMainFeedBanner.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
-import { ImageSourcePropType, useWindowDimensions } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
-import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
-import { useSelector } from 'react-redux';
-import { strings } from '../../../../../../locales/i18n';
-import Routes from '../../../../../constants/navigation/Routes';
-import Engine from '../../../../../core/Engine';
-import { selectPredictWorldCupConfig } from '../../selectors/featureFlags';
-import { PredictEventValues } from '../../constants/eventNames';
-import type { PredictWorldCupConfig } from '../../types/flags';
-import PredictWorldCupBannerCard, {
-  type PredictWorldCupBannerCardVariant,
-} from '../PredictWorldCupBannerCard';
-import { PredictWorldCupMainFeedBannerSelectorsIDs } from './PredictWorldCupMainFeedBanner.testIds';
-
-import worldCupMainFeedBannerImage from '../../assets/world-cup-main-feed-banner.png';
-import worldCupMainFeedBannerCompactImage from '../../assets/world-cup-main-feed-banner-compact.png';
-
-const WORLD_CUP_BANNER_DEFAULT_IMAGE_ASPECT_RATIO = 360 / 177;
-const WORLD_CUP_BANNER_HORIZONTAL_MARGIN = 16;
-const WORLD_CUP_BANNER_HORIZONTAL_MARGIN_TOTAL =
-  WORLD_CUP_BANNER_HORIZONTAL_MARGIN * 2;
-
-type PredictWorldCupMainFeedBannerVariant = PredictWorldCupBannerCardVariant;
-
-export const getPredictWorldCupBannerSource = (
-  bannerImage?: PredictWorldCupConfig['bannerImage'],
-  fallbackImageSource?: ImageSourcePropType,
-): ImageSourcePropType | undefined => {
-  const trimmedBannerImageUrl = bannerImage?.url.trim();
-
-  if (trimmedBannerImageUrl) {
-    return { uri: trimmedBannerImageUrl };
-  }
-
-  return fallbackImageSource;
-};
-
-export const getPredictWorldCupBannerImageAspectRatio = (
-  bannerImage?: PredictWorldCupConfig['bannerImage'],
-): number => {
-  if (bannerImage && bannerImage.width > 0 && bannerImage.height > 0) {
-    return bannerImage.width / bannerImage.height;
-  }
-
-  return WORLD_CUP_BANNER_DEFAULT_IMAGE_ASPECT_RATIO;
-};
-
-interface PredictWorldCupMainFeedBannerProps {
-  fallbackImageSource?: ImageSourcePropType | null;
-  variant?: PredictWorldCupMainFeedBannerVariant;
-}
-
-const shouldRenderBanner = ({
-  enabled,
-  showMainFeedBanner,
-  showWorldCupScreen,
-}: Pick<
-  PredictWorldCupConfig,
-  'enabled' | 'showMainFeedBanner' | 'showWorldCupScreen'
->): boolean => enabled && showMainFeedBanner && showWorldCupScreen;
-
-const PredictWorldCupMainFeedBanner: React.FC<
-  PredictWorldCupMainFeedBannerProps
-> = ({ fallbackImageSource, variant = 'default' }) => {
-  const { width: windowWidth } = useWindowDimensions();
-  const navigation = useNavigation<AppNavigationProp>();
-  const hasTrackedBannerViewed = useRef(false);
-  const predictWorldCupConfig = useSelector(selectPredictWorldCupConfig);
-  const bannerWidth = Math.max(
-    windowWidth - WORLD_CUP_BANNER_HORIZONTAL_MARGIN_TOTAL,
-    0,
-  );
-  const bannerImageAspectRatio = getPredictWorldCupBannerImageAspectRatio(
-    predictWorldCupConfig.bannerImage,
-  );
-  const bannerImageHeight = bannerWidth / bannerImageAspectRatio;
-
-  const defaultFallbackImageSource =
-    variant === 'compact'
-      ? worldCupMainFeedBannerCompactImage
-      : worldCupMainFeedBannerImage;
-  const resolvedFallbackImageSource =
-    fallbackImageSource === undefined
-      ? defaultFallbackImageSource
-      : (fallbackImageSource ?? undefined);
-
-  const imageSource = useMemo(
-    () =>
-      shouldRenderBanner(predictWorldCupConfig)
-        ? getPredictWorldCupBannerSource(
-            predictWorldCupConfig.bannerImage,
-            resolvedFallbackImageSource,
-          )
-        : undefined,
-    [resolvedFallbackImageSource, predictWorldCupConfig],
-  );
-
-  useEffect(() => {
-    if (!imageSource || hasTrackedBannerViewed.current) {
-      return;
-    }
-
-    Engine.context.PredictController.trackBannerAction({
-      actionType: PredictEventValues.ACTION_TYPE.VIEWED,
-      bannerType: PredictEventValues.BANNER_TYPE.WORLD_CUP,
-    });
-    hasTrackedBannerViewed.current = true;
-  }, [imageSource]);
-
-  const handlePress = useCallback(() => {
-    Engine.context.PredictController.trackBannerAction({
-      actionType: PredictEventValues.ACTION_TYPE.CLICKED,
-      bannerType: PredictEventValues.BANNER_TYPE.WORLD_CUP,
-    });
-    navigation.navigate(Routes.PREDICT.ROOT, {
-      screen: Routes.PREDICT.WORLD_CUP,
-      params: {
-        entryPoint: PredictEventValues.ENTRY_POINT.PREDICT_FEED,
-      },
-    });
-  }, [navigation]);
-
-  if (!imageSource) {
-    return null;
-  }
-
-  const title = strings('predict.world_cup.banner_title');
-  const description = strings('predict.world_cup.banner_description');
-
-  return (
-    <PredictWorldCupBannerCard
-      variant={variant}
-      imageSource={imageSource}
-      imageHeight={bannerImageHeight}
-      title={title}
-      description={description}
-      onPress={handlePress}
-      accessibilityLabel={`${title}. ${description}`}
-      containerClassName="mx-4 pb-3"
-      testIDs={{
-        container: PredictWorldCupMainFeedBannerSelectorsIDs.CONTAINER,
-        image: PredictWorldCupMainFeedBannerSelectorsIDs.IMAGE,
-      }}
-    />
-  );
-};
-
-export default PredictWorldCupMainFeedBanner;
diff --git a/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/index.ts b/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/index.ts
deleted file mode 100644
index 4af6c28e4090..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupMainFeedBanner/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default } from './PredictWorldCupMainFeedBanner';
-export { getPredictWorldCupBannerSource } from './PredictWorldCupMainFeedBanner';
-export { PredictWorldCupMainFeedBannerSelectorsIDs } from './PredictWorldCupMainFeedBanner.testIds';
diff --git a/app/components/UI/Predict/components/PredictWorldCupWinnerModule/PredictWorldCupWinnerModule.test.tsx b/app/components/UI/Predict/components/PredictWorldCupWinnerModule/PredictWorldCupWinnerModule.test.tsx
deleted file mode 100644
index 1616291b48b2..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupWinnerModule/PredictWorldCupWinnerModule.test.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import React from 'react';
-import { fireEvent, render, screen } from '@testing-library/react-native';
-import PredictWorldCupWinnerModule, {
-  PREDICT_WORLD_CUP_WINNER_MODULE_TEST_IDS,
-} from './PredictWorldCupWinnerModule';
-import type { PredictMarket, PredictOutcome } from '../../types';
-
-const mockOpenBuySheet = jest.fn();
-const mockExecuteGuardedAction = jest.fn((action: () => void) => action());
-
-jest.mock('../../contexts', () => ({
-  usePredictPreviewSheet: () => ({ openBuySheet: mockOpenBuySheet }),
-}));
-
-jest.mock('../../hooks/usePredictActionGuard', () => ({
-  usePredictActionGuard: () => ({
-    executeGuardedAction: mockExecuteGuardedAction,
-  }),
-}));
-
-jest.mock('../../hooks/useResolvedPredictEntryPoint', () => ({
-  useResolvedPredictEntryPoint: (ep: unknown) => ep ?? 'predict_feed',
-}));
-
-jest.mock('@react-navigation/native', () => ({
-  useNavigation: () => ({ navigate: jest.fn() }),
-}));
-
-jest.mock('../../../../../../locales/i18n', () => ({
-  strings: (key: string) => key,
-}));
-
-const createOutcome = (
-  overrides: Partial<PredictOutcome> = {},
-): PredictOutcome =>
-  ({
-    id: 'outcome-1',
-    providerId: 'provider-1',
-    marketId: 'market-1',
-    title: 'Brazil Yes',
-    description: '',
-    image: 'https://example.com/brazil.png',
-    status: 'open',
-    tokens: [
-      { id: 'token-yes', title: 'Yes', price: 0.18 },
-      { id: 'token-no', title: 'No', price: 0.82 },
-    ],
-    volume: 1000,
-    groupItemTitle: 'Brazil',
-    ...overrides,
-  }) as PredictOutcome;
-
-const createMarket = (outcomes: PredictOutcome[]): PredictMarket =>
-  ({
-    id: 'market-1',
-    title: 'World Cup Winner',
-    outcomes,
-    parentMarketId: null,
-  }) as PredictMarket;
-
-describe('PredictWorldCupWinnerModule', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('renders the module container', () => {
-    const market = createMarket([createOutcome()]);
-
-    render(<PredictWorldCupWinnerModule market={market} />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_WINNER_MODULE_TEST_IDS.CONTAINER),
-    ).toBeOnTheScreen();
-  });
-
-  it('renders a tile for each outcome', () => {
-    const outcomes = [
-      createOutcome({ id: 'o-1', groupItemTitle: 'Brazil' }),
-      createOutcome({ id: 'o-2', groupItemTitle: 'France' }),
-      createOutcome({ id: 'o-3', groupItemTitle: 'England' }),
-    ];
-    const market = createMarket(outcomes);
-
-    render(<PredictWorldCupWinnerModule market={market} />);
-
-    outcomes.forEach((o) => {
-      expect(
-        screen.getByTestId(
-          `${PREDICT_WORLD_CUP_WINNER_MODULE_TEST_IDS.TILE}-${o.id}`,
-        ),
-      ).toBeOnTheScreen();
-    });
-  });
-
-  it('calls openBuySheet with the outcome yes-token when a tile is pressed', () => {
-    const outcome = createOutcome({ id: 'o-brazil' });
-    const market = createMarket([outcome]);
-
-    render(<PredictWorldCupWinnerModule market={market} />);
-
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_WINNER_MODULE_TEST_IDS.TILE}-${outcome.id}`,
-      ),
-    );
-
-    expect(mockOpenBuySheet).toHaveBeenCalledWith(
-      expect.objectContaining({
-        market,
-        outcome,
-        outcomeToken: outcome.tokens[0],
-      }),
-    );
-  });
-
-  it('renders the heading with the who_will_win string', () => {
-    const market = createMarket([createOutcome()]);
-
-    render(<PredictWorldCupWinnerModule market={market} />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_WINNER_MODULE_TEST_IDS.HEADING),
-    ).toBeOnTheScreen();
-  });
-});
diff --git a/app/components/UI/Predict/components/PredictWorldCupWinnerModule/PredictWorldCupWinnerModule.tsx b/app/components/UI/Predict/components/PredictWorldCupWinnerModule/PredictWorldCupWinnerModule.tsx
deleted file mode 100644
index 5b47bb43973a..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupWinnerModule/PredictWorldCupWinnerModule.tsx
+++ /dev/null
@@ -1,188 +0,0 @@
-import React, { useCallback } from 'react';
-import { Pressable, ScrollView, View } from 'react-native';
-import { Image } from 'expo-image';
-import { useNavigation } from '@react-navigation/native';
-import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import {
-  Box,
-  Text,
-  TextColor,
-  TextVariant,
-} from '@metamask/design-system-react-native';
-import { strings } from '../../../../../../locales/i18n';
-import { usePredictActionGuard } from '../../hooks/usePredictActionGuard';
-import { usePredictPreviewSheet } from '../../contexts';
-import { useResolvedPredictEntryPoint } from '../../hooks/useResolvedPredictEntryPoint';
-import { formatPercentage } from '../../utils/format';
-import { PredictEventValues } from '../../constants/eventNames';
-import type {
-  PredictMarket,
-  PredictOutcome,
-  PredictOutcomeToken,
-} from '../../types';
-import type { PredictEntryPoint } from '../../types/navigation';
-import type { TransactionActiveAbTestEntry } from '../../../../../util/transactions/transaction-active-ab-test-attribution-registry';
-
-const PREDICT_WORLD_CUP_HUB_ANALYTICS_TAB = {
-  PROPS: 'props',
-} as const;
-
-export const PREDICT_WORLD_CUP_WINNER_MODULE_TEST_IDS = {
-  CONTAINER: 'predict-world-cup-winner-module',
-  HEADING: 'predict-world-cup-winner-module-heading',
-  TILE: 'predict-world-cup-winner-module-tile',
-} as const;
-
-interface WinnerTileProps {
-  outcome: PredictOutcome;
-  onPress: (outcome: PredictOutcome, token: PredictOutcomeToken) => void;
-}
-
-const WinnerTile: React.FC<WinnerTileProps> = ({ outcome, onPress }) => {
-  const tw = useTailwind();
-  const yesToken = outcome.tokens[0];
-  const probability = yesToken
-    ? formatPercentage(yesToken.price * 100, { truncate: true })
-    : '–';
-
-  return (
-    <Pressable
-      onPress={() => yesToken && onPress(outcome, yesToken)}
-      style={tw.style(
-        'flex-row items-center rounded-xl bg-muted gap-2 py-1 px-3',
-      )}
-      testID={`${PREDICT_WORLD_CUP_WINNER_MODULE_TEST_IDS.TILE}-${outcome.id}`}
-    >
-      {outcome.image ? (
-        <Image
-          source={{ uri: outcome.image }}
-          style={tw.style('rounded-lg flex-shrink-0', {
-            width: 32,
-            height: 32,
-          })}
-          contentFit="cover"
-        />
-      ) : (
-        <View
-          style={tw.style('rounded-lg bg-overlay-default flex-shrink-0', {
-            width: 32,
-            height: 32,
-          })}
-        />
-      )}
-      <Box twClassName="min-w-0">
-        <Text
-          variant={TextVariant.BodySm}
-          color={TextColor.TextDefault}
-          style={tw.style('font-medium')}
-          numberOfLines={1}
-        >
-          {outcome.groupItemTitle}
-        </Text>
-        <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
-          {probability}
-        </Text>
-      </Box>
-    </Pressable>
-  );
-};
-
-interface PredictWorldCupWinnerModuleProps {
-  market: PredictMarket;
-  entryPoint?: PredictEntryPoint;
-  predictScreen?: string;
-  transactionActiveAbTests?: TransactionActiveAbTestEntry[];
-}
-
-const PredictWorldCupWinnerModule: React.FC<
-  PredictWorldCupWinnerModuleProps
-> = ({
-  market,
-  entryPoint: propEntryPoint,
-  predictScreen,
-  transactionActiveAbTests,
-}) => {
-  const tw = useTailwind();
-  const navigation = useNavigation<AppNavigationProp>();
-  const { openBuySheet } = usePredictPreviewSheet();
-  const { executeGuardedAction } = usePredictActionGuard({ navigation });
-  const resolvedEntryPoint = useResolvedPredictEntryPoint(propEntryPoint);
-
-  const handleTilePress = useCallback(
-    (outcome: PredictOutcome, outcomeToken: PredictOutcomeToken) => {
-      executeGuardedAction(
-        () => {
-          openBuySheet({
-            market,
-            outcome,
-            outcomeToken,
-            entryPoint: resolvedEntryPoint,
-            predictFeedTab: PREDICT_WORLD_CUP_HUB_ANALYTICS_TAB.PROPS,
-            ...(predictScreen && { predictScreen }),
-            ...(transactionActiveAbTests?.length && {
-              transactionActiveAbTests,
-            }),
-          });
-        },
-        { attemptedAction: PredictEventValues.ATTEMPTED_ACTION.PREDICT },
-      );
-    },
-    [
-      executeGuardedAction,
-      market,
-      openBuySheet,
-      predictScreen,
-      resolvedEntryPoint,
-      transactionActiveAbTests,
-    ],
-  );
-
-  const mid = Math.ceil(market.outcomes.length / 2);
-  const topRow = market.outcomes.slice(0, mid);
-  const bottomRow = market.outcomes.slice(mid);
-
-  return (
-    <Box
-      twClassName="pb-4"
-      testID={PREDICT_WORLD_CUP_WINNER_MODULE_TEST_IDS.CONTAINER}
-    >
-      <Text
-        variant={TextVariant.HeadingSm}
-        color={TextColor.TextDefault}
-        style={tw.style('font-medium px-4 mb-3')}
-        testID={PREDICT_WORLD_CUP_WINNER_MODULE_TEST_IDS.HEADING}
-      >
-        {strings('predict.world_cup.who_will_win')}
-      </Text>
-      <ScrollView
-        horizontal
-        showsHorizontalScrollIndicator={false}
-        contentContainerStyle={tw.style('px-4 gap-2 flex-col')}
-      >
-        <View style={tw.style('flex-row gap-2')}>
-          {topRow.map((outcome) => (
-            <WinnerTile
-              key={outcome.id}
-              outcome={outcome}
-              onPress={handleTilePress}
-            />
-          ))}
-        </View>
-        {bottomRow.length > 0 && (
-          <View style={tw.style('flex-row gap-2')}>
-            {bottomRow.map((outcome) => (
-              <WinnerTile
-                key={outcome.id}
-                outcome={outcome}
-                onPress={handleTilePress}
-              />
-            ))}
-          </View>
-        )}
-      </ScrollView>
-    </Box>
-  );
-};
-
-export default PredictWorldCupWinnerModule;
diff --git a/app/components/UI/Predict/components/PredictWorldCupWinnerModule/index.ts b/app/components/UI/Predict/components/PredictWorldCupWinnerModule/index.ts
deleted file mode 100644
index 1d1fdb12d23c..000000000000
--- a/app/components/UI/Predict/components/PredictWorldCupWinnerModule/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default } from './PredictWorldCupWinnerModule';
-export { PREDICT_WORLD_CUP_WINNER_MODULE_TEST_IDS } from './PredictWorldCupWinnerModule';
diff --git a/app/components/UI/Predict/constants/eventNames.ts b/app/components/UI/Predict/constants/eventNames.ts
index fc0d5cce0791..c11d91d00f3d 100644
--- a/app/components/UI/Predict/constants/eventNames.ts
+++ b/app/components/UI/Predict/constants/eventNames.ts
@@ -28,6 +28,9 @@ export const PredictEventProperties = {
   MARKET_TYPE: 'market_type',
   OUTCOME: 'outcome',
   ORDER_TYPE: 'order_type',
+  TRADE_TYPE: 'trade_type',
+  IMPLEMENTATION_TYPE: 'implementation_type',
+  USD_TRADE_VALUE: 'usd_trade_value',
 
   // Sensitive properties
   AMOUNT_USD: 'amount_usd',
@@ -139,6 +142,12 @@ export const PredictEventValues = {
     MM_PREDICT_TRANSACTION_SUBMISSION: 'mm_predict_transaction_submission',
     MM_PREDICT_WALLET_CREATION: 'mm_predict_wallet_creation',
   },
+  TRADE_TYPE: {
+    PREDICT: 'predict',
+  },
+  IMPLEMENTATION_TYPE: {
+    NATIVE: 'native',
+  },
   CLAIM_FAILURE_REASON: {
     PENDING_RESOLUTION: 'pending_resolution',
     INSUFFICIENT_GAS: 'insufficient_gas',
@@ -169,7 +178,6 @@ export const PredictEventValues = {
     WITHDRAW: 'withdraw',
   },
   PREDICT_SCREEN: {
-    WORLD_CUP: 'world_cup',
     PREDICT_POSITIONS_SCREEN: 'predict_positions_screen',
   },
   PREDICT_COMPONENT: {
@@ -191,7 +199,6 @@ export const PredictEventValues = {
     TRENDING: 'trending',
   },
   BANNER_TYPE: {
-    WORLD_CUP: 'world_cup',
     PREDICT_THE_PITCH: 'predict_the_pitch',
   },
   SEARCH_INTERACTION: {
diff --git a/app/components/UI/Predict/constants/feedBanner.ts b/app/components/UI/Predict/constants/feedBanner.ts
index d26dca3fb41d..5c4b6bf00e8c 100644
--- a/app/components/UI/Predict/constants/feedBanner.ts
+++ b/app/components/UI/Predict/constants/feedBanner.ts
@@ -1,7 +1,6 @@
 export const PredictFeedBannerPosition = {
   AfterBalance: 'after-balance',
   AfterFeaturedCarousel: 'after-featured-carousel',
-  AfterWorldCupBanner: 'after-world-cup-banner',
   BeforePortfolio: 'before-portfolio',
   AfterPortfolio: 'after-portfolio',
   AfterLiveNow: 'after-live-now',
diff --git a/app/components/UI/Predict/constants/feedTabs.ts b/app/components/UI/Predict/constants/feedTabs.ts
index eca1fded98d7..8e8639b646a1 100644
--- a/app/components/UI/Predict/constants/feedTabs.ts
+++ b/app/components/UI/Predict/constants/feedTabs.ts
@@ -1,5 +1,4 @@
 import type { PredictCategory } from '../types';
-import { PREDICT_WORLD_CUP_FEED_PARAM } from './worldCupTabs';
 
 export type PredictTabKey = PredictCategory;
 
@@ -22,11 +21,6 @@ export const PREDICT_HOT_TAB: PredictTabConfig = {
   labelKey: 'predict.category.hot',
 };
 
-export const PREDICT_WORLD_CUP_TAB: PredictTabConfig = {
-  key: PREDICT_WORLD_CUP_FEED_PARAM,
-  labelKey: 'predict.world_cup.title',
-};
-
 export const PREDICT_WIMBLEDON_TAB: PredictTabConfig = {
   key: 'wimbledon',
   labelKey: 'predict.category.wimbledon',
@@ -35,7 +29,6 @@ export const PREDICT_WIMBLEDON_TAB: PredictTabConfig = {
 export const PREDICT_ALL_TABS: readonly PredictTabConfig[] = [
   ...PREDICT_BASE_TABS,
   PREDICT_HOT_TAB,
-  PREDICT_WORLD_CUP_TAB,
   PREDICT_WIMBLEDON_TAB,
 ];
 
diff --git a/app/components/UI/Predict/constants/flags.ts b/app/components/UI/Predict/constants/flags.ts
index 9f7d5de65067..eb925f6c3b5a 100644
--- a/app/components/UI/Predict/constants/flags.ts
+++ b/app/components/UI/Predict/constants/flags.ts
@@ -10,7 +10,6 @@ import type {
   PredictSportsFeedConfig,
   PredictSportsFeedTabConfig,
   PredictWimbledonTabFlag,
-  PredictWorldCupConfig,
 } from '../types/flags';
 import { PREDICT_MIN_GAME_OUTCOME_VOLUME } from '../utils/marketStaleness';
 import {
@@ -35,7 +34,7 @@ export const DEFAULT_PREDICT_FEED_BANNER_FLAG: PredictFeedBannerConfig = {
   id: '',
   title: '',
   description: '',
-  position: PredictFeedBannerPosition.AfterWorldCupBanner,
+  position: PredictFeedBannerPosition.AfterFeaturedCarousel,
   severity: PredictFeedBannerSeverity.Info,
   dismissible: false,
 };
@@ -108,22 +107,6 @@ export const DEFAULT_WIMBLEDON_TAB_FLAG = {
   minimumVersion: '',
 } satisfies PredictWimbledonTabFlag;
 
-export const PREDICT_WORLD_CUP_DEFAULT_TAG_SLUG = 'fifa-world-cup';
-
-export const DEFAULT_PREDICT_WORLD_CUP_FLAG: PredictWorldCupConfig = {
-  enabled: false,
-  minimumVersion: '',
-  showMainFeedBanner: false,
-  showMainFeedTab: false,
-  showWorldCupScreen: false,
-  showHubV2: false,
-  showHubBanner: false,
-  tagSlug: PREDICT_WORLD_CUP_DEFAULT_TAG_SLUG,
-  gamesTagId: PREDICT_POLYMARKET_GAMES_TAG_ID,
-  winnerEventId: '',
-  stages: [],
-};
-
 const createSportsFeedChip = (
   id: string,
   tagSlug: string,
diff --git a/app/components/UI/Predict/constants/worldCupHubTabs.test.ts b/app/components/UI/Predict/constants/worldCupHubTabs.test.ts
deleted file mode 100644
index 90761aa67858..000000000000
--- a/app/components/UI/Predict/constants/worldCupHubTabs.test.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import {
-  buildPredictWorldCupHubTabs,
-  PREDICT_WORLD_CUP_HUB_DEFAULT_TAB,
-  PREDICT_WORLD_CUP_HUB_TAB_KEYS,
-  resolvePredictWorldCupHubInitialTab,
-} from './worldCupHubTabs';
-
-jest.mock('../../../../../locales/i18n', () => ({
-  strings: (key: string) => key,
-}));
-
-describe('worldCupHubTabs', () => {
-  describe('PREDICT_WORLD_CUP_HUB_TAB_KEYS', () => {
-    it('exposes GAMES and PROPS tab keys', () => {
-      expect(PREDICT_WORLD_CUP_HUB_TAB_KEYS.GAMES).toBe('games');
-      expect(PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS).toBe('props');
-    });
-  });
-
-  describe('PREDICT_WORLD_CUP_HUB_DEFAULT_TAB', () => {
-    it('defaults to the games tab', () => {
-      expect(PREDICT_WORLD_CUP_HUB_DEFAULT_TAB).toBe(
-        PREDICT_WORLD_CUP_HUB_TAB_KEYS.GAMES,
-      );
-    });
-  });
-
-  describe('buildPredictWorldCupHubTabs', () => {
-    it('returns Games and Props tabs in order', () => {
-      const tabs = buildPredictWorldCupHubTabs(false);
-
-      expect(tabs).toHaveLength(2);
-      expect(tabs[0].key).toBe(PREDICT_WORLD_CUP_HUB_TAB_KEYS.GAMES);
-      expect(tabs[1].key).toBe(PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS);
-    });
-
-    it('sets hasLiveDot on Games tab when isLive is true', () => {
-      const tabs = buildPredictWorldCupHubTabs(true);
-
-      expect(tabs[0].hasLiveDot).toBe(true);
-    });
-
-    it('omits hasLiveDot on Games tab when isLive is false', () => {
-      const tabs = buildPredictWorldCupHubTabs(false);
-
-      expect(tabs[0].hasLiveDot).toBe(false);
-    });
-
-    it('never sets hasLiveDot on Props tab regardless of live status', () => {
-      const tabsLive = buildPredictWorldCupHubTabs(true);
-      const tabsNotLive = buildPredictWorldCupHubTabs(false);
-
-      expect(tabsLive[1].hasLiveDot).toBeFalsy();
-      expect(tabsNotLive[1].hasLiveDot).toBeFalsy();
-    });
-  });
-
-  describe('resolvePredictWorldCupHubInitialTab', () => {
-    it('resolves an explicit props request to the Props tab', () => {
-      expect(resolvePredictWorldCupHubInitialTab('props')).toBe(
-        PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS,
-      );
-    });
-
-    it('is case- and whitespace-insensitive for props', () => {
-      expect(resolvePredictWorldCupHubInitialTab('  PROPS  ')).toBe(
-        PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS,
-      );
-    });
-
-    it('falls back to the default Games tab for games', () => {
-      expect(resolvePredictWorldCupHubInitialTab('games')).toBe(
-        PREDICT_WORLD_CUP_HUB_DEFAULT_TAB,
-      );
-    });
-
-    it('falls back to the default Games tab for unknown keys', () => {
-      expect(resolvePredictWorldCupHubInitialTab('anything-else')).toBe(
-        PREDICT_WORLD_CUP_HUB_DEFAULT_TAB,
-      );
-    });
-
-    it('falls back to the default Games tab when undefined or null', () => {
-      expect(resolvePredictWorldCupHubInitialTab(undefined)).toBe(
-        PREDICT_WORLD_CUP_HUB_DEFAULT_TAB,
-      );
-      expect(resolvePredictWorldCupHubInitialTab(null)).toBe(
-        PREDICT_WORLD_CUP_HUB_DEFAULT_TAB,
-      );
-    });
-  });
-});
diff --git a/app/components/UI/Predict/constants/worldCupHubTabs.ts b/app/components/UI/Predict/constants/worldCupHubTabs.ts
deleted file mode 100644
index c16a5bc4d150..000000000000
--- a/app/components/UI/Predict/constants/worldCupHubTabs.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { strings } from '../../../../../locales/i18n';
-
-export const PREDICT_WORLD_CUP_HUB_TAB_KEYS = {
-  GAMES: 'games',
-  PROPS: 'props',
-} as const;
-
-export type PredictWorldCupHubTabKey =
-  (typeof PREDICT_WORLD_CUP_HUB_TAB_KEYS)[keyof typeof PREDICT_WORLD_CUP_HUB_TAB_KEYS];
-
-export interface PredictWorldCupHubTab {
-  key: PredictWorldCupHubTabKey;
-  label: string;
-  hasLiveDot?: boolean;
-}
-
-export const PREDICT_WORLD_CUP_HUB_DEFAULT_TAB =
-  PREDICT_WORLD_CUP_HUB_TAB_KEYS.GAMES;
-
-export const buildPredictWorldCupHubTabs = (
-  isLive: boolean,
-): PredictWorldCupHubTab[] => [
-  {
-    key: PREDICT_WORLD_CUP_HUB_TAB_KEYS.GAMES,
-    label: strings('predict.world_cup.tabs.games'),
-    hasLiveDot: isLive,
-  },
-  {
-    key: PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS,
-    label: strings('predict.world_cup.tabs.props'),
-  },
-];
-
-/**
- * Maps an incoming `initialTab` route param (used by the legacy V1 World Cup
- * screen) to a V2 hub tab. Only an explicit `props` request opens the Props
- * tab; anything else (including undefined) falls back to the default Games tab.
- */
-export const resolvePredictWorldCupHubInitialTab = (
-  requestedTab?: string | null,
-): PredictWorldCupHubTabKey =>
-  requestedTab?.trim().toLowerCase() === PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS
-    ? PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS
-    : PREDICT_WORLD_CUP_HUB_DEFAULT_TAB;
diff --git a/app/components/UI/Predict/constants/worldCupTabs.test.ts b/app/components/UI/Predict/constants/worldCupTabs.test.ts
deleted file mode 100644
index b6faf8115a0c..000000000000
--- a/app/components/UI/Predict/constants/worldCupTabs.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import {
-  getPredictWorldCupAvailableTabKeys,
-  PREDICT_WORLD_CUP_TAB_KEYS,
-  resolvePredictWorldCupInitialTab,
-} from './worldCupTabs';
-
-const config = {
-  stages: [
-    { key: 'group-stage', eventIds: ['123'] },
-    { key: 'final', eventIds: ['456'] },
-  ],
-};
-
-describe('worldCupTabs', () => {
-  describe('getPredictWorldCupAvailableTabKeys', () => {
-    it('returns all fixed and configured stage tabs when availability is not supplied', () => {
-      expect(getPredictWorldCupAvailableTabKeys(config)).toEqual([
-        PREDICT_WORLD_CUP_TAB_KEYS.ALL,
-        PREDICT_WORLD_CUP_TAB_KEYS.LIVE,
-        PREDICT_WORLD_CUP_TAB_KEYS.PROPS,
-        'group-stage',
-        'final',
-      ]);
-    });
-
-    it('hides Live, Props, and stage tabs when availability is false', () => {
-      expect(
-        getPredictWorldCupAvailableTabKeys(config, {
-          live: false,
-          props: true,
-          stages: {
-            'group-stage': false,
-            final: true,
-          },
-        }),
-      ).toEqual([PREDICT_WORLD_CUP_TAB_KEYS.ALL, 'props', 'final']);
-    });
-
-    it('hides configured stage tabs when they are absent from availability', () => {
-      expect(
-        getPredictWorldCupAvailableTabKeys(config, {
-          live: true,
-          props: true,
-          stages: {
-            final: true,
-          },
-        }),
-      ).toEqual([
-        PREDICT_WORLD_CUP_TAB_KEYS.ALL,
-        PREDICT_WORLD_CUP_TAB_KEYS.LIVE,
-        PREDICT_WORLD_CUP_TAB_KEYS.PROPS,
-        'final',
-      ]);
-    });
-
-    it('does not add stage tabs when no stages are configured', () => {
-      expect(getPredictWorldCupAvailableTabKeys({ stages: [] })).toEqual([
-        PREDICT_WORLD_CUP_TAB_KEYS.ALL,
-        PREDICT_WORLD_CUP_TAB_KEYS.LIVE,
-        PREDICT_WORLD_CUP_TAB_KEYS.PROPS,
-      ]);
-    });
-  });
-
-  describe('resolvePredictWorldCupInitialTab', () => {
-    it('falls back to All when requested group tab is not configured', () => {
-      expect(resolvePredictWorldCupInitialTab('group-b', { stages: [] })).toBe(
-        PREDICT_WORLD_CUP_TAB_KEYS.ALL,
-      );
-    });
-
-    it('falls back to All when requested tab is hidden by availability', () => {
-      expect(
-        resolvePredictWorldCupInitialTab('group-stage', config, {
-          live: true,
-          props: true,
-          stages: {
-            'group-stage': false,
-            final: true,
-          },
-        }),
-      ).toBe(PREDICT_WORLD_CUP_TAB_KEYS.ALL);
-    });
-
-    it('falls back to All when requested stage is absent from availability', () => {
-      expect(
-        resolvePredictWorldCupInitialTab('group-stage', config, {
-          live: true,
-          props: true,
-          stages: {
-            final: true,
-          },
-        }),
-      ).toBe(PREDICT_WORLD_CUP_TAB_KEYS.ALL);
-    });
-  });
-});
diff --git a/app/components/UI/Predict/constants/worldCupTabs.ts b/app/components/UI/Predict/constants/worldCupTabs.ts
deleted file mode 100644
index 3d5197a480a3..000000000000
--- a/app/components/UI/Predict/constants/worldCupTabs.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import type { PredictWorldCupConfig } from '../types/flags';
-
-export const PREDICT_WORLD_CUP_FEED_PARAM = 'world-cup';
-
-export const PREDICT_WORLD_CUP_TAB_KEYS = {
-  ALL: 'all',
-  LIVE: 'live',
-  PROPS: 'props',
-} as const;
-
-export type PredictWorldCupTabKey = string;
-
-export interface PredictWorldCupTabAvailability {
-  live: boolean;
-  props: boolean;
-  stages: Record<string, boolean>;
-}
-
-const normalizeStageTabKey = (key: string): string =>
-  key.trim().toLowerCase().replace(/-/g, '_');
-
-export const getPredictWorldCupAvailableTabKeys = (
-  config?: Pick<PredictWorldCupConfig, 'stages'>,
-  availability?: PredictWorldCupTabAvailability,
-): string[] => {
-  const keys: string[] = [PREDICT_WORLD_CUP_TAB_KEYS.ALL];
-
-  if (!availability || availability.live) {
-    keys.push(PREDICT_WORLD_CUP_TAB_KEYS.LIVE);
-  }
-  if (!availability || availability.props) {
-    keys.push(PREDICT_WORLD_CUP_TAB_KEYS.PROPS);
-  }
-
-  const configuredStages = config?.stages ?? [];
-  for (const stage of configuredStages) {
-    if (!availability || availability.stages[stage.key] === true) {
-      keys.push(stage.key);
-    }
-  }
-
-  return keys;
-};
-
-export const resolvePredictWorldCupInitialTab = (
-  requestedTab?: string | null,
-  config?: Pick<PredictWorldCupConfig, 'stages'>,
-  availability?: PredictWorldCupTabAvailability,
-): PredictWorldCupTabKey => {
-  const trimmed = requestedTab?.trim();
-  if (!trimmed) {
-    return PREDICT_WORLD_CUP_TAB_KEYS.ALL;
-  }
-
-  const normalizedTab = trimmed.toLowerCase();
-  const availableTabKeys = getPredictWorldCupAvailableTabKeys(
-    config,
-    availability,
-  );
-
-  if (availableTabKeys.includes(normalizedTab)) {
-    return normalizedTab;
-  }
-
-  const requestedNorm = normalizeStageTabKey(trimmed);
-  const matched = availableTabKeys.find(
-    (key) => normalizeStageTabKey(key) === requestedNorm,
-  );
-
-  return matched ?? PREDICT_WORLD_CUP_TAB_KEYS.ALL;
-};
diff --git a/app/components/UI/Predict/controllers/PredictAnalytics.test.ts b/app/components/UI/Predict/controllers/PredictAnalytics.test.ts
index 3c45275c71aa..faf0a1e570c4 100644
--- a/app/components/UI/Predict/controllers/PredictAnalytics.test.ts
+++ b/app/components/UI/Predict/controllers/PredictAnalytics.test.ts
@@ -37,8 +37,8 @@ describe('PredictAnalytics', () => {
   const getDevLoggerMock = () =>
     DevLogger.log as jest.MockedFunction<typeof DevLogger.log>;
 
-  const getTrackedEvent = (): TrackedEvent =>
-    getTrackEventMock().mock.calls[0][0] as TrackedEvent;
+  const getTrackedEvent = (index = 0): TrackedEvent =>
+    getTrackEventMock().mock.calls[index][0] as TrackedEvent;
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -117,6 +117,106 @@ describe('PredictAnalytics', () => {
       expect(getDevLoggerMock()).toHaveBeenCalledTimes(1);
     });
 
+    it('tracks Trade Considered after an initiated Predict buy', async () => {
+      await predictAnalytics.trackPredictOrderEvent({
+        status: PredictTradeStatus.INITIATED,
+        analyticsProperties: {
+          marketId: 'm1',
+          transactionType: PredictEventValues.TRANSACTION_TYPE.MM_PREDICT_BUY,
+        },
+      });
+
+      const predictTradeEvent = getTrackedEvent();
+      const tradeConsideredEvent = getTrackedEvent(1);
+
+      expect(getTrackEventMock()).toHaveBeenCalledTimes(2);
+      expect(predictTradeEvent.name).toBe(
+        MetaMetricsEvents.PREDICT_TRADE_TRANSACTION.category,
+      );
+      expect(tradeConsideredEvent.name).toBe(
+        MetaMetricsEvents.TRADE_CONSIDERED.category,
+      );
+      expect(tradeConsideredEvent.properties).toEqual({
+        trade_type: 'predict',
+        implementation_type: 'native',
+      });
+    });
+
+    it('does not track Trade Considered for an initiated Predict sell', async () => {
+      await predictAnalytics.trackPredictOrderEvent({
+        status: PredictTradeStatus.INITIATED,
+        analyticsProperties: {
+          marketId: 'm1',
+          transactionType: PredictEventValues.TRANSACTION_TYPE.MM_PREDICT_SELL,
+        },
+      });
+
+      expect(getTrackEventMock()).toHaveBeenCalledTimes(1);
+    });
+
+    it('tracks Trade Completed after Predict Trade Transaction with matching properties', async () => {
+      await predictAnalytics.trackPredictOrderEvent({
+        status: PredictTradeStatus.SUCCEEDED,
+        amountUsd: 150,
+        sharePrice: 0.63,
+        completionDuration: 1832,
+        orderType: 'FOK',
+        analyticsProperties: {
+          marketId: 'm1',
+          marketTitle: 'Will Team A win?',
+          entryPoint: 'predict_feed',
+          transactionType: PredictEventValues.TRANSACTION_TYPE.MM_PREDICT_BUY,
+          outcome: 'yes',
+        },
+      });
+
+      const predictTradeEvent = getTrackedEvent();
+      const tradeCompletedEvent = getTrackedEvent(1);
+
+      expect(getTrackEventMock()).toHaveBeenCalledTimes(2);
+      expect(predictTradeEvent.name).toBe(
+        MetaMetricsEvents.PREDICT_TRADE_TRANSACTION.category,
+      );
+      expect(tradeCompletedEvent.name).toBe(
+        MetaMetricsEvents.TRADE_COMPLETED.category,
+      );
+      expect(tradeCompletedEvent.properties).toEqual({
+        ...predictTradeEvent.properties,
+        trade_type: 'predict',
+        implementation_type: 'native',
+      });
+      expect(tradeCompletedEvent.sensitiveProperties).toEqual({
+        ...predictTradeEvent.sensitiveProperties,
+        usd_trade_value: 150,
+      });
+    });
+
+    it('does not track Trade Completed for a succeeded Predict deposit', async () => {
+      await predictAnalytics.trackPredictOrderEvent({
+        status: PredictTradeStatus.SUCCEEDED,
+        amountUsd: 150,
+        analyticsProperties: {
+          marketId: 'm1',
+          transactionType:
+            PredictEventValues.TRANSACTION_TYPE.MM_PREDICT_DEPOSIT,
+        },
+      });
+
+      expect(getTrackEventMock()).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not track Trade Completed without a USD trade value', async () => {
+      await predictAnalytics.trackPredictOrderEvent({
+        status: PredictTradeStatus.SUCCEEDED,
+        analyticsProperties: {
+          marketId: 'm1',
+          transactionType: PredictEventValues.TRANSACTION_TYPE.MM_PREDICT_BUY,
+        },
+      });
+
+      expect(getTrackEventMock()).toHaveBeenCalledTimes(1);
+    });
+
     it('tracks failed status with completionDuration and failureReason', async () => {
       await predictAnalytics.trackPredictOrderEvent({
         status: PredictTradeStatus.FAILED,
@@ -265,8 +365,8 @@ describe('PredictAnalytics', () => {
         analyticsProperties: {
           marketId: 'test',
           entryPoint: 'predict_feed',
-          predictFeedTab: 'world-cup',
-          predictScreen: 'world_cup',
+          predictFeedTab: 'sports',
+          predictScreen: 'predict_positions_screen',
         },
       });
 
@@ -274,8 +374,8 @@ describe('PredictAnalytics', () => {
 
       expect(event.properties).toMatchObject({
         entry_point: 'predict_feed',
-        predict_feed_tab: 'world-cup',
-        predict_screen: 'world_cup',
+        predict_feed_tab: 'sports',
+        predict_screen: 'predict_positions_screen',
       });
     });
 
@@ -469,8 +569,8 @@ describe('PredictAnalytics', () => {
         marketId: 'm1',
         marketTitle: 'Market title',
         entryPoint: 'predict_feed',
-        predictFeedTab: 'world-cup',
-        predictScreen: 'world_cup',
+        predictFeedTab: 'sports',
+        predictScreen: 'predict_positions_screen',
         marketDetailsViewed: 'about',
       });
 
@@ -478,8 +578,8 @@ describe('PredictAnalytics', () => {
 
       expect(event.properties).toMatchObject({
         entry_point: 'predict_feed',
-        predict_feed_tab: 'world-cup',
-        predict_screen: 'world_cup',
+        predict_feed_tab: 'sports',
+        predict_screen: 'predict_positions_screen',
       });
     });
 
@@ -745,7 +845,7 @@ describe('PredictAnalytics', () => {
     it('tracks banner viewed action with action type and banner type', () => {
       predictAnalytics.trackBannerAction({
         actionType: 'viewed',
-        bannerType: 'world_cup',
+        bannerType: 'predict_the_pitch',
       });
 
       const event = getTrackedEvent();
@@ -753,14 +853,14 @@ describe('PredictAnalytics', () => {
       expect(event.name).toBe(MetaMetricsEvents.PREDICT_BANNER_ACTION.category);
       expect(event.properties).toMatchObject({
         action_type: 'viewed',
-        banner_type: 'world_cup',
+        banner_type: 'predict_the_pitch',
       });
     });
 
     it('tracks banner clicked action with action type and banner type', () => {
       predictAnalytics.trackBannerAction({
         actionType: 'clicked',
-        bannerType: 'world_cup',
+        bannerType: 'predict_the_pitch',
       });
 
       const event = getTrackedEvent();
@@ -768,7 +868,7 @@ describe('PredictAnalytics', () => {
       expect(event.name).toBe(MetaMetricsEvents.PREDICT_BANNER_ACTION.category);
       expect(event.properties).toMatchObject({
         action_type: 'clicked',
-        banner_type: 'world_cup',
+        banner_type: 'predict_the_pitch',
       });
     });
 
diff --git a/app/components/UI/Predict/controllers/PredictAnalytics.ts b/app/components/UI/Predict/controllers/PredictAnalytics.ts
index 29df333c6724..f015f965d9ca 100644
--- a/app/components/UI/Predict/controllers/PredictAnalytics.ts
+++ b/app/components/UI/Predict/controllers/PredictAnalytics.ts
@@ -343,6 +343,52 @@ export class PredictAnalytics {
         .addSensitiveProperties(sensitiveProperties)
         .build(),
     );
+
+    if (
+      status === PredictTradeStatus.INITIATED &&
+      analyticsProperties.transactionType ===
+        PredictEventValues.TRANSACTION_TYPE.MM_PREDICT_BUY
+    ) {
+      analytics.trackEvent(
+        AnalyticsEventBuilder.createEventBuilder(
+          MetaMetricsEvents.TRADE_CONSIDERED,
+        )
+          .addProperties({
+            [PredictEventProperties.TRADE_TYPE]:
+              PredictEventValues.TRADE_TYPE.PREDICT,
+            [PredictEventProperties.IMPLEMENTATION_TYPE]:
+              PredictEventValues.IMPLEMENTATION_TYPE.NATIVE,
+          })
+          .build(),
+      );
+    }
+
+    if (
+      status === PredictTradeStatus.SUCCEEDED &&
+      amountUsd !== undefined &&
+      (analyticsProperties.transactionType ===
+        PredictEventValues.TRANSACTION_TYPE.MM_PREDICT_BUY ||
+        analyticsProperties.transactionType ===
+          PredictEventValues.TRANSACTION_TYPE.MM_PREDICT_SELL)
+    ) {
+      analytics.trackEvent(
+        AnalyticsEventBuilder.createEventBuilder(
+          MetaMetricsEvents.TRADE_COMPLETED,
+        )
+          .addProperties({
+            ...regularProperties,
+            [PredictEventProperties.TRADE_TYPE]:
+              PredictEventValues.TRADE_TYPE.PREDICT,
+            [PredictEventProperties.IMPLEMENTATION_TYPE]:
+              PredictEventValues.IMPLEMENTATION_TYPE.NATIVE,
+          })
+          .addSensitiveProperties({
+            ...sensitiveProperties,
+            [PredictEventProperties.USD_TRADE_VALUE]: amountUsd,
+          })
+          .build(),
+      );
+    }
   }
 
   public trackBetslipDismissed({
diff --git a/app/components/UI/Predict/controllers/PredictController.test.ts b/app/components/UI/Predict/controllers/PredictController.test.ts
index aa63a95cd8c1..651dade2b5fb 100644
--- a/app/components/UI/Predict/controllers/PredictController.test.ts
+++ b/app/components/UI/Predict/controllers/PredictController.test.ts
@@ -10634,7 +10634,7 @@ describe('PredictController', () => {
         controller.trackFeedViewed({
           sessionId: 'test',
           feedTab: 'test',
-          predictScreen: 'world_cup',
+          predictScreen: 'predict_positions_screen',
           numPagesViewed: 1,
           sessionTime: 1000,
         });
@@ -10646,7 +10646,7 @@ describe('PredictController', () => {
       withController(({ controller }) => {
         controller.trackBannerAction({
           actionType: 'viewed',
-          bannerType: 'world_cup',
+          bannerType: 'predict_the_pitch',
         });
         expect(analytics.trackEvent).toHaveBeenCalledTimes(1);
       });
diff --git a/app/components/UI/Predict/hooks/index.ts b/app/components/UI/Predict/hooks/index.ts
index 3e4a26c1408d..f9ea4dc7d228 100644
--- a/app/components/UI/Predict/hooks/index.ts
+++ b/app/components/UI/Predict/hooks/index.ts
@@ -37,29 +37,6 @@ export {
 export { usePredictCashOut } from './usePredictCashOut';
 export { usePredictPortfolio } from './usePredictPortfolio';
 
-export {
-  usePredictWorldCupMarkets,
-  usePredictWorldCupAvailability,
-  usePredictWorldCupAvailableTabs,
-  type UsePredictWorldCupMarketsOptions,
-  type UsePredictWorldCupAvailableTabsOptions,
-  type PredictWorldCupAvailableTab,
-} from './usePredictWorldCup';
-
-export {
-  usePredictWorldCupGamesSections,
-  usePredictWorldCupWinnerMarket,
-  type PredictWorldCupStageSection,
-  type UsePredictWorldCupGamesSectionsResult,
-  type UsePredictWorldCupWinnerMarketResult,
-} from './usePredictWorldCupHub';
-
-export {
-  usePredictWorldCupFeedSession,
-  type UsePredictWorldCupFeedSessionOptions,
-  type UsePredictWorldCupFeedSessionResult,
-} from './usePredictWorldCupFeedSession';
-
 export {
   usePredictFeedMarketList,
   type UsePredictFeedMarketListOptions,
diff --git a/app/components/UI/Predict/hooks/usePredictBalance.test.ts b/app/components/UI/Predict/hooks/usePredictBalance.test.ts
index f871804399be..2b5623422787 100644
--- a/app/components/UI/Predict/hooks/usePredictBalance.test.ts
+++ b/app/components/UI/Predict/hooks/usePredictBalance.test.ts
@@ -104,6 +104,17 @@ describe('usePredictBalance', () => {
       expect(mockGetBalance).not.toHaveBeenCalled();
     });
 
+    it('skips all setup when disabled', () => {
+      const { Wrapper } = createWrapper();
+
+      renderHook(() => usePredictBalance({ enabled: false }), {
+        wrapper: Wrapper,
+      });
+
+      expect(mockEnsurePolygonNetworkExists).not.toHaveBeenCalled();
+      expect(mockGetBalance).not.toHaveBeenCalled();
+    });
+
     it('fetches against the new address after the selected account changes', async () => {
       const { Wrapper } = createWrapper();
       mockGetBalance.mockImplementation(({ address }) =>
diff --git a/app/components/UI/Predict/hooks/usePredictBalance.ts b/app/components/UI/Predict/hooks/usePredictBalance.ts
index eaa38c469508..27419df681f8 100644
--- a/app/components/UI/Predict/hooks/usePredictBalance.ts
+++ b/app/components/UI/Predict/hooks/usePredictBalance.ts
@@ -6,7 +6,13 @@ import { getEvmAccountFromSelectedAccountGroup } from '../utils/accounts';
 import { predictQueries } from '../queries';
 import { selectSelectedAccountGroupId } from '../../../../selectors/multichainAccounts/accountTreeController';
 
-export function usePredictBalance(): UseQueryResult<number, Error> {
+interface UsePredictBalanceOptions {
+  enabled?: boolean;
+}
+
+export function usePredictBalance({
+  enabled = true,
+}: UsePredictBalanceOptions = {}): UseQueryResult<number, Error> {
   const { ensurePolygonNetworkExists } = usePredictNetworkManagement();
   // Subscribe to account group changes so the hook re-renders when the user switches accounts
   useSelector(selectSelectedAccountGroupId);
@@ -14,13 +20,15 @@ export function usePredictBalance(): UseQueryResult<number, Error> {
   const address = evmAccount?.address;
 
   useEffect(() => {
+    if (!enabled) return;
+
     ensurePolygonNetworkExists().catch(() => {
       // Network may already exist — swallow so the query can still proceed.
     });
-  }, [ensurePolygonNetworkExists]);
+  }, [enabled, ensurePolygonNetworkExists]);
 
   return useQuery({
     ...predictQueries.balance.options({ address: address ?? '' }),
-    enabled: Boolean(address),
+    enabled: enabled && Boolean(address),
   });
 }
diff --git a/app/components/UI/Predict/hooks/usePredictPlaceOrder.test.ts b/app/components/UI/Predict/hooks/usePredictPlaceOrder.test.ts
index 769932cfe07a..548f23b3725b 100644
--- a/app/components/UI/Predict/hooks/usePredictPlaceOrder.test.ts
+++ b/app/components/UI/Predict/hooks/usePredictPlaceOrder.test.ts
@@ -770,6 +770,36 @@ describe('usePredictPlaceOrder', () => {
     });
   });
 
+  describe('loading state', () => {
+    it('sets loading state before the pre-submit balance refetch resolves', async () => {
+      let resolveBalance: (value: { data: number }) => void = () => undefined;
+      mockRefetchBalance.mockReturnValue(
+        new Promise((resolve) => {
+          resolveBalance = resolve;
+        }),
+      );
+      mockPlaceOrder.mockResolvedValue(mockSuccessResult);
+      const { result } = renderHook(() => usePredictPlaceOrder());
+
+      let pendingOrder: Promise<PlaceOrderOutcome> | undefined;
+      act(() => {
+        pendingOrder = result.current.placeOrder(mockOrderParams);
+      });
+      const isLoadingDuringRefetch = result.current.isLoading;
+      const refetchCallsDuringRefetch = mockRefetchBalance.mock.calls.length;
+      const orderCallsDuringRefetch = mockPlaceOrder.mock.calls.length;
+      await act(async () => {
+        resolveBalance({ data: 1000 });
+        await pendingOrder;
+      });
+
+      expect(refetchCallsDuringRefetch).toBe(1);
+      expect(orderCallsDuringRefetch).toBe(0);
+      expect(isLoadingDuringRefetch).toBe(true);
+      expect(result.current.isLoading).toBe(false);
+    });
+  });
+
   describe('order not filled detection', () => {
     it('sets isOrderNotFilled to true when BUY order throws BUY_ORDER_NOT_FULLY_FILLED', async () => {
       mockPlaceOrder.mockRejectedValue(
diff --git a/app/components/UI/Predict/hooks/usePredictPlaceOrder.ts b/app/components/UI/Predict/hooks/usePredictPlaceOrder.ts
index fe478f2a7147..1e79586079c6 100644
--- a/app/components/UI/Predict/hooks/usePredictPlaceOrder.ts
+++ b/app/components/UI/Predict/hooks/usePredictPlaceOrder.ts
@@ -182,6 +182,10 @@ export function usePredictPlaceOrder(
 
   const placeOrder = useCallback(
     async (orderParams: PlaceOrderParams): Promise<PlaceOrderOutcome> => {
+      // Disable the CTA before the pre-submit balance refresh.
+      setIsLoading(true);
+      setError(undefined);
+
       const { side } = orderParams.preview;
 
       const buyTotalAmount =
@@ -204,6 +208,7 @@ export function usePredictPlaceOrder(
 
       // Check if user has sufficient balance for the bet amount
       if (side === Side.BUY && latestBalance < buyTotalAmount) {
+        setIsLoading(false);
         if (isDepositPending) {
           toastRef?.current?.showToast({
             variant: ToastVariants.Icon,
@@ -240,9 +245,6 @@ export function usePredictPlaceOrder(
       }
 
       try {
-        setIsLoading(true);
-        setError(undefined);
-
         const orderResult = await withPendingTransactionActiveAbTests(
           transactionActiveAbTests,
           () =>
diff --git a/app/components/UI/Predict/hooks/usePredictPortfolio.test.ts b/app/components/UI/Predict/hooks/usePredictPortfolio.test.ts
index a27d8aa99107..9028f01e6c7c 100644
--- a/app/components/UI/Predict/hooks/usePredictPortfolio.test.ts
+++ b/app/components/UI/Predict/hooks/usePredictPortfolio.test.ts
@@ -10,7 +10,7 @@ const mockUsePredictWithdraw = jest.fn();
 const mockUsePredictAccountState = jest.fn();
 
 jest.mock('./usePredictBalance', () => ({
-  usePredictBalance: () => mockUsePredictBalance(),
+  usePredictBalance: (options: unknown) => mockUsePredictBalance(options),
 }));
 
 jest.mock('./usePredictPositions', () => ({
@@ -118,6 +118,32 @@ describe('usePredictPortfolio', () => {
     expect(result.current.hasClaimableWinnings).toBe(false);
   });
 
+  it('propagates disabled state to every portfolio query', () => {
+    renderHook(() => usePredictPortfolio({ enabled: false }));
+
+    expect(mockUsePredictBalance).toHaveBeenCalledWith({ enabled: false });
+    expect(mockUsePredictPositions).toHaveBeenNthCalledWith(1, {
+      claimable: false,
+      enabled: false,
+      livePriceUpdates: true,
+    });
+    expect(mockUsePredictPositions).toHaveBeenNthCalledWith(2, {
+      claimable: true,
+      enabled: false,
+    });
+    expect(mockUsePredictAccountState).toHaveBeenCalledWith({ enabled: false });
+  });
+
+  it('disables live position updates when requested', () => {
+    renderHook(() => usePredictPortfolio({ livePriceUpdates: false }));
+
+    expect(mockUsePredictPositions).toHaveBeenNthCalledWith(1, {
+      claimable: false,
+      enabled: true,
+      livePriceUpdates: false,
+    });
+  });
+
   it('returns a usable balance-only portfolio state', () => {
     mockUsePredictBalance.mockReturnValue(createQuery<number>({ data: 250 }));
 
diff --git a/app/components/UI/Predict/hooks/usePredictPortfolio.ts b/app/components/UI/Predict/hooks/usePredictPortfolio.ts
index def4f4336d7a..5af84faaade1 100644
--- a/app/components/UI/Predict/hooks/usePredictPortfolio.ts
+++ b/app/components/UI/Predict/hooks/usePredictPortfolio.ts
@@ -56,6 +56,11 @@ export interface PredictPortfolioModel {
   >['withdrawTransaction'];
 }
 
+interface UsePredictPortfolioOptions {
+  enabled?: boolean;
+  livePriceUpdates?: boolean;
+}
+
 const getPositionsPnl = (positions: PredictPosition[]) => {
   const totals = positions.reduce(
     (acc, position) => ({
@@ -75,20 +80,27 @@ const getPositionsPnl = (positions: PredictPosition[]) => {
   };
 };
 
-export function usePredictPortfolio(): PredictPortfolioModel {
+export function usePredictPortfolio({
+  enabled = true,
+  livePriceUpdates = true,
+}: UsePredictPortfolioOptions = {}): PredictPortfolioModel {
   const {
     data: availableBalance = 0,
     isLoading: isBalanceLoading,
     isRefetching: isBalanceRefetching,
     error: balanceError,
     refetch: refetchBalance,
-  } = usePredictBalance();
+  } = usePredictBalance({ enabled });
 
   const activePositionsQuery = usePredictPositions({
     claimable: false,
-    livePriceUpdates: true,
+    enabled,
+    livePriceUpdates,
+  });
+  const claimablePositionsQuery = usePredictPositions({
+    claimable: true,
+    enabled,
   });
-  const claimablePositionsQuery = usePredictPositions({ claimable: true });
 
   const activePositions = activePositionsQuery.data ?? EMPTY_POSITIONS;
   const claimablePositions = claimablePositionsQuery.data ?? EMPTY_POSITIONS;
@@ -127,7 +139,7 @@ export function usePredictPortfolio(): PredictPortfolioModel {
   const { withdraw, withdrawTransaction } = usePredictWithdraw();
 
   const accountStateQuery = usePredictAccountState({
-    enabled: portfolioValue > 0,
+    enabled: enabled && portfolioValue > 0,
   });
   const refetchAccountState = accountStateQuery.refetch;
   const totalUnrealizedPnl = useMemo(
diff --git a/app/components/UI/Predict/hooks/usePredictTabs.test.ts b/app/components/UI/Predict/hooks/usePredictTabs.test.ts
index 2d00a994e305..4855492e5c70 100644
--- a/app/components/UI/Predict/hooks/usePredictTabs.test.ts
+++ b/app/components/UI/Predict/hooks/usePredictTabs.test.ts
@@ -1,10 +1,8 @@
 import { renderHook, act } from '@testing-library/react-native';
 import {
-  DEFAULT_PREDICT_WORLD_CUP_FLAG,
   DEFAULT_WIMBLEDON_TAB_FLAG,
   PREDICT_WIMBLEDON_DEFAULT_QUERY_PARAMS,
 } from '../constants/flags';
-import { buildPredictWorldCupAllQuery } from '../utils/worldCup';
 import { usePredictTabs } from './usePredictTabs';
 
 const mockRouteParams: { tab?: string } = {};
@@ -26,9 +24,6 @@ const mockWimbledonTabFlag: {
   enabled: false,
   queryParams: undefined,
 };
-let mockIsWorldCupMainFeedTabEnabled = false;
-let mockWorldCupConfig = DEFAULT_PREDICT_WORLD_CUP_FLAG;
-
 jest.mock('react-redux', () => ({
   useSelector: (selector: string) => {
     switch (selector) {
@@ -36,10 +31,6 @@ jest.mock('react-redux', () => ({
         return mockHotTabFlag;
       case 'selectPredictWimbledonTabFlag':
         return mockWimbledonTabFlag;
-      case 'selectPredictWorldCupMainFeedTabEnabledFlag':
-        return mockIsWorldCupMainFeedTabEnabled;
-      case 'selectPredictWorldCupConfig':
-        return mockWorldCupConfig;
       default:
         return undefined;
     }
@@ -49,9 +40,6 @@ jest.mock('react-redux', () => ({
 jest.mock('../selectors/featureFlags', () => ({
   selectPredictHotTabFlag: 'selectPredictHotTabFlag',
   selectPredictWimbledonTabFlag: 'selectPredictWimbledonTabFlag',
-  selectPredictWorldCupConfig: 'selectPredictWorldCupConfig',
-  selectPredictWorldCupMainFeedTabEnabledFlag:
-    'selectPredictWorldCupMainFeedTabEnabledFlag',
 }));
 
 jest.mock('../../../../../locales/i18n', () => ({
@@ -66,8 +54,6 @@ describe('usePredictTabs', () => {
     mockHotTabFlag.queryParams = undefined;
     mockWimbledonTabFlag.enabled = false;
     mockWimbledonTabFlag.queryParams = undefined;
-    mockIsWorldCupMainFeedTabEnabled = false;
-    mockWorldCupConfig = DEFAULT_PREDICT_WORLD_CUP_FLAG;
   });
 
   describe('tabs array', () => {
@@ -88,14 +74,6 @@ describe('usePredictTabs', () => {
       expect(result.current.tabs[1].key).toBe('trending');
     });
 
-    it('does not include World Cup tab when main feed tab flag is disabled', () => {
-      const { result } = renderHook(() => usePredictTabs());
-
-      expect(result.current.tabs.map((tab) => tab.key)).not.toContain(
-        'world-cup',
-      );
-    });
-
     it('does not include Wimbledon tab when Wimbledon tab flag is disabled', () => {
       const { result } = renderHook(() => usePredictTabs());
 
@@ -104,45 +82,15 @@ describe('usePredictTabs', () => {
       );
     });
 
-    it('includes World Cup tab at beginning when enabled', () => {
-      mockIsWorldCupMainFeedTabEnabled = true;
-
-      const { result } = renderHook(() => usePredictTabs());
-
-      expect(result.current.tabs).toHaveLength(7);
-      expect(result.current.tabs[0]).toEqual({
-        key: 'world-cup',
-        label: 'predict.world_cup.title',
-        customQueryParams: buildPredictWorldCupAllQuery(mockWorldCupConfig),
-      });
-      expect(result.current.tabs[1].key).toBe('trending');
-    });
-
-    it('places World Cup before Hot when both tabs are enabled', () => {
-      mockHotTabFlag.enabled = true;
-      mockHotTabFlag.queryParams = 'test=value';
-      mockIsWorldCupMainFeedTabEnabled = true;
-
-      const { result } = renderHook(() => usePredictTabs());
-
-      expect(result.current.tabs.map((tab) => tab.key).slice(0, 3)).toEqual([
-        'world-cup',
-        'hot',
-        'trending',
-      ]);
-    });
-
-    it('places Wimbledon after World Cup and before Hot when all optional tabs are enabled', () => {
+    it('places Wimbledon before Hot when all optional tabs are enabled', () => {
       mockHotTabFlag.enabled = true;
       mockHotTabFlag.queryParams = 'test=value';
       mockWimbledonTabFlag.enabled = true;
       mockWimbledonTabFlag.queryParams = DEFAULT_WIMBLEDON_TAB_FLAG.queryParams;
-      mockIsWorldCupMainFeedTabEnabled = true;
 
       const { result } = renderHook(() => usePredictTabs());
 
-      expect(result.current.tabs.map((tab) => tab.key).slice(0, 4)).toEqual([
-        'world-cup',
+      expect(result.current.tabs.map((tab) => tab.key).slice(0, 3)).toEqual([
         'wimbledon',
         'hot',
         'trending',
@@ -157,15 +105,6 @@ describe('usePredictTabs', () => {
       expect(result.current.activeIndex).toBe(0);
     });
 
-    it('defaults to 0 (World Cup) when World Cup tab is enabled and no tab is requested', () => {
-      mockIsWorldCupMainFeedTabEnabled = true;
-
-      const { result } = renderHook(() => usePredictTabs());
-
-      expect(result.current.activeIndex).toBe(0);
-      expect(result.current.tabs[0].key).toBe('world-cup');
-    });
-
     it('sets active index to requested tab position', () => {
       mockRouteParams.tab = 'crypto';
 
@@ -182,15 +121,6 @@ describe('usePredictTabs', () => {
       expect(result.current.activeIndex).toBe(0);
     });
 
-    it('defaults to trending when World Cup tab is requested but disabled', () => {
-      mockRouteParams.tab = 'world-cup';
-
-      const { result } = renderHook(() => usePredictTabs());
-
-      expect(result.current.activeIndex).toBe(0);
-      expect(result.current.initialTabKey).toBe('trending');
-    });
-
     it('defaults to trending when Wimbledon tab is requested but disabled', () => {
       mockRouteParams.tab = 'wimbledon';
 
@@ -200,16 +130,6 @@ describe('usePredictTabs', () => {
       expect(result.current.initialTabKey).toBe('trending');
     });
 
-    it('sets active index to requested World Cup tab when enabled', () => {
-      mockRouteParams.tab = 'world-cup';
-      mockIsWorldCupMainFeedTabEnabled = true;
-
-      const { result } = renderHook(() => usePredictTabs());
-
-      expect(result.current.activeIndex).toBe(0);
-      expect(result.current.initialTabKey).toBe('world-cup');
-    });
-
     it('sets active index to requested Wimbledon tab when enabled', () => {
       mockRouteParams.tab = 'wimbledon';
       mockWimbledonTabFlag.enabled = true;
@@ -355,24 +275,6 @@ describe('usePredictTabs', () => {
       });
     });
 
-    it('adds exact World Cup query params to the World Cup tab when enabled', () => {
-      mockIsWorldCupMainFeedTabEnabled = true;
-      mockWorldCupConfig = {
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        showMainFeedTab: true,
-        tagSlug: 'custom-world-cup',
-      };
-
-      const { result } = renderHook(() => usePredictTabs());
-
-      expect(result.current.tabs[0]).toEqual({
-        key: 'world-cup',
-        label: 'predict.world_cup.title',
-        customQueryParams: buildPredictWorldCupAllQuery(mockWorldCupConfig),
-      });
-    });
-
     it('adds default Wimbledon query params to the Wimbledon tab when enabled without remote query params', () => {
       mockWimbledonTabFlag.enabled = true;
 
diff --git a/app/components/UI/Predict/hooks/usePredictTabs.ts b/app/components/UI/Predict/hooks/usePredictTabs.ts
index 750cf29d7881..d636bfae54c7 100644
--- a/app/components/UI/Predict/hooks/usePredictTabs.ts
+++ b/app/components/UI/Predict/hooks/usePredictTabs.ts
@@ -5,20 +5,16 @@ import { strings } from '../../../../../locales/i18n';
 import {
   selectPredictHotTabFlag,
   selectPredictWimbledonTabFlag,
-  selectPredictWorldCupConfig,
-  selectPredictWorldCupMainFeedTabEnabledFlag,
 } from '../selectors/featureFlags';
 import {
   PREDICT_BASE_TABS,
   PREDICT_HOT_TAB,
   PREDICT_WIMBLEDON_TAB,
-  PREDICT_WORLD_CUP_TAB,
   isPredictTabKey,
   type PredictTabKey,
 } from '../constants/feedTabs';
 import { PREDICT_WIMBLEDON_DEFAULT_QUERY_PARAMS } from '../constants/flags';
 import type { PredictNavigationParamList } from '../types/navigation';
-import { buildPredictWorldCupAllQuery } from '../utils/worldCup';
 
 export interface FeedTab {
   key: PredictTabKey;
@@ -38,10 +34,6 @@ export const usePredictTabs = (): UsePredictTabsResult => {
     useRoute<RouteProp<PredictNavigationParamList, 'PredictMarketList'>>();
   const hotTabFlag = useSelector(selectPredictHotTabFlag);
   const wimbledonTabFlag = useSelector(selectPredictWimbledonTabFlag);
-  const isWorldCupMainFeedTabEnabled = useSelector(
-    selectPredictWorldCupMainFeedTabEnabledFlag,
-  );
-  const worldCupConfig = useSelector(selectPredictWorldCupConfig);
 
   const tabs: FeedTab[] = useMemo(() => {
     const baseTabs: FeedTab[] = PREDICT_BASE_TABS.map((tab) => ({
@@ -51,14 +43,6 @@ export const usePredictTabs = (): UsePredictTabsResult => {
 
     const optionalTabs: FeedTab[] = [];
 
-    if (isWorldCupMainFeedTabEnabled) {
-      optionalTabs.push({
-        key: PREDICT_WORLD_CUP_TAB.key,
-        label: strings(PREDICT_WORLD_CUP_TAB.labelKey),
-        customQueryParams: buildPredictWorldCupAllQuery(worldCupConfig),
-      });
-    }
-
     if (wimbledonTabFlag.enabled) {
       optionalTabs.push({
         key: PREDICT_WIMBLEDON_TAB.key,
@@ -81,10 +65,8 @@ export const usePredictTabs = (): UsePredictTabsResult => {
   }, [
     hotTabFlag.enabled,
     hotTabFlag.queryParams,
-    isWorldCupMainFeedTabEnabled,
     wimbledonTabFlag.enabled,
     wimbledonTabFlag.queryParams,
-    worldCupConfig,
   ]);
 
   const requestedValidTabKey = isPredictTabKey(route.params?.tab)
diff --git a/app/components/UI/Predict/hooks/usePredictWorldCup.test.ts b/app/components/UI/Predict/hooks/usePredictWorldCup.test.ts
deleted file mode 100644
index 8d6030046617..000000000000
--- a/app/components/UI/Predict/hooks/usePredictWorldCup.test.ts
+++ /dev/null
@@ -1,356 +0,0 @@
-import React from 'react';
-import { act, renderHook, waitFor } from '@testing-library/react-native';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import Engine from '../../../../core/Engine';
-import { DEFAULT_PREDICT_WORLD_CUP_FLAG } from '../constants/flags';
-import { Recurrence, type PredictMarket, type PredictOutcome } from '../types';
-import { usePredictWorldCupMarkets } from './usePredictWorldCup';
-
-jest.mock('../../../../core/Engine', () => ({
-  context: {
-    PredictController: {
-      getMarkets: jest.fn(),
-    },
-  },
-}));
-
-const mockGetMarkets = jest.mocked(Engine.context.PredictController.getMarkets);
-
-const createOutcome = (
-  overrides: Partial<PredictOutcome> = {},
-): PredictOutcome => ({
-  id: 'outcome-1',
-  providerId: 'polymarket',
-  marketId: 'market-1',
-  title: 'Outcome 1',
-  description: 'Outcome description',
-  image: 'outcome.png',
-  status: 'open',
-  tokens: [
-    {
-      id: 'token-1',
-      title: 'Yes',
-      price: 0.5,
-    },
-  ],
-  volume: 0,
-  groupItemTitle: 'Outcome 1',
-  ...overrides,
-});
-
-const createWrapper = () => {
-  const queryClient = new QueryClient({
-    defaultOptions: { queries: { cacheTime: Infinity, retry: false } },
-  });
-  const Wrapper = ({ children }: { children: React.ReactNode }) =>
-    React.createElement(QueryClientProvider, { client: queryClient }, children);
-  return { Wrapper, queryClient };
-};
-
-const createMarket = (
-  overrides: Partial<PredictMarket> = {},
-): PredictMarket => ({
-  id: 'market-1',
-  providerId: 'polymarket',
-  slug: 'market-1',
-  title: 'Market 1',
-  description: 'Description',
-  image: 'image.png',
-  status: 'open',
-  recurrence: Recurrence.NONE,
-  category: 'hot',
-  tags: [],
-  outcomes: [createOutcome()],
-  liquidity: 0,
-  volume: 0,
-  ...overrides,
-});
-
-describe('usePredictWorldCupMarkets', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('requests All markets with a cached paginated query', async () => {
-    const { Wrapper } = createWrapper();
-    const allMarket = createMarket({ id: 'all-market' });
-    mockGetMarkets.mockResolvedValue({
-      markets: [allMarket],
-      nextCursor: null,
-    });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupMarkets({
-          tabKey: 'all',
-          config: DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          pageSize: 30,
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() => expect(result.current.marketData).toEqual([allMarket]));
-
-    expect(mockGetMarkets).toHaveBeenCalledWith({
-      category: 'hot',
-      customQueryParams:
-        'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&order=volume24hr&ascending=false',
-      limit: 30,
-      afterCursor: null,
-    });
-    expect(result.current.hasMore).toBe(false);
-  });
-
-  it('filters stale World Cup markets while preserving pagination state', async () => {
-    const { Wrapper } = createWrapper();
-    const liveMarket = createMarket({ id: 'live-market' });
-    const staleMarket = createMarket({
-      id: 'stale-market',
-      outcomes: [
-        createOutcome({
-          id: 'dead-outcome',
-          title: 'Dead outcome',
-          tokens: [
-            {
-              id: 'dead-token',
-              title: 'Yes',
-              price: 0.99,
-            },
-          ],
-        }),
-      ],
-    });
-    mockGetMarkets.mockResolvedValue({
-      markets: [staleMarket, liveMarket],
-      nextCursor: 'cursor-2',
-    });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupMarkets({
-          tabKey: 'all',
-          config: DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          pageSize: 30,
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() =>
-      expect(result.current.marketData).toEqual([liveMarket]),
-    );
-    expect(result.current.hasMore).toBe(true);
-  });
-
-  it('filters child more-market cards', async () => {
-    const { Wrapper } = createWrapper();
-    const parentMarket = createMarket({ id: 'parent-market' });
-    const childMarket = createMarket({
-      id: 'child-market',
-      parentMarketId: 'parent-market',
-    });
-    mockGetMarkets.mockResolvedValue({
-      markets: [parentMarket, childMarket],
-      nextCursor: null,
-    });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupMarkets({
-          tabKey: 'all',
-          config: DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() =>
-      expect(result.current.marketData).toEqual([parentMarket]),
-    );
-  });
-
-  it('requests Props markets with a cached paginated query', async () => {
-    const { Wrapper } = createWrapper();
-    const propsMarket = createMarket({ id: 'props-market' });
-    mockGetMarkets.mockResolvedValue({
-      markets: [propsMarket],
-      nextCursor: null,
-    });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupMarkets({
-          tabKey: 'props',
-          config: DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() =>
-      expect(result.current.marketData).toEqual([propsMarket]),
-    );
-
-    expect(mockGetMarkets).toHaveBeenCalledWith(
-      expect.objectContaining({
-        customQueryParams:
-          'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&exclude_tag_id=100639&order=volume&ascending=false',
-      }),
-    );
-  });
-
-  it('requests Live markets without pagination', async () => {
-    const { Wrapper } = createWrapper();
-    const liveMarket = createMarket({ id: 'live-market' });
-    mockGetMarkets.mockResolvedValue({
-      markets: [liveMarket],
-      nextCursor: null,
-    });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupMarkets({
-          tabKey: 'live',
-          config: DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() =>
-      expect(result.current.marketData).toEqual([liveMarket]),
-    );
-
-    expect(mockGetMarkets).toHaveBeenCalledWith(
-      expect.objectContaining({
-        customQueryParams:
-          'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&tag_id=100639&live=true&order=startDate',
-      }),
-    );
-    expect(result.current.hasMore).toBe(false);
-    expect(result.current.isFetchingMore).toBe(false);
-  });
-
-  it('requests stage markets with all configured event IDs and no pagination', async () => {
-    const { Wrapper } = createWrapper();
-    const stageMarket = createMarket({
-      id: 'stage-market',
-      outcomes: [createOutcome({ sportsMarketType: 'soccer_team_to_advance' })],
-    });
-    const config = {
-      ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-      stages: [{ key: 'group-stage', eventIds: ['123', '456'] }],
-    };
-    mockGetMarkets.mockResolvedValue({
-      markets: [stageMarket],
-      nextCursor: null,
-    });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupMarkets({
-          tabKey: 'group-stage',
-          config,
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() =>
-      expect(result.current.marketData).toEqual([stageMarket]),
-    );
-
-    expect(mockGetMarkets).toHaveBeenCalledWith(
-      expect.objectContaining({
-        customQueryParams:
-          'active=true&archived=false&closed=false&id=123&id=456',
-        limit: 2,
-      }),
-    );
-    expect(result.current.hasMore).toBe(false);
-  });
-
-  it('skips fetching for a stage without configured event IDs', () => {
-    const { Wrapper } = createWrapper();
-    const config = {
-      ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-      stages: [{ key: 'empty-stage', eventIds: [] }],
-    };
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupMarkets({
-          tabKey: 'empty-stage',
-          config,
-        }),
-      { wrapper: Wrapper },
-    );
-
-    expect(result.current.marketData).toEqual([]);
-    expect(mockGetMarkets).not.toHaveBeenCalled();
-  });
-
-  it('uses the returned cursor when fetching more World Cup markets', async () => {
-    const { Wrapper } = createWrapper();
-    const firstMarket = createMarket({ id: 'first-market' });
-    const secondMarket = createMarket({ id: 'second-market' });
-    mockGetMarkets
-      .mockResolvedValueOnce({ markets: [firstMarket], nextCursor: 'cursor-2' })
-      .mockResolvedValueOnce({ markets: [secondMarket], nextCursor: null });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupMarkets({
-          tabKey: 'all',
-          config: DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          pageSize: 1,
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() => {
-      expect(result.current.marketData).toEqual([firstMarket]);
-    });
-    expect(result.current.hasMore).toBe(true);
-
-    await act(async () => {
-      await result.current.fetchMore();
-    });
-
-    expect(mockGetMarkets).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({ afterCursor: 'cursor-2', limit: 1 }),
-    );
-    await waitFor(() => {
-      expect(result.current.marketData).toEqual([firstMarket, secondMarket]);
-    });
-    expect(result.current.hasMore).toBe(false);
-  });
-
-  it('returns cached data when switching back to a previously loaded tab', async () => {
-    const { Wrapper } = createWrapper();
-    const allMarket = createMarket({ id: 'all-market' });
-    const liveMarket = createMarket({ id: 'live-market' });
-    mockGetMarkets
-      .mockResolvedValueOnce({ markets: [allMarket], nextCursor: null })
-      .mockResolvedValueOnce({ markets: [liveMarket], nextCursor: null });
-
-    const { result, rerender } = renderHook(
-      ({ tabKey }: { tabKey: 'all' | 'live' }) =>
-        usePredictWorldCupMarkets({
-          tabKey,
-          config: DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        }),
-      { initialProps: { tabKey: 'all' }, wrapper: Wrapper },
-    );
-
-    await waitFor(() => expect(result.current.marketData).toEqual([allMarket]));
-
-    rerender({ tabKey: 'live' });
-
-    await waitFor(() =>
-      expect(result.current.marketData).toEqual([liveMarket]),
-    );
-
-    mockGetMarkets.mockClear();
-    rerender({ tabKey: 'all' });
-
-    expect(result.current.marketData).toEqual([allMarket]);
-    expect(mockGetMarkets).not.toHaveBeenCalled();
-  });
-});
diff --git a/app/components/UI/Predict/hooks/usePredictWorldCup.ts b/app/components/UI/Predict/hooks/usePredictWorldCup.ts
deleted file mode 100644
index 879e062dec41..000000000000
--- a/app/components/UI/Predict/hooks/usePredictWorldCup.ts
+++ /dev/null
@@ -1,418 +0,0 @@
-import { useCallback, useEffect, useMemo } from 'react';
-import {
-  queryOptions,
-  useInfiniteQuery,
-  useQueries,
-  useQuery,
-  useQueryClient,
-} from '@tanstack/react-query';
-import { predictQueries } from '../queries';
-import {
-  getPredictWorldCupAvailableTabKeys,
-  PREDICT_WORLD_CUP_TAB_KEYS,
-  type PredictWorldCupTabAvailability,
-  type PredictWorldCupTabKey,
-} from '../constants/worldCupTabs';
-import {
-  buildPredictWorldCupAllQuery,
-  buildPredictWorldCupLiveQuery,
-  buildPredictWorldCupPropsQuery,
-  buildPredictWorldCupStageEventsQuery,
-  resolvePredictWorldCupStageLabel,
-} from '../utils/worldCup';
-import {
-  fetchPredictWorldCupMarketsPage,
-  PREDICT_WORLD_CUP_PAGE_SIZE,
-} from '../services/worldCup';
-import { strings } from '../../../../../locales/i18n';
-import type { PredictMarket } from '../types';
-import type { PredictWorldCupConfig } from '../types/flags';
-import { filterStandaloneMarkets } from '../utils/feed';
-import { getVisiblePredictMarkets } from '../utils/marketStaleness';
-import type { UsePredictMarketDataResult } from './usePredictMarketData';
-
-export interface UsePredictWorldCupMarketsOptions {
-  tabKey: PredictWorldCupTabKey;
-  config: PredictWorldCupDataConfig;
-  enabled?: boolean;
-  pageSize?: number;
-}
-
-export interface UsePredictWorldCupAvailableTabsOptions {
-  enabled?: boolean;
-}
-
-export interface PredictWorldCupAvailableTab {
-  key: PredictWorldCupTabKey;
-  label: string;
-  isLive?: boolean;
-}
-
-type PredictWorldCupDataConfig = Pick<
-  PredictWorldCupConfig,
-  'tagSlug' | 'gamesTagId' | 'stages'
->;
-
-interface WorldCupMarketDataConfig {
-  tabKey: PredictWorldCupTabKey;
-  queryParams: string;
-  pageSize: number;
-  paginationEnabled: boolean;
-  enabled: boolean;
-  stage?: PredictWorldCupConfig['stages'][number];
-}
-
-const DEFAULT_WORLD_CUP_MARKETS_OPTIONS = {
-  enabled: true,
-} as const;
-
-const PREDICT_WORLD_CUP_MARKETS_STALE_TIME = 10_000;
-
-const getStage = (
-  config: PredictWorldCupDataConfig,
-  tabKey: PredictWorldCupTabKey,
-): PredictWorldCupConfig['stages'][number] | undefined =>
-  config.stages.find((configuredStage) => configuredStage.key === tabKey);
-
-const getWorldCupMarketDataConfig = ({
-  tabKey,
-  config,
-  enabled = true,
-  pageSize = PREDICT_WORLD_CUP_PAGE_SIZE,
-}: UsePredictWorldCupMarketsOptions): WorldCupMarketDataConfig => {
-  switch (tabKey) {
-    case PREDICT_WORLD_CUP_TAB_KEYS.ALL:
-      return {
-        tabKey,
-        queryParams: buildPredictWorldCupAllQuery(config),
-        pageSize,
-        paginationEnabled: true,
-        enabled,
-      };
-    case PREDICT_WORLD_CUP_TAB_KEYS.PROPS:
-      return {
-        tabKey,
-        queryParams: buildPredictWorldCupPropsQuery(config),
-        pageSize,
-        paginationEnabled: true,
-        enabled,
-      };
-    case PREDICT_WORLD_CUP_TAB_KEYS.LIVE:
-      return {
-        tabKey,
-        queryParams: buildPredictWorldCupLiveQuery(config),
-        pageSize,
-        paginationEnabled: false,
-        enabled,
-      };
-    default: {
-      const stage = getStage(config, tabKey);
-
-      if (!stage || stage.eventIds.length === 0) {
-        return {
-          tabKey,
-          queryParams: '',
-          pageSize,
-          paginationEnabled: false,
-          enabled: false,
-        };
-      }
-
-      return {
-        tabKey,
-        queryParams: buildPredictWorldCupStageEventsQuery(stage),
-        pageSize: stage.eventIds.length,
-        paginationEnabled: false,
-        enabled,
-        stage,
-      };
-    }
-  }
-};
-
-const getSingleWorldCupMarketQueryOptions = (
-  marketDataConfig: WorldCupMarketDataConfig,
-  config: PredictWorldCupDataConfig,
-) => {
-  if (marketDataConfig.tabKey === PREDICT_WORLD_CUP_TAB_KEYS.LIVE) {
-    return predictQueries.worldCup.options.live(config, {
-      limit: marketDataConfig.pageSize,
-    });
-  }
-
-  if (marketDataConfig.stage) {
-    return predictQueries.worldCup.options.stage(marketDataConfig.stage);
-  }
-
-  return queryOptions<PredictMarket[], Error>({
-    queryKey: [
-      ...predictQueries.worldCup.keys.all(),
-      'disabled',
-      marketDataConfig.tabKey,
-    ],
-    queryFn: async () => [],
-    staleTime: PREDICT_WORLD_CUP_MARKETS_STALE_TIME,
-  });
-};
-
-const fetchInfiniteWorldCupMarketsPage = async ({
-  queryParams,
-  pageSize,
-  pageParam,
-}: {
-  queryParams: string;
-  pageSize: number;
-  pageParam?: unknown;
-}) =>
-  fetchPredictWorldCupMarketsPage({
-    queryParams,
-    limit: pageSize,
-    afterCursor: typeof pageParam === 'string' ? pageParam : null,
-  });
-
-export const usePredictWorldCupMarkets = ({
-  tabKey,
-  config,
-  enabled = DEFAULT_WORLD_CUP_MARKETS_OPTIONS.enabled,
-  pageSize,
-}: UsePredictWorldCupMarketsOptions): UsePredictMarketDataResult => {
-  const marketDataConfig = useMemo(
-    () =>
-      getWorldCupMarketDataConfig({
-        tabKey,
-        config,
-        enabled,
-        pageSize,
-      }),
-    [config, enabled, pageSize, tabKey],
-  );
-
-  const infiniteQuery = useInfiniteQuery<
-    Awaited<ReturnType<typeof fetchPredictWorldCupMarketsPage>>,
-    Error
-  >({
-    queryKey: predictQueries.worldCup.keys.infiniteMarkets(
-      marketDataConfig.tabKey,
-      marketDataConfig.queryParams,
-      marketDataConfig.pageSize,
-    ),
-    queryFn: ({ pageParam }) =>
-      fetchInfiniteWorldCupMarketsPage({
-        queryParams: marketDataConfig.queryParams,
-        pageSize: marketDataConfig.pageSize,
-        pageParam,
-      }),
-    getNextPageParam: (lastPage) => lastPage.nextCursor ?? undefined,
-    enabled: marketDataConfig.enabled && marketDataConfig.paginationEnabled,
-    staleTime: PREDICT_WORLD_CUP_MARKETS_STALE_TIME,
-  });
-
-  const singleQueryOptions = useMemo(
-    () => getSingleWorldCupMarketQueryOptions(marketDataConfig, config),
-    [config, marketDataConfig],
-  );
-  const singleQuery = useQuery({
-    ...singleQueryOptions,
-    enabled: marketDataConfig.enabled && !marketDataConfig.paginationEnabled,
-  });
-
-  const fetchMore = useCallback(async () => {
-    if (!marketDataConfig.paginationEnabled) {
-      return;
-    }
-
-    await infiniteQuery.fetchNextPage();
-  }, [infiniteQuery, marketDataConfig.paginationEnabled]);
-
-  const refetch = useCallback(async () => {
-    if (marketDataConfig.paginationEnabled) {
-      await infiniteQuery.refetch();
-      return;
-    }
-
-    await singleQuery.refetch();
-  }, [infiniteQuery, marketDataConfig.paginationEnabled, singleQuery]);
-
-  const infiniteMarketData = useMemo(
-    () => infiniteQuery.data?.pages.flatMap((page) => page.markets) ?? [],
-    [infiniteQuery.data],
-  );
-  const visibleInfiniteMarketData = useMemo(
-    () => getVisiblePredictMarkets(filterStandaloneMarkets(infiniteMarketData)),
-    [infiniteMarketData],
-  );
-  const visibleSingleMarketData = useMemo(
-    () =>
-      getVisiblePredictMarkets(filterStandaloneMarkets(singleQuery.data ?? [])),
-    [singleQuery.data],
-  );
-
-  if (marketDataConfig.paginationEnabled) {
-    return {
-      marketData: visibleInfiniteMarketData,
-      isFetching: infiniteQuery.isLoading,
-      isFetchingMore: infiniteQuery.isFetchingNextPage,
-      error: infiniteQuery.error?.message ?? null,
-      hasMore: infiniteQuery.hasNextPage ?? false,
-      refetch,
-      fetchMore,
-    };
-  }
-
-  return {
-    marketData: visibleSingleMarketData,
-    isFetching: singleQuery.isLoading,
-    isFetchingMore: false,
-    error: singleQuery.error?.message ?? null,
-    hasMore: false,
-    refetch,
-    fetchMore,
-  };
-};
-
-const prefetchWorldCupTabMarkets = ({
-  queryClient,
-  tabKey,
-  config,
-}: {
-  queryClient: ReturnType<typeof useQueryClient>;
-  tabKey: PredictWorldCupTabKey;
-  config: PredictWorldCupDataConfig;
-}) => {
-  const marketDataConfig = getWorldCupMarketDataConfig({
-    tabKey,
-    config,
-    enabled: true,
-  });
-
-  if (!marketDataConfig.enabled) {
-    return;
-  }
-
-  if (marketDataConfig.paginationEnabled) {
-    queryClient.prefetchInfiniteQuery({
-      queryKey: predictQueries.worldCup.keys.infiniteMarkets(
-        marketDataConfig.tabKey,
-        marketDataConfig.queryParams,
-        marketDataConfig.pageSize,
-      ),
-      queryFn: ({ pageParam }) =>
-        fetchInfiniteWorldCupMarketsPage({
-          queryParams: marketDataConfig.queryParams,
-          pageSize: marketDataConfig.pageSize,
-          pageParam,
-        }),
-      staleTime: PREDICT_WORLD_CUP_MARKETS_STALE_TIME,
-    });
-    return;
-  }
-
-  queryClient.prefetchQuery(
-    getSingleWorldCupMarketQueryOptions(marketDataConfig, config),
-  );
-};
-
-export const usePredictWorldCupAvailability = (
-  config: PredictWorldCupDataConfig,
-  options: UsePredictWorldCupAvailableTabsOptions = DEFAULT_WORLD_CUP_MARKETS_OPTIONS,
-) => {
-  const enabled = options.enabled ?? true;
-  const queries = useQueries({
-    queries: [
-      predictQueries.worldCup.options.availability.live(config),
-      predictQueries.worldCup.options.availability.props(config),
-      ...config.stages.map((stage) =>
-        predictQueries.worldCup.options.availability.stage(stage),
-      ),
-    ].map((queryOption) => ({
-      ...queryOption,
-      enabled,
-    })),
-  });
-
-  const availability: PredictWorldCupTabAvailability = {
-    live: queries[0]?.data ?? false,
-    props: queries[1]?.data ?? false,
-    stages: config.stages.reduce<Record<string, boolean>>(
-      (accumulator, stage, index) => ({
-        ...accumulator,
-        [stage.key]: queries[index + 2]?.data ?? false,
-      }),
-      {},
-    ),
-  };
-
-  return {
-    availability,
-    isFetching: queries.some((query) => query.isFetching),
-    isLoading: queries.some((query) => query.isLoading),
-    errors: queries.map((query) => query.error),
-    refetch: () => Promise.all(queries.map((query) => query.refetch())),
-  };
-};
-
-export const usePredictWorldCupAvailableTabs = (
-  config: PredictWorldCupDataConfig,
-  options: UsePredictWorldCupAvailableTabsOptions = DEFAULT_WORLD_CUP_MARKETS_OPTIONS,
-) => {
-  const queryClient = useQueryClient();
-  const enabled = options.enabled ?? true;
-  const { availability, ...availabilityQuery } = usePredictWorldCupAvailability(
-    config,
-    options,
-  );
-
-  const availableTabKeys = useMemo(
-    () => getPredictWorldCupAvailableTabKeys(config, availability),
-    [availability, config],
-  );
-
-  const tabs = useMemo<PredictWorldCupAvailableTab[]>(
-    () =>
-      availableTabKeys.map((key) => {
-        switch (key) {
-          case PREDICT_WORLD_CUP_TAB_KEYS.ALL:
-            return { key, label: strings('predict.world_cup.tabs.all') };
-          case PREDICT_WORLD_CUP_TAB_KEYS.LIVE:
-            return {
-              key,
-              label: strings('predict.world_cup.tabs.live'),
-              isLive: true,
-            };
-          case PREDICT_WORLD_CUP_TAB_KEYS.PROPS:
-            return { key, label: strings('predict.world_cup.tabs.props') };
-          default: {
-            const stage = config.stages.find(
-              (configuredStage) => configuredStage.key === key,
-            );
-            return {
-              key,
-              label: resolvePredictWorldCupStageLabel(stage ?? { key }),
-            };
-          }
-        }
-      }),
-    [availableTabKeys, config.stages],
-  );
-
-  const prefetchTabKeys = availableTabKeys.join(',');
-
-  useEffect(() => {
-    if (!enabled) {
-      return;
-    }
-
-    prefetchTabKeys
-      .split(',')
-      .filter(Boolean)
-      .forEach((tabKey) =>
-        prefetchWorldCupTabMarkets({ queryClient, tabKey, config }),
-      );
-  }, [config, enabled, prefetchTabKeys, queryClient]);
-
-  return {
-    ...availabilityQuery,
-    availability,
-    tabs,
-  };
-};
diff --git a/app/components/UI/Predict/hooks/usePredictWorldCupFeedSession.ts b/app/components/UI/Predict/hooks/usePredictWorldCupFeedSession.ts
deleted file mode 100644
index 47d472c7c2d2..000000000000
--- a/app/components/UI/Predict/hooks/usePredictWorldCupFeedSession.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { type LayoutChangeEvent, ScrollView } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
-import type { AppNavigationProp } from '../../../../core/NavigationService/types';
-import { v4 as uuidv4 } from 'uuid';
-import Engine from '../../../../core/Engine';
-import Routes from '../../../../constants/navigation/Routes';
-import type { PredictEntryPoint } from '../types/navigation';
-import type { TransactionActiveAbTestEntry } from '../../../../util/transactions/transaction-active-ab-test-attribution-registry';
-import { PredictEventValues } from '../constants/eventNames';
-
-export interface UsePredictWorldCupFeedSessionOptions<T extends string> {
-  initialTab: T;
-  /** Resolved entry point (with fallback applied). Used for analytics. */
-  entryPoint: PredictEntryPoint;
-  /** Raw route.params.entryPoint — used only for the back-navigation fallback. */
-  routeEntryPoint?: PredictEntryPoint;
-  transactionActiveAbTests?: TransactionActiveAbTestEntry[];
-}
-
-export interface UsePredictWorldCupFeedSessionResult<T extends string> {
-  activeTab: T;
-  setActiveTab: (tab: T) => void;
-  tabsScrollViewRef: React.RefObject<ScrollView | null>;
-  feedSessionId: string;
-  feedSessionStartTime: number;
-  /** Returns the current number of feed pages viewed (tab switches since mount). */
-  getPageViewCount: () => number;
-  scrollActiveTabIntoView: (tabKey: T, animated: boolean) => void;
-  handleTabLayout: (tabKey: T, event: LayoutChangeEvent) => void;
-  handleTabPress: (tabKey: T) => void;
-  /** Always navigates to the market list (no canGoBack check). Use when the screen becomes disabled. */
-  navigateToMarketList: () => void;
-  /** Navigates back if possible, otherwise falls back to the market list. */
-  handleBack: () => void;
-}
-
-/**
- * Shared session and tab-management logic used by both the V1 World Cup screen
- * and the V2 World Cup Hub. Encapsulates:
- * - feed session identifiers (id, start time, page view count)
- * - active-tab state and scroll-into-view mechanics
- * - tab-press handler that fires `trackFeedViewed`
- * - back-navigation handler
- */
-export function usePredictWorldCupFeedSession<T extends string>({
-  initialTab,
-  entryPoint,
-  routeEntryPoint,
-  transactionActiveAbTests,
-}: UsePredictWorldCupFeedSessionOptions<T>): UsePredictWorldCupFeedSessionResult<T> {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const navigation = useNavigation<AppNavigationProp>();
-
-  const tabsScrollViewRef = useRef<ScrollView>(null);
-  const tabLayoutsRef = useRef<Record<string, { x: number; width: number }>>(
-    {},
-  );
-  const hasScrolledToInitialTabRef = useRef(false);
-  const hasTrackedInitialFeedViewed = useRef(false);
-  const feedSessionId = useMemo(() => uuidv4(), []);
-  const feedSessionStartTime = useMemo(() => Date.now(), []);
-  const feedPageViewCount = useRef(0);
-
-  const [activeTab, setActiveTab] = useState<T>(initialTab);
-
-  // Sync active tab whenever the resolved initial tab changes (e.g. after
-  // availability data loads in V1).
-  useEffect(() => {
-    setActiveTab(initialTab);
-  }, [initialTab]);
-
-  const scrollActiveTabIntoView = useCallback(
-    (tabKey: T, animated: boolean) => {
-      const layout = tabLayoutsRef.current[tabKey];
-      if (!layout || !tabsScrollViewRef.current) return;
-      const targetX = Math.max(layout.x - 16, 0);
-      tabsScrollViewRef.current.scrollTo({ x: targetX, animated });
-    },
-    [],
-  );
-
-  const handleTabLayout = useCallback(
-    (tabKey: T, event: LayoutChangeEvent) => {
-      const { x, width } = event.nativeEvent.layout;
-      tabLayoutsRef.current[tabKey] = { x, width };
-      if (!hasScrolledToInitialTabRef.current && tabKey === activeTab) {
-        hasScrolledToInitialTabRef.current = true;
-        scrollActiveTabIntoView(tabKey, false);
-      }
-    },
-    [activeTab, scrollActiveTabIntoView],
-  );
-
-  const handleTabPress = useCallback(
-    (tabKey: T) => {
-      if (tabKey === activeTab) return;
-      feedPageViewCount.current += 1;
-      Engine.context.PredictController.trackFeedViewed({
-        sessionId: feedSessionId,
-        feedTab: tabKey,
-        predictScreen: PredictEventValues.PREDICT_SCREEN.WORLD_CUP,
-        numPagesViewed: feedPageViewCount.current,
-        sessionTime: Math.round((Date.now() - feedSessionStartTime) / 1000),
-        entryPoint,
-        isSessionEnd: false,
-      });
-      setActiveTab(tabKey);
-    },
-    [activeTab, entryPoint, feedSessionId, feedSessionStartTime],
-  );
-
-  const navigateToMarketList = useCallback(() => {
-    navigation.navigate(Routes.PREDICT.MARKET_LIST, {
-      entryPoint: routeEntryPoint,
-      ...(transactionActiveAbTests?.length && { transactionActiveAbTests }),
-    });
-  }, [navigation, routeEntryPoint, transactionActiveAbTests]);
-
-  const handleBack = useCallback(() => {
-    if (navigation.canGoBack()) {
-      navigation.goBack();
-      return;
-    }
-    navigateToMarketList();
-  }, [navigation, navigateToMarketList]);
-
-  const getPageViewCount = useCallback(() => feedPageViewCount.current, []);
-
-  // Keep the active pill visible when the tab changes.
-  useEffect(() => {
-    scrollActiveTabIntoView(activeTab, true);
-  }, [activeTab, scrollActiveTabIntoView]);
-
-  return {
-    activeTab,
-    setActiveTab,
-    tabsScrollViewRef,
-    feedSessionId,
-    feedSessionStartTime,
-    getPageViewCount,
-    scrollActiveTabIntoView,
-    handleTabLayout,
-    handleTabPress,
-    navigateToMarketList,
-    handleBack,
-  };
-}
diff --git a/app/components/UI/Predict/hooks/usePredictWorldCupHub.test.tsx b/app/components/UI/Predict/hooks/usePredictWorldCupHub.test.tsx
deleted file mode 100644
index ab4684fb0f44..000000000000
--- a/app/components/UI/Predict/hooks/usePredictWorldCupHub.test.tsx
+++ /dev/null
@@ -1,404 +0,0 @@
-import React from 'react';
-import { renderHook, waitFor } from '@testing-library/react-native';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { DEFAULT_PREDICT_WORLD_CUP_FLAG } from '../constants/flags';
-import type { PredictMarket } from '../types';
-import {
-  usePredictWorldCupGamesSections,
-  usePredictWorldCupWinnerMarket,
-} from './usePredictWorldCupHub';
-
-const mockGetMarkets = jest.fn();
-
-jest.mock('../../../../core/Engine', () => ({
-  __esModule: true,
-  default: {
-    context: {
-      PredictController: {
-        getMarkets: (...args: unknown[]) => mockGetMarkets(...args),
-      },
-    },
-  },
-}));
-
-jest.mock('../utils/feed', () => ({
-  filterStandaloneMarkets: (markets: PredictMarket[]) => markets,
-}));
-
-jest.mock('../utils/marketStaleness', () => ({
-  getVisiblePredictMarkets: jest.fn((markets: PredictMarket[]) => markets),
-}));
-
-const createMarket = (overrides: Partial<PredictMarket> = {}): PredictMarket =>
-  ({
-    id: 'market-1',
-    title: 'Test Market',
-    outcomes: [],
-    parentMarketId: null,
-    ...overrides,
-  }) as PredictMarket;
-
-const createWrapper = () => {
-  const queryClient = new QueryClient({
-    defaultOptions: { queries: { retry: false } },
-  });
-  const Wrapper = ({ children }: { children: React.ReactNode }) => (
-    <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
-  );
-  return { Wrapper, queryClient };
-};
-
-describe('usePredictWorldCupGamesSections', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockGetMarkets.mockResolvedValue({ markets: [], nextCursor: null });
-  });
-
-  it('returns empty sections when no stages are configured', () => {
-    const { Wrapper } = createWrapper();
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupGamesSections({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          stages: [],
-        }),
-      { wrapper: Wrapper },
-    );
-
-    expect(result.current.sections).toHaveLength(0);
-  });
-
-  it('returns a section for each stage that has markets', async () => {
-    const { Wrapper } = createWrapper();
-    const market = createMarket({ id: 'round32-market' });
-    mockGetMarkets.mockResolvedValue({ markets: [market], nextCursor: null });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupGamesSections({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          stages: [{ key: 'round_of_32', eventIds: ['evt-1'] }],
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() => expect(result.current.sections).toHaveLength(1));
-
-    expect(result.current.sections[0].key).toBe('round_of_32');
-    expect(result.current.sections[0].markets).toHaveLength(1);
-  });
-
-  it('omits sections whose stages return no markets', async () => {
-    const { Wrapper } = createWrapper();
-    mockGetMarkets.mockResolvedValue({ markets: [], nextCursor: null });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupGamesSections({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          stages: [{ key: 'final', eventIds: ['evt-final'] }],
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() => expect(result.current.isFetching).toBe(false));
-
-    expect(result.current.sections).toHaveLength(0);
-  });
-
-  it('preserves canonical stage order from config', async () => {
-    const { Wrapper } = createWrapper();
-    const qfMarket = createMarket({ id: 'qf-market' });
-    const sfMarket = createMarket({ id: 'sf-market' });
-
-    mockGetMarkets.mockImplementation(
-      ({ customQueryParams }: { customQueryParams: string }) => {
-        if (customQueryParams.includes('evt-qf')) {
-          return Promise.resolve({ markets: [qfMarket], nextCursor: null });
-        }
-        return Promise.resolve({ markets: [sfMarket], nextCursor: null });
-      },
-    );
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupGamesSections({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          stages: [
-            { key: 'quarterfinals', eventIds: ['evt-qf'] },
-            { key: 'semifinals', eventIds: ['evt-sf'] },
-          ],
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() => expect(result.current.sections).toHaveLength(2));
-
-    expect(result.current.sections[0].key).toBe('quarterfinals');
-    expect(result.current.sections[1].key).toBe('semifinals');
-  });
-
-  it('returns isLive false when no stages are configured', () => {
-    const { Wrapper } = createWrapper();
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupGamesSections({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          stages: [],
-        }),
-      { wrapper: Wrapper },
-    );
-
-    expect(result.current.isLive).toBe(false);
-  });
-
-  it('returns isLive true when any stage market has game.status ongoing', async () => {
-    const { Wrapper } = createWrapper();
-    const liveMarket = createMarket({
-      id: 'live-match',
-      game: {
-        id: 'game-1',
-        startTime: '2026-06-29T18:00:00Z',
-        status: 'ongoing',
-        league: 'fifwc',
-        elapsed: "45'",
-        period: '1H',
-        score: null,
-        homeTeam: {
-          id: 't1',
-          name: 'France',
-          logo: '',
-          abbreviation: 'FRA',
-          color: '',
-        },
-        awayTeam: {
-          id: 't2',
-          name: 'England',
-          logo: '',
-          abbreviation: 'ENG',
-          color: '',
-        },
-      },
-    });
-    mockGetMarkets.mockResolvedValue({
-      markets: [liveMarket],
-      nextCursor: null,
-    });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupGamesSections({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          stages: [{ key: 'round_of_16', eventIds: ['evt-live'] }],
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() => expect(result.current.isLive).toBe(true));
-  });
-
-  it('returns isLive false when stage markets exist but none have game.status ongoing', async () => {
-    const { Wrapper } = createWrapper();
-    const scheduledMarket = createMarket({
-      id: 'scheduled-match',
-      game: {
-        id: 'game-2',
-        startTime: '2026-06-30T18:00:00Z',
-        status: 'scheduled',
-        league: 'fifwc',
-        elapsed: null,
-        period: null,
-        score: null,
-        homeTeam: {
-          id: 't3',
-          name: 'Spain',
-          logo: '',
-          abbreviation: 'ESP',
-          color: '',
-        },
-        awayTeam: {
-          id: 't4',
-          name: 'Brazil',
-          logo: '',
-          abbreviation: 'BRA',
-          color: '',
-        },
-      },
-    });
-    mockGetMarkets.mockResolvedValue({
-      markets: [scheduledMarket],
-      nextCursor: null,
-    });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupGamesSections({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          stages: [{ key: 'quarterfinals', eventIds: ['evt-sched'] }],
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() => expect(result.current.isFetching).toBe(false));
-
-    expect(result.current.isLive).toBe(false);
-  });
-
-  it('returns isLive false when the ongoing market is stripped by visibility filters', async () => {
-    const { Wrapper } = createWrapper();
-    const ongoingMarket = createMarket({
-      id: 'stale-ongoing',
-      game: {
-        id: 'game-stale',
-        startTime: '2026-06-29T18:00:00Z',
-        status: 'ongoing',
-        league: 'fifwc',
-        elapsed: "70'",
-        period: '2H',
-        score: null,
-        homeTeam: {
-          id: 't5',
-          name: 'Germany',
-          logo: '',
-          abbreviation: 'GER',
-          color: '',
-        },
-        awayTeam: {
-          id: 't6',
-          name: 'Portugal',
-          logo: '',
-          abbreviation: 'POR',
-          color: '',
-        },
-      },
-    });
-    mockGetMarkets.mockResolvedValue({
-      markets: [ongoingMarket],
-      nextCursor: null,
-    });
-
-    // Simulate the visibility filter stripping the ongoing market for all
-    // renders of this test (mockReturnValueOnce would be consumed on the
-    // initial render before query data arrives).
-    const { getVisiblePredictMarkets } = jest.requireMock(
-      '../utils/marketStaleness',
-    ) as { getVisiblePredictMarkets: jest.Mock };
-    getVisiblePredictMarkets.mockReturnValue([]);
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupGamesSections({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          stages: [{ key: 'round_of_16', eventIds: ['evt-stale'] }],
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() => expect(result.current.isFetching).toBe(false));
-
-    expect(result.current.isLive).toBe(false);
-
-    // Restore pass-through so subsequent tests are unaffected.
-    getVisiblePredictMarkets.mockImplementation(
-      (markets: PredictMarket[]) => markets,
-    );
-  });
-
-  it('returns null error by default', () => {
-    const { Wrapper } = createWrapper();
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupGamesSections({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          stages: [],
-        }),
-      { wrapper: Wrapper },
-    );
-
-    expect(result.current.error).toBeNull();
-  });
-
-  it('exposes an error message when a stage query fails', async () => {
-    const { Wrapper } = createWrapper();
-    mockGetMarkets.mockRejectedValue(new Error('network down'));
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupGamesSections({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          stages: [{ key: 'final', eventIds: ['evt-final'] }],
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() => expect(result.current.error).toBe('network down'));
-  });
-
-  it('does not run queries when disabled', () => {
-    const { Wrapper } = createWrapper();
-
-    renderHook(
-      () =>
-        usePredictWorldCupGamesSections(
-          {
-            ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-            stages: [{ key: 'final', eventIds: ['evt-final'] }],
-          },
-          { enabled: false },
-        ),
-      { wrapper: Wrapper },
-    );
-
-    expect(mockGetMarkets).not.toHaveBeenCalled();
-  });
-});
-
-describe('usePredictWorldCupWinnerMarket', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockGetMarkets.mockResolvedValue({ markets: [], nextCursor: null });
-  });
-
-  it('returns null market immediately when winnerEventId is empty', () => {
-    const { Wrapper } = createWrapper();
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupWinnerMarket({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          winnerEventId: '',
-        }),
-      { wrapper: Wrapper },
-    );
-
-    expect(result.current.market).toBeNull();
-  });
-
-  it('returns the first market when winnerEventId is configured', async () => {
-    const { Wrapper } = createWrapper();
-    const winnerMarket = createMarket({
-      id: 'winner-market',
-      title: 'World Cup Winner',
-    });
-    mockGetMarkets.mockResolvedValue({
-      markets: [winnerMarket],
-      nextCursor: null,
-    });
-
-    const { result } = renderHook(
-      () =>
-        usePredictWorldCupWinnerMarket({
-          ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-          winnerEventId: 'evt-winner',
-        }),
-      { wrapper: Wrapper },
-    );
-
-    await waitFor(() => expect(result.current.market).not.toBeNull());
-
-    expect(result.current.market?.id).toBe('winner-market');
-  });
-});
diff --git a/app/components/UI/Predict/hooks/usePredictWorldCupHub.ts b/app/components/UI/Predict/hooks/usePredictWorldCupHub.ts
deleted file mode 100644
index 0b0a79b3f65b..000000000000
--- a/app/components/UI/Predict/hooks/usePredictWorldCupHub.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import { useCallback, useMemo } from 'react';
-import { useQueries, useQuery } from '@tanstack/react-query';
-import { predictQueries } from '../queries';
-import { resolvePredictWorldCupStageLabel } from '../utils/worldCup';
-import { filterStandaloneMarkets } from '../utils/feed';
-import { getVisiblePredictMarkets } from '../utils/marketStaleness';
-import type { PredictMarket } from '../types';
-import type { PredictWorldCupConfig } from '../types/flags';
-
-type WorldCupHubDataConfig = Pick<
-  PredictWorldCupConfig,
-  'tagSlug' | 'gamesTagId' | 'stages' | 'winnerEventId'
->;
-
-export interface PredictWorldCupStageSection {
-  key: string;
-  label: string;
-  markets: PredictMarket[];
-  isFetching: boolean;
-}
-
-export interface UsePredictWorldCupGamesSectionsResult {
-  sections: PredictWorldCupStageSection[];
-  isLive: boolean;
-  isFetching: boolean;
-  error: string | null;
-  refetch: () => Promise<void>;
-}
-
-/**
- * Fetches all configured knockout-stage event groups in parallel and returns
- * them as ordered sections. Sections with no visible markets are omitted so
- * completed stages disappear automatically. The order follows `config.stages`
- * (i.e. the remote config canonical order) and market order within each
- * section is preserved as returned by the Polymarket API — no client-side sort.
- */
-export const usePredictWorldCupGamesSections = (
-  config: WorldCupHubDataConfig,
-  options: { enabled?: boolean } = {},
-): UsePredictWorldCupGamesSectionsResult => {
-  const enabled = options.enabled ?? true;
-
-  const stageQueryResults = useQueries({
-    queries: config.stages.map((stage) => ({
-      ...predictQueries.worldCup.options.stage(stage),
-      enabled,
-    })),
-  });
-
-  const sections = useMemo<PredictWorldCupStageSection[]>(
-    () =>
-      config.stages
-        .map((stage, index) => {
-          const result = stageQueryResults[index];
-          const rawMarkets = result?.data ?? [];
-          const markets = getVisiblePredictMarkets(
-            filterStandaloneMarkets(rawMarkets),
-          );
-          return {
-            key: stage.key,
-            label: resolvePredictWorldCupStageLabel(stage),
-            markets,
-            isFetching: result?.isLoading ?? false,
-          };
-        })
-        .filter((section) => section.markets.length > 0),
-    [config.stages, stageQueryResults],
-  );
-
-  // Derived from filtered sections so the dot only fires when a game with a
-  // running clock is actually visible to the user — not on raw API data that
-  // may include stale or invisible markets.
-  const isLive = useMemo(
-    () =>
-      sections.some((section) =>
-        section.markets.some((market) => market.game?.status === 'ongoing'),
-      ),
-    [sections],
-  );
-
-  const isFetching = stageQueryResults.some((r) => r.isLoading);
-
-  // Only stage (content) query failures surface as an offline/error state so
-  // completed stages disappear cleanly without an error banner.
-  const error = stageQueryResults.find((r) => r.error)?.error?.message ?? null;
-
-  const refetch = useCallback(async () => {
-    await Promise.all(stageQueryResults.map((r) => r.refetch()));
-  }, [stageQueryResults]);
-
-  return {
-    sections,
-    isLive,
-    isFetching,
-    error,
-    refetch,
-  };
-};
-
-export interface UsePredictWorldCupWinnerMarketResult {
-  market: PredictMarket | null;
-  isFetching: boolean;
-  error: string | null;
-  refetch: () => Promise<void>;
-}
-
-/**
- * Fetches the single "Who will win the World Cup?" multi-outcome market using
- * the `winnerEventId` from remote config. Returns `null` when not configured.
- */
-export const usePredictWorldCupWinnerMarket = (
-  config: WorldCupHubDataConfig,
-  options: { enabled?: boolean } = {},
-): UsePredictWorldCupWinnerMarketResult => {
-  const enabled = (options.enabled ?? true) && Boolean(config.winnerEventId);
-  const winnerStage = useMemo(
-    () =>
-      config.winnerEventId
-        ? { key: 'winner', eventIds: [config.winnerEventId] }
-        : null,
-    [config.winnerEventId],
-  );
-
-  const queryOptions = useMemo(
-    () =>
-      winnerStage
-        ? predictQueries.worldCup.options.stage(winnerStage)
-        : predictQueries.worldCup.options.stage({
-            key: 'winner-disabled',
-            eventIds: [],
-          }),
-    [winnerStage],
-  );
-
-  const {
-    data,
-    isLoading,
-    error,
-    refetch: queryRefetch,
-  } = useQuery({
-    ...queryOptions,
-    enabled,
-  });
-
-  const market = useMemo(() => {
-    if (!data || data.length === 0) return null;
-    const visible = getVisiblePredictMarkets(filterStandaloneMarkets(data));
-    return visible[0] ?? null;
-  }, [data]);
-
-  const refetch = useCallback(async () => {
-    await queryRefetch();
-  }, [queryRefetch]);
-
-  return {
-    market,
-    isFetching: isLoading,
-    error: error?.message ?? null,
-    refetch,
-  };
-};
diff --git a/app/components/UI/Predict/providers/polymarket/PolymarketProvider.test.ts b/app/components/UI/Predict/providers/polymarket/PolymarketProvider.test.ts
index 19fa0e8f7025..3a86a779ea16 100644
--- a/app/components/UI/Predict/providers/polymarket/PolymarketProvider.test.ts
+++ b/app/components/UI/Predict/providers/polymarket/PolymarketProvider.test.ts
@@ -10,7 +10,6 @@ import { UserProfileProperty } from '../../../../../util/metrics/UserSettingsAna
 import {
   DEFAULT_FEE_COLLECTION_FLAG,
   DEFAULT_PREDICT_SPORTS_FEED_FLAG,
-  DEFAULT_PREDICT_WORLD_CUP_FLAG,
   DEFAULT_WIMBLEDON_TAB_FLAG,
 } from '../../constants/flags';
 import type { OrderPreview } from '../types';
@@ -388,7 +387,6 @@ const defaultFeatureFlags: PredictFeatureFlags = {
   predictHomeRedesignEnabled: false,
   predictSportCardLivePricesEnabled: true,
   predictSportsFeed: DEFAULT_PREDICT_SPORTS_FEED_FLAG,
-  predictWorldCup: DEFAULT_PREDICT_WORLD_CUP_FLAG,
   predictWimbledonTab: DEFAULT_WIMBLEDON_TAB_FLAG,
 };
 
diff --git a/app/components/UI/Predict/providers/polymarket/utils.test.ts b/app/components/UI/Predict/providers/polymarket/utils.test.ts
index de3db1788e3a..6f02ed7664f6 100644
--- a/app/components/UI/Predict/providers/polymarket/utils.test.ts
+++ b/app/components/UI/Predict/providers/polymarket/utils.test.ts
@@ -1616,38 +1616,6 @@ describe('polymarket utils', () => {
       expect(url).not.toContain('offset=');
     });
 
-    it('uses exact World Cup custom query params without normal feed filters', async () => {
-      await fetchEventsFromPolymarketApi({
-        category: 'world-cup',
-        limit: 20,
-        customQueryParams:
-          'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&order=volume24hr',
-      });
-
-      expect(mockFetch).toHaveBeenCalledWith(
-        'https://gamma-api.polymarket.com/events/keyset?limit=20&active=true&archived=false&closed=false&tag_slug=fifa-world-cup&order=volume24hr',
-      );
-      const requestedUrl = String(mockFetch.mock.calls[0][0]);
-      expect(requestedUrl).not.toContain('liquidity_min');
-      expect(requestedUrl).not.toContain('volume_min');
-      expect(requestedUrl).not.toContain('offset=');
-    });
-
-    it('falls back to default World Cup query params without normal feed filters', async () => {
-      await fetchEventsFromPolymarketApi({
-        category: 'world-cup',
-        limit: 10,
-      });
-
-      expect(mockFetch).toHaveBeenCalledWith(
-        'https://gamma-api.polymarket.com/events/keyset?limit=10&active=true&archived=false&closed=false&tag_slug=fifa-world-cup&order=volume24hr&ascending=false',
-      );
-      const requestedUrl = String(mockFetch.mock.calls[0][0]);
-      expect(requestedUrl).not.toContain('liquidity_min');
-      expect(requestedUrl).not.toContain('volume_min');
-      expect(requestedUrl).not.toContain('offset=');
-    });
-
     it('uses exact Wimbledon custom query params without normal feed filters', async () => {
       await fetchEventsFromPolymarketApi({
         category: 'wimbledon',
diff --git a/app/components/UI/Predict/providers/polymarket/utils.ts b/app/components/UI/Predict/providers/polymarket/utils.ts
index cc6b98ddb786..7106c2daa04b 100644
--- a/app/components/UI/Predict/providers/polymarket/utils.ts
+++ b/app/components/UI/Predict/providers/polymarket/utils.ts
@@ -84,10 +84,7 @@ import {
   OrderBook,
 } from './types';
 import { PREDICT_CONSTANTS, PREDICT_ERROR_CODES } from '../../constants/errors';
-import {
-  PREDICT_WIMBLEDON_DEFAULT_QUERY_PARAMS,
-  PREDICT_WORLD_CUP_DEFAULT_TAG_SLUG,
-} from '../../constants/flags';
+import { PREDICT_WIMBLEDON_DEFAULT_QUERY_PARAMS } from '../../constants/flags';
 import { PredictFeeCollection } from '../../types/flags';
 import { roundToFiveDecimals } from '../../utils/orders';
 import { getMinAmountReceivedWithSlippage } from './protocol/slippage';
@@ -1260,10 +1257,7 @@ export interface FetchEventsResult {
   nextCursor: string | null;
 }
 
-const EXACT_QUERY_PARAM_CATEGORIES: readonly PredictCategory[] = [
-  'hot',
-  'world-cup',
-];
+const EXACT_QUERY_PARAM_CATEGORIES: readonly PredictCategory[] = ['hot'];
 
 const appendCustomQueryParams = (
   params: URLSearchParams,
@@ -1331,14 +1325,6 @@ export const fetchEventsFromPolymarketApi = async (
 
   if (isExactQueryTabWithCustomQuery) {
     queryParamsEvents = appendCustomQueryParams(queryParams, customQueryParams);
-  } else if (category === 'world-cup') {
-    queryParams.set('active', 'true');
-    queryParams.set('archived', 'false');
-    queryParams.set('closed', 'false');
-    queryParams.set('tag_slug', PREDICT_WORLD_CUP_DEFAULT_TAG_SLUG);
-    queryParams.set('order', 'volume24hr');
-    queryParams.set('ascending', 'false');
-    queryParamsEvents = queryParams.toString();
   } else if (category === 'wimbledon') {
     queryParamsEvents = appendCustomQueryParams(
       queryParams,
@@ -1354,7 +1340,7 @@ export const fetchEventsFromPolymarketApi = async (
     queryParams.set('volume_min', String(10000.0));
 
     const categoryParamMap: Record<
-      Exclude<PredictCategory, 'world-cup' | 'wimbledon'>,
+      Exclude<PredictCategory, 'wimbledon'>,
       Record<string, string>
     > = {
       trending: { order: 'volume24hr' },
diff --git a/app/components/UI/Predict/queries/index.ts b/app/components/UI/Predict/queries/index.ts
index 87db1bd10439..789ca535fa22 100644
--- a/app/components/UI/Predict/queries/index.ts
+++ b/app/components/UI/Predict/queries/index.ts
@@ -37,7 +37,6 @@ import {
   predictUnrealizedPnLKeys,
   predictUnrealizedPnLOptions,
 } from './unrealizedPnL';
-import { predictWorldCupKeys, predictWorldCupOptions } from './worldCup';
 
 export const predictQueries = {
   accountState: {
@@ -99,8 +98,4 @@ export const predictQueries = {
     keys: predictUnrealizedPnLKeys,
     options: predictUnrealizedPnLOptions,
   },
-  worldCup: {
-    keys: predictWorldCupKeys,
-    options: predictWorldCupOptions,
-  },
 };
diff --git a/app/components/UI/Predict/queries/worldCup.test.ts b/app/components/UI/Predict/queries/worldCup.test.ts
deleted file mode 100644
index 978968a145d5..000000000000
--- a/app/components/UI/Predict/queries/worldCup.test.ts
+++ /dev/null
@@ -1,237 +0,0 @@
-import Engine from '../../../../core/Engine';
-import { DEFAULT_PREDICT_WORLD_CUP_FLAG } from '../constants/flags';
-import { Recurrence, type PredictMarket } from '../types';
-import { predictWorldCupOptions } from './worldCup';
-
-jest.mock('../../../../core/Engine', () => ({
-  context: {
-    PredictController: {
-      getMarkets: jest.fn(),
-    },
-  },
-}));
-
-const mockGetMarkets = jest.mocked(Engine.context.PredictController.getMarkets);
-
-const createMarket = (
-  overrides: Partial<PredictMarket> = {},
-): PredictMarket => ({
-  id: 'market-1',
-  providerId: 'polymarket',
-  slug: 'market-1',
-  title: 'Market 1',
-  description: 'Description',
-  image: 'image.png',
-  status: 'open',
-  recurrence: Recurrence.NONE,
-  category: 'hot',
-  tags: [],
-  outcomes: [],
-  liquidity: 0,
-  volume: 0,
-  ...overrides,
-});
-
-describe('worldCup queries', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('fetches All markets with the World Cup tag query and pagination', async () => {
-    const markets = [createMarket()];
-    mockGetMarkets.mockResolvedValue({ markets, nextCursor: null });
-
-    const options = predictWorldCupOptions.all(DEFAULT_PREDICT_WORLD_CUP_FLAG, {
-      limit: 10,
-    });
-    const result = await (options.queryFn as () => Promise<PredictMarket[]>)();
-
-    expect(mockGetMarkets).toHaveBeenCalledWith({
-      category: 'hot',
-      customQueryParams:
-        'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&order=volume24hr&ascending=false',
-      limit: 10,
-    });
-    expect(result).toEqual(markets);
-  });
-
-  it('fetches Props markets with the games tag excluded and pagination', async () => {
-    mockGetMarkets.mockResolvedValue({
-      markets: [createMarket()],
-      nextCursor: null,
-    });
-
-    const options = predictWorldCupOptions.props(
-      DEFAULT_PREDICT_WORLD_CUP_FLAG,
-      {
-        limit: 25,
-      },
-    );
-    await (options.queryFn as () => Promise<PredictMarket[]>)();
-
-    expect(mockGetMarkets).toHaveBeenCalledWith({
-      category: 'hot',
-      customQueryParams:
-        'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&exclude_tag_id=100639&order=volume&ascending=false',
-      limit: 25,
-    });
-  });
-
-  it('fetches Live markets with tag slug, games tag, and live filters', async () => {
-    mockGetMarkets.mockResolvedValue({
-      markets: [createMarket()],
-      nextCursor: null,
-    });
-
-    const options = predictWorldCupOptions.live(
-      DEFAULT_PREDICT_WORLD_CUP_FLAG,
-      {
-        limit: 5,
-      },
-    );
-    await (options.queryFn as () => Promise<PredictMarket[]>)();
-
-    expect(mockGetMarkets).toHaveBeenCalledWith({
-      category: 'hot',
-      customQueryParams:
-        'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&tag_id=100639&live=true&order=startDate',
-      limit: 5,
-    });
-  });
-
-  it('fetches stage markets with repeated event IDs', async () => {
-    const baseGame = {
-      id: 'game-later',
-      startTime: '2026-06-13T20:00:00.000Z',
-      status: 'scheduled' as const,
-      league: 'fifwc' as const,
-      elapsed: null,
-      period: null,
-      score: null,
-      homeTeam: {
-        id: 'team-1',
-        name: 'Team 1',
-        logo: '',
-        abbreviation: 'T1',
-        color: 'black',
-      },
-      awayTeam: {
-        id: 'team-2',
-        name: 'Team 2',
-        logo: '',
-        abbreviation: 'T2',
-        color: 'white',
-      },
-    };
-    const laterMarket = createMarket({
-      id: 'later',
-      title: 'Later',
-      game: baseGame,
-      outcomes: [
-        {
-          id: 'later-advance',
-          providerId: 'polymarket',
-          marketId: 'later',
-          title: 'Advance',
-          description: 'Advance',
-          image: '',
-          status: 'open',
-          tokens: [{ id: 'later-token', title: 'Yes', price: 0.5 }],
-          volume: 0,
-          groupItemTitle: 'Advance',
-          sportsMarketType: 'soccer_team_to_advance',
-        },
-      ],
-    });
-    const earlierMarket = createMarket({
-      id: 'earlier',
-      title: 'Earlier',
-      game: {
-        ...baseGame,
-        id: 'game-earlier',
-        startTime: '2026-06-12T20:00:00.000Z',
-      },
-      outcomes: [
-        {
-          id: 'earlier-advance',
-          providerId: 'polymarket',
-          marketId: 'earlier',
-          title: 'Advance',
-          description: 'Advance',
-          image: '',
-          status: 'open',
-          tokens: [{ id: 'earlier-token', title: 'Yes', price: 0.5 }],
-          volume: 0,
-          groupItemTitle: 'Advance',
-          sportsMarketType: 'soccer_team_to_advance',
-        },
-      ],
-    });
-    mockGetMarkets.mockResolvedValue({
-      markets: [laterMarket, earlierMarket],
-      nextCursor: null,
-    });
-
-    const options = predictWorldCupOptions.stage({
-      key: 'group-stage',
-      eventIds: ['123', '456'],
-    });
-    const result = await (options.queryFn as () => Promise<PredictMarket[]>)();
-
-    expect(mockGetMarkets).toHaveBeenCalledWith({
-      category: 'hot',
-      customQueryParams:
-        'active=true&archived=false&closed=false&id=123&id=456',
-      limit: 2,
-    });
-    expect(result.map((market) => market.id)).toEqual(['later', 'earlier']);
-  });
-
-  it('uses lightweight availability requests for Live, Props, and stages', async () => {
-    mockGetMarkets.mockResolvedValue({
-      markets: [createMarket()],
-      nextCursor: null,
-    });
-
-    await (
-      predictWorldCupOptions.availability.live(DEFAULT_PREDICT_WORLD_CUP_FLAG)
-        .queryFn as () => Promise<boolean>
-    )();
-    await (
-      predictWorldCupOptions.availability.props(DEFAULT_PREDICT_WORLD_CUP_FLAG)
-        .queryFn as () => Promise<boolean>
-    )();
-    await (
-      predictWorldCupOptions.availability.stage({
-        key: 'final',
-        eventIds: ['999'],
-      }).queryFn as () => Promise<boolean>
-    )();
-
-    expect(mockGetMarkets).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({ limit: 1 }),
-    );
-    expect(mockGetMarkets).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({ limit: 1 }),
-    );
-    expect(mockGetMarkets).toHaveBeenNthCalledWith(
-      3,
-      expect.objectContaining({
-        customQueryParams: 'active=true&archived=false&closed=false&id=999',
-        limit: 1,
-      }),
-    );
-  });
-
-  it('hides empty stage tabs without calling the API when no event IDs are configured', async () => {
-    const options = predictWorldCupOptions.availability.stage({
-      key: 'empty-stage',
-      eventIds: [],
-    });
-
-    expect((options.queryFn as () => boolean)()).toBe(false);
-    expect(mockGetMarkets).not.toHaveBeenCalled();
-  });
-});
diff --git a/app/components/UI/Predict/queries/worldCup.ts b/app/components/UI/Predict/queries/worldCup.ts
deleted file mode 100644
index fbe7a2a091ce..000000000000
--- a/app/components/UI/Predict/queries/worldCup.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import { queryOptions } from '@tanstack/react-query';
-import {
-  buildPredictWorldCupAllQuery,
-  buildPredictWorldCupLiveQuery,
-  buildPredictWorldCupPropsQuery,
-  buildPredictWorldCupStageEventsQuery,
-} from '../utils/worldCup';
-import {
-  fetchPredictWorldCupAvailability,
-  fetchPredictWorldCupMarkets,
-  PREDICT_WORLD_CUP_PAGE_SIZE,
-} from '../services/worldCup';
-import type { PredictMarket } from '../types';
-import type {
-  PredictWorldCupConfig,
-  PredictWorldCupStageConfig,
-} from '../types/flags';
-
-export interface PredictWorldCupPageOptions {
-  limit?: number;
-}
-
-export const predictWorldCupKeys = {
-  all: () => ['predict', 'worldCup'] as const,
-  markets: (tabKey: string, queryParams: string, limit: number) =>
-    [
-      ...predictWorldCupKeys.all(),
-      'markets',
-      tabKey,
-      queryParams,
-      limit,
-    ] as const,
-  infiniteMarkets: (tabKey: string, queryParams: string, limit: number) =>
-    [
-      ...predictWorldCupKeys.all(),
-      'markets',
-      'infinite',
-      tabKey,
-      queryParams,
-      limit,
-    ] as const,
-  tab: (queryParams: string) =>
-    [...predictWorldCupKeys.all(), 'tab', queryParams] as const,
-  availability: (tabKey: string, queryParams: string) =>
-    [
-      ...predictWorldCupKeys.all(),
-      'availability',
-      tabKey,
-      queryParams,
-    ] as const,
-  stage: (stageKey: string, eventIds: string[]) =>
-    [...predictWorldCupKeys.all(), 'stage', stageKey, ...eventIds] as const,
-};
-
-export const predictWorldCupQueryParams = {
-  all: (config: Pick<PredictWorldCupConfig, 'tagSlug'>) =>
-    buildPredictWorldCupAllQuery(config),
-  props: (config: Pick<PredictWorldCupConfig, 'tagSlug' | 'gamesTagId'>) =>
-    buildPredictWorldCupPropsQuery(config),
-  live: (config: Pick<PredictWorldCupConfig, 'tagSlug' | 'gamesTagId'>) =>
-    buildPredictWorldCupLiveQuery(config),
-  stage: (stage: Pick<PredictWorldCupStageConfig, 'eventIds'>) =>
-    buildPredictWorldCupStageEventsQuery(stage),
-};
-
-const getPageOptions = ({
-  limit = PREDICT_WORLD_CUP_PAGE_SIZE,
-}: PredictWorldCupPageOptions = {}) => ({ limit });
-
-const buildMarketsOptions = ({
-  tabKey,
-  queryParams,
-  limit,
-  sortByStartTime = false,
-}: {
-  tabKey: string;
-  queryParams: string;
-  limit: number;
-  sortByStartTime?: boolean;
-}) =>
-  queryOptions<PredictMarket[], Error>({
-    queryKey: predictWorldCupKeys.markets(tabKey, queryParams, limit),
-    queryFn: () =>
-      fetchPredictWorldCupMarkets({
-        queryParams,
-        limit,
-        sortByStartTime,
-      }),
-    staleTime: 10_000,
-  });
-
-const buildAvailabilityOptions = ({
-  tabKey,
-  queryParams,
-}: {
-  tabKey: string;
-  queryParams: string;
-}) =>
-  queryOptions<boolean, Error>({
-    queryKey: predictWorldCupKeys.availability(tabKey, queryParams),
-    queryFn: () => fetchPredictWorldCupAvailability(queryParams),
-    staleTime: 10_000,
-  });
-
-export const predictWorldCupOptions = {
-  all: (
-    config: Pick<PredictWorldCupConfig, 'tagSlug'>,
-    pageOptions?: PredictWorldCupPageOptions,
-  ) => {
-    const { limit } = getPageOptions(pageOptions);
-    return buildMarketsOptions({
-      tabKey: 'all',
-      queryParams: predictWorldCupQueryParams.all(config),
-      limit,
-    });
-  },
-  props: (
-    config: Pick<PredictWorldCupConfig, 'tagSlug' | 'gamesTagId'>,
-    pageOptions?: PredictWorldCupPageOptions,
-  ) => {
-    const { limit } = getPageOptions(pageOptions);
-    return buildMarketsOptions({
-      tabKey: 'props',
-      queryParams: predictWorldCupQueryParams.props(config),
-      limit,
-    });
-  },
-  live: (
-    config: Pick<PredictWorldCupConfig, 'tagSlug' | 'gamesTagId'>,
-    pageOptions?: PredictWorldCupPageOptions,
-  ) => {
-    const { limit } = getPageOptions(pageOptions);
-    return buildMarketsOptions({
-      tabKey: 'live',
-      queryParams: predictWorldCupQueryParams.live(config),
-      limit,
-    });
-  },
-  stage: (stage: Pick<PredictWorldCupStageConfig, 'key' | 'eventIds'>) => {
-    const queryParams = predictWorldCupQueryParams.stage(stage);
-    const limit = stage.eventIds.length;
-
-    return queryOptions<PredictMarket[], Error>({
-      queryKey: predictWorldCupKeys.stage(stage.key, stage.eventIds),
-      queryFn: () =>
-        limit === 0
-          ? []
-          : fetchPredictWorldCupMarkets({
-              queryParams,
-              limit,
-            }),
-      staleTime: 10_000,
-    });
-  },
-  availability: {
-    live: (config: Pick<PredictWorldCupConfig, 'tagSlug' | 'gamesTagId'>) =>
-      buildAvailabilityOptions({
-        tabKey: 'live',
-        queryParams: predictWorldCupQueryParams.live(config),
-      }),
-    props: (config: Pick<PredictWorldCupConfig, 'tagSlug' | 'gamesTagId'>) =>
-      buildAvailabilityOptions({
-        tabKey: 'props',
-        queryParams: predictWorldCupQueryParams.props(config),
-      }),
-    stage: (stage: Pick<PredictWorldCupStageConfig, 'key' | 'eventIds'>) => {
-      const queryParams = predictWorldCupQueryParams.stage(stage);
-
-      return queryOptions<boolean, Error>({
-        queryKey: predictWorldCupKeys.availability(stage.key, queryParams),
-        queryFn: () =>
-          stage.eventIds.length === 0
-            ? false
-            : fetchPredictWorldCupAvailability(queryParams),
-        staleTime: 10_000,
-      });
-    },
-  },
-};
diff --git a/app/components/UI/Predict/routes/PredictWorldCupRoute.test.tsx b/app/components/UI/Predict/routes/PredictWorldCupRoute.test.tsx
deleted file mode 100644
index b5749c33920e..000000000000
--- a/app/components/UI/Predict/routes/PredictWorldCupRoute.test.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react-native';
-import PredictWorldCupRoute from './PredictWorldCupRoute';
-
-const mockHubV2Enabled = { value: false };
-
-jest.mock('react-redux', () => ({
-  useSelector: jest.fn(() => mockHubV2Enabled.value),
-}));
-
-jest.mock('../views/PredictWorldCup', () => {
-  const { Text } = jest.requireActual('react-native');
-  return {
-    __esModule: true,
-    default: () => <Text testID="predict-world-cup-v1">V1</Text>,
-  };
-});
-
-jest.mock('../views/PredictWorldCupHub', () => {
-  const { Text } = jest.requireActual('react-native');
-  return {
-    __esModule: true,
-    default: () => <Text testID="predict-world-cup-hub-v2">V2</Text>,
-  };
-});
-
-describe('PredictWorldCupRoute', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('renders V1 PredictWorldCup when showHubV2 is false', () => {
-    mockHubV2Enabled.value = false;
-
-    render(<PredictWorldCupRoute />);
-
-    expect(screen.getByTestId('predict-world-cup-v1')).toBeOnTheScreen();
-    expect(
-      screen.queryByTestId('predict-world-cup-hub-v2'),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('renders V2 PredictWorldCupHub when showHubV2 is true', () => {
-    mockHubV2Enabled.value = true;
-
-    render(<PredictWorldCupRoute />);
-
-    expect(screen.getByTestId('predict-world-cup-hub-v2')).toBeOnTheScreen();
-    expect(screen.queryByTestId('predict-world-cup-v1')).not.toBeOnTheScreen();
-  });
-});
diff --git a/app/components/UI/Predict/routes/PredictWorldCupRoute.tsx b/app/components/UI/Predict/routes/PredictWorldCupRoute.tsx
deleted file mode 100644
index a2f32689dc4a..000000000000
--- a/app/components/UI/Predict/routes/PredictWorldCupRoute.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import { useSelector } from 'react-redux';
-import PredictWorldCup from '../views/PredictWorldCup';
-import PredictWorldCupHub from '../views/PredictWorldCupHub';
-import { selectPredictWorldCupHubV2EnabledFlag } from '../selectors/featureFlags';
-
-/**
- * WORLD_CUP route component selector.
- *
- * Renders the V2 `PredictWorldCupHub` (Games/Props tabs with knockout-stage
- * section headers and a winner module) when `showHubV2` is enabled inside the
- * `predict-world-cup` LaunchDarkly flag, otherwise falls back to the existing
- * `PredictWorldCup` experience.
- */
-const PredictWorldCupRoute = () => {
-  const hubV2Enabled = useSelector(selectPredictWorldCupHubV2EnabledFlag);
-
-  return hubV2Enabled ? <PredictWorldCupHub /> : <PredictWorldCup />;
-};
-
-export default PredictWorldCupRoute;
diff --git a/app/components/UI/Predict/routes/index.test.tsx b/app/components/UI/Predict/routes/index.test.tsx
index 573e46f54a4e..e4d909e6a1f8 100644
--- a/app/components/UI/Predict/routes/index.test.tsx
+++ b/app/components/UI/Predict/routes/index.test.tsx
@@ -10,7 +10,6 @@ import PredictScreenStack, { PredictModalStack } from './index';
 let mockPayWithAnyTokenEnabled = false;
 let mockPredictPortfolioEnabled = true;
 let mockPredictHomeRedesignEnabled = false;
-let mockWorldCupHubV2Enabled = false;
 
 const mockSelectPredictWithAnyTokenEnabledFlag = jest.fn(
   () => mockPayWithAnyTokenEnabled,
@@ -21,10 +20,6 @@ const mockSelectPredictPortfolioEnabledFlag = jest.fn(
 const mockSelectPredictHomeRedesignEnabledFlag = jest.fn(
   () => mockPredictHomeRedesignEnabled,
 );
-const mockSelectPredictWorldCupHubV2Enabled = jest.fn(
-  () => mockWorldCupHubV2Enabled,
-);
-
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
   useSelector: jest.fn((selector: (state: unknown) => unknown) => selector({})),
@@ -37,8 +32,6 @@ jest.mock('../selectors/featureFlags', () => ({
     mockSelectPredictPortfolioEnabledFlag(),
   selectPredictHomeRedesignEnabledFlag: () =>
     mockSelectPredictHomeRedesignEnabledFlag(),
-  selectPredictWorldCupHubV2EnabledFlag: () =>
-    mockSelectPredictWorldCupHubV2Enabled(),
 }));
 
 jest.mock('../contexts', () => {
@@ -70,16 +63,6 @@ jest.mock('../views/PredictHome', () => {
   );
 });
 
-jest.mock('../views/PredictWorldCup', () => {
-  const { View } = jest.requireActual('react-native');
-  return () => <View testID="predict-world-cup" />;
-});
-
-jest.mock('../views/PredictWorldCupHub', () => {
-  const { View } = jest.requireActual('react-native');
-  return () => <View testID="predict-world-cup-hub" />;
-});
-
 jest.mock('../views/PredictFeedView', () => {
   const { View } = jest.requireActual('react-native');
   return () => <View testID="predict-feed-view" />;
@@ -167,7 +150,6 @@ describe('PredictScreenStack', () => {
     mockPayWithAnyTokenEnabled = false;
     mockPredictPortfolioEnabled = true;
     mockPredictHomeRedesignEnabled = false;
-    mockWorldCupHubV2Enabled = false;
     navigationRef = React.createRef();
   });
 
@@ -203,30 +185,6 @@ describe('PredictScreenStack', () => {
     expect(screen.getByTestId('predict-market-details')).toBeOnTheScreen();
   });
 
-  it('navigates to WORLD_CUP screen and renders the V1 screen when hub V2 is disabled', async () => {
-    mockWorldCupHubV2Enabled = false;
-    renderWithNavigation(<PredictScreenStack />);
-
-    await act(async () => {
-      navigationRef.current?.navigate(Routes.PREDICT.WORLD_CUP);
-    });
-
-    expect(screen.getByTestId('predict-world-cup')).toBeOnTheScreen();
-    expect(screen.queryByTestId('predict-world-cup-hub')).not.toBeOnTheScreen();
-  });
-
-  it('navigates to WORLD_CUP screen and renders the V2 hub when hub V2 is enabled', async () => {
-    mockWorldCupHubV2Enabled = true;
-    renderWithNavigation(<PredictScreenStack />);
-
-    await act(async () => {
-      navigationRef.current?.navigate(Routes.PREDICT.WORLD_CUP);
-    });
-
-    expect(screen.getByTestId('predict-world-cup-hub')).toBeOnTheScreen();
-    expect(screen.queryByTestId('predict-world-cup')).not.toBeOnTheScreen();
-  });
-
   it('navigates to FEED screen', async () => {
     renderWithNavigation(<PredictScreenStack />);
 
@@ -318,45 +276,6 @@ describe('PredictScreenStack', () => {
 
     expect(screen.getByTestId('confirm-component')).toBeOnTheScreen();
   });
-
-  it('navigates to no-header confirmation with animation disabled', async () => {
-    renderWithNavigation(<PredictScreenStack />);
-
-    await act(async () => {
-      navigationRef.current?.navigate(
-        Routes.FULL_SCREEN_CONFIRMATIONS.NO_HEADER,
-        { animationEnabled: false },
-      );
-    });
-
-    expect(screen.getByTestId('confirm-component')).toBeOnTheScreen();
-  });
-
-  it('navigates to redesigned confirmation with animation disabled', async () => {
-    renderWithNavigation(<PredictScreenStack />);
-
-    await act(async () => {
-      navigationRef.current?.navigate(
-        Routes.FULL_SCREEN_CONFIRMATIONS.REDESIGNED_CONFIRMATIONS,
-        { animationEnabled: false },
-      );
-    });
-
-    expect(screen.getByTestId('confirm-component')).toBeOnTheScreen();
-  });
-
-  it('navigates to redesigned confirmation with animation enabled', async () => {
-    renderWithNavigation(<PredictScreenStack />);
-
-    await act(async () => {
-      navigationRef.current?.navigate(
-        Routes.FULL_SCREEN_CONFIRMATIONS.REDESIGNED_CONFIRMATIONS,
-        { animationEnabled: true },
-      );
-    });
-
-    expect(screen.getByTestId('confirm-component')).toBeOnTheScreen();
-  });
 });
 
 describe('PredictModalStack', () => {
@@ -424,17 +343,4 @@ describe('PredictModalStack', () => {
 
     expect(screen.getByTestId('confirm-component')).toBeOnTheScreen();
   });
-
-  it('navigates to no-header confirmation with animation disabled in modal', async () => {
-    renderWithNavigation(<PredictModalStack />);
-
-    await act(async () => {
-      navigationRef.current?.navigate(
-        Routes.FULL_SCREEN_CONFIRMATIONS.NO_HEADER,
-        { animationEnabled: false },
-      );
-    });
-
-    expect(screen.getByTestId('confirm-component')).toBeOnTheScreen();
-  });
 });
diff --git a/app/components/UI/Predict/routes/index.tsx b/app/components/UI/Predict/routes/index.tsx
index 7aa0899cb3e1..bf512bcd2c39 100644
--- a/app/components/UI/Predict/routes/index.tsx
+++ b/app/components/UI/Predict/routes/index.tsx
@@ -20,7 +20,6 @@ import {
 import PredictAddFundsModal from '../views/PredictAddFundsModal/PredictAddFundsModal';
 import PredictPositionsView from '../views/PredictPositionsView';
 import PredictMarketListRoute from './PredictMarketListRoute';
-import PredictWorldCupRoute from './PredictWorldCupRoute';
 import PredictFeedView from '../views/PredictFeedView';
 import PredictGTMModal from '../components/PredictGTMModal';
 import { useSelector } from 'react-redux';
@@ -63,12 +62,12 @@ const PredictModalStack = () => {
       <ModalStack.Screen
         name={Routes.FULL_SCREEN_CONFIRMATIONS.REDESIGNED_CONFIRMATIONS}
         component={Confirm}
-        options={emptyNavHeaderOptions}
+        options={{ ...emptyNavHeaderOptions, presentation: 'card' }}
       />
       <ModalStack.Screen
         name={Routes.FULL_SCREEN_CONFIRMATIONS.NO_HEADER}
         component={Confirm}
-        options={{ headerShown: false }}
+        options={{ headerShown: false, presentation: 'card' }}
       />
     </ModalStack.Navigator>
   );
@@ -98,11 +97,6 @@ const PredictScreenStack = () => {
           }}
         />
 
-        <Stack.Screen
-          name={Routes.PREDICT.WORLD_CUP}
-          component={PredictWorldCupRoute}
-        />
-
         <Stack.Screen name={Routes.PREDICT.FEED} component={PredictFeedView} />
 
         <Stack.Screen
diff --git a/app/components/UI/Predict/schemas/flags.test.ts b/app/components/UI/Predict/schemas/flags.test.ts
index 3ca630598e55..3fde66e253f1 100644
--- a/app/components/UI/Predict/schemas/flags.test.ts
+++ b/app/components/UI/Predict/schemas/flags.test.ts
@@ -4,14 +4,12 @@ import {
   PredictFeedBannerSchema,
   PredictFeedCarouselSchema,
   PredictSportsFeedSchema,
-  PredictWorldCupSchema,
 } from './flags';
 import {
   DEFAULT_FEE_COLLECTION_FLAG,
   DEFAULT_PREDICT_SPORTS_FEED_FLAG,
   DEFAULT_PREDICT_FEED_BANNER_FLAG,
   DEFAULT_PREDICT_FEED_CAROUSEL_FLAG,
-  DEFAULT_PREDICT_WORLD_CUP_FLAG,
 } from '../constants/flags';
 import {
   PredictFeedBannerPosition,
@@ -100,7 +98,7 @@ describe('PredictFeedBannerSchema', () => {
     id: 'predict-incident-1',
     title: 'Service update',
     description: 'Predict markets are temporarily unavailable.',
-    position: PredictFeedBannerPosition.AfterWorldCupBanner,
+    position: PredictFeedBannerPosition.AfterFeaturedCarousel,
     severity: PredictFeedBannerSeverity.Warning,
     dismissible: true,
   };
@@ -307,101 +305,6 @@ describe('PredictFeeCollectionSchema', () => {
   });
 });
 
-describe('PredictWorldCupSchema', () => {
-  it('returns safe disabled defaults when input is undefined', () => {
-    const result = create(undefined, PredictWorldCupSchema);
-
-    expect(result).toStrictEqual(DEFAULT_PREDICT_WORLD_CUP_FLAG);
-  });
-
-  it('fills missing IDs and stages with defaults', () => {
-    const result = create(
-      {
-        enabled: true,
-        minimumVersion: '1.0.0',
-        showMainFeedBanner: true,
-        showMainFeedTab: true,
-        showWorldCupScreen: true,
-      },
-      PredictWorldCupSchema,
-    );
-
-    expect(result).toStrictEqual({
-      ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-      enabled: true,
-      minimumVersion: '1.0.0',
-      showMainFeedBanner: true,
-      showMainFeedTab: true,
-      showWorldCupScreen: true,
-    });
-  });
-
-  it('preserves configured IDs, banner, and stages', () => {
-    const input = {
-      enabled: true,
-      minimumVersion: '1.0.0',
-      showMainFeedBanner: true,
-      showMainFeedTab: true,
-      showWorldCupScreen: true,
-      showHubV2: true,
-      showHubBanner: true,
-      tagSlug: 'fifa-world-cup',
-      gamesTagId: '100639',
-      winnerEventId: '987654',
-      bannerImage: {
-        url: 'https://example.com/banner.png',
-        width: 400,
-        height: 200,
-      },
-      stages: [
-        {
-          key: 'group_stage',
-          labelKey: 'predict.world_cup.stages.group_stage',
-          eventIds: ['1', '2'],
-        },
-      ],
-    };
-
-    const result = create(input, PredictWorldCupSchema);
-
-    expect(result).toStrictEqual(input);
-  });
-
-  it('tolerates unknown/legacy keys in the remote payload without disabling the flag', () => {
-    // Remote feature flags are managed independently of client releases, so a
-    // legacy key such as `seriesId` (removed from the client) must not cause a
-    // parse failure that would fall back to the disabled default.
-    const result = create(
-      {
-        enabled: true,
-        minimumVersion: '1.0.0',
-        showWorldCupScreen: true,
-        tagSlug: 'fifa-world-cup',
-        seriesId: '11433',
-        someFutureField: 'ignored',
-      },
-      PredictWorldCupSchema,
-    );
-
-    expect(result.enabled).toBe(true);
-    expect(result.showWorldCupScreen).toBe(true);
-    expect(result.tagSlug).toBe('fifa-world-cup');
-    // Declared defaults are still applied for omitted fields.
-    expect(result.gamesTagId).toBe(DEFAULT_PREDICT_WORLD_CUP_FLAG.gamesTagId);
-  });
-
-  it('throws for invalid stage event IDs', () => {
-    expect(() =>
-      create(
-        {
-          stages: [{ key: 'group_stage', eventIds: [123] }],
-        },
-        PredictWorldCupSchema,
-      ),
-    ).toThrow(StructError);
-  });
-});
-
 describe('PredictSportsFeedSchema', () => {
   it('returns bundled sports config defaults when input is undefined', () => {
     const result = create(undefined, PredictSportsFeedSchema);
diff --git a/app/components/UI/Predict/schemas/flags.ts b/app/components/UI/Predict/schemas/flags.ts
index 18585efdc3e9..cc8e4018804e 100644
--- a/app/components/UI/Predict/schemas/flags.ts
+++ b/app/components/UI/Predict/schemas/flags.ts
@@ -19,7 +19,6 @@ import {
   DEFAULT_PREDICT_FEED_BANNER_FLAG,
   DEFAULT_PREDICT_FEED_CAROUSEL_FLAG,
   DEFAULT_PREDICT_SPORTS_FEED_FLAG,
-  DEFAULT_PREDICT_WORLD_CUP_FLAG,
   DEFAULT_WIMBLEDON_TAB_FLAG,
   PREDICT_MARKET_LIST_ORDERS,
   PREDICT_WIMBLEDON_DEFAULT_QUERY_PARAMS,
@@ -86,7 +85,6 @@ export const PredictFeedCarouselSchema = defaulted(
 const PredictFeedBannerPositionSchema = union([
   literal(PredictFeedBannerPosition.AfterBalance),
   literal(PredictFeedBannerPosition.AfterFeaturedCarousel),
-  literal(PredictFeedBannerPosition.AfterWorldCupBanner),
   literal(PredictFeedBannerPosition.BeforePortfolio),
   literal(PredictFeedBannerPosition.AfterPortfolio),
   literal(PredictFeedBannerPosition.AfterLiveNow),
@@ -145,66 +143,6 @@ export const PredictFeeCollectionSchema = defaulted(
   () => DEFAULT_FEE_COLLECTION_FLAG,
 );
 
-export const PredictWorldCupStageSchema = object({
-  key: string(),
-  labelKey: optional(string()),
-  label: optional(string()),
-  eventIds: defaulted(array(string()), () => []),
-});
-
-// Uses `type()` (not strict `object()`) so unknown keys in the remote
-// feature-flag payload are tolerated rather than throwing. Remote config is
-// managed independently of client releases, so a legacy/extra key (e.g. the
-// previously-supported `seriesId`) must not cause `parse()` to fall back to the
-// disabled default and silently turn World Cup off for everyone.
-export const PredictWorldCupSchema = defaulted(
-  type({
-    enabled: defaulted(boolean(), () => DEFAULT_PREDICT_WORLD_CUP_FLAG.enabled),
-    minimumVersion: defaulted(
-      string(),
-      () => DEFAULT_PREDICT_WORLD_CUP_FLAG.minimumVersion,
-    ),
-    showMainFeedBanner: defaulted(
-      boolean(),
-      () => DEFAULT_PREDICT_WORLD_CUP_FLAG.showMainFeedBanner,
-    ),
-    showMainFeedTab: defaulted(
-      boolean(),
-      () => DEFAULT_PREDICT_WORLD_CUP_FLAG.showMainFeedTab,
-    ),
-    showWorldCupScreen: defaulted(
-      boolean(),
-      () => DEFAULT_PREDICT_WORLD_CUP_FLAG.showWorldCupScreen,
-    ),
-    showHubV2: defaulted(
-      boolean(),
-      () => DEFAULT_PREDICT_WORLD_CUP_FLAG.showHubV2,
-    ),
-    showHubBanner: defaulted(
-      boolean(),
-      () => DEFAULT_PREDICT_WORLD_CUP_FLAG.showHubBanner,
-    ),
-    tagSlug: defaulted(string(), () => DEFAULT_PREDICT_WORLD_CUP_FLAG.tagSlug),
-    gamesTagId: defaulted(
-      string(),
-      () => DEFAULT_PREDICT_WORLD_CUP_FLAG.gamesTagId,
-    ),
-    winnerEventId: defaulted(
-      string(),
-      () => DEFAULT_PREDICT_WORLD_CUP_FLAG.winnerEventId,
-    ),
-    bannerImage: optional(
-      object({
-        url: string(),
-        width: number(),
-        height: number(),
-      }),
-    ),
-    stages: defaulted(array(PredictWorldCupStageSchema), () => []),
-  }),
-  () => DEFAULT_PREDICT_WORLD_CUP_FLAG,
-);
-
 export const PredictWimbledonTabSchema = defaulted(
   type({
     enabled: defaulted(boolean(), () => DEFAULT_WIMBLEDON_TAB_FLAG.enabled),
diff --git a/app/components/UI/Predict/schemas/index.ts b/app/components/UI/Predict/schemas/index.ts
index 2edad12fadc5..84fceb4c3d2d 100644
--- a/app/components/UI/Predict/schemas/index.ts
+++ b/app/components/UI/Predict/schemas/index.ts
@@ -9,6 +9,4 @@ export {
   PredictSportsFeedTabSchema,
   PredictSportsFeedChipSchema,
   PredictWimbledonTabSchema,
-  PredictWorldCupSchema,
-  PredictWorldCupStageSchema,
 } from './flags';
diff --git a/app/components/UI/Predict/selectors/featureFlags/index.test.ts b/app/components/UI/Predict/selectors/featureFlags/index.test.ts
index ccd717584335..5b52d2ac09d4 100644
--- a/app/components/UI/Predict/selectors/featureFlags/index.test.ts
+++ b/app/components/UI/Predict/selectors/featureFlags/index.test.ts
@@ -19,12 +19,6 @@ import {
   selectPredictUpDownEnabledFlag,
   selectPredictWithAnyTokenEnabledFlag,
   selectPredictWimbledonTabFlag,
-  selectPredictWorldCupConfig,
-  selectPredictWorldCupHubBannerEnabledFlag,
-  selectPredictWorldCupHubV2EnabledFlag,
-  selectPredictWorldCupMainFeedBannerEnabledFlag,
-  selectPredictWorldCupMainFeedTabEnabledFlag,
-  selectPredictWorldCupScreenEnabledFlag,
 } from '.';
 import mockedEngine from '../../../../../core/__mocks__/MockedEngine';
 import {
@@ -41,7 +35,6 @@ import {
   DEFAULT_PREDICT_FEED_BANNER_FLAG,
   DEFAULT_PREDICT_FEED_CAROUSEL_FLAG,
   DEFAULT_PREDICT_SPORTS_FEED_FLAG,
-  DEFAULT_PREDICT_WORLD_CUP_FLAG,
   DEFAULT_WIMBLEDON_TAB_FLAG,
 } from '../../constants/flags';
 import {
@@ -1562,85 +1555,6 @@ describe('Predict Feature Flag Selectors', () => {
     });
   });
 
-  describe('selectPredictWorldCupConfig', () => {
-    it('returns default disabled config when flag is missing', () => {
-      expect(selectPredictWorldCupConfig(mockedEmptyFlagsState)).toEqual(
-        DEFAULT_PREDICT_WORLD_CUP_FLAG,
-      );
-      expect(
-        selectPredictWorldCupMainFeedBannerEnabledFlag(mockedEmptyFlagsState),
-      ).toBe(false);
-      expect(
-        selectPredictWorldCupMainFeedTabEnabledFlag(mockedEmptyFlagsState),
-      ).toBe(false);
-      expect(
-        selectPredictWorldCupScreenEnabledFlag(mockedEmptyFlagsState),
-      ).toBe(false);
-    });
-
-    it('returns normalized config and gated booleans when enabled', () => {
-      mockHasMinimumRequiredVersion.mockReturnValue(true);
-      const state = {
-        engine: {
-          backgroundState: {
-            RemoteFeatureFlagController: {
-              remoteFeatureFlags: {
-                predictWorldCup: {
-                  enabled: true,
-                  minimumVersion: '1.0.0',
-                  showMainFeedBanner: true,
-                  showMainFeedTab: true,
-                  showWorldCupScreen: true,
-                  stages: [{ key: 'final', eventIds: ['10'] }],
-                },
-              },
-              cacheTimestamp: 0,
-            },
-          },
-        },
-      };
-
-      expect(selectPredictWorldCupConfig(state)).toEqual({
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        minimumVersion: '1.0.0',
-        showMainFeedBanner: true,
-        showMainFeedTab: true,
-        showWorldCupScreen: true,
-        stages: [{ key: 'final', eventIds: ['10'] }],
-      });
-      expect(selectPredictWorldCupMainFeedBannerEnabledFlag(state)).toBe(true);
-      expect(selectPredictWorldCupMainFeedTabEnabledFlag(state)).toBe(true);
-      expect(selectPredictWorldCupScreenEnabledFlag(state)).toBe(true);
-    });
-
-    it('returns default config when version requirement is not met', () => {
-      mockHasMinimumRequiredVersion.mockReturnValue(false);
-      const state = {
-        engine: {
-          backgroundState: {
-            RemoteFeatureFlagController: {
-              remoteFeatureFlags: {
-                predictWorldCup: {
-                  enabled: true,
-                  minimumVersion: '99.0.0',
-                  showMainFeedBanner: true,
-                  showMainFeedTab: true,
-                  showWorldCupScreen: true,
-                },
-              },
-              cacheTimestamp: 0,
-            },
-          },
-        },
-      };
-
-      expect(selectPredictWorldCupConfig(state)).toEqual(
-        DEFAULT_PREDICT_WORLD_CUP_FLAG,
-      );
-    });
-  });
-
   describe('selectPredictSportsFeedConfig', () => {
     it('returns bundled sports config when flag is missing', () => {
       expect(selectPredictSportsFeedConfig(mockedEmptyFlagsState)).toEqual(
@@ -1715,144 +1629,6 @@ describe('Predict Feature Flag Selectors', () => {
     });
   });
 
-  describe('selectPredictWorldCupHubV2EnabledFlag', () => {
-    const buildWorldCupState = <T>(predictWorldCup: T) => ({
-      engine: {
-        backgroundState: {
-          RemoteFeatureFlagController: {
-            remoteFeatureFlags: { predictWorldCup },
-            cacheTimestamp: 0,
-          },
-        },
-      },
-    });
-
-    beforeEach(() => {
-      mockHasMinimumRequiredVersion.mockReturnValue(true);
-    });
-
-    it('returns true only when enabled, showWorldCupScreen and showHubV2 are all true', () => {
-      const state = buildWorldCupState({
-        enabled: true,
-        minimumVersion: '1.0.0',
-        showWorldCupScreen: true,
-        showHubV2: true,
-      });
-
-      expect(selectPredictWorldCupHubV2EnabledFlag(state)).toBe(true);
-    });
-
-    it('returns false when showWorldCupScreen is false even if showHubV2 is true', () => {
-      const state = buildWorldCupState({
-        enabled: true,
-        minimumVersion: '1.0.0',
-        showWorldCupScreen: false,
-        showHubV2: true,
-      });
-
-      expect(selectPredictWorldCupHubV2EnabledFlag(state)).toBe(false);
-    });
-
-    it('returns false when showHubV2 is false', () => {
-      const state = buildWorldCupState({
-        enabled: true,
-        minimumVersion: '1.0.0',
-        showWorldCupScreen: true,
-        showHubV2: false,
-      });
-
-      expect(selectPredictWorldCupHubV2EnabledFlag(state)).toBe(false);
-    });
-
-    it('returns false when the World Cup feature is disabled', () => {
-      const state = buildWorldCupState({
-        enabled: false,
-        minimumVersion: '1.0.0',
-        showWorldCupScreen: true,
-        showHubV2: true,
-      });
-
-      expect(selectPredictWorldCupHubV2EnabledFlag(state)).toBe(false);
-    });
-  });
-
-  describe('selectPredictWorldCupHubBannerEnabledFlag', () => {
-    const buildWorldCupState = <T>(predictWorldCup: T) => ({
-      engine: {
-        backgroundState: {
-          RemoteFeatureFlagController: {
-            remoteFeatureFlags: { predictWorldCup },
-            cacheTimestamp: 0,
-          },
-        },
-      },
-    });
-
-    beforeEach(() => {
-      mockHasMinimumRequiredVersion.mockReturnValue(true);
-    });
-
-    it('returns true only when enabled, showWorldCupScreen, showHubV2 and showHubBanner are all true', () => {
-      const state = buildWorldCupState({
-        enabled: true,
-        minimumVersion: '1.0.0',
-        showWorldCupScreen: true,
-        showHubV2: true,
-        showHubBanner: true,
-      });
-
-      expect(selectPredictWorldCupHubBannerEnabledFlag(state)).toBe(true);
-    });
-
-    it('returns false when showWorldCupScreen is false even if showHubBanner is true', () => {
-      const state = buildWorldCupState({
-        enabled: true,
-        minimumVersion: '1.0.0',
-        showWorldCupScreen: false,
-        showHubV2: true,
-        showHubBanner: true,
-      });
-
-      expect(selectPredictWorldCupHubBannerEnabledFlag(state)).toBe(false);
-    });
-
-    it('returns false when showHubV2 is false even if showHubBanner is true', () => {
-      const state = buildWorldCupState({
-        enabled: true,
-        minimumVersion: '1.0.0',
-        showWorldCupScreen: true,
-        showHubV2: false,
-        showHubBanner: true,
-      });
-
-      expect(selectPredictWorldCupHubBannerEnabledFlag(state)).toBe(false);
-    });
-
-    it('returns false when showHubBanner is false', () => {
-      const state = buildWorldCupState({
-        enabled: true,
-        minimumVersion: '1.0.0',
-        showWorldCupScreen: true,
-        showHubV2: true,
-        showHubBanner: false,
-      });
-
-      expect(selectPredictWorldCupHubBannerEnabledFlag(state)).toBe(false);
-    });
-
-    it('returns false when the World Cup feature is disabled', () => {
-      const state = buildWorldCupState({
-        enabled: false,
-        minimumVersion: '1.0.0',
-        showWorldCupScreen: true,
-        showHubV2: true,
-        showHubBanner: true,
-      });
-
-      expect(selectPredictWorldCupHubBannerEnabledFlag(state)).toBe(false);
-    });
-  });
-
   describe('selectPredictPortfolioEnabledFlag', () => {
     it('returns false when flag is missing', () => {
       const result = selectPredictPortfolioEnabledFlag(mockedEmptyFlagsState);
diff --git a/app/components/UI/Predict/selectors/featureFlags/index.ts b/app/components/UI/Predict/selectors/featureFlags/index.ts
index 34b206e30357..36d1cda321e2 100644
--- a/app/components/UI/Predict/selectors/featureFlags/index.ts
+++ b/app/components/UI/Predict/selectors/featureFlags/index.ts
@@ -166,11 +166,6 @@ export const selectPredictUpDownEnabledFlag = createSelector(
   (flags) => flags.predictUpDownEnabled,
 );
 
-export const selectPredictWorldCupConfig = createSelector(
-  selectPredictFeatureFlags,
-  (flags) => flags.predictWorldCup,
-);
-
 export const selectPredictSportsFeedConfig = createSelector(
   selectPredictFeatureFlags,
   (flags) => flags.predictSportsFeed,
@@ -181,43 +176,6 @@ export const selectPredictWimbledonTabFlag = createSelector(
   (flags) => flags.predictWimbledonTab,
 );
 
-export const selectPredictWorldCupEnabledFlag = createSelector(
-  selectPredictWorldCupConfig,
-  (config) => config.enabled,
-);
-
-export const selectPredictWorldCupMainFeedBannerEnabledFlag = createSelector(
-  selectPredictWorldCupConfig,
-  (config) => config.enabled && config.showMainFeedBanner,
-);
-
-export const selectPredictWorldCupMainFeedTabEnabledFlag = createSelector(
-  selectPredictWorldCupConfig,
-  (config) => config.enabled && config.showMainFeedTab,
-);
-
-export const selectPredictWorldCupScreenEnabledFlag = createSelector(
-  selectPredictWorldCupConfig,
-  (config) => config.enabled && config.showWorldCupScreen,
-);
-
-export const selectPredictWorldCupHubV2EnabledFlag = createSelector(
-  selectPredictWorldCupConfig,
-  (config) => config.enabled && config.showWorldCupScreen && config.showHubV2,
-);
-
-// The banner is only mounted inside the V2 hub (`PredictWorldCupHub`), so it
-// must also require `showHubV2`. Without this, enabling `showHubBanner` while
-// `showHubV2` is off would silently render nothing (the V1 hub has no banner).
-export const selectPredictWorldCupHubBannerEnabledFlag = createSelector(
-  selectPredictWorldCupConfig,
-  (config) =>
-    config.enabled &&
-    config.showWorldCupScreen &&
-    config.showHubV2 &&
-    config.showHubBanner,
-);
-
 export const selectPredictPortfolioEnabledFlag = createSelector(
   selectPredictFeatureFlags,
   (flags) => flags.predictPortfolioEnabled,
diff --git a/app/components/UI/Predict/services/PredictFeedSessionManager.test.ts b/app/components/UI/Predict/services/PredictFeedSessionManager.test.ts
index dc277f199056..1a10c3f09c27 100644
--- a/app/components/UI/Predict/services/PredictFeedSessionManager.test.ts
+++ b/app/components/UI/Predict/services/PredictFeedSessionManager.test.ts
@@ -239,11 +239,11 @@ describe('PredictFeedSessionManager', () => {
       sessionManager.startSession('predict_feed');
       mockTrackFeedViewed.mockClear();
 
-      sessionManager.trackTabChange('world-cup');
+      sessionManager.trackTabChange('sports');
 
       expect(mockTrackFeedViewed).toHaveBeenCalledWith({
         sessionId: 'mock-session-id',
-        feedTab: 'world-cup',
+        feedTab: 'sports',
         numPagesViewed: 1,
         sessionTime: 0,
         entryPoint: 'predict_feed',
diff --git a/app/components/UI/Predict/services/worldCup.ts b/app/components/UI/Predict/services/worldCup.ts
deleted file mode 100644
index 4ccbb4ea8a36..000000000000
--- a/app/components/UI/Predict/services/worldCup.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import Engine from '../../../../core/Engine';
-import type { GetMarketsResult, PredictMarket } from '../types';
-
-export const PREDICT_WORLD_CUP_PAGE_SIZE = 20;
-export const PREDICT_WORLD_CUP_AVAILABILITY_LIMIT = 1;
-
-interface FetchPredictWorldCupMarketsParams {
-  queryParams: string;
-  limit?: number;
-  afterCursor?: string | null;
-  sortByStartTime?: boolean;
-}
-
-const getPredictController = () => {
-  const controller = Engine.context.PredictController;
-
-  if (!controller) {
-    throw new Error('PredictController not available');
-  }
-
-  return controller;
-};
-
-const getMarketStartTimestamp = (market: PredictMarket): number => {
-  const timestamp = Date.parse(market.game?.startTime ?? market.endDate ?? '');
-  return Number.isNaN(timestamp) ? Number.POSITIVE_INFINITY : timestamp;
-};
-
-/**
- * Returns World Cup markets ordered by match start time when available.
- * Non-game markets sort after dated game markets and use title as a deterministic tie-breaker.
- */
-export const sortPredictWorldCupMarketsByStartTime = (
-  markets: PredictMarket[],
-): PredictMarket[] =>
-  [...markets].sort((firstMarket, secondMarket) => {
-    const firstTimestamp = getMarketStartTimestamp(firstMarket);
-    const secondTimestamp = getMarketStartTimestamp(secondMarket);
-
-    if (firstTimestamp !== secondTimestamp) {
-      return firstTimestamp - secondTimestamp;
-    }
-
-    return firstMarket.title.localeCompare(secondMarket.title);
-  });
-
-/**
- * Fetches World Cup markets through the Predict controller using raw Polymarket query params.
- */
-export const fetchPredictWorldCupMarketsPage = async ({
-  queryParams,
-  limit = PREDICT_WORLD_CUP_PAGE_SIZE,
-  afterCursor,
-  sortByStartTime = false,
-}: FetchPredictWorldCupMarketsParams): Promise<GetMarketsResult> => {
-  const controller = getPredictController();
-  const { markets, nextCursor } = await controller.getMarkets({
-    category: 'hot',
-    customQueryParams: queryParams,
-    limit,
-    afterCursor,
-  });
-
-  return {
-    markets: sortByStartTime
-      ? sortPredictWorldCupMarketsByStartTime(markets)
-      : markets,
-    nextCursor,
-  };
-};
-
-export const fetchPredictWorldCupMarkets = async (
-  params: FetchPredictWorldCupMarketsParams,
-): Promise<PredictMarket[]> => {
-  const { markets } = await fetchPredictWorldCupMarketsPage(params);
-  return markets;
-};
-
-/**
- * Performs a lightweight World Cup tab availability check.
- */
-export const fetchPredictWorldCupAvailability = async (
-  queryParams: string,
-): Promise<boolean> => {
-  const markets = await fetchPredictWorldCupMarkets({
-    queryParams,
-    limit: PREDICT_WORLD_CUP_AVAILABILITY_LIMIT,
-  });
-
-  return markets.length > 0;
-};
diff --git a/app/components/UI/Predict/types/flags.ts b/app/components/UI/Predict/types/flags.ts
index 9e10e53eac45..91837c379498 100644
--- a/app/components/UI/Predict/types/flags.ts
+++ b/app/components/UI/Predict/types/flags.ts
@@ -54,30 +54,6 @@ export interface PredictExtendedSportsMarketsFlag
   nonRegTimeSportsMarketTypes?: string[];
 }
 
-export interface PredictWorldCupStageConfig {
-  key: string;
-  labelKey?: string;
-  label?: string;
-  eventIds: string[];
-}
-
-export interface PredictWorldCupConfig extends VersionGatedFeatureFlag {
-  showMainFeedBanner: boolean;
-  showMainFeedTab: boolean;
-  showWorldCupScreen: boolean;
-  showHubV2: boolean;
-  showHubBanner: boolean;
-  tagSlug: string;
-  gamesTagId: string;
-  winnerEventId: string;
-  bannerImage?: {
-    url: string;
-    width: number;
-    height: number;
-  };
-  stages: PredictWorldCupStageConfig[];
-}
-
 export type PredictSportsFeedChipKind = 'games' | 'props' | 'tag';
 export type PredictSportsFeedChipOrder = PredictMarketListOrder;
 
@@ -133,7 +109,6 @@ export interface PredictFeatureFlags {
   fakOrdersEnabled: boolean;
   predictWithAnyTokenEnabled: boolean;
   predictUpDownEnabled: boolean;
-  predictWorldCup: PredictWorldCupConfig;
   predictSportsFeed: PredictSportsFeedConfig;
   predictWimbledonTab: PredictWimbledonTabFlag;
   predictPortfolioEnabled: boolean;
diff --git a/app/components/UI/Predict/types/index.ts b/app/components/UI/Predict/types/index.ts
index 58b9fb608ef1..dab5154e2347 100644
--- a/app/components/UI/Predict/types/index.ts
+++ b/app/components/UI/Predict/types/index.ts
@@ -154,7 +154,6 @@ export type PredictCategory =
   | 'crypto'
   | 'politics'
   | 'hot'
-  | 'world-cup'
   | 'wimbledon';
 
 // Sports league types
diff --git a/app/components/UI/Predict/types/navigation.ts b/app/components/UI/Predict/types/navigation.ts
index fe6290cf9db3..bce044acc75c 100644
--- a/app/components/UI/Predict/types/navigation.ts
+++ b/app/components/UI/Predict/types/navigation.ts
@@ -14,7 +14,6 @@ import {
 } from '.';
 import { PredictEventValues } from '../constants/eventNames';
 import type { TransactionActiveAbTestEntry } from '../../../../util/transactions/transaction-active-ab-test-attribution-registry';
-import type { PredictWorldCupTabKey } from '../constants/worldCupTabs';
 import type { PredictFeedId } from '../constants/feedConfig';
 
 export type PredictEntryPoint =
@@ -43,7 +42,7 @@ export interface PredictMarketListRouteParams {
   entryPoint?: PredictEntryPoint;
   feedId?: PredictFeedId;
   /**
-   * Legacy top-level Predict feed tab key (hot / world-cup / base tabs).
+   * Legacy top-level Predict feed tab key (hot / base tabs).
    * Consumed by `usePredictTabs`. Not interchangeable with `tabId`.
    */
   tab?: PredictCategory;
@@ -87,9 +86,9 @@ export interface PredictMarketDetailsParams {
   seriesId?: string;
   seriesRecurrence?: string;
   entryPoint?: PredictEntryPoint;
-  /** Active feed tab key at the time the market card was tapped (e.g. "trending", "world-cup"). */
+  /** Active feed tab key at the time the market card was tapped (e.g. "trending"). */
   predictFeedTab?: string;
-  /** Screen context the trade originated from (e.g. "world_cup"). */
+  /** Screen context the trade originated from. */
   predictScreen?: string;
   title?: string;
   image?: string;
@@ -97,13 +96,6 @@ export interface PredictMarketDetailsParams {
   transactionActiveAbTests?: TransactionActiveAbTestEntry[];
 }
 
-/** Predict World Cup feed parameters */
-export interface PredictWorldCupParams {
-  entryPoint?: string;
-  initialTab?: PredictWorldCupTabKey;
-  transactionActiveAbTests?: TransactionActiveAbTestEntry[];
-}
-
 /** Predict activity detail parameters */
 export interface PredictActivityDetailParams {
   activity: PredictActivityItem;
@@ -129,9 +121,9 @@ export interface PredictBuyPreviewParams {
   outcome: PredictOutcome;
   outcomeToken: PredictOutcomeToken;
   entryPoint?: PredictEntryPoint;
-  /** Active feed tab key at the time the market card was tapped (e.g. "trending", "world-cup"). */
+  /** Active feed tab key at the time the market card was tapped (e.g. "trending"). */
   predictFeedTab?: string;
-  /** Screen context the trade originated from (e.g. "world_cup"). */
+  /** Screen context the trade originated from. */
   predictScreen?: string;
   transactionActiveAbTests?: TransactionActiveAbTestEntry[];
 }
@@ -183,7 +175,6 @@ export type PredictStackParamList = {
   PredictFeed: PredictFeedRouteParams | undefined;
   PredictMarketDetails: PredictMarketDetailsParams | undefined;
   PredictPositions: PredictPositionsParams | undefined;
-  PredictWorldCup: PredictWorldCupParams | undefined;
   PredictSellPreview: PredictSellPreviewParams;
   PredictBuyPreview: PredictBuyPreviewParams;
   RedesignedConfirmations: undefined;
diff --git a/app/components/UI/Predict/utils/analytics.test.ts b/app/components/UI/Predict/utils/analytics.test.ts
index 274bdceac693..fadb95dffc4d 100644
--- a/app/components/UI/Predict/utils/analytics.test.ts
+++ b/app/components/UI/Predict/utils/analytics.test.ts
@@ -212,12 +212,12 @@ describe('parseAnalyticsProperties', () => {
         market,
         outcomeToken,
         'predict_feed',
-        'world-cup',
-        'world_cup',
+        'sports',
+        'predict_positions_screen',
       );
 
-      expect(result.predictFeedTab).toBe('world-cup');
-      expect(result.predictScreen).toBe('world_cup');
+      expect(result.predictFeedTab).toBe('sports');
+      expect(result.predictScreen).toBe('predict_positions_screen');
     });
 
     it('includes only predictFeedTab when screen is omitted', () => {
diff --git a/app/components/UI/Predict/utils/resolvePredictFeatureFlags.test.ts b/app/components/UI/Predict/utils/resolvePredictFeatureFlags.test.ts
index 13d2a2be903d..659d135c5985 100644
--- a/app/components/UI/Predict/utils/resolvePredictFeatureFlags.test.ts
+++ b/app/components/UI/Predict/utils/resolvePredictFeatureFlags.test.ts
@@ -4,7 +4,6 @@ import {
   DEFAULT_FEE_COLLECTION_FLAG,
   DEFAULT_MARKET_HIGHLIGHTS_FLAG,
   DEFAULT_PREDICT_SPORTS_FEED_FLAG,
-  DEFAULT_PREDICT_WORLD_CUP_FLAG,
   DEFAULT_WIMBLEDON_TAB_FLAG,
 } from '../constants/flags';
 import { DEFAULT_NON_REG_TIME_SPORTS_MARKET_TYPES } from '../constants/sports';
@@ -41,7 +40,6 @@ describe('resolvePredictFeatureFlags', () => {
       predictPortfolioEnabled: false,
       predictHomeRedesignEnabled: false,
       predictSportCardLivePricesEnabled: true,
-      predictWorldCup: DEFAULT_PREDICT_WORLD_CUP_FLAG,
       predictSportsFeed: DEFAULT_PREDICT_SPORTS_FEED_FLAG,
       predictWimbledonTab: DEFAULT_WIMBLEDON_TAB_FLAG,
     });
@@ -258,106 +256,6 @@ describe('resolvePredictFeatureFlags', () => {
     });
   });
 
-  describe('predictWorldCup', () => {
-    it('returns default disabled config when flag is missing', () => {
-      const result = resolvePredictFeatureFlags({});
-
-      expect(result.predictWorldCup).toEqual(DEFAULT_PREDICT_WORLD_CUP_FLAG);
-    });
-
-    it('falls back to default disabled config when version gate fails', () => {
-      mockValidatedVersionGatedFeatureFlag.mockImplementation((flag) => {
-        if (flag && typeof flag === 'object' && 'tagSlug' in flag) {
-          return false;
-        }
-        return undefined;
-      });
-
-      const result = resolvePredictFeatureFlags({
-        remoteFeatureFlags: {
-          predictWorldCup: {
-            enabled: true,
-            minimumVersion: '99.0.0',
-            showMainFeedBanner: true,
-            showMainFeedTab: true,
-            showWorldCupScreen: true,
-            stages: [{ key: 'final', eventIds: ['1'] }],
-          },
-        },
-      });
-
-      expect(result.predictWorldCup).toEqual(DEFAULT_PREDICT_WORLD_CUP_FLAG);
-    });
-
-    it('parses config with defaults when version gate passes', () => {
-      mockValidatedVersionGatedFeatureFlag.mockImplementation((flag) => {
-        if (flag && typeof flag === 'object' && 'tagSlug' in flag) {
-          return true;
-        }
-        return undefined;
-      });
-
-      const result = resolvePredictFeatureFlags({
-        remoteFeatureFlags: {
-          predictWorldCup: {
-            enabled: true,
-            minimumVersion: '1.0.0',
-            showMainFeedBanner: true,
-            showMainFeedTab: true,
-            showWorldCupScreen: true,
-            bannerImage: {
-              url: 'https://example.com/banner.png',
-              width: 400,
-              height: 200,
-            },
-            stages: [
-              {
-                key: 'group_stage',
-                labelKey: 'predict.world_cup.stages.group_stage',
-                eventIds: ['100', '101'],
-              },
-            ],
-          },
-        },
-      });
-
-      expect(result.predictWorldCup).toEqual({
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        minimumVersion: '1.0.0',
-        showMainFeedBanner: true,
-        showMainFeedTab: true,
-        showWorldCupScreen: true,
-        bannerImage: {
-          url: 'https://example.com/banner.png',
-          width: 400,
-          height: 200,
-        },
-        stages: [
-          {
-            key: 'group_stage',
-            labelKey: 'predict.world_cup.stages.group_stage',
-            eventIds: ['100', '101'],
-          },
-        ],
-      });
-    });
-
-    it('falls back to default when schema parsing fails', () => {
-      const result = resolvePredictFeatureFlags({
-        remoteFeatureFlags: {
-          predictWorldCup: {
-            enabled: true,
-            minimumVersion: '1.0.0',
-            showMainFeedBanner: 'yes',
-          },
-        },
-      });
-
-      expect(result.predictWorldCup).toEqual(DEFAULT_PREDICT_WORLD_CUP_FLAG);
-    });
-  });
-
   describe('predictWimbledonTab', () => {
     it('returns default disabled flag when flag is missing', () => {
       const result = resolvePredictFeatureFlags({});
diff --git a/app/components/UI/Predict/utils/resolvePredictFeatureFlags.ts b/app/components/UI/Predict/utils/resolvePredictFeatureFlags.ts
index 550ffdf80546..3a810b41937d 100644
--- a/app/components/UI/Predict/utils/resolvePredictFeatureFlags.ts
+++ b/app/components/UI/Predict/utils/resolvePredictFeatureFlags.ts
@@ -8,7 +8,6 @@ import {
   DEFAULT_LIVE_SPORTS_FLAG,
   DEFAULT_MARKET_HIGHLIGHTS_FLAG,
   DEFAULT_PREDICT_SPORTS_FEED_FLAG,
-  DEFAULT_PREDICT_WORLD_CUP_FLAG,
   DEFAULT_WIMBLEDON_TAB_FLAG,
 } from '../constants/flags';
 import {
@@ -24,7 +23,6 @@ import {
   PredictFeeCollectionSchema,
   PredictSportsFeedSchema,
   PredictWimbledonTabSchema,
-  PredictWorldCupSchema,
 } from '../schemas';
 import {
   PredictExtendedSportsMarketsFlag,
@@ -136,18 +134,6 @@ export function resolvePredictFeatureFlags(
     flags.predictSportCardLivePrices,
     true,
   );
-  const parsedPredictWorldCup = parse(
-    unwrapRemoteFeatureFlag<PredictFeatureFlags['predictWorldCup']>(
-      flags.predictWorldCup,
-    ),
-    PredictWorldCupSchema,
-    DEFAULT_PREDICT_WORLD_CUP_FLAG,
-  );
-  const predictWorldCup = validatedVersionGatedFeatureFlag(
-    parsedPredictWorldCup,
-  )
-    ? parsedPredictWorldCup
-    : DEFAULT_PREDICT_WORLD_CUP_FLAG;
   const parsedPredictSportsFeed = parse(
     unwrapRemoteFeatureFlag<PredictFeatureFlags['predictSportsFeed']>(
       flags.predictSportsFeed,
@@ -184,7 +170,6 @@ export function resolvePredictFeatureFlags(
     predictPortfolioEnabled,
     predictHomeRedesignEnabled,
     predictSportCardLivePricesEnabled,
-    predictWorldCup,
     predictSportsFeed,
     predictWimbledonTab,
   };
diff --git a/app/components/UI/Predict/utils/worldCup.test.ts b/app/components/UI/Predict/utils/worldCup.test.ts
deleted file mode 100644
index cbe1adeef517..000000000000
--- a/app/components/UI/Predict/utils/worldCup.test.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import {
-  buildPredictWorldCupAllQuery,
-  buildPredictWorldCupLiveQuery,
-  buildPredictWorldCupPropsQuery,
-  buildPredictWorldCupQuery,
-  buildPredictWorldCupStageEventsQuery,
-  PREDICT_WORLD_CUP_QUERY_TYPES,
-  resolvePredictWorldCupStageLabel,
-} from './worldCup';
-import { DEFAULT_PREDICT_WORLD_CUP_FLAG } from '../constants/flags';
-
-jest.mock('../../../../../locales/i18n', () => ({
-  strings: jest.fn((key: string) => {
-    const translations: Record<string, string> = {
-      'predict.world_cup.stages.group_stage': 'Group Stage',
-      'predict.world_cup.stages.final': 'Final',
-      'custom.stage': 'Custom Translated',
-    };
-    return translations[key] ?? key;
-  }),
-}));
-
-describe('Predict World Cup helpers', () => {
-  describe('query helpers', () => {
-    it('builds All query with World Cup tag slug', () => {
-      expect(buildPredictWorldCupAllQuery(DEFAULT_PREDICT_WORLD_CUP_FLAG)).toBe(
-        'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&order=volume24hr&ascending=false',
-      );
-    });
-
-    it('builds Props query excluding game markets', () => {
-      expect(
-        buildPredictWorldCupPropsQuery(DEFAULT_PREDICT_WORLD_CUP_FLAG),
-      ).toBe(
-        'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&exclude_tag_id=100639&order=volume&ascending=false',
-      );
-    });
-
-    it('builds Live query with tag slug, games tag, and live filter', () => {
-      expect(
-        buildPredictWorldCupLiveQuery(DEFAULT_PREDICT_WORLD_CUP_FLAG),
-      ).toBe(
-        'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&tag_id=100639&live=true&order=startDate',
-      );
-    });
-
-    it('builds stage query with repeated event ids', () => {
-      expect(
-        buildPredictWorldCupStageEventsQuery({ eventIds: ['123', '456'] }),
-      ).toBe('active=true&archived=false&closed=false&id=123&id=456');
-    });
-
-    it('dispatches query builder by World Cup query type', () => {
-      expect(
-        buildPredictWorldCupQuery(
-          PREDICT_WORLD_CUP_QUERY_TYPES.PROPS,
-          DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        ),
-      ).toBe(
-        'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&exclude_tag_id=100639&order=volume&ascending=false',
-      );
-    });
-  });
-
-  describe('resolvePredictWorldCupStageLabel', () => {
-    it('uses labelKey translation first', () => {
-      expect(
-        resolvePredictWorldCupStageLabel({
-          key: 'group_stage',
-          labelKey: 'custom.stage',
-          label: 'Fallback label',
-        }),
-      ).toBe('Custom Translated');
-    });
-
-    it('falls back to label when labelKey is missing translation', () => {
-      expect(
-        resolvePredictWorldCupStageLabel({
-          key: 'group_stage',
-          labelKey: 'missing.stage',
-          label: 'Fallback label',
-        }),
-      ).toBe('Fallback label');
-    });
-
-    it('falls back to derived stage label key', () => {
-      expect(
-        resolvePredictWorldCupStageLabel({
-          key: 'final',
-        }),
-      ).toBe('Final');
-    });
-
-    it('falls back to stage key when derived translation is missing', () => {
-      expect(
-        resolvePredictWorldCupStageLabel({
-          key: 'unknown_stage',
-        }),
-      ).toBe('unknown_stage');
-    });
-  });
-});
diff --git a/app/components/UI/Predict/utils/worldCup.ts b/app/components/UI/Predict/utils/worldCup.ts
deleted file mode 100644
index f8e01f797939..000000000000
--- a/app/components/UI/Predict/utils/worldCup.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import type {
-  PredictWorldCupConfig,
-  PredictWorldCupStageConfig,
-} from '../types/flags';
-import { translateIfPresent } from './translations';
-
-export type PredictWorldCupQueryType = 'all' | 'props' | 'live';
-
-export const PREDICT_WORLD_CUP_QUERY_TYPES = {
-  ALL: 'all',
-  PROPS: 'props',
-  LIVE: 'live',
-} as const satisfies Record<string, PredictWorldCupQueryType>;
-
-const WORLD_CUP_BASE_QUERY_PARAMS = {
-  active: 'true',
-  archived: 'false',
-  closed: 'false',
-} as const;
-
-const appendBaseWorldCupParams = (params: URLSearchParams): void => {
-  Object.entries(WORLD_CUP_BASE_QUERY_PARAMS).forEach(([key, value]) => {
-    params.set(key, value);
-  });
-};
-
-const buildQueryString = (params: URLSearchParams): string => params.toString();
-
-export const buildPredictWorldCupAllQuery = ({
-  tagSlug,
-}: Pick<PredictWorldCupConfig, 'tagSlug'>): string => {
-  const params = new URLSearchParams();
-  appendBaseWorldCupParams(params);
-  params.set('tag_slug', tagSlug);
-  params.set('order', 'volume24hr');
-  params.set('ascending', 'false');
-  return buildQueryString(params);
-};
-
-export const buildPredictWorldCupPropsQuery = ({
-  tagSlug,
-  gamesTagId,
-}: Pick<PredictWorldCupConfig, 'tagSlug' | 'gamesTagId'>): string => {
-  const params = new URLSearchParams();
-  appendBaseWorldCupParams(params);
-  params.set('tag_slug', tagSlug);
-  params.set('exclude_tag_id', gamesTagId);
-  params.set('order', 'volume');
-  params.set('ascending', 'false');
-  return buildQueryString(params);
-};
-
-export const buildPredictWorldCupLiveQuery = ({
-  tagSlug,
-  gamesTagId,
-}: Pick<PredictWorldCupConfig, 'tagSlug' | 'gamesTagId'>): string => {
-  const params = new URLSearchParams();
-  appendBaseWorldCupParams(params);
-  params.set('tag_slug', tagSlug);
-  params.set('tag_id', gamesTagId);
-  params.set('live', 'true');
-  params.set('order', 'startDate');
-  return buildQueryString(params);
-};
-
-export const buildPredictWorldCupStageEventsQuery = ({
-  eventIds,
-}: Pick<PredictWorldCupStageConfig, 'eventIds'>): string => {
-  const params = new URLSearchParams();
-  appendBaseWorldCupParams(params);
-  eventIds.forEach((eventId) => params.append('id', eventId));
-  return buildQueryString(params);
-};
-
-export const buildPredictWorldCupQuery = (
-  type: PredictWorldCupQueryType,
-  config: PredictWorldCupConfig,
-): string => {
-  switch (type) {
-    case PREDICT_WORLD_CUP_QUERY_TYPES.ALL:
-      return buildPredictWorldCupAllQuery(config);
-    case PREDICT_WORLD_CUP_QUERY_TYPES.PROPS:
-      return buildPredictWorldCupPropsQuery(config);
-    case PREDICT_WORLD_CUP_QUERY_TYPES.LIVE:
-      return buildPredictWorldCupLiveQuery(config);
-    default:
-      return buildPredictWorldCupAllQuery(config);
-  }
-};
-
-export const getPredictWorldCupStageDerivedLabelKey = (
-  stageKey: string,
-): string => `predict.world_cup.stages.${stageKey}`;
-
-export const resolvePredictWorldCupStageLabel = ({
-  key,
-  labelKey,
-  label,
-}: Pick<PredictWorldCupStageConfig, 'key' | 'labelKey' | 'label'>): string => {
-  if (labelKey) {
-    const translatedLabel = translateIfPresent(labelKey);
-    if (translatedLabel) {
-      return translatedLabel;
-    }
-  }
-
-  if (label) {
-    return label;
-  }
-
-  const derivedLabelKey = getPredictWorldCupStageDerivedLabelKey(key);
-  return translateIfPresent(derivedLabelKey) ?? key;
-};
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.test.tsx b/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.test.tsx
index f0ce166e8639..dff112de86c5 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.test.tsx
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.test.tsx
@@ -152,6 +152,9 @@ jest.mock('./hooks/usePredictBuyInputState', () => ({
     mockUsePredictBuyInputState(...args),
 }));
 
+let mockBlockingPayAlertMessage: string | null = null;
+let mockHasBlockingPayAlerts = false;
+
 jest.mock('./hooks/usePredictBuyInfo', () => ({
   usePredictBuyInfo: () => ({
     toWin: 24,
@@ -162,15 +165,14 @@ jest.mock('./hooks/usePredictBuyInfo', () => ({
     depositFee: 3,
     rewardsFeeAmount: 5,
     totalPayForPredictBalance: 20,
-    hasBlockingPayAlerts: false,
-    blockingPayAlertMessage: null,
+    hasBlockingPayAlerts: mockHasBlockingPayAlerts,
+    blockingPayAlertMessage: mockBlockingPayAlertMessage,
   }),
 }));
 
 let mockIsCurrentTokenInsufficient = false;
 let mockHasAlternativeBalance = false;
 let mockIsPaymentSelectorNavigationLocked = false;
-let mockIsPayRouteUnavailable = false;
 const mockLockPaymentSelectorNavigation = jest.fn();
 
 jest.mock('./hooks/usePredictBuyConditions', () => ({
@@ -182,7 +184,6 @@ jest.mock('./hooks/usePredictBuyConditions', () => ({
     isBelowMinimum: false,
     isInsufficientBalance: false,
     isCurrentTokenInsufficient: mockIsCurrentTokenInsufficient,
-    isPayRouteUnavailable: mockIsPayRouteUnavailable,
     hasAlternativeBalance: mockHasAlternativeBalance,
     maxBetAmount: 50,
     isPaymentSelectorNavigationLocked: mockIsPaymentSelectorNavigationLocked,
@@ -446,7 +447,8 @@ describe('PredictBuyWithAnyToken', () => {
     mockIsCurrentTokenInsufficient = false;
     mockHasAlternativeBalance = false;
     mockIsPaymentSelectorNavigationLocked = false;
-    mockIsPayRouteUnavailable = false;
+    mockBlockingPayAlertMessage = null;
+    mockHasBlockingPayAlerts = false;
     mockUseSelector.mockImplementation((selector) => {
       if (typeof selector === 'function') {
         return selector({
@@ -994,9 +996,12 @@ describe('PredictBuyWithAnyToken', () => {
     });
   });
 
-  describe('no pay route available', () => {
-    it('surfaces the no-pay-token-quotes message via usePredictBuyError when no route is available', () => {
-      mockIsPayRouteUnavailable = true;
+  describe('blocking payment alerts', () => {
+    it('forwards the shared no-pay-token-quotes message to usePredictBuyError', () => {
+      mockHasBlockingPayAlerts = true;
+      mockBlockingPayAlertMessage = strings(
+        'alert_system.no_pay_token_quotes.message',
+      );
 
       renderWithProvider(<PredictBuyWithAnyToken />);
 
@@ -1008,15 +1013,5 @@ describe('PredictBuyWithAnyToken', () => {
         }),
       );
     });
-
-    it('passes a null blocking message to usePredictBuyError when a pay route is available', () => {
-      mockIsPayRouteUnavailable = false;
-
-      renderWithProvider(<PredictBuyWithAnyToken />);
-
-      expect(mockUsePredictBuyError).toHaveBeenLastCalledWith(
-        expect.objectContaining({ blockingPayAlertMessage: null }),
-      );
-    });
   });
 });
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.tsx b/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.tsx
index c7daa4278224..0767156687d5 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.tsx
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.tsx
@@ -19,7 +19,6 @@ import { SafeAreaView } from 'react-native-safe-area-context';
 import { useSelector } from 'react-redux';
 import { BottomSheetRef } from '../../../../../component-library/components/BottomSheets/BottomSheet';
 import { TraceName } from '../../../../../util/trace';
-import { strings } from '../../../../../../locales/i18n';
 import { PredictBuyPreviewSelectorsIDs } from '../../Predict.testIds';
 import PredictBuyActionButton from './components/PredictBuyActionButton';
 import PredictBuyAmountSection from './components/PredictBuyAmountSection';
@@ -234,7 +233,6 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
     isBelowMinimum,
     isInsufficientBalance,
     isCurrentTokenInsufficient,
-    isPayRouteUnavailable,
     hasAlternativeBalance,
     isPaySystemSettling,
     isPaymentSelectorNavigationLocked,
@@ -249,14 +247,6 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
     hasBlockingPayAlerts,
   });
 
-  // Reuse the existing no-pay-token-quotes copy when the betslip blocks a bet
-  // because no usable pay route to pUSD is available.
-  const effectiveBlockingPayAlertMessage =
-    blockingPayAlertMessage ??
-    (isPayRouteUnavailable
-      ? strings('alert_system.no_pay_token_quotes.message')
-      : null);
-
   const {
     errorMessage,
     errorMessageSource,
@@ -273,7 +263,7 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
     isConfirming,
     isPayFeesLoading,
     isPaySystemSettling,
-    blockingPayAlertMessage: effectiveBlockingPayAlertMessage,
+    blockingPayAlertMessage,
     outcomeTokenPrice: getDisplayBuyPrice(outcomeToken),
     isSheetMode,
   });
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyActions.test.ts b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyActions.test.ts
index 1d0c9c5d9d4b..9c02eeb1785b 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyActions.test.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyActions.test.ts
@@ -200,6 +200,13 @@ describe('usePredictBuyActions', () => {
       expect(mockInitPayWithAnyToken).toHaveBeenCalledTimes(1);
     });
 
+    it('does not reset payment token during init', () => {
+      renderHook(() => usePredictBuyActions(createDefaultParams()));
+
+      expect(mockResetSelectedPaymentToken).not.toHaveBeenCalled();
+      expect(mockInitPayWithAnyToken).toHaveBeenCalledTimes(1);
+    });
+
     it('does not call initPayWithAnyToken when pay with any token is disabled', () => {
       mockPayWithAnyTokenEnabled = false;
 
@@ -220,6 +227,18 @@ describe('usePredictBuyActions', () => {
       expect(mockOnConfirmActionsReject).toHaveBeenCalledTimes(1);
     });
 
+    it('resets payment token on beforeRemove cleanup', () => {
+      renderHook(() => usePredictBuyActions(createDefaultParams()));
+
+      act(() => {
+        mockBeforeRemoveCallbacks[0]();
+      });
+
+      expect(mockResetSelectedPaymentToken).toHaveBeenCalledTimes(1);
+      expect(mockOnConfirmActionsReject).toHaveBeenCalledWith(undefined, true);
+      expect(mockClearActiveOrderTransactionId).toHaveBeenCalled();
+    });
+
     it('only calls initPayWithAnyToken once even if transitionEnd fires again', () => {
       const transitionEndCallbacks: ((e: {
         data: { closing: boolean };
@@ -753,9 +772,11 @@ describe('usePredictBuyActions', () => {
         'beforeRemove',
         expect.any(Function),
       );
+      expect(mockResetSelectedPaymentToken).not.toHaveBeenCalled();
 
       unmount();
 
+      expect(mockResetSelectedPaymentToken).toHaveBeenCalledTimes(1);
       expect(mockOnConfirmActionsReject).toHaveBeenCalledWith(undefined, true);
       expect(mockClearActiveOrderTransactionId).toHaveBeenCalled();
     });
@@ -783,9 +804,11 @@ describe('usePredictBuyActions', () => {
 
       mockOnConfirmActionsReject.mockClear();
       mockClearActiveOrderTransactionId.mockClear();
+      mockResetSelectedPaymentToken.mockClear();
 
       unmount();
 
+      expect(mockResetSelectedPaymentToken).toHaveBeenCalledTimes(1);
       expect(mockOnConfirmActionsReject).toHaveBeenCalledWith(undefined, true);
       expect(mockClearActiveOrderTransactionId).toHaveBeenCalled();
     });
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyActions.ts b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyActions.ts
index 580eb6d51539..1245b1ae4b7c 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyActions.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyActions.ts
@@ -121,7 +121,8 @@ export const usePredictBuyActions = ({
     const doInit = async () => {
       batchIdRef.current = undefined;
       rejectPendingTransactions();
-      resetSelectedPaymentToken();
+      // Reset payment token on dismiss instead, so default auto-select is not
+      // overwritten when leftover PREVIEW lets that effect run before doInit.
       const result = await initPayWithAnyToken();
       if (result?.success && result.response?.batchId) {
         batchIdRef.current = result.response.batchId;
@@ -149,7 +150,6 @@ export const usePredictBuyActions = ({
     initPayWithAnyToken,
     payWithAnyTokenEnabled,
     PredictController,
-    resetSelectedPaymentToken,
     isSheetMode,
   ]);
 
@@ -160,6 +160,7 @@ export const usePredictBuyActions = ({
 
     if (isSheetMode) {
       return () => {
+        resetSelectedPaymentToken();
         onRejectRef.current(undefined, true);
         clearActiveOrderTransactionIdRef.current();
       };
@@ -184,6 +185,7 @@ export const usePredictBuyActions = ({
           activeAbTests: transactionActiveAbTests,
         });
       }
+      resetSelectedPaymentToken();
       onRejectRef.current(undefined, true);
       clearActiveOrderTransactionIdRef.current();
     });
@@ -193,6 +195,7 @@ export const usePredictBuyActions = ({
     isSheetMode,
     analyticsProperties,
     transactionActiveAbTests,
+    resetSelectedPaymentToken,
   ]);
 
   const handlePlaceOrder = useCallback(
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.test.ts b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.test.ts
index 4f3ee3108f11..18fb20635064 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.test.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.test.ts
@@ -629,122 +629,6 @@ describe('usePredictBuyConditions', () => {
     });
   });
 
-  describe('isPayRouteUnavailable', () => {
-    it('is true once an ERC20 pay token settles with no quotes, blocking the bet', () => {
-      mockIsPredictBalanceSelected = false;
-      mockSelectedPaymentToken = { address: '0xDAI', chainId: '1' };
-      mockIsPayQuoteLoading = true;
-      mockIsPayTotalsLoading = true;
-      mockQuotes = [];
-
-      const { result, rerender } = renderHook(() =>
-        usePredictBuyConditions({ ...defaultParams, currentValue: 10 }),
-      );
-
-      // While the quote cycle is still in flight the guard must not fire yet.
-      expect(result.current.isPayRouteUnavailable).toBe(false);
-
-      act(() => {
-        mockIsPayQuoteLoading = false;
-        mockIsPayTotalsLoading = false;
-        mockQuotes = [];
-      });
-      rerender({});
-
-      expect(result.current.isPaySystemSettling).toBe(false);
-      expect(result.current.isPayRouteUnavailable).toBe(true);
-      expect(result.current.canPlaceBet).toBe(false);
-      expect(result.current.isCurrentTokenInsufficient).toBe(true);
-    });
-
-    it('is false once quotes arrive after settling (a usable route exists)', () => {
-      mockIsPredictBalanceSelected = false;
-      mockSelectedPaymentToken = { address: '0xDAI', chainId: '1' };
-      mockIsPayQuoteLoading = true;
-      mockIsPayTotalsLoading = true;
-      mockQuotes = [];
-
-      const { result, rerender } = renderHook(() =>
-        usePredictBuyConditions({ ...defaultParams, currentValue: 10 }),
-      );
-
-      act(() => {
-        mockIsPayQuoteLoading = false;
-        mockIsPayTotalsLoading = false;
-        mockQuotes = [{ id: 'q1' }];
-      });
-      rerender({});
-
-      expect(result.current.isPaySystemSettling).toBe(false);
-      expect(result.current.isPayRouteUnavailable).toBe(false);
-      expect(result.current.canPlaceBet).toBe(true);
-    });
-
-    it('is false when the Predict balance is selected', () => {
-      mockIsPredictBalanceSelected = true;
-      mockQuotes = [];
-
-      const { result } = renderHook(() =>
-        usePredictBuyConditions({ ...defaultParams, currentValue: 10 }),
-      );
-
-      expect(result.current.isPayRouteUnavailable).toBe(false);
-    });
-
-    it('is false while the pay system is still settling', () => {
-      mockIsPredictBalanceSelected = false;
-      mockSelectedPaymentToken = { address: '0xDAI', chainId: '1' };
-      mockQuotes = [];
-
-      const { result } = renderHook(() =>
-        usePredictBuyConditions({ ...defaultParams, currentValue: 10 }),
-      );
-
-      expect(result.current.isPaySystemSettling).toBe(true);
-      expect(result.current.isPayRouteUnavailable).toBe(false);
-    });
-
-    it('is false while pay fees are loading', () => {
-      mockIsPredictBalanceSelected = false;
-      mockIsPayTotalsLoading = true;
-      mockQuotes = [];
-
-      const { result } = renderHook(() =>
-        usePredictBuyConditions({ ...defaultParams, currentValue: 10 }),
-      );
-
-      expect(result.current.isPayFeesLoading).toBe(true);
-      expect(result.current.isPayRouteUnavailable).toBe(false);
-    });
-
-    it('is false when the amount is zero', () => {
-      mockIsPredictBalanceSelected = false;
-      mockQuotes = [];
-
-      const { result } = renderHook(() =>
-        usePredictBuyConditions({
-          ...defaultParams,
-          currentValue: 0,
-          totalPayForPredictBalance: 0,
-        }),
-      );
-
-      expect(result.current.isPayRouteUnavailable).toBe(false);
-    });
-
-    it('is false when the amount is below the minimum bet', () => {
-      mockIsPredictBalanceSelected = false;
-      mockQuotes = [];
-
-      const { result } = renderHook(() =>
-        usePredictBuyConditions({ ...defaultParams, currentValue: 0.5 }),
-      );
-
-      expect(result.current.isBelowMinimum).toBe(true);
-      expect(result.current.isPayRouteUnavailable).toBe(false);
-    });
-  });
-
   describe('hasAlternativeBalance', () => {
     it('is false when currentValue is 0', () => {
       mockAvailableTokens = [
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.ts b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.ts
index d907ad75e50b..20c04b0fa095 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.ts
@@ -266,29 +266,6 @@ export const usePredictBuyConditions = ({
     }
   }, [isPredictBalanceSelected]);
 
-  // Fail-closed: a Pay-with-any-token bet (ERC20 funding, not the existing
-  // Predict balance) needs a usable route to pUSD. Once the pay system has
-  // settled and stopped loading, an empty quote set means no fundable route, so
-  // block the bet instead of letting an underfunded deposit reach the chain and
-  // revert.
-  const isPayRouteUnavailable = useMemo(
-    () =>
-      !isPredictBalanceSelected &&
-      currentValue > 0 &&
-      !isBelowMinimum &&
-      !isPaySystemSettling &&
-      !isPayFeesLoading &&
-      !quotes?.length,
-    [
-      isPredictBalanceSelected,
-      currentValue,
-      isBelowMinimum,
-      isPaySystemSettling,
-      isPayFeesLoading,
-      quotes,
-    ],
-  );
-
   // Only surface token-insufficiency once the pay system has fully settled,
   // the amount is above the minimum bet (a below-minimum amount should surface
   // the minimum-bet error, not a payment CTA), and the amount is non-zero.
@@ -298,7 +275,7 @@ export const usePredictBuyConditions = ({
       !isBelowMinimum &&
       !isPaySystemSettling &&
       !isPayFeesLoading &&
-      (isInsufficientBalance || hasBlockingPayAlerts || isPayRouteUnavailable),
+      (isInsufficientBalance || hasBlockingPayAlerts),
     [
       currentValue,
       isBelowMinimum,
@@ -306,7 +283,6 @@ export const usePredictBuyConditions = ({
       isPayFeesLoading,
       isInsufficientBalance,
       hasBlockingPayAlerts,
-      isPayRouteUnavailable,
     ],
   );
 
@@ -343,8 +319,7 @@ export const usePredictBuyConditions = ({
       !isBalanceLoading &&
       !isPayFeesLoading &&
       !hasBlockingPayAlerts &&
-      !isPaymentSelectorNavigationLocked &&
-      !isPayRouteUnavailable,
+      !isPaymentSelectorNavigationLocked,
     [
       isPaySystemSettling,
       isConfirming,
@@ -356,7 +331,6 @@ export const usePredictBuyConditions = ({
       isPayFeesLoading,
       hasBlockingPayAlerts,
       isPaymentSelectorNavigationLocked,
-      isPayRouteUnavailable,
     ],
   );
 
@@ -369,7 +343,6 @@ export const usePredictBuyConditions = ({
     isBelowMinimum,
     isInsufficientBalance,
     isCurrentTokenInsufficient,
-    isPayRouteUnavailable,
     hasAlternativeBalance,
     isRateLimited,
     canPlaceBet,
diff --git a/app/components/UI/Predict/views/PredictFeed/PredictFeed.test.tsx b/app/components/UI/Predict/views/PredictFeed/PredictFeed.test.tsx
index e42dfe525230..4252c700cd2f 100644
--- a/app/components/UI/Predict/views/PredictFeed/PredictFeed.test.tsx
+++ b/app/components/UI/Predict/views/PredictFeed/PredictFeed.test.tsx
@@ -1,20 +1,16 @@
+/**
+ * Unit tests for PredictFeed.
+ */
 import { fireEvent, render } from '@testing-library/react-native';
 import React from 'react';
 import {
   PredictMarketListSelectorsIDs,
   PredictSearchSelectorsIDs,
-  PredictFeedSelectorsIDs,
   PredictFeedMockSelectorsIDs,
-  getPredictMarketListSelector,
-  getPredictSearchSelector,
   getPredictFeedSelector,
   getPredictFeedMockSelector,
 } from '../../Predict.testIds';
-import {
-  DEFAULT_PREDICT_WORLD_CUP_FLAG,
-  PREDICT_WIMBLEDON_DEFAULT_QUERY_PARAMS,
-} from '../../constants/flags';
-import { buildPredictWorldCupAllQuery } from '../../utils/worldCup';
+import { PREDICT_WIMBLEDON_DEFAULT_QUERY_PARAMS } from '../../constants/flags';
 import { PredictFeedBannerPosition } from '../../constants/feedBanner';
 
 jest.mock('react-native-reanimated', () => {
@@ -112,8 +108,6 @@ const mockHotTabFlag: { enabled: boolean; queryParams?: string } = {
   enabled: false,
   queryParams: undefined,
 };
-let mockIsWorldCupMainFeedTabEnabled = false;
-let mockWorldCupConfig = DEFAULT_PREDICT_WORLD_CUP_FLAG;
 let mockWimbledonTabFlag = {
   enabled: false,
   queryParams: PREDICT_WIMBLEDON_DEFAULT_QUERY_PARAMS,
@@ -138,9 +132,6 @@ jest.mock('../../selectors/featureFlags', () => ({
   selectPredictPortfolioEnabledFlag: 'selectPredictPortfolioEnabledFlag',
   selectPredictUpDownEnabledFlag: 'selectPredictUpDownEnabledFlag',
   selectPredictWimbledonTabFlag: 'selectPredictWimbledonTabFlag',
-  selectPredictWorldCupConfig: 'selectPredictWorldCupConfig',
-  selectPredictWorldCupMainFeedTabEnabledFlag:
-    'selectPredictWorldCupMainFeedTabEnabledFlag',
 }));
 
 jest.mock('../../../../hooks/useDebouncedValue', () => ({
@@ -346,8 +337,6 @@ describe('PredictFeed', () => {
     mockGetInstance.mockReturnValue(mockSessionManager);
     mockHotTabFlag.enabled = false;
     mockHotTabFlag.queryParams = undefined;
-    mockIsWorldCupMainFeedTabEnabled = false;
-    mockWorldCupConfig = DEFAULT_PREDICT_WORLD_CUP_FLAG;
     mockWimbledonTabFlag = {
       enabled: false,
       queryParams: PREDICT_WIMBLEDON_DEFAULT_QUERY_PARAMS,
@@ -368,10 +357,6 @@ describe('PredictFeed', () => {
           return mockIsUpDownEnabled;
         case 'selectPredictWimbledonTabFlag':
           return mockWimbledonTabFlag;
-        case 'selectPredictWorldCupConfig':
-          return mockWorldCupConfig;
-        case 'selectPredictWorldCupMainFeedTabEnabledFlag':
-          return mockIsWorldCupMainFeedTabEnabled;
         default:
           return undefined;
       }
@@ -416,34 +401,13 @@ describe('PredictFeed', () => {
   });
 
   describe('initial render', () => {
-    it('renders container with top nav, balance, tabs, and market list', () => {
-      const { getByTestId } = render(<PredictFeed />);
-
-      expect(
-        getByTestId(PredictMarketListSelectorsIDs.CONTAINER),
-      ).toBeOnTheScreen();
-      expect(
-        getByTestId(PredictMarketListSelectorsIDs.BACK_BUTTON),
-      ).toBeOnTheScreen();
-      expect(
-        getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON),
-      ).toBeOnTheScreen();
-      expect(
-        getByTestId(PredictFeedMockSelectorsIDs.BALANCE_MOCK),
-      ).toBeOnTheScreen();
-      expect(getByTestId(PredictFeedSelectorsIDs.TABS)).toBeOnTheScreen();
-      expect(
-        getByTestId(PredictFeedMockSelectorsIDs.PAGER_VIEW),
-      ).toBeOnTheScreen();
-    });
-
     it('hides search overlay on initial render', () => {
       const { queryByPlaceholderText } = render(<PredictFeed />);
 
       expect(queryByPlaceholderText('Search prediction markets')).toBeNull();
     });
 
-    it('mounts remote banner slots around the existing feed banners', () => {
+    it('mounts remote banner slots in the feed header', () => {
       render(<PredictFeed />);
 
       const positions = mockPredictFeedBanner.mock.calls.map(
@@ -454,35 +418,11 @@ describe('PredictFeed', () => {
         expect.arrayContaining([
           PredictFeedBannerPosition.AfterBalance,
           PredictFeedBannerPosition.AfterFeaturedCarousel,
-          PredictFeedBannerPosition.AfterWorldCupBanner,
         ]),
       );
     });
   });
 
-  describe('search functionality', () => {
-    it('opens search overlay when search button pressed', () => {
-      const { getByTestId, getByPlaceholderText } = render(<PredictFeed />);
-
-      fireEvent.press(getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON));
-
-      expect(
-        getByPlaceholderText('Search prediction markets'),
-      ).toBeOnTheScreen();
-    });
-
-    it('closes search overlay when cancel button pressed', () => {
-      const { getByTestId, getByText, queryByPlaceholderText } = render(
-        <PredictFeed />,
-      );
-
-      fireEvent.press(getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON));
-      fireEvent.press(getByText('Cancel'));
-
-      expect(queryByPlaceholderText('Search prediction markets')).toBeNull();
-    });
-  });
-
   describe('tab navigation', () => {
     it('renders all six category tabs', () => {
       const { getByTestId } = render(<PredictFeed />);
@@ -569,135 +509,6 @@ describe('PredictFeed', () => {
 
       expect(mockNavigation.goBack).toHaveBeenCalled();
     });
-
-    it('navigates to wallet home when back button pressed and navigation cannot go back', () => {
-      mockNavigation.canGoBack.mockReturnValue(false);
-      const { getByTestId } = render(<PredictFeed />);
-
-      fireEvent.press(getByTestId(PredictMarketListSelectorsIDs.BACK_BUTTON));
-
-      expect(mockNavigation.navigate).toHaveBeenCalled();
-    });
-  });
-
-  describe('loading states', () => {
-    it('renders skeleton loaders when fetching initial data', () => {
-      mockUsePredictMarketData.mockReturnValue({
-        marketData: [],
-        isFetching: true,
-        isFetchingMore: false,
-        error: null,
-        hasMore: false,
-        refetch: jest.fn(),
-        fetchMore: jest.fn(),
-      });
-
-      const { getByTestId } = render(<PredictFeed />);
-
-      expect(
-        getByTestId(getPredictFeedSelector.skeletonLoading('trending', 1)),
-      ).toBeOnTheScreen();
-      expect(
-        getByTestId(getPredictFeedSelector.skeletonLoading('trending', 2)),
-      ).toBeOnTheScreen();
-    });
-  });
-
-  describe('error states', () => {
-    it('renders offline component when fetch error occurs', () => {
-      mockUsePredictMarketData.mockReturnValue({
-        marketData: [],
-        isFetching: false,
-        isFetchingMore: false,
-        error: new Error('Network error'),
-        hasMore: false,
-        refetch: jest.fn(),
-        fetchMore: jest.fn(),
-      });
-
-      const { getByTestId } = render(<PredictFeed />);
-
-      expect(
-        getByTestId(PredictFeedMockSelectorsIDs.OFFLINE_MOCK),
-      ).toBeOnTheScreen();
-    });
-  });
-
-  describe('empty states', () => {
-    it('renders empty state message when no markets available', () => {
-      mockUsePredictMarketData.mockReturnValue({
-        marketData: [],
-        isFetching: false,
-        isFetchingMore: false,
-        error: null,
-        hasMore: false,
-        refetch: jest.fn(),
-        fetchMore: jest.fn(),
-      });
-
-      const { getByTestId } = render(<PredictFeed />);
-
-      expect(
-        getByTestId(getPredictFeedSelector.emptyState('trending')),
-      ).toBeOnTheScreen();
-    });
-  });
-
-  describe('search overlay interactions', () => {
-    it('displays search results when query is entered', () => {
-      const { getByTestId, getByPlaceholderText } = render(<PredictFeed />);
-
-      fireEvent.press(getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON));
-      const searchInput = getByPlaceholderText('Search prediction markets');
-      fireEvent.changeText(searchInput, 'bitcoin');
-
-      expect(
-        getByTestId(getPredictSearchSelector.resultCard(0)),
-      ).toBeOnTheScreen();
-      expect(
-        getByTestId(getPredictSearchSelector.resultCard(1)),
-      ).toBeOnTheScreen();
-    });
-
-    it('displays skeleton loaders while search is fetching', () => {
-      mockUsePredictSearchMarketData.mockReturnValue({
-        marketData: [],
-        isFetching: true,
-        error: null,
-        refetch: jest.fn(),
-      });
-
-      const { getByTestId, getByPlaceholderText } = render(<PredictFeed />);
-
-      fireEvent.press(getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON));
-      const searchInput = getByPlaceholderText('Search prediction markets');
-      fireEvent.changeText(searchInput, 'bitcoin');
-
-      expect(
-        getByTestId(getPredictFeedSelector.searchSkeleton(1)),
-      ).toBeOnTheScreen();
-    });
-
-    it('clears search query when clear button is pressed', () => {
-      const { getByTestId, getByPlaceholderText, queryByTestId } = render(
-        <PredictFeed />,
-      );
-
-      fireEvent.press(getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON));
-      const searchInput = getByPlaceholderText('Search prediction markets');
-      fireEvent.changeText(searchInput, 'test query');
-      fireEvent.press(getByTestId(PredictSearchSelectorsIDs.CLEAR_BUTTON));
-
-      // After clearing search, the clear button should no longer be visible
-      // (only shows when searchQuery.length > 0)
-      expect(
-        queryByTestId(PredictSearchSelectorsIDs.CLEAR_BUTTON),
-      ).not.toBeOnTheScreen();
-      // Trending results visible when no search query is empty
-      expect(
-        getByTestId(getPredictSearchSelector.resultCard(0)),
-      ).toBeOnTheScreen();
-    });
   });
 
   describe('pager view interactions', () => {
@@ -756,96 +567,6 @@ describe('PredictFeed', () => {
 
       expect(mockPredictMarket).toHaveBeenCalledTimes(initialRenderCount);
     });
-
-    it('renders market cards with correct testIDs using 1-based indexing', () => {
-      const { getByTestId } = render(<PredictFeed />);
-
-      expect(
-        getByTestId(
-          getPredictMarketListSelector.marketCardByCategory('trending', 1),
-        ),
-      ).toBeOnTheScreen();
-      expect(
-        getByTestId(
-          getPredictMarketListSelector.marketCardByCategory('trending', 2),
-        ),
-      ).toBeOnTheScreen();
-    });
-  });
-
-  describe('search empty states', () => {
-    it('displays no results message when search returns empty', () => {
-      mockUsePredictSearchMarketData.mockReturnValue({
-        marketData: [],
-        isFetching: false,
-        error: null,
-        refetch: jest.fn(),
-      });
-
-      const { getByTestId, getByPlaceholderText, getByText } = render(
-        <PredictFeed />,
-      );
-
-      fireEvent.press(getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON));
-      const searchInput = getByPlaceholderText('Search prediction markets');
-      fireEvent.changeText(searchInput, 'nonexistent');
-
-      expect(getByText(/No results found/i)).toBeOnTheScreen();
-    });
-
-    it('does not display no results message before the user enters a query', () => {
-      mockUsePredictSearchMarketData.mockReturnValue({
-        marketData: [],
-        isFetching: false,
-        error: null,
-        refetch: jest.fn(),
-      });
-
-      const { getByTestId, queryByText } = render(<PredictFeed />);
-
-      fireEvent.press(getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON));
-
-      expect(queryByText(/No results found/i)).toBeNull();
-    });
-
-    it('does not display search error state before the user enters a query', () => {
-      mockUsePredictSearchMarketData.mockReturnValue({
-        marketData: [],
-        isFetching: false,
-        error: 'Search error',
-        refetch: jest.fn(),
-      });
-
-      const { getByTestId, queryByTestId } = render(<PredictFeed />);
-
-      fireEvent.press(getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON));
-
-      expect(
-        queryByTestId(PredictFeedMockSelectorsIDs.OFFLINE_MOCK),
-      ).toBeNull();
-    });
-
-    it('displays error state in search when fetch fails', () => {
-      mockUsePredictSearchMarketData.mockReturnValue({
-        marketData: [],
-        isFetching: false,
-        error: 'Search error',
-        refetch: jest.fn(),
-      });
-
-      const { getByTestId, getByPlaceholderText, getAllByTestId } = render(
-        <PredictFeed />,
-      );
-
-      fireEvent.press(getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON));
-      const searchInput = getByPlaceholderText('Search prediction markets');
-      fireEvent.changeText(searchInput, 'test');
-
-      const offlineElements = getAllByTestId(
-        PredictFeedMockSelectorsIDs.OFFLINE_MOCK,
-      );
-      expect(offlineElements.length).toBeGreaterThan(0);
-    });
   });
 
   describe('pagination', () => {
@@ -1003,31 +724,6 @@ describe('PredictFeed', () => {
       ).toBeOnTheScreen();
     });
 
-    it('displays search results after debounce completes', () => {
-      mockUseDebouncedValue.mockReturnValue('bitcoin');
-      mockUsePredictSearchMarketData.mockReturnValue({
-        marketData: [
-          { id: '1', title: 'Bitcoin Market 1' },
-          { id: '2', title: 'Bitcoin Market 2' },
-        ],
-        isFetching: false,
-        error: null,
-        refetch: jest.fn(),
-      });
-      const { getByTestId, getByPlaceholderText } = render(<PredictFeed />);
-
-      fireEvent.press(getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON));
-      const searchInput = getByPlaceholderText('Search prediction markets');
-      fireEvent.changeText(searchInput, 'bitcoin');
-
-      expect(
-        getByTestId(getPredictSearchSelector.resultCard(0)),
-      ).toBeOnTheScreen();
-      expect(
-        getByTestId(getPredictSearchSelector.resultCard(1)),
-      ).toBeOnTheScreen();
-    });
-
     it('invokes useDebouncedValue with 200ms delay', () => {
       const { getByTestId, getByPlaceholderText } = render(<PredictFeed />);
 
@@ -1039,7 +735,7 @@ describe('PredictFeed', () => {
     });
   });
 
-  describe('hot tab feature flag', () => {
+  describe('Hot tab feature flag', () => {
     it('renders Hot tab first when flag is enabled', () => {
       mockHotTabFlag.enabled = true;
       mockHotTabFlag.queryParams = 'tag_id=149&order=volume24hr';
@@ -1189,101 +885,6 @@ describe('PredictFeed', () => {
     });
   });
 
-  describe('World Cup tab feature flag', () => {
-    it('does not render World Cup tab when flag is disabled', () => {
-      const { queryByTestId } = render(<PredictFeed />);
-
-      expect(
-        queryByTestId(getPredictFeedMockSelector.tabKey('world-cup')),
-      ).toBeNull();
-    });
-
-    it('renders World Cup tab and page first when flag is enabled', () => {
-      mockIsWorldCupMainFeedTabEnabled = true;
-      mockWorldCupConfig = {
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        showMainFeedTab: true,
-      };
-
-      const { getByTestId } = render(<PredictFeed />);
-
-      expect(
-        getByTestId(getPredictFeedMockSelector.tabKey('world-cup')),
-      ).toBeOnTheScreen();
-      expect(
-        getByTestId(getPredictFeedMockSelector.pagerPage(0)),
-      ).toBeOnTheScreen();
-      expect(mockSessionManager.startSession).toHaveBeenCalledWith(
-        'homepage_new_prediction',
-        'world-cup',
-      );
-    });
-
-    it('places World Cup before Hot when both flags are enabled', () => {
-      mockIsWorldCupMainFeedTabEnabled = true;
-      mockWorldCupConfig = {
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        showMainFeedTab: true,
-      };
-      mockHotTabFlag.enabled = true;
-      mockHotTabFlag.queryParams = 'tag_id=149';
-
-      const mockOnTabSwitch = jest.fn();
-      mockUseFeedScrollManager.mockReturnValue({
-        headerTranslateY: { value: 0 },
-        headerHidden: false,
-        headerHeight: 100,
-        tabBarHeight: 48,
-        layoutReady: true,
-        onTabSwitch: mockOnTabSwitch,
-        scrollHandler: jest.fn(),
-        onHeaderLayout: jest.fn(),
-        onTabBarLayout: jest.fn(),
-      });
-
-      const { getByTestId } = render(<PredictFeed />);
-
-      fireEvent(
-        getByTestId(getPredictFeedMockSelector.pagerPage(0)),
-        'onTouchEnd',
-      );
-      fireEvent(
-        getByTestId(getPredictFeedMockSelector.pagerPage(1)),
-        'onTouchEnd',
-      );
-
-      expect(mockSessionManager.trackTabChange).toHaveBeenCalledWith(
-        'world-cup',
-      );
-      expect(mockSessionManager.trackTabChange).toHaveBeenCalledWith('hot');
-    });
-
-    it('passes World Cup custom query params to market data fetching', () => {
-      mockIsWorldCupMainFeedTabEnabled = true;
-      mockWorldCupConfig = {
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        showMainFeedTab: true,
-        tagSlug: 'custom-world-cup',
-      };
-
-      render(<PredictFeed />);
-
-      const worldCupTabCall = mockUsePredictMarketData.mock.calls.find(
-        (call: [{ category?: string }]) => call[0].category === 'world-cup',
-      );
-
-      expect(worldCupTabCall?.[0]).toEqual(
-        expect.objectContaining({
-          category: 'world-cup',
-          customQueryParams: buildPredictWorldCupAllQuery(mockWorldCupConfig),
-        }),
-      );
-    });
-  });
-
   describe('query deeplink parameter', () => {
     it.each([['bitcoin'], ['ethereum'], ['solana']])(
       'opens search overlay when query param "%s" is provided in route params',
@@ -1319,41 +920,9 @@ describe('PredictFeed', () => {
         expect(searchInput.props.value).toBe(query);
       },
     );
-
-    it('closes search overlay when cancel is pressed', () => {
-      mockUseRoute.mockReturnValue({
-        params: {
-          entryPoint: 'deeplink',
-          query: 'bitcoin',
-        },
-      });
-
-      const { getByText, queryByPlaceholderText, getByPlaceholderText } =
-        render(<PredictFeed />);
-
-      expect(
-        getByPlaceholderText('Search prediction markets'),
-      ).toBeOnTheScreen();
-
-      fireEvent.press(getByText('Cancel'));
-      expect(queryByPlaceholderText('Search prediction markets')).toBeNull();
-    });
-  });
-
-  describe('header', () => {
-    it('renders header navigation', () => {
-      const { getByTestId } = render(<PredictFeed />);
-
-      expect(
-        getByTestId(PredictMarketListSelectorsIDs.BACK_BUTTON),
-      ).toBeOnTheScreen();
-      expect(
-        getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON),
-      ).toBeOnTheScreen();
-    });
   });
 
-  describe('lazy tab data fetching (enabled gate)', () => {
+  describe('lazy tab data fetching', () => {
     // PagerView mounts every PredictTabContent at once, so usePredictMarketData
     // is called for every tab on every render. Only the active tab (and tabs the
     // user has already visited) should pass `enabled: true` so that just the
diff --git a/app/components/UI/Predict/views/PredictFeed/PredictFeed.tsx b/app/components/UI/Predict/views/PredictFeed/PredictFeed.tsx
index 87b3576825bc..36063fa96b1c 100644
--- a/app/components/UI/Predict/views/PredictFeed/PredictFeed.tsx
+++ b/app/components/UI/Predict/views/PredictFeed/PredictFeed.tsx
@@ -68,7 +68,6 @@ import PredictWithdrawUnavailableSheet, {
 } from '../../components/PredictWithdrawUnavailableSheet';
 import PredictOffline from '../../components/PredictOffline';
 import FeaturedCarousel from '../../components/FeaturedCarousel';
-import PredictWorldCupMainFeedBanner from '../../components/PredictWorldCupMainFeedBanner';
 import PredictFeedBanner from '../../components/PredictFeedBanner';
 import {
   selectPredictFeaturedCarouselEnabledFlag,
@@ -216,11 +215,6 @@ const AnimatedHeader: React.FC<AnimatedHeaderProps> = ({
           position={PredictFeedBannerPosition.AfterFeaturedCarousel}
           containerClassName="px-4 pb-3"
         />
-        <PredictWorldCupMainFeedBanner variant="compact" />
-        <PredictFeedBanner
-          position={PredictFeedBannerPosition.AfterWorldCupBanner}
-          containerClassName="px-4 pb-3"
-        />
       </Animated.View>
       <View
         ref={tabBarRef}
diff --git a/app/components/UI/Predict/views/PredictFeed/PredictFeed.view.test.tsx b/app/components/UI/Predict/views/PredictFeed/PredictFeed.view.test.tsx
index 26c6290af2eb..c855e4903833 100644
--- a/app/components/UI/Predict/views/PredictFeed/PredictFeed.view.test.tsx
+++ b/app/components/UI/Predict/views/PredictFeed/PredictFeed.view.test.tsx
@@ -588,6 +588,40 @@ describe('PredictFeed', () => {
   });
 
   describe('market feed data', () => {
+    it('shows skeleton loaders while trending markets are loading', async () => {
+      (
+        Engine.context.PredictController.getMarkets as jest.Mock
+      ).mockImplementation(() => new Promise(() => undefined));
+
+      const { findByTestId } = renderPredictFeedView();
+
+      await layoutPredictFeed({ findByTestId });
+
+      expect(
+        await findByTestId(
+          getPredictFeedSelector.skeletonLoading('trending', 1),
+        ),
+      ).toBeOnTheScreen();
+    });
+
+    it('shows the empty state when trending markets resolve to an empty list', async () => {
+      (
+        Engine.context.PredictController.getMarkets as jest.Mock
+      ).mockResolvedValue({ markets: [], nextCursor: null });
+
+      const { findByTestId } = renderPredictFeedView();
+
+      await layoutPredictFeed({ findByTestId });
+
+      expect(
+        await findByTestId(
+          getPredictFeedSelector.emptyState('trending'),
+          {},
+          { timeout: 10000 },
+        ),
+      ).toBeOnTheScreen();
+    });
+
     it('shows complete market data for every loaded trending market', async () => {
       const getMarketsSpy = jest.spyOn(
         Engine.context.PredictController,
@@ -725,6 +759,7 @@ describe('PredictFeed', () => {
         findByTestId,
       } = renderPredictFeedViewWithRoutes({
         overrides: predictUpDownFlagOverrides,
+        // Default probe is enough — we only assert navigation occurred.
         extraRoutes: [{ name: Routes.PREDICT.ROOT }],
       });
 
@@ -734,12 +769,13 @@ describe('PredictFeed', () => {
         'btc',
       );
 
-      const searchResult = await findByTestId(
-        getPredictSearchSelector.resultCard(0),
-        {},
-        { timeout: 3000 },
-      );
-      expect(searchResult).toBeOnTheScreen();
+      expect(
+        await findByTestId(
+          getPredictSearchSelector.resultCard(0),
+          {},
+          { timeout: 3000 },
+        ),
+      ).toBeOnTheScreen();
       expect(
         await findByTestId(
           PredictCryptoUpDownMarketCardSelectorsIDs.LIVE_BADGE,
@@ -747,7 +783,9 @@ describe('PredictFeed', () => {
       ).toBeOnTheScreen();
       expect(await findAllByText('BTC Up or Down - 5 Minutes')).toHaveLength(1);
 
-      fireEvent.press(searchResult);
+      // Re-query immediately before press: the live card clock re-renders every
+      // second, so a held element reference can go stale under CI load.
+      fireEvent.press(getByTestId(getPredictSearchSelector.resultCard(0)));
 
       expect(
         await findByTestId(`route-${Routes.PREDICT.ROOT}`),
diff --git a/app/components/UI/Predict/views/PredictFeedView/PredictFeedView.test.tsx b/app/components/UI/Predict/views/PredictFeedView/PredictFeedView.test.tsx
index 9a75b4ef667e..d37b17545d72 100644
--- a/app/components/UI/Predict/views/PredictFeedView/PredictFeedView.test.tsx
+++ b/app/components/UI/Predict/views/PredictFeedView/PredictFeedView.test.tsx
@@ -1,11 +1,12 @@
+/**
+ * Unit tests for PredictFeedView.
+ */
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react-native';
 import PredictFeedView from './PredictFeedView';
 import {
   PredictFeedViewSelectorsIDs,
   getPredictFeedViewSelector,
-  PredictMarketListSelectorsIDs,
-  PredictSearchSelectorsIDs,
 } from '../../Predict.testIds';
 import type { PredictFeedConfigResult } from '../../hooks/usePredictFeedConfig';
 import type { UsePredictMarketListResult } from '../../hooks/usePredictMarketList';
@@ -238,195 +239,113 @@ describe('PredictFeedView', () => {
     mockUsePredictSearch.mockReturnValue(searchResult());
   });
 
-  it('renders the header title from config', () => {
-    render(<PredictFeedView />);
-
-    expect(
-      screen.getByTestId(PredictFeedViewSelectorsIDs.CONTAINER),
-    ).toBeOnTheScreen();
-    expect(screen.getByText('Sports')).toBeOnTheScreen();
-  });
-
-  it('forwards the route feedId and active filter params to the data hooks', () => {
-    mockRouteParams = {
-      feedId: 'sports',
-      initialTabId: 'soccer',
-      initialFilterId: 'props',
-    };
-
-    render(<PredictFeedView />);
-
-    expect(mockUsePredictFeedConfig).toHaveBeenCalledWith('sports', {
-      initialTabId: 'soccer',
-      initialFilterId: 'props',
-    });
-    expect(mockUsePredictFeedMarketList).toHaveBeenCalledWith(
-      {},
-      {
-        enabled: true,
-        showLiveFirst: true,
-        autoAdvanceEmptyPages: true,
-        filterStaleGameMarkets: true,
-      },
-    );
-  });
+  describe('hook wiring', () => {
+    it('forwards the route feedId and active filter params to the data hooks', () => {
+      mockRouteParams = {
+        feedId: 'sports',
+        initialTabId: 'soccer',
+        initialFilterId: 'props',
+      };
 
-  it('forwards filterByVolume from the active sports filter', () => {
-    mockRouteParams = { feedId: 'sports' };
-    mockUsePredictFeedConfig.mockReturnValue(
-      feedConfigResult({
-        activeFilter: {
-          id: 'games',
-          titleKey: 'predict.feed.filters.games',
-          params: {},
-          showLiveFirst: true,
-          filterByVolume: 1000,
-          isDynamic: false,
-        },
-      }),
-    );
-
-    render(<PredictFeedView />);
-
-    expect(mockUsePredictFeedMarketList).toHaveBeenCalledWith(
-      {},
-      {
-        enabled: true,
-        showLiveFirst: true,
-        autoAdvanceEmptyPages: true,
-        filterStaleGameMarkets: true,
-        filterByVolume: 1000,
-      },
-    );
-  });
+      render(<PredictFeedView />);
 
-  it('disables live-first for non-sports feeds', () => {
-    mockRouteParams = { feedId: 'politics' };
-    mockUsePredictFeedConfig.mockReturnValue(
-      feedConfigResult({
-        feedId: 'politics',
-        titleKey: 'predict.category.politics',
-        activeFilter: {
-          id: 'all',
-          titleKey: 'predict.feed.filters.all',
-          params: { tagSlugs: ['politics'] },
+      expect(mockUsePredictFeedConfig).toHaveBeenCalledWith('sports', {
+        initialTabId: 'soccer',
+        initialFilterId: 'props',
+      });
+      expect(mockUsePredictFeedMarketList).toHaveBeenCalledWith(
+        {},
+        {
+          enabled: true,
           showLiveFirst: true,
-          isDynamic: false,
+          autoAdvanceEmptyPages: true,
+          filterStaleGameMarkets: true,
         },
-      }),
-    );
-
-    render(<PredictFeedView />);
-
-    expect(mockUsePredictFeedMarketList).toHaveBeenCalledWith(
-      { tagSlugs: ['politics'] },
-      {
-        enabled: true,
-        showLiveFirst: false,
-        autoAdvanceEmptyPages: false,
-        filterStaleGameMarkets: false,
-      },
-    );
-  });
-
-  it('forwards transactionActiveAbTests from the route to market cards and the search overlay', () => {
-    const transactionActiveAbTests = [
-      { name: 'predict_test', variant: 'treatment' },
-    ];
-    mockRouteParams = { feedId: 'sports', transactionActiveAbTests };
-    mockUsePredictFeedMarketList.mockReturnValue(
-      marketListResult({ markets: [createMarket('1', 'Lakers win')] }),
-    );
-    mockUsePredictSearch.mockReturnValue(
-      searchResult({ isSearchVisible: true }),
-    );
-
-    render(<PredictFeedView />);
-
-    expect(mockPredictMarketProps).toHaveBeenCalledWith(
-      expect.objectContaining({ transactionActiveAbTests }),
-    );
-    expect(mockSearchOverlayProps).toHaveBeenCalledWith(
-      expect.objectContaining({ transactionActiveAbTests }),
-    );
-  });
-
-  describe('tab bar visibility', () => {
-    it('shows the tab bar and tab labels for a multi-tab feed', () => {
-      render(<PredictFeedView />);
-
-      expect(
-        screen.getByTestId(PredictFeedViewSelectorsIDs.TABS),
-      ).toBeOnTheScreen();
-      expect(screen.getAllByText('All').length).toBeGreaterThan(0);
-      expect(screen.getAllByText('Soccer').length).toBeGreaterThan(0);
+      );
     });
 
-    it('hides the tab and filter bars for the Live feed', () => {
+    it('forwards filterByVolume from the active sports filter', () => {
+      mockRouteParams = { feedId: 'sports' };
       mockUsePredictFeedConfig.mockReturnValue(
         feedConfigResult({
-          feedId: 'live',
-          titleKey: 'predict.feed.live',
-          tabs: [{ id: 'live', titleKey: 'predict.feed.live' }],
-          showTabBar: false,
-          showFilterBar: false,
-          activeTabId: 'live',
-          filters: [
-            {
-              id: 'live',
-              titleKey: 'predict.feed.filters.live',
-              params: { live: true },
-              isDynamic: false,
-            },
-          ],
-          activeFilterId: 'live',
+          activeFilter: {
+            id: 'games',
+            titleKey: 'predict.feed.filters.games',
+            params: {},
+            showLiveFirst: true,
+            filterByVolume: 1000,
+            isDynamic: false,
+          },
         }),
       );
 
       render(<PredictFeedView />);
 
-      expect(
-        screen.queryByTestId(PredictFeedViewSelectorsIDs.TABS),
-      ).not.toBeOnTheScreen();
-      expect(
-        screen.queryByTestId(PredictFeedViewSelectorsIDs.FILTERS),
-      ).not.toBeOnTheScreen();
+      expect(mockUsePredictFeedMarketList).toHaveBeenCalledWith(
+        {},
+        {
+          enabled: true,
+          showLiveFirst: true,
+          autoAdvanceEmptyPages: true,
+          filterStaleGameMarkets: true,
+          filterByVolume: 1000,
+        },
+      );
     });
-  });
 
-  describe('selection', () => {
-    it('renders filter chips for the active tab', () => {
-      render(<PredictFeedView />);
-
-      expect(
-        screen.getByTestId(PredictFeedViewSelectorsIDs.FILTERS),
-      ).toBeOnTheScreen();
-      expect(screen.getByText('Games')).toBeOnTheScreen();
-      expect(screen.getByText('Props')).toBeOnTheScreen();
-    });
+    it('disables live-first for non-sports feeds', () => {
+      mockRouteParams = { feedId: 'politics' };
+      mockUsePredictFeedConfig.mockReturnValue(
+        feedConfigResult({
+          feedId: 'politics',
+          titleKey: 'predict.category.politics',
+          activeFilter: {
+            id: 'all',
+            titleKey: 'predict.feed.filters.all',
+            params: { tagSlugs: ['politics'] },
+            showLiveFirst: true,
+            isDynamic: false,
+          },
+        }),
+      );
 
-    it('calls setActiveFilterId when a filter chip is pressed', () => {
       render(<PredictFeedView />);
 
-      fireEvent.press(screen.getByText('Props'));
-
-      expect(mockSetActiveFilterId).toHaveBeenCalledWith('props');
+      expect(mockUsePredictFeedMarketList).toHaveBeenCalledWith(
+        { tagSlugs: ['politics'] },
+        {
+          enabled: true,
+          showLiveFirst: false,
+          autoAdvanceEmptyPages: false,
+          filterStaleGameMarkets: false,
+        },
+      );
     });
-  });
 
-  describe('market list states', () => {
-    it('renders skeleton loaders while initially loading', () => {
+    it('forwards transactionActiveAbTests from the route to market cards and the search overlay', () => {
+      const transactionActiveAbTests = [
+        { name: 'predict_test', variant: 'treatment' },
+      ];
+      mockRouteParams = { feedId: 'sports', transactionActiveAbTests };
       mockUsePredictFeedMarketList.mockReturnValue(
-        marketListResult({ isLoading: true }),
+        marketListResult({ markets: [createMarket('1', 'Lakers win')] }),
+      );
+      mockUsePredictSearch.mockReturnValue(
+        searchResult({ isSearchVisible: true }),
       );
 
       render(<PredictFeedView />);
 
-      expect(
-        screen.getByTestId(getPredictFeedViewSelector.skeleton(1)),
-      ).toBeOnTheScreen();
+      expect(mockPredictMarketProps).toHaveBeenCalledWith(
+        expect.objectContaining({ transactionActiveAbTests }),
+      );
+      expect(mockSearchOverlayProps).toHaveBeenCalledWith(
+        expect.objectContaining({ transactionActiveAbTests }),
+      );
     });
+  });
 
+  describe('market list states', () => {
     it('does not render the empty state while empty results are still loading', () => {
       mockUsePredictFeedMarketList.mockReturnValue(
         marketListResult({ markets: [], isLoading: true }),
@@ -442,49 +361,6 @@ describe('PredictFeedView', () => {
       ).toBeNull();
     });
 
-    it('renders market cards when data is present', () => {
-      mockUsePredictFeedMarketList.mockReturnValue(
-        marketListResult({
-          markets: [
-            createMarket('1', 'Lakers win'),
-            createMarket('2', 'Heat win'),
-          ],
-        }),
-      );
-
-      render(<PredictFeedView />);
-
-      expect(
-        screen.getByTestId(getPredictFeedViewSelector.marketCard(1)),
-      ).toHaveTextContent('Lakers win');
-      expect(
-        screen.getByTestId(getPredictFeedViewSelector.marketCard(2)),
-      ).toHaveTextContent('Heat win');
-    });
-
-    it('renders the empty state when there are no markets', () => {
-      render(<PredictFeedView />);
-
-      expect(
-        screen.getByTestId(PredictFeedViewSelectorsIDs.EMPTY_STATE),
-      ).toBeOnTheScreen();
-    });
-
-    it('renders the offline state and retries on press', () => {
-      mockUsePredictFeedMarketList.mockReturnValue(
-        marketListResult({ error: new Error('Network error') }),
-      );
-
-      render(<PredictFeedView />);
-
-      expect(
-        screen.getByTestId(PredictFeedViewSelectorsIDs.ERROR_STATE),
-      ).toBeOnTheScreen();
-
-      fireEvent.press(screen.getByTestId('predict-feed-view-offline-retry'));
-      expect(mockRefetch).toHaveBeenCalledTimes(1);
-    });
-
     it('keeps the list (not the full-screen error) when a next-page fetch fails with markets already loaded', () => {
       mockUsePredictFeedMarketList.mockReturnValue(
         marketListResult({
@@ -521,45 +397,7 @@ describe('PredictFeedView', () => {
     });
   });
 
-  describe('search', () => {
-    it('opens search from the header search icon', () => {
-      render(<PredictFeedView />);
-
-      fireEvent.press(
-        screen.getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON),
-      );
-
-      expect(mockShowSearch).toHaveBeenCalledTimes(1);
-    });
-
-    it('mounts the search overlay when search is visible', () => {
-      mockUsePredictSearch.mockReturnValue(
-        searchResult({ isSearchVisible: true }),
-      );
-
-      render(<PredictFeedView />);
-
-      expect(
-        screen.getByTestId('predict-feed-view-search-overlay'),
-      ).toBeOnTheScreen();
-    });
-  });
-
   describe('analytics', () => {
-    it('tracks feed viewed on focus with feed/tab/filter ids, tracking_mode:focus, and entry point', () => {
-      mockRouteParams = { feedId: 'sports', entryPoint: 'home_section' };
-
-      render(<PredictFeedView />);
-
-      expect(mockTrackFeedViewed).toHaveBeenCalledWith({
-        feedId: 'sports',
-        tabId: 'all',
-        filterId: 'games',
-        trackingMode: 'focus',
-        entryPoint: 'home_section',
-      });
-    });
-
     it('does not track feed viewed when the feed is not found', () => {
       mockUsePredictFeedConfig.mockReturnValue(
         feedConfigResult({ status: 'not-found', feedId: undefined }),
@@ -570,20 +408,6 @@ describe('PredictFeedView', () => {
       expect(mockTrackFeedViewed).not.toHaveBeenCalled();
     });
 
-    it('tracks a tab change when a tab is pressed', () => {
-      mockRouteParams = { feedId: 'sports', entryPoint: 'home_section' };
-
-      render(<PredictFeedView />);
-
-      fireEvent.press(screen.getAllByText('Soccer')[0]);
-
-      expect(mockTrackFeedTabChanged).toHaveBeenCalledWith({
-        feedId: 'sports',
-        tabId: 'soccer',
-        entryPoint: 'home_section',
-      });
-    });
-
     it('does not track tab changed when re-pressing the already-active tab', () => {
       // Active tab is 'all'. Pressing 'All' again should be a no-op.
       mockRouteParams = { feedId: 'sports', entryPoint: 'home_section' };
@@ -596,22 +420,6 @@ describe('PredictFeedView', () => {
       expect(mockSetActiveTabId).not.toHaveBeenCalled();
     });
 
-    it('tracks a static filter change with is_dynamic_filter false', () => {
-      mockRouteParams = { feedId: 'sports', entryPoint: 'home_section' };
-
-      render(<PredictFeedView />);
-
-      fireEvent.press(screen.getByText('Props'));
-
-      expect(mockTrackFeedFilterChanged).toHaveBeenCalledWith({
-        feedId: 'sports',
-        tabId: 'all',
-        filterId: 'props',
-        isDynamicFilter: false,
-        entryPoint: 'home_section',
-      });
-    });
-
     it('tracks a dynamic filter change with is_dynamic_filter true', () => {
       mockRouteParams = { feedId: 'politics', entryPoint: 'home_section' };
       mockUsePredictFeedConfig.mockReturnValue(
@@ -829,22 +637,6 @@ describe('PredictFeedView', () => {
         expect.objectContaining({ filterId: 'all' }),
       );
     });
-
-    it('tracks search opened from the header search icon', () => {
-      mockRouteParams = { feedId: 'sports', entryPoint: 'home_section' };
-
-      render(<PredictFeedView />);
-
-      fireEvent.press(
-        screen.getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON),
-      );
-
-      expect(mockTrackSearchInteracted).toHaveBeenCalledWith({
-        interactionType: 'opened',
-        predictFeedTab: 'all',
-        entryPoint: 'home_section',
-      });
-    });
   });
 
   describe('fallbacks', () => {
diff --git a/app/components/UI/Predict/views/PredictFeedView/PredictFeedView.view.test.tsx b/app/components/UI/Predict/views/PredictFeedView/PredictFeedView.view.test.tsx
index 9154c89915f2..4935ac324dbc 100644
--- a/app/components/UI/Predict/views/PredictFeedView/PredictFeedView.view.test.tsx
+++ b/app/components/UI/Predict/views/PredictFeedView/PredictFeedView.view.test.tsx
@@ -8,12 +8,19 @@
  */
 import '../../../../../../tests/component-view/mocks';
 import Engine from '../../../../../../app/core/Engine';
-import { cleanup, within } from '@testing-library/react-native';
+import {
+  cleanup,
+  fireEvent,
+  waitFor,
+  within,
+} from '@testing-library/react-native';
 import { renderPredictFeedView } from '../../../../../../tests/component-view/renderers/predictFeedView';
 import {
   PredictFeedViewSelectorsIDs,
+  PredictSearchSelectorsIDs,
   getPredictFeedViewSelector,
 } from '../../Predict.testIds';
+import { PREDICT_OFFLINE_TEST_IDS } from '../../components/PredictOffline/PredictOffline.testIds';
 import { MOCK_PREDICT_MARKET } from '../../../../../../tests/component-view/fixtures/predict';
 import type { PredictMarket } from '../../types';
 
@@ -32,6 +39,8 @@ const createMarket = (id: string, title: string): PredictMarket => ({
   ],
 });
 
+const SEARCH_PLACEHOLDER = 'Search prediction markets';
+
 describe('PredictFeedView (component view)', () => {
   afterEach(() => {
     cleanup();
@@ -47,19 +56,18 @@ describe('PredictFeedView (component view)', () => {
   });
 
   it('renders the configured feed header, tabs, and filters for a multi-tab feed', async () => {
-    const { findByText, getByTestId, getAllByText } = renderPredictFeedView({
-      initialParams: { feedId: 'sports' },
-    });
+    const { findByText, getByTestId, getByText, getAllByText } =
+      renderPredictFeedView({
+        initialParams: { feedId: 'sports' },
+      });
 
     expect(await findByText('Sports')).toBeOnTheScreen();
-    // sports is a multi-tab feed -> tab bar is visible with the sport tabs
     expect(getByTestId(PredictFeedViewSelectorsIDs.TABS)).toBeOnTheScreen();
-    expect(getAllByText('All').length).toBeGreaterThan(0);
-    expect(getAllByText('Soccer').length).toBeGreaterThan(0);
-    // static filter chips for the active tab
+    expect(getAllByText('Basketball').length).toBeGreaterThan(0);
     expect(getByTestId(PredictFeedViewSelectorsIDs.FILTERS)).toBeOnTheScreen();
-    expect(getAllByText('Games').length).toBeGreaterThan(0);
-    expect(getAllByText('Props').length).toBeGreaterThan(0);
+    expect(getAllByText('All').length).toBeGreaterThan(0);
+    expect(getByText('Games')).toBeOnTheScreen();
+    expect(getByText('Props')).toBeOnTheScreen();
 
     expect(Engine.context.PredictController.listMarkets).toHaveBeenCalled();
   });
@@ -103,7 +111,7 @@ describe('PredictFeedView (component view)', () => {
     ).toBeOnTheScreen();
   });
 
-  it('hides Live filter chips while requesting only live markets', async () => {
+  it('hides Live tab and filter bars while requesting only live markets', async () => {
     const { findByTestId, queryByTestId } = renderPredictFeedView({
       initialParams: { feedId: 'live' },
     });
@@ -114,6 +122,9 @@ describe('PredictFeedView (component view)', () => {
       { timeout: 10000 },
     );
 
+    expect(
+      queryByTestId(PredictFeedViewSelectorsIDs.TABS),
+    ).not.toBeOnTheScreen();
     expect(
       queryByTestId(PredictFeedViewSelectorsIDs.FILTERS),
     ).not.toBeOnTheScreen();
@@ -121,4 +132,194 @@ describe('PredictFeedView (component view)', () => {
       expect.objectContaining({ live: true }),
     );
   });
+
+  it('shows skeleton loaders while markets are loading', async () => {
+    (
+      Engine.context.PredictController.listMarkets as jest.Mock
+    ).mockImplementation(() => new Promise(() => undefined));
+
+    const { findByTestId } = renderPredictFeedView({
+      initialParams: { feedId: 'sports' },
+    });
+
+    expect(
+      await findByTestId(getPredictFeedViewSelector.skeleton(1)),
+    ).toBeOnTheScreen();
+  });
+
+  it('shows the offline state and loads markets after Retry', async () => {
+    const listMarketsSpy = jest.spyOn(
+      Engine.context.PredictController,
+      'listMarkets',
+    );
+    listMarketsSpy.mockRejectedValue(new Error('Network error'));
+
+    const { findByTestId, findByText, queryByTestId } = renderPredictFeedView({
+      initialParams: { feedId: 'sports' },
+    });
+
+    expect(
+      await findByTestId(
+        PredictFeedViewSelectorsIDs.ERROR_STATE,
+        {},
+        { timeout: 10000 },
+      ),
+    ).toBeOnTheScreen();
+    expect(
+      await findByTestId(PREDICT_OFFLINE_TEST_IDS.ERROR_STATE),
+    ).toBeOnTheScreen();
+
+    const callCountBeforeRetry = listMarketsSpy.mock.calls.length;
+    listMarketsSpy.mockResolvedValue({
+      markets: [createMarket('market-1', 'Lakers to win the title')],
+      nextCursor: null,
+    });
+
+    fireEvent.press(await findByText('Retry'));
+
+    await waitFor(() => {
+      expect(listMarketsSpy.mock.calls.length).toBeGreaterThan(
+        callCountBeforeRetry,
+      );
+    });
+    expect(
+      await findByTestId(
+        getPredictFeedViewSelector.marketCard(1),
+        {},
+        { timeout: 10000 },
+      ),
+    ).toBeOnTheScreen();
+    expect(
+      queryByTestId(PredictFeedViewSelectorsIDs.ERROR_STATE),
+    ).not.toBeOnTheScreen();
+
+    listMarketsSpy.mockRestore();
+  });
+
+  it('opens search and tracks search opened from the header', async () => {
+    const trackSearchSpy = jest.spyOn(
+      Engine.context.PredictController,
+      'trackSearchInteracted',
+    );
+
+    const { getByTestId, findByPlaceholderText } = renderPredictFeedView({
+      initialParams: { feedId: 'sports', entryPoint: 'home_section' },
+    });
+
+    fireEvent.press(getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON));
+
+    expect(await findByPlaceholderText(SEARCH_PLACEHOLDER)).toBeOnTheScreen();
+    expect(trackSearchSpy).toHaveBeenCalledWith({
+      interactionType: 'opened',
+      predictFeedTab: 'all',
+      entryPoint: 'home_section',
+    });
+
+    trackSearchSpy.mockRestore();
+  });
+
+  it('tracks feed viewed on focus with feed, tab, filter, and entry point', async () => {
+    const trackFeedViewedSpy = jest.spyOn(
+      Engine.context.PredictController,
+      'trackFeedViewed',
+    );
+
+    const { findByText } = renderPredictFeedView({
+      initialParams: { feedId: 'sports', entryPoint: 'home_section' },
+    });
+
+    await findByText('Sports');
+
+    await waitFor(() => {
+      expect(trackFeedViewedSpy).toHaveBeenCalledWith({
+        feedId: 'sports',
+        tabId: 'all',
+        filterId: 'games',
+        trackingMode: 'focus',
+        entryPoint: 'home_section',
+      });
+    });
+
+    trackFeedViewedSpy.mockRestore();
+  });
+
+  it('tracks a tab change when the user selects a different tab', async () => {
+    const trackTabSpy = jest.spyOn(
+      Engine.context.PredictController,
+      'trackFeedTabChanged',
+    );
+
+    const { findByText, getAllByText } = renderPredictFeedView({
+      initialParams: { feedId: 'sports', entryPoint: 'home_section' },
+    });
+
+    await findByText('Sports');
+    fireEvent.press(getAllByText('Basketball')[0]);
+
+    await waitFor(() => {
+      expect(trackTabSpy).toHaveBeenCalledWith({
+        feedId: 'sports',
+        tabId: 'basketball',
+        entryPoint: 'home_section',
+      });
+    });
+
+    trackTabSpy.mockRestore();
+  });
+
+  it('refetches markets and tracks filter change when a filter chip is pressed', async () => {
+    const listMarketsSpy = jest.spyOn(
+      Engine.context.PredictController,
+      'listMarkets',
+    );
+    const trackFilterSpy = jest.spyOn(
+      Engine.context.PredictController,
+      'trackFeedFilterChanged',
+    );
+    const gamesMarket = createMarket('games-1', 'Lakers game market');
+    const propsMarket = createMarket('props-1', 'Player props market');
+    listMarketsSpy.mockImplementation(
+      async (params?: { excludedTags?: string[] }) => {
+        if (params?.excludedTags?.length) {
+          return { markets: [propsMarket], nextCursor: null };
+        }
+        return { markets: [gamesMarket], nextCursor: null };
+      },
+    );
+
+    const { findByText, getByText, queryByText } = renderPredictFeedView({
+      initialParams: { feedId: 'sports', entryPoint: 'home_section' },
+    });
+
+    expect(await findByText('Lakers game market')).toBeOnTheScreen();
+    expect(queryByText('Player props market')).not.toBeOnTheScreen();
+
+    fireEvent.press(getByText('Props'));
+
+    expect(await findByText('Player props market')).toBeOnTheScreen();
+    expect(queryByText('Lakers game market')).not.toBeOnTheScreen();
+    expect(trackFilterSpy).toHaveBeenCalledWith({
+      feedId: 'sports',
+      tabId: 'all',
+      filterId: 'props',
+      isDynamicFilter: false,
+      entryPoint: 'home_section',
+    });
+
+    listMarketsSpy.mockRestore();
+    trackFilterSpy.mockRestore();
+  });
+
+  it('does not render a ready feed shell when the feed id is unknown', async () => {
+    const { queryByTestId } = renderPredictFeedView({
+      initialParams: { feedId: 'definitely-not-a-feed' },
+    });
+
+    await waitFor(() => {
+      expect(queryByTestId(PredictFeedViewSelectorsIDs.CONTAINER)).toBeNull();
+      expect(
+        Engine.context.PredictController.listMarkets,
+      ).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.test.tsx b/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.test.tsx
index f9e13aa3a04e..6506b89cc973 100644
--- a/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.test.tsx
+++ b/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.test.tsx
@@ -1,3 +1,6 @@
+/**
+ * Unit tests for PredictMarketDetails.
+ */
 import React from 'react';
 import type { ReactTestInstance } from 'react-test-renderer';
 import { screen, fireEvent, waitFor, act } from '@testing-library/react-native';
@@ -64,12 +67,10 @@ jest.mock('../../hooks/usePredictActiveOrder', () => ({
   }),
 }));
 
-jest.mock('@react-navigation/native-stack', () => ({
-  createNativeStackNavigator: () => ({
-    Navigator: ({ children }: { children: React.ReactNode }) => children,
-    Screen: ({ children }: { children: React.ReactNode }) => children,
-  }),
-}));
+jest.mock('@react-navigation/native-stack', () =>
+  // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
+  require('../../../../../util/test/mockNativeStackNavigator').createMockNativeStackModule(),
+);
 
 // Minimal mock to add testID pattern for icon assertions
 jest.mock('../../../../../component-library/components/Icons/Icon', () => {
@@ -146,10 +147,6 @@ jest.mock('../../../../../../locales/i18n', () => ({
   }),
 }));
 
-jest.mock('../../../Navbar', () => ({
-  getNavigationOptionsTitle: jest.fn(() => ({})),
-}));
-
 jest.mock('../../utils/format', () => ({
   formatPrice: jest.fn(
     (value: number, options?: { maximumDecimals?: number }) =>
@@ -353,7 +350,7 @@ jest.mock('../../utils/cryptoUpDown', () => ({
   CRYPTO_TAG: 'crypto',
 }));
 
-let mockSelectPredictUpDownEnabledFlag = false;
+const mockSelectPredictUpDownEnabledFlag = false;
 const mockSelectPredictFeeCollectionFlag = {
   enabled: true,
   collector: '0xe6a2026d58eaff3c7ad7ba9386fb143388002382',
@@ -774,10 +771,13 @@ const findActionButtonByPrice = (price: number) =>
   getActionButtons().find((button) => getActionButtonPrice(button) === price);
 
 describe('PredictMarketDetails', () => {
+  beforeEach(() => {
+    mockIsBuySheetOpen = false;
+  });
+
   afterEach(() => {
     jest.clearAllMocks();
     mockRunAfterInteractions.mockReset();
-    mockIsBuySheetOpen = false;
   });
 
   afterAll(() => {
@@ -785,122 +785,6 @@ describe('PredictMarketDetails', () => {
   });
 
   describe('Component Rendering', () => {
-    it('renders the main screen container', () => {
-      setupPredictMarketDetailsTest();
-
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.SCREEN),
-      ).toBeOnTheScreen();
-    });
-
-    it('displays market title when market data is loaded', () => {
-      const { mockMarket } = setupPredictMarketDetailsTest();
-
-      expect(screen.getByText(mockMarket.title)).toBeOnTheScreen();
-    });
-
-    it('tracks market details opened with explore entry point from route params', async () => {
-      setupPredictMarketDetailsTest(
-        {},
-        {
-          params: {
-            marketId: 'market-1',
-            entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE,
-          },
-        },
-      );
-
-      const trackMarketDetailsOpened =
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        require('../../../../../core/Engine').context.PredictController
-          .trackMarketDetailsOpened;
-
-      await waitFor(() => {
-        expect(trackMarketDetailsOpened).toHaveBeenCalledWith(
-          expect.objectContaining({
-            entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE,
-          }),
-        );
-      });
-    });
-
-    it('displays loading state when market is fetching', () => {
-      setupPredictMarketDetailsTest(
-        {},
-        {},
-        { market: { isLoading: true, isFetching: true, data: null } },
-      );
-
-      // Check that skeleton loaders appear
-      expect(
-        screen.getByTestId(
-          PredictMarketDetailsSelectorsIDs.DETAILS_HEADER_SKELETON_BACK_BUTTON,
-        ),
-      ).toBeOnTheScreen();
-      expect(
-        screen.getByTestId(
-          PredictMarketDetailsSelectorsIDs.DETAILS_CONTENT_SKELETON_LINE_1,
-        ),
-      ).toBeOnTheScreen();
-      expect(
-        screen.getByTestId(
-          PredictMarketDetailsSelectorsIDs.DETAILS_BUTTONS_SKELETON_BUTTON_1,
-        ),
-      ).toBeOnTheScreen();
-    });
-
-    it('resolves the details market from route series params', () => {
-      const routeSeries = {
-        id: 'btc-series',
-        slug: 'btc-up-or-down-5m',
-        title: 'BTC Up or Down',
-        recurrence: '5m',
-      };
-      const liveMarket = createMockMarket({
-        id: 'live-market',
-        series: routeSeries,
-      });
-
-      setupPredictMarketDetailsTest(
-        {},
-        { params: { series: routeSeries } },
-        {
-          currentSeriesMarket: {
-            market: liveMarket,
-            marketId: liveMarket.id,
-          },
-          market: { data: liveMarket },
-        },
-      );
-
-      const { useCurrentPredictMarketFromSeries } = jest.requireMock(
-        '../../hooks/useCurrentPredictMarketFromSeries',
-      );
-      const { usePredictMarket } = jest.requireMock(
-        '../../hooks/usePredictMarket',
-      );
-
-      expect(useCurrentPredictMarketFromSeries).toHaveBeenCalledWith({
-        series: routeSeries,
-        seriesId: undefined,
-        seriesRecurrence: undefined,
-        enabled: true,
-      });
-      expect(usePredictMarket).toHaveBeenCalledWith({
-        id: liveMarket.id,
-        enabled: true,
-      });
-    });
-
-    it('displays fallback title when market data is unavailable', () => {
-      setupPredictMarketDetailsTest({}, {}, { market: { data: null } });
-
-      // Screen renders without a title; other sections may still show loading keys
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.SCREEN),
-      ).toBeOnTheScreen();
-    });
-
     it('renders the market unavailable state when no marketId or series id can be resolved', () => {
       setupPredictMarketDetailsTest(
         {},
@@ -954,14 +838,6 @@ describe('PredictMarketDetails', () => {
       ).toBeOnTheScreen();
     });
 
-    it('renders share button in header when market data is loaded', () => {
-      setupPredictMarketDetailsTest();
-
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.SHARE_BUTTON),
-      ).toBeOnTheScreen();
-    });
-
     it('passes market.id to share button', () => {
       setupPredictMarketDetailsTest({ id: 'test-market-id' });
 
@@ -992,543 +868,131 @@ describe('PredictMarketDetails', () => {
     });
   });
 
-  describe('Market Information Display', () => {
-    it('displays market volume correctly', () => {
-      setupPredictMarketDetailsTest();
-
-      const aboutTab = screen.getByTestId(
-        getPredictMarketDetailsSelector.tabBarTab('about'),
-      );
-      fireEvent.press(aboutTab);
-
-      expect(
-        screen.getByText('predict.market_details.volume'),
-      ).toBeOnTheScreen();
-    });
-
-    it('displays market end date correctly', () => {
-      setupPredictMarketDetailsTest();
-
-      const aboutTab = screen.getByTestId(
-        getPredictMarketDetailsSelector.tabBarTab('about'),
-      );
-      fireEvent.press(aboutTab);
-
-      expect(
-        screen.getByText('predict.market_details.end_date'),
-      ).toBeOnTheScreen();
-      expect(
-        screen.getByText(new Date('2024-12-31T23:59:59Z').toLocaleDateString()),
-      ).toBeOnTheScreen();
-    });
-
-    it('displays resolution details information', () => {
-      setupPredictMarketDetailsTest();
-
-      const aboutTab = screen.getByTestId(
-        getPredictMarketDetailsSelector.tabBarTab('about'),
-      );
-      fireEvent.press(aboutTab);
-
-      expect(
-        screen.getByText('predict.market_details.resolution_details'),
-      ).toBeOnTheScreen();
-      expect(screen.getByText('Polymarket')).toBeOnTheScreen();
-    });
-
-    it('navigates to polymarket resolution details when pressed', () => {
-      const { mockNavigate } = setupPredictMarketDetailsTest();
-
-      const aboutTab = screen.getByTestId(
-        getPredictMarketDetailsSelector.tabBarTab('about'),
+  describe('Chart Rendering', () => {
+    it('limits chart data to first 3 open outcomes when more are available', () => {
+      const { usePredictPriceHistory } = jest.requireMock(
+        '../../hooks/usePredictPriceHistory',
       );
-      fireEvent.press(aboutTab);
-
-      const resolutionText = screen.getByText('Polymarket');
-
-      act(() => {
-        fireEvent.press(resolutionText);
-      });
-
-      expect(mockRunAfterInteractions).toHaveBeenCalledTimes(1);
-      const callback = runAfterInteractionsCallbacks[0];
-      expect(callback).toBeDefined();
 
-      act(() => {
-        callback?.();
-      });
-
-      expect(mockNavigate).toHaveBeenCalledWith('Webview', {
-        screen: 'SimpleWebview',
-        params: {
-          url: 'https://docs.polymarket.com/polymarket-learn/markets/how-are-markets-resolved',
-          title: 'predict.market_details.resolution_details',
-        },
-      });
-    });
-  });
-
-  describe('Chart Rendering', () => {
-    it('renders single outcome chart for single outcome markets', () => {
-      const singleOutcomeMarket = createMockMarket({
-        status: 'open',
+      const marketWithManyOutcomes = createMockMarket({
         outcomes: [
           {
             id: 'outcome-1',
-            title: 'Yes',
+            title: 'Option A',
             status: 'open',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: 0.65 },
-              { id: 'token-2', title: 'No', price: 0.35 },
-            ],
+            tokens: [{ id: 'token-1', price: 0.25 }],
             volume: 1000000,
           },
+          {
+            id: 'outcome-2',
+            title: 'Option B',
+            status: 'open',
+            tokens: [{ id: 'token-2', price: 0.25 }],
+            volume: 800000,
+          },
+          {
+            id: 'outcome-3',
+            title: 'Option C',
+            status: 'open',
+            tokens: [{ id: 'token-3', price: 0.25 }],
+            volume: 600000,
+          },
+          {
+            id: 'outcome-4',
+            title: 'Option D',
+            status: 'open',
+            tokens: [{ id: 'token-4', price: 0.25 }],
+            volume: 400000,
+          },
         ],
       });
 
-      setupPredictMarketDetailsTest(singleOutcomeMarket);
+      setupPredictMarketDetailsTest(marketWithManyOutcomes);
 
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.DETAILS_CHART),
-      ).toBeOnTheScreen();
+      expect(usePredictPriceHistory).toHaveBeenCalledWith(
+        expect.objectContaining({
+          marketIds: ['token-1', 'token-2', 'token-3'],
+        }),
+      );
     });
 
-    it('renders multiple outcome chart for binary markets with two outcomes', () => {
-      setupPredictMarketDetailsTest();
-
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.DETAILS_CHART),
-      ).toBeOnTheScreen();
-    });
+    it('filters out closed outcomes from chart data', () => {
+      const { usePredictPriceHistory } = jest.requireMock(
+        '../../hooks/usePredictPriceHistory',
+      );
 
-    it('renders multiple outcome chart for multi-outcome markets', () => {
-      const multiOutcomeMarket = createMockMarket({
+      const marketWithMixedStatus = createMockMarket({
         outcomes: [
           {
             id: 'outcome-1',
             title: 'Option A',
-            status: 'open',
-            tokens: [{ id: 'token-1', price: 0.4 }],
+            status: 'closed',
+            tokens: [{ id: 'token-1', price: 1.0 }],
             volume: 1000000,
           },
           {
             id: 'outcome-2',
             title: 'Option B',
             status: 'open',
-            tokens: [{ id: 'token-2', price: 0.3 }],
-            volume: 500000,
+            tokens: [{ id: 'token-2', price: 0.6 }],
+            volume: 800000,
           },
           {
             id: 'outcome-3',
             title: 'Option C',
             status: 'open',
-            tokens: [{ id: 'token-3', price: 0.3 }],
-            volume: 300000,
+            tokens: [{ id: 'token-3', price: 0.4 }],
+            volume: 600000,
           },
         ],
       });
 
-      setupPredictMarketDetailsTest(multiOutcomeMarket);
+      setupPredictMarketDetailsTest(marketWithMixedStatus);
 
+      expect(usePredictPriceHistory).toHaveBeenCalledWith(
+        expect.objectContaining({
+          marketIds: ['token-2', 'token-3'],
+        }),
+      );
       expect(
         screen.getByTestId(PredictMarketDetailsSelectorsIDs.DETAILS_CHART),
       ).toBeOnTheScreen();
     });
 
-    it('does not render chart when all outcomes are closed', () => {
-      const closedOutcomesMarket = createMockMarket({
-        status: 'closed',
+    it('renders chart even when outcomes have no tokens', () => {
+      const noTokensMarket = createMockMarket({
         outcomes: [
           {
             id: 'outcome-1',
-            title: 'Yes',
-            status: 'closed',
-            tokens: [
-              { id: 'token-1', price: 1.0, title: 'Yes' },
-              { id: 'token-1b', price: 0.0, title: 'No' },
-            ],
+            title: 'Option A',
+            status: 'open',
+            tokens: [],
             volume: 1000000,
           },
-          {
-            id: 'outcome-2',
-            title: 'No',
-            status: 'closed',
-            tokens: [
-              { id: 'token-2', price: 0.0, title: 'Yes' },
-              { id: 'token-2b', price: 1.0, title: 'No' },
-            ],
-            volume: 500000,
-          },
         ],
       });
 
-      setupPredictMarketDetailsTest(closedOutcomesMarket);
+      setupPredictMarketDetailsTest(noTokensMarket);
 
       expect(
-        screen.queryByTestId(PredictMarketDetailsSelectorsIDs.DETAILS_CHART),
-      ).not.toBeOnTheScreen();
+        screen.getByTestId(PredictMarketDetailsSelectorsIDs.DETAILS_CHART),
+      ).toBeOnTheScreen();
     });
+  });
 
-    it('does not render chart when market has no open outcomes', () => {
-      const noOpenOutcomesMarket = createMockMarket({
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Option A',
-            status: 'closed',
-            tokens: [{ id: 'token-1', price: 0.5 }],
-            volume: 1000000,
-          },
-        ],
-      });
+  describe('Navigation Functionality', () => {
+    it('handles back button press correctly', () => {
+      const { mockGoBack, mockCanGoBack } = setupPredictMarketDetailsTest();
 
-      setupPredictMarketDetailsTest(noOpenOutcomesMarket);
+      const backButton = screen.getByTestId(
+        getPredictMarketDetailsSelector.icon('ArrowLeft'),
+      );
+      fireEvent.press(backButton);
 
-      expect(
-        screen.queryByTestId(PredictMarketDetailsSelectorsIDs.DETAILS_CHART),
-      ).not.toBeOnTheScreen();
+      expect(mockCanGoBack).toHaveBeenCalled();
+      expect(mockGoBack).toHaveBeenCalled();
     });
-
-    it('renders chart when market has at least one open outcome', () => {
-      const mixedStatusMarket = createMockMarket({
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Option A',
-            status: 'closed',
-            tokens: [{ id: 'token-1', price: 1.0 }],
-            volume: 1000000,
-          },
-          {
-            id: 'outcome-2',
-            title: 'Option B',
-            status: 'open',
-            tokens: [{ id: 'token-2', price: 0.5 }],
-            volume: 500000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(mixedStatusMarket);
-
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.DETAILS_CHART),
-      ).toBeOnTheScreen();
-    });
-
-    it('limits chart data to first 3 open outcomes when more are available', () => {
-      const { usePredictPriceHistory } = jest.requireMock(
-        '../../hooks/usePredictPriceHistory',
-      );
-
-      const marketWithManyOutcomes = createMockMarket({
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Option A',
-            status: 'open',
-            tokens: [{ id: 'token-1', price: 0.25 }],
-            volume: 1000000,
-          },
-          {
-            id: 'outcome-2',
-            title: 'Option B',
-            status: 'open',
-            tokens: [{ id: 'token-2', price: 0.25 }],
-            volume: 800000,
-          },
-          {
-            id: 'outcome-3',
-            title: 'Option C',
-            status: 'open',
-            tokens: [{ id: 'token-3', price: 0.25 }],
-            volume: 600000,
-          },
-          {
-            id: 'outcome-4',
-            title: 'Option D',
-            status: 'open',
-            tokens: [{ id: 'token-4', price: 0.25 }],
-            volume: 400000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(marketWithManyOutcomes);
-
-      expect(usePredictPriceHistory).toHaveBeenCalledWith(
-        expect.objectContaining({
-          marketIds: ['token-1', 'token-2', 'token-3'],
-        }),
-      );
-    });
-
-    it('filters out closed outcomes from chart data', () => {
-      const { usePredictPriceHistory } = jest.requireMock(
-        '../../hooks/usePredictPriceHistory',
-      );
-
-      const marketWithMixedStatus = createMockMarket({
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Option A',
-            status: 'closed',
-            tokens: [{ id: 'token-1', price: 1.0 }],
-            volume: 1000000,
-          },
-          {
-            id: 'outcome-2',
-            title: 'Option B',
-            status: 'open',
-            tokens: [{ id: 'token-2', price: 0.6 }],
-            volume: 800000,
-          },
-          {
-            id: 'outcome-3',
-            title: 'Option C',
-            status: 'open',
-            tokens: [{ id: 'token-3', price: 0.4 }],
-            volume: 600000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(marketWithMixedStatus);
-
-      expect(usePredictPriceHistory).toHaveBeenCalledWith(
-        expect.objectContaining({
-          marketIds: ['token-2', 'token-3'],
-        }),
-      );
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.DETAILS_CHART),
-      ).toBeOnTheScreen();
-    });
-
-    it('removes chart when closed market lacks open outcomes', () => {
-      const emptyOutcomesMarket = createMockMarket({
-        status: 'closed',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Placeholder',
-            status: 'closed',
-            tokens: [
-              { id: 'token-1', title: 'Token', price: 0.5 },
-              { id: 'token-2', title: 'Token 2', price: 0.5 },
-            ],
-            volume: 0,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(emptyOutcomesMarket);
-
-      expect(
-        screen.queryByTestId(PredictMarketDetailsSelectorsIDs.DETAILS_CHART),
-      ).not.toBeOnTheScreen();
-    });
-
-    it('renders chart even when outcomes have no tokens', () => {
-      const noTokensMarket = createMockMarket({
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Option A',
-            status: 'open',
-            tokens: [],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(noTokensMarket);
-
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.DETAILS_CHART),
-      ).toBeOnTheScreen();
-    });
-  });
-
-  describe('Tab Navigation', () => {
-    it('renders tab bar with correct tabs', () => {
-      setupPredictMarketDetailsTest();
-
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.TAB_BAR),
-      ).toBeOnTheScreen();
-      expect(
-        screen.getByTestId(
-          PredictMarketDetailsSelectorsIDs.SCROLLABLE_TAB_VIEW,
-        ),
-      ).toBeOnTheScreen();
-    });
-
-    it('displays About tab content', () => {
-      setupPredictMarketDetailsTest();
-
-      const aboutTab = screen.getByTestId(
-        getPredictMarketDetailsSelector.tabBarTab('about'),
-      );
-      fireEvent.press(aboutTab);
-
-      expect(
-        screen.getByText('predict.market_details.volume'),
-      ).toBeOnTheScreen();
-      expect(
-        screen.getByText('predict.market_details.end_date'),
-      ).toBeOnTheScreen();
-      expect(
-        screen.getByText('predict.market_details.resolution_details'),
-      ).toBeOnTheScreen();
-    });
-
-    it('hides Positions tab when user has no positions', () => {
-      setupPredictMarketDetailsTest();
-
-      expect(
-        screen.queryByText('predict.tabs.positions'),
-      ).not.toBeOnTheScreen();
-    });
-  });
-
-  describe('Action Buttons', () => {
-    it('renders Yes and No action buttons for single outcome markets', () => {
-      const singleOutcomeMarket = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: 0.65 },
-              { id: 'token-2', title: 'No', price: 0.35 },
-            ],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(singleOutcomeMarket);
-
-      const actionButtons = getActionButtons();
-      const buttonLabels = actionButtons.map(getActionButtonText);
-
-      expect(actionButtons).toHaveLength(2);
-      expect(buttonLabels).toEqual(
-        expect.arrayContaining(['Yes•65¢', 'No•35¢']),
-      );
-    });
-
-    it('calculates percentage correctly from market price', () => {
-      const marketWithDifferentPrice = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: 0.75 },
-              { id: 'token-2', title: 'No', price: 0.25 },
-            ],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(marketWithDifferentPrice);
-
-      const actionButtons = getActionButtons();
-      const buttonLabels = actionButtons.map(getActionButtonText);
-
-      expect(buttonLabels).toEqual(
-        expect.arrayContaining(['Yes•75¢', 'No•25¢']),
-      );
-    });
-  });
-
-  describe('Navigation Functionality', () => {
-    it('handles back button press correctly', () => {
-      const { mockGoBack, mockCanGoBack } = setupPredictMarketDetailsTest();
-
-      const backButton = screen.getByTestId(
-        getPredictMarketDetailsSelector.icon('ArrowLeft'),
-      );
-      fireEvent.press(backButton);
-
-      expect(mockCanGoBack).toHaveBeenCalled();
-      expect(mockGoBack).toHaveBeenCalled();
-    });
-
-    it('navigates to predict root when current navigation cannot go back', () => {
-      const { mockCanGoBack, mockNavigate } = setupPredictMarketDetailsTest();
-      mockCanGoBack.mockReturnValue(false);
-
-      const backButton = screen.getByTestId(
-        getPredictMarketDetailsSelector.icon('ArrowLeft'),
-      );
-      fireEvent.press(backButton);
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT);
-    });
-  });
-
-  describe('Current Prediction Display', () => {
-    it('displays current prediction percentage for single outcome markets', () => {
-      const singleOutcomeMarket = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: 0.65 },
-              { id: 'token-2', title: 'No', price: 0.35 },
-            ],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(singleOutcomeMarket);
-
-      // The component now shows the percentage in the action buttons instead of a separate text
-      const actionButtons = getActionButtons();
-      const buttonLabels = actionButtons.map(getActionButtonText);
-
-      expect(buttonLabels).toContain('Yes•65¢');
-    });
-
-    it('handles missing price data gracefully', () => {
-      const marketWithoutPrice = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: undefined },
-              { id: 'token-2', title: 'No', price: 0.35 },
-            ],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(marketWithoutPrice);
-
-      // Each button now shows its own token's price: the Yes token has no
-      // price so it shows 0c, while the No token shows its real 35c (no longer
-      // the synthetic 100 - yes complement).
-      const actionButtons = getActionButtons();
-      const buttonLabels = actionButtons.map(getActionButtonText);
-
-      expect(buttonLabels).toEqual(
-        expect.arrayContaining(['Yes•0¢', 'No•35¢']),
-      );
-    });
-  });
+  });
 
   describe('Edge Cases', () => {
     it('handles market without image', () => {
@@ -1539,19 +1003,6 @@ describe('PredictMarketDetails', () => {
       expect(screen.getByText(marketWithoutImage.title)).toBeOnTheScreen();
     });
 
-    it('handles market without end date', () => {
-      const marketWithoutEndDate = createMockMarket({ endDate: null });
-
-      setupPredictMarketDetailsTest(marketWithoutEndDate);
-
-      const aboutTab = screen.getByTestId(
-        getPredictMarketDetailsSelector.tabBarTab('about'),
-      );
-      fireEvent.press(aboutTab);
-
-      expect(screen.getByText('N/A')).toBeOnTheScreen();
-    });
-
     it('handles market with minimal data', () => {
       const marketWithMinimalData = createMockMarket({
         outcomes: [
@@ -1582,88 +1033,7 @@ describe('PredictMarketDetails', () => {
   });
 
   describe('Event Handlers', () => {
-    it('handles timeframe change with valid timeframe', () => {
-      const { mockMarket } = setupPredictMarketDetailsTest();
-
-      // Find the chart component and trigger timeframe change
-      const chartComponent = screen.getByTestId(
-        PredictMarketDetailsSelectorsIDs.DETAILS_CHART,
-      );
-      expect(chartComponent).toBeOnTheScreen();
-
-      // The timeframe change is handled internally by the component
-      // We can verify the component renders without errors
-      expect(screen.getByText(mockMarket.title)).toBeOnTheScreen();
-    });
-
-    it('cash out uses context sell sheet instead of navigation', () => {
-      const mockPosition = {
-        id: 'position-1',
-        outcomeId: 'outcome-1',
-        outcome: 'Yes',
-        size: 100,
-        initialValue: 65,
-        currentValue: 70,
-        avgPrice: 0.65,
-        percentPnl: 7.7,
-        icon: 'https://example.com/icon.png',
-      };
-
-      setupPredictMarketDetailsTest(
-        { status: 'open' },
-        {},
-        { positions: { data: [mockPosition] } },
-      );
-
-      const positionsTab = screen.getByTestId(
-        getPredictMarketDetailsSelector.tabBarTab('positions'),
-      );
-      fireEvent.press(positionsTab);
-
-      const cashOutButton = screen.getByText('predict.cash_out');
-      fireEvent.press(cashOutButton);
-
-      expect(mockOpenSellSheet).toHaveBeenCalledWith(
-        expect.objectContaining({
-          position: mockPosition,
-          entryPoint: 'predict_market_details',
-        }),
-      );
-    });
-
-    it('calls openBuySheet via context when Yes button is pressed', () => {
-      const singleOutcomeMarket = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: 0.65 },
-              { id: 'token-2', title: 'No', price: 0.35 },
-            ],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(singleOutcomeMarket);
-
-      const yesButton = findActionButtonByPrice(65);
-      expect(yesButton).toBeDefined();
-      fireEvent.press(yesButton as ReactTestInstance);
-
-      expect(mockOpenBuySheet).toHaveBeenCalledWith(
-        expect.objectContaining({
-          market: singleOutcomeMarket,
-          outcome: singleOutcomeMarket.outcomes[0],
-          outcomeToken: singleOutcomeMarket.outcomes[0].tokens[0],
-          entryPoint: 'predict_market_details',
-        }),
-      );
-    });
-
-    it('calls openBuySheet via context when No button is pressed', () => {
+    it('calls openBuySheet with the pressed outcome token', () => {
       const singleOutcomeMarket = createMockMarket({
         status: 'open',
         outcomes: [
@@ -1728,78 +1098,15 @@ describe('PredictMarketDetails', () => {
       const refreshControl = screen.UNSAFE_getByType(RefreshControl);
 
       expect(refreshControl).toBeTruthy();
-      expect(refreshControl.props.tintColor).toBeTruthy();
-      expect(refreshControl.props.colors).toEqual([
-        refreshControl.props.tintColor,
-      ]);
-      expect(refreshControl.props.refreshing).toBe(false);
-    });
-
-    it('triggers market, price history, and active positions refresh', async () => {
-      const mockRefetchMarket = jest.fn(() => Promise.resolve());
-      const mockRefetchPriceHistory = jest.fn(() => Promise.resolve());
-      const mockRefetchActivePositions = jest.fn(() => Promise.resolve());
-
-      setupPredictMarketDetailsTest(
-        {},
-        {},
-        {
-          market: { refetch: mockRefetchMarket },
-          priceHistory: { refetch: mockRefetchPriceHistory },
-          positions: { refetch: mockRefetchActivePositions },
-        },
-      );
-
-      const refreshControl = screen.UNSAFE_getByType(RefreshControl);
-
-      await act(async () => {
-        await fireEvent(refreshControl, 'refresh');
-      });
-
-      await waitFor(() => {
-        expect(mockRefetchMarket).toHaveBeenCalledTimes(1);
-        expect(mockRefetchPriceHistory).toHaveBeenCalledTimes(1);
-        expect(mockRefetchActivePositions).toHaveBeenCalled();
-      });
-    });
-  });
-
-  describe('Conditional Rendering', () => {
-    it('renders positions section when user has positions', () => {
-      const mockPosition = {
-        id: 'position-1',
-        outcomeId: 'outcome-1',
-        outcome: 'Yes',
-        title: 'Yes',
-        size: 100,
-        initialValue: 65,
-        currentValue: 70,
-        avgPrice: 0.65,
-        percentPnl: 7.7,
-        icon: 'https://example.com/icon.png',
-      };
-
-      setupPredictMarketDetailsTest(
-        { status: 'open' },
-        {},
-        { positions: { data: [mockPosition] } },
-      );
-
-      // Switch to Positions tab (index 0 when positions exist)
-      const positionsTab = screen.getByTestId(
-        getPredictMarketDetailsSelector.tabBarTab('positions'),
-      );
-      fireEvent.press(positionsTab);
-
-      expect(screen.getByText('predict.cash_out')).toBeOnTheScreen();
-      expect(
-        screen.getByText('$65.00 on Yes to win $100.00', {
-          exact: false,
-        }),
-      ).toBeOnTheScreen();
-      expect(screen.getByText('+7.69%')).toBeOnTheScreen();
+      expect(refreshControl.props.tintColor).toBeTruthy();
+      expect(refreshControl.props.colors).toEqual([
+        refreshControl.props.tintColor,
+      ]);
+      expect(refreshControl.props.refreshing).toBe(false);
     });
+  });
 
+  describe('Conditional Rendering', () => {
     it('renders position with negative PnL correctly', () => {
       const mockPosition = {
         id: 'position-1',
@@ -1829,85 +1136,6 @@ describe('PredictMarketDetails', () => {
       expect(screen.getByText('7.69%')).toBeOnTheScreen();
     });
 
-    it('renders outcomes tab for multi-outcome markets', () => {
-      const multiOutcomeMarket = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Option A',
-            status: 'open',
-            tokens: [{ id: 'token-1', price: 0.4 }],
-            volume: 1000000,
-          },
-          {
-            id: 'outcome-2',
-            title: 'Option B',
-            status: 'open',
-            tokens: [{ id: 'token-2', price: 0.3 }],
-            volume: 500000,
-          },
-          {
-            id: 'outcome-3',
-            title: 'Option C',
-            status: 'open',
-            tokens: [{ id: 'token-3', price: 0.3 }],
-            volume: 300000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(multiOutcomeMarket);
-
-      // Outcomes is the default tab when there are no positions
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.OUTCOMES_TAB),
-      ).toBeOnTheScreen();
-    });
-
-    it('does not render outcomes tab for single outcome markets', () => {
-      const singleOutcomeMarket = createMockMarket({
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [{ id: 'token-1', price: 0.65 }],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(singleOutcomeMarket);
-
-      // Should not render outcomes tab for single outcome
-      expect(screen.queryByText('Outcomes')).not.toBeOnTheScreen();
-    });
-
-    it('renders current prediction section only for single outcome markets', () => {
-      const singleOutcomeMarket = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: 0.65 },
-              { id: 'token-2', title: 'No', price: 0.35 },
-            ],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(singleOutcomeMarket);
-
-      // The component now shows the percentage in the action buttons instead of a separate text
-      const actionButtons = getActionButtons();
-      const buttonLabels = actionButtons.map(getActionButtonText);
-
-      expect(buttonLabels).toContain('Yes•65¢');
-    });
-
     it('renders action buttons only for single outcome markets', () => {
       const singleOutcomeMarket = createMockMarket({
         status: 'open',
@@ -1935,57 +1163,6 @@ describe('PredictMarketDetails', () => {
     });
   });
 
-  describe('Crypto Up/Down Branching', () => {
-    beforeEach(() => {
-      jest.clearAllMocks();
-      mockSelectPredictUpDownEnabledFlag = false;
-      const { isCryptoUpDown } = jest.requireMock('../../utils/cryptoUpDown');
-      isCryptoUpDown.mockReturnValue(false);
-    });
-
-    it('renders PredictCryptoUpDownDetails when upDownEnabled and isCryptoUpDown are true', () => {
-      const { isCryptoUpDown } = jest.requireMock('../../utils/cryptoUpDown');
-      mockSelectPredictUpDownEnabledFlag = true;
-      isCryptoUpDown.mockReturnValue(true);
-
-      setupPredictMarketDetailsTest();
-
-      expect(
-        screen.getByTestId('predict-crypto-up-down-details'),
-      ).toBeOnTheScreen();
-    });
-
-    it('renders default market details when upDownEnabled is false', () => {
-      const { isCryptoUpDown } = jest.requireMock('../../utils/cryptoUpDown');
-      mockSelectPredictUpDownEnabledFlag = false;
-      isCryptoUpDown.mockReturnValue(true);
-
-      setupPredictMarketDetailsTest();
-
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.SCREEN),
-      ).toBeOnTheScreen();
-      expect(
-        screen.queryByTestId('predict-crypto-up-down-details'),
-      ).not.toBeOnTheScreen();
-    });
-
-    it('renders default market details when isCryptoUpDown returns false', () => {
-      const { isCryptoUpDown } = jest.requireMock('../../utils/cryptoUpDown');
-      mockSelectPredictUpDownEnabledFlag = true;
-      isCryptoUpDown.mockReturnValue(false);
-
-      setupPredictMarketDetailsTest();
-
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.SCREEN),
-      ).toBeOnTheScreen();
-      expect(
-        screen.queryByTestId('predict-crypto-up-down-details'),
-      ).not.toBeOnTheScreen();
-    });
-  });
-
   describe('Data Processing Functions', () => {
     it('handles position with groupItemTitle correctly', () => {
       const mockMarket = createMockMarket({
@@ -2118,239 +1295,49 @@ describe('PredictMarketDetails', () => {
           {
             id: 'outcome-1',
             title: 'Yes',
-            tokens: [], // Empty tokens array
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(marketWithMissingData);
-
-      // Since this is a single outcome market with empty tokens, it should not render the current prediction
-      // Instead, verify the market title is rendered
-      expect(
-        screen.getByText('Will Bitcoin reach $100k by end of 2024?'),
-      ).toBeOnTheScreen();
-    });
-
-    it('handles market with undefined price correctly', () => {
-      const marketWithUndefinedPrice = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: undefined },
-              { id: 'token-2', title: 'No', price: 0.35 },
-            ],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(marketWithUndefinedPrice);
-
-      // Yes has no price -> 0c; No shows its own price (35c), not 100 - yes.
-      const yesButton = findActionButtonByPrice(0);
-      const noButton = findActionButtonByPrice(35);
-
-      expect(yesButton).toBeDefined();
-      expect(noButton).toBeDefined();
-    });
-  });
-
-  describe('Closed Market Functionality', () => {
-    it('displays winning outcome when market is closed', () => {
-      const closedMarket = createMockMarket({
-        status: 'closed',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            groupItemTitle: 'Yes',
-            tokens: [
-              { id: 'token-1', price: 1.0 }, // Winning token
-            ],
-            volume: 1000000,
-          },
-          {
-            id: 'outcome-2',
-            title: 'No',
-            groupItemTitle: 'No',
-            tokens: [
-              { id: 'token-2', price: 0.0 }, // Losing token
-            ],
-            volume: 500000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(closedMarket);
-
-      expect(
-        screen.getByText('predict.market_details.market_ended_on'),
-      ).toBeOnTheScreen();
-    });
-
-    it('renders claim button when market is closed', () => {
-      const closedMarket = createMockMarket({
-        status: 'closed',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [{ id: 'token-1', price: 1.0 }],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(
-        closedMarket,
-        {},
-        {
-          positions: {
-            claimable: {
-              data: [
-                {
-                  id: 'position-1',
-                  outcomeId: 'outcome-1',
-                  outcome: 'Yes',
-                  size: 10,
-                  initialValue: 10,
-                  currentValue: 12,
-                  avgPrice: 0.5,
-                  percentPnl: 20,
-                },
-              ],
-            },
-          },
-        },
-      );
-
-      expect(
-        screen.getByText(strings('predict.claim_winnings_text')),
-      ).toBeOnTheScreen();
-    });
-
-    it('handles claim button press', async () => {
-      const mockClaim = jest.fn();
-      const { usePredictClaim } = jest.requireMock(
-        '../../hooks/usePredictClaim',
-      );
-      usePredictClaim.mockReturnValue({
-        claim: mockClaim,
-      });
-
-      const closedMarket = createMockMarket({
-        status: 'closed',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [{ id: 'token-1', price: 1.0 }],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(
-        closedMarket,
-        {},
-        {
-          positions: {
-            claimable: {
-              data: [
-                {
-                  id: 'position-1',
-                  outcomeId: 'outcome-1',
-                  outcome: 'Yes',
-                  size: 10,
-                  initialValue: 10,
-                  currentValue: 12,
-                  avgPrice: 0.5,
-                  percentPnl: 20,
-                },
-              ],
-            },
-          },
-        },
-      );
-
-      const claimButton = screen.getByText(
-        strings('predict.claim_winnings_text'),
-      );
-      fireEvent.press(claimButton);
-
-      expect(mockClaim).toHaveBeenCalled();
-    });
-
-    it('renders outcomes tab for closed markets', () => {
-      const closedMarket = createMockMarket({
-        status: 'closed',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [{ id: 'token-1', price: 1.0 }],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(closedMarket);
-
-      // Outcomes is the default tab when there are no positions
-      expect(
-        screen.getAllByTestId('predict-market-outcome').length,
-      ).toBeGreaterThan(0);
-    });
-
-    it('sets timeframe to MAX when market is closed', () => {
-      const closedMarket = createMockMarket({
-        status: 'closed',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [{ id: 'token-1', price: 1.0 }],
+            tokens: [], // Empty tokens array
             volume: 1000000,
           },
         ],
       });
 
-      setupPredictMarketDetailsTest(closedMarket);
+      setupPredictMarketDetailsTest(marketWithMissingData);
 
-      // Verify the component renders without errors
+      // Since this is a single outcome market with empty tokens, it should not render the current prediction
+      // Instead, verify the market title is rendered
       expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.SCREEN),
+        screen.getByText('Will Bitcoin reach $100k by end of 2024?'),
       ).toBeOnTheScreen();
     });
 
-    it('finds winning outcome token when market is closed', () => {
-      const closedMarket = createMockMarket({
-        status: 'closed',
+    it('handles market with undefined price correctly', () => {
+      const marketWithUndefinedPrice = createMockMarket({
+        status: 'open',
         outcomes: [
           {
             id: 'outcome-1',
             title: 'Yes',
-            groupItemTitle: 'Yes',
             tokens: [
-              { id: 'token-1', price: 1.0 }, // Winning token
+              { id: 'token-1', title: 'Yes', price: undefined },
+              { id: 'token-2', title: 'No', price: 0.35 },
             ],
             volume: 1000000,
           },
         ],
       });
 
-      setupPredictMarketDetailsTest(closedMarket);
+      setupPredictMarketDetailsTest(marketWithUndefinedPrice);
 
-      expect(
-        screen.getByText('predict.market_details.market_ended_on'),
-      ).toBeOnTheScreen();
+      // Yes has no price -> 0c; No shows its own price (35c), not 100 - yes.
+      const yesButton = findActionButtonByPrice(0);
+      const noButton = findActionButtonByPrice(35);
+
+      expect(yesButton).toBeDefined();
+      expect(noButton).toBeDefined();
     });
+  });
 
+  describe('Closed Market Functionality', () => {
     it('handles market without winning token', () => {
       const closedMarket = createMockMarket({
         status: 'closed',
@@ -2693,68 +1680,6 @@ describe('PredictMarketDetails', () => {
       });
     });
 
-    it('navigates to unavailable modal when user is not eligible - Yes button', () => {
-      const singleOutcomeMarket = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: 0.65 },
-              { id: 'token-2', title: 'No', price: 0.35 },
-            ],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      const { mockNavigate } = setupPredictMarketDetailsTest(
-        singleOutcomeMarket,
-        {},
-        { eligibility: { isEligible: false } },
-      );
-
-      const yesButton = findActionButtonByPrice(65);
-      expect(yesButton).toBeDefined();
-      fireEvent.press(yesButton as ReactTestInstance);
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.MODALS.ROOT, {
-        screen: Routes.PREDICT.MODALS.UNAVAILABLE,
-      });
-    });
-
-    it('navigates to unavailable modal when user is not eligible - No button', () => {
-      const singleOutcomeMarket = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: 0.65 },
-              { id: 'token-2', title: 'No', price: 0.35 },
-            ],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      const { mockNavigate } = setupPredictMarketDetailsTest(
-        singleOutcomeMarket,
-        {},
-        { eligibility: { isEligible: false } },
-      );
-
-      const noButton = findActionButtonByPrice(35);
-      expect(noButton).toBeDefined();
-      fireEvent.press(noButton as ReactTestInstance);
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.MODALS.ROOT, {
-        screen: Routes.PREDICT.MODALS.UNAVAILABLE,
-      });
-    });
-
     it('checks eligibility before balance for Yes button', () => {
       const { usePredictBalance } = jest.requireMock(
         '../../hooks/usePredictBalance',
@@ -2847,61 +1772,6 @@ describe('PredictMarketDetails', () => {
   });
 
   describe('Closed Market Tab Selection', () => {
-    it('defaults to Outcomes tab when market is closed and no tab is selected', () => {
-      const closedMarket = createMockMarket({
-        status: 'closed',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            groupItemTitle: 'Yes Outcome',
-            status: 'closed',
-            tokens: [
-              { id: 't1', price: 1, title: 'Yes' },
-              { id: 't2', price: 0, title: 'No' },
-            ],
-            volume: 1000000,
-          },
-          {
-            id: 'outcome-2',
-            title: 'No',
-            groupItemTitle: 'No Outcome',
-            status: 'closed',
-            tokens: [
-              { id: 't3', price: 0, title: 'Yes' },
-              { id: 't4', price: 1, title: 'No' },
-            ],
-            volume: 500000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(closedMarket);
-
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.OUTCOMES_TAB),
-      ).toBeOnTheScreen();
-      expect(screen.getByText('Yes Outcome')).toBeOnTheScreen();
-      expect(screen.getByText('No Outcome')).toBeOnTheScreen();
-    });
-
-    it('keeps user-selected About tab on closed market', () => {
-      const closedMarket = createMockMarket({
-        status: 'closed',
-      });
-
-      setupPredictMarketDetailsTest(closedMarket);
-
-      const aboutTab = screen.getByTestId(
-        getPredictMarketDetailsSelector.tabBarTab('about'),
-      );
-      fireEvent.press(aboutTab);
-
-      expect(
-        screen.getByText('predict.market_details.volume'),
-      ).toBeOnTheScreen();
-    });
-
     it('resets to Outcomes when selected tab becomes invalid after tabs change on closed market', async () => {
       const closedMarket = createMockMarket({
         status: 'closed',
@@ -2958,72 +1828,6 @@ describe('PredictMarketDetails', () => {
   });
 
   describe('Multiple Open Outcomes Partially Resolved', () => {
-    it('renders expandable resolved outcomes section when market has multiple outcomes with some resolved', () => {
-      const marketWithPartialResolution = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Option A',
-            groupItemTitle: 'Option A',
-            status: 'closed',
-            resolutionStatus: 'resolved',
-            tokens: [
-              { id: 'token-1', price: 1.0, title: 'Won' },
-              { id: 'token-2', price: 0.0, title: 'Lost' },
-            ],
-            volume: 1000000,
-          },
-          {
-            id: 'outcome-2',
-            title: 'Option B',
-            groupItemTitle: 'Option B',
-            status: 'open',
-            tokens: [{ id: 'token-3', price: 0.5 }],
-            volume: 500000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(marketWithPartialResolution);
-
-      expect(screen.getByText('predict.resolved_outcomes')).toBeOnTheScreen();
-    });
-
-    it('renders chart when market has open outcomes despite partial resolution', () => {
-      const marketWithPartialResolution = createMockMarket({
-        status: 'open',
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Option A',
-            groupItemTitle: 'Option A',
-            status: 'closed',
-            resolutionStatus: 'resolved',
-            tokens: [
-              { id: 'token-1', price: 1.0, title: 'Won' },
-              { id: 'token-2', price: 0.0, title: 'Lost' },
-            ],
-            volume: 1000000,
-          },
-          {
-            id: 'outcome-2',
-            title: 'Option B',
-            groupItemTitle: 'Option B',
-            status: 'open',
-            tokens: [{ id: 'token-3', price: 0.5 }],
-            volume: 500000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(marketWithPartialResolution);
-
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.DETAILS_CHART),
-      ).toBeOnTheScreen();
-    });
-
     it('displays resolved outcomes count badge', () => {
       const marketWithPartialResolution = createMockMarket({
         status: 'open',
@@ -3656,54 +2460,6 @@ describe('PredictMarketDetails', () => {
   });
 
   describe('Fee Exemption Display', () => {
-    it('displays fee exemption message when market tag matches waiveList', () => {
-      const marketWithWaivedTag = createMockMarket({
-        status: 'open',
-        tags: ['middle-east'],
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: 0.65 },
-              { id: 'token-2', title: 'No', price: 0.35 },
-            ],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(marketWithWaivedTag);
-
-      expect(
-        screen.getByText('predict.market_details.fee_exemption'),
-      ).toBeOnTheScreen();
-    });
-
-    it('hides fee exemption message when market tags do not match waiveList', () => {
-      const marketWithNonWaivedTags = createMockMarket({
-        status: 'open',
-        tags: ['sports', 'politics'],
-        outcomes: [
-          {
-            id: 'outcome-1',
-            title: 'Yes',
-            tokens: [
-              { id: 'token-1', title: 'Yes', price: 0.65 },
-              { id: 'token-2', title: 'No', price: 0.35 },
-            ],
-            volume: 1000000,
-          },
-        ],
-      });
-
-      setupPredictMarketDetailsTest(marketWithNonWaivedTags);
-
-      expect(
-        screen.queryByText('predict.market_details.fee_exemption'),
-      ).not.toBeOnTheScreen();
-    });
-
     it('hides fee exemption message when market has no tags', () => {
       const marketWithoutTags = createMockMarket({
         status: 'open',
@@ -3860,27 +2616,6 @@ describe('PredictMarketDetails', () => {
   });
 
   describe('Game Details Content', () => {
-    it('renders PredictGameDetailsContent when market has game property', () => {
-      const gameMarket = createMockMarket({
-        title: 'NFL: Team A vs Team B',
-        game: {
-          homeTeam: { name: 'Team A', abbreviation: 'TA' },
-          awayTeam: { name: 'Team B', abbreviation: 'TB' },
-          startTime: '2024-12-31T20:00:00Z',
-          status: 'scheduled',
-        },
-      });
-
-      setupPredictMarketDetailsTest(gameMarket);
-
-      expect(
-        screen.getByTestId(
-          PredictMarketDetailsSelectorsIDs.GAME_DETAILS_CONTENT,
-        ),
-      ).toBeOnTheScreen();
-      expect(screen.getByText('NFL: Team A vs Team B')).toBeOnTheScreen();
-    });
-
     it('threads childMarketIds to usePredictPositions for both active and claimable queries', () => {
       const marketWithChildren = createMockMarket({
         childMarketIds: ['child-1', 'child-2'],
@@ -3907,23 +2642,5 @@ describe('PredictMarketDetails', () => {
         expect.objectContaining({ childMarketIds: ['child-1', 'child-2'] }),
       );
     });
-
-    it('renders regular market details when market has no game property', () => {
-      const regularMarket = createMockMarket({
-        title: 'Will Bitcoin reach $100k?',
-        game: undefined,
-      });
-
-      setupPredictMarketDetailsTest(regularMarket);
-
-      expect(
-        screen.queryByTestId(
-          PredictMarketDetailsSelectorsIDs.GAME_DETAILS_CONTENT,
-        ),
-      ).not.toBeOnTheScreen();
-      expect(
-        screen.getByTestId(PredictMarketDetailsSelectorsIDs.SCREEN),
-      ).toBeOnTheScreen();
-    });
   });
 });
diff --git a/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.view.test.tsx b/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.view.test.tsx
index c41031ed0989..f8886826fbdd 100644
--- a/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.view.test.tsx
+++ b/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.view.test.tsx
@@ -1,6 +1,11 @@
 /**
  * Component view tests for PredictMarketDetails.
  *
+ * Behaviour is driven through Engine spies (getMarket, getPositions,
+ * getPriceHistory, claimWithConfirmation), route params and Redux overrides —
+ * never by mocking hooks. The sibling unit file keeps only the contracts that
+ * are not observable from the screen (hook call arguments, chart fidelity).
+ *
  * Run with: yarn jest -c jest.config.view.js PredictMarketDetails.view.test --runInBand --silent --coverage=false
  */
 import '../../../../../../tests/component-view/mocks';
@@ -9,46 +14,174 @@ import {
   renderPredictMarketDetailsView,
   renderPredictMarketDetailsViewWithRoutes,
 } from '../../../../../../tests/component-view/renderers/predictMarketDetails';
-import { fireEvent, waitFor, within } from '@testing-library/react-native';
-import { PredictMarketDetailsSelectorsIDs } from '../../Predict.testIds';
+import {
+  act,
+  cleanup,
+  fireEvent,
+  waitFor,
+  within,
+} from '@testing-library/react-native';
+import { Image } from 'expo-image';
+import {
+  getPredictMarketDetailsSelector,
+  PredictCryptoUpDownDetailsSelectorsIDs,
+  PredictMarketDetailsSelectorsIDs,
+} from '../../Predict.testIds';
 import Routes from '../../../../../constants/navigation/Routes';
-import { MOCK_PREDICT_MARKET } from '../../../../../../tests/component-view/fixtures/predict';
+import {
+  MOCK_PREDICT_MARKET,
+  MOCK_PREDICT_CLOSED_MARKET,
+  MOCK_PREDICT_LIVE_SPORT_MARKET,
+  MOCK_PREDICT_MULTI_OUTCOME_MARKET,
+  MOCK_PREDICT_PARTIALLY_RESOLVED_MARKET,
+  buildMockPredictPosition,
+} from '../../../../../../tests/component-view/fixtures/predict';
+import { PREDICT_GAME_DETAILS_CONTENT_TEST_IDS } from '../../components/PredictGameDetailsContent/PredictGameDetailsContent.testIds';
+import type {
+  PredictMarket,
+  PredictPosition,
+  PredictPriceHistoryPoint,
+} from '../../types';
+
+const MARKET_ID = MOCK_PREDICT_MARKET.id;
+
+const controllerMock = (
+  method: keyof typeof Engine.context.PredictController,
+): jest.Mock =>
+  Engine.context.PredictController[method] as unknown as jest.Mock;
+
+const givenMarket = (market: PredictMarket | null) =>
+  controllerMock('getMarket').mockResolvedValue(market);
+
+const givenPositions = (positions: PredictPosition[]) =>
+  controllerMock('getPositions').mockResolvedValue(positions);
+
+const givenPriceHistory = (points: PredictPriceHistoryPoint[]) =>
+  controllerMock('getPriceHistory').mockResolvedValue(points);
+
+/** Redux delta that makes the user eligible to trade. */
+const ELIGIBLE_USER = {
+  engine: {
+    backgroundState: {
+      PredictController: {
+        eligibility: { eligible: true, country: 'US' },
+      },
+    },
+  },
+};
+
+/**
+ * Eligible user with the bottom sheet flag on, so buy previews open in place
+ * instead of navigating to the full-screen preview route.
+ */
+const ELIGIBLE_USER_WITH_BUY_SHEET = {
+  engine: {
+    backgroundState: {
+      PredictController: {
+        eligibility: { eligible: true, country: 'US' },
+      },
+      RemoteFeatureFlagController: {
+        remoteFeatureFlags: {
+          predictBottomSheet: {
+            enabled: true,
+            featureVersion: '1.0.0',
+            minimumVersion: '0.0.1',
+          },
+        },
+      },
+    },
+  },
+};
+
+/** Redux delta that turns on the dedicated crypto up/down details screen. */
+const UP_DOWN_ENABLED = {
+  engine: {
+    backgroundState: {
+      RemoteFeatureFlagController: {
+        remoteFeatureFlags: {
+          predictUpDown: {
+            enabled: true,
+            featureVersion: '1.0.0',
+            minimumVersion: '0.0.1',
+          },
+        },
+      },
+    },
+  },
+};
+
+/** `isCryptoUpDown` requires series metadata plus the crypto and up-or-down tags. */
+const CRYPTO_UP_DOWN_MARKET: PredictMarket = {
+  ...MOCK_PREDICT_MARKET,
+  id: 'market-btc-up-down',
+  slug: 'btc-up-or-down-5m',
+  title: 'BTC Up or Down - 5 Minutes',
+  category: 'crypto',
+  tags: ['crypto', 'up-or-down', 'bitcoin'],
+  endDate: '2026-12-31T00:05:00.000Z',
+  series: {
+    id: 'btc-up-down-series',
+    slug: 'btc-up-or-down-5m',
+    title: 'BTC Up or Down - 5 Minutes',
+    recurrence: '5m',
+  },
+};
+
+/** Redux delta that waives fees for markets tagged `middle-east`. */
+const FEES_WAIVED_FOR_MIDDLE_EAST = {
+  engine: {
+    backgroundState: {
+      RemoteFeatureFlagController: {
+        remoteFeatureFlags: {
+          predictFeeCollection: {
+            enabled: true,
+            collector: '0x0000000000000000000000000000000000000001',
+            metamaskFee: 0.02,
+            providerFee: 0.02,
+            waiveList: ['middle-east'],
+            executors: [],
+            permit2Enabled: false,
+          },
+        },
+      },
+    },
+  },
+};
 
 describe('PredictMarketDetails', () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    givenMarket(MOCK_PREDICT_MARKET);
+    givenPositions([]);
+    givenPriceHistory([]);
+    controllerMock('getMarketSeries').mockResolvedValue([]);
+    controllerMock('claimWithConfirmation').mockResolvedValue(undefined);
+  });
+
   describe('initial load', () => {
     it('calls getMarket with the marketId from route params when the screen mounts', async () => {
-      const getMarketSpy = jest.spyOn(
-        Engine.context.PredictController,
-        'getMarket',
-      );
-      getMarketSpy.mockResolvedValue(MOCK_PREDICT_MARKET);
+      const getMarketSpy = controllerMock('getMarket');
 
       renderPredictMarketDetailsView({
-        initialParams: { marketId: 'market-btc-1' },
+        initialParams: { marketId: MARKET_ID },
       });
 
       await waitFor(() => {
         expect(getMarketSpy).toHaveBeenCalledWith(
-          expect.objectContaining({ marketId: 'market-btc-1' }),
+          expect.objectContaining({ marketId: MARKET_ID }),
         );
       });
-
-      getMarketSpy.mockRestore();
     });
 
     it('shows complete market data in the details screen after getMarket resolves', async () => {
-      // Arrange
-      const getMarketSpy = jest.spyOn(
-        Engine.context.PredictController,
-        'getMarket',
-      );
-      getMarketSpy.mockResolvedValue(MOCK_PREDICT_MARKET);
       const { findByTestId, findByText } = renderPredictMarketDetailsView({
-        initialParams: { marketId: 'market-btc-1' },
+        initialParams: { marketId: MARKET_ID },
       });
 
-      // Assert — all significant fields of the loaded market are visible on screen.
-      // The async resolution of getMarket is the event under test (not a render scenario).
       const screen = await findByTestId(
         PredictMarketDetailsSelectorsIDs.SCREEN,
       );
@@ -57,30 +190,108 @@ describe('PredictMarketDetails', () => {
           within(screen).getByText(MOCK_PREDICT_MARKET.title),
         ).toBeOnTheScreen();
       });
-      expect(await findByText(/Yes.*¢/)).toBeOnTheScreen();
-      expect(await findByText(/No.*¢/)).toBeOnTheScreen();
-
-      getMarketSpy.mockRestore();
+      expect(await findByText('Yes • 65¢')).toBeOnTheScreen();
+      expect(await findByText('No • 35¢')).toBeOnTheScreen();
     });
 
-    it('tracks geo block and navigates to unavailable modal when the user presses a bet button while ineligible', async () => {
-      const trackGeoBlockSpy = jest.spyOn(
-        Engine.context.PredictController,
-        'trackGeoBlockTriggered',
+    it('shows the loading skeleton until the market request resolves', async () => {
+      let resolveMarket: (market: PredictMarket) => void = () => undefined;
+      controllerMock('getMarket').mockImplementation(
+        () =>
+          new Promise<PredictMarket>((resolve) => {
+            resolveMarket = resolve;
+          }),
       );
-      const getMarketSpy = jest.spyOn(
-        Engine.context.PredictController,
-        'getMarket',
+
+      const { findByTestId, queryByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+      });
+
+      expect(
+        await findByTestId(
+          PredictMarketDetailsSelectorsIDs.DETAILS_CONTENT_SKELETON_LINE_1,
+        ),
+      ).toBeOnTheScreen();
+
+      resolveMarket(MOCK_PREDICT_MARKET);
+
+      await waitFor(() => {
+        expect(
+          queryByTestId(
+            PredictMarketDetailsSelectorsIDs.DETAILS_CONTENT_SKELETON_LINE_1,
+          ),
+        ).not.toBeOnTheScreen();
+      });
+    });
+
+    it('keeps showing the loading skeleton when the route carries no resolvable market', async () => {
+      givenMarket(null);
+
+      const { findByTestId, queryByTestId } = renderPredictMarketDetailsView({
+        initialParams: {
+          series: { id: '', slug: '', title: '', recurrence: '5m' },
+        },
+      });
+
+      expect(
+        await findByTestId(
+          PredictMarketDetailsSelectorsIDs.DETAILS_CONTENT_SKELETON_LINE_1,
+        ),
+      ).toBeOnTheScreen();
+      expect(
+        queryByTestId(PredictMarketDetailsSelectorsIDs.MARKET_UNAVAILABLE),
+      ).not.toBeOnTheScreen();
+    });
+
+    it('prefers the title and image from route params over the loaded market data', async () => {
+      let resolveMarket: (market: PredictMarket) => void = () => undefined;
+      controllerMock('getMarket').mockImplementation(
+        () =>
+          new Promise<PredictMarket>((resolve) => {
+            resolveMarket = resolve;
+          }),
       );
-      getMarketSpy.mockResolvedValue(MOCK_PREDICT_MARKET);
+
+      const { findByTestId, findByText, queryByText, UNSAFE_getByType } =
+        renderPredictMarketDetailsView({
+          initialParams: {
+            marketId: MARKET_ID,
+            title: 'Title from the feed card',
+            image: 'https://example.com/feed-card.png',
+          },
+        });
+
+      expect(
+        await findByTestId(
+          PredictMarketDetailsSelectorsIDs.DETAILS_CONTENT_SKELETON_LINE_1,
+        ),
+      ).toBeOnTheScreen();
+      expect(queryByText('Title from the feed card')).not.toBeOnTheScreen();
+
+      await act(async () => {
+        resolveMarket({
+          ...MOCK_PREDICT_MARKET,
+          title: 'Title from getMarket',
+          image: 'https://example.com/market.png',
+        });
+      });
+
+      expect(await findByText('Title from the feed card')).toBeOnTheScreen();
+      expect(queryByText('Title from getMarket')).not.toBeOnTheScreen();
+      expect(UNSAFE_getByType(Image).props.source).toEqual({
+        uri: 'https://example.com/feed-card.png',
+      });
+    });
+
+    it('tracks geo block and navigates to unavailable modal when the user presses a bet button while ineligible', async () => {
+      const trackGeoBlockSpy = controllerMock('trackGeoBlockTriggered');
 
       const { findByText, findByTestId } =
         renderPredictMarketDetailsViewWithRoutes({
-          initialParams: { marketId: 'market-btc-1' },
+          initialParams: { marketId: MARKET_ID },
           extraRoutes: [{ name: Routes.PREDICT.MODALS.ROOT }],
         });
 
-      // Bet button label is "Yes • {yesPercentage}¢"; press it while ineligible
       fireEvent.press(await findByText(/Yes.*¢/));
 
       await waitFor(() => {
@@ -91,47 +302,74 @@ describe('PredictMarketDetails', () => {
       expect(
         await findByTestId(`route-${Routes.PREDICT.MODALS.ROOT}`),
       ).toBeOnTheScreen();
+    });
+
+    it('shows the share button once the market has loaded', async () => {
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+      });
+
+      expect(
+        await findByTestId(PredictMarketDetailsSelectorsIDs.SHARE_BUTTON),
+      ).toBeOnTheScreen();
+    });
+
+    it('resolves the market from the series in route params when no marketId is given', async () => {
+      const seriesMarket = {
+        ...MOCK_PREDICT_MARKET,
+        id: 'market-from-series',
+        title: 'Resolved from series',
+      };
+      controllerMock('getMarketSeries').mockResolvedValue([seriesMarket]);
+      givenMarket(seriesMarket);
+
+      const { findByText } = renderPredictMarketDetailsView({
+        initialParams: {
+          series: {
+            id: 'btc-series',
+            slug: 'btc-up-or-down-5m',
+            title: 'BTC Up or Down',
+            recurrence: '5m',
+          },
+        },
+      });
 
-      getMarketSpy.mockRestore();
-      trackGeoBlockSpy.mockRestore();
+      expect(await findByText('Resolved from series')).toBeOnTheScreen();
     });
 
     it('calls trackMarketDetailsOpened when the market and positions finish loading', async () => {
-      const trackSpy = jest.spyOn(
-        Engine.context.PredictController,
-        'trackMarketDetailsOpened',
-      );
-      const getMarketSpy = jest.spyOn(
-        Engine.context.PredictController,
-        'getMarket',
-      );
-      getMarketSpy.mockResolvedValue(MOCK_PREDICT_MARKET);
+      const trackSpy = controllerMock('trackMarketDetailsOpened');
 
       renderPredictMarketDetailsView({
-        initialParams: { marketId: 'market-btc-1' },
+        initialParams: { marketId: MARKET_ID },
       });
 
       await waitFor(() => {
         expect(trackSpy).toHaveBeenCalledWith(
-          expect.objectContaining({ marketId: 'market-btc-1' }),
+          expect.objectContaining({ marketId: MARKET_ID }),
         );
       });
+    });
+
+    it('reports the entry point the user arrived from', async () => {
+      const trackSpy = controllerMock('trackMarketDetailsOpened');
+
+      renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID, entryPoint: 'explore' },
+      });
 
-      getMarketSpy.mockRestore();
-      trackSpy.mockRestore();
+      await waitFor(() => {
+        expect(trackSpy).toHaveBeenCalledWith(
+          expect.objectContaining({ entryPoint: 'explore' }),
+        );
+      });
     });
   });
 
   describe('back navigation', () => {
     it('navigates to the Predict root when the user presses back from the details screen', async () => {
-      const getMarketSpy = jest.spyOn(
-        Engine.context.PredictController,
-        'getMarket',
-      );
-      getMarketSpy.mockResolvedValue(MOCK_PREDICT_MARKET);
-
       const { findByTestId } = renderPredictMarketDetailsViewWithRoutes({
-        initialParams: { marketId: 'market-btc-1' },
+        initialParams: { marketId: MARKET_ID },
         extraRoutes: [{ name: Routes.PREDICT.ROOT }],
       });
 
@@ -144,8 +382,443 @@ describe('PredictMarketDetails', () => {
       expect(
         await findByTestId(`route-${Routes.PREDICT.ROOT}`),
       ).toBeOnTheScreen();
+    });
+  });
+
+  describe('about tab', () => {
+    it('shows volume, end date and the resolution provider for the loaded market', async () => {
+      givenMarket({ ...MOCK_PREDICT_MARKET, endDate: '2026-12-31' });
+
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+      });
+
+      const aboutTab = await findByTestId(
+        PredictMarketDetailsSelectorsIDs.ABOUT_TAB_CONTENT,
+      );
+      expect(within(aboutTab).getByText('Volume')).toBeOnTheScreen();
+      expect(within(aboutTab).getByText('$1M')).toBeOnTheScreen();
+      expect(within(aboutTab).getByText('End date')).toBeOnTheScreen();
+      expect(
+        within(aboutTab).getByText(new Date('2026-12-31').toLocaleDateString()),
+      ).toBeOnTheScreen();
+      expect(within(aboutTab).getByText('Polymarket')).toBeOnTheScreen();
+      expect(
+        within(aboutTab).getByText(MOCK_PREDICT_MARKET.description),
+      ).toBeOnTheScreen();
+    });
+
+    it('shows N/A as the end date when the market has none', async () => {
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+      });
+
+      const aboutTab = await findByTestId(
+        PredictMarketDetailsSelectorsIDs.ABOUT_TAB_CONTENT,
+      );
+      expect(within(aboutTab).getByText('N/A')).toBeOnTheScreen();
+    });
+
+    it('opens the Polymarket resolution docs when the user presses the provider link', async () => {
+      const { findByTestId, findByText } =
+        renderPredictMarketDetailsViewWithRoutes({
+          initialParams: { marketId: MARKET_ID },
+          extraRoutes: [{ name: Routes.WEBVIEW.MAIN }],
+        });
+
+      await findByTestId(PredictMarketDetailsSelectorsIDs.ABOUT_TAB_CONTENT);
+      fireEvent.press(await findByText('Polymarket'));
+
+      expect(
+        await findByTestId(`route-${Routes.WEBVIEW.MAIN}`),
+      ).toBeOnTheScreen();
+    });
+  });
+
+  describe('tabs', () => {
+    it('shows only the About tab for an open binary market with no positions', async () => {
+      const { findByTestId, queryByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+      });
+
+      await findByTestId(PredictMarketDetailsSelectorsIDs.ABOUT_TAB);
+      expect(
+        queryByTestId(PredictMarketDetailsSelectorsIDs.POSITIONS_TAB),
+      ).not.toBeOnTheScreen();
+      expect(
+        queryByTestId(PredictMarketDetailsSelectorsIDs.OUTCOMES_TAB),
+      ).not.toBeOnTheScreen();
+    });
+
+    it('adds an Outcomes tab for a market with several outcomes', async () => {
+      givenMarket(MOCK_PREDICT_MULTI_OUTCOME_MARKET);
+
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MOCK_PREDICT_MULTI_OUTCOME_MARKET.id },
+      });
+
+      expect(
+        await findByTestId(PredictMarketDetailsSelectorsIDs.OUTCOMES_TAB),
+      ).toBeOnTheScreen();
+    });
+
+    it('shows the user position and a cash out CTA on the Positions tab', async () => {
+      givenPositions([buildMockPredictPosition()]);
+
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+      });
+
+      const positionsTab = await findByTestId(
+        PredictMarketDetailsSelectorsIDs.POSITIONS_TAB_CONTENT,
+      );
+      expect(
+        within(positionsTab).getByText('$50 on Yes to win $50'),
+      ).toBeOnTheScreen();
+      expect(within(positionsTab).getByText('$60')).toBeOnTheScreen();
+      expect(
+        within(positionsTab).getByTestId(
+          PredictMarketDetailsSelectorsIDs.MARKET_DETAILS_CASH_OUT_BUTTON,
+        ),
+      ).toBeOnTheScreen();
+    });
+
+    it('opens the sell preview sheet when the user cashes a position out', async () => {
+      givenPositions([buildMockPredictPosition()]);
+
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+        overrides: ELIGIBLE_USER_WITH_BUY_SHEET,
+      });
+
+      fireEvent.press(
+        await findByTestId(
+          PredictMarketDetailsSelectorsIDs.MARKET_DETAILS_CASH_OUT_BUTTON,
+        ),
+      );
+
+      expect(
+        await findByTestId(PredictMarketDetailsSelectorsIDs.SELL_PREVIEW_SHEET),
+      ).toBeOnTheScreen();
+    });
+
+    it('tracks the newly selected tab when the user switches tabs', async () => {
+      givenMarket(MOCK_PREDICT_MULTI_OUTCOME_MARKET);
+      const trackSpy = controllerMock('trackMarketDetailsOpened');
+
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MOCK_PREDICT_MULTI_OUTCOME_MARKET.id },
+      });
+
+      fireEvent.press(
+        await findByTestId(PredictMarketDetailsSelectorsIDs.ABOUT_TAB),
+      );
+
+      await waitFor(() => {
+        expect(trackSpy).toHaveBeenCalledWith(
+          expect.objectContaining({ marketDetailsViewed: 'about' }),
+        );
+      });
+    });
+  });
+
+  describe('buy actions', () => {
+    it('shows 0¢ on the buy buttons when the outcome has no tradable price', async () => {
+      givenMarket({
+        ...MOCK_PREDICT_MARKET,
+        outcomes: [
+          {
+            ...MOCK_PREDICT_MARKET.outcomes[0],
+            tokens: [
+              { id: 'token-yes', title: 'Yes', price: 0 },
+              { id: 'token-no', title: 'No', price: 0 },
+            ],
+          },
+        ],
+      });
+
+      const { findByText } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+      });
+
+      expect(await findByText('Yes • 0¢')).toBeOnTheScreen();
+      expect(await findByText('No • 0¢')).toBeOnTheScreen();
+    });
+
+    // Whether the bottom action bar renders at all for a multi-outcome market
+    // is owned by PredictMarketDetailsActions.test.tsx ("renders nothing when
+    // no action state is active"); the bar has no testID to assert on here.
+    it('lists every outcome of a multi-outcome market on the Outcomes tab', async () => {
+      givenMarket(MOCK_PREDICT_MULTI_OUTCOME_MARKET);
+
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MOCK_PREDICT_MULTI_OUTCOME_MARKET.id },
+      });
+
+      const outcomesTab = await findByTestId(
+        PredictMarketDetailsSelectorsIDs.OUTCOMES_TAB_CONTENT,
+      );
+      expect(within(outcomesTab).getByText('Alice')).toBeOnTheScreen();
+      expect(within(outcomesTab).getByText('Bob')).toBeOnTheScreen();
+      expect(within(outcomesTab).getByText('Carol')).toBeOnTheScreen();
+    });
+
+    it('opens the buy preview sheet when an eligible user presses a bet button', async () => {
+      const { findByText, findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+        overrides: ELIGIBLE_USER_WITH_BUY_SHEET,
+      });
+
+      fireEvent.press(await findByText('Yes • 65¢'));
+
+      expect(
+        await findByTestId(PredictMarketDetailsSelectorsIDs.BUY_PREVIEW_SHEET),
+      ).toBeOnTheScreen();
+    });
+  });
+
+  describe('fee waiver', () => {
+    it('tells the user fees are waived when the market carries a waived tag', async () => {
+      givenMarket({ ...MOCK_PREDICT_MARKET, tags: ['middle-east'] });
+
+      const { findByText } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+        overrides: FEES_WAIVED_FOR_MIDDLE_EAST,
+      });
+
+      expect(
+        await findByText("We don't charge any fees on this market."),
+      ).toBeOnTheScreen();
+    });
+
+    it('does not mention waived fees for a market outside the waive list', async () => {
+      givenMarket({ ...MOCK_PREDICT_MARKET, tags: ['politics'] });
+
+      const { findByTestId, queryByText } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+        overrides: FEES_WAIVED_FOR_MIDDLE_EAST,
+      });
+
+      await findByTestId(PredictMarketDetailsSelectorsIDs.ABOUT_TAB_CONTENT);
+      expect(
+        queryByText("We don't charge any fees on this market."),
+      ).not.toBeOnTheScreen();
+    });
+  });
+
+  describe('closed market', () => {
+    it('shows the resolved outcome and opens on the Outcomes tab', async () => {
+      givenMarket(MOCK_PREDICT_CLOSED_MARKET);
+
+      const { findByTestId, findByText } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MOCK_PREDICT_CLOSED_MARKET.id },
+      });
+
+      expect(await findByText('Market resulted to Yes')).toBeOnTheScreen();
+      expect(
+        await findByTestId(
+          PredictMarketDetailsSelectorsIDs.OUTCOMES_TAB_CONTENT,
+        ),
+      ).toBeOnTheScreen();
+    });
+
+    it('lets the user switch to the About tab on a closed market', async () => {
+      givenMarket(MOCK_PREDICT_CLOSED_MARKET);
+
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MOCK_PREDICT_CLOSED_MARKET.id },
+      });
+
+      fireEvent.press(
+        await findByTestId(PredictMarketDetailsSelectorsIDs.ABOUT_TAB),
+      );
+
+      expect(
+        await findByTestId(PredictMarketDetailsSelectorsIDs.ABOUT_TAB_CONTENT),
+      ).toBeOnTheScreen();
+    });
+
+    it('claims through the controller when the user presses the claim button', async () => {
+      givenMarket(MOCK_PREDICT_CLOSED_MARKET);
+      givenPositions([
+        buildMockPredictPosition({
+          marketId: MOCK_PREDICT_CLOSED_MARKET.id,
+          claimable: true,
+          percentPnl: 42,
+        }),
+      ]);
+      const claimSpy = controllerMock('claimWithConfirmation');
+
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MOCK_PREDICT_CLOSED_MARKET.id },
+        overrides: ELIGIBLE_USER,
+      });
+
+      fireEvent.press(
+        await findByTestId(
+          PredictMarketDetailsSelectorsIDs.CLAIM_WINNINGS_BUTTON,
+        ),
+      );
+
+      await waitFor(() => {
+        expect(claimSpy).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('partially resolved market', () => {
+    it('expands the resolved outcomes section when the user presses it', async () => {
+      givenMarket(MOCK_PREDICT_PARTIALLY_RESOLVED_MARKET);
+
+      const { findByTestId, findByText, queryByTestId } =
+        renderPredictMarketDetailsView({
+          initialParams: {
+            marketId: MOCK_PREDICT_PARTIALLY_RESOLVED_MARKET.id,
+          },
+        });
+
+      fireEvent.press(
+        await findByTestId(PredictMarketDetailsSelectorsIDs.OUTCOMES_TAB),
+      );
+
+      const resolvedSection = await findByText('Resolved outcomes');
+      expect(
+        queryByTestId(getPredictMarketDetailsSelector.icon('ArrowUp')),
+      ).not.toBeOnTheScreen();
+
+      fireEvent.press(resolvedSection);
+
+      expect(
+        await findByTestId(getPredictMarketDetailsSelector.icon('ArrowUp')),
+      ).toBeOnTheScreen();
+    });
+  });
+
+  // The chart renders no testID of its own, so it is identified by the
+  // timeframe selector it always renders alongside the graph.
+  describe('chart', () => {
+    it('shows the price chart with its timeframe options for a market with an open outcome', async () => {
+      givenPriceHistory([
+        { timestamp: 1_767_225_600, price: 0.6 },
+        { timestamp: 1_767_312_000, price: 0.65 },
+      ]);
+
+      const { findByText } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+      });
+
+      expect(await findByText('1D')).toBeOnTheScreen();
+      expect(await findByText('MAX')).toBeOnTheScreen();
+    });
+
+    it('requests price history for the timeframe the user selects', async () => {
+      const getPriceHistorySpy = controllerMock('getPriceHistory');
+
+      const { findByText } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+      });
+
+      fireEvent.press(await findByText('1W'));
+
+      await waitFor(() => {
+        expect(getPriceHistorySpy).toHaveBeenCalledWith(
+          expect.objectContaining({ interval: '1w' }),
+        );
+      });
+    });
+
+    it('hides the chart when the market has no open outcome', async () => {
+      givenMarket(MOCK_PREDICT_CLOSED_MARKET);
+
+      const { findByTestId, queryByText } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MOCK_PREDICT_CLOSED_MARKET.id },
+      });
+
+      await findByTestId(PredictMarketDetailsSelectorsIDs.OUTCOMES_TAB_CONTENT);
+      expect(queryByText('MAX')).not.toBeOnTheScreen();
+    });
+  });
+
+  describe('branch screens', () => {
+    it('shows the game scoreboard instead of the standard details for a game market', async () => {
+      givenMarket(MOCK_PREDICT_LIVE_SPORT_MARKET);
+
+      const { findByTestId, queryByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MOCK_PREDICT_LIVE_SPORT_MARKET.id },
+      });
+
+      expect(
+        await findByTestId(
+          PREDICT_GAME_DETAILS_CONTENT_TEST_IDS.GAME_SCOREBOARD,
+        ),
+      ).toBeOnTheScreen();
+      expect(
+        queryByTestId(PredictMarketDetailsSelectorsIDs.TAB_BAR),
+      ).not.toBeOnTheScreen();
+    });
+
+    it('shows the crypto up/down screen when the flag is on and the market is an up/down market', async () => {
+      givenMarket(CRYPTO_UP_DOWN_MARKET);
+
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: CRYPTO_UP_DOWN_MARKET.id },
+        overrides: UP_DOWN_ENABLED,
+      });
+
+      expect(
+        await findByTestId(PredictCryptoUpDownDetailsSelectorsIDs.SCREEN),
+      ).toBeOnTheScreen();
+    });
+
+    it('shows the standard details screen for an up/down market while the flag is off', async () => {
+      givenMarket(CRYPTO_UP_DOWN_MARKET);
+
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: CRYPTO_UP_DOWN_MARKET.id },
+      });
+
+      expect(
+        await findByTestId(PredictMarketDetailsSelectorsIDs.SCREEN),
+      ).toBeOnTheScreen();
+    });
+  });
+
+  describe('pull to refresh', () => {
+    it('refetches the market, its price history and the positions', async () => {
+      const getMarketSpy = controllerMock('getMarket');
+      const getPositionsSpy = controllerMock('getPositions');
+      const getPriceHistorySpy = controllerMock('getPriceHistory');
+
+      const { findByTestId } = renderPredictMarketDetailsView({
+        initialParams: { marketId: MARKET_ID },
+      });
+
+      const scrollView = await findByTestId(
+        PredictMarketDetailsSelectorsIDs.SCROLLABLE_TAB_VIEW,
+      );
+      await waitFor(() => {
+        expect(getPriceHistorySpy).toHaveBeenCalled();
+      });
+
+      const marketCallsBefore = getMarketSpy.mock.calls.length;
+      const positionCallsBefore = getPositionsSpy.mock.calls.length;
+      const priceHistoryCallsBefore = getPriceHistorySpy.mock.calls.length;
 
-      getMarketSpy.mockRestore();
+      await act(async () => {
+        await scrollView.props.refreshControl.props.onRefresh();
+      });
+
+      await waitFor(() => {
+        expect(getMarketSpy.mock.calls.length).toBeGreaterThan(
+          marketCallsBefore,
+        );
+      });
+      expect(getPositionsSpy.mock.calls.length).toBeGreaterThan(
+        positionCallsBefore,
+      );
+      expect(getPriceHistorySpy.mock.calls.length).toBeGreaterThan(
+        priceHistoryCallsBefore,
+      );
     });
   });
 });
diff --git a/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.test.tsx b/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.test.tsx
index fd71f87198c2..f4d04767b57b 100644
--- a/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.test.tsx
+++ b/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.test.tsx
@@ -1,12 +1,15 @@
+/**
+ * Unit tests for PredictPositionsView.
+ *
+ * Run with: yarn jest PredictPositionsView.test --runInBand --silent --coverage=false
+ */
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react-native';
 import { useNavigation, useRoute } from '@react-navigation/native';
-import Routes from '../../../../../constants/navigation/Routes';
 import Engine from '../../../../../core/Engine';
 import { PredictEventValues } from '../../constants/eventNames';
 import type { PredictPortfolioModel } from '../../hooks/usePredictPortfolio';
 import {
-  PredictPositionsEmptySelectorsIDs,
   PredictPositionsHistoryListSelectorsIDs,
   PredictPositionsViewSelectorsIDs,
 } from '../../Predict.testIds';
@@ -221,12 +224,6 @@ const renderScreen = (
   return render(<PredictPositionsView />);
 };
 
-const getMountedByTestId = (testID: string) =>
-  screen.UNSAFE_getByProps({ testID });
-
-const getMountedHistoryVisibilityText = (isVisible: boolean) =>
-  screen.UNSAFE_getByProps({ children: `history-visible:${isVisible}` });
-
 describe('PredictPositionsView', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -246,313 +243,228 @@ describe('PredictPositionsView', () => {
     ).PredictController = predictController;
   });
 
-  it('renders the fixed header, summary placeholder, tabs, and positions tab by default', () => {
-    renderScreen();
-
-    expect(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.CONTAINER),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.HEADER),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.SUMMARY),
-    ).toBeOnTheScreen();
-    expect(screen.getByText('$0.00')).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.TABS),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.POSITIONS_TAB),
-    ).toBeOnTheScreen();
-    expect(screen.getByText('Active positions')).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(
-        PredictPositionsViewSelectorsIDs.POSITIONS_TAB_CONTENT,
-      ),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(PredictPositionsEmptySelectorsIDs.CONTAINER),
-    ).toBeOnTheScreen();
-    expect(
-      getMountedByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB_CONTENT),
-    ).toBeTruthy();
-    expect(getMountedHistoryVisibilityText(false)).toBeTruthy();
-  });
-
-  it('tracks Positions screen viewed without duplicating the default tab', () => {
-    mockUsePredictPortfolio.mockReturnValue(
-      createPortfolio({
-        claimableAmount: 46.35,
-        claimablePositionCount: 1,
-        hasClaimableWinnings: true,
-        openPositionCount: 2,
-        portfolioValue: 4000,
-        totalUnrealizedPnlAmount: -18.47,
-      }),
-    );
-
-    renderScreen();
-
-    expect(mockTrackPositionsScreenViewed).toHaveBeenCalledWith(
-      expectedPositionsAnalyticsContext({
-        openPositionsCount: 2,
-        claimablePositionsCount: 1,
-        hasClaimableWinnings: true,
-      }),
-    );
-    expect(mockTrackPositionsTabViewed).not.toHaveBeenCalled();
-
-    const payload = mockTrackPositionsScreenViewed.mock.calls[0][0];
-    expect(payload).not.toHaveProperty('claimableAmount');
-    expect(payload).not.toHaveProperty('portfolioValue');
-    expect(payload).not.toHaveProperty('totalUnrealizedPnlAmount');
-  });
-
-  it('waits for portfolio data before tracking Positions screen viewed', () => {
-    mockUsePredictPortfolio
-      .mockReturnValueOnce(
-        createPortfolio({
-          isLoading: true,
-        }),
-      )
-      .mockReturnValue(
+  describe('analytics timing', () => {
+    it('tracks Positions screen viewed without duplicating the default tab', () => {
+      mockUsePredictPortfolio.mockReturnValue(
         createPortfolio({
-          claimablePositionCount: 3,
+          claimableAmount: 46.35,
+          claimablePositionCount: 1,
           hasClaimableWinnings: true,
-          isLoading: false,
-          openPositionCount: 6,
+          openPositionCount: 2,
+          portfolioValue: 4000,
+          totalUnrealizedPnlAmount: -18.47,
         }),
       );
 
-    const { rerender } = renderScreen();
-
-    expect(mockTrackPositionsScreenViewed).not.toHaveBeenCalled();
-
-    rerender(<PredictPositionsView />);
+      renderScreen();
 
-    expect(mockTrackPositionsScreenViewed).toHaveBeenCalledTimes(1);
-    expect(mockTrackPositionsScreenViewed).toHaveBeenCalledWith(
-      expectedPositionsAnalyticsContext({
-        claimablePositionsCount: 3,
-        hasClaimableWinnings: true,
-        openPositionsCount: 6,
-      }),
-    );
-  });
+      expect(mockTrackPositionsScreenViewed).toHaveBeenCalledWith(
+        expectedPositionsAnalyticsContext({
+          openPositionsCount: 2,
+          claimablePositionsCount: 1,
+          hasClaimableWinnings: true,
+        }),
+      );
+      expect(mockTrackPositionsTabViewed).not.toHaveBeenCalled();
 
-  it('does not duplicate History tab tracking when data loads after the tab press', () => {
-    let portfolio = createPortfolio({
-      isLoading: true,
+      const payload = mockTrackPositionsScreenViewed.mock.calls[0][0];
+      expect(payload).not.toHaveProperty('claimableAmount');
+      expect(payload).not.toHaveProperty('portfolioValue');
+      expect(payload).not.toHaveProperty('totalUnrealizedPnlAmount');
     });
-    mockUsePredictPortfolio.mockImplementation(() => portfolio);
 
-    const { rerender } = renderScreen();
+    it('waits for portfolio data before tracking Positions screen viewed', () => {
+      mockUsePredictPortfolio
+        .mockReturnValueOnce(
+          createPortfolio({
+            isLoading: true,
+          }),
+        )
+        .mockReturnValue(
+          createPortfolio({
+            claimablePositionCount: 3,
+            hasClaimableWinnings: true,
+            isLoading: false,
+            openPositionCount: 6,
+          }),
+        );
 
-    fireEvent.press(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB),
-    );
+      const { rerender } = renderScreen();
 
-    expect(mockTrackPositionsScreenViewed).not.toHaveBeenCalled();
-    expect(mockTrackPositionsTabViewed).toHaveBeenCalledTimes(1);
-    expect(mockTrackPositionsTabViewed).toHaveBeenCalledWith(
-      expectedPositionsAnalyticsContext({
-        predictFeedTab: PredictEventValues.PREDICT_FEED_TAB.HISTORY,
-      }),
-    );
+      expect(mockTrackPositionsScreenViewed).not.toHaveBeenCalled();
 
-    portfolio = createPortfolio({
-      claimablePositionCount: 3,
-      hasClaimableWinnings: true,
-      isLoading: false,
-      openPositionCount: 6,
-    });
+      rerender(<PredictPositionsView />);
 
-    rerender(<PredictPositionsView />);
-
-    expect(mockTrackPositionsScreenViewed).toHaveBeenCalledTimes(1);
-    expect(mockTrackPositionsScreenViewed).toHaveBeenCalledWith(
-      expectedPositionsAnalyticsContext({
-        claimablePositionsCount: 3,
-        hasClaimableWinnings: true,
-        openPositionsCount: 6,
-      }),
-    );
-    expect(mockTrackPositionsTabViewed).toHaveBeenCalledTimes(1);
-  });
+      expect(mockTrackPositionsScreenViewed).toHaveBeenCalledTimes(1);
+      expect(mockTrackPositionsScreenViewed).toHaveBeenCalledWith(
+        expectedPositionsAnalyticsContext({
+          claimablePositionsCount: 3,
+          hasClaimableWinnings: true,
+          openPositionsCount: 6,
+        }),
+      );
+    });
 
-  it('tracks Active positions tab when the selected tab is pressed again', () => {
-    renderScreen();
+    it('does not duplicate History tab tracking when data loads after the tab press', () => {
+      let portfolio = createPortfolio({
+        isLoading: true,
+      });
+      mockUsePredictPortfolio.mockImplementation(() => portfolio);
 
-    expect(mockTrackPositionsTabViewed).not.toHaveBeenCalled();
+      const { rerender } = renderScreen();
 
-    fireEvent.press(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.POSITIONS_TAB),
-    );
+      fireEvent.press(
+        screen.getByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB),
+      );
 
-    expect(mockTrackPositionsTabViewed).toHaveBeenCalledTimes(1);
-    expect(mockTrackPositionsTabViewed).toHaveBeenCalledWith(
-      expectedPositionsAnalyticsContext({
-        predictFeedTab: PredictEventValues.PREDICT_FEED_TAB.POSITIONS,
-      }),
-    );
-  });
+      expect(mockTrackPositionsScreenViewed).not.toHaveBeenCalled();
+      expect(mockTrackPositionsTabViewed).toHaveBeenCalledTimes(1);
+      expect(mockTrackPositionsTabViewed).toHaveBeenCalledWith(
+        expectedPositionsAnalyticsContext({
+          predictFeedTab: PredictEventValues.PREDICT_FEED_TAB.HISTORY,
+        }),
+      );
 
-  it('uses the initial history tab from route params', () => {
-    renderScreen({ initialTab: 'history' });
-
-    expect(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB_CONTENT),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(PredictPositionsHistoryListSelectorsIDs.CONTAINER),
-    ).toBeOnTheScreen();
-    expect(screen.getByText('history-visible:true')).toBeOnTheScreen();
-    expect(
-      getMountedByTestId(
-        PredictPositionsViewSelectorsIDs.POSITIONS_TAB_CONTENT,
-      ),
-    ).toBeTruthy();
-    expect(mockTrackPositionsScreenViewed).toHaveBeenCalledWith(
-      expectedPositionsAnalyticsContext(),
-    );
-    expect(mockTrackPositionsTabViewed).toHaveBeenCalledTimes(1);
-    expect(mockTrackPositionsTabViewed).toHaveBeenCalledWith(
-      expectedPositionsAnalyticsContext({
-        predictFeedTab: PredictEventValues.PREDICT_FEED_TAB.HISTORY,
-      }),
-    );
-  });
+      portfolio = createPortfolio({
+        claimablePositionCount: 3,
+        hasClaimableWinnings: true,
+        isLoading: false,
+        openPositionCount: 6,
+      });
 
-  it('switches between Positions and History tabs', () => {
-    renderScreen();
+      rerender(<PredictPositionsView />);
 
-    fireEvent.press(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB),
-    );
+      expect(mockTrackPositionsScreenViewed).toHaveBeenCalledTimes(1);
+      expect(mockTrackPositionsScreenViewed).toHaveBeenCalledWith(
+        expectedPositionsAnalyticsContext({
+          claimablePositionsCount: 3,
+          hasClaimableWinnings: true,
+          openPositionsCount: 6,
+        }),
+      );
+      expect(mockTrackPositionsTabViewed).toHaveBeenCalledTimes(1);
+    });
 
-    expect(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB_CONTENT),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(PredictPositionsHistoryListSelectorsIDs.CONTAINER),
-    ).toBeOnTheScreen();
-    expect(screen.getByText('history-visible:true')).toBeOnTheScreen();
+    it('tracks Active positions tab when the selected tab is pressed again', () => {
+      renderScreen();
 
-    fireEvent.press(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.POSITIONS_TAB),
-    );
+      expect(mockTrackPositionsTabViewed).not.toHaveBeenCalled();
 
-    expect(
-      screen.getByTestId(
-        PredictPositionsViewSelectorsIDs.POSITIONS_TAB_CONTENT,
-      ),
-    ).toBeOnTheScreen();
-    expect(getMountedHistoryVisibilityText(false)).toBeTruthy();
-    expect(mockTrackPositionsScreenViewed).toHaveBeenCalledTimes(1);
-    expect(mockTrackPositionsTabViewed).toHaveBeenNthCalledWith(
-      1,
-      expectedPositionsAnalyticsContext({
-        predictFeedTab: PredictEventValues.PREDICT_FEED_TAB.HISTORY,
-      }),
-    );
-    expect(mockTrackPositionsTabViewed).toHaveBeenNthCalledWith(
-      2,
-      expectedPositionsAnalyticsContext({
-        predictFeedTab: PredictEventValues.PREDICT_FEED_TAB.POSITIONS,
-      }),
-    );
-    expect(mockTrackPositionsTabViewed).toHaveBeenCalledTimes(2);
-  });
+      fireEvent.press(
+        screen.getByTestId(PredictPositionsViewSelectorsIDs.POSITIONS_TAB),
+      );
 
-  it('passes only actionable claimable positions and privacy mode to History', () => {
-    mockPrivacyMode = true;
-    const wonPosition = createClaimablePosition({ id: 'won-position' });
-    const lostPosition = createClaimablePosition({
-      currentValue: 0,
-      id: 'lost-position',
-      status: PredictPositionStatus.LOST,
+      expect(mockTrackPositionsTabViewed).toHaveBeenCalledTimes(1);
+      expect(mockTrackPositionsTabViewed).toHaveBeenCalledWith(
+        expectedPositionsAnalyticsContext({
+          predictFeedTab: PredictEventValues.PREDICT_FEED_TAB.POSITIONS,
+        }),
+      );
     });
-    mockUsePredictPortfolio.mockReturnValue(
-      createPortfolio({
-        actionableClaimablePositions: [wonPosition],
-        claimablePositions: [wonPosition, lostPosition],
-      }),
-    );
 
-    renderScreen('history');
+    it('tracks History tab from initialTab route params without duplicating screen fields', () => {
+      renderScreen({ initialTab: 'history' });
 
-    expect(
-      screen.getByText('history-claim-pending-present:true'),
-    ).toBeOnTheScreen();
-    expect(screen.getByText('history-claim-pending-count:1')).toBeOnTheScreen();
-    expect(screen.getByText('history-refresh-present:true')).toBeOnTheScreen();
-    expect(screen.getByText('history-privacy:true')).toBeOnTheScreen();
+      expect(mockTrackPositionsScreenViewed).toHaveBeenCalledWith(
+        expectedPositionsAnalyticsContext(),
+      );
+      expect(mockTrackPositionsTabViewed).toHaveBeenCalledTimes(1);
+      expect(mockTrackPositionsTabViewed).toHaveBeenCalledWith(
+        expectedPositionsAnalyticsContext({
+          predictFeedTab: PredictEventValues.PREDICT_FEED_TAB.HISTORY,
+        }),
+      );
+    });
   });
 
-  it('passes no claim pending positions to History when only lost positions exist', () => {
-    mockUsePredictPortfolio.mockReturnValue(
-      createPortfolio({
-        claimablePositions: [
-          createClaimablePosition({
-            currentValue: 0,
-            id: 'lost-position',
-            status: PredictPositionStatus.LOST,
-          }),
-        ],
-      }),
-    );
-
-    renderScreen('history');
-
-    expect(
-      screen.getByText('history-claim-pending-present:true'),
-    ).toBeOnTheScreen();
-    expect(screen.getByText('history-claim-pending-count:0')).toBeOnTheScreen();
-  });
+  describe('claim-pending History wiring', () => {
+    it('passes only actionable claimable positions and privacy mode to History', () => {
+      mockPrivacyMode = true;
+      const wonPosition = createClaimablePosition({ id: 'won-position' });
+      const lostPosition = createClaimablePosition({
+        currentValue: 0,
+        id: 'lost-position',
+        status: PredictPositionStatus.LOST,
+      });
+      mockUsePredictPortfolio.mockReturnValue(
+        createPortfolio({
+          actionableClaimablePositions: [wonPosition],
+          claimablePositions: [wonPosition, lostPosition],
+        }),
+      );
 
-  it('does not pass claim pending positions to History when portfolio flag is disabled', () => {
-    mockPredictPortfolioEnabled = false;
-    mockUsePredictPortfolio.mockReturnValue(
-      createPortfolio({
-        claimablePositions: [createClaimablePosition()],
-      }),
-    );
+      renderScreen('history');
+
+      expect(
+        screen.getByText('history-claim-pending-present:true'),
+      ).toBeOnTheScreen();
+      expect(
+        screen.getByText('history-claim-pending-count:1'),
+      ).toBeOnTheScreen();
+      expect(
+        screen.getByText('history-refresh-present:true'),
+      ).toBeOnTheScreen();
+      expect(screen.getByText('history-privacy:true')).toBeOnTheScreen();
+      expect(
+        screen.getByTestId(PredictPositionsHistoryListSelectorsIDs.CONTAINER),
+      ).toBeOnTheScreen();
+    });
 
-    renderScreen('history');
+    it('passes no claim pending positions to History when only lost positions exist', () => {
+      mockUsePredictPortfolio.mockReturnValue(
+        createPortfolio({
+          claimablePositions: [
+            createClaimablePosition({
+              currentValue: 0,
+              id: 'lost-position',
+              status: PredictPositionStatus.LOST,
+            }),
+          ],
+        }),
+      );
 
-    expect(
-      screen.getByText('history-claim-pending-present:false'),
-    ).toBeOnTheScreen();
-    expect(screen.getByText('history-claim-pending-count:0')).toBeOnTheScreen();
-    expect(screen.getByText('history-refresh-present:false')).toBeOnTheScreen();
-  });
+      renderScreen('history');
 
-  it('navigates back when the back button is pressed and the stack can go back', () => {
-    renderScreen();
+      expect(
+        screen.getByText('history-claim-pending-present:true'),
+      ).toBeOnTheScreen();
+      expect(
+        screen.getByText('history-claim-pending-count:0'),
+      ).toBeOnTheScreen();
+    });
 
-    fireEvent.press(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.BACK_BUTTON),
-    );
+    it('does not pass claim pending positions to History when portfolio flag is disabled', () => {
+      mockPredictPortfolioEnabled = false;
+      mockUsePredictPortfolio.mockReturnValue(
+        createPortfolio({
+          claimablePositions: [createClaimablePosition()],
+        }),
+      );
 
-    expect(mockNavigation.goBack).toHaveBeenCalledTimes(1);
-    expect(mockNavigation.navigate).not.toHaveBeenCalled();
+      renderScreen('history');
+
+      expect(
+        screen.getByText('history-claim-pending-present:false'),
+      ).toBeOnTheScreen();
+      expect(
+        screen.getByText('history-claim-pending-count:0'),
+      ).toBeOnTheScreen();
+      expect(
+        screen.getByText('history-refresh-present:false'),
+      ).toBeOnTheScreen();
+    });
   });
 
-  it('returns to the Predict market list when the stack cannot go back', () => {
-    mockNavigation.canGoBack.mockReturnValue(false);
-    renderScreen();
+  describe('stack goBack', () => {
+    it('navigates back when the back button is pressed and the stack can go back', () => {
+      renderScreen();
 
-    fireEvent.press(
-      screen.getByTestId(PredictPositionsViewSelectorsIDs.BACK_BUTTON),
-    );
+      fireEvent.press(
+        screen.getByTestId(PredictPositionsViewSelectorsIDs.BACK_BUTTON),
+      );
 
-    expect(mockNavigation.goBack).not.toHaveBeenCalled();
-    expect(mockNavigation.navigate).toHaveBeenCalledWith(
-      Routes.PREDICT.MARKET_LIST,
-    );
+      expect(mockNavigation.goBack).toHaveBeenCalledTimes(1);
+      expect(mockNavigation.navigate).not.toHaveBeenCalled();
+    });
   });
 });
diff --git a/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.view.test.tsx b/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.view.test.tsx
index 8925e6e50df2..47ca63e87010 100644
--- a/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.view.test.tsx
+++ b/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.view.test.tsx
@@ -231,4 +231,21 @@ describe('PredictPositionsView component view', () => {
       await findByTestId(getRouteProbeTestId(Routes.PREDICT.MARKET_LIST)),
     ).toBeOnTheScreen();
   });
+
+  it('navigates to the Predict market list when the user presses back from the root positions screen', async () => {
+    mockPredictData({});
+    const { findByTestId } = renderPredictPositionsViewWithRoutes({
+      extraRoutes: [{ name: Routes.PREDICT.MARKET_LIST }],
+    });
+
+    await findByTestId(PredictPositionsViewSelectorsIDs.CONTAINER);
+
+    fireEvent.press(
+      await findByTestId(PredictPositionsViewSelectorsIDs.BACK_BUTTON),
+    );
+
+    expect(
+      await findByTestId(getRouteProbeTestId(Routes.PREDICT.MARKET_LIST)),
+    ).toBeOnTheScreen();
+  });
 });
diff --git a/app/components/UI/Predict/views/PredictWorldCup/PredictWorldCup.test.tsx b/app/components/UI/Predict/views/PredictWorldCup/PredictWorldCup.test.tsx
deleted file mode 100644
index a9b2a13fc5a2..000000000000
--- a/app/components/UI/Predict/views/PredictWorldCup/PredictWorldCup.test.tsx
+++ /dev/null
@@ -1,495 +0,0 @@
-import React from 'react';
-import { ScrollView } from 'react-native';
-import { fireEvent, render, screen } from '@testing-library/react-native';
-import PredictWorldCup, {
-  PREDICT_WORLD_CUP_SCREEN_TEST_IDS,
-} from './PredictWorldCup';
-import Routes from '../../../../../constants/navigation/Routes';
-import { DEFAULT_PREDICT_WORLD_CUP_FLAG } from '../../constants/flags';
-import { PredictEventValues } from '../../constants/eventNames';
-
-const mockNavigate = jest.fn();
-const mockGoBack = jest.fn();
-const mockCanGoBack = jest.fn(() => true);
-const mockTrackFeedViewed = jest.fn();
-let mockRouteParams: { entryPoint?: string; initialTab?: string } | undefined;
-let mockIsScreenEnabled = true;
-let mockConfig = DEFAULT_PREDICT_WORLD_CUP_FLAG;
-let mockAvailableTabs = [
-  { key: 'all', label: 'All' },
-  { key: 'live', label: 'Live', isLive: true },
-  { key: 'props', label: 'Props' },
-];
-let mockAvailability = {
-  live: true,
-  props: true,
-  stages: {},
-};
-const mockUsePredictWorldCupMarkets: jest.Mock = jest.fn((_args: unknown) => ({
-  marketData: [],
-  isFetching: false,
-  isFetchingMore: false,
-  error: null,
-  hasMore: false,
-  refetch: jest.fn(),
-  fetchMore: jest.fn(),
-}));
-
-jest.mock('../../../../../core/Engine', () => ({
-  __esModule: true,
-  default: {
-    context: {
-      PredictController: {
-        trackFeedViewed: (...args: Parameters<typeof mockTrackFeedViewed>) =>
-          mockTrackFeedViewed(...args),
-      },
-    },
-  },
-}));
-
-jest.mock('@react-navigation/native', () => ({
-  useNavigation: () => ({
-    navigate: mockNavigate,
-    goBack: mockGoBack,
-    canGoBack: mockCanGoBack,
-  }),
-  useRoute: () => ({ params: mockRouteParams }),
-}));
-
-jest.mock('react-redux', () => ({
-  useSelector: jest.fn((selector) => {
-    if (selector === 'selectPredictWorldCupConfig') {
-      return mockConfig;
-    }
-
-    if (selector === 'selectPredictWorldCupScreenEnabledFlag') {
-      return mockIsScreenEnabled;
-    }
-
-    return undefined;
-  }),
-}));
-
-jest.mock('../../selectors/featureFlags', () => ({
-  selectPredictWorldCupConfig: 'selectPredictWorldCupConfig',
-  selectPredictWorldCupScreenEnabledFlag:
-    'selectPredictWorldCupScreenEnabledFlag',
-}));
-
-jest.mock('@shopify/flash-list', () => {
-  const { View } = jest.requireActual('react-native');
-
-  interface MockItem {
-    id: string;
-  }
-  interface MockFlashListProps {
-    data?: MockItem[];
-    renderItem: (info: { item: MockItem; index: number }) => React.ReactNode;
-    keyExtractor?: (item: MockItem, index: number) => string;
-    ListFooterComponent?: React.ComponentType | React.ReactNode;
-    testID?: string;
-  }
-
-  const FlashList = ({
-    data = [],
-    renderItem,
-    keyExtractor,
-    ListFooterComponent,
-    testID,
-  }: MockFlashListProps) => (
-    <View testID={testID}>
-      {data.map((item, index) => (
-        <View key={keyExtractor ? keyExtractor(item, index) : item.id}>
-          {renderItem({ item, index })}
-        </View>
-      ))}
-      {typeof ListFooterComponent === 'function' ? (
-        <ListFooterComponent />
-      ) : (
-        ListFooterComponent
-      )}
-    </View>
-  );
-
-  return { FlashList };
-});
-
-jest.mock('../../components/PredictMarket', () => {
-  const { Text } = jest.requireActual('react-native');
-
-  return {
-    __esModule: true,
-    default: ({
-      market,
-      testID,
-      predictFeedTab,
-      predictScreen,
-    }: {
-      market: { title: string };
-      testID: string;
-      predictFeedTab?: string;
-      predictScreen?: string;
-    }) => (
-      <Text
-        testID={testID}
-        accessibilityLabel={`${predictFeedTab ?? ''}|${predictScreen ?? ''}`}
-      >
-        {market.title}
-      </Text>
-    ),
-  };
-});
-
-jest.mock('../../hooks', () => ({
-  ...jest.requireActual('../../hooks'),
-  usePredictWorldCupAvailableTabs: () => ({
-    tabs: mockAvailableTabs,
-    availability: mockAvailability,
-    isFetching: false,
-    isLoading: false,
-    errors: [],
-    refetch: jest.fn(),
-  }),
-  usePredictWorldCupMarkets: (args: unknown) =>
-    mockUsePredictWorldCupMarkets(args),
-}));
-
-describe('PredictWorldCup', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockCanGoBack.mockReturnValue(true);
-    mockRouteParams = undefined;
-    mockIsScreenEnabled = true;
-    mockConfig = {
-      ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-      enabled: true,
-      showWorldCupScreen: true,
-    };
-    mockAvailableTabs = [
-      { key: 'all', label: 'All' },
-      { key: 'live', label: 'Live', isLive: true },
-      { key: 'props', label: 'Props' },
-    ];
-    mockAvailability = {
-      live: true,
-      props: true,
-      stages: {},
-    };
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [],
-      isFetching: false,
-      isFetchingMore: false,
-      error: null,
-      hasMore: false,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
-  });
-
-  it('renders the screen scaffold with All selected by default', () => {
-    render(<PredictWorldCup />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_SCREEN_TEST_IDS.CONTAINER),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_SCREEN_TEST_IDS.INITIAL_TAB),
-    ).toHaveTextContent('all');
-  });
-
-  it('renders available tabs and an empty content area', () => {
-    render(<PredictWorldCup />);
-
-    expect(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-all`),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-live`),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-props`),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_SCREEN_TEST_IDS.EMPTY_STATE),
-    ).toBeOnTheScreen();
-  });
-
-  it('matches configured stage when URL uses hyphens but flag uses underscores', () => {
-    mockRouteParams = { initialTab: 'group-stage' };
-    mockConfig = {
-      ...mockConfig,
-      stages: [{ key: 'group_stage', eventIds: ['1'] }],
-    };
-    mockAvailability = {
-      ...mockAvailability,
-      stages: { group_stage: true },
-    };
-
-    render(<PredictWorldCup />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_SCREEN_TEST_IDS.INITIAL_TAB),
-    ).toHaveTextContent('group_stage');
-  });
-
-  it('uses a valid requested initial tab', () => {
-    mockRouteParams = { initialTab: 'props' };
-
-    render(<PredictWorldCup />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_SCREEN_TEST_IDS.INITIAL_TAB),
-    ).toHaveTextContent('props');
-  });
-
-  it('tracks initial screen view through feed viewed with the resolved initial tab and entry point', () => {
-    mockRouteParams = {
-      entryPoint: 'deeplink_twitter',
-      initialTab: 'live',
-    };
-
-    render(<PredictWorldCup />);
-
-    expect(mockTrackFeedViewed).toHaveBeenCalledTimes(1);
-    expect(mockTrackFeedViewed).toHaveBeenCalledWith({
-      sessionId: expect.any(String),
-      entryPoint: 'deeplink_twitter',
-      feedTab: 'live',
-      predictScreen: PredictEventValues.PREDICT_SCREEN.WORLD_CUP,
-      numPagesViewed: 0,
-      sessionTime: expect.any(Number),
-      isSessionEnd: false,
-    });
-  });
-
-  it('tracks initial screen view with predict_feed and the default tab when no entry point is provided', () => {
-    render(<PredictWorldCup />);
-
-    expect(mockTrackFeedViewed).toHaveBeenCalledWith({
-      sessionId: expect.any(String),
-      entryPoint: PredictEventValues.ENTRY_POINT.PREDICT_FEED,
-      feedTab: 'all',
-      predictScreen: PredictEventValues.PREDICT_SCREEN.WORLD_CUP,
-      numPagesViewed: 0,
-      sessionTime: expect.any(Number),
-      isSessionEnd: false,
-    });
-  });
-
-  it('updates active tab and tab content when a tab is pressed', () => {
-    render(<PredictWorldCup />);
-
-    fireEvent.press(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-live`),
-    );
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_SCREEN_TEST_IDS.INITIAL_TAB),
-    ).toHaveTextContent('live');
-    expect(mockUsePredictWorldCupMarkets).toHaveBeenLastCalledWith({
-      tabKey: 'live',
-      config: mockConfig,
-    });
-    expect(mockTrackFeedViewed).toHaveBeenLastCalledWith({
-      sessionId: expect.any(String),
-      numPagesViewed: 1,
-      sessionTime: expect.any(Number),
-      entryPoint: PredictEventValues.ENTRY_POINT.PREDICT_FEED,
-      feedTab: 'live',
-      predictScreen: PredictEventValues.PREDICT_SCREEN.WORLD_CUP,
-      isSessionEnd: false,
-    });
-  });
-
-  it('does not track tab changed when the active tab is pressed', () => {
-    render(<PredictWorldCup />);
-
-    fireEvent.press(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-all`),
-    );
-
-    expect(mockTrackFeedViewed).toHaveBeenCalledTimes(1);
-  });
-
-  it('scrolls the initial pill into view once its layout is measured', () => {
-    const scrollToSpy = jest.spyOn(ScrollView.prototype, 'scrollTo');
-    mockRouteParams = { initialTab: 'group-stage' };
-    mockConfig = {
-      ...mockConfig,
-      stages: [{ key: 'group-stage', eventIds: ['1'] }],
-    };
-    mockAvailability = {
-      ...mockAvailability,
-      stages: { 'group-stage': true },
-    };
-    mockAvailableTabs = [
-      ...mockAvailableTabs,
-      { key: 'group-stage', label: 'Group Stage' },
-    ];
-
-    render(<PredictWorldCup />);
-
-    fireEvent(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-group-stage`,
-      ),
-      'layout',
-      { nativeEvent: { layout: { x: 800, width: 51 } } },
-    );
-
-    expect(scrollToSpy).toHaveBeenCalledWith({ x: 784, animated: false });
-
-    scrollToSpy.mockRestore();
-  });
-
-  it('scrolls the selected pill into view when a tab is pressed', () => {
-    const scrollToSpy = jest.spyOn(ScrollView.prototype, 'scrollTo');
-
-    render(<PredictWorldCup />);
-
-    fireEvent(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-props`),
-      'layout',
-      { nativeEvent: { layout: { x: 200, width: 51 } } },
-    );
-
-    fireEvent.press(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-props`),
-    );
-
-    expect(scrollToSpy).toHaveBeenLastCalledWith({ x: 184, animated: true });
-
-    scrollToSpy.mockRestore();
-  });
-
-  it('clamps the scroll offset to zero for an early pill', () => {
-    const scrollToSpy = jest.spyOn(ScrollView.prototype, 'scrollTo');
-    mockRouteParams = { initialTab: 'live' };
-
-    render(<PredictWorldCup />);
-
-    fireEvent(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-live`),
-      'layout',
-      { nativeEvent: { layout: { x: 10, width: 51 } } },
-    );
-
-    expect(scrollToSpy).toHaveBeenCalledWith({ x: 0, animated: false });
-
-    scrollToSpy.mockRestore();
-  });
-
-  it('uses a configured available stage initial tab', () => {
-    mockRouteParams = { initialTab: 'group-stage' };
-    mockConfig = {
-      ...mockConfig,
-      stages: [{ key: 'group-stage', eventIds: ['1'] }],
-    };
-    mockAvailability = {
-      ...mockAvailability,
-      stages: { 'group-stage': true },
-    };
-    mockAvailableTabs = [
-      ...mockAvailableTabs,
-      { key: 'group-stage', label: 'Group Stage' },
-    ];
-
-    render(<PredictWorldCup />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_SCREEN_TEST_IDS.INITIAL_TAB),
-    ).toHaveTextContent('group-stage');
-  });
-
-  it('renders market content for the active tab', () => {
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [
-        {
-          id: 'market-1',
-          title: 'World Cup winner',
-        },
-      ],
-      isFetching: false,
-      isFetchingMore: false,
-      error: null,
-      hasMore: false,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
-
-    render(<PredictWorldCup />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_SCREEN_TEST_IDS.MARKET_LIST),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.MARKET_CARD}-1`),
-    ).toHaveTextContent('World Cup winner');
-  });
-
-  it('forwards the active tab key and world_cup screen to market cards', () => {
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [{ id: 'market-1', title: 'World Cup winner' }],
-      isFetching: false,
-      isFetchingMore: false,
-      error: null,
-      hasMore: false,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
-
-    render(<PredictWorldCup />);
-
-    const card = screen.getByTestId(
-      `${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.MARKET_CARD}-1`,
-    );
-    expect(card.props.accessibilityLabel).toBe(
-      `all|${PredictEventValues.PREDICT_SCREEN.WORLD_CUP}`,
-    );
-  });
-
-  it('does not render tabs hidden by availability', () => {
-    mockAvailableTabs = [{ key: 'all', label: 'All' }];
-    mockAvailability = {
-      live: false,
-      props: false,
-      stages: {},
-    };
-
-    render(<PredictWorldCup />);
-
-    expect(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-all`),
-    ).toBeOnTheScreen();
-    expect(
-      screen.queryByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-live`),
-    ).toBeNull();
-    expect(
-      screen.queryByTestId(`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-props`),
-    ).toBeNull();
-  });
-
-  it('falls back to All for an invalid requested initial tab', () => {
-    mockRouteParams = { initialTab: 'invalid' };
-
-    render(<PredictWorldCup />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_SCREEN_TEST_IDS.INITIAL_TAB),
-    ).toHaveTextContent('all');
-  });
-
-  it('redirects to Predict market list when the screen is disabled', () => {
-    mockIsScreenEnabled = false;
-    mockRouteParams = { entryPoint: 'deeplink', initialTab: 'live' };
-
-    const { queryByTestId } = render(<PredictWorldCup />);
-
-    expect(
-      queryByTestId(PREDICT_WORLD_CUP_SCREEN_TEST_IDS.CONTAINER),
-    ).toBeNull();
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.MARKET_LIST, {
-      entryPoint: 'deeplink',
-    });
-  });
-});
diff --git a/app/components/UI/Predict/views/PredictWorldCup/PredictWorldCup.tsx b/app/components/UI/Predict/views/PredictWorldCup/PredictWorldCup.tsx
deleted file mode 100644
index 7ec3686993d4..000000000000
--- a/app/components/UI/Predict/views/PredictWorldCup/PredictWorldCup.tsx
+++ /dev/null
@@ -1,429 +0,0 @@
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
-import { useRoute, RouteProp } from '@react-navigation/native';
-import { useSelector } from 'react-redux';
-import {
-  type LayoutChangeEvent,
-  Pressable,
-  RefreshControl,
-  ScrollView,
-} from 'react-native';
-import { FlashList } from '@shopify/flash-list';
-import {
-  Theme,
-  ThemeProvider as DesignSystemThemeProvider,
-  useTailwind,
-  useTheme as useDesignSystemTheme,
-} from '@metamask/design-system-twrnc-preset';
-import {
-  Box,
-  HeaderStandard,
-  Text,
-  TextColor,
-  TextVariant,
-} from '@metamask/design-system-react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
-import Engine from '../../../../../core/Engine';
-import {
-  selectPredictWorldCupConfig,
-  selectPredictWorldCupScreenEnabledFlag,
-} from '../../selectors/featureFlags';
-import type {
-  PredictEntryPoint,
-  PredictNavigationParamList,
-} from '../../types/navigation';
-import type { TransactionActiveAbTestEntry } from '../../../../../util/transactions/transaction-active-ab-test-attribution-registry';
-import type { PredictMarket as PredictMarketType } from '../../types';
-import {
-  resolvePredictWorldCupInitialTab,
-  type PredictWorldCupTabKey,
-} from '../../constants/worldCupTabs';
-import {
-  usePredictWorldCupAvailableTabs,
-  usePredictWorldCupMarkets,
-  usePredictWorldCupFeedSession,
-  type PredictWorldCupAvailableTab,
-} from '../../hooks';
-import PredictMarket from '../../components/PredictMarket';
-import PredictMarketSkeleton from '../../components/PredictMarketSkeleton';
-import PredictOffline from '../../components/PredictOffline';
-import PulsingLiveDot from '../../components/PulsingLiveDot/PulsingLiveDot';
-import { PredictEventValues } from '../../constants/eventNames';
-import type { PredictWorldCupConfig } from '../../types/flags';
-import { strings } from '../../../../../../locales/i18n';
-
-export const PREDICT_WORLD_CUP_SCREEN_TEST_IDS = {
-  CONTAINER: 'predict-world-cup-screen',
-  INITIAL_TAB: 'predict-world-cup-initial-tab',
-  TABS: 'predict-world-cup-tabs',
-  TAB: 'predict-world-cup-tab',
-  EMPTY_STATE: 'predict-world-cup-empty-state',
-  ERROR_STATE: 'predict-world-cup-error-state',
-  MARKET_LIST: 'predict-world-cup-market-list',
-  MARKET_CARD: 'predict-world-cup-market-card',
-  SKELETON: 'predict-world-cup-skeleton',
-} as const;
-
-type WorldCupConfigSubset = Pick<
-  PredictWorldCupConfig,
-  'tagSlug' | 'gamesTagId' | 'stages'
->;
-
-interface WorldCupTabContentProps {
-  activeTab: PredictWorldCupTabKey;
-  config: WorldCupConfigSubset;
-  entryPoint?: PredictEntryPoint;
-  transactionActiveAbTests?: TransactionActiveAbTestEntry[];
-}
-
-interface WorldCupTabButtonProps {
-  tab: PredictWorldCupAvailableTab;
-  isActive: boolean;
-  onPress: () => void;
-  onLayout: (event: LayoutChangeEvent) => void;
-}
-
-const WorldCupLiveTabLabelContent = ({ label }: { label: string }) => {
-  const tw = useTailwind();
-
-  return (
-    <>
-      <PulsingLiveDot color={tw.color('success-default')} />
-      <Text
-        variant={TextVariant.BodySm}
-        style={tw.style('font-medium leading-[22px]', 'text-success-default')}
-      >
-        {label}
-      </Text>
-    </>
-  );
-};
-
-const WorldCupLiveTabLabel = ({
-  label,
-  isActive,
-}: {
-  label: string;
-  isActive: boolean;
-}) => {
-  const designSystemTheme = useDesignSystemTheme();
-  const inverseDesignSystemTheme =
-    designSystemTheme === Theme.Dark ? Theme.Light : Theme.Dark;
-
-  if (!isActive) {
-    return <WorldCupLiveTabLabelContent label={label} />;
-  }
-
-  return (
-    <DesignSystemThemeProvider theme={inverseDesignSystemTheme}>
-      <WorldCupLiveTabLabelContent label={label} />
-    </DesignSystemThemeProvider>
-  );
-};
-
-const WorldCupTabButton = ({
-  tab,
-  isActive,
-  onPress,
-  onLayout,
-}: WorldCupTabButtonProps) => {
-  const tw = useTailwind();
-
-  return (
-    <Pressable
-      onPress={onPress}
-      onLayout={onLayout}
-      style={tw.style(
-        'min-w-[51px] flex-row items-center justify-center gap-2 rounded-xl bg-muted p-2',
-        isActive && 'bg-icon-default',
-      )}
-      testID={`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TAB}-${tab.key}`}
-    >
-      {tab.isLive ? (
-        <WorldCupLiveTabLabel label={tab.label} isActive={isActive} />
-      ) : (
-        <Text
-          color={
-            isActive ? TextColor.PrimaryInverse : TextColor.TextAlternative
-          }
-          variant={TextVariant.BodySm}
-          style={tw.style('font-medium leading-[22px]')}
-        >
-          {tab.label}
-        </Text>
-      )}
-    </Pressable>
-  );
-};
-
-const WorldCupTabContent = ({
-  activeTab,
-  config,
-  entryPoint,
-  transactionActiveAbTests,
-}: WorldCupTabContentProps) => {
-  const tw = useTailwind();
-  const [isRefreshing, setIsRefreshing] = useState(false);
-  const {
-    marketData,
-    isFetching,
-    isFetchingMore,
-    error,
-    hasMore,
-    refetch,
-    fetchMore,
-  } = usePredictWorldCupMarkets({
-    tabKey: activeTab,
-    config,
-  });
-
-  const handleRefresh = useCallback(async () => {
-    setIsRefreshing(true);
-    try {
-      await refetch();
-    } finally {
-      setIsRefreshing(false);
-    }
-  }, [refetch]);
-
-  const handleEndReached = useCallback(() => {
-    if (hasMore && !isFetchingMore) {
-      fetchMore();
-    }
-  }, [fetchMore, hasMore, isFetchingMore]);
-
-  const renderItem = useCallback(
-    ({ item, index }: { item: PredictMarketType; index: number }) => (
-      <PredictMarket
-        market={item}
-        entryPoint={entryPoint}
-        testID={`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.MARKET_CARD}-${index + 1}`}
-        predictFeedTab={activeTab}
-        predictScreen={PredictEventValues.PREDICT_SCREEN.WORLD_CUP}
-        transactionActiveAbTests={transactionActiveAbTests}
-      />
-    ),
-    [activeTab, entryPoint, transactionActiveAbTests],
-  );
-
-  const keyExtractor = useCallback((item: PredictMarketType) => item.id, []);
-
-  const renderFooter = useCallback(() => {
-    if (!isFetchingMore) {
-      return null;
-    }
-
-    return (
-      <Box twClassName="py-2">
-        <PredictMarketSkeleton
-          testID={`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.SKELETON}-footer-1`}
-        />
-      </Box>
-    );
-  }, [isFetchingMore]);
-
-  if (isFetching && !isRefreshing && !isFetchingMore) {
-    return (
-      <Box twClassName="flex-1 px-4">
-        <PredictMarketSkeleton
-          testID={`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.SKELETON}-1`}
-        />
-        <PredictMarketSkeleton
-          testID={`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.SKELETON}-2`}
-        />
-        <PredictMarketSkeleton
-          testID={`${PREDICT_WORLD_CUP_SCREEN_TEST_IDS.SKELETON}-3`}
-        />
-      </Box>
-    );
-  }
-
-  if (error) {
-    return (
-      <Box
-        twClassName="flex-1"
-        testID={PREDICT_WORLD_CUP_SCREEN_TEST_IDS.ERROR_STATE}
-      >
-        <PredictOffline onRetry={handleRefresh} />
-      </Box>
-    );
-  }
-
-  if (marketData.length === 0) {
-    return (
-      <Box
-        twClassName="flex-1 justify-center items-center p-8"
-        testID={PREDICT_WORLD_CUP_SCREEN_TEST_IDS.EMPTY_STATE}
-      >
-        <Text variant={TextVariant.BodyMd} color={TextColor.PrimaryAlternative}>
-          {strings('predict.search_empty_state', {
-            category: strings('predict.world_cup.title'),
-          })}
-        </Text>
-      </Box>
-    );
-  }
-
-  return (
-    <FlashList
-      testID={PREDICT_WORLD_CUP_SCREEN_TEST_IDS.MARKET_LIST}
-      data={marketData}
-      renderItem={renderItem}
-      keyExtractor={keyExtractor}
-      onEndReached={handleEndReached}
-      onEndReachedThreshold={0.7}
-      ListFooterComponent={renderFooter}
-      refreshControl={
-        <RefreshControl refreshing={isRefreshing} onRefresh={handleRefresh} />
-      }
-      contentContainerStyle={tw.style('px-4 pb-4')}
-      showsVerticalScrollIndicator={false}
-    />
-  );
-};
-
-const PredictWorldCup: React.FC = () => {
-  const tw = useTailwind();
-  const route =
-    useRoute<RouteProp<PredictNavigationParamList, 'PredictWorldCup'>>();
-  const config = useSelector(selectPredictWorldCupConfig);
-  const isScreenEnabled = useSelector(selectPredictWorldCupScreenEnabledFlag);
-
-  const entryPoint = (route.params?.entryPoint ??
-    PredictEventValues.ENTRY_POINT.PREDICT_FEED) as PredictEntryPoint;
-  const transactionActiveAbTests = route.params?.transactionActiveAbTests;
-
-  const {
-    tabs,
-    availability,
-    isFetching: isAvailabilityFetching,
-    isLoading: isAvailabilityLoading,
-  } = usePredictWorldCupAvailableTabs(config, {
-    enabled: isScreenEnabled,
-  });
-
-  const initialTab = useMemo(
-    () =>
-      resolvePredictWorldCupInitialTab(
-        route.params?.initialTab,
-        config,
-        availability,
-      ),
-    [availability, config, route.params?.initialTab],
-  );
-
-  const {
-    activeTab,
-    tabsScrollViewRef,
-    feedSessionId,
-    feedSessionStartTime,
-    getPageViewCount,
-    handleTabLayout,
-    handleTabPress,
-    navigateToMarketList,
-    handleBack,
-  } = usePredictWorldCupFeedSession<PredictWorldCupTabKey>({
-    initialTab,
-    entryPoint,
-    routeEntryPoint: route.params?.entryPoint as PredictEntryPoint | undefined,
-    transactionActiveAbTests,
-  });
-
-  const hasTrackedInitialFeedViewed = useRef(false);
-
-  useEffect(() => {
-    if (isScreenEnabled) return;
-    navigateToMarketList();
-  }, [isScreenEnabled, navigateToMarketList]);
-
-  useEffect(() => {
-    if (
-      !isScreenEnabled ||
-      isAvailabilityFetching ||
-      isAvailabilityLoading ||
-      hasTrackedInitialFeedViewed.current
-    ) {
-      return;
-    }
-
-    Engine.context.PredictController.trackFeedViewed({
-      sessionId: feedSessionId,
-      feedTab: initialTab,
-      predictScreen: PredictEventValues.PREDICT_SCREEN.WORLD_CUP,
-      numPagesViewed: getPageViewCount(),
-      sessionTime: Math.round((Date.now() - feedSessionStartTime) / 1000),
-      entryPoint,
-      isSessionEnd: false,
-    });
-    hasTrackedInitialFeedViewed.current = true;
-  }, [
-    entryPoint,
-    feedSessionId,
-    feedSessionStartTime,
-    getPageViewCount,
-    initialTab,
-    isAvailabilityFetching,
-    isAvailabilityLoading,
-    isScreenEnabled,
-  ]);
-
-  if (!isScreenEnabled) {
-    return null;
-  }
-
-  return (
-    <SafeAreaView
-      edges={['bottom', 'left', 'right']}
-      style={tw.style('flex-1 bg-default')}
-      testID={PREDICT_WORLD_CUP_SCREEN_TEST_IDS.CONTAINER}
-    >
-      <HeaderStandard
-        title={strings('predict.world_cup.title')}
-        onBack={handleBack}
-        includesTopInset
-      />
-
-      <Box twClassName="flex-1">
-        <ScrollView
-          ref={tabsScrollViewRef}
-          horizontal
-          showsHorizontalScrollIndicator={false}
-          style={tw.style('grow-0')}
-          contentContainerStyle={tw.style('gap-2 px-4 pb-4')}
-          testID={PREDICT_WORLD_CUP_SCREEN_TEST_IDS.TABS}
-        >
-          {tabs.map((tab) => (
-            <WorldCupTabButton
-              key={tab.key}
-              tab={tab}
-              isActive={activeTab === tab.key}
-              onPress={() => handleTabPress(tab.key)}
-              onLayout={(event) => handleTabLayout(tab.key, event)}
-            />
-          ))}
-        </ScrollView>
-
-        <Text
-          testID={PREDICT_WORLD_CUP_SCREEN_TEST_IDS.INITIAL_TAB}
-          style={tw.style('h-0 opacity-0')}
-        >
-          {activeTab}
-        </Text>
-
-        <WorldCupTabContent
-          activeTab={activeTab}
-          config={config}
-          entryPoint={entryPoint}
-          transactionActiveAbTests={transactionActiveAbTests}
-        />
-      </Box>
-    </SafeAreaView>
-  );
-};
-
-export default PredictWorldCup;
diff --git a/app/components/UI/Predict/views/PredictWorldCup/index.ts b/app/components/UI/Predict/views/PredictWorldCup/index.ts
deleted file mode 100644
index c82920c8f0c3..000000000000
--- a/app/components/UI/Predict/views/PredictWorldCup/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default } from './PredictWorldCup';
-export { PREDICT_WORLD_CUP_SCREEN_TEST_IDS } from './PredictWorldCup';
diff --git a/app/components/UI/Predict/views/PredictWorldCupHub/PredictWorldCupHub.test.tsx b/app/components/UI/Predict/views/PredictWorldCupHub/PredictWorldCupHub.test.tsx
deleted file mode 100644
index 98c2cb6d3815..000000000000
--- a/app/components/UI/Predict/views/PredictWorldCupHub/PredictWorldCupHub.test.tsx
+++ /dev/null
@@ -1,794 +0,0 @@
-import React from 'react';
-import { act, fireEvent, render, screen } from '@testing-library/react-native';
-import { RefreshControl } from 'react-native';
-import PredictWorldCupHub, {
-  PREDICT_WORLD_CUP_HUB_TEST_IDS,
-} from './PredictWorldCupHub';
-import { DEFAULT_PREDICT_WORLD_CUP_FLAG } from '../../constants/flags';
-import { PREDICT_WORLD_CUP_HUB_TAB_KEYS } from '../../constants/worldCupHubTabs';
-
-const mockNavigate = jest.fn();
-const mockGoBack = jest.fn();
-const mockCanGoBack = jest.fn(() => true);
-const mockTrackFeedViewed = jest.fn();
-let mockRouteParams: Record<string, unknown> | undefined;
-let mockConfig = {
-  ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-  enabled: true,
-  showWorldCupScreen: true,
-};
-
-const mockUsePredictWorldCupMarkets = jest.fn();
-const mockUsePredictWorldCupGamesSections = jest.fn();
-const mockUsePredictWorldCupWinnerMarket = jest.fn();
-
-jest.mock('../../../../../core/Engine', () => ({
-  __esModule: true,
-  default: {
-    context: {
-      PredictController: {
-        trackFeedViewed: (...args: Parameters<typeof mockTrackFeedViewed>) =>
-          mockTrackFeedViewed(...args),
-      },
-    },
-  },
-}));
-
-jest.mock('@react-navigation/native', () => ({
-  useNavigation: () => ({
-    navigate: mockNavigate,
-    goBack: mockGoBack,
-    canGoBack: mockCanGoBack,
-  }),
-  useRoute: () => ({ params: mockRouteParams }),
-}));
-
-jest.mock('react-redux', () => ({
-  useSelector: jest.fn((selector) => {
-    if (selector === 'selectPredictWorldCupConfig') return mockConfig;
-    return undefined;
-  }),
-}));
-
-jest.mock('../../selectors/featureFlags', () => ({
-  selectPredictWorldCupConfig: 'selectPredictWorldCupConfig',
-}));
-
-jest.mock('@shopify/flash-list', () => {
-  const { View, TouchableOpacity } = jest.requireActual('react-native');
-  const FlashList = ({
-    data = [],
-    renderItem,
-    keyExtractor,
-    ListHeaderComponent,
-    ListFooterComponent,
-    testID,
-    refreshControl,
-    onEndReached,
-  }: {
-    data?: unknown[];
-    renderItem: (info: { item: unknown; index: number }) => React.ReactNode;
-    keyExtractor?: (item: unknown, index: number) => string;
-    ListHeaderComponent?: React.ComponentType | React.ReactNode;
-    ListFooterComponent?: React.ComponentType | React.ReactNode;
-    testID?: string;
-    refreshControl?: React.ReactNode;
-    onEndReached?: () => void;
-  }) => (
-    <View testID={testID}>
-      {refreshControl}
-      {onEndReached && (
-        <TouchableOpacity
-          testID={`${testID ?? ''}-end-reached`}
-          onPress={onEndReached}
-        />
-      )}
-      {typeof ListHeaderComponent === 'function' ? (
-        <ListHeaderComponent />
-      ) : (
-        ListHeaderComponent
-      )}
-      {(data as { id: string }[]).map((item, index) => (
-        <View key={keyExtractor ? keyExtractor(item, index) : String(index)}>
-          {renderItem({ item, index })}
-        </View>
-      ))}
-      {typeof ListFooterComponent === 'function' ? (
-        <ListFooterComponent />
-      ) : (
-        ListFooterComponent
-      )}
-    </View>
-  );
-  return { FlashList };
-});
-
-jest.mock('../../components/PredictMarket', () => {
-  const { Text } = jest.requireActual('react-native');
-  return {
-    __esModule: true,
-    default: ({
-      market,
-      testID,
-    }: {
-      market: { title: string };
-      testID: string;
-    }) => <Text testID={testID}>{market.title}</Text>,
-  };
-});
-
-jest.mock('../../components/PredictWorldCupWinnerModule', () => {
-  const { Text } = jest.requireActual('react-native');
-  return {
-    __esModule: true,
-    default: ({ market }: { market: { title: string } }) => (
-      <Text testID="winner-module">{market.title}</Text>
-    ),
-  };
-});
-
-jest.mock('../../components/PredictOffline', () => {
-  const { Text } = jest.requireActual('react-native');
-  return {
-    __esModule: true,
-    default: () => <Text testID="predict-offline">offline</Text>,
-  };
-});
-
-jest.mock('../../components/PredictMarketSkeleton', () => {
-  const { View } = jest.requireActual('react-native');
-  return {
-    __esModule: true,
-    default: ({ testID }: { testID?: string }) => <View testID={testID} />,
-  };
-});
-
-jest.mock('@metamask/design-system-react-native', () => {
-  const actual = jest.requireActual('@metamask/design-system-react-native');
-  const { TouchableOpacity, View } = jest.requireActual('react-native');
-  return {
-    ...actual,
-    HeaderStandard: ({ onBack }: { onBack?: () => void; title?: string }) => (
-      <View>
-        <TouchableOpacity testID="header-back-button" onPress={onBack} />
-      </View>
-    ),
-  };
-});
-
-jest.mock('../../hooks/usePredictWorldCupHub', () => ({
-  usePredictWorldCupGamesSections: (...args: unknown[]) =>
-    mockUsePredictWorldCupGamesSections(...args),
-  usePredictWorldCupWinnerMarket: (...args: unknown[]) =>
-    mockUsePredictWorldCupWinnerMarket(...args),
-}));
-
-jest.mock('../../hooks', () => ({
-  ...jest.requireActual('../../hooks'),
-  usePredictWorldCupMarkets: (...args: unknown[]) =>
-    mockUsePredictWorldCupMarkets(...args),
-}));
-
-jest.mock('../../../../../../locales/i18n', () => ({
-  strings: (key: string) => key,
-}));
-
-jest.mock('uuid', () => ({ v4: () => 'test-session-id' }));
-
-describe('PredictWorldCupHub', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockCanGoBack.mockReturnValue(true);
-    mockRouteParams = undefined;
-    mockConfig = {
-      ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-      enabled: true,
-      showWorldCupScreen: true,
-    };
-    mockUsePredictWorldCupGamesSections.mockReturnValue({
-      sections: [],
-      isLive: false,
-      isFetching: false,
-      error: null,
-      refetch: jest.fn(),
-    });
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [],
-      isFetching: false,
-      isFetchingMore: false,
-      error: null,
-      hasMore: false,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
-    mockUsePredictWorldCupWinnerMarket.mockReturnValue({
-      market: null,
-      isFetching: false,
-      error: null,
-      refetch: jest.fn(),
-    });
-  });
-
-  it('renders the hub container', () => {
-    render(<PredictWorldCupHub />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.CONTAINER),
-    ).toBeOnTheScreen();
-  });
-
-  it('renders Games and Props tab buttons', () => {
-    render(<PredictWorldCupHub />);
-
-    expect(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.GAMES}`,
-      ),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    ).toBeOnTheScreen();
-  });
-
-  it('shows Games list by default with section data', () => {
-    mockUsePredictWorldCupGamesSections.mockReturnValue({
-      sections: [
-        {
-          key: 'final',
-          label: 'Final',
-          markets: [
-            {
-              id: 'm-1',
-              title: 'Final Match',
-              outcomes: [],
-              parentMarketId: null,
-            },
-          ],
-          isFetching: false,
-        },
-      ],
-      isLive: false,
-      isFetching: false,
-      refetch: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.GAMES_LIST),
-    ).toBeOnTheScreen();
-    expect(
-      screen.queryByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.PROPS_LIST),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('switches to Props list when Props tab is pressed', () => {
-    render(<PredictWorldCupHub />);
-
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    );
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.PROPS_LIST),
-    ).toBeOnTheScreen();
-    expect(
-      screen.queryByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.GAMES_LIST),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('renders stage section headers for each section returned by the hook', () => {
-    mockUsePredictWorldCupGamesSections.mockReturnValue({
-      sections: [
-        {
-          key: 'round_of_32',
-          label: 'Round of 32',
-          markets: [
-            {
-              id: 'm-1',
-              title: 'Canada vs. Mexico',
-              outcomes: [],
-              parentMarketId: null,
-            },
-          ],
-          isFetching: false,
-        },
-      ],
-      isLive: false,
-      isFetching: false,
-      refetch: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-
-    expect(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.SECTION_HEADER}-header-round_of_32`,
-      ),
-    ).toBeOnTheScreen();
-  });
-
-  it('shows the winner module in Props tab when winner market is available', () => {
-    mockUsePredictWorldCupWinnerMarket.mockReturnValue({
-      market: {
-        id: 'winner',
-        title: 'World Cup Winner',
-        outcomes: [],
-        parentMarketId: null,
-      },
-      isFetching: false,
-      error: null,
-      refetch: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    );
-
-    expect(screen.getByTestId('winner-module')).toBeOnTheScreen();
-  });
-
-  it('tracks feedViewed on initial render', () => {
-    render(<PredictWorldCupHub />);
-
-    expect(mockTrackFeedViewed).toHaveBeenCalledWith(
-      expect.objectContaining({
-        sessionId: 'test-session-id',
-        feedTab: PREDICT_WORLD_CUP_HUB_TAB_KEYS.GAMES,
-        predictScreen: 'world_cup',
-      }),
-    );
-  });
-
-  it('tracks feedViewed with new tab key when switching tabs', () => {
-    render(<PredictWorldCupHub />);
-    jest.clearAllMocks();
-
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    );
-
-    expect(mockTrackFeedViewed).toHaveBeenCalledWith(
-      expect.objectContaining({
-        feedTab: PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS,
-      }),
-    );
-  });
-
-  it('opens the Props tab when navigated with initialTab="props"', () => {
-    mockRouteParams = { initialTab: 'props' };
-
-    render(<PredictWorldCupHub />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.PROPS_LIST),
-    ).toBeOnTheScreen();
-    expect(
-      screen.queryByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.GAMES_LIST),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('tracks the initial feedViewed with the resolved initialTab', () => {
-    mockRouteParams = { initialTab: 'props' };
-
-    render(<PredictWorldCupHub />);
-
-    expect(mockTrackFeedViewed).toHaveBeenCalledWith(
-      expect.objectContaining({
-        feedTab: PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS,
-      }),
-    );
-  });
-
-  it('defaults to the Games tab for unknown initialTab values', () => {
-    mockRouteParams = { initialTab: 'something-else' };
-    mockUsePredictWorldCupGamesSections.mockReturnValue({
-      sections: [
-        {
-          key: 'final',
-          label: 'Final',
-          markets: [
-            {
-              id: 'm-1',
-              title: 'Final Match',
-              outcomes: [],
-              parentMarketId: null,
-            },
-          ],
-          isFetching: false,
-        },
-      ],
-      isLive: false,
-      isFetching: false,
-      error: null,
-      refetch: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.GAMES_LIST),
-    ).toBeOnTheScreen();
-    expect(
-      screen.queryByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.PROPS_LIST),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('does not render the winner market twice in the Props feed', () => {
-    mockUsePredictWorldCupWinnerMarket.mockReturnValue({
-      market: {
-        id: 'winner',
-        title: 'Winner Duplicate',
-        outcomes: [],
-        parentMarketId: null,
-      },
-      isFetching: false,
-      error: null,
-      refetch: jest.fn(),
-    });
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [
-        {
-          id: 'winner',
-          title: 'Winner Duplicate',
-          outcomes: [],
-          parentMarketId: null,
-        },
-        {
-          id: 'other',
-          title: 'Other Market',
-          outcomes: [],
-          parentMarketId: null,
-        },
-      ],
-      isFetching: false,
-      isFetchingMore: false,
-      error: null,
-      hasMore: false,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    );
-
-    expect(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.MARKET_CARD}-props-0`,
-      ),
-    ).toBeOnTheScreen();
-    expect(
-      screen.queryByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.MARKET_CARD}-props-1`,
-      ),
-    ).not.toBeOnTheScreen();
-    // The winner title appears only once (in the header winner module).
-    expect(screen.getAllByText('Winner Duplicate')).toHaveLength(1);
-  });
-
-  it('renders the offline state in the Games tab when the games hook errors', () => {
-    mockUsePredictWorldCupGamesSections.mockReturnValue({
-      sections: [],
-      isLive: false,
-      isFetching: false,
-      error: 'network down',
-      refetch: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.ERROR_STATE),
-    ).toBeOnTheScreen();
-    expect(screen.getByTestId('predict-offline')).toBeOnTheScreen();
-  });
-
-  it('shows Games tab skeleton while initial data is loading', () => {
-    mockUsePredictWorldCupGamesSections.mockReturnValue({
-      sections: [],
-      isLive: false,
-      isFetching: true,
-      error: null,
-      refetch: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-
-    expect(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_HUB_TEST_IDS.SKELETON}-1`),
-    ).toBeOnTheScreen();
-    expect(
-      screen.queryByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.GAMES_LIST),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('shows Props tab loading skeleton while the props feed is loading', () => {
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [],
-      isFetching: true,
-      isFetchingMore: false,
-      error: null,
-      hasMore: false,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    );
-
-    expect(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_HUB_TEST_IDS.SKELETON}-props-1`),
-    ).toBeOnTheScreen();
-    expect(
-      screen.queryByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.PROPS_LIST),
-    ).not.toBeOnTheScreen();
-  });
-
-  it('shows Props tab loading skeleton alongside the winner module when both are present', () => {
-    mockUsePredictWorldCupWinnerMarket.mockReturnValue({
-      market: {
-        id: 'winner',
-        title: 'World Cup Winner',
-        outcomes: [],
-        parentMarketId: null,
-      },
-      isFetching: false,
-      error: null,
-      refetch: jest.fn(),
-    });
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [],
-      isFetching: true,
-      isFetchingMore: false,
-      error: null,
-      hasMore: false,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    );
-
-    expect(screen.getByTestId('winner-module')).toBeOnTheScreen();
-    expect(
-      screen.getByTestId(`${PREDICT_WORLD_CUP_HUB_TEST_IDS.SKELETON}-props-1`),
-    ).toBeOnTheScreen();
-  });
-
-  it('shows Props tab error state when the props feed errors', () => {
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [],
-      isFetching: false,
-      isFetchingMore: false,
-      error: new Error('network'),
-      hasMore: false,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    );
-
-    expect(
-      screen.getByTestId(PREDICT_WORLD_CUP_HUB_TEST_IDS.ERROR_STATE),
-    ).toBeOnTheScreen();
-    expect(screen.getByTestId('predict-offline')).toBeOnTheScreen();
-  });
-
-  it('keeps winner module visible in Props error state', () => {
-    mockUsePredictWorldCupWinnerMarket.mockReturnValue({
-      market: {
-        id: 'winner',
-        title: 'World Cup Winner',
-        outcomes: [],
-        parentMarketId: null,
-      },
-      isFetching: false,
-      error: null,
-      refetch: jest.fn(),
-    });
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [],
-      isFetching: false,
-      isFetchingMore: false,
-      error: new Error('network'),
-      hasMore: false,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    );
-
-    expect(screen.getByTestId('winner-module')).toBeOnTheScreen();
-    expect(screen.getByTestId('predict-offline')).toBeOnTheScreen();
-  });
-
-  it('shows Props footer skeleton when fetching more items', () => {
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [],
-      isFetching: false,
-      isFetchingMore: true,
-      error: null,
-      hasMore: true,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
-
-    render(<PredictWorldCupHub />);
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    );
-
-    expect(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.SKELETON}-props-footer`,
-      ),
-    ).toBeOnTheScreen();
-  });
-
-  it('calls fetchMore when end of Props list is reached and more data is available', () => {
-    const mockFetchMore = jest.fn();
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [],
-      isFetching: false,
-      isFetchingMore: false,
-      error: null,
-      hasMore: true,
-      refetch: jest.fn(),
-      fetchMore: mockFetchMore,
-    });
-
-    render(<PredictWorldCupHub />);
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    );
-
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.PROPS_LIST}-end-reached`,
-      ),
-    );
-
-    expect(mockFetchMore).toHaveBeenCalled();
-  });
-
-  it('calls goBack when back button is pressed and navigation can go back', () => {
-    mockCanGoBack.mockReturnValue(true);
-
-    render(<PredictWorldCupHub />);
-    fireEvent.press(screen.getByTestId('header-back-button'));
-
-    expect(mockGoBack).toHaveBeenCalled();
-    expect(mockNavigate).not.toHaveBeenCalled();
-  });
-
-  it('navigates to market list when back button is pressed and cannot go back', () => {
-    mockCanGoBack.mockReturnValue(false);
-
-    render(<PredictWorldCupHub />);
-    fireEvent.press(screen.getByTestId('header-back-button'));
-
-    expect(mockGoBack).not.toHaveBeenCalled();
-    expect(mockNavigate).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({}),
-    );
-  });
-
-  it('triggers Games tab refetch on pull-to-refresh', async () => {
-    const mockRefetch = jest.fn().mockResolvedValue(undefined);
-    mockUsePredictWorldCupGamesSections.mockReturnValue({
-      sections: [
-        {
-          key: 'final',
-          label: 'Final',
-          markets: [
-            {
-              id: 'm-1',
-              title: 'Final Match',
-              outcomes: [],
-              parentMarketId: null,
-            },
-          ],
-          isFetching: false,
-        },
-      ],
-      isLive: false,
-      isFetching: false,
-      error: null,
-      refetch: mockRefetch,
-    });
-
-    const { UNSAFE_getAllByType } = render(<PredictWorldCupHub />);
-    const refreshControls = UNSAFE_getAllByType(RefreshControl);
-    await act(async () => {
-      refreshControls[0].props.onRefresh();
-    });
-
-    expect(mockRefetch).toHaveBeenCalled();
-  });
-
-  it('triggers Props tab refetch on pull-to-refresh', async () => {
-    const mockPropsRefetch = jest.fn().mockResolvedValue(undefined);
-    const mockWinnerRefetch = jest.fn().mockResolvedValue(undefined);
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [],
-      isFetching: false,
-      isFetchingMore: false,
-      error: null,
-      hasMore: false,
-      refetch: mockPropsRefetch,
-      fetchMore: jest.fn(),
-    });
-    mockUsePredictWorldCupWinnerMarket.mockReturnValue({
-      market: null,
-      isFetching: false,
-      error: null,
-      refetch: mockWinnerRefetch,
-    });
-
-    const { UNSAFE_getAllByType } = render(<PredictWorldCupHub />);
-    fireEvent.press(
-      screen.getByTestId(
-        `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}`,
-      ),
-    );
-
-    const refreshControls = UNSAFE_getAllByType(RefreshControl);
-    await act(async () => {
-      refreshControls[0].props.onRefresh();
-    });
-
-    expect(mockPropsRefetch).toHaveBeenCalled();
-  });
-
-  it('stores tab layout and does not throw when a tab receives a layout event', () => {
-    render(<PredictWorldCupHub />);
-
-    const gamesTab = screen.getByTestId(
-      `${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${PREDICT_WORLD_CUP_HUB_TAB_KEYS.GAMES}`,
-    );
-
-    expect(() => {
-      fireEvent(gamesTab, 'layout', {
-        nativeEvent: { layout: { x: 10, y: 0, width: 80, height: 40 } },
-      });
-    }).not.toThrow();
-  });
-});
diff --git a/app/components/UI/Predict/views/PredictWorldCupHub/PredictWorldCupHub.tsx b/app/components/UI/Predict/views/PredictWorldCupHub/PredictWorldCupHub.tsx
deleted file mode 100644
index 0ed2885d0e69..000000000000
--- a/app/components/UI/Predict/views/PredictWorldCupHub/PredictWorldCupHub.tsx
+++ /dev/null
@@ -1,580 +0,0 @@
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
-import { useRoute, RouteProp } from '@react-navigation/native';
-import { useSelector } from 'react-redux';
-import {
-  type LayoutChangeEvent,
-  Pressable,
-  RefreshControl,
-  ScrollView,
-} from 'react-native';
-import { FlashList } from '@shopify/flash-list';
-import {
-  useTailwind,
-  Theme,
-  ThemeProvider as DesignSystemThemeProvider,
-  useTheme as useDesignSystemTheme,
-} from '@metamask/design-system-twrnc-preset';
-import {
-  Box,
-  HeaderStandard,
-  Text,
-  TextColor,
-  TextVariant,
-} from '@metamask/design-system-react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
-import Engine from '../../../../../core/Engine';
-import { selectPredictWorldCupConfig } from '../../selectors/featureFlags';
-import type {
-  PredictEntryPoint,
-  PredictNavigationParamList,
-} from '../../types/navigation';
-import type { TransactionActiveAbTestEntry } from '../../../../../util/transactions/transaction-active-ab-test-attribution-registry';
-import type { PredictMarket as PredictMarketType } from '../../types';
-import {
-  PREDICT_WORLD_CUP_HUB_TAB_KEYS,
-  buildPredictWorldCupHubTabs,
-  resolvePredictWorldCupHubInitialTab,
-  type PredictWorldCupHubTab,
-  type PredictWorldCupHubTabKey,
-} from '../../constants/worldCupHubTabs';
-import {
-  usePredictWorldCupGamesSections,
-  usePredictWorldCupWinnerMarket,
-  type PredictWorldCupStageSection,
-} from '../../hooks/usePredictWorldCupHub';
-import {
-  usePredictWorldCupMarkets,
-  usePredictWorldCupFeedSession,
-} from '../../hooks';
-import PredictMarket from '../../components/PredictMarket';
-import PredictMarketSkeleton from '../../components/PredictMarketSkeleton';
-import PredictOffline from '../../components/PredictOffline';
-import PulsingLiveDot from '../../components/PulsingLiveDot/PulsingLiveDot';
-import PredictWorldCupWinnerModule from '../../components/PredictWorldCupWinnerModule';
-import PredictWorldCupHubBanner from '../../components/PredictWorldCupHubBanner';
-import { PredictEventValues } from '../../constants/eventNames';
-import { strings } from '../../../../../../locales/i18n';
-
-export const PREDICT_WORLD_CUP_HUB_TEST_IDS = {
-  CONTAINER: 'predict-world-cup-hub-screen',
-  TABS: 'predict-world-cup-hub-tabs',
-  TAB: 'predict-world-cup-hub-tab',
-  GAMES_LIST: 'predict-world-cup-hub-games-list',
-  PROPS_LIST: 'predict-world-cup-hub-props-list',
-  SECTION_HEADER: 'predict-world-cup-hub-section-header',
-  MARKET_CARD: 'predict-world-cup-hub-market-card',
-  SKELETON: 'predict-world-cup-hub-skeleton',
-  EMPTY_STATE: 'predict-world-cup-hub-empty-state',
-  ERROR_STATE: 'predict-world-cup-hub-error-state',
-} as const;
-
-// ---------------------------------------------------------------------------
-// Tab bar
-// ---------------------------------------------------------------------------
-
-const HubTabButton: React.FC<{
-  tab: PredictWorldCupHubTab;
-  isActive: boolean;
-  onPress: () => void;
-  onLayout: (event: LayoutChangeEvent) => void;
-}> = ({ tab, isActive, onPress, onLayout }) => {
-  const tw = useTailwind();
-  const designSystemTheme = useDesignSystemTheme();
-  const inverseTheme =
-    designSystemTheme === Theme.Dark ? Theme.Light : Theme.Dark;
-
-  const dotContent = (
-    <>
-      <PulsingLiveDot color={tw.color('success-default')} />
-      <Text
-        variant={TextVariant.BodySm}
-        style={tw.style('font-medium leading-[22px]', 'text-success-default')}
-      >
-        {tab.label}
-      </Text>
-    </>
-  );
-
-  return (
-    <Pressable
-      onPress={onPress}
-      onLayout={onLayout}
-      style={tw.style(
-        'min-w-[51px] flex-row items-center justify-center gap-2 rounded-xl bg-muted p-2',
-        isActive && 'bg-icon-default',
-      )}
-      testID={`${PREDICT_WORLD_CUP_HUB_TEST_IDS.TAB}-${tab.key}`}
-    >
-      {tab.hasLiveDot ? (
-        isActive ? (
-          <DesignSystemThemeProvider theme={inverseTheme}>
-            {dotContent}
-          </DesignSystemThemeProvider>
-        ) : (
-          dotContent
-        )
-      ) : (
-        <Text
-          color={
-            isActive ? TextColor.PrimaryInverse : TextColor.TextAlternative
-          }
-          variant={TextVariant.BodySm}
-          style={tw.style('font-medium leading-[22px]')}
-        >
-          {tab.label}
-        </Text>
-      )}
-    </Pressable>
-  );
-};
-
-// ---------------------------------------------------------------------------
-// Games tab — flat FlashList with interleaved section headers
-// ---------------------------------------------------------------------------
-
-type GamesListItem =
-  | { type: 'header'; key: string; label: string }
-  | {
-      type: 'market';
-      key: string;
-      market: PredictMarketType;
-      stageKey: string;
-    };
-
-interface GamesTabContentProps {
-  sections: PredictWorldCupStageSection[];
-  isFetching: boolean;
-  error: string | null;
-  refetch: () => Promise<void>;
-  entryPoint?: PredictEntryPoint;
-  transactionActiveAbTests?: TransactionActiveAbTestEntry[];
-}
-
-const GamesTabContent: React.FC<GamesTabContentProps> = ({
-  sections,
-  isFetching,
-  error,
-  refetch,
-  entryPoint,
-  transactionActiveAbTests,
-}) => {
-  const tw = useTailwind();
-  const [isRefreshing, setIsRefreshing] = useState(false);
-
-  const items = useMemo<GamesListItem[]>(() => {
-    const list: GamesListItem[] = [];
-    for (const section of sections) {
-      list.push({
-        type: 'header',
-        key: `header-${section.key}`,
-        label: section.label,
-      });
-      for (const market of section.markets) {
-        list.push({
-          type: 'market',
-          key: market.id,
-          market,
-          stageKey: section.key,
-        });
-      }
-    }
-    return list;
-  }, [sections]);
-
-  const handleRefresh = useCallback(async () => {
-    setIsRefreshing(true);
-    try {
-      await refetch();
-    } finally {
-      setIsRefreshing(false);
-    }
-  }, [refetch]);
-
-  const renderItem = useCallback(
-    ({ item, index }: { item: GamesListItem; index: number }) => {
-      if (item.type === 'header') {
-        return (
-          <Text
-            variant={TextVariant.HeadingSm}
-            color={TextColor.TextDefault}
-            style={tw.style('font-medium px-4 pt-4 pb-2')}
-            testID={`${PREDICT_WORLD_CUP_HUB_TEST_IDS.SECTION_HEADER}-${item.key}`}
-          >
-            {item.label}
-          </Text>
-        );
-      }
-      return (
-        <Box twClassName="px-4">
-          <PredictMarket
-            market={item.market}
-            entryPoint={entryPoint}
-            testID={`${PREDICT_WORLD_CUP_HUB_TEST_IDS.MARKET_CARD}-${index}`}
-            predictFeedTab={PREDICT_WORLD_CUP_HUB_TAB_KEYS.GAMES}
-            predictScreen={PredictEventValues.PREDICT_SCREEN.WORLD_CUP}
-            transactionActiveAbTests={transactionActiveAbTests}
-          />
-        </Box>
-      );
-    },
-    [entryPoint, transactionActiveAbTests, tw],
-  );
-
-  const keyExtractor = useCallback((item: GamesListItem) => item.key, []);
-
-  const getItemType = useCallback((item: GamesListItem) => item.type, []);
-
-  if (isFetching && !isRefreshing && sections.length === 0) {
-    return (
-      <Box twClassName="flex-1 px-4">
-        <PredictMarketSkeleton
-          testID={`${PREDICT_WORLD_CUP_HUB_TEST_IDS.SKELETON}-1`}
-        />
-        <PredictMarketSkeleton
-          testID={`${PREDICT_WORLD_CUP_HUB_TEST_IDS.SKELETON}-2`}
-        />
-        <PredictMarketSkeleton
-          testID={`${PREDICT_WORLD_CUP_HUB_TEST_IDS.SKELETON}-3`}
-        />
-      </Box>
-    );
-  }
-
-  if (error && sections.length === 0) {
-    return (
-      <Box
-        twClassName="flex-1"
-        testID={PREDICT_WORLD_CUP_HUB_TEST_IDS.ERROR_STATE}
-      >
-        <PredictOffline onRetry={handleRefresh} />
-      </Box>
-    );
-  }
-
-  if (items.length === 0) {
-    return (
-      <Box
-        twClassName="flex-1 justify-center items-center p-8"
-        testID={PREDICT_WORLD_CUP_HUB_TEST_IDS.EMPTY_STATE}
-      >
-        <Text variant={TextVariant.BodyMd} color={TextColor.PrimaryAlternative}>
-          {strings('predict.search_empty_state', {
-            category: strings('predict.world_cup.title'),
-          })}
-        </Text>
-      </Box>
-    );
-  }
-
-  return (
-    <FlashList
-      testID={PREDICT_WORLD_CUP_HUB_TEST_IDS.GAMES_LIST}
-      data={items}
-      renderItem={renderItem}
-      keyExtractor={keyExtractor}
-      getItemType={getItemType}
-      refreshControl={
-        <RefreshControl refreshing={isRefreshing} onRefresh={handleRefresh} />
-      }
-      contentContainerStyle={tw.style('pb-4')}
-      showsVerticalScrollIndicator={false}
-    />
-  );
-};
-
-// ---------------------------------------------------------------------------
-// Props tab — winner module + "Props" header + infinite props feed
-// ---------------------------------------------------------------------------
-
-interface PropsTabContentProps {
-  config: ReturnType<typeof selectPredictWorldCupConfig>;
-  entryPoint?: PredictEntryPoint;
-  transactionActiveAbTests?: TransactionActiveAbTestEntry[];
-}
-
-const PropsTabContent: React.FC<PropsTabContentProps> = ({
-  config,
-  entryPoint,
-  transactionActiveAbTests,
-}) => {
-  const tw = useTailwind();
-  const [isRefreshing, setIsRefreshing] = useState(false);
-
-  const { market: winnerMarket, refetch: refetchWinner } =
-    usePredictWorldCupWinnerMarket(config);
-
-  const {
-    marketData,
-    isFetching,
-    isFetchingMore,
-    error,
-    hasMore,
-    refetch,
-    fetchMore,
-  } = usePredictWorldCupMarkets({
-    tabKey: PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS,
-    config,
-  });
-
-  // The winner market is rendered in the dedicated header module, so exclude it
-  // from the props feed list to avoid rendering it twice.
-  const filteredMarketData = useMemo(
-    () =>
-      winnerMarket
-        ? marketData.filter((market) => market.id !== winnerMarket.id)
-        : marketData,
-    [marketData, winnerMarket],
-  );
-
-  const handleRefresh = useCallback(async () => {
-    setIsRefreshing(true);
-    try {
-      await Promise.all([refetch(), refetchWinner()]);
-    } finally {
-      setIsRefreshing(false);
-    }
-  }, [refetch, refetchWinner]);
-
-  const handleEndReached = useCallback(() => {
-    if (hasMore && !isFetchingMore) {
-      fetchMore();
-    }
-  }, [fetchMore, hasMore, isFetchingMore]);
-
-  const renderItem = useCallback(
-    ({ item, index }: { item: PredictMarketType; index: number }) => (
-      <Box twClassName="px-4">
-        <PredictMarket
-          market={item}
-          entryPoint={entryPoint}
-          testID={`${PREDICT_WORLD_CUP_HUB_TEST_IDS.MARKET_CARD}-props-${index}`}
-          predictFeedTab={PREDICT_WORLD_CUP_HUB_TAB_KEYS.PROPS}
-          predictScreen={PredictEventValues.PREDICT_SCREEN.WORLD_CUP}
-          transactionActiveAbTests={transactionActiveAbTests}
-        />
-      </Box>
-    ),
-    [entryPoint, transactionActiveAbTests],
-  );
-
-  const keyExtractor = useCallback((item: PredictMarketType) => item.id, []);
-
-  const renderFooter = useCallback(() => {
-    if (!isFetchingMore) return null;
-    return (
-      <Box twClassName="px-4 py-2">
-        <PredictMarketSkeleton
-          testID={`${PREDICT_WORLD_CUP_HUB_TEST_IDS.SKELETON}-props-footer`}
-        />
-      </Box>
-    );
-  }, [isFetchingMore]);
-
-  const winnerModuleNode = useMemo(
-    () =>
-      winnerMarket ? (
-        <PredictWorldCupWinnerModule
-          market={winnerMarket}
-          entryPoint={entryPoint}
-          predictScreen={PredictEventValues.PREDICT_SCREEN.WORLD_CUP}
-          transactionActiveAbTests={transactionActiveAbTests}
-        />
-      ) : null,
-    [winnerMarket, entryPoint, transactionActiveAbTests],
-  );
-
-  const ListHeaderComponent = useMemo(
-    () => (
-      <>
-        {winnerModuleNode}
-        <Text
-          variant={TextVariant.HeadingSm}
-          color={TextColor.TextDefault}
-          style={tw.style('font-medium px-4 pt-4 pb-2')}
-        >
-          {strings('predict.world_cup.tabs.props')}
-        </Text>
-      </>
-    ),
-    [winnerModuleNode, tw],
-  );
-
-  if (isFetching && !isRefreshing && !isFetchingMore) {
-    return (
-      <Box twClassName="flex-1">
-        {winnerModuleNode}
-        <Box twClassName="px-4">
-          <PredictMarketSkeleton
-            testID={`${PREDICT_WORLD_CUP_HUB_TEST_IDS.SKELETON}-props-1`}
-          />
-          <PredictMarketSkeleton
-            testID={`${PREDICT_WORLD_CUP_HUB_TEST_IDS.SKELETON}-props-2`}
-          />
-        </Box>
-      </Box>
-    );
-  }
-
-  if (error) {
-    return (
-      <Box
-        twClassName="flex-1"
-        testID={PREDICT_WORLD_CUP_HUB_TEST_IDS.ERROR_STATE}
-      >
-        {winnerModuleNode}
-        <PredictOffline onRetry={handleRefresh} />
-      </Box>
-    );
-  }
-
-  return (
-    <FlashList
-      testID={PREDICT_WORLD_CUP_HUB_TEST_IDS.PROPS_LIST}
-      data={filteredMarketData}
-      renderItem={renderItem}
-      keyExtractor={keyExtractor}
-      onEndReached={handleEndReached}
-      onEndReachedThreshold={0.7}
-      ListHeaderComponent={ListHeaderComponent}
-      ListFooterComponent={renderFooter}
-      refreshControl={
-        <RefreshControl refreshing={isRefreshing} onRefresh={handleRefresh} />
-      }
-      contentContainerStyle={tw.style('pb-4')}
-      showsVerticalScrollIndicator={false}
-    />
-  );
-};
-
-// ---------------------------------------------------------------------------
-// Main hub screen
-// ---------------------------------------------------------------------------
-
-const PredictWorldCupHub: React.FC = () => {
-  const tw = useTailwind();
-  const route =
-    useRoute<RouteProp<PredictNavigationParamList, 'PredictWorldCup'>>();
-  const config = useSelector(selectPredictWorldCupConfig);
-
-  const entryPoint = (route.params?.entryPoint ??
-    PredictEventValues.ENTRY_POINT.PREDICT_FEED) as PredictEntryPoint;
-  const transactionActiveAbTests = route.params?.transactionActiveAbTests;
-
-  const initialTab = useMemo(
-    () => resolvePredictWorldCupHubInitialTab(route.params?.initialTab),
-    [route.params?.initialTab],
-  );
-
-  const {
-    activeTab,
-    tabsScrollViewRef,
-    feedSessionId,
-    feedSessionStartTime,
-    getPageViewCount,
-    handleTabLayout,
-    handleTabPress,
-    handleBack,
-  } = usePredictWorldCupFeedSession<PredictWorldCupHubTabKey>({
-    initialTab,
-    entryPoint,
-    routeEntryPoint: route.params?.entryPoint as PredictEntryPoint | undefined,
-    transactionActiveAbTests,
-  });
-
-  const hasTrackedInitialFeedViewed = useRef(false);
-
-  // Single hook call — sections, live status and refetch are passed down to GamesTabContent.
-  // No `enabled` guard needed: PredictWorldCupRoute already ensures this component only
-  // mounts when `enabled && showWorldCupScreen && showHubV2` are all true.
-  const {
-    sections: gamesSections,
-    isLive,
-    isFetching: isGamesFetching,
-    error: gamesError,
-    refetch: refetchGames,
-  } = usePredictWorldCupGamesSections(config);
-  const tabs = useMemo(() => buildPredictWorldCupHubTabs(isLive), [isLive]);
-
-  useEffect(() => {
-    if (hasTrackedInitialFeedViewed.current) return;
-
-    Engine.context.PredictController.trackFeedViewed({
-      sessionId: feedSessionId,
-      feedTab: initialTab,
-      predictScreen: PredictEventValues.PREDICT_SCREEN.WORLD_CUP,
-      numPagesViewed: getPageViewCount(),
-      sessionTime: Math.round((Date.now() - feedSessionStartTime) / 1000),
-      entryPoint,
-      isSessionEnd: false,
-    });
-    hasTrackedInitialFeedViewed.current = true;
-  }, [
-    entryPoint,
-    feedSessionId,
-    feedSessionStartTime,
-    getPageViewCount,
-    initialTab,
-  ]);
-
-  return (
-    <SafeAreaView
-      edges={['bottom', 'left', 'right']}
-      style={tw.style('flex-1 bg-default')}
-      testID={PREDICT_WORLD_CUP_HUB_TEST_IDS.CONTAINER}
-    >
-      <HeaderStandard
-        title={strings('predict.world_cup.title')}
-        onBack={handleBack}
-        includesTopInset
-      />
-
-      <PredictWorldCupHubBanner />
-
-      <Box twClassName="flex-1">
-        <ScrollView
-          ref={tabsScrollViewRef}
-          horizontal
-          showsHorizontalScrollIndicator={false}
-          style={tw.style('grow-0')}
-          contentContainerStyle={tw.style('gap-2 px-4 pb-4')}
-          testID={PREDICT_WORLD_CUP_HUB_TEST_IDS.TABS}
-        >
-          {tabs.map((tab) => (
-            <HubTabButton
-              key={tab.key}
-              tab={tab}
-              isActive={activeTab === tab.key}
-              onPress={() => handleTabPress(tab.key)}
-              onLayout={(event) => handleTabLayout(tab.key, event)}
-            />
-          ))}
-        </ScrollView>
-
-        {activeTab === PREDICT_WORLD_CUP_HUB_TAB_KEYS.GAMES ? (
-          <GamesTabContent
-            sections={gamesSections}
-            isFetching={isGamesFetching}
-            error={gamesError}
-            refetch={refetchGames}
-            entryPoint={entryPoint}
-            transactionActiveAbTests={transactionActiveAbTests}
-          />
-        ) : (
-          <PropsTabContent
-            config={config}
-            entryPoint={entryPoint}
-            transactionActiveAbTests={transactionActiveAbTests}
-          />
-        )}
-      </Box>
-    </SafeAreaView>
-  );
-};
-
-export default PredictWorldCupHub;
diff --git a/app/components/UI/Predict/views/PredictWorldCupHub/index.ts b/app/components/UI/Predict/views/PredictWorldCupHub/index.ts
deleted file mode 100644
index c92526ffe0fb..000000000000
--- a/app/components/UI/Predict/views/PredictWorldCupHub/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default } from './PredictWorldCupHub';
-export { PREDICT_WORLD_CUP_HUB_TEST_IDS } from './PredictWorldCupHub';
diff --git a/app/components/UI/Ramp/Aggregator/Views/OrdersList/OrdersList.test.tsx b/app/components/UI/Ramp/Aggregator/Views/OrdersList/OrdersList.test.tsx
index 201cd09fe479..720b4e7901e9 100644
--- a/app/components/UI/Ramp/Aggregator/Views/OrdersList/OrdersList.test.tsx
+++ b/app/components/UI/Ramp/Aggregator/Views/OrdersList/OrdersList.test.tsx
@@ -338,6 +338,8 @@ describe('OrdersList', () => {
     fireEvent.press(screen.getByRole('button', { name: 'Purchased' }));
     fireEvent.press(screen.getByRole('button', { name: /Purchased USDT/ }));
 
-    expect(mockGoToBuy).toHaveBeenCalledWith();
+    expect(mockGoToBuy).toHaveBeenCalledWith(undefined, {
+      surface: 'orders_list',
+    });
   });
 });
diff --git a/app/components/UI/Ramp/Aggregator/Views/OrdersList/OrdersList.tsx b/app/components/UI/Ramp/Aggregator/Views/OrdersList/OrdersList.tsx
index 9314a6afd0a7..359a11afe002 100644
--- a/app/components/UI/Ramp/Aggregator/Views/OrdersList/OrdersList.tsx
+++ b/app/components/UI/Ramp/Aggregator/Views/OrdersList/OrdersList.tsx
@@ -11,6 +11,7 @@ import { createOrderDetailsNavDetails } from '../OrderDetails/OrderDetails';
 import { createRampsOrderDetailsNavDetails } from '../../../Views/OrderDetails';
 import { createDepositOrderDetailsNavDetails } from '../../../Views/OrderDetails/DepositOrderDetails/DepositOrderDetails';
 import { useRampNavigation } from '../../../hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../../constants/rampsBuyCufTags';
 import createStyles from './OrdersList.styles';
 import { TabEmptyState } from '../../../../../../component-library/components-temp/TabEmptyState';
 
@@ -241,7 +242,7 @@ function OrdersList() {
         order?.state === FIAT_ORDER_STATES.CREATED &&
         order?.provider === FIAT_ORDER_PROVIDERS.DEPOSIT
       ) {
-        goToBuy();
+        goToBuy(undefined, { surface: RAMPS_BUY_CUF_SURFACE.ORDERS_LIST });
       } else if (order?.provider === FIAT_ORDER_PROVIDERS.DEPOSIT) {
         navigateWithDetails(
           navigation,
diff --git a/app/components/UI/Ramp/Aggregator/Views/Settings/Settings.test.tsx b/app/components/UI/Ramp/Aggregator/Views/Settings/Settings.test.tsx
index 22b41aecdb97..4607d2a9f266 100644
--- a/app/components/UI/Ramp/Aggregator/Views/Settings/Settings.test.tsx
+++ b/app/components/UI/Ramp/Aggregator/Views/Settings/Settings.test.tsx
@@ -115,6 +115,7 @@ const mockUseRampsControllerInitialValues: ReturnType<
   setUserRegion: mockSetUserRegion,
   selectedProvider: null,
   setSelectedProvider: mockSetSelectedProvider,
+  setSelectedProviderForAsset: jest.fn(),
   providers: [],
   providersLoading: false,
   providersError: null,
@@ -189,13 +190,13 @@ describe('Settings', () => {
 
   it('renders correctly', () => {
     render(Settings);
-    expect(screen.getByText('Buy & sell crypto')).toBeOnTheScreen();
+    expect(screen.getByText('Buy and sell crypto')).toBeOnTheScreen();
     expect(withRampSDK).toHaveBeenCalled();
   });
 
-  it('renders inline header with title Buy & sell crypto', () => {
+  it('renders inline header with title Buy and sell crypto', () => {
     render(Settings);
-    expect(screen.getByText('Buy & sell crypto')).toBeOnTheScreen();
+    expect(screen.getByText('Buy and sell crypto')).toBeOnTheScreen();
     expect(screen.getByTestId(RAMP_SETTINGS_HEADER_TEST_ID)).toBeOnTheScreen();
   });
 
diff --git a/app/components/UI/Ramp/Aggregator/routes/index.test.tsx b/app/components/UI/Ramp/Aggregator/routes/index.test.tsx
index 5ff70a4715ec..1dc18143da5b 100644
--- a/app/components/UI/Ramp/Aggregator/routes/index.test.tsx
+++ b/app/components/UI/Ramp/Aggregator/routes/index.test.tsx
@@ -8,18 +8,10 @@ import { RampType } from '../types';
 import Routes from '../../../../../constants/navigation/Routes';
 import { backgroundState } from '../../../../../util/test/initial-root-state';
 
-jest.mock('@react-navigation/native-stack', () => ({
-  createNativeStackNavigator: jest.fn().mockReturnValue({
-    Navigator: ({ children }: { children: React.ReactNode }) => children,
-    Screen: ({
-      name,
-      component: Component,
-    }: {
-      name: string;
-      component: React.ComponentType;
-    }) => <Component key={name} />,
-  }),
-}));
+jest.mock('@react-navigation/native-stack', () =>
+  // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
+  require('../../../../../util/test/mockNativeStackNavigator').createMockNativeStackModule(),
+);
 
 jest.mock('../sdk', () => ({
   RampSDKProvider: ({ children }: { children: React.ReactNode }) => children,
diff --git a/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.test.tsx b/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.test.tsx
index e42ac6b5e729..0ae35bf3785a 100644
--- a/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.test.tsx
+++ b/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.test.tsx
@@ -327,12 +327,14 @@ describe('createBuildQuoteNavDetails', () => {
 });
 
 const mockSetSelectedProvider = jest.fn();
+const mockSetSelectedProviderForAsset = jest.fn();
 
 const buildRampsControllerResult = (overrides = {}) => ({
   userRegion: USER_REGION,
   providers: [WIDGET_PROVIDER, NATIVE_PROVIDER],
   selectedProvider: WIDGET_PROVIDER,
   setSelectedProvider: mockSetSelectedProvider,
+  setSelectedProviderForAsset: mockSetSelectedProviderForAsset,
   selectedToken: SELECTED_TOKEN,
   paymentMethods: [SELECTED_PAYMENT_METHOD],
   getBuyWidgetData: mockGetBuyWidgetData,
@@ -1525,6 +1527,7 @@ describe('BuildQuote', () => {
         providers: [transakProvider, WIDGET_PROVIDER],
         selectedProvider: transakProvider,
         setSelectedProvider: mockSetSelectedProvider,
+        setSelectedProviderForAsset: mockSetSelectedProviderForAsset,
         selectedToken: SELECTED_TOKEN,
         paymentMethods: [],
         getBuyWidgetData: mockGetBuyWidgetData,
@@ -1542,6 +1545,7 @@ describe('BuildQuote', () => {
     beforeEach(() => {
       jest.useFakeTimers();
       mockUseParams.mockReturnValue({ assetId: TOKEN_ASSET });
+      mockSetSelectedProviderForAsset.mockReset();
     });
 
     afterEach(() => {
@@ -1630,7 +1634,7 @@ describe('BuildQuote', () => {
     });
 
     it('does not open payment selection when token unavailable disables pill', () => {
-      mockUnavailableController({});
+      mockUnavailableController({ providers: [transakProvider] });
       const { getByTestId } = renderWithProvider(<BuildQuote />, {
         state: initialRootState,
       });
@@ -1647,6 +1651,28 @@ describe('BuildQuote', () => {
       );
     });
 
+    it('switches to another supporting provider when current has empty payment methods', () => {
+      mockSetSelectedProviderForAsset.mockReturnValue(false);
+      mockUnavailableController({
+        selectedProvider: transakProvider,
+        providers: [transakProvider, WIDGET_PROVIDER],
+      });
+      renderWithProvider(<BuildQuote />, { state: initialRootState });
+      act(() => {
+        jest.advanceTimersByTime(650);
+      });
+      expect(mockSetSelectedProviderForAsset).toHaveBeenCalledWith(TOKEN_ASSET);
+      expect(mockSetSelectedProvider).toHaveBeenCalledWith(WIDGET_PROVIDER, {
+        autoSelected: true,
+      });
+      expect(mockNavigate).not.toHaveBeenCalledWith(
+        'RampModals',
+        expect.objectContaining({
+          screen: 'RampTokenNotAvailableModal',
+        }),
+      );
+    });
+
     it('navigates when token is missing from supportedCryptoCurrencies', () => {
       const banxaProvider = {
         id: '/providers/banxa',
@@ -1756,15 +1782,14 @@ describe('BuildQuote', () => {
           },
         });
         mockUseParams.mockReturnValue({ assetId: BTC_ASSET });
+        mockSetSelectedProviderForAsset.mockReturnValue(true);
 
         renderWithProvider(<BuildQuote />, { state: autoSelectedState });
         act(() => {
           jest.advanceTimersByTime(650);
         });
 
-        expect(mockSetSelectedProvider).toHaveBeenCalledWith(coinbaseProvider, {
-          autoSelected: true,
-        });
+        expect(mockSetSelectedProviderForAsset).toHaveBeenCalledWith(BTC_ASSET);
         expect(mockNavigate).not.toHaveBeenCalledWith(
           'RampModals',
           expect.objectContaining({
@@ -1790,7 +1815,7 @@ describe('BuildQuote', () => {
           jest.advanceTimersByTime(650);
         });
 
-        expect(mockSetSelectedProvider).not.toHaveBeenCalled();
+        expect(mockSetSelectedProviderForAsset).toHaveBeenCalledWith(BTC_ASSET);
         expect(mockNavigate).toHaveBeenCalledWith(
           'RampModals',
           expect.objectContaining({
@@ -1810,15 +1835,14 @@ describe('BuildQuote', () => {
           },
         });
         mockUseParams.mockReturnValue({ assetId: BTC_ASSET });
+        mockSetSelectedProviderForAsset.mockReturnValue(true);
 
         renderWithProvider(<BuildQuote />, { state: initialRootState });
         act(() => {
           jest.advanceTimersByTime(650);
         });
 
-        expect(mockSetSelectedProvider).toHaveBeenCalledWith(coinbaseProvider, {
-          autoSelected: true,
-        });
+        expect(mockSetSelectedProviderForAsset).toHaveBeenCalledWith(BTC_ASSET);
         expect(mockNavigate).not.toHaveBeenCalledWith(
           'RampModals',
           expect.objectContaining({
diff --git a/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.tsx b/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.tsx
index cd9328c133b3..d2a7916d2480 100644
--- a/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.tsx
+++ b/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.tsx
@@ -156,6 +156,7 @@ function BuildQuote() {
     providers,
     selectedProvider,
     setSelectedProvider,
+    setSelectedProviderForAsset,
     selectedToken,
     paymentMethods,
     paymentMethodsLoading,
@@ -273,14 +274,26 @@ function BuildQuote() {
       return;
     }
 
+    // Keep providers in deps: ensures the effect re-runs when the provider
+    // list loads or refreshes, giving the controller a chance to find a
+    // compatible provider even if it was called too early.
+    if (providers.length === 0) return;
+
     if (effectiveAssetId) {
-      const supportingProvider = providers.find(
+      const switched = setSelectedProviderForAsset(effectiveAssetId);
+      if (switched) return;
+
+      // Controller no-ops when the current provider already lists the asset in
+      // supportedCryptoCurrencies. Empty payment methods can still mark the
+      // token unavailable for that provider, so try a different supporting
+      // provider before showing the modal (parity with pre-delegation UI).
+      const otherSupporting = providers.find(
         (p) =>
           p.id !== selectedProvider?.id &&
           providerSupportsAsset(p, effectiveAssetId),
       );
-      if (supportingProvider) {
-        setSelectedProvider(supportingProvider, { autoSelected: true });
+      if (otherSupporting) {
+        setSelectedProvider(otherSupporting, { autoSelected: true });
         return;
       }
     }
@@ -310,6 +323,7 @@ function BuildQuote() {
     focusTrigger,
     providers,
     setSelectedProvider,
+    setSelectedProviderForAsset,
   ]);
 
   const currency = userRegion?.country?.currency || 'USD';
diff --git a/app/components/UI/Ramp/Views/HeadlessPlayground/HeadlessPlayground.test.tsx b/app/components/UI/Ramp/Views/HeadlessPlayground/HeadlessPlayground.test.tsx
index 0f4bf8d902e0..a8b6dd824ffb 100644
--- a/app/components/UI/Ramp/Views/HeadlessPlayground/HeadlessPlayground.test.tsx
+++ b/app/components/UI/Ramp/Views/HeadlessPlayground/HeadlessPlayground.test.tsx
@@ -125,6 +125,7 @@ const mockUseRampsControllerInitialValues: ReturnType<
   setUserRegion: mockSetUserRegion,
   selectedProvider: null,
   setSelectedProvider: mockSetSelectedProvider,
+  setSelectedProviderForAsset: jest.fn(),
   providers: mockProviders,
   providersLoading: false,
   providersError: null,
diff --git a/app/components/UI/Ramp/Views/Modals/PaymentSelectionModal/PaymentSelectionModal.test.tsx b/app/components/UI/Ramp/Views/Modals/PaymentSelectionModal/PaymentSelectionModal.test.tsx
index b2cf203772ef..c6d58679b5a9 100644
--- a/app/components/UI/Ramp/Views/Modals/PaymentSelectionModal/PaymentSelectionModal.test.tsx
+++ b/app/components/UI/Ramp/Views/Modals/PaymentSelectionModal/PaymentSelectionModal.test.tsx
@@ -154,6 +154,7 @@ const defaultControllerReturn = {
   paymentMethodsError: null,
   selectedPaymentMethod: mockPaymentMethods[0],
   setSelectedProvider: mockSetSelectedProvider,
+  setSelectedProviderForAsset: jest.fn(),
   setSelectedPaymentMethod: mockSetSelectedPaymentMethod,
   userRegion: { regionCode: 'us', country: { currency: 'USD' } },
   selectedToken: {
diff --git a/app/components/UI/Ramp/Views/Modals/ProviderSelectionModal/ProviderSelection.test.tsx b/app/components/UI/Ramp/Views/Modals/ProviderSelectionModal/ProviderSelection.test.tsx
index 00d32f288c08..287027d4965a 100644
--- a/app/components/UI/Ramp/Views/Modals/ProviderSelectionModal/ProviderSelection.test.tsx
+++ b/app/components/UI/Ramp/Views/Modals/ProviderSelectionModal/ProviderSelection.test.tsx
@@ -45,6 +45,7 @@ const defaultMockController: UseRampsControllerResult = {
   setUserRegion: jest.fn(),
   selectedProvider: null,
   setSelectedProvider: jest.fn(),
+  setSelectedProviderForAsset: jest.fn(),
   providers: [],
   providersLoading: false,
   providersError: null,
diff --git a/app/components/UI/Ramp/Views/Modals/ProviderSelectionModal/ProviderSelectionModal.test.tsx b/app/components/UI/Ramp/Views/Modals/ProviderSelectionModal/ProviderSelectionModal.test.tsx
index bf2e4a6e551a..df351c8707f5 100644
--- a/app/components/UI/Ramp/Views/Modals/ProviderSelectionModal/ProviderSelectionModal.test.tsx
+++ b/app/components/UI/Ramp/Views/Modals/ProviderSelectionModal/ProviderSelectionModal.test.tsx
@@ -102,6 +102,7 @@ const defaultControllerReturn = {
   providers: mockProviders,
   selectedProvider: mockProviders[0],
   setSelectedProvider: mockSetSelectedProvider,
+  setSelectedProviderForAsset: jest.fn(),
   selectedPaymentMethod: {
     id: '/payments/debit-credit-card-1',
     paymentType: 'debit-credit-card',
diff --git a/app/components/UI/Ramp/Views/Modals/SettingsModal/SettingsModal.test.tsx b/app/components/UI/Ramp/Views/Modals/SettingsModal/SettingsModal.test.tsx
index 9cccd039d6b0..f28100cd39cb 100644
--- a/app/components/UI/Ramp/Views/Modals/SettingsModal/SettingsModal.test.tsx
+++ b/app/components/UI/Ramp/Views/Modals/SettingsModal/SettingsModal.test.tsx
@@ -128,6 +128,7 @@ jest.mock('../../../hooks/useRampsProviders', () => ({
   useRampsProviders: () => ({
     selectedProvider: mockSelectedProvider,
     setSelectedProvider: mockSetSelectedProvider,
+    setSelectedProviderForAsset: jest.fn(),
   }),
 }));
 
diff --git a/app/components/UI/Ramp/Views/NativeFlow/BankDetails.tsx b/app/components/UI/Ramp/Views/NativeFlow/BankDetails.tsx
index 459d5f30b984..3dd9d677003c 100644
--- a/app/components/UI/Ramp/Views/NativeFlow/BankDetails.tsx
+++ b/app/components/UI/Ramp/Views/NativeFlow/BankDetails.tsx
@@ -39,6 +39,9 @@ import { selectTokens } from '../../../../../selectors/rampsController';
 import { parseUserFacingError } from '../../utils/parseUserFacingError';
 import { useRampsOrders } from '../../hooks/useRampsOrders';
 import { useSelector } from 'react-redux';
+import { endOpenRampsBuyCufChildrenByName } from '../../utils/rampsBuyCufTrace';
+import { RAMPS_BUY_CUF_TAG } from '../../constants/rampsBuyCufTags';
+import { TraceName } from '../../../../../util/trace';
 import { BANK_DETAILS_TEST_IDS } from './BankDetails.testIds';
 import { isHttpUnauthorized } from '../../utils/isHttpUnauthorized';
 
@@ -145,6 +148,10 @@ const V2BankDetails = () => {
       TERMINAL_STATUSES.has(order.status) ||
       order.status === RampsOrderStatus.Pending
     ) {
+      endOpenRampsBuyCufChildrenByName(TraceName.RampBuyNativeToOrderCreated, {
+        [RAMPS_BUY_CUF_TAG.SUCCESS]: true,
+        orderId: order.providerOrderId,
+      });
       // @ts-expect-error navigation prop mismatch
       navigation.replace(Routes.RAMP.RAMPS_ORDER_DETAILS, {
         orderId: order.providerOrderId,
diff --git a/app/components/UI/Ramp/Views/OrderDetails/OrderDetails.tsx b/app/components/UI/Ramp/Views/OrderDetails/OrderDetails.tsx
index ab4d3b867932..6dd71eddc30b 100644
--- a/app/components/UI/Ramp/Views/OrderDetails/OrderDetails.tsx
+++ b/app/components/UI/Ramp/Views/OrderDetails/OrderDetails.tsx
@@ -44,6 +44,12 @@ import { showV2OrderToast } from '../../utils/v2OrderToast';
 import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
 import { RampsOrderDetailsSelectorsIDs } from './OrderDetails.testIds';
+import { endRampsBuyCufTrace } from '../../utils/rampsBuyCufTrace';
+import {
+  RAMPS_BUY_CUF_BOUNDARY,
+  RAMPS_BUY_CUF_END_REASON,
+  RAMPS_BUY_CUF_TAG,
+} from '../../constants/rampsBuyCufTags';
 
 export const createRampsOrderDetailsNavDetails =
   createNavigationDetails<RampsOrderDetailsParams>(
@@ -107,6 +113,12 @@ const OrderDetails = () => {
           walletAddress,
         );
         if (!fetchedOrder || isBailedOrderStatus(fetchedOrder.status)) {
+          endRampsBuyCufTrace({
+            data: {
+              [RAMPS_BUY_CUF_TAG.SUCCESS]: false,
+              [RAMPS_BUY_CUF_TAG.REASON]: RAMPS_BUY_CUF_END_REASON.BAILED,
+            },
+          });
           resetWithRoutes(navigation, {
             index: 0,
             routes: getNavigateAfterExternalBrowserRoutes({
@@ -193,6 +205,7 @@ const OrderDetails = () => {
   ]);
 
   const hasTrackedScreenView = useRef(false);
+  const hasEndedBuyCuf = useRef(false);
   useEffect(() => {
     if (order && !hasTrackedScreenView.current) {
       hasTrackedScreenView.current = true;
@@ -207,6 +220,20 @@ const OrderDetails = () => {
     }
   }, [order, createEventBuilder, trackEvent]);
 
+  useEffect(() => {
+    if (!order || hasEndedBuyCuf.current) {
+      return;
+    }
+    hasEndedBuyCuf.current = true;
+    endRampsBuyCufTrace({
+      data: {
+        [RAMPS_BUY_CUF_TAG.SUCCESS]: true,
+        [RAMPS_BUY_CUF_TAG.BOUNDARY]: RAMPS_BUY_CUF_BOUNDARY.ORDER_DETAILS,
+        orderId: order.providerOrderId,
+      },
+    });
+  }, [order]);
+
   const handleOnRefresh = useCallback(async () => {
     if (!order) return;
     try {
diff --git a/app/components/UI/Ramp/Views/TokenSelection/TokenSelection.test.tsx b/app/components/UI/Ramp/Views/TokenSelection/TokenSelection.test.tsx
index 4f2967e451c8..cf633c4928a1 100644
--- a/app/components/UI/Ramp/Views/TokenSelection/TokenSelection.test.tsx
+++ b/app/components/UI/Ramp/Views/TokenSelection/TokenSelection.test.tsx
@@ -147,6 +147,7 @@ describe('TokenSelection Component', () => {
       setUserRegion: jest.fn(),
       selectedProvider: null,
       setSelectedProvider: jest.fn(),
+      setSelectedProviderForAsset: jest.fn(),
       providers: [],
       providersLoading: false,
       providersError: null,
@@ -204,6 +205,7 @@ describe('TokenSelection Component', () => {
       setUserRegion: jest.fn(),
       selectedProvider: null,
       setSelectedProvider: jest.fn(),
+      setSelectedProviderForAsset: jest.fn(),
       providers: [],
       providersLoading: false,
       providersError: null,
@@ -307,6 +309,7 @@ describe('TokenSelection Component', () => {
       setUserRegion: jest.fn(),
       selectedProvider: null,
       setSelectedProvider: jest.fn(),
+      setSelectedProviderForAsset: jest.fn(),
       providers: [],
       providersLoading: false,
       providersError: null,
@@ -349,6 +352,7 @@ describe('TokenSelection Component', () => {
       setUserRegion: jest.fn(),
       selectedProvider: null,
       setSelectedProvider: jest.fn(),
+      setSelectedProviderForAsset: jest.fn(),
       providers: [],
       providersLoading: false,
       providersError: null,
@@ -391,6 +395,7 @@ describe('TokenSelection Component', () => {
       setUserRegion: jest.fn(),
       selectedProvider: null,
       setSelectedProvider: jest.fn(),
+      setSelectedProviderForAsset: jest.fn(),
       providers: [],
       providersLoading: false,
       providersError: null,
@@ -437,6 +442,7 @@ describe('TokenSelection Component', () => {
       setUserRegion: jest.fn(),
       selectedProvider: null,
       setSelectedProvider: jest.fn(),
+      setSelectedProviderForAsset: jest.fn(),
       providers: [],
       providersLoading: false,
       providersError: null,
@@ -487,6 +493,7 @@ describe('TokenSelection Component', () => {
       setUserRegion: jest.fn(),
       selectedProvider: null,
       setSelectedProvider: jest.fn(),
+      setSelectedProviderForAsset: jest.fn(),
       providers: [],
       providersLoading: false,
       providersError: null,
@@ -543,6 +550,7 @@ describe('TokenSelection Component', () => {
       setUserRegion: jest.fn(),
       selectedProvider: null,
       setSelectedProvider: jest.fn(),
+      setSelectedProviderForAsset: jest.fn(),
       providers: [],
       providersLoading: false,
       providersError: null,
@@ -604,6 +612,7 @@ describe('TokenSelection Component', () => {
       setUserRegion: jest.fn(),
       selectedProvider: null,
       setSelectedProvider: jest.fn(),
+      setSelectedProviderForAsset: jest.fn(),
       providers: [],
       providersLoading: false,
       providersError: null,
diff --git a/app/components/UI/Ramp/constants/networks.ts b/app/components/UI/Ramp/constants/networks.ts
index f89c02985bbe..561cbe6aadfb 100644
--- a/app/components/UI/Ramp/constants/networks.ts
+++ b/app/components/UI/Ramp/constants/networks.ts
@@ -29,6 +29,10 @@ export const ARC_MAINNET: DepositNetwork = {
   chainId: 'eip155:5042',
   name: 'Arc',
 };
+export const STELLAR_MAINNET: DepositNetwork = {
+  chainId: 'stellar:pubnet',
+  name: 'Stellar',
+};
 
 export const DEPOSIT_NETWORKS_BY_CHAIN_ID: Record<CaipChainId, DepositNetwork> =
   {
@@ -38,4 +42,5 @@ export const DEPOSIT_NETWORKS_BY_CHAIN_ID: Record<CaipChainId, DepositNetwork> =
     [SOLANA_MAINNET.chainId]: SOLANA_MAINNET,
     [BSC_MAINNET.chainId]: BSC_MAINNET,
     [ARC_MAINNET.chainId]: ARC_MAINNET,
+    [STELLAR_MAINNET.chainId]: STELLAR_MAINNET,
   };
diff --git a/app/components/UI/Ramp/constants/rampsBuyCufTags.ts b/app/components/UI/Ramp/constants/rampsBuyCufTags.ts
new file mode 100644
index 000000000000..b687dac8d162
--- /dev/null
+++ b/app/components/UI/Ramp/constants/rampsBuyCufTags.ts
@@ -0,0 +1,52 @@
+import { TRACES_CLEANUP_INTERVAL } from '../../../../util/trace';
+
+export const RAMPS_BUY_CUF_TAG = {
+  FEATURE: 'feature',
+  SURFACE: 'surface',
+  PATH: 'path',
+  SUCCESS: 'success',
+  REASON: 'reason',
+  BOUNDARY: 'boundary',
+  RAMP_TYPE: 'ramp_type',
+} as const;
+
+export const RAMPS_BUY_CUF_FEATURE = 'buy';
+
+export const RAMPS_BUY_CUF_SURFACE = {
+  FUND_MENU: 'fund_menu',
+  EMPTY_STATE: 'empty_state',
+  DEEP_LINK: 'deep_link',
+  TOKEN_BUY: 'token_buy',
+  HOME_TOKEN_LIST: 'home_token_list',
+  HOME: 'home',
+  ACCOUNTS_MENU: 'accounts_menu',
+  ACTIVITY: 'activity',
+  CONFIRMATION: 'confirmation',
+  CARD: 'card',
+  ORDERS_LIST: 'orders_list',
+  CASH: 'cash',
+  EARN: 'earn',
+  UNKNOWN: 'unknown',
+} as const;
+
+export type RampsBuyCufSurface =
+  (typeof RAMPS_BUY_CUF_SURFACE)[keyof typeof RAMPS_BUY_CUF_SURFACE];
+
+export const RAMPS_BUY_CUF_PATH = {
+  WIDGET: 'widget',
+  NATIVE: 'native',
+} as const;
+export const RAMPS_BUY_CUF_BOUNDARY = {
+  ORDER_DETAILS: 'order_details',
+} as const;
+export const RAMPS_BUY_CUF_END_REASON = {
+  SUPERSEDED: 'superseded',
+  TIMEOUT: 'timeout',
+  BAILED: 'bailed',
+  ERROR: 'error',
+  CANCELLED: 'cancelled',
+  ABANDONED: 'abandoned',
+  HEADLESS: 'headless',
+} as const;
+/** Aligned with `TRACES_CLEANUP_INTERVAL` so Sentry does not end the span first. */
+export const RAMPS_BUY_CUF_TIMEOUT_MS = TRACES_CLEANUP_INTERVAL;
diff --git a/app/components/UI/Ramp/deeplink/handleRampUrl.test.ts b/app/components/UI/Ramp/deeplink/handleRampUrl.test.ts
index 87745da66541..78576635faa1 100644
--- a/app/components/UI/Ramp/deeplink/handleRampUrl.test.ts
+++ b/app/components/UI/Ramp/deeplink/handleRampUrl.test.ts
@@ -7,6 +7,7 @@ import { UNKNOWN_LOCATION } from '@metamask/geolocation-controller';
 import type { Country, UserRegion } from '@metamask/ramps-controller';
 import Engine from '../../../../core/Engine';
 import ReduxService from '../../../../core/redux';
+import { backgroundState } from '../../../../util/test/initial-root-state';
 
 jest.mock('../../../../core/NavigationService', () => ({
   navigation: {
@@ -21,7 +22,7 @@ jest.mock('../../../../core/redux', () => ({
   __esModule: true,
   default: {
     store: {
-      getState: jest.fn(() => ({})),
+      getState: jest.fn(),
     },
   },
 }));
@@ -137,11 +138,22 @@ jest.mock('../../../../core/Engine', () => ({
 const mockRefreshGeolocation = Engine.context.GeolocationController
   .refreshGeolocation as jest.Mock;
 
+const mockStartRampsBuyCufTrace = jest.fn();
+jest.mock('../utils/rampsBuyCufTrace', () => ({
+  startRampsBuyCufTrace: (...args: unknown[]) =>
+    mockStartRampsBuyCufTrace(...args),
+}));
+
 describe('handleRampUrl', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     (NavigationService.navigation.navigate as jest.Mock).mockClear();
     (handleRedirection as jest.Mock).mockClear();
+    jest.mocked(ReduxService.store.getState).mockReturnValue({
+      engine: {
+        backgroundState,
+      },
+    } as ReturnType<typeof ReduxService.store.getState>);
     mockSelectGeolocationLocation.mockReturnValue('us-ca');
     mockSelectUserRegion.mockReturnValue(null);
     mockSelectCountries.mockReturnValue({ data: [] });
@@ -207,6 +219,7 @@ describe('handleRampUrl', () => {
       expect(NavigationService.navigation.navigate).toHaveBeenCalledWith(
         'ELIGIBILITY_FAILED_MODAL_ROUTE',
       );
+      expect(mockStartRampsBuyCufTrace).not.toHaveBeenCalled();
     });
 
     it('continues to TokenSelection when geolocation refresh resolves a known region', async () => {
@@ -224,6 +237,9 @@ describe('handleRampUrl', () => {
       expect(NavigationService.navigation.navigate).toHaveBeenCalledWith(
         'TOKEN_SELECTION_ROUTE',
       );
+      expect(mockStartRampsBuyCufTrace).toHaveBeenCalledWith({
+        surface: 'deep_link',
+      });
     });
 
     it('does not refresh geolocation when a known location is already in state', async () => {
diff --git a/app/components/UI/Ramp/deeplink/handleRampUrl.ts b/app/components/UI/Ramp/deeplink/handleRampUrl.ts
index 3619d730c410..f56663b23b68 100644
--- a/app/components/UI/Ramp/deeplink/handleRampUrl.ts
+++ b/app/components/UI/Ramp/deeplink/handleRampUrl.ts
@@ -26,6 +26,8 @@ import { isRampsServiceDisruptionActive } from '../utils/rampsServiceDisruption'
 import { createRampsServiceDisruptionModalNavigationDetails } from '../components/RampsServiceDisruptionModal/RampsServiceDisruptionModal';
 import { selectRampsServiceDisruptionRegions } from '../../../../selectors/featureFlagController/rampsServiceDisruption';
 import { resolveRampControllerAssetId } from '../utils/resolveRampControllerAssetId';
+import { startRampsBuyCufTrace } from '../utils/rampsBuyCufTrace';
+import { RAMPS_BUY_CUF_SURFACE } from '../constants/rampsBuyCufTags';
 import Engine from '../../../../core/Engine';
 
 interface RampUrlOptions {
@@ -97,6 +99,8 @@ async function navigateUnifiedV2Buy(
     return;
   }
 
+  startRampsBuyCufTrace({ surface: RAMPS_BUY_CUF_SURFACE.DEEP_LINK });
+
   if (rampIntent?.assetId) {
     const allTokens = selectTokens(state).data?.allTokens ?? [];
     const controllerAssetId = resolveRampControllerAssetId(
diff --git a/app/components/UI/Ramp/headless/useHeadlessBuy.test.ts b/app/components/UI/Ramp/headless/useHeadlessBuy.test.ts
index 0a3b4d55db33..ff12eddf7a6d 100644
--- a/app/components/UI/Ramp/headless/useHeadlessBuy.test.ts
+++ b/app/components/UI/Ramp/headless/useHeadlessBuy.test.ts
@@ -87,6 +87,7 @@ const baseControllerValue: ReturnType<typeof useRampsController> = {
   setUserRegion: jest.fn(),
   selectedProvider: null,
   setSelectedProvider: jest.fn(),
+  setSelectedProviderForAsset: jest.fn(),
   providers: mockProviders,
   providersLoading: false,
   providersError: null,
@@ -375,6 +376,7 @@ describe('useHeadlessBuy', () => {
       const setters = {
         setSelectedToken: jest.fn(),
         setSelectedProvider: jest.fn(),
+        setSelectedProviderForAsset: jest.fn(),
         setSelectedPaymentMethod: jest.fn(),
       };
       (useRampsController as jest.Mock).mockReturnValue({
diff --git a/app/components/UI/Ramp/hooks/useContinueWithQuote.ts b/app/components/UI/Ramp/hooks/useContinueWithQuote.ts
index 7875ab5ab161..bacc6b92e5bf 100644
--- a/app/components/UI/Ramp/hooks/useContinueWithQuote.ts
+++ b/app/components/UI/Ramp/hooks/useContinueWithQuote.ts
@@ -37,6 +37,17 @@ import { useRampsController } from './useRampsController';
 import { useTransakController } from './useTransakController';
 import { useTransakRouting } from './useTransakRouting';
 import useRampAccountAddress from './useRampAccountAddress';
+import {
+  endOpenRampsBuyCufChildrenByName,
+  endRampsBuyCufChildTrace,
+  startRampsBuyCufChildTrace,
+} from '../utils/rampsBuyCufTrace';
+import {
+  RAMPS_BUY_CUF_END_REASON,
+  RAMPS_BUY_CUF_PATH,
+  RAMPS_BUY_CUF_TAG,
+} from '../constants/rampsBuyCufTags';
+import { TraceName } from '../../../../util/trace';
 
 export interface ContinueWithQuoteContext {
   amount: number;
@@ -172,6 +183,14 @@ export function useContinueWithQuote(
           ),
         );
       }
+      endOpenRampsBuyCufChildrenByName(TraceName.RampBuyNativeToOrderCreated, {
+        [RAMPS_BUY_CUF_TAG.SUCCESS]: false,
+        [RAMPS_BUY_CUF_TAG.REASON]: RAMPS_BUY_CUF_END_REASON.SUPERSEDED,
+      });
+      const nativeCufOpId = startRampsBuyCufChildTrace({
+        name: TraceName.RampBuyNativeToOrderCreated,
+        tags: { [RAMPS_BUY_CUF_TAG.PATH]: RAMPS_BUY_CUF_PATH.NATIVE },
+      });
       try {
         const hasToken = await transakCheckExistingToken();
 
@@ -209,6 +228,15 @@ export function useContinueWithQuote(
           );
         }
       } catch (error) {
+        if (nativeCufOpId) {
+          endRampsBuyCufChildTrace({
+            id: nativeCufOpId,
+            data: {
+              [RAMPS_BUY_CUF_TAG.SUCCESS]: false,
+              [RAMPS_BUY_CUF_TAG.REASON]: RAMPS_BUY_CUF_END_REASON.ERROR,
+            },
+          });
+        }
         throw new Error(
           reportRampsError(
             error,
@@ -249,6 +277,26 @@ export function useContinueWithQuote(
       let useExternalBrowser: boolean;
       let redirectUrl: string;
       let buyWidget: Awaited<ReturnType<typeof getBuyWidgetData>>;
+      endOpenRampsBuyCufChildrenByName(TraceName.RampBuyContinueToCheckout, {
+        [RAMPS_BUY_CUF_TAG.SUCCESS]: false,
+        [RAMPS_BUY_CUF_TAG.REASON]: RAMPS_BUY_CUF_END_REASON.SUPERSEDED,
+      });
+      const checkoutCufOpId = startRampsBuyCufChildTrace({
+        name: TraceName.RampBuyContinueToCheckout,
+        tags: { [RAMPS_BUY_CUF_TAG.PATH]: RAMPS_BUY_CUF_PATH.WIDGET },
+      });
+      const endCheckoutCuf = (success: boolean, reason?: string) => {
+        if (!checkoutCufOpId) {
+          return;
+        }
+        endRampsBuyCufChildTrace({
+          id: checkoutCufOpId,
+          data: {
+            [RAMPS_BUY_CUF_TAG.SUCCESS]: success,
+            ...(reason ? { [RAMPS_BUY_CUF_TAG.REASON]: reason } : {}),
+          },
+        });
+      };
       try {
         providerCode = quote.provider;
         const isCustom = isCustomAction(quote);
@@ -262,6 +310,7 @@ export function useContinueWithQuote(
         const quoteForWidget = buildQuoteWithRedirectUrl(quote, redirectUrl);
         buyWidget = await getBuyWidgetData(quoteForWidget);
       } catch (error) {
+        endCheckoutCuf(false, RAMPS_BUY_CUF_END_REASON.ERROR);
         throw new Error(
           reportRampsError(
             error,
@@ -275,6 +324,7 @@ export function useContinueWithQuote(
       }
 
       if (!buyWidget?.url) {
+        endCheckoutCuf(false, RAMPS_BUY_CUF_END_REASON.ERROR);
         throw new Error(
           reportRampsError(
             new Error('No widget URL available for provider'),
@@ -284,6 +334,8 @@ export function useContinueWithQuote(
         );
       }
 
+      endCheckoutCuf(true);
+
       try {
         const { network, effectiveWallet, effectiveOrderId } =
           getCheckoutContext(
diff --git a/app/components/UI/Ramp/hooks/useEnsureCompatibleProvider.test.ts b/app/components/UI/Ramp/hooks/useEnsureCompatibleProvider.test.ts
new file mode 100644
index 000000000000..196651dc0736
--- /dev/null
+++ b/app/components/UI/Ramp/hooks/useEnsureCompatibleProvider.test.ts
@@ -0,0 +1,163 @@
+import { renderHook } from '@testing-library/react-native';
+import { useEnsureCompatibleProvider } from './useEnsureCompatibleProvider';
+import { useRampsProviders } from './useRampsProviders';
+import { useHeadlessAllProvidersEnabled } from './useHeadlessAllProvidersEnabled';
+
+jest.mock('./useRampsProviders', () => ({
+  useRampsProviders: jest.fn(),
+}));
+jest.mock('./useHeadlessAllProvidersEnabled', () => ({
+  useHeadlessAllProvidersEnabled: jest.fn(),
+}));
+
+const mockUseRampsProviders = useRampsProviders as jest.Mock;
+const mockUseHeadlessAllProvidersEnabled =
+  useHeadlessAllProvidersEnabled as jest.Mock;
+const mockSetSelectedProviderForAsset = jest.fn();
+const mockSetSelectedProvider = jest.fn();
+
+const ASSET_ID = 'eip155:143/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA';
+
+const makeProvider = (id: string) => ({ id });
+
+const makeTypedProvider = (
+  id: string,
+  type: 'native' | 'aggregator',
+  servesAsset = true,
+) => ({
+  id,
+  type,
+  supportedCryptoCurrencies: servesAsset ? { [ASSET_ID]: true } : {},
+});
+
+function setup(
+  providers: { id: string }[],
+  options?: {
+    selectedProvider?: { id: string; type?: string } | null;
+    allProvidersEnabled?: boolean;
+    didSwitch?: boolean;
+  },
+) {
+  mockSetSelectedProviderForAsset.mockReturnValue(options?.didSwitch ?? false);
+  mockUseHeadlessAllProvidersEnabled.mockReturnValue(
+    options?.allProvidersEnabled ?? false,
+  );
+  mockUseRampsProviders.mockReturnValue({
+    providers,
+    selectedProvider: options?.selectedProvider ?? null,
+    setSelectedProvider: mockSetSelectedProvider,
+    setSelectedProviderForAsset: mockSetSelectedProviderForAsset,
+  });
+}
+
+describe('useEnsureCompatibleProvider', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('calls setSelectedProviderForAsset with the asset id when providers are loaded', () => {
+    setup([makeProvider('coinbase'), makeProvider('transak-native')]);
+
+    renderHook(() => useEnsureCompatibleProvider(ASSET_ID));
+
+    expect(mockSetSelectedProviderForAsset).toHaveBeenCalledWith(ASSET_ID, {
+      autoSelected: true,
+    });
+  });
+
+  it('is a no-op when assetId is undefined', () => {
+    setup([makeProvider('transak-native')]);
+
+    renderHook(() => useEnsureCompatibleProvider(undefined));
+
+    expect(mockSetSelectedProviderForAsset).not.toHaveBeenCalled();
+  });
+
+  it('is a no-op when the providers list is empty', () => {
+    setup([]);
+
+    renderHook(() => useEnsureCompatibleProvider(ASSET_ID));
+
+    expect(mockSetSelectedProviderForAsset).not.toHaveBeenCalled();
+  });
+
+  it('re-runs and calls setSelectedProviderForAsset when providers load after initial render', () => {
+    setup([]);
+    const { rerender } = renderHook(() =>
+      useEnsureCompatibleProvider(ASSET_ID),
+    );
+
+    expect(mockSetSelectedProviderForAsset).not.toHaveBeenCalled();
+
+    setup([makeProvider('transak-native')]);
+    rerender({});
+
+    expect(mockSetSelectedProviderForAsset).toHaveBeenCalledWith(ASSET_ID, {
+      autoSelected: true,
+    });
+  });
+
+  describe('when moneyHeadlessAllProviders is disabled', () => {
+    it('switches to a native provider serving the asset when an aggregator is selected', () => {
+      const aggregator = makeTypedProvider('coinbase', 'aggregator');
+      const native = makeTypedProvider('transak-native', 'native');
+      setup([aggregator, native], { selectedProvider: aggregator });
+
+      renderHook(() => useEnsureCompatibleProvider(ASSET_ID));
+
+      expect(mockSetSelectedProvider).toHaveBeenCalledWith(native, {
+        autoSelected: true,
+      });
+    });
+
+    it('leaves the selection alone when the selected provider is already native', () => {
+      const native = makeTypedProvider('transak-native', 'native');
+      setup([native], { selectedProvider: native });
+
+      renderHook(() => useEnsureCompatibleProvider(ASSET_ID));
+
+      expect(mockSetSelectedProvider).not.toHaveBeenCalled();
+    });
+
+    it('leaves the selection alone when no native provider serves the asset', () => {
+      const aggregator = makeTypedProvider('coinbase', 'aggregator');
+      const otherNative = makeTypedProvider('transak-native', 'native', false);
+      setup([aggregator, otherNative], { selectedProvider: aggregator });
+
+      renderHook(() => useEnsureCompatibleProvider(ASSET_ID));
+
+      expect(mockSetSelectedProvider).not.toHaveBeenCalled();
+    });
+
+    it('leaves the selection alone when the controller already switched providers', () => {
+      const aggregator = makeTypedProvider('coinbase', 'aggregator');
+      const native = makeTypedProvider('transak-native', 'native');
+      setup([aggregator, native], {
+        selectedProvider: aggregator,
+        didSwitch: true,
+      });
+
+      renderHook(() => useEnsureCompatibleProvider(ASSET_ID));
+
+      expect(mockSetSelectedProvider).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when moneyHeadlessAllProviders is enabled', () => {
+    it('keeps the aggregator selection the controller left in place', () => {
+      const aggregator = makeTypedProvider('coinbase', 'aggregator');
+      const native = makeTypedProvider('transak-native', 'native');
+      setup([aggregator, native], {
+        selectedProvider: aggregator,
+        allProvidersEnabled: true,
+      });
+
+      renderHook(() => useEnsureCompatibleProvider(ASSET_ID));
+
+      expect(mockSetSelectedProviderForAsset).toHaveBeenCalledWith(ASSET_ID, {
+        autoSelected: true,
+      });
+      expect(mockSetSelectedProvider).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/app/components/UI/Ramp/hooks/useEnsureCompatibleProvider.ts b/app/components/UI/Ramp/hooks/useEnsureCompatibleProvider.ts
new file mode 100644
index 000000000000..2417164d5084
--- /dev/null
+++ b/app/components/UI/Ramp/hooks/useEnsureCompatibleProvider.ts
@@ -0,0 +1,60 @@
+import { useEffect } from 'react';
+import { getProvidersServingAsset } from '@metamask/ramps-controller';
+import { useRampsProviders } from './useRampsProviders';
+import { useHeadlessAllProvidersEnabled } from './useHeadlessAllProvidersEnabled';
+
+/**
+ * Silently switches `RampsController.providers.selected` to a provider that can
+ * actually serve a headless deposit of `assetId`, by delegating to
+ * `RampsController:setSelectedProviderForAsset`.
+ *
+ * `providers` is kept in the dep array so the effect retries once providers
+ * have loaded from the API. The controller method is a no-op if called while
+ * providers are still empty, so the guard here and the internal guard are
+ * consistent.
+ *
+ * While `moneyHeadlessAllProviders` is still rolling out, the controller's
+ * asset-compatibility switch alone is not enough for the flag-off cohort:
+ * `isFiatDepositAvailable` requires the *selected* provider to be native when
+ * the flag is off, while `setSelectedProviderForAsset` is type-agnostic and
+ * no-ops as soon as the current provider lists the asset. An aggregator that
+ * serves the asset therefore satisfies the switch but still fails the
+ * availability gate, hiding deposit in regions that do offer a native provider.
+ * Reconcile the two here for the flag-off path only; the widened path keeps the
+ * controller's decision as final. The flag-off branch is removed with the flag.
+ *
+ * No-op when `assetId` is undefined or providers have not loaded yet.
+ */
+export function useEnsureCompatibleProvider(assetId: string | undefined): void {
+  const {
+    providers,
+    selectedProvider,
+    setSelectedProvider,
+    setSelectedProviderForAsset,
+  } = useRampsProviders();
+  const allProvidersEnabled = useHeadlessAllProvidersEnabled();
+
+  useEffect(() => {
+    if (!assetId || providers.length === 0) return;
+    if (setSelectedProviderForAsset(assetId, { autoSelected: true })) return;
+    if (allProvidersEnabled) return;
+    if (selectedProvider?.type === 'native') return;
+
+    const nativeProvider = getProvidersServingAsset(providers, assetId).find(
+      (provider) => provider.type === 'native',
+    );
+    // Leaving the selection alone when no native provider serves the asset
+    // matches `regionHasProviderForAsset`, which also reports the region as
+    // unsupported while the flag is off.
+    if (nativeProvider) {
+      setSelectedProvider(nativeProvider, { autoSelected: true });
+    }
+  }, [
+    assetId,
+    providers,
+    selectedProvider,
+    setSelectedProvider,
+    setSelectedProviderForAsset,
+    allProvidersEnabled,
+  ]);
+}
diff --git a/app/components/UI/Ramp/hooks/useRampNavigation.test.ts b/app/components/UI/Ramp/hooks/useRampNavigation.test.ts
index 8fa75c3fefb3..3da8657564fe 100644
--- a/app/components/UI/Ramp/hooks/useRampNavigation.test.ts
+++ b/app/components/UI/Ramp/hooks/useRampNavigation.test.ts
@@ -110,6 +110,14 @@ jest.mock('../../../../core/Engine', () => ({
   },
 }));
 
+const mockStartRampsBuyCufTrace = jest.fn();
+jest.mock('../utils/rampsBuyCufTrace', () => ({
+  startRampsBuyCufTrace: (...args: unknown[]) =>
+    mockStartRampsBuyCufTrace(...args),
+  surfaceFromBuyFlowOrigin: jest.requireActual('../utils/rampsBuyCufTrace')
+    .surfaceFromBuyFlowOrigin,
+}));
+
 const mockNavigate = jest.fn();
 const mockUseNavigation = useNavigation as jest.MockedFunction<
   typeof useNavigation
@@ -223,6 +231,9 @@ describe('useRampNavigation', () => {
       });
       expect(mockNavigate).toHaveBeenCalledWith(...mockNavDetails);
       expect(mockCreateRampNavigationDetails).not.toHaveBeenCalled();
+      expect(mockStartRampsBuyCufTrace).toHaveBeenCalledWith({
+        surface: 'unknown',
+      });
     });
 
     it('passes buyFlowOrigin through to BuildQuote params', () => {
@@ -236,6 +247,9 @@ describe('useRampNavigation', () => {
         assetId: intent.assetId,
         buyFlowOrigin: 'tokenInfo',
       });
+      expect(mockStartRampsBuyCufTrace).toHaveBeenCalledWith({
+        surface: 'token_buy',
+      });
     });
 
     it('passes homeTokenList buyFlowOrigin through to BuildQuote params', () => {
@@ -249,6 +263,24 @@ describe('useRampNavigation', () => {
         assetId: intent.assetId,
         buyFlowOrigin: 'homeTokenList',
       });
+      expect(mockStartRampsBuyCufTrace).toHaveBeenCalledWith({
+        surface: 'home_token_list',
+      });
+    });
+
+    it('starts Buy E2E CUF with an explicit surface tag', () => {
+      const intent = { assetId: 'eip155:1/erc20:0x123' };
+      mockCreateBuildQuoteNavDetails.mockReturnValue([
+        Routes.RAMP.AMOUNT_INPUT,
+      ] as never);
+
+      const { result } = renderUseRampNavigation();
+
+      result.current.goToBuy(intent, { surface: 'fund_menu' });
+
+      expect(mockStartRampsBuyCufTrace).toHaveBeenCalledWith({
+        surface: 'fund_menu',
+      });
     });
 
     it('navigates to TokenSelection when no assetId is provided (matches handleRampUrl deeplink)', () => {
@@ -264,6 +296,9 @@ describe('useRampNavigation', () => {
       expect(mockCreateTokenSelectionNavigationDetails).toHaveBeenCalled();
       expect(mockNavigate).toHaveBeenCalledWith(...mockNavDetails);
       expect(mockCreateRampNavigationDetails).not.toHaveBeenCalled();
+      expect(mockStartRampsBuyCufTrace).toHaveBeenCalledWith({
+        surface: 'unknown',
+      });
     });
 
     it('does not navigate to BuildQuote when overrideUnifiedRouting is true', () => {
@@ -277,6 +312,7 @@ describe('useRampNavigation', () => {
 
       expect(mockSetSelectedToken).not.toHaveBeenCalled();
       expect(mockCreateBuildQuoteNavDetails).not.toHaveBeenCalled();
+      expect(mockStartRampsBuyCufTrace).not.toHaveBeenCalled();
       expect(mockCreateRampNavigationDetails).toHaveBeenCalledWith(
         AggregatorRampType.BUY,
         intent,
diff --git a/app/components/UI/Ramp/hooks/useRampNavigation.ts b/app/components/UI/Ramp/hooks/useRampNavigation.ts
index 03938b3620cd..9e5c994b37ec 100644
--- a/app/components/UI/Ramp/hooks/useRampNavigation.ts
+++ b/app/components/UI/Ramp/hooks/useRampNavigation.ts
@@ -25,6 +25,11 @@ import Engine from '../../../../core/Engine';
 import { selectGeolocationLocation } from '../../../../selectors/geolocationController';
 import { UNKNOWN_LOCATION } from '@metamask/geolocation-controller';
 import { selectProviders } from '../../../../selectors/rampsController';
+import {
+  startRampsBuyCufTrace,
+  surfaceFromBuyFlowOrigin,
+} from '../utils/rampsBuyCufTrace';
+import type { RampsBuyCufSurface } from '../constants/rampsBuyCufTags';
 
 /**
  * Hook that returns functions to navigate to ramp flows.
@@ -60,12 +65,24 @@ export const useRampNavigation = () => {
       options?: {
         overrideUnifiedRouting?: boolean;
         buyFlowOrigin?: BuyFlowOrigin;
+        surface?: RampsBuyCufSurface;
       },
     ) => {
       const { overrideUnifiedRouting = false } = options || {};
 
       const isUnifiedRoutingEnabled = !overrideUnifiedRouting;
 
+      const startBuyCufIfUnified = () => {
+        if (!isUnifiedRoutingEnabled) {
+          return;
+        }
+        startRampsBuyCufTrace({
+          surface:
+            options?.surface ??
+            surfaceFromBuyFlowOrigin(options?.buyFlowOrigin),
+        });
+      };
+
       // Resolve the best available geolocation; only the unified path refreshes.
       let location: string | undefined = geolocationLocation;
       if (
@@ -162,6 +179,7 @@ export const useRampNavigation = () => {
         } catch {
           // Token may not be in controller's list yet (still loading).
         }
+        startBuyCufIfUnified();
         navigateWithDetails(
           navigation,
           createBuildQuoteNavDetails({
@@ -173,6 +191,7 @@ export const useRampNavigation = () => {
       }
 
       if (!intent?.assetId && !overrideUnifiedRouting) {
+        startBuyCufIfUnified();
         navigateWithDetails(navigation, createTokenSelectionNavDetails());
         return;
       }
diff --git a/app/components/UI/Ramp/hooks/useRampsController.test.ts b/app/components/UI/Ramp/hooks/useRampsController.test.ts
index 680abc4999db..d4b7f338bd5b 100644
--- a/app/components/UI/Ramp/hooks/useRampsController.test.ts
+++ b/app/components/UI/Ramp/hooks/useRampsController.test.ts
@@ -30,6 +30,7 @@ jest.mock('./useRampsProviders', () => ({
     providers: [],
     selectedProvider: null,
     setSelectedProvider: jest.fn(),
+    setSelectedProviderForAsset: jest.fn(),
     isLoading: false,
     error: null,
   })),
@@ -148,6 +149,7 @@ describe('useRampsController', () => {
 
     expect(typeof result.current.setUserRegion).toBe('function');
     expect(typeof result.current.setSelectedProvider).toBe('function');
+    expect(typeof result.current.setSelectedProviderForAsset).toBe('function');
     expect(typeof result.current.setSelectedToken).toBe('function');
     expect(typeof result.current.setSelectedPaymentMethod).toBe('function');
     expect(typeof result.current.getQuotes).toBe('function');
diff --git a/app/components/UI/Ramp/hooks/useRampsController.ts b/app/components/UI/Ramp/hooks/useRampsController.ts
index a70e4bc1afdb..ae98badbdabc 100644
--- a/app/components/UI/Ramp/hooks/useRampsController.ts
+++ b/app/components/UI/Ramp/hooks/useRampsController.ts
@@ -30,6 +30,7 @@ export interface UseRampsControllerResult {
   // Selected provider
   selectedProvider: UseRampsProvidersResult['selectedProvider'];
   setSelectedProvider: UseRampsProvidersResult['setSelectedProvider'];
+  setSelectedProviderForAsset: UseRampsProvidersResult['setSelectedProviderForAsset'];
 
   // Providers
   providers: UseRampsProvidersResult['providers'];
@@ -124,6 +125,7 @@ export function useRampsController(): UseRampsControllerResult {
     providers,
     selectedProvider,
     setSelectedProvider,
+    setSelectedProviderForAsset,
     isLoading: providersLoading,
     error: providersError,
   } = useRampsProviders();
@@ -170,6 +172,7 @@ export function useRampsController(): UseRampsControllerResult {
 
     selectedProvider,
     setSelectedProvider,
+    setSelectedProviderForAsset,
 
     providers,
     providersLoading,
diff --git a/app/components/UI/Ramp/hooks/useRampsProviders.ts b/app/components/UI/Ramp/hooks/useRampsProviders.ts
index 4c1b0d692878..c122cac17a39 100644
--- a/app/components/UI/Ramp/hooks/useRampsProviders.ts
+++ b/app/components/UI/Ramp/hooks/useRampsProviders.ts
@@ -40,6 +40,18 @@ export interface UseRampsProvidersResult {
     provider: Provider | null,
     options?: { autoSelected?: boolean },
   ) => void;
+  /**
+   * Switches providers.selected to the first provider that serves the given
+   * CAIP-19 asset, when the currently selected provider does not.
+   * No-op when providers are not loaded, the current provider already serves
+   * the asset, or no alternative does. Returns true if a switch was made.
+   *
+   * Delegates to RampsController:setSelectedProviderForAsset (MetaMask/core#9759).
+   */
+  setSelectedProviderForAsset: (
+    assetId: string,
+    options?: { autoSelected?: boolean },
+  ) => boolean;
   /**
    * Whether the providers request is currently loading.
    */
@@ -135,6 +147,15 @@ export function useRampsProviders(options?: {
     [],
   );
 
+  const setSelectedProviderForAsset = useCallback(
+    (assetId: string, setOptions?: { autoSelected?: boolean }): boolean =>
+      Engine.context.RampsController.setSelectedProviderForAsset(
+        assetId,
+        setOptions,
+      ),
+    [],
+  );
+
   useEffect(() => {
     if (
       enableSideEffects &&
@@ -176,6 +197,7 @@ export function useRampsProviders(options?: {
     providers,
     selectedProvider,
     setSelectedProvider,
+    setSelectedProviderForAsset,
     isLoading: providersQuery?.isLoading ?? providersStateIsLoading,
     error,
   };
diff --git a/app/components/UI/Ramp/hooks/useTransakRouting.test.ts b/app/components/UI/Ramp/hooks/useTransakRouting.test.ts
index 5e60695355c1..d1f012b0315d 100644
--- a/app/components/UI/Ramp/hooks/useTransakRouting.test.ts
+++ b/app/components/UI/Ramp/hooks/useTransakRouting.test.ts
@@ -119,6 +119,7 @@ jest.mock('./useRampsProviders', () => ({
     providers: [MOCK_SELECTED_PROVIDER],
     selectedProvider: MOCK_SELECTED_PROVIDER,
     setSelectedProvider: jest.fn(),
+    setSelectedProviderForAsset: jest.fn(),
     isLoading: false,
     error: null,
   }),
diff --git a/app/components/UI/Ramp/hooks/useTransakRouting.ts b/app/components/UI/Ramp/hooks/useTransakRouting.ts
index c84daa6a9379..cce36ac56b3b 100644
--- a/app/components/UI/Ramp/hooks/useTransakRouting.ts
+++ b/app/components/UI/Ramp/hooks/useTransakRouting.ts
@@ -51,6 +51,15 @@ import { dismissHeadlessFlow } from '../headless/headlessEntryNavigation';
 import { getChainIdFromAssetId } from '../headless';
 import { setHeadlessOrderContext } from '../../../../core/Engine/controllers/ramps-controller/headlessOrderContextRegistry';
 import { emitTerminalOrderAnalyticsFromCallback } from '../../../../core/Engine/controllers/ramps-controller/event-handlers/analytics';
+import {
+  endOpenRampsBuyCufChildrenByName,
+  endRampsBuyCufTrace,
+} from '../utils/rampsBuyCufTrace';
+import {
+  RAMPS_BUY_CUF_END_REASON,
+  RAMPS_BUY_CUF_TAG,
+} from '../constants/rampsBuyCufTags';
+import { TraceName } from '../../../../util/trace';
 
 // The native provider code must match the environment that `refreshOrder` /
 // `getOrderFromCallback` poll (from `getRampsEnvironment()`). Dev/UAT expose
@@ -437,6 +446,12 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
 
   const navigateToOrderProcessingCallback = useCallback(
     ({ orderId }: { orderId: string }) => {
+      // Native child CUF ends when the order is created (before Order Details).
+      endOpenRampsBuyCufChildrenByName(TraceName.RampBuyNativeToOrderCreated, {
+        [RAMPS_BUY_CUF_TAG.SUCCESS]: true,
+        orderId,
+      });
+
       // Headless mode: fire `onOrderCreated`, close the session, and pop
       // out of the ramp stack so the caller regains foreground. The
       // consumer drives post-order UI themselves — no RAMPS_ORDER_DETAILS.
@@ -450,6 +465,14 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
             'useTransakRouting: onOrderCreated callback threw',
           );
         }
+        // Parent Buy E2E CUF expects Order Details; headless never shows it.
+        endRampsBuyCufTrace({
+          data: {
+            [RAMPS_BUY_CUF_TAG.SUCCESS]: false,
+            [RAMPS_BUY_CUF_TAG.REASON]: RAMPS_BUY_CUF_END_REASON.HEADLESS,
+            orderId,
+          },
+        });
         closeSession(headlessSessionId, { reason: 'completed' });
         dismissActiveHeadlessFlow();
         return;
diff --git a/app/components/UI/Ramp/utils/getRampCallbackBaseUrl.test.ts b/app/components/UI/Ramp/utils/getRampCallbackBaseUrl.test.ts
index f095fc52eebd..66f54441a7ba 100644
--- a/app/components/UI/Ramp/utils/getRampCallbackBaseUrl.test.ts
+++ b/app/components/UI/Ramp/utils/getRampCallbackBaseUrl.test.ts
@@ -1,3 +1,6 @@
+import { getDefaultRedirectCallbackUrl } from '@metamask/ramps-controller';
+
+import { getRampsEnvironment } from '../../../../core/Engine/controllers/ramps-controller/ramps-service-init';
 import { getRampCallbackBaseUrl } from './getRampCallbackBaseUrl';
 
 const PRODUCTION_CALLBACK =
@@ -8,49 +11,55 @@ const DEVELOPMENT_CALLBACK =
   'https://on-ramp.dev-api.cx.metamask.io/regions/fake-callback';
 
 describe('getRampCallbackBaseUrl', () => {
-  const originalEnv = process.env.METAMASK_ENVIRONMENT;
+  const originalMetamaskEnvironment = process.env.METAMASK_ENVIRONMENT;
+  const originalRampsEnvironment = process.env.RAMPS_ENVIRONMENT;
 
   afterEach(() => {
-    process.env.METAMASK_ENVIRONMENT = originalEnv;
+    process.env.METAMASK_ENVIRONMENT = originalMetamaskEnvironment;
+    if (originalRampsEnvironment !== undefined) {
+      process.env.RAMPS_ENVIRONMENT = originalRampsEnvironment;
+    } else {
+      delete process.env.RAMPS_ENVIRONMENT;
+    }
   });
 
-  it('returns production content callback for production', () => {
-    process.env.METAMASK_ENVIRONMENT = 'production';
-    expect(getRampCallbackBaseUrl()).toBe(PRODUCTION_CALLBACK);
+  beforeEach(() => {
+    delete process.env.RAMPS_ENVIRONMENT;
   });
 
-  it('returns production content callback for beta', () => {
-    process.env.METAMASK_ENVIRONMENT = 'beta';
-    expect(getRampCallbackBaseUrl()).toBe(PRODUCTION_CALLBACK);
-  });
+  it.each([
+    ['production', PRODUCTION_CALLBACK],
+    ['beta', PRODUCTION_CALLBACK],
+    ['rc', PRODUCTION_CALLBACK],
+    ['dev', DEVELOPMENT_CALLBACK],
+    ['exp', STAGING_CALLBACK],
+    ['test', STAGING_CALLBACK],
+    ['e2e', STAGING_CALLBACK],
+  ] as const)(
+    'matches getDefaultRedirectCallbackUrl(getRampsEnvironment()) for METAMASK_ENVIRONMENT=%s',
+    (metamaskEnvironment, expected) => {
+      process.env.METAMASK_ENVIRONMENT = metamaskEnvironment;
+      expect(getRampCallbackBaseUrl()).toBe(expected);
+      expect(getRampCallbackBaseUrl()).toBe(
+        getDefaultRedirectCallbackUrl(getRampsEnvironment()),
+      );
+    },
+  );
 
-  it('returns production content callback for rc', () => {
-    process.env.METAMASK_ENVIRONMENT = 'rc';
-    expect(getRampCallbackBaseUrl()).toBe(PRODUCTION_CALLBACK);
-  });
-
-  it('returns Dev API fake-callback for dev (no content.dev-api host)', () => {
-    process.env.METAMASK_ENVIRONMENT = 'dev';
-    expect(getRampCallbackBaseUrl()).toBe(DEVELOPMENT_CALLBACK);
-  });
-
-  it('returns staging content callback for exp', () => {
-    process.env.METAMASK_ENVIRONMENT = 'exp';
-    expect(getRampCallbackBaseUrl()).toBe(STAGING_CALLBACK);
-  });
-
-  it('returns staging content callback for test', () => {
-    process.env.METAMASK_ENVIRONMENT = 'test';
+  it('returns staging content callback when METAMASK_ENVIRONMENT is unset', () => {
+    delete process.env.METAMASK_ENVIRONMENT;
     expect(getRampCallbackBaseUrl()).toBe(STAGING_CALLBACK);
+    expect(getRampCallbackBaseUrl()).toBe(
+      getDefaultRedirectCallbackUrl(getRampsEnvironment()),
+    );
   });
 
-  it('returns staging content callback for e2e', () => {
+  it('prefers RAMPS_ENVIRONMENT over METAMASK_ENVIRONMENT', () => {
     process.env.METAMASK_ENVIRONMENT = 'e2e';
-    expect(getRampCallbackBaseUrl()).toBe(STAGING_CALLBACK);
-  });
-
-  it('returns staging content callback when METAMASK_ENVIRONMENT is unset', () => {
-    delete process.env.METAMASK_ENVIRONMENT;
-    expect(getRampCallbackBaseUrl()).toBe(STAGING_CALLBACK);
+    process.env.RAMPS_ENVIRONMENT = 'production';
+    expect(getRampCallbackBaseUrl()).toBe(PRODUCTION_CALLBACK);
+    expect(getRampCallbackBaseUrl()).toBe(
+      getDefaultRedirectCallbackUrl(getRampsEnvironment()),
+    );
   });
 });
diff --git a/app/components/UI/Ramp/utils/getRampCallbackBaseUrl.ts b/app/components/UI/Ramp/utils/getRampCallbackBaseUrl.ts
index 2bd56e61804e..97cfafb00a18 100644
--- a/app/components/UI/Ramp/utils/getRampCallbackBaseUrl.ts
+++ b/app/components/UI/Ramp/utils/getRampCallbackBaseUrl.ts
@@ -1,30 +1,15 @@
+import { getDefaultRedirectCallbackUrl } from '@metamask/ramps-controller';
+
+import { getRampsEnvironment } from '../../../../core/Engine/controllers/ramps-controller/ramps-service-init';
+
 /**
  * Callback base URL for ramp quote/order redirects (UNIFIED_BUY_2).
- * Defined here so the unified BuildQuote / Checkout flow does not import the
- * legacy aggregator SDK (which has top-level initialization side effects).
  *
- * Production/staging use the on-ramp-content hosts (same as Aggregator).
- * Mobile `dev` uses the RAM Dev API host because there is no
- * `on-ramp-content.dev-api` deployment; `/regions/fake-callback` is served
- * from `on-ramp.dev-api` and returns 200.
+ * Thin wrapper around core's canonical environment-to-callback map so BuildQuote,
+ * Checkout completion detection, Continue rewrite, and the controller's widened
+ * default all resolve from the same `getRampsEnvironment()` source (which honors
+ * `RAMPS_ENVIRONMENT` from builds.yml, then `METAMASK_ENVIRONMENT`).
  */
-const RAMP_CALLBACK_URL_PRODUCTION =
-  'https://on-ramp-content.api.cx.metamask.io/regions/fake-callback';
-const RAMP_CALLBACK_URL_STAGING =
-  'https://on-ramp-content.uat-api.cx.metamask.io/regions/fake-callback';
-const RAMP_CALLBACK_URL_DEVELOPMENT =
-  'https://on-ramp.dev-api.cx.metamask.io/regions/fake-callback';
-
 export function getRampCallbackBaseUrl(): string {
-  const env = process.env.METAMASK_ENVIRONMENT;
-  switch (env) {
-    case 'production':
-    case 'beta':
-    case 'rc':
-      return RAMP_CALLBACK_URL_PRODUCTION;
-    case 'dev':
-      return RAMP_CALLBACK_URL_DEVELOPMENT;
-    default:
-      return RAMP_CALLBACK_URL_STAGING;
-  }
+  return getDefaultRedirectCallbackUrl(getRampsEnvironment());
 }
diff --git a/app/components/UI/Ramp/utils/rampsBuyCufTrace.test.ts b/app/components/UI/Ramp/utils/rampsBuyCufTrace.test.ts
new file mode 100644
index 000000000000..e73cd93991d0
--- /dev/null
+++ b/app/components/UI/Ramp/utils/rampsBuyCufTrace.test.ts
@@ -0,0 +1,217 @@
+import {
+  trace,
+  endTrace,
+  getTraceContext,
+  TraceName,
+  TraceOperation,
+} from '../../../../util/trace';
+import {
+  startRampsBuyCufTrace,
+  endRampsBuyCufTrace,
+  startRampsBuyCufChildTrace,
+  endOpenRampsBuyCufChildrenByName,
+  getRampsBuyCufParentContext,
+  hasActiveRampsBuyCufTrace,
+  surfaceFromBuyFlowOrigin,
+  resetRampsBuyCufTraceForTests,
+} from './rampsBuyCufTrace';
+import {
+  RAMPS_BUY_CUF_FEATURE,
+  RAMPS_BUY_CUF_SURFACE,
+  RAMPS_BUY_CUF_TAG,
+  RAMPS_BUY_CUF_END_REASON,
+  RAMPS_BUY_CUF_TIMEOUT_MS,
+} from '../constants/rampsBuyCufTags';
+
+jest.mock('../../../../util/trace', () => ({
+  ...jest.requireActual('../../../../util/trace'),
+  trace: jest.fn(() => ({ mocked: 'parent-span' })),
+  endTrace: jest.fn(),
+  getTraceContext: jest.fn(() => ({ mocked: 'parent-span' })),
+}));
+
+const mockTrace = trace as jest.Mock;
+const mockEndTrace = endTrace as jest.Mock;
+const mockGetTraceContext = getTraceContext as jest.Mock;
+
+describe('rampsBuyCufTrace', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.useFakeTimers();
+    resetRampsBuyCufTraceForTests();
+    mockGetTraceContext.mockReturnValue({ mocked: 'parent-span' });
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it.each([
+    ['tokenInfo', RAMPS_BUY_CUF_SURFACE.TOKEN_BUY],
+    ['homeTokenList', RAMPS_BUY_CUF_SURFACE.HOME_TOKEN_LIST],
+    [undefined, RAMPS_BUY_CUF_SURFACE.UNKNOWN],
+  ] as const)('surfaceFromBuyFlowOrigin(%s) → %s', (origin, expected) => {
+    expect(surfaceFromBuyFlowOrigin(origin)).toBe(expected);
+  });
+
+  it('starts a parent span with feature, ramp_type, and surface as tags and attributes', () => {
+    const fields = {
+      [RAMPS_BUY_CUF_TAG.FEATURE]: RAMPS_BUY_CUF_FEATURE,
+      [RAMPS_BUY_CUF_TAG.RAMP_TYPE]: 'UNIFIED_BUY_2',
+      [RAMPS_BUY_CUF_TAG.SURFACE]: RAMPS_BUY_CUF_SURFACE.FUND_MENU,
+    };
+
+    const opId = startRampsBuyCufTrace({
+      surface: RAMPS_BUY_CUF_SURFACE.FUND_MENU,
+    });
+
+    expect(opId).toContain(TraceName.RampBuyToOrderDetails);
+    expect(hasActiveRampsBuyCufTrace()).toBe(true);
+    expect(getRampsBuyCufParentContext()).toEqual({ mocked: 'parent-span' });
+    expect(mockTrace).toHaveBeenCalledWith(
+      expect.objectContaining({
+        name: TraceName.RampBuyToOrderDetails,
+        id: opId,
+        op: TraceOperation.RampOperation,
+        forceTransaction: true,
+        tags: fields,
+        data: fields,
+      }),
+    );
+  });
+
+  it('returns the open parent op id on a second start', () => {
+    const first = startRampsBuyCufTrace({
+      surface: RAMPS_BUY_CUF_SURFACE.EMPTY_STATE,
+    });
+
+    expect(
+      startRampsBuyCufTrace({ surface: RAMPS_BUY_CUF_SURFACE.DEEP_LINK }),
+    ).toEqual(first);
+    expect(mockTrace).toHaveBeenCalledTimes(1);
+  });
+
+  it('starts a new parent after the previous parent ends', () => {
+    const first = startRampsBuyCufTrace();
+    endRampsBuyCufTrace({ data: { [RAMPS_BUY_CUF_TAG.SUCCESS]: true } });
+
+    expect(startRampsBuyCufTrace()).not.toEqual(first);
+  });
+
+  it('starts a new parent when Sentry no longer has the parent span', () => {
+    const first = startRampsBuyCufTrace();
+    mockGetTraceContext.mockReturnValue(undefined);
+
+    expect(
+      startRampsBuyCufTrace({ surface: RAMPS_BUY_CUF_SURFACE.DEEP_LINK }),
+    ).not.toEqual(first);
+  });
+
+  it('ignores end when the id does not match the open parent', () => {
+    startRampsBuyCufTrace();
+
+    endRampsBuyCufTrace({ id: 'other-id' });
+
+    expect(mockEndTrace).not.toHaveBeenCalled();
+    expect(hasActiveRampsBuyCufTrace()).toBe(true);
+  });
+
+  it('ends the open parent once and clears module state', () => {
+    startRampsBuyCufTrace();
+
+    endRampsBuyCufTrace({ data: { [RAMPS_BUY_CUF_TAG.SUCCESS]: true } });
+    endRampsBuyCufTrace({ data: { [RAMPS_BUY_CUF_TAG.SUCCESS]: true } });
+
+    expect(mockEndTrace).toHaveBeenCalledTimes(1);
+    expect(hasActiveRampsBuyCufTrace()).toBe(false);
+    expect(getRampsBuyCufParentContext()).toBeUndefined();
+  });
+
+  it('ends the parent with timeout reason after the CUF timeout', () => {
+    const timedOutId = startRampsBuyCufTrace();
+
+    jest.advanceTimersByTime(RAMPS_BUY_CUF_TIMEOUT_MS);
+
+    expect(mockEndTrace).toHaveBeenCalledWith(
+      expect.objectContaining({
+        name: TraceName.RampBuyToOrderDetails,
+        id: timedOutId,
+        data: {
+          [RAMPS_BUY_CUF_TAG.SUCCESS]: false,
+          [RAMPS_BUY_CUF_TAG.REASON]: RAMPS_BUY_CUF_END_REASON.TIMEOUT,
+        },
+      }),
+    );
+  });
+
+  it('does not end a parent from a stale timeout after a successful end', () => {
+    startRampsBuyCufTrace();
+    endRampsBuyCufTrace({ data: { [RAMPS_BUY_CUF_TAG.SUCCESS]: true } });
+    mockEndTrace.mockClear();
+
+    jest.advanceTimersByTime(RAMPS_BUY_CUF_TIMEOUT_MS);
+
+    expect(mockEndTrace).not.toHaveBeenCalled();
+  });
+
+  it('returns null when starting a child without an open parent', () => {
+    expect(
+      startRampsBuyCufChildTrace({ name: TraceName.RampBuyContinueToCheckout }),
+    ).toBeNull();
+  });
+
+  it('nests a child span under the open parent context', () => {
+    startRampsBuyCufTrace();
+    mockTrace.mockClear();
+
+    const childId = startRampsBuyCufChildTrace({
+      name: TraceName.RampBuyContinueToCheckout,
+    });
+
+    expect(mockTrace).toHaveBeenCalledWith(
+      expect.objectContaining({
+        name: TraceName.RampBuyContinueToCheckout,
+        id: childId,
+        parentContext: { mocked: 'parent-span' },
+      }),
+    );
+  });
+
+  it('ends open children that match the requested name', () => {
+    startRampsBuyCufTrace();
+    const nativeId = startRampsBuyCufChildTrace({
+      name: TraceName.RampBuyNativeToOrderCreated,
+    });
+    mockEndTrace.mockClear();
+
+    expect(
+      endOpenRampsBuyCufChildrenByName(TraceName.RampBuyNativeToOrderCreated, {
+        [RAMPS_BUY_CUF_TAG.SUCCESS]: true,
+      }),
+    ).toBe(1);
+    expect(mockEndTrace).toHaveBeenCalledWith(
+      expect.objectContaining({ id: nativeId }),
+    );
+  });
+
+  it('abandons open children when the parent ends', () => {
+    startRampsBuyCufTrace();
+    const childId = startRampsBuyCufChildTrace({
+      name: TraceName.RampBuyContinueToCheckout,
+    });
+    mockEndTrace.mockClear();
+
+    endRampsBuyCufTrace({ data: { [RAMPS_BUY_CUF_TAG.SUCCESS]: true } });
+
+    expect(mockEndTrace).toHaveBeenCalledWith(
+      expect.objectContaining({
+        name: TraceName.RampBuyContinueToCheckout,
+        id: childId,
+        data: {
+          [RAMPS_BUY_CUF_TAG.SUCCESS]: false,
+          [RAMPS_BUY_CUF_TAG.REASON]: RAMPS_BUY_CUF_END_REASON.ABANDONED,
+        },
+      }),
+    );
+  });
+});
diff --git a/app/components/UI/Ramp/utils/rampsBuyCufTrace.ts b/app/components/UI/Ramp/utils/rampsBuyCufTrace.ts
new file mode 100644
index 000000000000..94f328398abf
--- /dev/null
+++ b/app/components/UI/Ramp/utils/rampsBuyCufTrace.ts
@@ -0,0 +1,272 @@
+import {
+  trace,
+  endTrace,
+  getTraceContext,
+  TraceName,
+  TraceOperation,
+  type TraceContext,
+  type TraceValue,
+} from '../../../../util/trace';
+import {
+  RAMPS_BUY_CUF_FEATURE,
+  RAMPS_BUY_CUF_TAG,
+  RAMPS_BUY_CUF_SURFACE,
+  RAMPS_BUY_CUF_END_REASON,
+  RAMPS_BUY_CUF_TIMEOUT_MS,
+  type RampsBuyCufSurface,
+} from '../constants/rampsBuyCufTags';
+import type { BuyFlowOrigin } from '../Views/BuildQuote/BuildQuote';
+
+const CUF_META = {
+  NAME: 'name',
+} as const;
+
+const pendingChildMeta = new Map<string, Record<string, TraceValue>>();
+let parentOpId: string | null = null;
+let parentSpan: TraceContext;
+let parentTimeoutId: ReturnType<typeof setTimeout> | null = null;
+let cufOpCounter = 0;
+
+function nextCufOpId(name: TraceName): string {
+  cufOpCounter += 1;
+  return `${name}#${cufOpCounter}`;
+}
+
+function clearStaleParentState(): void {
+  if (parentTimeoutId) {
+    clearTimeout(parentTimeoutId);
+    parentTimeoutId = null;
+  }
+  parentOpId = null;
+  parentSpan = undefined;
+}
+
+function resolveParentContext(): TraceContext {
+  if (
+    !parentOpId ||
+    getTraceContext({
+      name: TraceName.RampBuyToOrderDetails,
+      id: parentOpId,
+    }) === undefined
+  ) {
+    if (parentOpId) {
+      clearStaleParentState();
+    }
+    return undefined;
+  }
+  return parentSpan;
+}
+
+export function buildRampsBuyCufStartTags(
+  extra?: Record<string, TraceValue>,
+): Record<string, TraceValue> {
+  return {
+    [RAMPS_BUY_CUF_TAG.FEATURE]: RAMPS_BUY_CUF_FEATURE,
+    [RAMPS_BUY_CUF_TAG.RAMP_TYPE]: 'UNIFIED_BUY_2',
+    ...extra,
+  };
+}
+
+function withStartSpanAttributes(
+  startTags: Record<string, TraceValue>,
+  data?: Record<string, TraceValue>,
+): Record<string, TraceValue> {
+  return {
+    ...startTags,
+    ...data,
+  };
+}
+
+export function surfaceFromBuyFlowOrigin(
+  buyFlowOrigin?: BuyFlowOrigin,
+): RampsBuyCufSurface {
+  if (buyFlowOrigin === 'tokenInfo') {
+    return RAMPS_BUY_CUF_SURFACE.TOKEN_BUY;
+  }
+  if (buyFlowOrigin === 'homeTokenList') {
+    return RAMPS_BUY_CUF_SURFACE.HOME_TOKEN_LIST;
+  }
+  return RAMPS_BUY_CUF_SURFACE.UNKNOWN;
+}
+
+export interface StartRampsBuyCufTraceOptions {
+  surface?: RampsBuyCufSurface;
+  tags?: Record<string, TraceValue>;
+  startTime?: number;
+  data?: Record<string, TraceValue>;
+}
+
+export function startRampsBuyCufTrace({
+  surface = RAMPS_BUY_CUF_SURFACE.UNKNOWN,
+  tags,
+  startTime,
+  data,
+}: StartRampsBuyCufTraceOptions = {}): string {
+  if (resolveParentContext() && parentOpId) {
+    return parentOpId;
+  }
+
+  const opId = nextCufOpId(TraceName.RampBuyToOrderDetails);
+  const startTags = buildRampsBuyCufStartTags({
+    [RAMPS_BUY_CUF_TAG.SURFACE]: surface,
+    ...tags,
+  });
+
+  parentOpId = opId;
+  parentSpan = trace({
+    name: TraceName.RampBuyToOrderDetails,
+    id: opId,
+    op: TraceOperation.RampOperation,
+    startTime,
+    forceTransaction: true,
+    data: withStartSpanAttributes(startTags, data),
+    tags: startTags,
+  });
+
+  endRampsBuyCufTraceAfter(
+    {
+      data: {
+        [RAMPS_BUY_CUF_TAG.SUCCESS]: false,
+        [RAMPS_BUY_CUF_TAG.REASON]: RAMPS_BUY_CUF_END_REASON.TIMEOUT,
+      },
+    },
+    RAMPS_BUY_CUF_TIMEOUT_MS,
+  );
+
+  return opId;
+}
+
+export interface EndRampsBuyCufTraceOptions {
+  id?: string;
+  data?: Record<string, TraceValue>;
+  timestamp?: number;
+}
+
+export function endRampsBuyCufTrace({
+  id,
+  data,
+  timestamp,
+}: EndRampsBuyCufTraceOptions = {}): void {
+  const targetId = id ?? parentOpId;
+  if (!targetId || targetId !== parentOpId) {
+    return;
+  }
+
+  abandonOpenChildTraces(RAMPS_BUY_CUF_END_REASON.ABANDONED);
+  clearStaleParentState();
+  endTrace({
+    name: TraceName.RampBuyToOrderDetails,
+    id: targetId,
+    data,
+    timestamp,
+  });
+}
+
+export function endRampsBuyCufTraceAfter(
+  options: EndRampsBuyCufTraceOptions,
+  delayMs: number,
+): void {
+  if (parentTimeoutId) {
+    clearTimeout(parentTimeoutId);
+  }
+  const scheduledFor = parentOpId;
+  parentTimeoutId = setTimeout(() => {
+    parentTimeoutId = null;
+    if (scheduledFor && scheduledFor === parentOpId) {
+      endRampsBuyCufTrace(options);
+    }
+  }, delayMs);
+}
+
+export function getRampsBuyCufParentContext(): TraceContext {
+  return parentSpan;
+}
+
+export function hasActiveRampsBuyCufTrace(): boolean {
+  return parentOpId !== null;
+}
+
+export interface StartRampsBuyCufChildTraceOptions {
+  name: TraceName;
+  tags?: Record<string, TraceValue>;
+  startTime?: number;
+  data?: Record<string, TraceValue>;
+}
+
+export function startRampsBuyCufChildTrace({
+  name,
+  tags,
+  startTime,
+  data,
+}: StartRampsBuyCufChildTraceOptions): string | null {
+  const parentContext = resolveParentContext();
+  if (!parentContext || !parentOpId) {
+    return null;
+  }
+
+  const opId = nextCufOpId(name);
+  const startTags = buildRampsBuyCufStartTags(tags);
+  pendingChildMeta.set(opId, { [CUF_META.NAME]: name });
+  trace({
+    name,
+    id: opId,
+    op: TraceOperation.RampOperation,
+    parentContext,
+    startTime,
+    data: withStartSpanAttributes(startTags, data),
+    tags: startTags,
+  });
+  return opId;
+}
+
+export interface EndRampsBuyCufChildTraceOptions {
+  id: string;
+  data?: Record<string, TraceValue>;
+  timestamp?: number;
+}
+
+export function endRampsBuyCufChildTrace({
+  id,
+  data,
+  timestamp,
+}: EndRampsBuyCufChildTraceOptions): void {
+  const meta = pendingChildMeta.get(id);
+  if (!meta) {
+    return;
+  }
+  pendingChildMeta.delete(id);
+  const name = meta[CUF_META.NAME] as TraceName;
+  endTrace({ name, id, data, timestamp });
+}
+
+export function endOpenRampsBuyCufChildrenByName(
+  name: TraceName,
+  data?: Record<string, TraceValue>,
+): number {
+  let ended = 0;
+  for (const [opId, meta] of Array.from(pendingChildMeta.entries())) {
+    if (meta[CUF_META.NAME] === name) {
+      endRampsBuyCufChildTrace({ id: opId, data });
+      ended += 1;
+    }
+  }
+  return ended;
+}
+
+function abandonOpenChildTraces(reason: string): void {
+  for (const [opId] of Array.from(pendingChildMeta.entries())) {
+    endRampsBuyCufChildTrace({
+      id: opId,
+      data: {
+        [RAMPS_BUY_CUF_TAG.SUCCESS]: false,
+        [RAMPS_BUY_CUF_TAG.REASON]: reason,
+      },
+    });
+  }
+}
+
+export function resetRampsBuyCufTraceForTests(): void {
+  clearStaleParentState();
+  pendingChildMeta.clear();
+  cufOpCounter = 0;
+}
diff --git a/app/components/UI/Rewards/RewardsNavigator.test.tsx b/app/components/UI/Rewards/RewardsNavigator.test.tsx
index b6c7a4b29071..e86e74f382cc 100644
--- a/app/components/UI/Rewards/RewardsNavigator.test.tsx
+++ b/app/components/UI/Rewards/RewardsNavigator.test.tsx
@@ -191,11 +191,6 @@ jest.mock('../../../util/theme', () => {
   };
 });
 
-// Mock getNavigationOptionsTitle
-jest.mock('../Navbar', () => ({
-  getNavigationOptionsTitle: jest.fn(() => ({ title: 'Rewards' })),
-}));
-
 // Mock i18n
 jest.mock('../../../../locales/i18n', () => ({
   strings: jest.fn((key: string) => {
diff --git a/app/components/UI/Rewards/components/Campaigns/PredictThePitchCampaignCTA.test.tsx b/app/components/UI/Rewards/components/Campaigns/PredictThePitchCampaignCTA.test.tsx
index 48ae3a6ce11d..ab61fa811941 100644
--- a/app/components/UI/Rewards/components/Campaigns/PredictThePitchCampaignCTA.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/PredictThePitchCampaignCTA.test.tsx
@@ -108,7 +108,7 @@ describe('PredictThePitchCampaignCTA', () => {
     jest.useRealTimers();
   });
 
-  it('navigates to Predict World Cup when the active campaign participant is opted in', () => {
+  it('navigates to Predict market list when the active campaign participant is opted in', () => {
     const { getByTestId, getByText } = render(
       <PredictThePitchCampaignCTA
         campaign={buildCampaign()}
@@ -123,7 +123,7 @@ describe('PredictThePitchCampaignCTA', () => {
     fireEvent.press(getByTestId(CAMPAIGN_CTA_TEST_IDS.CTA_BUTTON));
 
     expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
-      screen: Routes.PREDICT.WORLD_CUP,
+      screen: Routes.PREDICT.MARKET_LIST,
       params: {
         entryPoint: PredictEventValues.ENTRY_POINT.REWARDS,
       },
diff --git a/app/components/UI/Rewards/components/Campaigns/PredictThePitchCampaignCTA.tsx b/app/components/UI/Rewards/components/Campaigns/PredictThePitchCampaignCTA.tsx
index ffc1933be74f..6f25e68acdd2 100644
--- a/app/components/UI/Rewards/components/Campaigns/PredictThePitchCampaignCTA.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/PredictThePitchCampaignCTA.tsx
@@ -34,9 +34,9 @@ const PredictThePitchCampaignCTA: React.FC<PredictThePitchCampaignCTAProps> = ({
   const isLoading = participantStatus.isLoading;
   const isOptedIn = participantStatus.status?.optedIn === true;
 
-  const navigateToPredictWorldCup = useCallback(() => {
+  const navigateToPredict = useCallback(() => {
     navigation.navigate(Routes.PREDICT.ROOT, {
-      screen: Routes.PREDICT.WORLD_CUP,
+      screen: Routes.PREDICT.MARKET_LIST,
       params: {
         entryPoint: PredictEventValues.ENTRY_POINT.REWARDS,
       },
@@ -50,7 +50,7 @@ const PredictThePitchCampaignCTA: React.FC<PredictThePitchCampaignCTAProps> = ({
           variant={ButtonVariant.Primary}
           size={ButtonSize.Lg}
           isFullWidth
-          onPress={navigateToPredictWorldCup}
+          onPress={navigateToPredict}
           testID={CAMPAIGN_CTA_TEST_IDS.CTA_BUTTON}
         >
           {strings('rewards.predict_the_pitch_campaign.predict_now_cta')}
diff --git a/app/components/UI/SpendableBalance/SpendableBalanceSection.test.tsx b/app/components/UI/SpendableBalance/SpendableBalanceSection.test.tsx
new file mode 100644
index 000000000000..0f03976f1ca8
--- /dev/null
+++ b/app/components/UI/SpendableBalance/SpendableBalanceSection.test.tsx
@@ -0,0 +1,102 @@
+import React from 'react';
+import { render } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+
+import {
+  SpendableBalanceSection,
+  SpendableBalanceSectionTestIds,
+} from './SpendableBalanceSection';
+
+jest.mock('../../../../locales/i18n', () => ({
+  strings: (key: string) => {
+    const translations: Record<string, string> = {
+      'asset_overview.your_balance': 'Your balance',
+      'asset_spendable_balance.total_balance': 'Total balance',
+      'asset_spendable_balance.fiat_value': 'Value',
+      'asset_spendable_balance.spendable': 'Spendable',
+      'asset_spendable_balance.base_reserved': 'Reserved (locked)',
+    };
+
+    return translations[key] ?? key;
+  },
+}));
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(),
+}));
+
+const mockUseSelector = jest.mocked(useSelector);
+
+describe('SpendableBalanceSection', () => {
+  const defaultProps = {
+    minimumReserveBalance: '2.5',
+    spendableBalance: '247.5',
+    totalBalance: '250',
+    symbol: 'XLM',
+    fiatValue: '$105.00',
+  };
+
+  beforeEach(() => {
+    mockUseSelector.mockReturnValue(false);
+  });
+
+  it('renders total, spendable, reserved, and fiat balances', () => {
+    const { getByTestId, getByText } = render(
+      <SpendableBalanceSection {...defaultProps} />,
+    );
+
+    expect(
+      getByTestId(SpendableBalanceSectionTestIds.CONTAINER),
+    ).toBeOnTheScreen();
+    expect(getByText('Your balance')).toBeOnTheScreen();
+    expect(getByTestId(SpendableBalanceSectionTestIds.TOTAL)).toHaveTextContent(
+      '250 XLM',
+    );
+    expect(
+      getByTestId(SpendableBalanceSectionTestIds.SPENDABLE),
+    ).toHaveTextContent('247.5 XLM');
+    expect(
+      getByTestId(SpendableBalanceSectionTestIds.RESERVED),
+    ).toHaveTextContent('2.5 XLM');
+    expect(getByTestId(SpendableBalanceSectionTestIds.FIAT)).toHaveTextContent(
+      '$105.00',
+    );
+  });
+
+  it('renders em dash when fiat value is undefined', () => {
+    const { getByTestId } = render(
+      <SpendableBalanceSection {...defaultProps} fiatValue={undefined} />,
+    );
+
+    expect(getByTestId(SpendableBalanceSectionTestIds.FIAT)).toHaveTextContent(
+      '—',
+    );
+  });
+
+  it('masks balances when privacy mode is enabled', () => {
+    mockUseSelector.mockReturnValue(true);
+
+    const { getByTestId, queryByText } = render(
+      <SpendableBalanceSection {...defaultProps} />,
+    );
+
+    const maskedBalance = '•••••••••';
+    expect(getByTestId(SpendableBalanceSectionTestIds.TOTAL)).toHaveTextContent(
+      maskedBalance,
+    );
+    expect(
+      getByTestId(SpendableBalanceSectionTestIds.SPENDABLE),
+    ).toHaveTextContent(maskedBalance);
+    expect(
+      getByTestId(SpendableBalanceSectionTestIds.RESERVED),
+    ).toHaveTextContent(maskedBalance);
+    expect(getByTestId(SpendableBalanceSectionTestIds.FIAT)).toHaveTextContent(
+      maskedBalance,
+    );
+    expect(queryByText('250 XLM')).toBeNull();
+    expect(queryByText('247.5 XLM')).toBeNull();
+    expect(queryByText('2.5 XLM')).toBeNull();
+    expect(queryByText('$105.00')).toBeNull();
+  });
+});
diff --git a/app/components/UI/SpendableBalance/SpendableBalanceSection.tsx b/app/components/UI/SpendableBalance/SpendableBalanceSection.tsx
new file mode 100644
index 000000000000..76a00417c683
--- /dev/null
+++ b/app/components/UI/SpendableBalance/SpendableBalanceSection.tsx
@@ -0,0 +1,141 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import {
+  Box,
+  BoxFlexDirection,
+  FontWeight,
+  SensitiveText,
+  SensitiveTextLength,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+
+import { strings } from '../../../../locales/i18n';
+import { selectPrivacyMode } from '../../../selectors/preferencesController';
+
+export const SpendableBalanceSectionTestIds = {
+  CONTAINER: 'spendable-balance-section',
+  TOTAL: 'spendable-balance-total-balance',
+  FIAT: 'spendable-balance-fiat-value',
+  SPENDABLE: 'spendable-balance-spendable-balance',
+  RESERVED: 'spendable-balance-base-reserved',
+} as const;
+
+export interface SpendableBalanceSectionProps {
+  spendableBalance: string;
+  minimumReserveBalance: string;
+  totalBalance: string;
+  symbol: string;
+  fiatValue: string | undefined;
+}
+
+/**
+ * Spendable balance section: breakdown for a native asset (total, spendable, reserved, fiat value).
+ *
+ * @param params - Spendable balance section parameters
+ * @param params.minimumReserveBalance - minimum reserve balance.
+ * @param params.spendableBalance - spendable balance.
+ * @param params.totalBalance - The total balance
+ * @param params.symbol - The symbol of the asset
+ * @param params.fiatValue - The fiat value
+ */
+export const SpendableBalanceSection = ({
+  minimumReserveBalance,
+  spendableBalance,
+  totalBalance,
+  symbol,
+  fiatValue,
+}: SpendableBalanceSectionProps) => {
+  const totalDisplay = `${totalBalance} ${symbol}`;
+  const spendableDisplay = `${spendableBalance} ${symbol}`;
+  const reservedDisplay = `${minimumReserveBalance} ${symbol}`;
+  const privacyMode = useSelector(selectPrivacyMode);
+
+  return (
+    <Box
+      testID={SpendableBalanceSectionTestIds.CONTAINER}
+      flexDirection={BoxFlexDirection.Column}
+      twClassName="px-4 py-4 gap-3"
+    >
+      <Text variant={TextVariant.HeadingMd}>
+        {strings('asset_overview.your_balance')}
+      </Text>
+      <Box flexDirection={BoxFlexDirection.Row} twClassName="gap-3">
+        <Box flexDirection={BoxFlexDirection.Column} twClassName="flex-1 gap-1">
+          <Text
+            variant={TextVariant.BodySm}
+            fontWeight={FontWeight.Medium}
+            color={TextColor.TextAlternative}
+          >
+            {strings('asset_spendable_balance.total_balance')}
+          </Text>
+          <SensitiveText
+            variant={TextVariant.BodyMd}
+            fontWeight={FontWeight.Medium}
+            testID={SpendableBalanceSectionTestIds.TOTAL}
+            isHidden={privacyMode}
+            length={SensitiveTextLength.Medium}
+          >
+            {totalDisplay}
+          </SensitiveText>
+        </Box>
+        <Box flexDirection={BoxFlexDirection.Column} twClassName="flex-1 gap-1">
+          <Text
+            variant={TextVariant.BodySm}
+            fontWeight={FontWeight.Medium}
+            color={TextColor.TextAlternative}
+          >
+            {strings('asset_spendable_balance.fiat_value')}
+          </Text>
+          <SensitiveText
+            variant={TextVariant.BodyMd}
+            testID={SpendableBalanceSectionTestIds.FIAT}
+            isHidden={privacyMode}
+            length={SensitiveTextLength.Medium}
+          >
+            {fiatValue ?? '—'}
+          </SensitiveText>
+        </Box>
+      </Box>
+      <Box flexDirection={BoxFlexDirection.Row} twClassName="gap-3">
+        <Box flexDirection={BoxFlexDirection.Column} twClassName="flex-1 gap-1">
+          <Text
+            variant={TextVariant.BodySm}
+            fontWeight={FontWeight.Medium}
+            color={TextColor.TextAlternative}
+          >
+            {strings('asset_spendable_balance.spendable')}
+          </Text>
+          <SensitiveText
+            variant={TextVariant.BodyMd}
+            color={TextColor.SuccessDefault}
+            testID={SpendableBalanceSectionTestIds.SPENDABLE}
+            isHidden={privacyMode}
+            length={SensitiveTextLength.Medium}
+          >
+            {spendableDisplay}
+          </SensitiveText>
+        </Box>
+        <Box flexDirection={BoxFlexDirection.Column} twClassName="flex-1 gap-1">
+          <Text
+            variant={TextVariant.BodySm}
+            fontWeight={FontWeight.Medium}
+            color={TextColor.TextAlternative}
+          >
+            {strings('asset_spendable_balance.base_reserved')}
+          </Text>
+          <SensitiveText
+            variant={TextVariant.BodyMd}
+            color={TextColor.SuccessDefault}
+            testID={SpendableBalanceSectionTestIds.RESERVED}
+            isHidden={privacyMode}
+            length={SensitiveTextLength.Medium}
+          >
+            {reservedDisplay}
+          </SensitiveText>
+        </Box>
+      </Box>
+    </Box>
+  );
+};
diff --git a/app/components/UI/SrpInputGrid/index.test.tsx b/app/components/UI/SrpInputGrid/index.test.tsx
index 1171d791b44b..9afe36c965f6 100644
--- a/app/components/UI/SrpInputGrid/index.test.tsx
+++ b/app/components/UI/SrpInputGrid/index.test.tsx
@@ -148,7 +148,78 @@ describe('SrpInputGrid', () => {
         nativeEvent: { key: 'Backspace' },
       });
 
-      expect(mockOnSeedPhraseChange).toHaveBeenCalled();
+      expect(mockOnSeedPhraseChange).toHaveBeenCalledWith(['wallet']);
+    });
+
+    it('does not collapse the last remaining blank cell on backspace', () => {
+      const seedPhrase = [''];
+      const { getByTestId } = renderWithProvider(
+        <SrpInputGrid {...defaultProps} seedPhrase={seedPhrase} />,
+      );
+
+      const input = getByTestId(`${ImportSRPIDs.SEED_PHRASE_INPUT_ID}_0`);
+      fireEvent(input, 'keyPress', {
+        nativeEvent: { key: 'Backspace' },
+      });
+
+      expect(mockOnSeedPhraseChange).not.toHaveBeenCalled();
+    });
+
+    it('stays in grid mode after deleting down to a single word', () => {
+      const { getByTestId, getByText, queryByText, rerender } =
+        renderWithProvider(
+          <SrpInputGrid
+            {...defaultProps}
+            seedPhrase={['wallet', 'abandon', '']}
+          />,
+        );
+
+      const thirdInput = getByTestId(`${ImportSRPIDs.SEED_PHRASE_INPUT_ID}_2`);
+      fireEvent(thirdInput, 'keyPress', {
+        nativeEvent: { key: 'Backspace' },
+      });
+
+      expect(mockOnSeedPhraseChange).toHaveBeenCalledWith([
+        'wallet',
+        'abandon',
+      ]);
+
+      rerender(<SrpInputGrid {...defaultProps} seedPhrase={['wallet', '']} />);
+
+      const secondInput = getByTestId(`${ImportSRPIDs.SEED_PHRASE_INPUT_ID}_1`);
+      fireEvent(secondInput, 'keyPress', {
+        nativeEvent: { key: 'Backspace' },
+      });
+
+      expect(mockOnSeedPhraseChange).toHaveBeenCalledWith(['wallet']);
+
+      // After sticky-grid mode is latched, a single remaining word must still
+      // render as a numbered grid cell — not switch back to the textarea
+      // (which would steal focus and break continued backspaces).
+      rerender(<SrpInputGrid {...defaultProps} seedPhrase={['wallet']} />);
+
+      expect(
+        getByTestId(`${ImportSRPIDs.SEED_PHRASE_INPUT_ID}_0`),
+      ).toBeOnTheScreen();
+      expect(getByText('1.')).toBeOnTheScreen();
+      expect(queryByText('2.')).toBeNull();
+    });
+
+    it('exits sticky grid mode when the last word is fully deleted', () => {
+      const { getByText, queryByText, rerender } = renderWithProvider(
+        <SrpInputGrid {...defaultProps} seedPhrase={['wallet', 'abandon']} />,
+      );
+
+      // Latch sticky grid with 2+ cells, then delete down to one word.
+      rerender(<SrpInputGrid {...defaultProps} seedPhrase={['wallet']} />);
+      expect(getByText('1.')).toBeOnTheScreen();
+
+      // Fully empty — Paste replaces Clear, so sticky mode must release or
+      // the numbered empty cell (no placeholder) becomes unreachable to reset.
+      rerender(<SrpInputGrid {...defaultProps} seedPhrase={['']} />);
+
+      expect(queryByText('1.')).toBeNull();
+      expect(getByText('Paste')).toBeOnTheScreen();
     });
 
     it('dismisses keyboard on submit editing', () => {
diff --git a/app/components/UI/SrpInputGrid/index.tsx b/app/components/UI/SrpInputGrid/index.tsx
index 8e5f2ba2feae..84d63f67e5b3 100644
--- a/app/components/UI/SrpInputGrid/index.tsx
+++ b/app/components/UI/SrpInputGrid/index.tsx
@@ -105,6 +105,10 @@ const SrpInputGrid = React.forwardRef<SrpInputGridRef, SrpInputGridProps>(
       Record<number, boolean>
     >({});
 
+    const [preferGridMode, setPreferGridMode] = useState(
+      () => seedPhrase.length > 1,
+    );
+
     const focusedInputIndexRef = useRef<number | null>(null);
 
     const seedPhraseInputRefs = useRef<Map<
@@ -118,10 +122,20 @@ const SrpInputGrid = React.forwardRef<SrpInputGridRef, SrpInputGridProps>(
       [seedPhrase],
     );
 
+    useEffect(() => {
+      if (seedPhrase.length > 1) {
+        setPreferGridMode(true);
+        return;
+      }
+      if (trimmedSeedPhraseLength === 0) {
+        setPreferGridMode(false);
+      }
+    }, [seedPhrase.length, trimmedSeedPhraseLength]);
+
     // Determine if we're in single input (textarea) mode
     const isFirstInput = useMemo(
-      () => isFirstInputUtil(seedPhrase),
-      [seedPhrase],
+      () => !preferGridMode && isFirstInputUtil(seedPhrase),
+      [preferGridMode, seedPhrase],
     );
 
     // Initialize seed phrase input refs
@@ -209,19 +223,29 @@ const SrpInputGrid = React.forwardRef<SrpInputGridRef, SrpInputGridProps>(
 
     const handleKeyPress = useCallback(
       (e: { nativeEvent: { key: string } }, index: number) => {
-        if (e.nativeEvent.key === 'Backspace') {
-          if (seedPhrase[index] === '') {
-            const newData = seedPhrase.filter((_, idx) => idx !== index);
-            if (index > 0) {
-              const prevInputRef = seedPhraseInputRefs.current?.get(index - 1);
-              if (prevInputRef) {
-                prevInputRef.focus();
-              }
-              setNextSeedPhraseInputFocusedIndex(index - 1);
-            }
-            onSeedPhraseChange([...newData]);
+        if (e.nativeEvent.key !== 'Backspace') {
+          return;
+        }
+
+        if (seedPhrase[index] !== '') {
+          return;
+        }
+
+        if (seedPhrase.length <= 1) {
+          return;
+        }
+
+        const newData = seedPhrase.filter((_, idx) => idx !== index);
+
+        if (index > 0) {
+          const prevInputRef = seedPhraseInputRefs.current?.get(index - 1);
+          if (prevInputRef) {
+            prevInputRef.focus();
           }
+          setNextSeedPhraseInputFocusedIndex(index - 1);
         }
+
+        onSeedPhraseChange([...newData]);
       },
       [seedPhrase, onSeedPhraseChange],
     );
@@ -247,6 +271,7 @@ const SrpInputGrid = React.forwardRef<SrpInputGridRef, SrpInputGridProps>(
     }, [handleSeedPhraseChange]);
 
     const handleClear = useCallback(() => {
+      setPreferGridMode(false);
       onSeedPhraseChange(['']);
       setErrorWordIndexes({});
       setNextSeedPhraseInputFocusedIndex(null);
diff --git a/app/components/UI/Stake/components/EstimatedAnnualRewardsCard.tsx b/app/components/UI/Stake/components/EstimatedAnnualRewardsCard.tsx
deleted file mode 100644
index 580437e4a477..000000000000
--- a/app/components/UI/Stake/components/EstimatedAnnualRewardsCard.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import React from 'react';
-import { StyleSheet, TouchableOpacity, View } from 'react-native';
-import { strings } from '../../../../../locales/i18n';
-import Icon, {
-  IconColor,
-  IconName,
-  IconSize,
-} from '../../../../component-library/components/Icons/Icon';
-import Text, {
-  TextColor,
-  TextVariant,
-} from '../../../../component-library/components/Texts/Text';
-import { useTheme } from '../../../../util/theme';
-import type { Colors } from '../../../../util/theme/models';
-import SkeletonPlaceholder from 'react-native-skeleton-placeholder';
-
-const createStyles = (colors: Colors) =>
-  StyleSheet.create({
-    rewardCard: {
-      backgroundColor: colors.background.muted,
-      borderRadius: 8,
-      paddingHorizontal: 16,
-      paddingVertical: 8,
-      alignItems: 'center',
-      justifyContent: 'center',
-    },
-    rewardRow: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-      width: '100%',
-    },
-    rewardRateContainer: {
-      alignItems: 'flex-end',
-    },
-    labelWithIcon: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      gap: 4,
-    },
-  });
-
-interface EstimatedAnnualRewardsCardProps {
-  estimatedAnnualRewards: string;
-  isLoading?: boolean;
-  onIconPress: () => void;
-}
-
-const EstimatedAnnualRewardsCard = ({
-  estimatedAnnualRewards,
-  onIconPress,
-  isLoading = false,
-}: EstimatedAnnualRewardsCardProps) => {
-  const { colors } = useTheme();
-  const styles = createStyles(colors);
-
-  return (
-    <View style={styles.rewardCard}>
-      <View style={styles.rewardRow}>
-        <View style={styles.labelWithIcon}>
-          <Text variant={TextVariant.BodyMDMedium}>
-            {strings('stake.metamask_pool')}
-          </Text>
-          <TouchableOpacity
-            onPress={onIconPress}
-            accessibilityLabel="Learn More"
-          >
-            <Icon
-              name={IconName.Question}
-              color={IconColor.Muted}
-              size={IconSize.Sm}
-            />
-          </TouchableOpacity>
-        </View>
-        <View style={styles.rewardRateContainer}>
-          {isLoading ? (
-            <SkeletonPlaceholder>
-              <SkeletonPlaceholder.Item
-                width={60}
-                height={20}
-                borderRadius={6}
-              />
-            </SkeletonPlaceholder>
-          ) : (
-            <Text color={TextColor.Success} variant={TextVariant.BodyMDMedium}>
-              {estimatedAnnualRewards}
-            </Text>
-          )}
-          <Text
-            variant={TextVariant.BodySMMedium}
-            color={TextColor.Alternative}
-          >
-            {strings('stake.estimated_annual_rewards')}
-          </Text>
-        </View>
-      </View>
-    </View>
-  );
-};
-
-export default EstimatedAnnualRewardsCard;
diff --git a/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.styles.ts b/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.styles.ts
deleted file mode 100644
index 7ce1390f7353..000000000000
--- a/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.styles.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const styleSheet = () =>
-  StyleSheet.create({
-    changesCard: {
-      borderWidth: 0,
-      borderRadius: 8,
-      gap: 16,
-    },
-    estimatedChangesWrapper: {
-      flexDirection: 'row',
-      alignItems: 'center',
-    },
-    youReceiveWrapper: {
-      flexDirection: 'row',
-      alignItems: 'baseline',
-      justifyContent: 'space-between',
-    },
-    youReceiveRightSide: {
-      alignItems: 'flex-end',
-      gap: 2,
-    },
-    flexRow: {
-      flexDirection: 'row',
-      gap: 4,
-    },
-    youReceiveFiat: {
-      paddingRight: 8,
-    },
-    ethLogo: {
-      width: 32,
-      height: 32,
-      borderRadius: 16,
-      overflow: 'hidden',
-    },
-  });
-
-export default styleSheet;
diff --git a/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.test.tsx b/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.test.tsx
deleted file mode 100644
index 5f3bf83e1ef6..000000000000
--- a/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.test.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import renderWithProvider from '../../../../../../util/test/renderWithProvider';
-import YouReceiveCard from './YouReceiveCard';
-import { YouReceiveCardProps } from './YouReceiveCard.types';
-import { renderFromWei } from '../../../../../../util/number';
-import { strings } from '../../../../../../../locales/i18n';
-
-const mockNavigate = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  const actualReactNavigation = jest.requireActual('@react-navigation/native');
-  return {
-    ...actualReactNavigation,
-    useNavigation: () => ({
-      navigate: mockNavigate,
-    }),
-  };
-});
-
-describe('YouReceiveCard', () => {
-  it('renders estimated changes, received amount, and fiat value', () => {
-    const props: YouReceiveCardProps = {
-      amountWei: '4999820000000000000',
-      amountFiat: '12,881.64',
-    };
-
-    const { getByText } = renderWithProvider(<YouReceiveCard {...props} />);
-
-    expect(getByText(strings('stake.estimated_changes'))).toBeOnTheScreen();
-    expect(getByText(strings('stake.you_receive'))).toBeOnTheScreen();
-    expect(getByText(`+ ${renderFromWei(props.amountWei)}`)).toBeOnTheScreen();
-    expect(getByText(`$${props.amountFiat}`)).toBeOnTheScreen();
-  });
-});
diff --git a/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.tsx b/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.tsx
deleted file mode 100644
index 02400792726a..000000000000
--- a/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import React from 'react';
-import { View } from 'react-native';
-import TagBase, {
-  TagSeverity,
-  TagShape,
-} from '../../../../../../component-library/base-components/TagBase';
-import Avatar, {
-  AvatarVariant,
-  AvatarSize,
-} from '../../../../../../component-library/components/Avatars/Avatar';
-import Text, {
-  TextVariant,
-  TextColor,
-} from '../../../../../../component-library/components/Texts/Text';
-import Card from '../../../../../../component-library/components/Cards/Card';
-import { renderFromWei } from '../../../../../../util/number';
-import { useStyles } from '../../../../../hooks/useStyles';
-import styleSheet from './YouReceiveCard.styles';
-import ethLogo from '../../../../../../images/ethereum.png';
-import { YouReceiveCardProps } from './YouReceiveCard.types';
-import { strings } from '../../../../../../../locales/i18n';
-
-const YouReceiveCard = ({ amountWei, amountFiat }: YouReceiveCardProps) => {
-  const { styles } = useStyles(styleSheet, {});
-
-  return (
-    <Card style={styles.changesCard} disabled>
-      <View style={styles.estimatedChangesWrapper}>
-        <Text variant={TextVariant.BodyMDMedium}>
-          {strings('stake.estimated_changes')}
-        </Text>
-      </View>
-      <View style={styles.youReceiveWrapper}>
-        <Text variant={TextVariant.BodyMDMedium}>
-          {strings('stake.you_receive')}
-        </Text>
-        <View style={styles.youReceiveRightSide}>
-          <View style={styles.flexRow}>
-            <TagBase severity={TagSeverity.Success} shape={TagShape.Pill}>
-              <Text
-                variant={TextVariant.BodyMDMedium}
-                color={TextColor.Success}
-              >
-                {`+ ${renderFromWei(amountWei)}`}
-              </Text>
-            </TagBase>
-            <TagBase
-              severity={TagSeverity.Neutral}
-              shape={TagShape.Pill}
-              startAccessory={
-                <Avatar
-                  variant={AvatarVariant.Network}
-                  imageSource={ethLogo}
-                  size={AvatarSize.Xs}
-                />
-              }
-            >
-              <Text>ETH</Text>
-            </TagBase>
-          </View>
-          <Text style={styles.youReceiveFiat} variant={TextVariant.BodySM}>
-            ${amountFiat}
-          </Text>
-        </View>
-      </View>
-    </Card>
-  );
-};
-
-export default YouReceiveCard;
diff --git a/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.types.ts b/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.types.ts
deleted file mode 100644
index 2a69e375536f..000000000000
--- a/app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface YouReceiveCardProps {
-  amountWei: string;
-  amountFiat: string;
-}
diff --git a/app/components/UI/Stake/hooks/useStakingEarningsHistory.test.tsx b/app/components/UI/Stake/hooks/useStakingEarningsHistory.test.tsx
deleted file mode 100644
index 751805a994fe..000000000000
--- a/app/components/UI/Stake/hooks/useStakingEarningsHistory.test.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { ChainId } from '@metamask/controller-utils';
-import useStakingEarningsHistory from './useStakingEarningsHistory';
-import { renderHookWithProvider } from '../../../../util/test/renderWithProvider';
-import { PooledStakingApiService, UserDailyReward } from '@metamask/stake-sdk';
-import { waitFor } from '@testing-library/react-native';
-import { backgroundState } from '../../../../util/test/initial-root-state';
-import { MOCK_ACCOUNTS_CONTROLLER_STATE } from '../../../../util/test/accountsControllerTestUtils';
-
-const mockInitialState = {
-  engine: {
-    backgroundState: {
-      ...backgroundState,
-      AccountsController: MOCK_ACCOUNTS_CONTROLLER_STATE,
-    },
-  },
-};
-
-afterEach(() => {
-  jest.clearAllMocks();
-});
-
-describe('useStakingEarningsHistory', () => {
-  it('should return loading state initially', async () => {
-    jest
-      .spyOn(PooledStakingApiService.prototype, 'getUserDailyRewards')
-      .mockResolvedValue({
-        userRewards: [],
-      });
-
-    const { result } = renderHookWithProvider(
-      () =>
-        useStakingEarningsHistory({
-          chainId: ChainId.mainnet,
-          limitDays: 365,
-        }),
-      {
-        state: mockInitialState,
-      },
-    );
-    expect(result.current.isLoading).toBe(true);
-    await waitFor(() => {
-      expect(result.current.isLoading).toBeFalsy();
-    });
-  });
-
-  it('should return error state if fetching fails', async () => {
-    jest
-      .spyOn(PooledStakingApiService.prototype, 'getUserDailyRewards')
-      .mockImplementation(() => {
-        throw new Error('Fetch failed');
-      });
-
-    const { result } = renderHookWithProvider(
-      () =>
-        useStakingEarningsHistory({
-          chainId: ChainId.mainnet,
-          limitDays: 365,
-        }),
-      {
-        state: mockInitialState,
-      },
-    );
-
-    await waitFor(() => {
-      expect(result.current.error).toBe('Failed to fetch earnings history');
-    });
-  });
-
-  it('should return earnings history when fetched successfully', async () => {
-    jest
-      .spyOn(PooledStakingApiService.prototype, 'getUserDailyRewards')
-      .mockResolvedValue({
-        userRewards: [
-          {
-            dateStr: '2024-01-01',
-            dailyRewards: '100',
-            sumRewards: '100',
-          } as UserDailyReward,
-        ],
-      });
-
-    const { result } = renderHookWithProvider(
-      () =>
-        useStakingEarningsHistory({
-          chainId: ChainId.mainnet,
-          limitDays: 365,
-        }),
-      {
-        state: mockInitialState,
-      },
-    );
-
-    await waitFor(() => {
-      expect(result.current?.earningsHistory).toBeInstanceOf(Array);
-      expect(result.current?.earningsHistory?.length).toBe(1);
-    });
-  });
-});
diff --git a/app/components/UI/Stake/hooks/useStakingEarningsHistory.ts b/app/components/UI/Stake/hooks/useStakingEarningsHistory.ts
deleted file mode 100644
index f7dc957b2c45..000000000000
--- a/app/components/UI/Stake/hooks/useStakingEarningsHistory.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { hexToNumber } from '@metamask/utils';
-import { ChainId } from '@metamask/controller-utils';
-import { useCallback, useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import { selectSelectedInternalAccountByScope } from '../../../../selectors/multichainAccounts/accounts';
-import { stakingApiService } from '../sdk/stakeSdkProvider';
-import { getFormattedAddressFromInternalAccount } from '../../../../core/Multichain/utils';
-import { EVM_SCOPE } from '../../Earn/constants/networks';
-
-export interface EarningHistory {
-  sumRewards: string;
-  dateStr: string;
-  dailyRewards: string;
-}
-export interface EarningHistoryResponse {
-  userRewards: EarningHistory[];
-}
-
-const useStakingEarningsHistory = ({
-  chainId,
-  limitDays = 365,
-}: {
-  chainId: ChainId;
-  limitDays: number;
-}) => {
-  const numericChainId = hexToNumber(chainId);
-  const [earningsHistory, setEarningsHistory] = useState<
-    EarningHistory[] | null
-  >(null);
-  const [isLoading, setIsLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-
-  const selectedAccount = useSelector(selectSelectedInternalAccountByScope)(
-    EVM_SCOPE,
-  );
-  const selectedAddress = selectedAccount
-    ? getFormattedAddressFromInternalAccount(selectedAccount)
-    : '';
-  const fetchEarningsHistory = useCallback(async () => {
-    if (stakingApiService) {
-      setIsLoading(true);
-      setError(null);
-
-      try {
-        const earningHistoryResponse: EarningHistoryResponse =
-          await stakingApiService.getUserDailyRewards(
-            numericChainId,
-            selectedAddress,
-            limitDays,
-          );
-        setEarningsHistory(earningHistoryResponse.userRewards);
-      } catch (err) {
-        setError('Failed to fetch earnings history');
-      } finally {
-        setIsLoading(false);
-      }
-    }
-  }, [numericChainId, selectedAddress, limitDays]);
-
-  useEffect(() => {
-    fetchEarningsHistory();
-  }, [fetchEarningsHistory]);
-
-  return {
-    earningsHistory,
-    isLoading,
-    error,
-  };
-};
-
-export default useStakingEarningsHistory;
diff --git a/app/components/UI/Stake/types.ts b/app/components/UI/Stake/types.ts
deleted file mode 100644
index af09590e49bb..000000000000
--- a/app/components/UI/Stake/types.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ParamListBase } from '@react-navigation/native';
-
-export interface StakeNavigationParamsList extends ParamListBase {
-  StakeModals: {
-    screen: string;
-    params?: {
-      amountWei?: string;
-      amountFiat?: string;
-      annualRewardsETH?: string;
-      annualRewardsFiat?: string;
-      annualRewardRate?: string;
-      estimatedGasFee?: string;
-      estimatedGasFeePercentage?: string;
-      handleMaxPress?: () => void;
-    };
-  };
-  StakeScreens: {
-    screen: string;
-    params?: {
-      amountWei: string;
-      amountFiat: string;
-      annualRewardsETH?: string;
-      annualRewardsFiat?: string;
-      annualRewardRate?: string;
-      chainId?: string;
-    };
-  };
-}
diff --git a/app/components/UI/Stake/utils/date/index.test.ts b/app/components/UI/Stake/utils/date/index.test.ts
deleted file mode 100644
index d55e4e8c3c15..000000000000
--- a/app/components/UI/Stake/utils/date/index.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { getUTCWeekRange } from '.';
-
-describe('date utils', () => {
-  describe('getUTCWeekRange', () => {
-    it('should return the correct week range during a month', () => {
-      const weekRange = getUTCWeekRange(new Date('2024-01-18'));
-      expect(weekRange.start).toBeDefined();
-      expect(weekRange.end).toBeDefined();
-      expect(weekRange.start).toBe('2024-01-15');
-      expect(weekRange.end).toBe('2024-01-21');
-    });
-
-    it('should return the correct week range across months', () => {
-      const weekRange = getUTCWeekRange(new Date('2024-01-31'));
-      expect(weekRange.start).toBeDefined();
-      expect(weekRange.end).toBeDefined();
-      expect(weekRange.start).toBe('2024-01-29');
-      expect(weekRange.end).toBe('2024-02-04');
-    });
-
-    it('should return the correct week range across years', () => {
-      const weekRange = getUTCWeekRange(new Date('2024-12-31'));
-      expect(weekRange.start).toBeDefined();
-      expect(weekRange.end).toBeDefined();
-      expect(weekRange.start).toBe('2024-12-30');
-      expect(weekRange.end).toBe('2025-01-05');
-    });
-
-    it('should error if the date is not a valid date', () => {
-      expect(() => getUTCWeekRange('not a date')).toThrow();
-    });
-  });
-});
diff --git a/app/components/UI/Stake/utils/date/index.ts b/app/components/UI/Stake/utils/date/index.ts
deleted file mode 100644
index 3d6b87f7c4d3..000000000000
--- a/app/components/UI/Stake/utils/date/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export const getUTCWeekRange = (date: Date | string) => {
-  const startDate = new Date(date);
-  const dayOfWeek = startDate.getUTCDay();
-  const startOfWeek = new Date(startDate);
-  startOfWeek.setUTCDate(startDate.getUTCDate() - ((dayOfWeek + 6) % 7));
-  const endOfWeek = new Date(startOfWeek);
-  endOfWeek.setUTCDate(startOfWeek.getUTCDate() + 6);
-  // returns a formatted utc date yyyy-MM-dd
-  const formatDate = (d: Date) => d.toISOString().split('T')[0];
-  return {
-    start: formatDate(startOfWeek),
-    end: formatDate(endOfWeek),
-  };
-};
diff --git a/app/components/UI/Tabs/TabThumbnail/TabThumbnail.test.tsx b/app/components/UI/Tabs/TabThumbnail/TabThumbnail.test.tsx
index bb312b1cbf11..2a4257739d57 100644
--- a/app/components/UI/Tabs/TabThumbnail/TabThumbnail.test.tsx
+++ b/app/components/UI/Tabs/TabThumbnail/TabThumbnail.test.tsx
@@ -63,7 +63,9 @@ describe('TabThumbnail', () => {
       },
     );
 
-    const switchButton = getByLabelText(strings('browser.switch_tab'));
+    const switchButton = getByLabelText(
+      `example.com, ${strings('browser.switch_tab')}`,
+    );
     fireEvent.press(switchButton);
 
     expect(mockOnSwitch).toHaveBeenCalledWith(mockTab);
@@ -109,7 +111,9 @@ describe('TabThumbnail', () => {
       },
     );
 
-    const switchButton = getByLabelText(strings('browser.switch_tab'));
+    const switchButton = getByLabelText(
+      `example.com, ${strings('browser.switch_tab')}`,
+    );
     // Verify active tab styling is applied (borderWidth: 3 from activeTab style)
     const flatStyle = StyleSheet.flatten(switchButton.props.style);
     expect(flatStyle.borderWidth).toBe(3);
diff --git a/app/components/UI/Tabs/TabThumbnail/TabThumbnail.tsx b/app/components/UI/Tabs/TabThumbnail/TabThumbnail.tsx
index 79182d8d1745..fd476f5c9953 100644
--- a/app/components/UI/Tabs/TabThumbnail/TabThumbnail.tsx
+++ b/app/components/UI/Tabs/TabThumbnail/TabThumbnail.tsx
@@ -66,7 +66,14 @@ const TabThumbnail = ({
     <Container style={styles.checkWrapper} elevation={8}>
       <TouchableOpacity
         accessible
-        accessibilityLabel={strings('browser.switch_tab')}
+        accessibilityRole="button"
+        // Host on the tab node itself — iOS flattens children out of the a11y
+        // tree; Android Appium matches content-desc from this label.
+        accessibilityLabel={
+          tabTitle
+            ? `${tabTitle}, ${strings('browser.switch_tab')}`
+            : strings('browser.switch_tab')
+        }
         onPress={() => onSwitch(tab)}
         style={[styles.tabWrapper, isActiveTab && styles.activeTab]}
         testID={`browser-tab-${tab.id}`}
diff --git a/app/components/UI/TemplateRenderer/SafeComponentList.ts b/app/components/UI/TemplateRenderer/SafeComponentList.ts
index b3dfef86abd3..6633e9d8498f 100644
--- a/app/components/UI/TemplateRenderer/SafeComponentList.ts
+++ b/app/components/UI/TemplateRenderer/SafeComponentList.ts
@@ -1,24 +1,13 @@
-import Button from '../../../component-library/components/Buttons/Button';
 import SheetHeader from '../../../component-library/components/Sheet/SheetHeader';
-import Text from '../../../component-library/components/Texts/Text';
+import { Text } from '@metamask/design-system-react-native';
 import Icon from '../../../component-library/components/Icons/Icon';
-import BottomSheetFooter from '../../../component-library/components/BottomSheets/BottomSheetFooter';
 import SmartTransactionStatus from '../../Views/transactions/SmartTransactionStatus/SmartTransactionStatus';
-import {
-  View,
-  Text as RNText,
-  ScrollView,
-  TouchableHighlight,
-} from 'react-native';
-import Checkbox from '../../../component-library/components/Checkbox/Checkbox';
+import { View, ScrollView, TouchableHighlight } from 'react-native';
 import { SnapUIImage } from '../../Snaps/SnapUIImage/SnapUIImage';
-import { SnapAvatar } from '../../Snaps/SnapAvatar/SnapAvatar';
-import AddressElement from '../../../components/Views/confirmations/legacy/components/AddressElement';
 import { Box } from '../Box/Box';
 import { SnapUICard } from '../../Snaps/SnapUICard/SnapUICard';
 import { SnapUILink } from '../../Snaps/SnapUILink/SnapUILink';
 import { SnapUIInput } from '../../Snaps/SnapUIInput/SnapUIInput';
-import { SnapIcon } from '../../Snaps/SnapIcon/SnapIcon';
 import { SnapUIFooterButton } from '../../Snaps/SnapUIFooterButton/SnapUIFooterButton';
 import { ConfirmInfoRowValueDouble } from '../../../component-library/components-temp/Snaps/ConfirmInfoRowValueDouble/ConfirmInfoRowValueDouble';
 import { SnapUIIcon } from '../../Snaps/SnapUIIcon/SnapUIIcon';
@@ -42,23 +31,17 @@ import { SnapUIDateTimePicker } from '../../Snaps/SnapUIDateTimePicker/SnapUIDat
 import { SnapUICollapsibleSection } from '../../Snaps/SnapUICollapsibleSection/SnapUICollapsibleSection';
 
 export const safeComponentList = {
-  BottomSheetFooter,
-  Button,
   Icon,
   SheetHeader,
   SmartTransactionStatus,
   Text,
   View,
-  Checkbox,
   SnapUIImage,
   SnapUICard,
-  SnapAvatar,
   SnapUILink,
-  AddressElement,
   Box,
   SnapUIInput,
   SnapUIAddressInput,
-  SnapIcon,
   SnapUIIcon,
   SnapUIFooterButton,
   ConfirmInfoRowValueDouble,
@@ -75,7 +58,6 @@ export const safeComponentList = {
   SnapUIInfoRow,
   SnapUIAccountSelector,
   SnapUIDateTimePicker,
-  RNText,
   ScrollView,
   SnapUITooltip,
   Skeleton,
diff --git a/app/components/UI/TemplateRenderer/TemplateRenderer.tsx b/app/components/UI/TemplateRenderer/TemplateRenderer.tsx
index a3c36b7c5da2..359318eca824 100644
--- a/app/components/UI/TemplateRenderer/TemplateRenderer.tsx
+++ b/app/components/UI/TemplateRenderer/TemplateRenderer.tsx
@@ -3,7 +3,7 @@ import { isEqual } from 'lodash';
 import { v1 as random } from 'uuid';
 import { safeComponentList } from './SafeComponentList';
 import { TemplateRendererComponent, TemplateRendererInput } from './types';
-import Text from '../../../component-library/components/Texts/Text';
+import { Text } from '@metamask/design-system-react-native';
 import { isValidElementName } from '../../Views/confirmations/legacy/components/Approval/TemplateConfirmation/util';
 
 interface TemplateRendererProps {
diff --git a/app/components/UI/TokenDetails/Views/TokenDetails.tsx b/app/components/UI/TokenDetails/Views/TokenDetails.tsx
index 9a5226897b25..e95883e3de2c 100644
--- a/app/components/UI/TokenDetails/Views/TokenDetails.tsx
+++ b/app/components/UI/TokenDetails/Views/TokenDetails.tsx
@@ -436,6 +436,7 @@ const TokenDetails: React.FC<{
     conversionRate,
     currentCurrency: txCurrentCurrency,
     isNonEvmAsset: txIsNonEvmAsset,
+    bridgeArrivalTxs,
   } = useTokenTransactions(token);
 
   const hasTransactions =
@@ -550,6 +551,7 @@ const TokenDetails: React.FC<{
           navigation={navigation}
           selectedAddress={selectedAddress}
           chainId={token.chainId as SupportedCaipChainId}
+          bridgeArrivalTransactions={bridgeArrivalTxs}
           enableRefresh
           showDisclaimer
           location={TransactionDetailLocation.AssetDetails}
diff --git a/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx b/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx
index 3180c8888d60..173567248021 100644
--- a/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx
+++ b/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx
@@ -78,7 +78,6 @@ import { useTokenDetailsActionTracking } from '../hooks/useTokenDetailsActionTra
 import { useTokenSecurityBadgePress } from '../hooks/useTokenSecurityBadgePress';
 import {
   Box,
-  BoxFlexDirection,
   FontWeight,
   Text,
   TextColor,
@@ -91,6 +90,10 @@ import TronEnergyBandwidthDetail from '../../AssetOverview/TronEnergyBandwidthDe
 import TronAssetOverviewSection from './TronAssetOverviewSection';
 import { isTronNativeToken } from '../utils/isTronNativeToken';
 ///: END:ONLY_INCLUDE_IF
+import { AssetActivateCard } from '../../AssetActivation/AssetActivateCard';
+import { SpendableBalanceSection } from '../../SpendableBalance/SpendableBalanceSection';
+import { getIsAssetRequireActivate } from '../../../../selectors/stellar/stellar-assets';
+import { useSpendableBalance } from '../hooks/useSpendableBalance';
 import MarketClosedActionButton from '../../AssetOverview/MarketClosedActionButton';
 import { IconName as ComponentLibraryIconName } from '../../../../component-library/components/Icons/Icon';
 import { useRWAToken } from '../../Bridge/hooks/useRWAToken';
@@ -270,6 +273,15 @@ const AssetOverviewContent: React.FC<AssetOverviewContentProps> = ({
     severity: securityData?.resultType,
   });
   const tronNativeToken = isTronNativeToken(token) ? token : null;
+  const isAssetInactive = useSelector((state) =>
+    getIsAssetRequireActivate(state, {
+      assetId: token.address,
+    }),
+  );
+  const spendableBalanceData = useSpendableBalance({
+    assetId: token.address,
+  });
+  const showSpendableBalance = spendableBalanceData.hasSpendableBalance;
 
   const {
     hasPerpsMarket,
@@ -606,6 +618,10 @@ const AssetOverviewContent: React.FC<AssetOverviewContentProps> = ({
               />
             )}
 
+          {isAssetInactive ? (
+            <AssetActivateCard token={token} chainName="Stellar" />
+          ) : null}
+
           <Price
             asset={token}
             prices={prices}
@@ -668,7 +684,16 @@ const AssetOverviewContent: React.FC<AssetOverviewContentProps> = ({
             tronNativeToken && <TronEnergyBandwidthDetail />
             ///: END:ONLY_INCLUDE_IF
           }
-          {balance != null && (
+          {balance != null && spendableBalanceData.hasSpendableBalance && (
+            <SpendableBalanceSection
+              minimumReserveBalance={spendableBalanceData.minimumReserveBalance}
+              spendableBalance={spendableBalanceData.spendableBalance}
+              totalBalance={String(balance)}
+              symbol={token.symbol}
+              fiatValue={mainBalance}
+            />
+          )}
+          {balance != null && !spendableBalanceData.hasSpendableBalance && (
             <>
               <Balance
                 asset={token}
diff --git a/app/components/UI/TokenDetails/components/MoreTokenActionsMenu.test.tsx b/app/components/UI/TokenDetails/components/MoreTokenActionsMenu.test.tsx
index 30a02fce5386..a33c82b47635 100644
--- a/app/components/UI/TokenDetails/components/MoreTokenActionsMenu.test.tsx
+++ b/app/components/UI/TokenDetails/components/MoreTokenActionsMenu.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { userEvent } from '@testing-library/react-native';
+import { userEvent, waitFor } from '@testing-library/react-native';
 import MoreTokenActionsMenu, {
   MoreTokenActionsMenuParams,
 } from './MoreTokenActionsMenu';
@@ -13,6 +13,7 @@ import { MUSD_TOKEN_ADDRESS } from '../../Earn/constants/musd';
 import Routes from '../../../../constants/navigation/Routes';
 import Engine from '../../../../core/Engine';
 import NotificationManager from '../../../../core/NotificationManager';
+import { strings } from '../../../../../locales/i18n';
 
 // Mock BottomSheet so that onCloseBottomSheet(callback) immediately invokes the callback.
 // This allows testing the action handlers (Buy, Receive, View explorer, Remove token).
@@ -167,6 +168,22 @@ jest.mock('../../../../core/NotificationManager', () => ({
   showSimpleNotification: jest.fn(),
 }));
 
+const mockDeactivateAsset = jest.fn();
+let mockCanDeactivate = false;
+let mockIsDeactivating = false;
+
+jest.mock('../hooks/useAssetActivation', () => ({
+  useAssetActivation: () => ({
+    deactivateAsset: mockDeactivateAsset,
+    get canDeactivate() {
+      return mockCanDeactivate;
+    },
+    get isDeactivating() {
+      return mockIsDeactivating;
+    },
+  }),
+}));
+
 jest.mock('./useAssetVisibility', () => ({
   __esModule: true,
   default: jest.fn(() => ({
@@ -205,6 +222,12 @@ const updateRouteParams = (params: Partial<MoreTokenActionsMenuParams>) => {
 describe('MoreTokenActionsMenu', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockCanDeactivate = false;
+    mockIsDeactivating = false;
+    mockDeactivateAsset.mockResolvedValue({
+      success: true,
+      errorMessage: null,
+    });
     (selectAsset as unknown as jest.Mock).mockReturnValue({});
     Object.assign(mockRouteParams, {
       hasPerpsMarket: false,
@@ -677,4 +700,95 @@ describe('MoreTokenActionsMenu', () => {
       );
     });
   });
+
+  describe('deactivate asset', () => {
+    beforeEach(() => {
+      mockCanDeactivate = true;
+    });
+
+    it('renders Deactivate asset when canDeactivate is true', () => {
+      const { getByTestId } = renderWithProvider(<MoreTokenActionsMenu />, {
+        state: mockInitialState,
+      });
+
+      expect(getByTestId('more-actions-deactivate-asset')).toBeOnTheScreen();
+    });
+
+    it('does not render Deactivate asset when canDeactivate is false', () => {
+      mockCanDeactivate = false;
+
+      const { queryByTestId } = renderWithProvider(<MoreTokenActionsMenu />, {
+        state: mockInitialState,
+      });
+
+      expect(
+        queryByTestId('more-actions-deactivate-asset'),
+      ).not.toBeOnTheScreen();
+    });
+
+    it('navigates to transactions view when deactivation succeeds', async () => {
+      mockDeactivateAsset.mockResolvedValue({
+        success: true,
+        errorMessage: null,
+      });
+
+      const { getByTestId } = renderWithProvider(<MoreTokenActionsMenu />, {
+        state: mockInitialState,
+      });
+
+      await userEvent.press(getByTestId('more-actions-deactivate-asset'));
+
+      await waitFor(() => {
+        expect(mockDeactivateAsset).toHaveBeenCalled();
+        expect(mockNavigate).toHaveBeenCalledWith(Routes.TRANSACTIONS_VIEW);
+      });
+      expect(NotificationManager.showSimpleNotification).not.toHaveBeenCalled();
+    });
+
+    it('shows an error notification when deactivation fails', async () => {
+      mockDeactivateAsset.mockResolvedValue({
+        success: false,
+        errorMessage: 'deactivate error',
+      });
+
+      const { getByTestId } = renderWithProvider(<MoreTokenActionsMenu />, {
+        state: mockInitialState,
+      });
+
+      await userEvent.press(getByTestId('more-actions-deactivate-asset'));
+
+      await waitFor(() => {
+        expect(NotificationManager.showSimpleNotification).toHaveBeenCalledWith(
+          {
+            status: 'error',
+            duration: 5000,
+            title: strings(
+              'transactions.activity_trustline_deactivation_failed',
+            ),
+            description: 'deactivate error',
+          },
+        );
+      });
+      expect(mockNavigate).not.toHaveBeenCalledWith(Routes.TRANSACTIONS_VIEW);
+    });
+
+    it('does not navigate or notify when deactivation is cancelled', async () => {
+      mockDeactivateAsset.mockResolvedValue({
+        success: false,
+        errorMessage: null,
+      });
+
+      const { getByTestId } = renderWithProvider(<MoreTokenActionsMenu />, {
+        state: mockInitialState,
+      });
+
+      await userEvent.press(getByTestId('more-actions-deactivate-asset'));
+
+      await waitFor(() => {
+        expect(mockDeactivateAsset).toHaveBeenCalled();
+      });
+      expect(mockNavigate).not.toHaveBeenCalledWith(Routes.TRANSACTIONS_VIEW);
+      expect(NotificationManager.showSimpleNotification).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/app/components/UI/TokenDetails/components/MoreTokenActionsMenu.tsx b/app/components/UI/TokenDetails/components/MoreTokenActionsMenu.tsx
index e990194d05b6..a66a5d978263 100644
--- a/app/components/UI/TokenDetails/components/MoreTokenActionsMenu.tsx
+++ b/app/components/UI/TokenDetails/components/MoreTokenActionsMenu.tsx
@@ -30,6 +30,7 @@ import { TokenDetailsAction } from '../constants/constants';
 import { isNonEvmChainId } from '../../../../core/Multichain/utils';
 import { removeNonEvmToken } from '../../Tokens/util/removeNonEvmToken';
 import { selectSelectedInternalAccountByScope } from '../../../../selectors/multichainAccounts/accounts';
+import { useAssetActivation } from '../hooks/useAssetActivation';
 
 export interface MoreTokenActionsMenuParams {
   hasPerpsMarket: boolean;
@@ -85,6 +86,13 @@ const MoreTokenActionsMenu = () => {
   );
   const { handleHideToken } = useAssetVisibility(asset);
 
+  const { deactivateAsset, canDeactivate, isDeactivating } = useAssetActivation(
+    {
+      assetId: asset.address,
+      assetSymbol: asset.symbol,
+    },
+  );
+
   const closeBottomSheetAndNavigate = useCallback(
     (navigateFunc: () => void) => {
       sheetRef.current?.onCloseBottomSheet(navigateFunc);
@@ -220,6 +228,26 @@ const MoreTokenActionsMenu = () => {
     onActionTapped,
   ]);
 
+  const handleDeactivateTrustline = useCallback(() => {
+    closeBottomSheetAndNavigate(async () => {
+      const { success, errorMessage } = await deactivateAsset();
+
+      if (errorMessage) {
+        NotificationManager.showSimpleNotification({
+          status: 'error',
+          duration: 5000,
+          title: strings('transactions.activity_trustline_deactivation_failed'),
+          description: errorMessage,
+        });
+        return;
+      }
+
+      if (success) {
+        navigation.navigate(Routes.TRANSACTIONS_VIEW);
+      }
+    });
+  }, [closeBottomSheetAndNavigate, deactivateAsset, navigation]);
+
   const tokenIsInAccount = !!useSelector((state: RootState) =>
     selectAsset(state, {
       address: asset.address,
@@ -280,6 +308,18 @@ const MoreTokenActionsMenu = () => {
       });
     }
 
+    if (canDeactivate) {
+      actions.push({
+        type: 'stellar-deactivate-trustline',
+        label: strings('asset_details.options.deactivate_asset'),
+        iconName: IconName.Trash,
+        testID: 'more-actions-deactivate-asset',
+        isVisible: true,
+        isDisabled: isDeactivating,
+        onPress: handleDeactivateTrustline,
+      });
+    }
+
     return actions;
   }, [
     asset.address,
@@ -296,6 +336,9 @@ const MoreTokenActionsMenu = () => {
     handleBuy,
     handleViewOnBlockExplorer,
     handleRemoveToken,
+    handleDeactivateTrustline,
+    canDeactivate,
+    isDeactivating,
   ]);
 
   return (
diff --git a/app/components/UI/TokenDetails/components/RwaUnavailableBottomSheet/RwaUnavailableBottomSheet.tsx b/app/components/UI/TokenDetails/components/RwaUnavailableBottomSheet/RwaUnavailableBottomSheet.tsx
index 70a69be37ce3..b0b76f6d1863 100644
--- a/app/components/UI/TokenDetails/components/RwaUnavailableBottomSheet/RwaUnavailableBottomSheet.tsx
+++ b/app/components/UI/TokenDetails/components/RwaUnavailableBottomSheet/RwaUnavailableBottomSheet.tsx
@@ -22,7 +22,6 @@ import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { useNavigation } from '@react-navigation/native';
 import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
 import { strings } from '../../../../../../locales/i18n';
-import { useElevatedSurface } from '../../../../../util/theme/themeUtils';
 
 const ONDO_ELIGIBILITY_URL =
   'https://docs.ondo.finance/ondo-global-markets/eligibility';
@@ -44,7 +43,6 @@ const RwaUnavailableBottomSheet = forwardRef<
   const [isVisible, setIsVisible] = useState(false);
   const tw = useTailwind();
   const navigation = useNavigation<AppNavigationProp>();
-  const surfaceClass = useElevatedSurface();
 
   const handleSheetClosed = useCallback(() => {
     setIsVisible(false);
@@ -102,12 +100,7 @@ const RwaUnavailableBottomSheet = forwardRef<
   }
 
   return (
-    <BottomSheet
-      ref={sheetRef}
-      isInteractable
-      onClose={handleSheetClosed}
-      twClassName={surfaceClass}
-    >
+    <BottomSheet ref={sheetRef} isInteractable onClose={handleSheetClosed}>
       <BottomSheetHeader onClose={closeSheet}>
         {strings('rwa.unavailable.title')}
       </BottomSheetHeader>
diff --git a/app/components/UI/TokenDetails/components/ShareTokenBottomSheet.test.tsx b/app/components/UI/TokenDetails/components/ShareTokenBottomSheet.test.tsx
index 5850ad887d3d..dea7f885054f 100644
--- a/app/components/UI/TokenDetails/components/ShareTokenBottomSheet.test.tsx
+++ b/app/components/UI/TokenDetails/components/ShareTokenBottomSheet.test.tsx
@@ -157,10 +157,6 @@ jest.mock('react-redux', () => ({
   useSelector: jest.fn((selector: (state: unknown) => unknown) => selector({})),
 }));
 
-jest.mock('../../../../util/theme/themeUtils', () => ({
-  useElevatedSurface: () => 'bg-default',
-}));
-
 jest.mock('../../../../selectors/tokenRatesController', () => ({
   selectTokenMarketData: jest.fn(() => ({})),
 }));
diff --git a/app/components/UI/TokenDetails/components/ShareTokenBottomSheet.tsx b/app/components/UI/TokenDetails/components/ShareTokenBottomSheet.tsx
index 04615ddb6d00..ec070ee3ee63 100644
--- a/app/components/UI/TokenDetails/components/ShareTokenBottomSheet.tsx
+++ b/app/components/UI/TokenDetails/components/ShareTokenBottomSheet.tsx
@@ -25,7 +25,6 @@ import {
   type BottomSheetRef,
 } from '@metamask/design-system-react-native';
 import i18n, { strings } from '../../../../../locales/i18n';
-import { useElevatedSurface } from '../../../../util/theme/themeUtils';
 import { RootState } from '../../../../reducers';
 import { selectTokenMarketData } from '../../../../selectors/tokenRatesController';
 import {
@@ -124,7 +123,6 @@ const ShareTokenBottomSheet = ({
   onClose,
 }: ShareTokenBottomSheetProps) => {
   const bottomSheetRef = useRef<BottomSheetRef>(null);
-  const surfaceClass = useElevatedSurface();
 
   const isNonEvm = isNonEvmChainId(token.chainId as string);
   const checksumAddress = !isNonEvm
@@ -326,7 +324,6 @@ const ShareTokenBottomSheet = ({
     <BottomSheet
       ref={bottomSheetRef}
       onClose={onClose}
-      twClassName={surfaceClass}
       testID="share-token-sheet"
     >
       <BottomSheetHeader textProps={{ variant: TextVariant.HeadingLg }}>
diff --git a/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.tsx b/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.tsx
index f0e1061e67e4..8ba0342017b8 100644
--- a/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.tsx
+++ b/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.tsx
@@ -39,24 +39,27 @@ const styles = StyleSheet.create({
   footer: {
     flexDirection: 'row',
     alignItems: 'center',
+    gap: 16,
     paddingVertical: 4,
   },
-  button: {
+  iconButton: {
     flex: 1,
-  },
-  subsequentButton: {
-    flex: 1,
-    marginLeft: 16,
+    paddingLeft: 0,
+    paddingRight: 4,
   },
   quickBuyButton: {
     width: 48,
     height: 48,
-    marginLeft: 16,
     alignItems: 'center',
     justifyContent: 'center',
     borderWidth: 1,
     borderRadius: 999,
   },
+  earnButton: {
+    flex: 1,
+    paddingLeft: 0,
+    paddingRight: 0,
+  },
 });
 
 const BALANCE_THRESHOLD_USD = 100;
@@ -328,7 +331,7 @@ const TokenDetailsStickyFooter: React.FC<TokenStickyFooterProps> = ({
       variant={
         hasTokenBalance ? ButtonVariant.Primary : ButtonVariant.Secondary
       }
-      style={showSwapButton ? styles.subsequentButton : styles.button}
+      style={styles.earnButton}
       twClassName={
         hasTokenBalance ? successBg : `bg-transparent ${successBorder}`
       }
@@ -361,7 +364,7 @@ const TokenDetailsStickyFooter: React.FC<TokenStickyFooterProps> = ({
               variant={
                 swapIsSuccess ? ButtonVariant.Primary : ButtonVariant.Secondary
               }
-              style={styles.button}
+              style={styles.iconButton}
               twClassName={
                 swapIsSuccess ? successBg : `bg-transparent ${successBorder}`
               }
@@ -397,11 +400,7 @@ const TokenDetailsStickyFooter: React.FC<TokenStickyFooterProps> = ({
               variant={
                 buyIsSuccess ? ButtonVariant.Primary : ButtonVariant.Secondary
               }
-              style={
-                showSwapButton || (isMoneyEarnCtaActive && !hasTokenBalance)
-                  ? styles.subsequentButton
-                  : styles.button
-              }
+              style={styles.iconButton}
               twClassName={
                 buyIsSuccess ? successBg : `bg-transparent ${successBorder}`
               }
@@ -460,7 +459,7 @@ const TokenDetailsStickyFooter: React.FC<TokenStickyFooterProps> = ({
         </View>
         {isMoneyEarnCtaActive && !moneyEarnCta?.isLoading && (
           <Text
-            variant={TextVariant.BodySm}
+            variant={TextVariant.BodyXs}
             color={TextColor.TextAlternative}
             twClassName="mt-2 text-center"
           >
diff --git a/app/components/UI/TokenDetails/hooks/useAssetActivation.test.ts b/app/components/UI/TokenDetails/hooks/useAssetActivation.test.ts
new file mode 100644
index 000000000000..a55c65e57103
--- /dev/null
+++ b/app/components/UI/TokenDetails/hooks/useAssetActivation.test.ts
@@ -0,0 +1,312 @@
+import { act, renderHook } from '@testing-library/react-hooks';
+import { XlmScope } from '@metamask/keyring-api';
+import { errorCodes } from '@metamask/rpc-errors';
+import type { CaipAssetType } from '@metamask/utils';
+
+import {
+  requestStellarChangeTrustOptAdd,
+  requestStellarChangeTrustOptDelete,
+} from '../../../../util/stellar/stellar-snap-client-requests';
+import { selectMultichainBalances } from '../../../../selectors/multichain';
+import { getIsAssetRequireActivate } from '../../../../selectors/stellar/stellar-assets';
+import { useAssetActivation } from './useAssetActivation';
+
+const ACCOUNT_ID = 'stellar-account-id';
+const PUBNET_USDC_ASSET =
+  'stellar:pubnet/asset:USDC-GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN' as CaipAssetType;
+const SEP41_ASSET_ID =
+  'stellar:pubnet/sep41:CBIJBDNZNF4X35BJ4FFZWCDBSCKOP5NB4PLG4SNENRMLAPYG4P5FM6VN' as CaipAssetType;
+
+const DEFAULT_HOOK_PARAMS = {
+  assetId: PUBNET_USDC_ASSET,
+  assetSymbol: 'USDC',
+};
+
+jest.mock('react-redux', () => ({
+  useSelector: <State, Result>(selector: (state: State) => Result): Result =>
+    selector({} as State),
+}));
+
+jest.mock('../../../../selectors/multichainAccounts/accounts', () => ({
+  selectSelectedInternalAccountByScope: () => () => ({ id: ACCOUNT_ID }),
+}));
+
+jest.mock('../../../../selectors/multichain', () => ({
+  selectMultichainBalances: jest.fn(() => ({})),
+}));
+
+jest.mock('../../../../selectors/stellar/stellar-assets', () => ({
+  ...jest.requireActual('../../../../selectors/stellar/stellar-assets'),
+  getIsAssetRequireActivate: jest.fn(),
+}));
+
+jest.mock('../../../../util/stellar/stellar-snap-client-requests', () => ({
+  requestStellarChangeTrustOptAdd: jest.fn(),
+  requestStellarChangeTrustOptDelete: jest.fn(),
+}));
+
+jest.mock('../../../../../locales/i18n', () => ({
+  strings: (key: string, params?: Record<string, string>) => {
+    if (key === 'asset_activation.deactivate_error_non_zero_balance_stellar') {
+      return `You still have ${params?.balance} ${params?.symbol}`;
+    }
+    if (key === 'asset_activation.deactivate_error') {
+      return 'deactivate error';
+    }
+    if (key === 'asset_activation.activate_error') {
+      return 'activate error';
+    }
+    return key;
+  },
+}));
+
+describe('useAssetActivation', () => {
+  const getIsAssetRequireActivateMock = jest.mocked(getIsAssetRequireActivate);
+  const requestAddMock = jest.mocked(requestStellarChangeTrustOptAdd);
+  const requestDeleteMock = jest.mocked(requestStellarChangeTrustOptDelete);
+  const selectMultichainBalancesMock = jest.mocked(selectMultichainBalances);
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    selectMultichainBalancesMock.mockReturnValue({});
+    getIsAssetRequireActivateMock.mockReturnValue(false);
+    requestAddMock.mockResolvedValue({ status: true });
+    requestDeleteMock.mockResolvedValue(undefined);
+  });
+
+  describe('canDeactivate / requiresActivate', () => {
+    it('returns false canDeactivate for non-trustline assets', () => {
+      const { result } = renderHook(() =>
+        useAssetActivation({
+          assetId: SEP41_ASSET_ID,
+          assetSymbol: 'SEP41',
+        }),
+      );
+
+      expect(result.current.canDeactivate).toBe(false);
+      expect(result.current.requiresActivate).toBe(false);
+    });
+
+    it('returns false canDeactivate when trustline limit is zero', () => {
+      getIsAssetRequireActivateMock.mockReturnValue(true);
+
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      expect(result.current.requiresActivate).toBe(true);
+      expect(result.current.canDeactivate).toBe(false);
+    });
+
+    it('returns true canDeactivate when trustline limit is greater than zero', () => {
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      expect(result.current.requiresActivate).toBe(false);
+      expect(result.current.canDeactivate).toBe(true);
+    });
+  });
+
+  describe('activateAsset', () => {
+    it('requests trustline add on success', async () => {
+      getIsAssetRequireActivateMock.mockReturnValue(true);
+
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      let actionResult;
+      await act(async () => {
+        actionResult = await result.current.activateAsset();
+      });
+
+      expect(requestAddMock).toHaveBeenCalledWith({
+        accountId: ACCOUNT_ID,
+        assetId: PUBNET_USDC_ASSET,
+        scope: XlmScope.Pubnet,
+      });
+      expect(result.current.isActivating).toBe(false);
+      expect(actionResult).toEqual({ success: true, errorMessage: null });
+    });
+
+    it('does not request add for non-trustline assets', async () => {
+      const { result } = renderHook(() =>
+        useAssetActivation({
+          assetId: SEP41_ASSET_ID,
+          assetSymbol: 'SEP41',
+        }),
+      );
+
+      let actionResult;
+      await act(async () => {
+        actionResult = await result.current.activateAsset();
+      });
+
+      expect(requestAddMock).not.toHaveBeenCalled();
+      expect(actionResult).toEqual({ success: false, errorMessage: null });
+    });
+
+    it('does not request add when activation is not required', async () => {
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      let actionResult;
+      await act(async () => {
+        actionResult = await result.current.activateAsset();
+      });
+
+      expect(requestAddMock).not.toHaveBeenCalled();
+      expect(actionResult).toEqual({ success: false, errorMessage: null });
+    });
+
+    it('returns an error message when activation fails', async () => {
+      getIsAssetRequireActivateMock.mockReturnValue(true);
+      requestAddMock.mockRejectedValue(new Error('activation failed'));
+
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      let actionResult;
+      await act(async () => {
+        actionResult = await result.current.activateAsset();
+      });
+
+      expect(actionResult).toEqual({
+        success: false,
+        errorMessage: 'activate error',
+      });
+    });
+
+    it('returns cancelled result when the user rejects activation', async () => {
+      getIsAssetRequireActivateMock.mockReturnValue(true);
+      requestAddMock.mockRejectedValue({
+        code: errorCodes.provider.userRejectedRequest,
+      });
+
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      let actionResult;
+      await act(async () => {
+        actionResult = await result.current.activateAsset();
+      });
+
+      expect(actionResult).toEqual({ success: false, errorMessage: null });
+    });
+
+    it('returns cancelled result when funding prompt is shown', async () => {
+      getIsAssetRequireActivateMock.mockReturnValue(true);
+      requestAddMock.mockResolvedValue({ status: false });
+
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      let actionResult;
+      await act(async () => {
+        actionResult = await result.current.activateAsset();
+      });
+
+      expect(actionResult).toEqual({ success: false, errorMessage: null });
+    });
+  });
+
+  describe('deactivateAsset', () => {
+    it('requests trustline delete on success', async () => {
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      let actionResult;
+      await act(async () => {
+        actionResult = await result.current.deactivateAsset();
+      });
+
+      expect(requestDeleteMock).toHaveBeenCalledWith({
+        accountId: ACCOUNT_ID,
+        assetId: PUBNET_USDC_ASSET,
+        scope: XlmScope.Pubnet,
+      });
+      expect(result.current.isDeactivating).toBe(false);
+      expect(actionResult).toEqual({ success: true, errorMessage: null });
+    });
+
+    it('does nothing when deactivation is not allowed', async () => {
+      getIsAssetRequireActivateMock.mockReturnValue(true);
+
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      let actionResult;
+      await act(async () => {
+        actionResult = await result.current.deactivateAsset();
+      });
+
+      expect(requestDeleteMock).not.toHaveBeenCalled();
+      expect(actionResult).toEqual({ success: false, errorMessage: null });
+    });
+
+    it('returns a generic remove error when deactivation fails', async () => {
+      requestDeleteMock.mockRejectedValue(new Error('deactivation failed'));
+
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      let actionResult;
+      await act(async () => {
+        actionResult = await result.current.deactivateAsset();
+      });
+
+      expect(actionResult).toEqual({
+        success: false,
+        errorMessage: 'deactivate error',
+      });
+    });
+
+    it('returns non-zero balance error without requesting delete', async () => {
+      selectMultichainBalancesMock.mockReturnValue({
+        [ACCOUNT_ID]: {
+          [PUBNET_USDC_ASSET]: { amount: '5.5', unit: 'USDC' },
+        },
+      });
+
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      let actionResult;
+      await act(async () => {
+        actionResult = await result.current.deactivateAsset();
+      });
+
+      expect(requestDeleteMock).not.toHaveBeenCalled();
+      expect(actionResult).toEqual({
+        success: false,
+        errorMessage: 'You still have 5.5 USDC',
+      });
+    });
+
+    it('returns cancelled result when the user rejects deactivation', async () => {
+      requestDeleteMock.mockRejectedValue({
+        code: errorCodes.provider.userRejectedRequest,
+      });
+
+      const { result } = renderHook(() =>
+        useAssetActivation(DEFAULT_HOOK_PARAMS),
+      );
+
+      let actionResult;
+      await act(async () => {
+        actionResult = await result.current.deactivateAsset();
+      });
+
+      expect(actionResult).toEqual({ success: false, errorMessage: null });
+    });
+  });
+});
diff --git a/app/components/UI/TokenDetails/hooks/useAssetActivation.ts b/app/components/UI/TokenDetails/hooks/useAssetActivation.ts
new file mode 100644
index 000000000000..30670c38257e
--- /dev/null
+++ b/app/components/UI/TokenDetails/hooks/useAssetActivation.ts
@@ -0,0 +1,189 @@
+import { errorCodes } from '@metamask/rpc-errors';
+import { useCallback, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { isCaipAssetType, parseCaipAssetType } from '@metamask/utils';
+import { strings } from '../../../../../locales/i18n';
+import { selectSelectedInternalAccountByScope } from '../../../../selectors/multichainAccounts/accounts';
+import { selectMultichainBalances } from '../../../../selectors/multichain';
+import {
+  getIsAssetRequireActivate,
+  isAssetSupportActivation,
+} from '../../../../selectors/stellar/stellar-assets';
+import {
+  requestStellarChangeTrustOptAdd,
+  requestStellarChangeTrustOptDelete,
+} from '../../../../util/stellar/stellar-snap-client-requests';
+
+export interface AssetActivationActionResult {
+  /**
+   * Whether the trustline change was submitted successfully.
+   */
+  success: boolean;
+  /**
+   * User-facing error message when the action failed.
+   * `null` when successful, cancelled, or skipped.
+   */
+  errorMessage: string | null;
+}
+
+const CANCELLED_RESULT: AssetActivationActionResult = {
+  success: false,
+  errorMessage: null,
+};
+
+/**
+ * Manages trustline activation and deactivation for supported assets (currently Stellar classic tokens).
+ *
+ * @param params - Hook parameters.
+ * @param params.assetId - Asset id for the trustline asset.
+ * @param params.assetSymbol - Symbol of the asset.
+ * @returns Trustline actions, loading flags, activation requirement, and whether deactivation is allowed.
+ */
+export const useAssetActivation = ({
+  assetId,
+  assetSymbol,
+}: {
+  assetId: string;
+  assetSymbol?: string;
+}) => {
+  const selectAccountByScope = useSelector(
+    selectSelectedInternalAccountByScope,
+  );
+
+  const chainId = isCaipAssetType(assetId)
+    ? parseCaipAssetType(assetId).chainId
+    : undefined;
+
+  const resolvedAccountId = chainId
+    ? selectAccountByScope(chainId)?.id
+    : undefined;
+
+  const multichainBalances = useSelector(selectMultichainBalances);
+
+  const balanceAmount =
+    resolvedAccountId && assetId
+      ? multichainBalances[resolvedAccountId]?.[assetId]?.amount
+      : undefined;
+
+  const requiresActivate = useSelector((state) =>
+    getIsAssetRequireActivate(state, { assetId, accountId: resolvedAccountId }),
+  );
+
+  // Classic asset with an active trustline (not requiring activation).
+  const canDeactivate = Boolean(
+    isAssetSupportActivation(assetId) &&
+      !requiresActivate &&
+      resolvedAccountId &&
+      chainId,
+  );
+
+  const [isDeactivating, setIsDeactivating] = useState(false);
+  const [isActivating, setIsActivating] = useState(false);
+
+  const deactivateAsset =
+    useCallback(async (): Promise<AssetActivationActionResult> => {
+      if (
+        !canDeactivate ||
+        !resolvedAccountId ||
+        !chainId ||
+        !isCaipAssetType(assetId)
+      ) {
+        return CANCELLED_RESULT;
+      }
+
+      const hasNonZeroBalance = Boolean(balanceAmount && balanceAmount !== '0');
+      const balanceDisplay = balanceAmount ?? '0';
+
+      setIsDeactivating(true);
+      try {
+        if (hasNonZeroBalance) {
+          return {
+            success: false,
+            errorMessage: strings(
+              'asset_activation.deactivate_error_non_zero_balance_stellar',
+              {
+                balance: balanceDisplay,
+                symbol: assetSymbol,
+              },
+            ),
+          };
+        }
+        await requestStellarChangeTrustOptDelete({
+          accountId: resolvedAccountId,
+          assetId,
+          scope: chainId,
+        });
+        return { success: true, errorMessage: null };
+      } catch (error: unknown) {
+        const errorCode = (error as { code?: number })?.code;
+        const isUserRejection =
+          errorCode === errorCodes.provider.userRejectedRequest;
+        if (isUserRejection) {
+          return CANCELLED_RESULT;
+        }
+        return {
+          success: false,
+          errorMessage: strings('asset_activation.deactivate_error'),
+        };
+      } finally {
+        setIsDeactivating(false);
+      }
+    }, [
+      assetId,
+      assetSymbol,
+      balanceAmount,
+      canDeactivate,
+      chainId,
+      resolvedAccountId,
+    ]);
+
+  const activateAsset =
+    useCallback(async (): Promise<AssetActivationActionResult> => {
+      // Non-classic / already-active assets have requiresActivate === false.
+      if (
+        !resolvedAccountId ||
+        !chainId ||
+        !isCaipAssetType(assetId) ||
+        !requiresActivate
+      ) {
+        return CANCELLED_RESULT;
+      }
+
+      setIsActivating(true);
+      try {
+        const result = await requestStellarChangeTrustOptAdd({
+          accountId: resolvedAccountId,
+          assetId,
+          scope: chainId,
+        });
+
+        if (result.status === false) {
+          // Snap showed the account funding prompt; no trustline tx was submitted.
+          return CANCELLED_RESULT;
+        }
+        return { success: true, errorMessage: null };
+      } catch (error: unknown) {
+        const errorCode = (error as { code?: number })?.code;
+        const isUserRejection =
+          errorCode === errorCodes.provider.userRejectedRequest;
+        if (isUserRejection) {
+          return CANCELLED_RESULT;
+        }
+        return {
+          success: false,
+          errorMessage: strings('asset_activation.activate_error'),
+        };
+      } finally {
+        setIsActivating(false);
+      }
+    }, [assetId, chainId, requiresActivate, resolvedAccountId]);
+
+  return {
+    activateAsset,
+    deactivateAsset,
+    canDeactivate,
+    requiresActivate,
+    isActivating,
+    isDeactivating,
+  };
+};
diff --git a/app/components/UI/TokenDetails/hooks/usePerpsActions.test.ts b/app/components/UI/TokenDetails/hooks/usePerpsActions.test.ts
index 332dfd1c2151..46818ded3c90 100644
--- a/app/components/UI/TokenDetails/hooks/usePerpsActions.test.ts
+++ b/app/components/UI/TokenDetails/hooks/usePerpsActions.test.ts
@@ -2,6 +2,7 @@ import { renderHook } from '@testing-library/react-native';
 import { useNavigation } from '@react-navigation/native';
 import { usePerpsActions } from './usePerpsActions';
 import { usePerpsMarketForAsset } from '../../Perps/hooks/usePerpsMarketForAsset';
+import { useIsPerpsProModeActive } from '../../Perps/utils/perpsModeSwitch';
 import Routes from '../../../../constants/navigation/Routes';
 
 jest.mock('@react-navigation/native', () => ({
@@ -13,13 +14,19 @@ jest.mock('../../Perps/hooks/usePerpsMarketForAsset', () => ({
   usePerpsMarketForAsset: jest.fn(),
 }));
 
+jest.mock('../../Perps/utils/perpsModeSwitch', () => ({
+  useIsPerpsProModeActive: jest.fn(),
+}));
+
 const mockNavigate = jest.fn();
 const mockUseNavigation = jest.mocked(useNavigation);
 const mockUsePerpsMarketForAsset = jest.mocked(usePerpsMarketForAsset);
+const mockUseIsPerpsProModeActive = jest.mocked(useIsPerpsProModeActive);
 
 describe('usePerpsActions', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUseIsPerpsProModeActive.mockReturnValue(false);
     mockUseNavigation.mockReturnValue({ navigate: mockNavigate } as never);
   });
 
@@ -129,6 +136,40 @@ describe('usePerpsActions', () => {
     });
   });
 
+  it('opens the Pro market with the side preselected while Pro mode is active', () => {
+    // Arrange
+    mockUseIsPerpsProModeActive.mockReturnValue(true);
+    const marketData = {
+      symbol: 'ETH',
+      name: 'ETH',
+      maxLeverage: '50x',
+      price: '',
+      change24h: '',
+      change24hPercent: '',
+      volume: '',
+    };
+    mockUsePerpsMarketForAsset.mockReturnValue({
+      hasPerpsMarket: true,
+      marketData,
+      isLoading: false,
+      error: null,
+    });
+
+    const { result } = renderHook(() => usePerpsActions({ symbol: 'ETH' }));
+
+    // Act
+    result.current.handlePerpsAction?.('short');
+
+    // Assert
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+      screen: Routes.PERPS.MARKET_DETAILS,
+      params: expect.objectContaining({
+        market: marketData,
+        direction: 'short',
+      }),
+    });
+  });
+
   it('passes null symbol through to usePerpsMarketForAsset', () => {
     // Arrange
     mockUsePerpsMarketForAsset.mockReturnValue({
diff --git a/app/components/UI/TokenDetails/hooks/usePerpsActions.ts b/app/components/UI/TokenDetails/hooks/usePerpsActions.ts
index f795eeb3aaa9..6b4f33798bf3 100644
--- a/app/components/UI/TokenDetails/hooks/usePerpsActions.ts
+++ b/app/components/UI/TokenDetails/hooks/usePerpsActions.ts
@@ -6,8 +6,12 @@ import {
   type UsePerpsMarketForAssetResult,
 } from '../../Perps/hooks/usePerpsMarketForAsset';
 import Routes from '../../../../constants/navigation/Routes';
+import { useIsPerpsProModeActive } from '../../Perps/utils/perpsModeSwitch';
 import type { TransactionActiveAbTestEntry } from '../../../../util/transactions/transaction-active-ab-test-attribution-registry';
-import type { OrderDirection } from '@metamask/perps-controller';
+import {
+  PERPS_EVENT_VALUE,
+  type OrderDirection,
+} from '@metamask/perps-controller';
 
 export interface UsePerpsActionsParams {
   /** Token symbol, or null to skip the perps market check */
@@ -29,7 +33,7 @@ export interface UsePerpsActionsResult extends UsePerpsMarketForAssetResult {
  * Provides navigation handlers for opening long/short perps positions
  * from the token details screen.
  *
- * Navigation flow:
+ * Navigation flow (Lite mode):
  * 1. User clicks Long/Short button in Token Details
  * 2. Navigate to PerpsOrderRedirect (inside Perps stack, so WebSocket initializes)
  * 3. PerpsOrderRedirect waits for connection, calls depositWithOrder()
@@ -40,6 +44,10 @@ export interface UsePerpsActionsResult extends UsePerpsMarketForAssetResult {
  * - depositWithOrder() requires WebSocket to be initialized
  * - WebSocket only initializes inside PerpsConnectionProvider (wraps Perps stack)
  *
+ * In Pro mode the order form lives on the market screen itself, so Long/Short
+ * opens that screen with the side preselected rather than the Lite one-click
+ * order flow.
+ *
  * @param params - Token symbol (pass null to disable perps market lookup)
  * @returns Object with hasPerpsMarket, marketData, isLoading, error, handlePerpsAction
  */
@@ -49,6 +57,7 @@ export const usePerpsActions = ({
   transactionActiveAbTests,
 }: UsePerpsActionsParams): UsePerpsActionsResult => {
   const navigation = useNavigation<AppNavigationProp>();
+  const isProModeActive = useIsPerpsProModeActive();
 
   const { hasPerpsMarket, marketData, isLoading, error } =
     usePerpsMarketForAsset(symbol);
@@ -57,6 +66,24 @@ export const usePerpsActions = ({
     (direction: OrderDirection) => {
       if (!marketData) return;
 
+      // Pro mode places orders from the inline form on the market screen, so
+      // the one-click Lite order flow would drop the user into the wrong
+      // experience. Open the Pro market with the side preselected instead.
+      if (isProModeActive) {
+        navigation.navigate(Routes.PERPS.ROOT, {
+          screen: Routes.PERPS.MARKET_DETAILS,
+          params: {
+            market: marketData,
+            direction,
+            source: PERPS_EVENT_VALUE.SOURCE.ASSET_DETAIL_SCREEN,
+            ...(transactionActiveAbTests?.length
+              ? { transactionActiveAbTests }
+              : {}),
+          },
+        });
+        return;
+      }
+
       // Navigate to the Perps stack, targeting PerpsOrderRedirect
       // This ensures WebSocket is initialized before calling depositWithOrder()
       navigation.navigate(Routes.PERPS.ROOT, {
@@ -71,7 +98,13 @@ export const usePerpsActions = ({
         },
       });
     },
-    [navigation, marketData, fromTokenDetails, transactionActiveAbTests],
+    [
+      navigation,
+      marketData,
+      isProModeActive,
+      fromTokenDetails,
+      transactionActiveAbTests,
+    ],
   );
 
   return useMemo(
diff --git a/app/components/UI/TokenDetails/hooks/useSpendableBalance.test.ts b/app/components/UI/TokenDetails/hooks/useSpendableBalance.test.ts
new file mode 100644
index 000000000000..964f33cd369f
--- /dev/null
+++ b/app/components/UI/TokenDetails/hooks/useSpendableBalance.test.ts
@@ -0,0 +1,106 @@
+import { XlmScope } from '@metamask/keyring-api';
+import type { CaipAssetType } from '@metamask/utils';
+import { renderHook } from '@testing-library/react-hooks';
+
+import { getSpendableForAccount } from '../../../../selectors/stellar/stellar-assets';
+import { useSpendableBalance } from './useSpendableBalance';
+
+jest.mock('react-redux', () => ({
+  useSelector: <State, Result>(selector: (state: State) => Result): Result =>
+    selector({} as State),
+}));
+
+jest.mock('../../../../selectors/stellar/stellar-assets', () => ({
+  ...jest.requireActual('../../../../selectors/stellar/stellar-assets'),
+  getSpendableForAccount: jest.fn(),
+}));
+
+const STELLAR_NATIVE_ASSET_ID =
+  `${XlmScope.Pubnet}/slip44:148` as CaipAssetType;
+
+describe('useSpendableBalance', () => {
+  const getSpendableForAccountMock =
+    getSpendableForAccount as unknown as jest.Mock;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns spendable balance data for supported native assets', () => {
+    getSpendableForAccountMock.mockReturnValue({
+      minimumReserveBalance: '2.5',
+      spendableBalance: '247.5',
+    });
+
+    const { result } = renderHook(() =>
+      useSpendableBalance({
+        assetId: STELLAR_NATIVE_ASSET_ID,
+      }),
+    );
+
+    expect(getSpendableForAccountMock).toHaveBeenCalledWith(
+      {},
+      { assetId: STELLAR_NATIVE_ASSET_ID },
+    );
+    expect(result.current).toStrictEqual({
+      hasSpendableBalance: true,
+      minimumReserveBalance: '2.5',
+      spendableBalance: '247.5',
+    });
+  });
+
+  it('returns hasSpendableBalance false when spendable info is unavailable', () => {
+    getSpendableForAccountMock.mockReturnValue(undefined);
+
+    const { result } = renderHook(() =>
+      useSpendableBalance({
+        assetId: STELLAR_NATIVE_ASSET_ID,
+      }),
+    );
+
+    expect(result.current).toStrictEqual({
+      hasSpendableBalance: false,
+      minimumReserveBalance: undefined,
+      spendableBalance: undefined,
+    });
+  });
+
+  it('returns hasSpendableBalance false for assets that do not support spendable balance', () => {
+    getSpendableForAccountMock.mockReturnValue(undefined);
+
+    const { result } = renderHook(() =>
+      useSpendableBalance({
+        assetId: 'eip155:1/slip44:60',
+      }),
+    );
+
+    expect(getSpendableForAccountMock).toHaveBeenCalledWith(
+      {},
+      { assetId: 'eip155:1/slip44:60' },
+    );
+    expect(result.current).toStrictEqual({
+      hasSpendableBalance: false,
+      minimumReserveBalance: undefined,
+      spendableBalance: undefined,
+    });
+  });
+
+  it('returns hasSpendableBalance true when spendable balance is zero', () => {
+    getSpendableForAccountMock.mockReturnValue({
+      minimumReserveBalance: '1',
+      spendableBalance: '0',
+    });
+
+    const { result } = renderHook(() =>
+      useSpendableBalance({
+        assetId: STELLAR_NATIVE_ASSET_ID,
+      }),
+    );
+
+    expect(result.current).toStrictEqual({
+      hasSpendableBalance: true,
+      minimumReserveBalance: '1',
+      spendableBalance: '0',
+    });
+  });
+});
diff --git a/app/components/UI/TokenDetails/hooks/useSpendableBalance.ts b/app/components/UI/TokenDetails/hooks/useSpendableBalance.ts
new file mode 100644
index 000000000000..f93e16f07a7e
--- /dev/null
+++ b/app/components/UI/TokenDetails/hooks/useSpendableBalance.ts
@@ -0,0 +1,49 @@
+import { useSelector } from 'react-redux';
+
+import { getSpendableForAccount } from '../../../../selectors/stellar/stellar-assets';
+
+type UseSpendableBalanceResult =
+  | {
+      hasSpendableBalance: true;
+      minimumReserveBalance: string;
+      spendableBalance: string;
+    }
+  | {
+      hasSpendableBalance: false;
+      minimumReserveBalance: undefined;
+      spendableBalance: undefined;
+    };
+
+/**
+ * Resolves native spendable balance data for the selected account and asset.
+ *
+ * @param params - Hook parameters.
+ * @param params.assetId - Asset id for the native asset.
+ * @returns Minimum reserve and spendable balance when available.
+ */
+export const useSpendableBalance = ({
+  assetId,
+}: {
+  assetId: string;
+}): UseSpendableBalanceResult => {
+  const spendableInfo = useSelector((state) =>
+    getSpendableForAccount(state, { assetId }),
+  );
+
+  if (
+    spendableInfo?.minimumReserveBalance !== undefined &&
+    spendableInfo?.spendableBalance !== undefined
+  ) {
+    return {
+      hasSpendableBalance: true,
+      minimumReserveBalance: spendableInfo.minimumReserveBalance,
+      spendableBalance: spendableInfo.spendableBalance,
+    };
+  }
+
+  return {
+    hasSpendableBalance: false,
+    minimumReserveBalance: undefined,
+    spendableBalance: undefined,
+  };
+};
diff --git a/app/components/UI/TokenDetails/hooks/useTokenTransactions.test.ts b/app/components/UI/TokenDetails/hooks/useTokenTransactions.test.ts
index c2f90b31be84..6921294a98a1 100644
--- a/app/components/UI/TokenDetails/hooks/useTokenTransactions.test.ts
+++ b/app/components/UI/TokenDetails/hooks/useTokenTransactions.test.ts
@@ -3,10 +3,8 @@ import { useSelector } from 'react-redux';
 import { useTokenTransactions } from './useTokenTransactions';
 import { TokenI } from '../../Tokens/types';
 import { TX_CONFIRMED } from '../../../../constants/transaction';
-import {
-  selectTransactions,
-  selectSwapsTransactions,
-} from '../../../../selectors/transactionController';
+import { selectTransactions } from '../../../../selectors/transactionController';
+import { selectBridgeHistoryForAccount } from '../../../../selectors/bridgeStatusController';
 import { selectIsActivityRedesignEnabled } from '../../../../selectors/featureFlagController/activityRedesign';
 import { selectTokens } from '../../../../selectors/tokensController';
 import { selectSelectedInternalAccount } from '../../../../selectors/accountsController';
@@ -16,12 +14,18 @@ import {
   selectCurrentCurrency,
 } from '../../../../selectors/currencyRateController';
 import { TransactionType } from '@metamask/transaction-controller';
+import { formatChainIdToCaip } from '@metamask/bridge-controller';
+import { isNonEvmChainId } from '../../../../core/Multichain/utils';
+import { selectNonEvmTransactionsForSelectedAccountGroup } from '../../../../selectors/multichain';
 
 jest.mock('react-redux', () => ({
   useSelector: jest.fn(),
 }));
 
 jest.mock('@metamask/bridge-controller', () => ({
+  // Real `formatChainIdToHex` / `isNonEvmChainId` so `getMaybeHexChainId`
+  // normalizes destination chain ids for real in these tests.
+  ...jest.requireActual('@metamask/bridge-controller'),
   formatChainIdToCaip: jest.fn((chainId: string) => `eip155:${chainId}`),
 }));
 
@@ -79,6 +83,10 @@ jest.mock('../../../../selectors/multichain', () => ({
   selectNonEvmTransactionsForSelectedAccountGroup: jest.fn(),
 }));
 
+jest.mock('../../../../selectors/bridgeStatusController', () => ({
+  selectBridgeHistoryForAccount: jest.fn(),
+}));
+
 jest.mock('../../../../selectors/accountTrackerController', () => ({
   selectAccounts: jest.fn(),
   selectAccountsByChainId: jest.fn(),
@@ -107,6 +115,12 @@ const MOCK_RECIPIENT = '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd';
 const MONAD_CHAIN_ID = '0x279f';
 const ETH_CHAIN_ID = '0x1';
 const MOCK_TOKEN_ADDRESS = '0x6b175474e89094c44da98b954eedeac495271d0f';
+const NATIVE_ADDRESS = '0x0000000000000000000000000000000000000000';
+const SOLANA_CHAIN_ID = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';
+const SOL_ASSET_ID = `${SOLANA_CHAIN_ID}/slip44:501`;
+const USDC_ADDRESS = 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
+const USDC_ASSET_ID = `${SOLANA_CHAIN_ID}/token:${USDC_ADDRESS}`;
+const SOLANA_ADDRESS = '7S3P4HxJpyyigGzodYwHtCxZyUQe9JiBMHyRWXArAaKv';
 
 const mockUseSelector = jest.mocked(useSelector);
 
@@ -139,11 +153,14 @@ const createAsset = (overrides: Partial<TokenI> = {}): TokenI => ({
 
 const setupMocks = (
   transactions: unknown[] = [],
-  { isActivityRedesignEnabled = false } = {},
+  {
+    isActivityRedesignEnabled = false,
+    bridgeHistory = {} as Record<string, unknown>,
+  } = {},
 ) => {
   mockUseSelector.mockImplementation((selector) => {
     if (selector === selectTransactions) return transactions;
-    if (selector === selectSwapsTransactions) return {};
+    if (selector === selectBridgeHistoryForAccount) return bridgeHistory;
     if (selector === selectIsActivityRedesignEnabled)
       return isActivityRedesignEnabled;
     if (selector === selectTokens) return [];
@@ -405,4 +422,706 @@ describe('useTokenTransactions', () => {
       ]);
     });
   });
+
+  describe('EVM swaps on ERC-20 token pages', () => {
+    const SWAP_ROUTER = '0x0439e60f02a8900a951603950d8d4527f400c3f1';
+    const DAI_ADDRESS = MOCK_TOKEN_ADDRESS;
+    const UNRELATED_TOKEN = '0x111111111117dc0aa78b770fa6a738034120c302';
+
+    // Unified swaps route through the bridge/swaps router, so `txParams.to` is
+    // never the token contract and the tx is not an ERC-20 transfer.
+    const createSwapTransaction = (overrides: Record<string, unknown> = {}) =>
+      createMockTransaction({
+        id: 'swap-1',
+        type: TransactionType.swap,
+        txParams: { from: MOCK_ADDRESS, to: SWAP_ROUTER },
+        ...overrides,
+      });
+
+    const createQuoteBridgeHistory = ({
+      txId = 'swap-1',
+      srcAddress,
+      destAddress,
+    }: {
+      txId?: string;
+      srcAddress: string;
+      destAddress: string;
+    }) => ({
+      [txId]: {
+        quote: {
+          srcChainId: ETH_CHAIN_ID,
+          destChainId: ETH_CHAIN_ID,
+          srcAsset: { address: srcAddress, symbol: 'SRC' },
+          destAsset: { address: destAddress, symbol: 'DST' },
+        },
+      },
+    });
+
+    const erc20Asset = (address: string, symbol: string) =>
+      createAsset({
+        symbol,
+        isETH: false,
+        isNative: false,
+        address,
+        chainId: ETH_CHAIN_ID,
+      });
+
+    it('includes a swap on the source token page', async () => {
+      setupMocks([createSwapTransaction()], {
+        bridgeHistory: createQuoteBridgeHistory({
+          srcAddress: DAI_ADDRESS,
+          destAddress: NATIVE_ADDRESS,
+        }),
+      });
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(erc20Asset(DAI_ADDRESS, 'DAI')),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions.map((tx) => tx.id)).toEqual([
+        'swap-1',
+      ]);
+    });
+
+    it('includes a swap on the destination token page', async () => {
+      setupMocks([createSwapTransaction()], {
+        bridgeHistory: createQuoteBridgeHistory({
+          srcAddress: NATIVE_ADDRESS,
+          destAddress: DAI_ADDRESS,
+        }),
+      });
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(erc20Asset(DAI_ADDRESS, 'DAI')),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions.map((tx) => tx.id)).toEqual([
+        'swap-1',
+      ]);
+    });
+
+    it('resolves bridge history keyed by actionId rather than tx id', async () => {
+      setupMocks([createSwapTransaction({ actionId: 'action-1' })], {
+        bridgeHistory: createQuoteBridgeHistory({
+          txId: 'action-1',
+          srcAddress: DAI_ADDRESS,
+          destAddress: NATIVE_ADDRESS,
+        }),
+      });
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(erc20Asset(DAI_ADDRESS, 'DAI')),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions.map((tx) => tx.id)).toEqual([
+        'swap-1',
+      ]);
+    });
+
+    it('excludes a swap between two unrelated tokens', async () => {
+      setupMocks([createSwapTransaction()], {
+        bridgeHistory: createQuoteBridgeHistory({
+          srcAddress: UNRELATED_TOKEN,
+          destAddress: NATIVE_ADDRESS,
+        }),
+      });
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(erc20Asset(DAI_ADDRESS, 'DAI')),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions).toEqual([]);
+    });
+
+    it('includes a bridge whose source leg is this token', async () => {
+      setupMocks([createSwapTransaction({ type: TransactionType.bridge })], {
+        bridgeHistory: {
+          'swap-1': {
+            quote: {
+              srcChainId: ETH_CHAIN_ID,
+              destChainId: '0x2105',
+              srcAsset: { address: DAI_ADDRESS, symbol: 'DAI' },
+              destAsset: { address: DAI_ADDRESS, symbol: 'DAI' },
+            },
+          },
+        },
+      });
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(erc20Asset(DAI_ADDRESS, 'DAI')),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions.map((tx) => tx.id)).toEqual([
+        'swap-1',
+      ]);
+    });
+
+    it('falls back to swap symbols for legacy transactions with no bridge history', async () => {
+      setupMocks([
+        createSwapTransaction({
+          swapMetaData: { token_from: 'DAI', token_to: 'ETH' },
+        }),
+      ]);
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(erc20Asset(DAI_ADDRESS, 'DAI')),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions.map((tx) => tx.id)).toEqual([
+        'swap-1',
+      ]);
+    });
+
+    it('ignores the symbol fallback when the quote already names both legs', async () => {
+      setupMocks(
+        [
+          createSwapTransaction({
+            // An impostor token sharing DAI's symbol must not hijack the page
+            // when the quote gives authoritative addresses.
+            sourceTokenSymbol: 'DAI',
+          }),
+        ],
+        {
+          bridgeHistory: createQuoteBridgeHistory({
+            srcAddress: UNRELATED_TOKEN,
+            destAddress: NATIVE_ADDRESS,
+          }),
+        },
+      );
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(erc20Asset(DAI_ADDRESS, 'DAI')),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions).toEqual([]);
+    });
+
+    it('does not treat non-swap transactions as swaps', async () => {
+      setupMocks([
+        createSwapTransaction({
+          type: TransactionType.contractInteraction,
+          swapMetaData: { token_from: 'DAI', token_to: 'ETH' },
+        }),
+      ]);
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(erc20Asset(DAI_ADDRESS, 'DAI')),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions).toEqual([]);
+    });
+  });
+
+  describe('bridge arrivals on the destination chain page', () => {
+    const BASE_CHAIN_ID = '0x2105';
+    const DAI_ADDRESS = MOCK_TOKEN_ADDRESS;
+    const UNRELATED_TOKEN = '0x111111111117dc0aa78b770fa6a738034120c302';
+
+    // Source tx lives on Base; the destination leg has no local tx at all.
+    const createBaseBridge = (destAsset: { address: string; symbol: string }) =>
+      createMockTransaction({
+        id: 'bridge-1',
+        chainId: BASE_CHAIN_ID,
+        type: TransactionType.bridge,
+        txParams: { from: MOCK_ADDRESS, to: MOCK_RECIPIENT },
+      });
+
+    const bridgeHistoryTo = (
+      destChainId: unknown,
+      destAddress: string,
+      destSymbol = 'DST',
+    ) => ({
+      'bridge-1': {
+        quote: {
+          srcChainId: 8453,
+          destChainId,
+          srcAsset: { address: UNRELATED_TOKEN, symbol: 'USDC' },
+          destAsset: { address: destAddress, symbol: destSymbol },
+        },
+      },
+    });
+
+    const nativeAsset = (chainIdValue: string) =>
+      createAsset({
+        symbol: 'ETH',
+        isETH: true,
+        isNative: true,
+        address: NATIVE_ADDRESS,
+        chainId: chainIdValue,
+      });
+
+    it('shows a bridge arriving as native on the destination native page', async () => {
+      setupMocks(
+        [createBaseBridge({ address: NATIVE_ADDRESS, symbol: 'ETH' })],
+        {
+          // Quotes carry EVM chain ids as numbers.
+          bridgeHistory: bridgeHistoryTo(1, NATIVE_ADDRESS, 'ETH'),
+        },
+      );
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(nativeAsset(ETH_CHAIN_ID)),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions.map((tx) => tx.id)).toEqual([
+        'bridge-1',
+      ]);
+    });
+
+    it('shows a bridge arriving as an ERC-20 on the destination token page', async () => {
+      setupMocks([createBaseBridge({ address: DAI_ADDRESS, symbol: 'DAI' })], {
+        bridgeHistory: bridgeHistoryTo(1, DAI_ADDRESS, 'DAI'),
+      });
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(
+          createAsset({
+            symbol: 'DAI',
+            isETH: false,
+            isNative: false,
+            address: DAI_ADDRESS,
+            chainId: ETH_CHAIN_ID,
+          }),
+        ),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions.map((tx) => tx.id)).toEqual([
+        'bridge-1',
+      ]);
+    });
+
+    it('accepts a hex destChainId as well as a number', async () => {
+      setupMocks(
+        [createBaseBridge({ address: NATIVE_ADDRESS, symbol: 'ETH' })],
+        {
+          bridgeHistory: bridgeHistoryTo('0x1', NATIVE_ADDRESS, 'ETH'),
+        },
+      );
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(nativeAsset(ETH_CHAIN_ID)),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions.map((tx) => tx.id)).toEqual([
+        'bridge-1',
+      ]);
+    });
+
+    it('does not show it on an unrelated token page on the destination chain', async () => {
+      setupMocks([createBaseBridge({ address: DAI_ADDRESS, symbol: 'DAI' })], {
+        bridgeHistory: bridgeHistoryTo(1, DAI_ADDRESS, 'DAI'),
+      });
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(
+          createAsset({
+            symbol: 'ONE',
+            isETH: false,
+            isNative: false,
+            address: UNRELATED_TOKEN,
+            chainId: ETH_CHAIN_ID,
+          }),
+        ),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions).toEqual([]);
+    });
+
+    it('does not show it on a native page of some third chain', async () => {
+      setupMocks(
+        [createBaseBridge({ address: NATIVE_ADDRESS, symbol: 'ETH' })],
+        {
+          bridgeHistory: bridgeHistoryTo(1, NATIVE_ADDRESS, 'ETH'),
+        },
+      );
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(nativeAsset(MONAD_CHAIN_ID)),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions).toEqual([]);
+    });
+
+    it('ignores a non-EVM CAIP destination rather than mis-matching it', async () => {
+      setupMocks(
+        [createBaseBridge({ address: NATIVE_ADDRESS, symbol: 'SOL' })],
+        {
+          bridgeHistory: bridgeHistoryTo(
+            SOLANA_CHAIN_ID,
+            NATIVE_ADDRESS,
+            'SOL',
+          ),
+        },
+      );
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(nativeAsset(ETH_CHAIN_ID)),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions).toEqual([]);
+    });
+
+    it('does not treat a non-bridge type as an arrival', async () => {
+      setupMocks(
+        [
+          createMockTransaction({
+            id: 'bridge-1',
+            chainId: BASE_CHAIN_ID,
+            type: TransactionType.swap,
+            txParams: { from: MOCK_ADDRESS, to: MOCK_RECIPIENT },
+          }),
+        ],
+        { bridgeHistory: bridgeHistoryTo(1, NATIVE_ADDRESS, 'ETH') },
+      );
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(nativeAsset(ETH_CHAIN_ID)),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions).toEqual([]);
+    });
+  });
+
+  describe('bridge arrivals on a non-EVM destination page', () => {
+    const SOLANA_NUMERIC_CHAIN_ID = 1151111081099710;
+
+    const setupSolanaPageMocks = (
+      bridgeHistory: Record<string, unknown>,
+      evmTxs: unknown[],
+    ) => {
+      jest.mocked(isNonEvmChainId).mockReturnValue(true);
+      jest
+        .mocked(formatChainIdToCaip)
+        .mockImplementation((chainId: unknown) =>
+          chainId === SOLANA_NUMERIC_CHAIN_ID || chainId === SOLANA_CHAIN_ID
+            ? (SOLANA_CHAIN_ID as never)
+            : (`eip155:${chainId}` as never),
+        );
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectTransactions) return evmTxs;
+        if (selector === selectBridgeHistoryForAccount) return bridgeHistory;
+        if (selector === selectIsActivityRedesignEnabled) return true;
+        if (selector === selectTokens) return [];
+        if (selector === selectSelectedInternalAccount) {
+          return { address: SOLANA_ADDRESS, metadata: { importTime: 0 } };
+        }
+        if (selector === selectSelectedInternalAccountByScope) {
+          return () => ({ address: SOLANA_ADDRESS });
+        }
+        if (selector === selectNonEvmTransactionsForSelectedAccountGroup) {
+          return { transactions: [] };
+        }
+        if (selector === selectConversionRate) return 1;
+        if (selector === selectCurrentCurrency) return 'usd';
+        return SOLANA_ADDRESS;
+      });
+    };
+
+    const evmBridgeTx = {
+      id: 'bridge-arrival-1',
+      chainId: '0x2105',
+      hash: '0xbase-source',
+      status: TX_CONFIRMED,
+      time: 5,
+      type: TransactionType.bridge,
+      txParams: { from: MOCK_ADDRESS, to: MOCK_RECIPIENT },
+    };
+
+    const historyTo = (destAssetId: string) => ({
+      'bridge-arrival-1': {
+        quote: {
+          srcChainId: 8453,
+          destChainId: SOLANA_NUMERIC_CHAIN_ID,
+          srcAsset: { chainId: 8453, assetId: 'eip155:8453/erc20:0xusdc' },
+          destAsset: {
+            chainId: SOLANA_NUMERIC_CHAIN_ID,
+            assetId: destAssetId,
+          },
+        },
+      },
+    });
+
+    const solanaAsset = (overrides: Partial<TokenI>) =>
+      createAsset({ chainId: SOLANA_CHAIN_ID, isETH: false, ...overrides });
+
+    it('returns an EVM bridge whose destination is this native non-EVM asset', async () => {
+      setupSolanaPageMocks(historyTo(SOL_ASSET_ID), [evmBridgeTx]);
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(
+          solanaAsset({ symbol: 'SOL', isNative: true, address: SOL_ASSET_ID }),
+        ),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.bridgeArrivalTxs.map((tx) => tx.id)).toEqual([
+        'bridge-arrival-1',
+      ]);
+    });
+
+    it('returns an EVM bridge whose destination is this non-EVM token', async () => {
+      setupSolanaPageMocks(historyTo(USDC_ASSET_ID), [evmBridgeTx]);
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(
+          solanaAsset({
+            symbol: 'USDC',
+            isNative: false,
+            address: USDC_ADDRESS,
+          }),
+        ),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.bridgeArrivalTxs.map((tx) => tx.id)).toEqual([
+        'bridge-arrival-1',
+      ]);
+    });
+
+    it('excludes a bridge whose destination asset is a different non-EVM token', async () => {
+      setupSolanaPageMocks(historyTo(USDC_ASSET_ID), [evmBridgeTx]);
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(
+          solanaAsset({ symbol: 'SOL', isNative: true, address: SOL_ASSET_ID }),
+        ),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.bridgeArrivalTxs).toEqual([]);
+    });
+
+    it('excludes a non-bridge EVM transaction', async () => {
+      setupSolanaPageMocks(historyTo(SOL_ASSET_ID), [
+        { ...evmBridgeTx, type: TransactionType.swap },
+      ]);
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(
+          solanaAsset({ symbol: 'SOL', isNative: true, address: SOL_ASSET_ID }),
+        ),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.bridgeArrivalTxs).toEqual([]);
+    });
+
+    it('returns nothing for an EVM asset page', async () => {
+      setupMocks([evmBridgeTx], { bridgeHistory: historyTo(SOL_ASSET_ID) });
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(
+          createAsset({ symbol: 'ETH', isETH: true, isNative: true }),
+        ),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.bridgeArrivalTxs).toEqual([]);
+    });
+  });
+
+  describe('non-EVM asset filtering', () => {
+    const setupNonEvmMocks = (transactions: unknown[]) => {
+      jest.mocked(isNonEvmChainId).mockReturnValue(true);
+      jest
+        .mocked(formatChainIdToCaip)
+        .mockImplementation((chainId: unknown) => chainId as never);
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectTransactions) return [];
+        if (selector === selectBridgeHistoryForAccount) return {};
+        if (selector === selectIsActivityRedesignEnabled) return true;
+        if (selector === selectTokens) return [];
+        if (selector === selectSelectedInternalAccount) {
+          return { address: SOLANA_ADDRESS, metadata: { importTime: 0 } };
+        }
+        if (selector === selectSelectedInternalAccountByScope) {
+          return () => ({ address: SOLANA_ADDRESS });
+        }
+        if (selector === selectNonEvmTransactionsForSelectedAccountGroup) {
+          return { transactions };
+        }
+        if (selector === selectConversionRate) return 1;
+        if (selector === selectCurrentCurrency) return 'usd';
+        return SOLANA_ADDRESS;
+      });
+    };
+
+    const createSolanaMovement = (assetType: string, unit: string) => ({
+      address: SOLANA_ADDRESS,
+      asset: { fungible: true, amount: '1', unit, type: assetType },
+    });
+
+    // SOL -> USDC swap: the native leg leaves, the token leg arrives.
+    const createSolanaSwap = (id: string) => ({
+      id,
+      chain: SOLANA_CHAIN_ID,
+      status: TX_CONFIRMED,
+      time: 2,
+      from: [createSolanaMovement(SOL_ASSET_ID, 'SOL')],
+      to: [createSolanaMovement(USDC_ASSET_ID, 'USDC')],
+    });
+
+    const createSolanaTokenSend = (id: string) => ({
+      id,
+      chain: SOLANA_CHAIN_ID,
+      status: TX_CONFIRMED,
+      time: 1,
+      from: [createSolanaMovement(USDC_ASSET_ID, 'USDC')],
+      to: [createSolanaMovement(USDC_ASSET_ID, 'USDC')],
+    });
+
+    const solanaAsset = (overrides: Partial<TokenI>) =>
+      createAsset({
+        chainId: SOLANA_CHAIN_ID,
+        isETH: false,
+        ...overrides,
+      });
+
+    it('includes a swap on the native token page even though it moves a non-native leg', async () => {
+      setupNonEvmMocks([createSolanaSwap('swap-native-page')]);
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(
+          solanaAsset({
+            symbol: 'SOL',
+            name: 'Solana',
+            isNative: true,
+            address: SOL_ASSET_ID,
+          }),
+        ),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions.map((tx) => tx.id)).toEqual([
+        'swap-native-page',
+      ]);
+    });
+
+    it('includes the same swap on the destination token page', async () => {
+      setupNonEvmMocks([createSolanaSwap('swap-token-page')]);
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(
+          solanaAsset({
+            symbol: 'USDC',
+            name: 'USD Coin',
+            isNative: false,
+            address: USDC_ADDRESS,
+          }),
+        ),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions.map((tx) => tx.id)).toEqual([
+        'swap-token-page',
+      ]);
+    });
+
+    it('excludes a token-only transfer from the native token page', async () => {
+      setupNonEvmMocks([
+        createSolanaSwap('swap-mixed'),
+        createSolanaTokenSend('token-send-mixed'),
+      ]);
+
+      const { result } = renderHook(() =>
+        useTokenTransactions(
+          solanaAsset({
+            symbol: 'SOL',
+            name: 'Solana',
+            isNative: true,
+            address: SOL_ASSET_ID,
+          }),
+        ),
+      );
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.transactions.map((tx) => tx.id)).toEqual([
+        'swap-mixed',
+      ]);
+    });
+  });
 });
diff --git a/app/components/UI/TokenDetails/hooks/useTokenTransactions.ts b/app/components/UI/TokenDetails/hooks/useTokenTransactions.ts
index 69a0f260090d..9845a48787d8 100644
--- a/app/components/UI/TokenDetails/hooks/useTokenTransactions.ts
+++ b/app/components/UI/TokenDetails/hooks/useTokenTransactions.ts
@@ -9,7 +9,7 @@ import {
   TX_SUBMITTED,
   TX_UNAPPROVED,
 } from '../../../../constants/transaction';
-import FIRST_PARTY_CONTRACT_NAMES from '../../../../constants/first-party-contracts';
+import { NATIVE_SWAPS_TOKEN_ADDRESS } from '../../../../constants/bridge';
 import { selectTokens } from '../../../../selectors/tokensController';
 import { sortTransactions } from '../../../../util/activity';
 import {
@@ -18,10 +18,10 @@ import {
 } from '../../../../util/address';
 import { addAccountTimeFlagFilter } from '../../../../util/transactions';
 import { store } from '../../../../store';
-import {
-  selectSwapsTransactions,
-  selectTransactions,
-} from '../../../../selectors/transactionController';
+import { selectTransactions } from '../../../../selectors/transactionController';
+import { selectBridgeHistoryForAccount } from '../../../../selectors/bridgeStatusController';
+import { findBridgeHistoryItem } from '../../../../util/bridge/findBridgeHistoryItem';
+import { getMaybeHexChainId } from '../../../../util/bridge';
 import { selectIsActivityRedesignEnabled } from '../../../../selectors/featureFlagController/activityRedesign';
 import { TransactionType } from '@metamask/transaction-controller';
 import { TOKEN_CATEGORY_HASH } from '../../../UI/TransactionElement/utils';
@@ -78,9 +78,56 @@ export interface UseTokenTransactionsResult {
   conversionRate: number;
   currentCurrency: string;
   isNonEvmAsset: boolean;
+  bridgeArrivalTxs: Transaction[];
   onRefresh: () => Promise<void>;
 }
 
+/** Types that move two different assets, so they belong on both token pages. */
+const SWAP_LIKE_TRANSACTION_TYPES: string[] = [
+  TransactionType.swap,
+  TransactionType.swapAndSend,
+  TransactionType.bridge,
+];
+
+/**
+ * Both legs of a swap/bridge, by address and by symbol.
+ *
+ * Unified swaps keep token metadata in the bridge quote; older SwapsController
+ * txs recorded symbols only. Prefer `addresses` — `symbols` can match an
+ * impostor token.
+ */
+export const getSwapLegTokenIdentifiers = (
+  tx: Transaction,
+  bridgeHistoryItem?: { quote?: Record<string, Transaction> },
+): { addresses: string[]; symbols: string[] } => {
+  const quote = bridgeHistoryItem?.quote;
+
+  const normalize = (values: (string | undefined)[]) => [
+    ...new Set(
+      values
+        .filter((value): value is string => Boolean(value))
+        .map((value) => value.toLowerCase()),
+    ),
+  ];
+
+  return {
+    addresses: normalize([
+      quote?.srcAsset?.address,
+      quote?.destAsset?.address,
+      tx.sourceTokenAddress,
+      tx.destinationTokenAddress,
+    ]),
+    symbols: normalize([
+      quote?.srcAsset?.symbol,
+      quote?.destAsset?.symbol,
+      tx.sourceTokenSymbol,
+      tx.destinationTokenSymbol,
+      tx.swapMetaData?.token_from,
+      tx.swapMetaData?.token_to,
+    ]),
+  };
+};
+
 // Cache for non-EVM transactions
 // eslint-disable-next-line import-x/no-mutable-exports
 let cachedFilteredTransactions: Transaction[] | null = null;
@@ -125,7 +172,7 @@ export const useTokenTransactions = (
   const isActivityRedesignEnabled = useSelector(
     selectIsActivityRedesignEnabled,
   );
-  const swapsTransactions = useSelector(selectSwapsTransactions);
+  const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
   const tokens = useSelector(selectTokens);
   const conversionRate = useSelector(selectConversionRate);
   const currentCurrency = useSelector(selectCurrentCurrency);
@@ -193,34 +240,20 @@ export const useTokenTransactions = (
         filteredTransactions = txs;
 
         if (isNativeAsset) {
+          const nativeAssetId =
+            AVAILABLE_MULTICHAIN_NETWORK_CONFIGURATIONS[
+              asset.chainId as SupportedCaipChainId
+            ]?.nativeCurrency;
+
           filteredTransactions = txs.filter((tx: Transaction) => {
             const txData = (tx.from || []).concat(tx.to || []);
 
-            if (!txData || txData.length === 0) {
-              return false;
-            }
-
-            const participantsWithAssets = txData.filter(
+            return txData.some(
               (participant: { asset?: { type?: string } }) =>
-                participant.asset && typeof participant.asset === 'object',
+                participant.asset &&
+                typeof participant.asset === 'object' &&
+                participant.asset.type === nativeAssetId,
             );
-
-            if (participantsWithAssets.length === 0) {
-              return false;
-            }
-
-            const allParticipantsAreNative = participantsWithAssets.every(
-              (participant: { asset: { type: string } }) => {
-                const assetId = participant.asset.type;
-                const chainIdKey = asset.chainId as SupportedCaipChainId;
-                return (
-                  AVAILABLE_MULTICHAIN_NETWORK_CONFIGURATIONS[chainIdKey]
-                    ?.nativeCurrency === assetId
-                );
-              },
-            );
-
-            return allParticipantsAreNative;
           });
         } else if (assetAddress || assetSymbol) {
           filteredTransactions = txs.filter((tx: Transaction) => {
@@ -280,6 +313,70 @@ export const useTokenTransactions = (
     ///: END:ONLY_INCLUDE_IF
   ]);
 
+  ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
+  /**
+   * EVM bridge transactions arriving at this non-EVM asset.
+   *
+   * A bridge's only local tx is on the source chain, and this page's list is
+   * keyring txs from its own chain — so the receiving leg would never show.
+   * `isBridgeArrivalForCurrentToken` does the same job for EVM pages; it can't
+   * be reused here because it compares hex chain ids.
+   */
+  const bridgeArrivalTxs = useMemo(() => {
+    if (!isNonEvmAsset || !asset.chainId) {
+      return [] as Transaction[];
+    }
+
+    const nativeAssetId =
+      AVAILABLE_MULTICHAIN_NETWORK_CONFIGURATIONS[
+        asset.chainId as SupportedCaipChainId
+      ]?.nativeCurrency;
+    const assetAddress = asset.address?.toLowerCase();
+    const isNativeAsset = asset.isNative || asset.isETH;
+
+    return evmTransactions.filter((tx: Transaction) => {
+      if (tx.type !== TransactionType.bridge || tx.status === TX_UNAPPROVED) {
+        return false;
+      }
+
+      const quote = findBridgeHistoryItem({
+        bridgeHistory,
+        transactionMetaId: tx.id,
+        transactionActionId: tx.actionId,
+        transactionHash: tx.hash,
+      })?.quote;
+
+      if (quote?.destChainId === undefined || quote.destChainId === null) {
+        return false;
+      }
+
+      if (formatChainIdToCaip(quote.destChainId) !== asset.chainId) {
+        return false;
+      }
+
+      const destAssetId = quote.destAsset?.assetId?.toLowerCase();
+
+      if (isNativeAsset) {
+        return Boolean(
+          nativeAssetId && destAssetId === nativeAssetId.toLowerCase(),
+        );
+      }
+
+      return Boolean(
+        assetAddress && destAssetId && destAssetId.includes(assetAddress),
+      );
+    });
+  }, [
+    asset.address,
+    asset.chainId,
+    asset.isETH,
+    asset.isNative,
+    bridgeHistory,
+    evmTransactions,
+    isNonEvmAsset,
+  ]);
+  ///: END:ONLY_INCLUDE_IF
+
   // Wrapper for shared mUSD claim detection utility
   const checkIsMusdClaimForCurrentView = useCallback(
     (tx: Transaction): boolean =>
@@ -293,6 +390,90 @@ export const useTokenTransactions = (
     [chainId, navAddress, navSymbol, selectedAddress],
   );
 
+  /**
+   * Did a swap/bridge move this page's token on either leg?
+   *
+   * Legs come from the bridge quote, looked up the same way the Activity screen
+   * looks it up so both surfaces agree on which entry belongs to a tx.
+   */
+  const isSwapLegForCurrentToken = useCallback(
+    (tx: Transaction) => {
+      if (!SWAP_LIKE_TRANSACTION_TYPES.includes(tx.type)) {
+        return false;
+      }
+
+      const bridgeHistoryItem = findBridgeHistoryItem({
+        bridgeHistory,
+        transactionMetaId: tx.id,
+        transactionActionId: tx.actionId,
+        transactionHash: tx.hash,
+      });
+
+      const { addresses, symbols } = getSwapLegTokenIdentifiers(
+        tx,
+        bridgeHistoryItem,
+      );
+
+      if (addresses.length > 0) {
+        return Boolean(navAddress) && addresses.includes(navAddress);
+      }
+
+      // No addresses anywhere — legacy tx with symbols only.
+      return Boolean(navSymbol) && symbols.includes(navSymbol);
+    },
+    [bridgeHistory, navAddress, navSymbol],
+  );
+
+  /**
+   * Whether a bridge *arrives* at this page's token.
+   *
+   * A cross-chain bridge is one local transaction, on the source chain — the
+   * destination transfer is the relayer's, so this device has nothing on the
+   * receiving chain to match. Without this the destination page never shows the
+   * incoming leg, even though its balance went up. Mirrors the Activity screen,
+   * which includes a bridge whose `destChainId` is among the enabled chains.
+   *
+   * Checked ahead of the `chainId === tx.chainId` gate, which is what drops it.
+   */
+  const isBridgeArrivalForCurrentToken = useCallback(
+    (tx: Transaction) => {
+      if (tx.type !== TransactionType.bridge || tx.status === TX_UNAPPROVED) {
+        return false;
+      }
+
+      const quote = findBridgeHistoryItem({
+        bridgeHistory,
+        transactionMetaId: tx.id,
+        transactionActionId: tx.actionId,
+        transactionHash: tx.hash,
+      })?.quote;
+
+      if (quote?.destChainId === undefined || quote.destChainId === null) {
+        return false;
+      }
+
+      // Quotes carry EVM chain ids as numbers; `getMaybeHexChainId` also
+      // returns undefined for a non-EVM destination, which can't match here.
+      const destChainId = getMaybeHexChainId(String(quote.destChainId));
+
+      if (
+        !destChainId ||
+        destChainId.toLowerCase() !== chainId?.toLowerCase()
+      ) {
+        return false;
+      }
+
+      const destAddress = quote.destAsset?.address?.toLowerCase();
+      const isNativeDestination =
+        !destAddress || destAddress === NATIVE_SWAPS_TOKEN_ADDRESS;
+
+      return asset.isNative || asset.isETH
+        ? isNativeDestination
+        : Boolean(navAddress) && destAddress === navAddress;
+    },
+    [asset.isETH, asset.isNative, bridgeHistory, chainId, navAddress],
+  );
+
   // ETH filter - for native token transactions
   const ethFilter = useCallback(
     (tx: Transaction) => {
@@ -308,6 +489,10 @@ export const useTokenTransactions = (
         return true;
       }
 
+      if (isBridgeArrivalForCurrentToken(tx)) {
+        return true;
+      }
+
       if (
         (areAddressesEqual(from ?? '', selectedAddress ?? '') ||
           areAddressesEqual(to ?? '', selectedAddress ?? '')) &&
@@ -330,7 +515,13 @@ export const useTokenTransactions = (
       }
       return false;
     },
-    [chainId, checkIsMusdClaimForCurrentView, selectedAddress, tokens],
+    [
+      chainId,
+      checkIsMusdClaimForCurrentView,
+      isBridgeArrivalForCurrentToken,
+      selectedAddress,
+      tokens,
+    ],
   );
 
   // Non-ETH filter - for token transactions
@@ -347,6 +538,10 @@ export const useTokenTransactions = (
         return true;
       }
 
+      if (isBridgeArrivalForCurrentToken(tx)) {
+        return true;
+      }
+
       if (
         (areAddressesEqual(from ?? '', selectedAddress ?? '') ||
           areAddressesEqual(to ?? '', selectedAddress ?? '')) &&
@@ -360,27 +555,17 @@ export const useTokenTransactions = (
             navAddress === transferInformation.contractAddress.toLowerCase()
           );
         }
-        if (
-          swapsTransactions[tx.id] &&
-          (to?.toLowerCase() ===
-            FIRST_PARTY_CONTRACT_NAMES.Swaps?.[chainId]?.toLowerCase() ||
-            to?.toLowerCase() === navAddress)
-        ) {
-          const { destinationToken, sourceToken } = swapsTransactions[tx.id];
-          return (
-            destinationToken.address === navAddress ||
-            sourceToken.address === navAddress
-          );
-        }
+        return isSwapLegForCurrentToken(tx);
       }
       return false;
     },
     [
       chainId,
       checkIsMusdClaimForCurrentView,
+      isBridgeArrivalForCurrentToken,
+      isSwapLegForCurrentToken,
       navAddress,
       selectedAddress,
-      swapsTransactions,
     ],
   );
 
@@ -591,6 +776,7 @@ export const useTokenTransactions = (
     conversionRate: conversionRate ?? 0,
     currentCurrency,
     isNonEvmAsset,
+    bridgeArrivalTxs,
     onRefresh,
   };
 };
diff --git a/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.tsx b/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.tsx
index b96304dc6b99..e81b16404c95 100644
--- a/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.tsx
+++ b/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.tsx
@@ -85,6 +85,8 @@ import {
 import TokenListSecurityBadge from '../../components/TokenListSecurityBadge/TokenListSecurityBadge';
 import { tokenListSecurityBadgeKeys } from '../../queries/tokenSecurityBadgeKeys';
 import { getCaipAssetIdForToken } from '../../util/getCaipAssetIdForToken';
+import { AssetInactiveBadge } from '../../../AssetActivation/AssetInactiveBadge';
+import { getIsAssetRequireActivate } from '../../../../../selectors/stellar/stellar-assets';
 
 export const ACCOUNT_TYPE_LABEL_TEST_ID = 'account-type-label';
 
@@ -195,6 +197,10 @@ export const TokenListItem = React.memo(
       }),
     );
 
+    const isAssetInactive = useSelector((state: RootState) =>
+      getIsAssetRequireActivate(state, { assetId: asset?.address ?? '' }),
+    );
+
     const { isStockToken } = useRWAToken();
 
     const basicFunctionalityEnabled = useSelector(
@@ -642,6 +648,7 @@ export const TokenListItem = React.memo(
                       caipAssetId={caipAssetIdForSecurity}
                     />
                   )}
+                {isAssetInactive ? <AssetInactiveBadge /> : null}
               </View>
 
               {renderEarnCta()}
diff --git a/app/components/UI/Tokens/util/sortAssetsWithPriority.ts b/app/components/UI/Tokens/util/sortAssetsWithPriority.ts
index 3fa463e82e73..ba4f1c0f0ece 100644
--- a/app/components/UI/Tokens/util/sortAssetsWithPriority.ts
+++ b/app/components/UI/Tokens/util/sortAssetsWithPriority.ts
@@ -1,7 +1,7 @@
 import type { Asset } from '@metamask/assets-controllers';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
 import type { CaipChainId, Hex } from '@metamask/utils';
-import { BtcScope, SolScope, TrxScope } from '@metamask/keyring-api';
+import { BtcScope, SolScope, TrxScope, XlmScope } from '@metamask/keyring-api';
 import { sortAssets, type SortCriteria } from './sortAssets';
 
 // These are the only two options for sorting assets
@@ -32,6 +32,7 @@ const defaultNativeAssetOrder: (Hex | CaipChainId)[] = [
   TrxScope.Mainnet,
   BtcScope.Mainnet,
   SolScope.Mainnet,
+  XlmScope.Pubnet,
   CHAIN_IDS.LINEA_MAINNET,
   CHAIN_IDS.MAINNET,
 ];
diff --git a/app/components/UI/Transactions/AssetDetailsActivityListItem.test.tsx b/app/components/UI/Transactions/AssetDetailsActivityListItem.test.tsx
index 707a3b2fbe25..9f0e3fa4111e 100644
--- a/app/components/UI/Transactions/AssetDetailsActivityListItem.test.tsx
+++ b/app/components/UI/Transactions/AssetDetailsActivityListItem.test.tsx
@@ -13,8 +13,10 @@ import { selectIsTransactionsRedesignEnabled } from '../../../selectors/featureF
 import { selectSelectedAccountGroupEvmInternalAccount } from '../../../selectors/multichainAccounts/accountTreeController';
 import { selectEvmNetworkConfigurationsByChainId } from '../../../selectors/networkController';
 import { selectAllTokens } from '../../../selectors/tokensController';
+import { selectBridgeHistoryForAccount } from '../../../selectors/bridgeStatusController';
 import type { TransactionWithImportTime } from './AssetDetailsActivityListItem.utils';
 import { resolveActivityListItemTitle } from '../ActivityListItemRow/ActivityListItemRow';
+import { handleUnifiedSwapsTxHistoryItemClick } from '../Bridge/utils/transaction-history';
 
 jest.mock('react-redux', () => ({
   useSelector: jest.fn(),
@@ -32,6 +34,10 @@ jest.mock('../../../util/theme', () => ({
   }),
 }));
 
+jest.mock('../Bridge/utils/transaction-history', () => ({
+  handleUnifiedSwapsTxHistoryItemClick: jest.fn(),
+}));
+
 jest.mock('../ActivityListItemRow/ActivityListItemRow', () => ({
   ActivityListItemRow: jest.fn(({ onPress, item }) => {
     const { TouchableOpacity } = jest.requireActual('react-native');
@@ -71,10 +77,17 @@ const createTransaction = (
 });
 
 describe('AssetDetailsActivityListItem', () => {
+  let bridgeHistory: Record<string, unknown> = {};
+
   beforeEach(() => {
     jest.clearAllMocks();
+    bridgeHistory = {};
 
     mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectBridgeHistoryForAccount) {
+        return bridgeHistory;
+      }
+
       if (selector === selectSelectedInternalAccount) {
         return { metadata: { importTime: 2000 } };
       }
@@ -137,6 +150,10 @@ describe('AssetDetailsActivityListItem', () => {
 
   it('does not render account import marker when import time is null', () => {
     mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectBridgeHistoryForAccount) {
+        return bridgeHistory;
+      }
+
       if (selector === selectSelectedInternalAccount) {
         return { metadata: { importTime: null } };
       }
@@ -180,8 +197,63 @@ describe('AssetDetailsActivityListItem', () => {
     ).not.toBeOnTheScreen();
   });
 
+  it('routes a bridge to the redesigned ActivityDetails screen, not the legacy sheet', () => {
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectBridgeHistoryForAccount) return bridgeHistory;
+      if (selector === selectSelectedInternalAccount)
+        return { metadata: { importTime: 2000 } };
+      if (selector === selectSelectedAccountGroupEvmInternalAccount)
+        return { address: '0x123' };
+      if (selector === selectEvmNetworkConfigurationsByChainId)
+        return { '0x1': { nativeCurrency: 'ETH' } };
+      if (selector === selectAllTokens) return {};
+      if (selector === selectIsTransactionsRedesignEnabled) return true;
+      return undefined;
+    });
+    const navigation = createNavigation();
+    const transaction = createTransaction({
+      id: 'bridge-1',
+      type: TransactionType.bridge,
+    });
+    bridgeHistory = {
+      'bridge-1': {
+        quote: {
+          srcChainId: 8453,
+          destChainId: 1151111081099710,
+          srcAsset: { chainId: 8453, symbol: 'USDC' },
+          destAsset: { chainId: 1151111081099710, symbol: 'SOL' },
+        },
+      },
+    };
+
+    const { getByTestId } = render(
+      <AssetDetailsActivityListItem
+        transaction={transaction}
+        index={0}
+        assetSymbol="USDC"
+        chainId="0x2105"
+        navigation={navigation}
+        onSpeedUpAction={jest.fn()}
+        onCancelAction={jest.fn()}
+      />,
+    );
+
+    fireEvent.press(getByTestId('activity-list-item-row'));
+
+    expect(navigation.navigate).toHaveBeenCalledWith(
+      Routes.ACTIVITY_DETAILS,
+      expect.objectContaining({ txIdentifier: 'bridge-1' }),
+    );
+    // Neither the legacy details sheet nor the legacy bridge-status screen.
+    expect(handleUnifiedSwapsTxHistoryItemClick).not.toHaveBeenCalled();
+  });
+
   it('routes to the ActivityDetails screen when the redesign is enabled', () => {
     mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectBridgeHistoryForAccount) {
+        return bridgeHistory;
+      }
+
       if (selector === selectSelectedInternalAccount) {
         return { metadata: { importTime: 2000 } };
       }
diff --git a/app/components/UI/Transactions/AssetDetailsActivityListItem.tsx b/app/components/UI/Transactions/AssetDetailsActivityListItem.tsx
index a5c44752487b..6037f3b207de 100644
--- a/app/components/UI/Transactions/AssetDetailsActivityListItem.tsx
+++ b/app/components/UI/Transactions/AssetDetailsActivityListItem.tsx
@@ -11,10 +11,8 @@ import {
 } from '../ActivityListItemRow/ActivityListItemRow';
 import { type ActivityListItem } from '../../../util/activity-adapters';
 import { selectSelectedInternalAccount } from '../../../selectors/accountsController';
-import {
-  useBridgeHistoryItemBySrcTxHash,
-  findBridgeHistoryItemBySrcTxHash,
-} from '../Bridge/hooks/useBridgeHistoryItemBySrcTxHash';
+import { selectBridgeHistoryForAccount } from '../../../selectors/bridgeStatusController';
+import { findBridgeHistoryItem } from '../../../util/bridge/findBridgeHistoryItem';
 import { selectIsTransactionsRedesignEnabled } from '../../../selectors/featureFlagController/activityRedesign';
 // eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): shared activity-details routing; route-isolation backlog
 import { getActivityDetailsRoute } from '../../Views/ActivityList/getActivityDetailsRoute';
@@ -70,6 +68,21 @@ export const AssetDetailsActivityListItem = ({
     Record<string, { address: string; symbol?: string; decimals?: number }[]>
   >;
   const accountImportTime = selectedInternalAccount?.metadata.importTime;
+
+  const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
+  // eslint-disable-next-line @typescript-eslint/no-deprecated -- Older persisted bridge history can still be keyed by actionId.
+  const { actionId } = tx;
+  const bridgeHistoryItem = useMemo(
+    () =>
+      findBridgeHistoryItem({
+        bridgeHistory,
+        transactionMetaId: tx.id,
+        transactionActionId: actionId,
+        transactionHash: tx.hash,
+      }),
+    [bridgeHistory, tx.id, actionId, tx.hash],
+  );
+
   const activityItem = useMemo(() => {
     const resolvedChainId = (tx.chainId ?? tokenChainId ?? currentChainId) as
       | Hex
@@ -98,10 +111,12 @@ export const AssetDetailsActivityListItem = ({
       nativeAssetSymbol,
       currentChainId,
       tokenChainId,
+      bridgeHistoryItem,
     });
   }, [
     allTokens,
     assetSymbol,
+    bridgeHistoryItem,
     currentChainId,
     groupEvmAccount?.address,
     networkConfigurations,
@@ -109,14 +124,13 @@ export const AssetDetailsActivityListItem = ({
     tx,
   ]);
 
-  const { bridgeHistoryItemsBySrcTxHash } = useBridgeHistoryItemBySrcTxHash();
-  const bridgeHistoryItem = findBridgeHistoryItemBySrcTxHash(
-    bridgeHistoryItemsBySrcTxHash,
-    activityItem.hash,
-  );
-
   const handlePress = useCallback(
     (item: ActivityListItem) => {
+      const selectedTx =
+        item.raw?.type === 'localTransaction'
+          ? item.raw.data.primaryTransaction
+          : undefined;
+
       if (isTransactionsRedesignEnabled) {
         const detailsRoute = getActivityDetailsRoute(item);
         if (detailsRoute) {
@@ -125,10 +139,6 @@ export const AssetDetailsActivityListItem = ({
         }
       }
 
-      const selectedTx =
-        item.raw?.type === 'localTransaction'
-          ? item.raw.data.primaryTransaction
-          : undefined;
       if (!selectedTx) return;
 
       const { from, to } = getActivityFromTo(item);
diff --git a/app/components/UI/Transactions/AssetDetailsActivityListItem.utils.test.ts b/app/components/UI/Transactions/AssetDetailsActivityListItem.utils.test.ts
index 0efd43f7834b..d5013087808b 100644
--- a/app/components/UI/Transactions/AssetDetailsActivityListItem.utils.test.ts
+++ b/app/components/UI/Transactions/AssetDetailsActivityListItem.utils.test.ts
@@ -203,6 +203,174 @@ describe('AssetDetailsActivityListItem utils', () => {
     });
   });
 
+  describe('swap enrichment from the bridge/swaps quote', () => {
+    const USDC_ADDRESS = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
+    const SWAP_ROUTER = '0x0439e60f02a8900a951603950d8d4527f400c3f1';
+
+    // `swapMetaData` is a legacy SwapsController field that never made it onto
+    // TransactionMeta, so it is declared here rather than cast at each call.
+    type LegacySwapOverrides = Partial<TransactionWithImportTime> & {
+      swapMetaData?: { token_from?: string; token_to?: string };
+    };
+
+    const createSwap = (overrides: LegacySwapOverrides = {}) =>
+      createTransaction({
+        type: TransactionType.swap,
+        txParams: { from: '0x123', to: SWAP_ROUTER, value: '0x0' },
+        ...overrides,
+      } as Partial<TransactionWithImportTime>);
+
+    // Unified swaps keep both legs in the quote, not on the TransactionMeta.
+    const createBridgeHistoryItem = (status?: {
+      destChain?: { txHash: string };
+    }) =>
+      ({
+        quote: {
+          srcChainId: '0x1',
+          destChainId: '0x1',
+          srcAsset: {
+            address: USDC_ADDRESS,
+            symbol: 'USDC',
+            decimals: 6,
+            assetId: 'eip155:1/erc20:0xa0b8',
+          },
+          destAsset: { address: '0x0', symbol: 'ETH', decimals: 18 },
+          srcTokenAmount: '10000',
+          destTokenAmount: '3000000000000',
+        },
+        ...(status ? { status } : {}),
+      }) as never;
+
+    const bridgeHistoryItem = createBridgeHistoryItem();
+    const completedBridgeHistoryItem = createBridgeHistoryItem({
+      destChain: { txHash: '0xdest' },
+    });
+
+    it('resolves a complete swap when the quote is available', () => {
+      const item = mapTransactionToActivityItem({
+        transaction: createSwap(),
+        assetSymbol: 'USDC',
+        nativeAssetSymbol: 'ETH',
+        currentChainId: '0x1',
+        bridgeHistoryItem,
+      });
+
+      expect(item.type).toBe('swap');
+      expect(item.data).toEqual(
+        expect.objectContaining({
+          sourceToken: expect.objectContaining({
+            direction: 'out',
+            symbol: 'USDC',
+            amount: '10000',
+            decimals: 6,
+          }),
+          destinationToken: expect.objectContaining({
+            direction: 'in',
+            symbol: 'ETH',
+            amount: '3000000000000',
+            decimals: 18,
+          }),
+        }),
+      );
+    });
+
+    it('degrades to swapIncomplete without the quote, which is the bug this enrichment fixes', () => {
+      const item = mapTransactionToActivityItem({
+        transaction: createSwap(),
+        assetSymbol: 'USDC',
+        nativeAssetSymbol: 'ETH',
+        currentChainId: '0x1',
+      });
+
+      expect(item.type).toBe('swapIncomplete');
+    });
+
+    it('falls back to legacy swapMetaData symbols when there is no quote', () => {
+      const item = mapTransactionToActivityItem({
+        transaction: createSwap({
+          swapMetaData: { token_from: 'USDC', token_to: 'ETH' },
+        }),
+        assetSymbol: 'USDC',
+        nativeAssetSymbol: 'ETH',
+        currentChainId: '0x1',
+      });
+
+      expect(item.type).toBe('swap');
+      expect(item.data).toEqual(
+        expect.objectContaining({
+          sourceToken: expect.objectContaining({ symbol: 'USDC' }),
+          destinationToken: expect.objectContaining({ symbol: 'ETH' }),
+        }),
+      );
+    });
+
+    it('prefers the quote over legacy symbols, so amounts and decimals survive', () => {
+      const item = mapTransactionToActivityItem({
+        transaction: createSwap({
+          swapMetaData: { token_from: 'STALE', token_to: 'STALE' },
+        }),
+        assetSymbol: 'USDC',
+        nativeAssetSymbol: 'ETH',
+        currentChainId: '0x1',
+        bridgeHistoryItem,
+      });
+
+      expect(item.data).toEqual(
+        expect.objectContaining({
+          sourceToken: expect.objectContaining({ symbol: 'USDC' }),
+          destinationToken: expect.objectContaining({ symbol: 'ETH' }),
+        }),
+      );
+    });
+
+    it('marks a bridge as successful once the destination leg lands', () => {
+      const item = mapTransactionToActivityItem({
+        transaction: createSwap({ type: TransactionType.bridge }),
+        assetSymbol: 'USDC',
+        nativeAssetSymbol: 'ETH',
+        currentChainId: '0x1',
+        bridgeHistoryItem: completedBridgeHistoryItem,
+      });
+
+      expect(item.type).toBe('bridge');
+      expect(item.status).toBe('success');
+    });
+
+    it('adds no override while the destination leg is unresolved, so the local status stands', () => {
+      const item = mapTransactionToActivityItem({
+        transaction: createSwap({
+          type: TransactionType.bridge,
+          status: TransactionStatus.submitted,
+        }),
+        assetSymbol: 'USDC',
+        nativeAssetSymbol: 'ETH',
+        currentChainId: '0x1',
+        bridgeHistoryItem,
+      });
+
+      if (item.raw?.type !== 'localTransaction') {
+        throw new Error('Expected local transaction activity item');
+      }
+      expect(item.raw.data.activityStatus).toBeUndefined();
+      expect(item.status).toBe('pending');
+    });
+
+    it('does not apply the bridge status override to a same-chain swap', () => {
+      const item = mapTransactionToActivityItem({
+        transaction: createSwap(),
+        assetSymbol: 'USDC',
+        nativeAssetSymbol: 'ETH',
+        currentChainId: '0x1',
+        bridgeHistoryItem: completedBridgeHistoryItem,
+      });
+
+      if (item.raw?.type !== 'localTransaction') {
+        throw new Error('Expected local transaction activity item');
+      }
+      expect(item.raw.data.activityStatus).toBeUndefined();
+    });
+  });
+
   describe('nativeAssetSymbol resolution', () => {
     it('uses the explicit nativeAssetSymbol when provided', () => {
       const item = mapTransactionToActivityItem({
diff --git a/app/components/UI/Transactions/AssetDetailsActivityListItem.utils.ts b/app/components/UI/Transactions/AssetDetailsActivityListItem.utils.ts
index b4a425cce320..928ffa4b6efa 100644
--- a/app/components/UI/Transactions/AssetDetailsActivityListItem.utils.ts
+++ b/app/components/UI/Transactions/AssetDetailsActivityListItem.utils.ts
@@ -1,4 +1,5 @@
 import type { TransactionMeta } from '@metamask/transaction-controller';
+import type { BridgeHistoryItem } from '@metamask/bridge-status-controller';
 import type { Hex } from '@metamask/utils';
 import {
   getActivityFromTo,
@@ -7,6 +8,11 @@ import {
   type ActivityListItem,
   type TransactionGroup,
 } from '../../../util/activity-adapters';
+// eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): shared activity enrichment, kept next to the Activity list that owns it; route-isolation backlog
+import {
+  getBridgeActivityStatus,
+  getSwapTokenEnrichment,
+} from '../../Views/ActivityList/hooks/useLocalActivityItems';
 
 export type TransactionWithImportTime = TransactionMeta & {
   insertImportTime?: boolean;
@@ -22,6 +28,7 @@ export const mapTransactionToActivityItem = ({
   nativeAssetSymbol,
   currentChainId,
   tokenChainId,
+  bridgeHistoryItem,
 }: {
   transaction: TransactionWithImportTime;
   assetSymbol?: string;
@@ -30,6 +37,12 @@ export const mapTransactionToActivityItem = ({
   nativeAssetSymbol?: string;
   currentChainId?: Hex;
   tokenChainId?: Hex;
+  /**
+   * Bridge/swaps history entry for this tx. Carries the quote that names both
+   * swap legs — without it a unified swap has no resolvable destination and the
+   * adapter degrades the row to `swapIncomplete`.
+   */
+  bridgeHistoryItem?: BridgeHistoryItem;
 }) => {
   const chainId = tx.chainId ?? tokenChainId ?? currentChainId;
   const transaction = {
@@ -49,12 +62,27 @@ export const mapTransactionToActivityItem = ({
     assetAddress !== undefined &&
     transaction.txParams?.to?.toLowerCase() === assetAddress.toLowerCase();
 
+  // Legacy callers passed the asset symbol here; keep that behavior when no
+  // explicit native symbol is provided.
+  const resolvedNativeAssetSymbol = nativeAssetSymbol ?? assetSymbol;
+
+  const { sourceToken, destinationToken } = getSwapTokenEnrichment(
+    transaction,
+    resolvedNativeAssetSymbol,
+    bridgeHistoryItem,
+  );
+  const activityStatus = getBridgeActivityStatus(
+    transaction,
+    bridgeHistoryItem,
+  );
+
   const transactionGroup: TransactionGroup = {
     initialTransaction: transaction,
     primaryTransaction: transaction,
-    // Legacy callers passed the asset symbol here; keep that behavior when no
-    // explicit native symbol is provided.
-    nativeAssetSymbol: nativeAssetSymbol ?? assetSymbol,
+    nativeAssetSymbol: resolvedNativeAssetSymbol,
+    ...(sourceToken ? { sourceToken } : {}),
+    ...(destinationToken ? { destinationToken } : {}),
+    ...(activityStatus ? { activityStatus } : {}),
     ...(isAssetContractTx
       ? {
           contractTokenMetadata: {
diff --git a/app/components/UI/UrlAutocomplete/Result.tsx b/app/components/UI/UrlAutocomplete/Result.tsx
index c78453bcf705..49130ad1e615 100644
--- a/app/components/UI/UrlAutocomplete/Result.tsx
+++ b/app/components/UI/UrlAutocomplete/Result.tsx
@@ -39,6 +39,7 @@ import type { AppNavigationProp } from '../../../core/NavigationService/types';
 interface ResultProps {
   result: AutocompleteSearchResult;
   onPress: () => void;
+  onPressIn?: () => void;
   onSwapPress: (result: TokenSearchResult) => void;
   navigation?: AppNavigationProp;
 }
@@ -72,7 +73,7 @@ const PredictionsIcon: React.FC<{
 });
 
 export const Result: React.FC<ResultProps> = memo(
-  ({ result, onPress, onSwapPress }) => {
+  ({ result, onPress, onPressIn, onSwapPress }) => {
     const theme = useTheme();
     const styles = stylesheet({ theme });
 
@@ -183,7 +184,11 @@ export const Result: React.FC<ResultProps> = memo(
     };
 
     return (
-      <TouchableOpacity style={styles.item} onPress={onPress}>
+      <TouchableOpacity
+        style={styles.item}
+        onPress={onPress}
+        onPressIn={onPressIn}
+      >
         <View style={styles.itemWrapper}>
           {renderIcon()}
           <View style={styles.textContent}>
diff --git a/app/components/UI/UrlAutocomplete/index.tsx b/app/components/UI/UrlAutocomplete/index.tsx
index b9ba105aa351..781617066811 100644
--- a/app/components/UI/UrlAutocomplete/index.tsx
+++ b/app/components/UI/UrlAutocomplete/index.tsx
@@ -183,6 +183,7 @@ interface SearchContentProps {
   browserHistory: FuseSearchResult[];
   bookmarks: FuseSearchResult[];
   onSelect: (item: AutocompleteSearchResult) => void;
+  onSelectPressIn?: () => void;
   hide: () => void;
   styles: ReturnType<typeof styleSheet>;
 }
@@ -196,6 +197,7 @@ const SearchContent: React.FC<SearchContentProps> = ({
   browserHistory,
   bookmarks,
   onSelect,
+  onSelectPressIn,
   hide,
   styles,
 }) => {
@@ -405,9 +407,18 @@ const SearchContent: React.FC<SearchContentProps> = ({
         return (
           <Result
             result={item}
+            onPressIn={
+              item.category === UrlAutocompleteCategory.Sites ||
+              item.category === UrlAutocompleteCategory.Recents ||
+              item.category === UrlAutocompleteCategory.Favorites
+                ? onSelectPressIn
+                : undefined
+            }
             onPress={() => {
-              // Only hide for URL-based results (user navigates away from browser)
-              // Keep open for Tokens/Perps/Predictions so user can explore multiple items
+              // Select first so BrowserTab can start WebView navigation, then
+              // hide autocomplete for URL-based results.
+              // Keep autocomplete open for Tokens/Perps/Predictions.
+              onSelect(item);
               const isUrlBasedResult =
                 item.category === UrlAutocompleteCategory.Sites ||
                 item.category === UrlAutocompleteCategory.Recents ||
@@ -415,14 +426,13 @@ const SearchContent: React.FC<SearchContentProps> = ({
               if (isUrlBasedResult) {
                 hide();
               }
-              onSelect(item);
             }}
             onSwapPress={goToSwaps}
             navigation={navigation}
           />
         );
       },
-      [hide, onSelect, goToSwaps, navigation],
+      [hide, onSelect, onSelectPressIn, goToSwaps, navigation],
     );
 
   const keyExtractor = useCallback(
@@ -497,7 +507,7 @@ const SearchContent: React.FC<SearchContentProps> = ({
 const UrlAutocomplete = forwardRef<
   UrlAutocompleteRef,
   UrlAutocompleteComponentProps
->(({ onSelect, onDismiss }, ref) => {
+>(({ onSelect, onSelectPressIn, onDismiss }, ref) => {
   const browserHistory = useSelector(selectBrowserHistoryWithType);
   const bookmarks = useSelector(selectBrowserBookmarksWithType);
 
@@ -613,14 +623,15 @@ const UrlAutocomplete = forwardRef<
       ({ item }) => (
         <Result
           result={item}
+          onPressIn={onSelectPressIn}
           onPress={() => {
-            hide();
             onSelect(item);
+            hide();
           }}
           onSwapPress={goToSwaps}
         />
       ),
-      [hide, onSelect, goToSwaps],
+      [hide, onSelect, onSelectPressIn, goToSwaps],
     );
 
   const keyExtractor = useCallback(
@@ -663,6 +674,7 @@ const UrlAutocomplete = forwardRef<
                 browserHistory={browserHistory}
                 bookmarks={bookmarks}
                 onSelect={onSelect}
+                onSelectPressIn={onSelectPressIn}
                 hide={hide}
                 styles={styles}
               />
diff --git a/app/components/UI/UrlAutocomplete/types.ts b/app/components/UI/UrlAutocomplete/types.ts
index 9915c1542965..21be5b46122c 100644
--- a/app/components/UI/UrlAutocomplete/types.ts
+++ b/app/components/UI/UrlAutocomplete/types.ts
@@ -12,6 +12,11 @@ export type UrlAutocompleteComponentProps = {
    * choosing one of the autocomplete options
    */
   onSelect: (item: AutocompleteSearchResult) => void;
+  /**
+   * Called on press-in for URL-based results (Sites/Recents/Favorites) before
+   * blur, so the browser can keep the URL bar focused until navigation starts.
+   */
+  onSelectPressIn?: () => void;
   /**
    * Callback that is triggered while
    * tapping on the background
diff --git a/app/components/UI/WalletHomeOnboardingSteps/WalletHomeOnboardingSteps.test.tsx b/app/components/UI/WalletHomeOnboardingSteps/WalletHomeOnboardingSteps.test.tsx
index 24a6b22ed71d..69e70f7f8b15 100644
--- a/app/components/UI/WalletHomeOnboardingSteps/WalletHomeOnboardingSteps.test.tsx
+++ b/app/components/UI/WalletHomeOnboardingSteps/WalletHomeOnboardingSteps.test.tsx
@@ -18,6 +18,7 @@ import {
   WALLET_HOME_ONBOARDING_POST_NAV_RESUME_HOLD_MS,
 } from './walletHomeOnboardingChecklistRive';
 import { walletHomeOnboardingProgressRatioForStep } from './walletHomeOnboardingStepsModel';
+import { markPushNotificationOsPromptRequested } from '../../../actions/onboarding';
 import { strings } from '../../../../locales/i18n';
 import { animateWalletHomeOnboardingProgressRatio } from './walletHomeOnboardingProgressAnimation';
 
@@ -88,6 +89,7 @@ describe('WalletHomeOnboardingSteps', () => {
       suppressedReason: null;
       stepIndex: number;
     };
+    pushNotificationOsPromptRequested?: boolean;
   }) =>
     renderWithProvider(<WalletHomeOnboardingSteps testID="steps-root" />, {
       state: {
@@ -734,9 +736,142 @@ describe('WalletHomeOnboardingSteps', () => {
         expect.objectContaining({ stepIndex: 1 }),
       );
       expect(
-        progressAnimationCalls(walletHomeOnboardingProgressRatioForStep(1))
+        progressAnimationCalls(walletHomeOnboardingProgressRatioForStep(1, 3))
           .length,
       ).toBeGreaterThan(0);
     });
+
+    it('spreads progress over two steps when the notifications step is dropped', async () => {
+      const { getByTestId, getByText, store } = renderSteps({
+        pushNotificationOsPromptRequested: true,
+      });
+
+      expect(getByText('1/2')).toBeOnTheScreen();
+
+      animateProgressRatioSpy.mockClear();
+      fireEvent.press(getByTestId(primaryTestId));
+
+      await flushWalletHomeStepTransition();
+
+      expect(store.getState().onboarding.walletHomeOnboardingSteps).toEqual(
+        expect.objectContaining({ stepIndex: 1 }),
+      );
+      expect(
+        progressAnimationCalls(walletHomeOnboardingProgressRatioForStep(1, 2))
+          .length,
+      ).toBeGreaterThan(0);
+    });
+  });
+
+  describe('notifications step visibility (TMCU-924)', () => {
+    it('shows the notifications step when the OS push request has not happened', () => {
+      const { getByTestId, getByText } = renderSteps({
+        walletHomeOnboardingSteps: { suppressedReason: null, stepIndex: 2 },
+      });
+
+      expect(getByTestId('steps-root-hero-notifications')).toBeOnTheScreen();
+      expect(getByText('3/3')).toBeOnTheScreen();
+    });
+
+    it('drops the notifications step once the OS push request has happened', () => {
+      const { getByTestId, queryByTestId, getByText } = renderSteps({
+        walletHomeOnboardingSteps: { suppressedReason: null, stepIndex: 1 },
+        pushNotificationOsPromptRequested: true,
+      });
+
+      expect(getByTestId('steps-root-hero-trade')).toBeOnTheScreen();
+      expect(queryByTestId('steps-root-hero-notifications')).toBeNull();
+      expect(getByText('2/2')).toBeOnTheScreen();
+    });
+
+    it('completes the flow from the trade step when the notifications step is dropped', async () => {
+      const { getByTestId, store } = renderSteps({
+        walletHomeOnboardingSteps: { suppressedReason: null, stepIndex: 1 },
+        pushNotificationOsPromptRequested: true,
+      });
+
+      fireEvent.press(
+        getByTestId(WalletHomeOnboardingStepsSelectors.SKIP_BUTTON),
+      );
+      await flushWalletHomeStepTransition();
+
+      await waitFor(() => {
+        expect(
+          store.getState().onboarding.walletHomeOnboardingSteps
+            ?.suppressedReason,
+        ).toBe('flow_completed');
+      });
+    });
+
+    it('completes the flow instead of stepping backwards when the notifications step is dropped after the user reached it', async () => {
+      const { store } = renderSteps({
+        walletHomeOnboardingSteps: { suppressedReason: null, stepIndex: 2 },
+        pushNotificationOsPromptRequested: true,
+      });
+
+      await waitFor(() => {
+        expect(
+          store.getState().onboarding.walletHomeOnboardingSteps
+            ?.suppressedReason,
+        ).toBe('flow_completed');
+      });
+      expect(
+        store.getState().onboarding.walletHomeOnboardingSteps?.stepIndex,
+      ).toBe(2);
+    });
+
+    it('completes the flow without painting the previous step when the OS push request lands mid-flow', async () => {
+      const { getByTestId, queryByTestId, store } = renderSteps({
+        walletHomeOnboardingSteps: { suppressedReason: null, stepIndex: 2 },
+      });
+
+      expect(getByTestId('steps-root-hero-notifications')).toBeOnTheScreen();
+
+      await act(async () => {
+        store.dispatch(markPushNotificationOsPromptRequested());
+      });
+
+      // No frame of the trade step (and no live trade CTA) while the flow winds down.
+      expect(queryByTestId('steps-root-hero-trade')).toBeNull();
+      expect(queryByTestId('steps-root-hero-notifications')).toBeNull();
+      await waitFor(() => {
+        expect(
+          store.getState().onboarding.walletHomeOnboardingSteps
+            ?.suppressedReason,
+        ).toBe('flow_completed');
+      });
+    });
+
+    it('keeps the step counter within the visible steps when the flag flips mid-flow', async () => {
+      const { getByText, queryByText, store } = renderSteps({
+        walletHomeOnboardingSteps: { suppressedReason: null, stepIndex: 1 },
+      });
+
+      expect(getByText('2/3')).toBeOnTheScreen();
+
+      await act(async () => {
+        store.dispatch(markPushNotificationOsPromptRequested());
+      });
+
+      expect(getByText('2/2')).toBeOnTheScreen();
+      expect(queryByText('2/3')).toBeNull();
+    });
+
+    it('clamps an out-of-range persisted step while the notifications step is still shown', async () => {
+      const { getByTestId, store } = renderSteps({
+        walletHomeOnboardingSteps: { suppressedReason: null, stepIndex: 7 },
+      });
+
+      expect(getByTestId('steps-root-hero-notifications')).toBeOnTheScreen();
+
+      await waitFor(() => {
+        expect(
+          store.getState().onboarding.walletHomeOnboardingSteps?.stepIndex,
+        ).toBe(2);
+      });
+      expect(
+        store.getState().onboarding.walletHomeOnboardingSteps?.suppressedReason,
+      ).toBeNull();
+    });
   });
 });
diff --git a/app/components/UI/WalletHomeOnboardingSteps/WalletHomeOnboardingSteps.tsx b/app/components/UI/WalletHomeOnboardingSteps/WalletHomeOnboardingSteps.tsx
index dd1dbb512011..a1f80f7b8eec 100644
--- a/app/components/UI/WalletHomeOnboardingSteps/WalletHomeOnboardingSteps.tsx
+++ b/app/components/UI/WalletHomeOnboardingSteps/WalletHomeOnboardingSteps.tsx
@@ -64,12 +64,13 @@ import {
 } from './walletHomeOnboardingStepHero';
 import { WALLET_HOME_ONBOARDING_HERO_MEDIA_LAYOUT_STYLE } from './walletHomeOnboardingStepsLayout';
 import {
-  WALLET_HOME_ONBOARDING_VISIBLE_STEPS,
   walletHomeOnboardingCappedVisualStepIndex,
   walletHomeOnboardingMaxPersistedStepIndex,
   walletHomeOnboardingProgressRatioForStep,
+  walletHomeOnboardingShouldHoldRenderForDroppedStep,
   type WalletHomeOnboardingStepKind,
 } from './walletHomeOnboardingStepsModel';
+import { useWalletHomeOnboardingVisibleSteps } from './useWalletHomeOnboardingVisibleSteps';
 import { walletHomeOnboardingPrimaryDeferDecision } from './walletHomeOnboardingStepsPrimaryPress';
 import {
   walletHomeOnboardingPrimaryLabelForStep,
@@ -136,21 +137,38 @@ const WalletHomeOnboardingSteps: React.FC<WalletHomeOnboardingStepsProps> = ({
     selectWalletHomeOnboardingSteps,
   );
   const stepIndex = walletHomeOnboardingStepsState.stepIndex ?? 0;
+  /** Notifications step is dropped once the OS push request already happened (TMCU-924). */
+  const { includeNotificationsStep, steps: visibleSteps } =
+    useWalletHomeOnboardingVisibleSteps();
+  const totalSteps = visibleSteps.length;
 
   useWalletHomeOnboardingChecklistHomeViewed({
     isAwaitingBalance,
     stepIndex,
     isFocused,
+    steps: visibleSteps,
   });
   const displayStepIndex = isAwaitingBalance ? 0 : stepIndex;
   /** Capped index for progress + hero; matches visible steps bounds before Redux clamps persisted step. */
-  const visualStepIndexForProgress =
-    walletHomeOnboardingCappedVisualStepIndex(displayStepIndex);
+  const visualStepIndexForProgress = walletHomeOnboardingCappedVisualStepIndex(
+    displayStepIndex,
+    totalSteps,
+  );
+
+  const isStepIndexBeyondVisibleSteps =
+    walletHomeOnboardingShouldHoldRenderForDroppedStep({
+      displayStepIndex,
+      stepCount: totalSteps,
+      includeNotificationsStep,
+    });
 
   const [slideX] = useState(() => new Animated.Value(0));
   const [slideY] = useState(() => new Animated.Value(0));
   const progressRatio = useSharedValue(
-    walletHomeOnboardingProgressRatioForStep(visualStepIndexForProgress),
+    walletHomeOnboardingProgressRatioForStep(
+      visualStepIndexForProgress,
+      totalSteps,
+    ),
   );
   const isFirstProgressSync = useRef(true);
   const onProgressFillCompleteRef = useRef<
@@ -201,23 +219,28 @@ const WalletHomeOnboardingSteps: React.FC<WalletHomeOnboardingStepsProps> = ({
   const [isAwaitingDeferredNavResumeHold, setIsAwaitingDeferredNavResumeHold] =
     useState(false);
   const stepIndexRef = useRef(stepIndex);
-  const isLastStepRef = useRef(
-    stepIndex >= WALLET_HOME_ONBOARDING_VISIBLE_STEPS.length - 1,
-  );
+  const isLastStepRef = useRef(stepIndex >= totalSteps - 1);
   /** Kept in sync with `stepIndex` + `isAwaitingBalance` so Primary commit matches `goNextOrComplete` ref reads. */
   const currentStepKindRef = useRef<WalletHomeOnboardingStepKind>(
-    WALLET_HOME_ONBOARDING_VISIBLE_STEPS[visualStepIndexForProgress].kind,
+    visibleSteps[visualStepIndexForProgress].kind,
   );
   useEffect(() => {
     canAdvanceFundStepAfterBalanceRef.current = canAdvanceFundStepAfterBalance;
     stepIndexRef.current = stepIndex;
-    isLastStepRef.current =
-      stepIndex >= WALLET_HOME_ONBOARDING_VISIBLE_STEPS.length - 1;
+    isLastStepRef.current = stepIndex >= totalSteps - 1;
     const displayIdx = isAwaitingBalance ? 0 : stepIndex;
-    const cappedVisual = walletHomeOnboardingCappedVisualStepIndex(displayIdx);
-    currentStepKindRef.current =
-      WALLET_HOME_ONBOARDING_VISIBLE_STEPS[cappedVisual].kind;
-  }, [stepIndex, isAwaitingBalance, canAdvanceFundStepAfterBalance]);
+    const cappedVisual = walletHomeOnboardingCappedVisualStepIndex(
+      displayIdx,
+      totalSteps,
+    );
+    currentStepKindRef.current = visibleSteps[cappedVisual].kind;
+  }, [
+    canAdvanceFundStepAfterBalance,
+    isAwaitingBalance,
+    stepIndex,
+    totalSteps,
+    visibleSteps,
+  ]);
 
   useEffect(
     () => () => {
@@ -275,11 +298,16 @@ const WalletHomeOnboardingSteps: React.FC<WalletHomeOnboardingStepsProps> = ({
   }, []);
 
   useEffect(() => {
-    const max = walletHomeOnboardingMaxPersistedStepIndex();
-    if (stepIndex > max) {
-      dispatch(setWalletHomeOnboardingStepsStep(max));
+    const max = walletHomeOnboardingMaxPersistedStepIndex(totalSteps);
+    if (stepIndex <= max) {
+      return;
+    }
+    if (!includeNotificationsStep) {
+      dispatch(suppressWalletHomeOnboardingSteps('flow_completed'));
+      return;
     }
-  }, [dispatch, stepIndex]);
+    dispatch(setWalletHomeOnboardingStepsStep(max));
+  }, [dispatch, includeNotificationsStep, stepIndex, totalSteps]);
 
   /**
    * When leaving this screen (swaps / settings / onramp), mark blur even if `useIsFocused` does
@@ -329,13 +357,12 @@ const WalletHomeOnboardingSteps: React.FC<WalletHomeOnboardingStepsProps> = ({
     };
   }, [isAwaitingBalance, skipIntroAfterDeferredNavReturn]);
 
-  const totalSteps = WALLET_HOME_ONBOARDING_VISIBLE_STEPS.length;
-  const currentStep =
-    WALLET_HOME_ONBOARDING_VISIBLE_STEPS[visualStepIndexForProgress];
+  const currentStep = visibleSteps[visualStepIndexForProgress];
 
   useEffect(() => {
     const target = walletHomeOnboardingProgressRatioForStep(
       visualStepIndexForProgress,
+      totalSteps,
     );
     if (isFirstProgressSync.current) {
       isFirstProgressSync.current = false;
@@ -345,7 +372,7 @@ const WalletHomeOnboardingSteps: React.FC<WalletHomeOnboardingStepsProps> = ({
     animateWalletHomeOnboardingProgressRatio(progressRatio, target, {
       instant: hasTestOverrides,
     });
-  }, [progressRatio, visualStepIndexForProgress]);
+  }, [progressRatio, totalSteps, visualStepIndexForProgress]);
 
   const handleProgressFillComplete = useCallback((finished: boolean) => {
     onProgressFillCompleteRef.current?.(finished);
@@ -679,13 +706,13 @@ const WalletHomeOnboardingSteps: React.FC<WalletHomeOnboardingStepsProps> = ({
   const progressLabel = useMemo(
     () =>
       strings('wallet.home_onboarding_steps.progress_a11y', {
-        current: displayStepIndex + 1,
+        current: visualStepIndexForProgress + 1,
         total: totalSteps,
       }),
-    [displayStepIndex, totalSteps],
+    [totalSteps, visualStepIndexForProgress],
   );
 
-  if (!currentStep) {
+  if (!currentStep || isStepIndexBeyondVisibleSteps) {
     return null;
   }
 
@@ -861,7 +888,7 @@ const WalletHomeOnboardingSteps: React.FC<WalletHomeOnboardingStepsProps> = ({
               color={TextColor.TextAlternative}
               fontWeight={FontWeight.Medium}
             >
-              {displayStepIndex + 1}/{totalSteps}
+              {visualStepIndexForProgress + 1}/{totalSteps}
             </Text>
           </Box>
 
diff --git a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.test.ts b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.test.ts
index 45cb03c0ba67..141c37a39b22 100644
--- a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.test.ts
+++ b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.test.ts
@@ -84,7 +84,9 @@ describe('useWalletHomeOnboardingChecklistFundPress', () => {
       order_count: 2,
     });
     expect(mockTrackEvent).toHaveBeenCalledWith({ event: 'built' });
-    expect(goToBuy).toHaveBeenCalledWith(undefined);
+    expect(goToBuy).toHaveBeenCalledWith(undefined, {
+      surface: 'home',
+    });
   });
 
   it('passes resolved ramp intent to goToBuy when available', () => {
@@ -101,8 +103,11 @@ describe('useWalletHomeOnboardingChecklistFundPress', () => {
       result.current();
     });
 
-    expect(goToBuy).toHaveBeenCalledWith({
-      assetId: MAINNET_MUSD_RAMP_ASSET_ID,
-    });
+    expect(goToBuy).toHaveBeenCalledWith(
+      {
+        assetId: MAINNET_MUSD_RAMP_ASSET_ID,
+      },
+      { surface: 'home' },
+    );
   });
 });
diff --git a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.ts b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.ts
index 415cd579f75a..226d29a19db3 100644
--- a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.ts
+++ b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.ts
@@ -5,6 +5,7 @@ import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import { ActionLocation } from '../../../util/analytics/actionButtonTracking';
 import { getDetectedGeolocation } from '../../../reducers/fiatOrders';
 import { useRampsButtonClickData } from '../Ramp/hooks/useRampsButtonClickData';
+import { RAMPS_BUY_CUF_SURFACE } from '../Ramp/constants/rampsBuyCufTags';
 import { walletHomeOnboardingPrimaryLabelForStep } from './walletHomeOnboardingStepsStrings';
 import { useWalletHomeOnboardingFundRampIntent } from './useWalletHomeOnboardingFundRampIntent';
 
@@ -39,7 +40,7 @@ export function useWalletHomeOnboardingChecklistFundPress(
         .build(),
     );
 
-    goToBuy(rampIntent);
+    goToBuy(rampIntent, { surface: RAMPS_BUY_CUF_SURFACE.HOME });
   }, [
     buttonClickData.is_authenticated,
     buttonClickData.order_count,
diff --git a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistHomeViewed.test.ts b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistHomeViewed.test.ts
index 5e925f041956..f7fd3cdbf92d 100644
--- a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistHomeViewed.test.ts
+++ b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistHomeViewed.test.ts
@@ -2,6 +2,14 @@ import { renderHook } from '@testing-library/react-hooks';
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import { WALLET_HOME_ONBOARDING_CHECKLIST_INTERACTION_TYPE } from './walletHomeOnboardingChecklistAnalytics';
 import { useWalletHomeOnboardingChecklistHomeViewed } from './useWalletHomeOnboardingChecklistHomeViewed';
+import { walletHomeOnboardingVisibleSteps } from './walletHomeOnboardingStepsModel';
+
+const ALL_STEPS = walletHomeOnboardingVisibleSteps({
+  includeNotificationsStep: true,
+});
+const STEPS_WITHOUT_NOTIFICATIONS = walletHomeOnboardingVisibleSteps({
+  includeNotificationsStep: false,
+});
 
 const mockTrackEvent = jest.fn();
 const mockBuild = jest.fn(() => ({ builtEvent: true }));
@@ -45,6 +53,7 @@ describe('useWalletHomeOnboardingChecklistHomeViewed', () => {
         isAwaitingBalance: false,
         stepIndex: 0,
         isFocused: true,
+        steps: ALL_STEPS,
       }),
     );
 
@@ -57,6 +66,7 @@ describe('useWalletHomeOnboardingChecklistHomeViewed', () => {
         isAwaitingBalance: false,
         stepIndex: 0,
         isFocused: false,
+        steps: ALL_STEPS,
       }),
     );
 
@@ -69,6 +79,7 @@ describe('useWalletHomeOnboardingChecklistHomeViewed', () => {
         isAwaitingBalance: false,
         stepIndex: 0,
         isFocused: true,
+        steps: ALL_STEPS,
       }),
     );
 
@@ -96,6 +107,7 @@ describe('useWalletHomeOnboardingChecklistHomeViewed', () => {
         isAwaitingBalance: false,
         stepIndex: 1,
         isFocused: true,
+        steps: ALL_STEPS,
       }),
     );
 
@@ -113,6 +125,7 @@ describe('useWalletHomeOnboardingChecklistHomeViewed', () => {
         isAwaitingBalance: false,
         stepIndex: 2,
         isFocused: true,
+        steps: ALL_STEPS,
       }),
     );
 
@@ -124,12 +137,67 @@ describe('useWalletHomeOnboardingChecklistHomeViewed', () => {
     );
   });
 
+  it('reports two sections and no notifications section when the notifications step is dropped', () => {
+    renderHook(() =>
+      useWalletHomeOnboardingChecklistHomeViewed({
+        isAwaitingBalance: false,
+        stepIndex: 1,
+        isFocused: true,
+        steps: STEPS_WITHOUT_NOTIFICATIONS,
+      }),
+    );
+
+    expect(mockAddProperties).toHaveBeenCalledWith(
+      expect.objectContaining({
+        section_name: 'first_trade',
+        section_index: 1,
+        total_sections_loaded: 2,
+      }),
+    );
+  });
+
+  it('stays quiet when the persisted step outruns the visible steps', () => {
+    renderHook(() =>
+      useWalletHomeOnboardingChecklistHomeViewed({
+        isAwaitingBalance: false,
+        stepIndex: 2,
+        isFocused: true,
+        steps: STEPS_WITHOUT_NOTIFICATIONS,
+      }),
+    );
+
+    expect(mockTrackEvent).not.toHaveBeenCalled();
+  });
+
+  it('does not report the previous step as re-viewed when the notifications step is dropped mid-visit', () => {
+    const { rerender } = renderHook(
+      ({ steps }) =>
+        useWalletHomeOnboardingChecklistHomeViewed({
+          isAwaitingBalance: false,
+          stepIndex: 2,
+          isFocused: true,
+          steps,
+        }),
+      { initialProps: { steps: ALL_STEPS } },
+    );
+
+    expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+    expect(mockAddProperties).toHaveBeenLastCalledWith(
+      expect.objectContaining({ section_name: 'notifications' }),
+    );
+
+    rerender({ steps: STEPS_WITHOUT_NOTIFICATIONS });
+
+    expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+  });
+
   it('refires when visitId increments', () => {
     const { rerender } = renderHook(() =>
       useWalletHomeOnboardingChecklistHomeViewed({
         isAwaitingBalance: false,
         stepIndex: 0,
         isFocused: true,
+        steps: ALL_STEPS,
       }),
     );
 
@@ -159,6 +227,7 @@ describe('useWalletHomeOnboardingChecklistHomeViewed', () => {
           isAwaitingBalance: false,
           stepIndex,
           isFocused: true,
+          steps: ALL_STEPS,
         }),
       { initialProps: { stepIndex: 0 } },
     );
diff --git a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistHomeViewed.ts b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistHomeViewed.ts
index 82e8c6d4ef7d..69be41701622 100644
--- a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistHomeViewed.ts
+++ b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistHomeViewed.ts
@@ -3,8 +3,8 @@ import { MetaMetricsEvents } from '../../../core/Analytics';
 import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import { useHomepageScrollContext } from '../../Views/Homepage/context/HomepageScrollContext';
 import {
-  WALLET_HOME_ONBOARDING_VISIBLE_STEPS,
   walletHomeOnboardingCappedVisualStepIndex,
+  type WalletHomeOnboardingVisibleStep,
 } from './walletHomeOnboardingStepsModel';
 import {
   WALLET_HOME_ONBOARDING_CHECKLIST_INTERACTION_TYPE,
@@ -23,10 +23,13 @@ export function useWalletHomeOnboardingChecklistHomeViewed({
   isAwaitingBalance,
   stepIndex,
   isFocused,
+  steps,
 }: {
   isAwaitingBalance: boolean;
   stepIndex: number;
   isFocused: boolean;
+  /** Resolved visible steps — `total_sections_loaded` / `section_name` follow what the user sees. */
+  steps: WalletHomeOnboardingVisibleStep[];
 }): void {
   const { entryPoint, visitId, appSessionId } = useHomepageScrollContext();
   const { trackEvent, createEventBuilder } = useAnalytics();
@@ -42,12 +45,21 @@ export function useWalletHomeOnboardingChecklistHomeViewed({
     }
 
     const displayIdx = isAwaitingBalance ? 0 : stepIndex;
-    const cappedVisual = walletHomeOnboardingCappedVisualStepIndex(displayIdx);
-    const stepKind = WALLET_HOME_ONBOARDING_VISIBLE_STEPS[cappedVisual].kind;
+    if (displayIdx > steps.length - 1) {
+      return;
+    }
+    const cappedVisual = walletHomeOnboardingCappedVisualStepIndex(
+      displayIdx,
+      steps.length,
+    );
+    const stepKind = steps[cappedVisual]?.kind;
+    if (!stepKind) {
+      return;
+    }
     const sectionName =
       walletHomeOnboardingStepKindToHomeViewedSectionName(stepKind);
 
-    const dedupeKey = `${visitId}:${cappedVisual}`;
+    const dedupeKey = `${visitId}:${stepKind}`;
     if (lastFiredVisitStepKeyRef.current === dedupeKey) {
       return;
     }
@@ -60,7 +72,7 @@ export function useWalletHomeOnboardingChecklistHomeViewed({
           location: 'home',
           section_name: sectionName,
           section_index: cappedVisual,
-          total_sections_loaded: WALLET_HOME_ONBOARDING_VISIBLE_STEPS.length,
+          total_sections_loaded: steps.length,
           is_empty: isAwaitingBalance && cappedVisual === 0,
           item_count: 1,
           entry_point: entryPoint,
@@ -76,6 +88,7 @@ export function useWalletHomeOnboardingChecklistHomeViewed({
     isAwaitingBalance,
     isFocused,
     stepIndex,
+    steps,
     trackEvent,
     visitId,
   ]);
diff --git a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingVisibleSteps.test.ts b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingVisibleSteps.test.ts
new file mode 100644
index 000000000000..16c09bd4e6b7
--- /dev/null
+++ b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingVisibleSteps.test.ts
@@ -0,0 +1,71 @@
+import { renderHook } from '@testing-library/react-native';
+import { useWalletHomeOnboardingVisibleSteps } from './useWalletHomeOnboardingVisibleSteps';
+
+const mockSelectPushNotificationOsPromptRequested = jest.fn();
+
+jest.mock('react-redux', () => ({
+  useSelector: (selector: unknown) => (selector as () => boolean)(),
+}));
+
+jest.mock('../../../selectors/onboarding', () => ({
+  selectPushNotificationOsPromptRequested: () =>
+    mockSelectPushNotificationOsPromptRequested(),
+}));
+
+describe('useWalletHomeOnboardingVisibleSteps', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('includes the notifications step when the OS push request has not happened', () => {
+    mockSelectPushNotificationOsPromptRequested.mockReturnValue(false);
+
+    const { result } = renderHook(() => useWalletHomeOnboardingVisibleSteps());
+
+    expect(result.current.includeNotificationsStep).toBe(true);
+    expect(result.current.steps.map((step) => step.kind)).toEqual([
+      'fund',
+      'trade',
+      'notifications',
+    ]);
+  });
+
+  it('drops the notifications step once the OS push request has happened', () => {
+    mockSelectPushNotificationOsPromptRequested.mockReturnValue(true);
+
+    const { result } = renderHook(() => useWalletHomeOnboardingVisibleSteps());
+
+    expect(result.current.includeNotificationsStep).toBe(false);
+    expect(result.current.steps.map((step) => step.kind)).toEqual([
+      'fund',
+      'trade',
+    ]);
+  });
+
+  it('keeps a stable steps reference across re-renders', () => {
+    mockSelectPushNotificationOsPromptRequested.mockReturnValue(false);
+
+    const { result, rerender } = renderHook(() =>
+      useWalletHomeOnboardingVisibleSteps(),
+    );
+    const firstSteps = result.current.steps;
+
+    rerender({});
+
+    expect(result.current.steps).toBe(firstSteps);
+  });
+
+  it('recomputes the steps when the flag flips mid-flow', () => {
+    mockSelectPushNotificationOsPromptRequested.mockReturnValue(false);
+
+    const { result, rerender } = renderHook(() =>
+      useWalletHomeOnboardingVisibleSteps(),
+    );
+    expect(result.current.steps).toHaveLength(3);
+
+    mockSelectPushNotificationOsPromptRequested.mockReturnValue(true);
+    rerender({});
+
+    expect(result.current.steps).toHaveLength(2);
+  });
+});
diff --git a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingVisibleSteps.ts b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingVisibleSteps.ts
new file mode 100644
index 000000000000..8a686067adfa
--- /dev/null
+++ b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingVisibleSteps.ts
@@ -0,0 +1,36 @@
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import { selectPushNotificationOsPromptRequested } from '../../../selectors/onboarding';
+import {
+  walletHomeOnboardingVisibleSteps,
+  type WalletHomeOnboardingVisibleStep,
+} from './walletHomeOnboardingStepsModel';
+
+export interface WalletHomeOnboardingVisibleStepsResult {
+  /** Ordered steps to show; `notifications` is omitted when the OS push request already happened. */
+  steps: WalletHomeOnboardingVisibleStep[];
+  includeNotificationsStep: boolean;
+}
+
+/**
+ * Resolves the checklist steps for the current user.
+ *
+ * The notifications step only belongs in the checklist for users who have not been taken to
+ * the OS push permission request — everyone else already answered that question (from the
+ * push pre-prompt or another enable path) and must not be nudged twice.
+ *
+ * @see https://consensyssoftware.atlassian.net/browse/TMCU-924
+ */
+export function useWalletHomeOnboardingVisibleSteps(): WalletHomeOnboardingVisibleStepsResult {
+  const pushNotificationOsPromptRequested = useSelector(
+    selectPushNotificationOsPromptRequested,
+  );
+  const includeNotificationsStep = !pushNotificationOsPromptRequested;
+
+  const steps = useMemo(
+    () => walletHomeOnboardingVisibleSteps({ includeNotificationsStep }),
+    [includeNotificationsStep],
+  );
+
+  return { includeNotificationsStep, steps };
+}
diff --git a/app/components/UI/WalletHomeOnboardingSteps/walletHomeOnboardingStepsModel.test.ts b/app/components/UI/WalletHomeOnboardingSteps/walletHomeOnboardingStepsModel.test.ts
new file mode 100644
index 000000000000..fb90210f897e
--- /dev/null
+++ b/app/components/UI/WalletHomeOnboardingSteps/walletHomeOnboardingStepsModel.test.ts
@@ -0,0 +1,137 @@
+import {
+  WALLET_HOME_ONBOARDING_ALL_STEPS,
+  walletHomeOnboardingCappedVisualStepIndex,
+  walletHomeOnboardingMaxPersistedStepIndex,
+  walletHomeOnboardingProgressDenominator,
+  walletHomeOnboardingProgressRatioForStep,
+  walletHomeOnboardingShouldHoldRenderForDroppedStep,
+  walletHomeOnboardingVisibleSteps,
+} from './walletHomeOnboardingStepsModel';
+
+describe('walletHomeOnboardingStepsModel', () => {
+  describe('walletHomeOnboardingVisibleSteps', () => {
+    it('keeps every step when the notifications step is included', () => {
+      const steps = walletHomeOnboardingVisibleSteps({
+        includeNotificationsStep: true,
+      });
+
+      expect(steps.map((step) => step.kind)).toEqual([
+        'fund',
+        'trade',
+        'notifications',
+      ]);
+    });
+
+    it('drops only the notifications step when it is excluded', () => {
+      const steps = walletHomeOnboardingVisibleSteps({
+        includeNotificationsStep: false,
+      });
+
+      expect(steps.map((step) => step.kind)).toEqual(['fund', 'trade']);
+    });
+
+    it('preserves the button layout of the remaining steps', () => {
+      const steps = walletHomeOnboardingVisibleSteps({
+        includeNotificationsStep: false,
+      });
+
+      expect(steps).toEqual([
+        { kind: 'fund', buttonLayout: 'full_width_primary' },
+        { kind: 'trade', buttonLayout: 'skip_and_primary_row' },
+      ]);
+    });
+
+    it('does not mutate the step catalogue', () => {
+      walletHomeOnboardingVisibleSteps({ includeNotificationsStep: false });
+
+      expect(WALLET_HOME_ONBOARDING_ALL_STEPS.map((step) => step.kind)).toEqual(
+        ['fund', 'trade', 'notifications'],
+      );
+    });
+  });
+
+  describe('walletHomeOnboardingProgressDenominator', () => {
+    it('reserves a final segment for the completion fill', () => {
+      expect(walletHomeOnboardingProgressDenominator(3)).toBe(4);
+      expect(walletHomeOnboardingProgressDenominator(2)).toBe(3);
+    });
+
+    it('never divides by zero for an empty step list', () => {
+      expect(walletHomeOnboardingProgressDenominator(0)).toBe(2);
+    });
+  });
+
+  describe('walletHomeOnboardingProgressRatioForStep', () => {
+    it('spreads three steps across quarters', () => {
+      expect(walletHomeOnboardingProgressRatioForStep(0, 3)).toBe(0.25);
+      expect(walletHomeOnboardingProgressRatioForStep(1, 3)).toBe(0.5);
+      expect(walletHomeOnboardingProgressRatioForStep(2, 3)).toBe(0.75);
+    });
+
+    it('spreads two steps across thirds', () => {
+      expect(walletHomeOnboardingProgressRatioForStep(0, 2)).toBeCloseTo(1 / 3);
+      expect(walletHomeOnboardingProgressRatioForStep(1, 2)).toBeCloseTo(2 / 3);
+    });
+  });
+
+  describe('walletHomeOnboardingMaxPersistedStepIndex', () => {
+    it('returns the last index of the visible steps', () => {
+      expect(walletHomeOnboardingMaxPersistedStepIndex(3)).toBe(2);
+      expect(walletHomeOnboardingMaxPersistedStepIndex(2)).toBe(1);
+    });
+
+    it('clamps at zero for an empty step list', () => {
+      expect(walletHomeOnboardingMaxPersistedStepIndex(0)).toBe(0);
+    });
+  });
+
+  describe('walletHomeOnboardingShouldHoldRenderForDroppedStep', () => {
+    it('holds the render when the notifications step was dropped under the user', () => {
+      expect(
+        walletHomeOnboardingShouldHoldRenderForDroppedStep({
+          displayStepIndex: 2,
+          stepCount: 2,
+          includeNotificationsStep: false,
+        }),
+      ).toBe(true);
+    });
+
+    it('still renders a legacy out-of-range step while the notifications step is shown', () => {
+      expect(
+        walletHomeOnboardingShouldHoldRenderForDroppedStep({
+          displayStepIndex: 7,
+          stepCount: 3,
+          includeNotificationsStep: true,
+        }),
+      ).toBe(false);
+    });
+
+    it('never holds the render for an in-range step', () => {
+      expect(
+        walletHomeOnboardingShouldHoldRenderForDroppedStep({
+          displayStepIndex: 1,
+          stepCount: 2,
+          includeNotificationsStep: false,
+        }),
+      ).toBe(false);
+      expect(
+        walletHomeOnboardingShouldHoldRenderForDroppedStep({
+          displayStepIndex: 2,
+          stepCount: 3,
+          includeNotificationsStep: true,
+        }),
+      ).toBe(false);
+    });
+  });
+
+  describe('walletHomeOnboardingCappedVisualStepIndex', () => {
+    it('passes through in-range indices', () => {
+      expect(walletHomeOnboardingCappedVisualStepIndex(1, 3)).toBe(1);
+    });
+
+    it('caps an index that outruns the visible steps', () => {
+      expect(walletHomeOnboardingCappedVisualStepIndex(2, 2)).toBe(1);
+      expect(walletHomeOnboardingCappedVisualStepIndex(9, 3)).toBe(2);
+    });
+  });
+});
diff --git a/app/components/UI/WalletHomeOnboardingSteps/walletHomeOnboardingStepsModel.ts b/app/components/UI/WalletHomeOnboardingSteps/walletHomeOnboardingStepsModel.ts
index c4c86c41c48a..1557f8b7492f 100644
--- a/app/components/UI/WalletHomeOnboardingSteps/walletHomeOnboardingStepsModel.ts
+++ b/app/components/UI/WalletHomeOnboardingSteps/walletHomeOnboardingStepsModel.ts
@@ -9,33 +9,75 @@ export interface WalletHomeOnboardingVisibleStep {
   buttonLayout: StepButtonLayout;
 }
 
-/** Ordered checklist steps (fund → trade → notifications). */
-export const WALLET_HOME_ONBOARDING_VISIBLE_STEPS: WalletHomeOnboardingVisibleStep[] =
+/** Every checklist step in order (fund → trade → notifications), before per-user filtering. */
+export const WALLET_HOME_ONBOARDING_ALL_STEPS: readonly WalletHomeOnboardingVisibleStep[] =
   [
     { kind: 'fund', buttonLayout: 'full_width_primary' },
     { kind: 'trade', buttonLayout: 'skip_and_primary_row' },
     { kind: 'notifications', buttonLayout: 'skip_and_primary_row' },
   ];
 
-/** Progress segments: step 1 → 25%, 2 → 50%, 3 → 75%; 100% runs on completion before exit. */
-export const WALLET_HOME_ONBOARDING_PROGRESS_DENOMINATOR =
-  WALLET_HOME_ONBOARDING_VISIBLE_STEPS.length + 1;
+/**
+ * The steps this user should walk through.
+ *
+ * The notifications step is dropped once the OS push permission request has already been
+ * asked for — that user answered the notifications question at the push pre-prompt, so
+ * asking again here would be a second nudge. Users who chose "Not now" on the pre-prompt
+ * never reached the OS request and still get the step.
+ *
+ * @see https://consensyssoftware.atlassian.net/browse/TMCU-924
+ */
+export function walletHomeOnboardingVisibleSteps({
+  includeNotificationsStep,
+}: {
+  includeNotificationsStep: boolean;
+}): WalletHomeOnboardingVisibleStep[] {
+  return WALLET_HOME_ONBOARDING_ALL_STEPS.filter(
+    (step) => includeNotificationsStep || step.kind !== 'notifications',
+  );
+}
+
+/** Progress segments with 3 steps: step 1 → 25%, 2 → 50%, 3 → 75%; 100% runs on completion before exit. */
+export function walletHomeOnboardingProgressDenominator(
+  stepCount: number,
+): number {
+  return Math.max(1, stepCount) + 1;
+}
 
 export function walletHomeOnboardingProgressRatioForStep(
   stepIndex: number,
+  stepCount: number,
 ): number {
-  return (stepIndex + 1) / WALLET_HOME_ONBOARDING_PROGRESS_DENOMINATOR;
+  return (stepIndex + 1) / walletHomeOnboardingProgressDenominator(stepCount);
 }
 
 export function walletHomeOnboardingCappedVisualStepIndex(
   displayStepIndex: number,
+  stepCount: number,
 ): number {
   return Math.min(
     displayStepIndex,
-    WALLET_HOME_ONBOARDING_VISIBLE_STEPS.length - 1,
+    walletHomeOnboardingMaxPersistedStepIndex(stepCount),
   );
 }
 
-export function walletHomeOnboardingMaxPersistedStepIndex(): number {
-  return Math.max(0, WALLET_HOME_ONBOARDING_VISIBLE_STEPS.length - 1);
+export function walletHomeOnboardingMaxPersistedStepIndex(
+  stepCount: number,
+): number {
+  return Math.max(0, stepCount - 1);
+}
+
+export function walletHomeOnboardingShouldHoldRenderForDroppedStep({
+  displayStepIndex,
+  stepCount,
+  includeNotificationsStep,
+}: {
+  displayStepIndex: number;
+  stepCount: number;
+  includeNotificationsStep: boolean;
+}): boolean {
+  return (
+    !includeNotificationsStep &&
+    displayStepIndex > walletHomeOnboardingMaxPersistedStepIndex(stepCount)
+  );
 }
diff --git a/app/components/Views/AccountStatus/AccountStatus.view.test.tsx b/app/components/Views/AccountStatus/AccountStatus.view.test.tsx
index a3a770270d86..bfc24cf0dec6 100644
--- a/app/components/Views/AccountStatus/AccountStatus.view.test.tsx
+++ b/app/components/Views/AccountStatus/AccountStatus.view.test.tsx
@@ -1,13 +1,11 @@
 /**
  * Component View tests for the Account Already Exists screen.
  *
- * Mirrors (partial):
- * - tests/smoke/seedless/apple-login-existing-user.spec.ts
- * - tests/smoke/seedless/google-login-existing-user.spec.ts
+ * Replaces former Appium seedless existing-user specs:
  *
- * CV covers Account Already Exists UI and Login navigation after OAuth detects
- * an existing user. Full E2E still required for OAuth mockttp, onboarding sheet,
- * and native provider flows — see SocialLoginIosUser.view.test.tsx and E2E specs.
+ * CV owns Account Already Exists UI and Login / different-method navigation.
+ * OAuth → AccountAlreadyExists routing remains covered by
+ * Onboarding/index.test.tsx. Keep Appium for new-user Google/Apple smokes only.
  *
  * Run:
  * yarn jest -c jest.config.view.js AccountStatus.view.test.tsx --runInBand
diff --git a/app/components/Views/AccountsMenu/AccountsMenu.tsx b/app/components/Views/AccountsMenu/AccountsMenu.tsx
index c98e4561e4f2..46e78e9a0b49 100644
--- a/app/components/Views/AccountsMenu/AccountsMenu.tsx
+++ b/app/components/Views/AccountsMenu/AccountsMenu.tsx
@@ -35,6 +35,7 @@ import { useRampsButtonClickData } from '../../UI/Ramp/hooks/useRampsButtonClick
 // eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): route-isolation backlog
 import { WalletViewSelectorsIDs } from '../Wallet/WalletView.testIds';
 import { useRampNavigation } from '../../UI/Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../UI/Ramp/constants/rampsBuyCufTags';
 import { isNotificationsFeatureEnabled } from '../../../util/notifications';
 import {
   getMetamaskNotificationsReadCount,
@@ -76,7 +77,7 @@ const AccountsMenu = () => {
         })
         .build(),
     );
-    goToBuy();
+    goToBuy(undefined, { surface: RAMPS_BUY_CUF_SURFACE.ACCOUNTS_MENU });
   }, [
     goToBuy,
     createEventBuilder,
diff --git a/app/components/Views/ActivityDetails/components/ActivityDetailsFooter.test.tsx b/app/components/Views/ActivityDetails/components/ActivityDetailsFooter.test.tsx
index 20ffba20b6fd..950ebe91d3df 100644
--- a/app/components/Views/ActivityDetails/components/ActivityDetailsFooter.test.tsx
+++ b/app/components/Views/ActivityDetails/components/ActivityDetailsFooter.test.tsx
@@ -21,6 +21,12 @@ jest.mock('../hooks/useActivityBlockExplorer', () => ({
   useActivityBlockExplorer: jest.fn(),
 }));
 
+/** Only the identity fields matter here — the sheet re-derives the rest. */
+type BridgeExplorerSheetTx = Pick<
+  React.ComponentProps<typeof ActivityDetailsBridgeExplorerButtons>,
+  'evmTxMeta' | 'multiChainTx'
+>;
+
 const useExplorerMock = jest.mocked(useActivityBlockExplorer);
 const { BLOCK_EXPLORER_BUTTON, DO_IT_AGAIN_BUTTON } =
   ActivityDetailsSelectorsIDs;
@@ -98,7 +104,45 @@ describe('ActivityDetailsFooter components', () => {
       expect(queryByTestId(`${BLOCK_EXPLORER_BUTTON}-source`)).toBeNull();
     });
 
-    it('renders a button per leg for a cross-chain transaction', () => {
+    it.each([
+      [
+        'an EVM transaction',
+        { evmTxMeta: { id: 'tx-1' } } as BridgeExplorerSheetTx,
+      ],
+      [
+        'a non-EVM transaction',
+        { multiChainTx: { id: 'tx-1' } } as BridgeExplorerSheetTx,
+      ],
+    ])(
+      'opens the block-explorer sheet from one button for a cross-chain bridge with %s',
+      (_name, tx) => {
+        useExplorerMock.mockImplementation((chainId, hash) =>
+          hash ? { url: `u-${chainId}`, title: `t-${chainId}` } : undefined,
+        );
+
+        const { getByTestId, queryByTestId } = renderWithProvider(
+          <ActivityDetailsBridgeExplorerButtons
+            sourceChainId="eip155:1"
+            sourceHash="0xs"
+            destChainId="eip155:8453"
+            destHash="0xd"
+            {...tx}
+          />,
+        );
+
+        expect(queryByTestId(`${BLOCK_EXPLORER_BUTTON}-source`)).toBeNull();
+        expect(queryByTestId(`${BLOCK_EXPLORER_BUTTON}-dest`)).toBeNull();
+
+        fireEvent.press(getByTestId(BLOCK_EXPLORER_BUTTON));
+
+        expect(mockNavigate).toHaveBeenCalledWith(Routes.BRIDGE.MODALS.ROOT, {
+          screen: Routes.BRIDGE.MODALS.TRANSACTION_DETAILS_BLOCK_EXPLORER,
+          params: expect.objectContaining(tx),
+        });
+      },
+    );
+
+    it('falls back to a button per leg when no transaction can back the sheet', () => {
       useExplorerMock.mockImplementation((chainId, hash) =>
         hash ? { url: `u-${chainId}`, title: `t-${chainId}` } : undefined,
       );
diff --git a/app/components/Views/ActivityDetails/components/ActivityDetailsFooter.tsx b/app/components/Views/ActivityDetails/components/ActivityDetailsFooter.tsx
index c925feb3a988..0a1673232679 100644
--- a/app/components/Views/ActivityDetails/components/ActivityDetailsFooter.tsx
+++ b/app/components/Views/ActivityDetails/components/ActivityDetailsFooter.tsx
@@ -1,5 +1,7 @@
 import React, { useCallback } from 'react';
 import { useNavigation } from '@react-navigation/native';
+import type { Transaction } from '@metamask/keyring-api';
+import type { TransactionMeta } from '@metamask/transaction-controller';
 import type { AppNavigationProp } from '../../../../core/NavigationService/types';
 import {
   Button,
@@ -88,21 +90,27 @@ export function ActivityDetailsBlockExplorerButton({
 }
 
 /**
- * Multi-explorer CTA for cross-chain (bridge) transactions: renders a separate
- * "view on explorer" button per leg when source and destination differ.
- * Falls back to a single button otherwise. Provided for per-type templates.
+ * Explorer CTA for bridge transactions. A cross-chain bridge gets one button
+ * opening the block-explorer sheet to pick a leg; same-chain rows go straight
+ * to the webview. The per-leg buttons are only a fallback for indexer-only
+ * rows, which have no local transaction for the sheet to resolve history from.
  */
 export function ActivityDetailsBridgeExplorerButtons({
   sourceChainId,
   sourceHash,
   destChainId,
   destHash,
+  evmTxMeta,
+  multiChainTx,
 }: {
   sourceChainId: string | undefined;
   sourceHash: string | undefined;
   destChainId: string | undefined;
   destHash: string | undefined;
+  evmTxMeta?: TransactionMeta;
+  multiChainTx?: Transaction;
 }) {
+  const navigation = useNavigation<AppNavigationProp>();
   const sourceLink = useActivityBlockExplorer(sourceChainId, sourceHash);
   const destLink = useActivityBlockExplorer(destChainId, destHash);
   const openWebview = useOpenWebview();
@@ -112,10 +120,31 @@ export function ActivityDetailsBridgeExplorerButtons({
     destChainId !== undefined &&
     destChainId !== sourceChainId;
 
+  const openExplorerSheet = useCallback(() => {
+    navigation.navigate(Routes.BRIDGE.MODALS.ROOT, {
+      screen: Routes.BRIDGE.MODALS.TRANSACTION_DETAILS_BLOCK_EXPLORER,
+      params: { evmTxMeta, multiChainTx },
+    });
+  }, [navigation, evmTxMeta, multiChainTx]);
+
   if (!sourceLink && !destLink) {
     return null;
   }
 
+  if (isCrossChain && (evmTxMeta || multiChainTx)) {
+    return (
+      <Button
+        variant={ButtonVariant.Secondary}
+        size={ButtonSize.Lg}
+        twClassName="w-full"
+        onPress={openExplorerSheet}
+        testID={ActivityDetailsSelectorsIDs.BLOCK_EXPLORER_BUTTON}
+      >
+        {strings('activity_details.view_on_block_explorer')}
+      </Button>
+    );
+  }
+
   if (!isCrossChain) {
     const link = sourceLink ?? destLink;
     return link ? (
diff --git a/app/components/Views/ActivityDetails/components/ActivityDetailsPayFees.test.tsx b/app/components/Views/ActivityDetails/components/ActivityDetailsPayFees.test.tsx
index 210a35de811b..a4731335d51e 100644
--- a/app/components/Views/ActivityDetails/components/ActivityDetailsPayFees.test.tsx
+++ b/app/components/Views/ActivityDetails/components/ActivityDetailsPayFees.test.tsx
@@ -1,10 +1,16 @@
 import React from 'react';
-import renderWithProvider from '../../../../util/test/renderWithProvider';
+import renderWithProvider, {
+  renderHookWithProvider,
+} from '../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../util/test/initial-root-state';
 import type { ActivityListItem } from '../../../../util/activity-adapters';
+import type {
+  MetamaskPayMetadata,
+  TransactionMeta,
+} from '@metamask/transaction-controller';
 import {
   ActivityDetailsPayFeesAndTotal,
-  hasActivityPayFiat,
+  useActivityPayFiat,
 } from './ActivityDetailsPayFees';
 import { ActivityDetailsSelectorsIDs } from '../ActivityDetails.testIds';
 
@@ -32,7 +38,7 @@ function payItem(
   } as unknown as ActivityListItem;
 }
 
-/** A provider-backed row — no local `TransactionMeta`, so no Pay metadata. */
+/** A provider-backed row — its Pay metadata lives on the local tx behind `hash`. */
 const providerItem = {
   type: 'predictionPlaced',
   chainId: 'eip155:137',
@@ -43,6 +49,11 @@ const providerItem = {
   raw: { type: 'predictActivity', data: { id: 'predict-1' } },
 } as unknown as ActivityListItem;
 
+/** Pay metadata as the component receives it, already resolved by the hook. */
+function pay(metamaskPay: Record<string, string>): MetamaskPayMetadata {
+  return metamaskPay as MetamaskPayMetadata;
+}
+
 const USDC_MAINNET = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48';
 const ACCOUNT = '0x0000000000000000000000000000000000000001';
 
@@ -63,6 +74,26 @@ const stateWithPayToken = {
   },
 };
 
+/** The local transaction a provider-backed row's hash points at. */
+const stateWithLocalPayTransaction = {
+  engine: {
+    backgroundState: {
+      ...backgroundState,
+      TransactionController: {
+        ...backgroundState.TransactionController,
+        transactions: [
+          {
+            id: 'tx-1',
+            chainId: '0x89',
+            hash: 'predict-1',
+            metamaskPay: { networkFeeFiat: '1.23', bridgeFeeFiat: '0.09' },
+          } as unknown as TransactionMeta,
+        ],
+      },
+    },
+  },
+};
+
 /** Non-USD display currency, to pin the deliberate USD formatting. */
 const eurState = {
   engine: {
@@ -85,7 +116,7 @@ describe('ActivityDetailsPayFeesAndTotal', () => {
   it('renders network fee, bridge fee and total', () => {
     const { getByText, getByTestId } = renderWithProvider(
       <ActivityDetailsPayFeesAndTotal
-        item={payItem({
+        pay={pay({
           networkFeeFiat: '0',
           bridgeFeeFiat: '0.04',
           totalFiat: '0.14',
@@ -103,18 +134,31 @@ describe('ActivityDetailsPayFeesAndTotal', () => {
     expect(getByText('$0.14')).toBeOnTheScreen();
   });
 
+  it('labels the network fee row from networkFeeLabel', () => {
+    // Perps calls the same value "Transaction fee".
+    const { getByText, queryByText } = renderWithProvider(
+      <ActivityDetailsPayFeesAndTotal
+        pay={pay({ networkFeeFiat: '1.23' })}
+        networkFeeLabel="Transaction fee"
+      />,
+    );
+
+    expect(getByText('Transaction fee')).toBeOnTheScreen();
+    expect(queryByText('Network fee')).toBeNull();
+  });
+
   it('formats in USD even when the display currency is not USD', () => {
     // Pay's values are USD amounts; reformatting them as EUR would relabel the
     // same number as a different currency.
     const { getByText, queryByText } = renderWithProvider(
       <ActivityDetailsPayFeesAndTotal
-        item={payItem({ bridgeFeeFiat: '0.04', totalFiat: '0.14' })}
+        pay={pay({ bridgeFeeFiat: '0.04', totalFiat: '0.14' })}
       />,
       { state: eurState },
     );
 
     expect(getByText('$0.04')).toBeOnTheScreen();
-    expect(queryByText('€0.04')).toBeNull();
+    expect(queryByText('\u20ac0.04')).toBeNull();
   });
 
   it('denominates the network fee in the payment chain native asset and the bridge fee in the payment token', () => {
@@ -122,7 +166,7 @@ describe('ActivityDetailsPayFeesAndTotal', () => {
     // the user paid with.
     const { getByText } = renderWithProvider(
       <ActivityDetailsPayFeesAndTotal
-        item={payItem({
+        pay={pay({
           chainId: '0x1',
           tokenAddress: USDC_MAINNET,
           networkFeeFiat: '1.23',
@@ -140,7 +184,7 @@ describe('ActivityDetailsPayFeesAndTotal', () => {
   it('denominates both fees in the native asset when the user paid with it', () => {
     const { getAllByText } = renderWithProvider(
       <ActivityDetailsPayFeesAndTotal
-        item={payItem({
+        pay={pay({
           chainId: '0x1',
           tokenAddress: '0x0000000000000000000000000000000000000000',
           networkFeeFiat: '1.23',
@@ -156,7 +200,7 @@ describe('ActivityDetailsPayFeesAndTotal', () => {
     // An untracked payment token has no symbol, so no nameless avatar.
     const { getByText, queryByText } = renderWithProvider(
       <ActivityDetailsPayFeesAndTotal
-        item={payItem({
+        pay={pay({
           chainId: '0x1',
           tokenAddress: USDC_MAINNET,
           bridgeFeeFiat: '0.09',
@@ -170,42 +214,70 @@ describe('ActivityDetailsPayFeesAndTotal', () => {
 
   it('renders the total alone when Pay recorded no fees', () => {
     const { getByTestId, queryByTestId } = renderWithProvider(
-      <ActivityDetailsPayFeesAndTotal item={payItem({ totalFiat: '0.14' })} />,
+      <ActivityDetailsPayFeesAndTotal pay={pay({ totalFiat: '0.14' })} />,
     );
 
     expect(getByTestId(TOTAL_ROW)).toBeOnTheScreen();
     expect(queryByTestId(NETWORK_FEE_ROW)).toBeNull();
     expect(queryByTestId(BRIDGE_FEE_ROW)).toBeNull();
   });
+});
 
-  it('renders nothing when the transaction has no Pay metadata', () => {
-    const { toJSON } = renderWithProvider(
-      <ActivityDetailsPayFeesAndTotal item={payItem(undefined)} />,
-    );
+describe('useActivityPayFiat', () => {
+  const renderPayFiat = (item: ActivityListItem, state?: object) =>
+    renderHookWithProvider(() => useActivityPayFiat(item), { state }).result
+      .current;
 
-    expect(toJSON()).toBeNull();
+  it('reads Pay metadata straight off a local row', () => {
+    expect(
+      renderPayFiat(payItem({ networkFeeFiat: '0', bridgeFeeFiat: '0.04' })),
+    ).toMatchObject({ networkFeeFiat: '0', bridgeFeeFiat: '0.04' });
   });
 
-  it('renders nothing for a row with no local transaction', () => {
-    const { toJSON } = renderWithProvider(
-      <ActivityDetailsPayFeesAndTotal item={providerItem} />,
-    );
+  it('resolves Pay metadata for a provider-backed row from the local transaction behind its hash', () => {
+    // Perps rows come from the HyperLiquid feed and carry no `metamaskPay`;
+    // only the on-chain hash ties them back to the local transaction.
+    expect(
+      renderPayFiat(providerItem, stateWithLocalPayTransaction),
+    ).toMatchObject({ networkFeeFiat: '1.23', bridgeFeeFiat: '0.09' });
+  });
 
-    expect(toJSON()).toBeNull();
+  it('is undefined for a provider-backed row with no matching local transaction', () => {
+    expect(renderPayFiat(providerItem)).toBeUndefined();
+  });
+
+  it('ignores a hash match on a different chain', () => {
+    const otherChainState = {
+      engine: {
+        backgroundState: {
+          ...backgroundState,
+          TransactionController: {
+            ...backgroundState.TransactionController,
+            transactions: [
+              {
+                id: 'tx-1',
+                chainId: '0x1',
+                hash: 'predict-1',
+                metamaskPay: { networkFeeFiat: '1.23' },
+              } as unknown as TransactionMeta,
+            ],
+          },
+        },
+      },
+    };
+
+    expect(renderPayFiat(providerItem, otherChainState)).toBeUndefined();
   });
-});
 
-describe('hasActivityPayFiat', () => {
   it.each([
-    ['is true for a recorded zero fee', { networkFeeFiat: '0' }, true],
-    ['is true for a total with no fees', { totalFiat: '0.14' }, true],
-    ['is false for empty Pay metadata', {}, false],
-  ])('%s', (_name, metamaskPay, expected) => {
-    expect(hasActivityPayFiat(payItem(metamaskPay))).toBe(expected);
+    ['a recorded zero fee resolves', { networkFeeFiat: '0' }, true],
+    ['a total with no fees resolves', { totalFiat: '0.14' }, true],
+    ['empty Pay metadata does not', {}, false],
+  ])('%s', (_name, metamaskPay, resolved) => {
+    expect(Boolean(renderPayFiat(payItem(metamaskPay)))).toBe(resolved);
   });
 
-  it('is false without Pay metadata or a local transaction', () => {
-    expect(hasActivityPayFiat(payItem(undefined))).toBe(false);
-    expect(hasActivityPayFiat(providerItem)).toBe(false);
+  it('is undefined when the local transaction has no Pay metadata', () => {
+    expect(renderPayFiat(payItem(undefined))).toBeUndefined();
   });
 });
diff --git a/app/components/Views/ActivityDetails/components/ActivityDetailsPayFees.tsx b/app/components/Views/ActivityDetails/components/ActivityDetailsPayFees.tsx
index 97278c9a69a0..606556e80490 100644
--- a/app/components/Views/ActivityDetails/components/ActivityDetailsPayFees.tsx
+++ b/app/components/Views/ActivityDetails/components/ActivityDetailsPayFees.tsx
@@ -11,6 +11,7 @@ import {
   type ActivityListItem,
 } from '../../../../util/activity-adapters';
 import { getNetworkImageSource } from '../../../../util/networks';
+import { useActivityPayMetadata } from '../hooks/useActivityPayMetadata';
 import { getTokenImageSource } from '../../../UI/ActivityListItemRow/tokenIcon';
 import useFiatFormatter from '../../../UI/SimulationDetails/FiatDisplay/useFiatFormatter';
 import {
@@ -30,26 +31,29 @@ interface PayFeeToken {
 }
 
 /**
- * MetaMask Pay's pre-aggregated fiat fees, read off the row's local transaction.
- * Pay-routed rows carry no token-denominated `data.fees`, so this is their only
- * fee source — the same one the legacy details screen reads.
+ * Pay's pre-aggregated fiat is the only fee source for a Pay-routed row, which
+ * carries no token-denominated `data.fees`.
+ *
+ * @param pay - Metadata to inspect.
+ * @returns Whether any fiat value is recorded.
  */
-function getActivityPayMetadata(
-  item: ActivityListItem,
-): MetamaskPayMetadata | undefined {
-  return item.raw?.type === 'localTransaction'
-    ? item.raw.data.primaryTransaction?.metamaskPay
-    : undefined;
+function hasPayFiat(pay: MetamaskPayMetadata | undefined): boolean {
+  return Boolean(pay?.networkFeeFiat || pay?.bridgeFeeFiat || pay?.totalFiat);
 }
 
 /**
- * Whether {@link ActivityDetailsPayFeesAndTotal} renders anything, so templates
- * can decide up front whether to add its divider. Fiat rather than fees: a row
- * carrying only `totalFiat` still renders a section.
+ * Gated on fiat rather than fees, so a `totalFiat`-only row still renders.
+ *
+ * @param item - Row to resolve.
+ * @returns The row's Pay metadata, or `undefined` when no fee section would
+ * render — what templates gate their divider on.
  */
-export function hasActivityPayFiat(item: ActivityListItem): boolean {
-  const pay = getActivityPayMetadata(item);
-  return Boolean(pay?.networkFeeFiat || pay?.bridgeFeeFiat || pay?.totalFiat);
+export function useActivityPayFiat(
+  item: ActivityListItem,
+): MetamaskPayMetadata | undefined {
+  const pay = useActivityPayMetadata(item);
+
+  return hasPayFiat(pay) ? pay : undefined;
 }
 
 /**
@@ -122,38 +126,40 @@ function PayFeeValue({
 }
 
 /**
- * Network fee / bridge fee / total for a MetaMask Pay-routed transaction. Rows
- * with no recorded value are omitted; a recorded zero still shows (`$0`).
+ * Network fee / bridge fee / total from {@link useActivityPayFiat}'s metadata.
+ * Unrecorded values omit their row; a recorded zero still shows (`$0`).
+ * `networkFeeLabel` is for Perps, which calls it "Transaction fee".
  */
 export function ActivityDetailsPayFeesAndTotal({
-  item,
+  pay,
+  networkFeeLabel = strings('activity_details.network_fee'),
 }: {
-  item: ActivityListItem;
+  pay: MetamaskPayMetadata;
+  networkFeeLabel?: string;
 }) {
   const formatFiat = useFiatFormatter({ currency: PAY_FIAT_CURRENCY });
-  const pay = getActivityPayMetadata(item);
   const { networkFeeToken, bridgeFeeToken } = usePayFeeTokens(pay);
 
-  if (!hasActivityPayFiat(item)) {
+  if (!hasPayFiat(pay)) {
     return null;
   }
 
   const formatPayFiat = (value: string | undefined) =>
     value ? formatFiat(new BigNumber(value)) : undefined;
 
-  const networkFee = formatPayFiat(pay?.networkFeeFiat);
-  const bridgeFee = formatPayFiat(pay?.bridgeFeeFiat);
+  const networkFee = formatPayFiat(pay.networkFeeFiat);
+  const bridgeFee = formatPayFiat(pay.bridgeFeeFiat);
 
   return (
     <ActivityDetailSection>
       <ActivityDetailRow
-        label={strings('activity_details.network_fee')}
+        label={networkFeeLabel}
         value={
           networkFee ? (
             <PayFeeValue
               value={networkFee}
               token={networkFeeToken}
-              chainId={pay?.chainId}
+              chainId={pay.chainId}
             />
           ) : undefined
         }
@@ -166,7 +172,7 @@ export function ActivityDetailsPayFeesAndTotal({
             <PayFeeValue
               value={bridgeFee}
               token={bridgeFeeToken}
-              chainId={pay?.chainId}
+              chainId={pay.chainId}
             />
           ) : undefined
         }
@@ -174,7 +180,7 @@ export function ActivityDetailsPayFeesAndTotal({
       />
       <ActivityDetailRow
         label={strings('activity_details.total_amount')}
-        value={formatPayFiat(pay?.totalFiat)}
+        value={formatPayFiat(pay.totalFiat)}
         testID={ActivityDetailsSelectorsIDs.TOTAL_ROW}
       />
     </ActivityDetailSection>
diff --git a/app/components/Views/ActivityDetails/components/ActivityDetailsPayNetworkRow.test.tsx b/app/components/Views/ActivityDetails/components/ActivityDetailsPayNetworkRow.test.tsx
new file mode 100644
index 000000000000..72c4892532ca
--- /dev/null
+++ b/app/components/Views/ActivityDetails/components/ActivityDetailsPayNetworkRow.test.tsx
@@ -0,0 +1,140 @@
+import React from 'react';
+import type { TransactionMeta } from '@metamask/transaction-controller';
+import renderWithProvider from '../../../../util/test/renderWithProvider';
+import { backgroundState } from '../../../../util/test/initial-root-state';
+import type { ActivityListItem } from '../../../../util/activity-adapters';
+import { ActivityDetailsSelectorsIDs } from '../ActivityDetails.testIds';
+import { ActivityDetailsPayNetworkRow } from './ActivityDetailsPayNetworkRow';
+
+/**
+ * A provider-backed funds row. `chainId` is the settlement chain the Activity
+ * list injects for HyperLiquid (Arbitrum), not a chain the user chose.
+ *
+ * @param overrides - Fields to replace on the base row.
+ * @returns The activity row.
+ */
+function payItem(overrides: Partial<ActivityListItem> = {}): ActivityListItem {
+  return {
+    type: 'perpsWithdraw',
+    chainId: 'eip155:42161',
+    status: 'success',
+    timestamp: 1_765_361_640_000,
+    hash: '0xperpsfunds',
+    raw: { type: 'perpsTransaction', data: { id: 'perps-1' } },
+    data: { token: { amount: '1', symbol: 'USDC', direction: 'out' } },
+    ...overrides,
+  } as unknown as ActivityListItem;
+}
+
+/**
+ * @param payChainId - Chain the local transaction records as the payment chain.
+ * @returns A row whose own local transaction carries the Pay metadata.
+ */
+function localPayItem(payChainId: string): ActivityListItem {
+  return payItem({
+    raw: {
+      type: 'localTransaction',
+      data: {
+        primaryTransaction: {
+          id: 'perps-withdraw-tx',
+          chainId: '0xa4b1',
+          metamaskPay: { chainId: payChainId },
+        },
+        initialTransaction: { id: 'perps-withdraw-tx', chainId: '0xa4b1' },
+        transactions: [],
+      },
+    },
+  } as unknown as Partial<ActivityListItem>);
+}
+
+/**
+ * Real network configurations, so chain ids resolve to names rather than falling
+ * back to the raw id.
+ *
+ * @param transactions - Local transactions a provider-backed row can match by hash.
+ * @returns Redux state for the render.
+ */
+function stateWithNetworks(transactions: TransactionMeta[] = []) {
+  return {
+    engine: {
+      backgroundState: {
+        ...backgroundState,
+        TransactionController: {
+          ...backgroundState.TransactionController,
+          transactions,
+        },
+      },
+    },
+  };
+}
+
+/**
+ * @param hash - Hash the activity row is matched by.
+ * @param payChainId - Chain the transaction records as the payment chain.
+ * @returns A local transaction carrying Pay metadata.
+ */
+function payTransaction(hash: string, payChainId: string): TransactionMeta {
+  return {
+    id: 'perps-withdraw-tx',
+    chainId: '0xa4b1',
+    hash,
+    metamaskPay: { chainId: payChainId },
+  } as unknown as TransactionMeta;
+}
+
+describe('ActivityDetailsPayNetworkRow', () => {
+  it('renders no row at all for a deposit', () => {
+    const { queryByTestId, queryByText } = renderWithProvider(
+      <ActivityDetailsPayNetworkRow item={localPayItem('0x1')} isDeposit />,
+      { state: stateWithNetworks() },
+    );
+
+    expect(queryByTestId(ActivityDetailsSelectorsIDs.NETWORK_ROW)).toBeNull();
+    expect(queryByText('Network')).toBeNull();
+  });
+
+  it('names the payment chain from the local transaction, not the row chain', () => {
+    const { getByTestId, getByText, queryByText } = renderWithProvider(
+      <ActivityDetailsPayNetworkRow
+        item={localPayItem('0x1')}
+        isDeposit={false}
+      />,
+      { state: stateWithNetworks() },
+    );
+
+    expect(
+      getByTestId(ActivityDetailsSelectorsIDs.NETWORK_ROW),
+    ).toBeOnTheScreen();
+    expect(getByText('Ethereum')).toBeOnTheScreen();
+    expect(queryByText('Arbitrum')).toBeNull();
+  });
+
+  it('resolves the payment chain by hash for a provider-backed row', () => {
+    // The feed row carries no `metamaskPay`; only its hash ties it to the local
+    // transaction that does.
+    const { getByTestId, getByText, queryByText } = renderWithProvider(
+      <ActivityDetailsPayNetworkRow item={payItem()} isDeposit={false} />,
+      {
+        state: stateWithNetworks([payTransaction('0xperpsfunds', '0x2105')]),
+      },
+    );
+
+    expect(
+      getByTestId(ActivityDetailsSelectorsIDs.NETWORK_ROW),
+    ).toBeOnTheScreen();
+    expect(getByText('Base')).toBeOnTheScreen();
+    expect(queryByText('Arbitrum')).toBeNull();
+  });
+
+  it("falls back to the row's own chain when Pay did not route it", () => {
+    const { getByTestId, getByText } = renderWithProvider(
+      <ActivityDetailsPayNetworkRow item={payItem()} isDeposit={false} />,
+      { state: stateWithNetworks() },
+    );
+
+    expect(
+      getByTestId(ActivityDetailsSelectorsIDs.NETWORK_ROW),
+    ).toBeOnTheScreen();
+    expect(getByText('Arbitrum')).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/Views/ActivityDetails/components/ActivityDetailsPayNetworkRow.tsx b/app/components/Views/ActivityDetails/components/ActivityDetailsPayNetworkRow.tsx
new file mode 100644
index 000000000000..0a0ffb098846
--- /dev/null
+++ b/app/components/Views/ActivityDetails/components/ActivityDetailsPayNetworkRow.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import { strings } from '../../../../../locales/i18n';
+import type { ActivityListItem } from '../../../../util/activity-adapters';
+import { ActivityDetailsSelectorsIDs } from '../ActivityDetails.testIds';
+import { useActivityNetworkName } from '../hooks/useActivityNetworkName';
+import { useActivityPayMetadata } from '../hooks/useActivityPayMetadata';
+import { ActivityDetailRow } from './ActivityDetailsLayout';
+import { ActivityDetailsNetworkValue } from './ActivityDetailsNetworkValue';
+
+/**
+ * Network row for a Perps or Predict funding activity.
+ *
+ * Names `metamaskPay.chainId` rather than `item.chainId`, which is the
+ * provider's settlement chain (Arbitrum, Polygon) injected by the Activity list,
+ * not where the user paid. Deposits show no network: they span the payment chain
+ * and the settlement chain, and the step timeline already names both.
+ *
+ * @param props.item - Row to name the network for.
+ * @param props.isDeposit - Whether the row is a deposit.
+ * @returns The Network row, or `null` for a deposit.
+ */
+export function ActivityDetailsPayNetworkRow({
+  item,
+  isDeposit,
+}: {
+  item: ActivityListItem;
+  isDeposit: boolean;
+}) {
+  const pay = useActivityPayMetadata(item);
+  const chainId = pay?.chainId ?? item.chainId;
+  const networkName = useActivityNetworkName(chainId);
+
+  if (isDeposit) {
+    return null;
+  }
+
+  return (
+    <ActivityDetailRow
+      label={strings('activity_details.network')}
+      value={
+        <ActivityDetailsNetworkValue chainId={chainId} name={networkName} />
+      }
+      testID={ActivityDetailsSelectorsIDs.NETWORK_ROW}
+    />
+  );
+}
diff --git a/app/components/Views/ActivityDetails/components/ActivityDetailsPerpsMetadata.tsx b/app/components/Views/ActivityDetails/components/ActivityDetailsPerpsMetadata.tsx
index 3d330e893ae3..c2e80b02430f 100644
--- a/app/components/Views/ActivityDetails/components/ActivityDetailsPerpsMetadata.tsx
+++ b/app/components/Views/ActivityDetails/components/ActivityDetailsPerpsMetadata.tsx
@@ -3,25 +3,33 @@ import { useSelector } from 'react-redux';
 import { strings } from '../../../../../locales/i18n';
 import { selectSelectedAccountGroupEvmInternalAccount } from '../../../../selectors/multichainAccounts/accountTreeController';
 import { ActivityDetailsSelectorsIDs } from '../ActivityDetails.testIds';
-import { useActivityNetworkName } from '../hooks/useActivityNetworkName';
 import { ActivityDetailsStatus } from './ActivityDetailsStatus';
 import {
   ActivityDetailRow,
   ActivityDetailSection,
 } from './ActivityDetailsLayout';
 import { ActivityDetailsAccountValue } from './ActivityDetailsAccountValue';
-import { ActivityDetailsNetworkValue } from './ActivityDetailsNetworkValue';
+import { ActivityDetailsPayNetworkRow } from './ActivityDetailsPayNetworkRow';
 import {
   formatPerpsTransactionDate,
   type PerpsActivityListItem,
 } from './ActivityDetailsPerps.utils';
 
+/**
+ * Metadata block for a perps deposit/withdrawal.
+ *
+ * @param props.item - Row to render metadata for.
+ * @param props.isDeposit - Whether the row is a deposit; drives the Network row,
+ * see {@link ActivityDetailsPayNetworkRow}.
+ * @returns The status, date, account and network rows.
+ */
 export function ActivityDetailsPerpsMetadata({
   item,
+  isDeposit,
 }: {
   item: PerpsActivityListItem;
+  isDeposit: boolean;
 }) {
-  const networkName = useActivityNetworkName(item.chainId);
   const selectedAccount = useSelector(
     selectSelectedAccountGroupEvmInternalAccount,
   );
@@ -50,16 +58,7 @@ export function ActivityDetailsPerpsMetadata({
         }
         testID={ActivityDetailsSelectorsIDs.ACCOUNT_ROW}
       />
-      <ActivityDetailRow
-        label={strings('activity_details.network')}
-        value={
-          <ActivityDetailsNetworkValue
-            chainId={item.chainId}
-            name={networkName}
-          />
-        }
-        testID={ActivityDetailsSelectorsIDs.NETWORK_ROW}
-      />
+      <ActivityDetailsPayNetworkRow item={item} isDeposit={isDeposit} />
     </ActivityDetailSection>
   );
 }
diff --git a/app/components/Views/ActivityDetails/components/index.ts b/app/components/Views/ActivityDetails/components/index.ts
index c2b3ca8b99eb..da55868d43d1 100644
--- a/app/components/Views/ActivityDetails/components/index.ts
+++ b/app/components/Views/ActivityDetails/components/index.ts
@@ -34,8 +34,9 @@ export {
 } from './ActivityDetailsFees';
 export {
   ActivityDetailsPayFeesAndTotal,
-  hasActivityPayFiat,
+  useActivityPayFiat,
 } from './ActivityDetailsPayFees';
+export { ActivityDetailsPayNetworkRow } from './ActivityDetailsPayNetworkRow';
 export {
   ActivityDetailsFooter,
   ActivityDetailsBlockExplorerButton,
diff --git a/app/components/Views/ActivityDetails/hooks/useActivityDetailsLendAgain.test.ts b/app/components/Views/ActivityDetails/hooks/useActivityDetailsLendAgain.test.ts
new file mode 100644
index 000000000000..7c5b6df8a8a6
--- /dev/null
+++ b/app/components/Views/ActivityDetails/hooks/useActivityDetailsLendAgain.test.ts
@@ -0,0 +1,235 @@
+import { renderHook } from '@testing-library/react-native';
+import Routes from '../../../../constants/navigation/Routes';
+import type { TokenAmount } from '../../../../util/activity-adapters';
+import { EARN_EXPERIENCES } from '../../../UI/Earn/constants/experiences';
+import useEarnTokens from '../../../UI/Earn/hooks/useEarnTokens';
+import type { EarnTokenDetails } from '../../../UI/Earn/types/lending.types';
+import { useActivityDetailsLendAgain } from './useActivityDetailsLendAgain';
+
+const mockNavigate = jest.fn();
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({ navigate: mockNavigate }),
+}));
+
+// `useStablecoinLendingRedirect` is exercised for real (it owns the network
+// switch + navigation contract we depend on); only its leaf dependencies are
+// stubbed.
+jest.mock('react-redux', () => ({ useSelector: jest.fn(() => undefined) }));
+
+const mockFindNetworkClientIdByChainId = jest.fn(
+  (_chainId: string) => 'arbitrum-client-id',
+);
+const mockSetActiveNetwork = jest.fn((_clientId: string) => undefined);
+jest.mock('../../../../core/Engine', () => ({
+  context: {
+    NetworkController: {
+      findNetworkClientIdByChainId: (chainId: string) =>
+        mockFindNetworkClientIdByChainId(chainId),
+      setActiveNetwork: (clientId: string) => mockSetActiveNetwork(clientId),
+    },
+  },
+}));
+
+const mockTrackEvent = jest.fn();
+jest.mock('../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: () => ({
+      addProperties: () => ({
+        build: () => ({ event: 'earn_button_clicked' }),
+      }),
+    }),
+  }),
+}));
+
+jest.mock('../../../../util/trace', () => ({
+  trace: jest.fn(),
+  TraceName: { EarnDepositScreen: 'Earn Deposit Screen' },
+}));
+
+jest.mock('../../../UI/Earn/hooks/useEarnTokens');
+const mockUseEarnTokens = jest.mocked(useEarnTokens);
+
+const ARBITRUM_CAIP_CHAIN_ID = 'eip155:42161';
+const USDC_ADDRESS = '0xaf88d065e77c8cC2239327C5EDb3A432268e5831';
+const USDC_ASSET_ID = `${ARBITRUM_CAIP_CHAIN_ID}/erc20:${USDC_ADDRESS}`;
+
+const usdcActivityToken = {
+  amount: '10000000',
+  decimals: 6,
+  symbol: 'USDC',
+  assetId: USDC_ASSET_ID,
+  direction: 'out',
+} as TokenAmount;
+
+const makeEarnToken = (experienceType: EARN_EXPERIENCES) =>
+  ({
+    address: USDC_ADDRESS,
+    chainId: '0xa4b1',
+    symbol: 'USDC',
+    decimals: 6,
+    balanceFormatted: '25 USDC',
+    experience: { type: experienceType },
+    experiences: [{ type: experienceType }],
+  }) as unknown as EarnTokenDetails;
+
+const arrangeEarnTokens = (
+  earnTokensByChainIdAndAddress: Record<
+    string,
+    Record<string, EarnTokenDetails>
+  >,
+) => {
+  mockUseEarnTokens.mockReturnValue({
+    earnTokensByChainIdAndAddress,
+  } as unknown as ReturnType<typeof useEarnTokens>);
+};
+
+// The Earn token map is keyed by decimal chain id, not the CAIP/hex form.
+const arrangeLendableUsdc = () =>
+  arrangeEarnTokens({
+    '42161': {
+      [USDC_ADDRESS.toLowerCase()]: makeEarnToken(
+        EARN_EXPERIENCES.STABLECOIN_LENDING,
+      ),
+    },
+  });
+
+describe('useActivityDetailsLendAgain', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockFindNetworkClientIdByChainId.mockReturnValue('arbitrum-client-id');
+    arrangeEarnTokens({});
+  });
+
+  it('opens the earn deposit input view with the resolved earn token', async () => {
+    arrangeLendableUsdc();
+
+    const { result } = renderHook(() =>
+      useActivityDetailsLendAgain({
+        token: usdcActivityToken,
+        fallbackCaipChainId: ARBITRUM_CAIP_CHAIN_ID,
+      }),
+    );
+
+    expect(result.current.canLendAgain).toBe(true);
+
+    await result.current.onLendAgain();
+
+    // The resolved `EarnTokenDetails` is handed over, not the activity row's
+    // skeleton token — `EarnInputView` needs the map entry to find its market.
+    expect(mockNavigate).toHaveBeenCalledWith('StakeScreens', {
+      screen: Routes.STAKING.STAKE,
+      params: {
+        token: expect.objectContaining({
+          address: USDC_ADDRESS,
+          symbol: 'USDC',
+          balanceFormatted: '25 USDC',
+        }),
+      },
+    });
+  });
+
+  it('switches to the token network before navigating', async () => {
+    arrangeLendableUsdc();
+
+    const { result } = renderHook(() =>
+      useActivityDetailsLendAgain({
+        token: usdcActivityToken,
+        fallbackCaipChainId: ARBITRUM_CAIP_CHAIN_ID,
+      }),
+    );
+    await result.current.onLendAgain();
+
+    expect(mockFindNetworkClientIdByChainId).toHaveBeenCalledWith('0xa4b1');
+    expect(mockSetActiveNetwork).toHaveBeenCalledWith('arbitrum-client-id');
+    expect(mockTrackEvent).toHaveBeenCalled();
+  });
+
+  it.each([
+    [
+      'the token is not in the earn map (market delisted or feature flag off)',
+      () => arrangeEarnTokens({}),
+    ],
+    [
+      'the resolved token is a pooled-staking token rather than a lending one',
+      () =>
+        arrangeEarnTokens({
+          '42161': {
+            [USDC_ADDRESS.toLowerCase()]: makeEarnToken(
+              EARN_EXPERIENCES.POOLED_STAKING,
+            ),
+          },
+        }),
+    ],
+    [
+      'the token is on a chain with no earn markets',
+      () =>
+        arrangeEarnTokens({
+          '1': {
+            [USDC_ADDRESS.toLowerCase()]: makeEarnToken(
+              EARN_EXPERIENCES.STABLECOIN_LENDING,
+            ),
+          },
+        }),
+    ],
+  ])('reports no CTA and does not navigate when %s', async (_case, arrange) => {
+    arrange();
+
+    const { result } = renderHook(() =>
+      useActivityDetailsLendAgain({
+        token: usdcActivityToken,
+        fallbackCaipChainId: ARBITRUM_CAIP_CHAIN_ID,
+      }),
+    );
+
+    expect(result.current.canLendAgain).toBe(false);
+
+    await result.current.onLendAgain();
+
+    expect(mockNavigate).not.toHaveBeenCalled();
+    expect(mockSetActiveNetwork).not.toHaveBeenCalled();
+  });
+
+  it.each([
+    ['no token at all', undefined],
+    [
+      'a native asset with no contract address',
+      { symbol: 'ETH', assetId: 'eip155:42161/slip44:60' } as TokenAmount,
+    ],
+    [
+      'a non-EVM token',
+      {
+        symbol: 'USDC',
+        assetId:
+          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+      } as TokenAmount,
+    ],
+  ])('reports no CTA for %s', (_case, token) => {
+    arrangeLendableUsdc();
+
+    const { result } = renderHook(() =>
+      useActivityDetailsLendAgain({
+        token,
+        fallbackCaipChainId: ARBITRUM_CAIP_CHAIN_ID,
+      }),
+    );
+
+    expect(result.current.canLendAgain).toBe(false);
+  });
+
+  it('matches the earn map entry regardless of address casing', () => {
+    arrangeLendableUsdc();
+
+    const { result } = renderHook(() =>
+      useActivityDetailsLendAgain({
+        token: {
+          ...usdcActivityToken,
+          assetId: `${ARBITRUM_CAIP_CHAIN_ID}/erc20:${USDC_ADDRESS.toUpperCase()}`,
+        } as TokenAmount,
+        fallbackCaipChainId: ARBITRUM_CAIP_CHAIN_ID,
+      }),
+    );
+
+    expect(result.current.canLendAgain).toBe(true);
+  });
+});
diff --git a/app/components/Views/ActivityDetails/hooks/useActivityDetailsLendAgain.ts b/app/components/Views/ActivityDetails/hooks/useActivityDetailsLendAgain.ts
new file mode 100644
index 000000000000..8c6237bcb4f9
--- /dev/null
+++ b/app/components/Views/ActivityDetails/hooks/useActivityDetailsLendAgain.ts
@@ -0,0 +1,66 @@
+import { useMemo } from 'react';
+import { parseCaipChainId, type CaipChainId } from '@metamask/utils';
+/* eslint-disable import-x/no-restricted-paths -- TODO(ADR-0020): reuses the Earn token map + lending redirect; route-isolation backlog */
+import { EVENT_LOCATIONS } from '../../../UI/Earn/constants/events/earnEvents';
+import { EARN_EXPERIENCES } from '../../../UI/Earn/constants/experiences';
+import useEarnTokens from '../../../UI/Earn/hooks/useEarnTokens';
+import { useStablecoinLendingRedirect } from '../../../UI/Earn/hooks/useStablecoinLendingRedirect';
+/* eslint-enable import-x/no-restricted-paths */
+import type { TokenAmount } from '../../../../util/activity-adapters';
+import {
+  getActivityTokenAddress,
+  getActivityTokenCaipChainId,
+} from './activityDetailsDoItAgainUtils';
+
+/** The Earn token map is keyed by decimal chain id — the `eip155` reference. */
+function toEarnMapChainKey(caipChainId: CaipChainId): string | undefined {
+  try {
+    const { namespace, reference } = parseCaipChainId(caipChainId);
+    return namespace === 'eip155' ? reference : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * "Lend again" CTA for lending-deposit details: resolves the deposited
+ * underlying token (USDC, not the aToken) to its Earn map entry and reopens the
+ * earn deposit flow with it.
+ *
+ * `EarnInputView` dereferences `earnToken.experience` unguarded, so it needs the
+ * resolved `EarnTokenDetails`, not the activity item's skeleton token. Tokens
+ * the map doesn't expose as stablecoin lending resolve to `undefined` and the
+ * caller hides the CTA rather than navigating into a crash.
+ */
+export function useActivityDetailsLendAgain({
+  token,
+  fallbackCaipChainId,
+}: {
+  token?: TokenAmount;
+  fallbackCaipChainId: CaipChainId;
+}) {
+  const { earnTokensByChainIdAndAddress } = useEarnTokens();
+
+  const earnToken = useMemo(() => {
+    const chainKey = toEarnMapChainKey(
+      getActivityTokenCaipChainId(token, fallbackCaipChainId),
+    );
+
+    const address = getActivityTokenAddress(token);
+    if (!chainKey || !address) {
+      return undefined;
+    }
+
+    const candidate =
+      earnTokensByChainIdAndAddress?.[chainKey]?.[address.toLowerCase()];
+    return candidate?.experience?.type === EARN_EXPERIENCES.STABLECOIN_LENDING
+      ? candidate
+      : undefined;
+  }, [earnTokensByChainIdAndAddress, fallbackCaipChainId, token]);
+  const onLendAgain = useStablecoinLendingRedirect({
+    asset: earnToken,
+    location: EVENT_LOCATIONS.ACTIVITY_DETAILS,
+  });
+
+  return { canLendAgain: Boolean(earnToken), onLendAgain };
+}
diff --git a/app/components/Views/ActivityDetails/hooks/useActivityPayMetadata.ts b/app/components/Views/ActivityDetails/hooks/useActivityPayMetadata.ts
new file mode 100644
index 000000000000..f400e63311b1
--- /dev/null
+++ b/app/components/Views/ActivityDetails/hooks/useActivityPayMetadata.ts
@@ -0,0 +1,46 @@
+import { useSelector } from 'react-redux';
+import type { MetamaskPayMetadata } from '@metamask/transaction-controller';
+import { toEvmCaipChainId } from '@metamask/multichain-network-controller';
+import type { RootState } from '../../../../reducers';
+import { selectTransactionMetadataByHash } from '../../../../selectors/transactionController';
+import type { ActivityListItem } from '../../../../util/activity-adapters';
+
+/**
+ * @param item - Row to read.
+ * @returns Pay metadata on the row's own local transaction, if it has one.
+ */
+function getLocalPayMetadata(
+  item: ActivityListItem,
+): MetamaskPayMetadata | undefined {
+  return item.raw?.type === 'localTransaction'
+    ? item.raw.data.primaryTransaction?.metamaskPay
+    : undefined;
+}
+
+/**
+ * Resolves the MetaMask Pay metadata behind an activity row. Provider-backed
+ * rows (Perps, Predict) come from a remote feed carrying no `metamaskPay`, so
+ * theirs is found via the local transaction behind the row's hash.
+ *
+ * @param item - Row to resolve.
+ * @returns The Pay metadata, or `undefined` when Pay didn't route the row.
+ */
+export function useActivityPayMetadata(
+  item: ActivityListItem,
+): MetamaskPayMetadata | undefined {
+  const localPay = getLocalPayMetadata(item);
+  const { hash, chainId } = item;
+
+  const payByHash = useSelector((state: RootState) => {
+    if (localPay) {
+      return undefined;
+    }
+    // Scoped to the row's chain, since the selector matches on hash alone.
+    const meta = selectTransactionMetadataByHash(state, hash);
+    return meta && toEvmCaipChainId(meta.chainId) === chainId
+      ? meta.metamaskPay
+      : undefined;
+  });
+
+  return localPay ?? payByHash;
+}
diff --git a/app/components/Views/ActivityDetails/templates/BridgeDetails.tsx b/app/components/Views/ActivityDetails/templates/BridgeDetails.tsx
index adc31ca97b5e..72ce53e79395 100644
--- a/app/components/Views/ActivityDetails/templates/BridgeDetails.tsx
+++ b/app/components/Views/ActivityDetails/templates/BridgeDetails.tsx
@@ -19,6 +19,7 @@ import {
 import {
   getBridgeDestinationCaipChainId,
   getBridgeDestinationTxHash,
+  getBridgeExplorerSheetTx,
   getBridgeHistoryItem,
 } from './bridgeDetailsUtils';
 
@@ -33,6 +34,7 @@ export function BridgeDetails({
     item.data.destinationToken,
   );
   const destinationHash = getBridgeDestinationTxHash(bridgeHistoryItem);
+  const explorerSheetTx = getBridgeExplorerSheetTx(item);
   const handleDoItAgain = useActivityDetailsDoItAgain({
     sourceToken: item.data.sourceToken,
     destinationToken: item.data.destinationToken,
@@ -64,6 +66,7 @@ export function BridgeDetails({
             sourceHash={item.hash}
             destChainId={destinationChainId}
             destHash={destinationHash}
+            {...explorerSheetTx}
           />
           {canDoItAgain ? (
             <ActivityDetailsDoItAgainButton
diff --git a/app/components/Views/ActivityDetails/templates/PerpsDetails.test.tsx b/app/components/Views/ActivityDetails/templates/PerpsDetails.test.tsx
index 8bdfd4350e32..a08eabf625fa 100644
--- a/app/components/Views/ActivityDetails/templates/PerpsDetails.test.tsx
+++ b/app/components/Views/ActivityDetails/templates/PerpsDetails.test.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
 import renderWithProvider from '../../../../util/test/renderWithProvider';
+import type { TransactionMeta } from '@metamask/transaction-controller';
+import { backgroundState } from '../../../../util/test/initial-root-state';
 import type { ActivityListItem } from '../../../../util/activity-adapters';
 import {
   FillType,
@@ -49,6 +51,12 @@ const baseTransaction: Pick<
   asset: 'BTC',
 };
 
+/**
+ * @param type - Activity kind the row maps to.
+ * @param transaction - Source perps transaction the row wraps.
+ * @param status - Activity status to render.
+ * @returns A feed-backed perps row, on the injected Arbitrum chain id.
+ */
 function perpsItem(
   type: ActivityListItem['type'],
   transaction: PerpsTransaction,
@@ -65,6 +73,82 @@ function perpsItem(
   } as ActivityListItem;
 }
 
+const PAY_METADATA = {
+  chainId: '0x1',
+  networkFeeFiat: '1.23',
+  bridgeFeeFiat: '0.09',
+  totalFiat: '1001.24',
+} as const;
+
+/**
+ * @param hash - Hash the activity row is matched by.
+ * @returns State where the deposit's local transaction carries Pay fees.
+ */
+function stateWithPayTransaction(hash: string) {
+  return {
+    engine: {
+      backgroundState: {
+        ...backgroundState,
+        TransactionController: {
+          ...backgroundState.TransactionController,
+          transactions: [
+            {
+              id: 'perps-deposit-tx',
+              chainId: '0xa4b1',
+              hash,
+              metamaskPay: PAY_METADATA,
+            } as unknown as TransactionMeta,
+          ],
+        },
+      },
+    },
+  };
+}
+
+/** Real network configurations, so chain ids resolve to display names. */
+const stateWithNetworks = { engine: { backgroundState } };
+
+/**
+ * A funds movement that only exists locally — the state the funding toast's
+ * "Track" opens into, before the HyperLiquid feed returns the row.
+ *
+ * @param type - Whether the row is a deposit or a withdrawal.
+ * @param status - Activity status to render.
+ * @returns The activity row.
+ */
+function localPerpsFundsItem(
+  type: 'perpsAddFunds' | 'perpsWithdraw' = 'perpsAddFunds',
+  status: ActivityListItem['status'] = 'success',
+): ActivityListItem {
+  return {
+    type,
+    chainId: 'eip155:42161',
+    status,
+    timestamp: 1_765_361_640_000,
+    hash: '0xperpsdeposit',
+    raw: {
+      type: 'localTransaction',
+      data: {
+        primaryTransaction: {
+          id: 'perps-deposit-tx',
+          chainId: '0xa4b1',
+          metamaskPay: PAY_METADATA,
+        },
+        initialTransaction: { id: 'perps-deposit-tx', chainId: '0xa4b1' },
+        transactions: [],
+      },
+    },
+    data: {
+      token: {
+        amount: '100000',
+        decimals: 6,
+        symbol: 'USDC',
+        direction: type === 'perpsAddFunds' ? 'in' : 'out',
+      },
+    },
+  } as unknown as ActivityListItem;
+}
+
 describe('PerpsDetails', () => {
   it('renders trade rows and trade-again CTA', () => {
     const transaction: PerpsTransaction = {
@@ -267,4 +351,193 @@ describe('PerpsDetails', () => {
     expect(getByText('Fund again')).toBeOnTheScreen();
     expect(queryByText('View on block explorer')).toBeNull();
   });
+
+  describe('MetaMask Pay fees', () => {
+    const fundsTransaction: PerpsTransaction = {
+      ...baseTransaction,
+      id: 'wallet-deposit-1',
+      type: 'deposit',
+      category: 'deposit',
+      title: 'Account funded',
+      asset: 'USDC',
+      depositWithdrawal: {
+        amount: '+$1,000',
+        amountNumber: 1000,
+        isPositive: true,
+        asset: 'USDC',
+        txHash: '0xperpsdeposit',
+        status: 'completed',
+        type: 'deposit',
+      },
+    };
+
+    /** @returns The feed row, hash-matched to the local Pay transaction. */
+    function feedItem(): ActivityListItem {
+      return {
+        ...perpsItem('perpsAddFunds', fundsTransaction),
+        hash: '0xperpsdeposit',
+      } as ActivityListItem;
+    }
+
+    it('shows the fee rows on a feed-backed deposit, resolved from its local transaction', () => {
+      // The HyperLiquid row carries no `metamaskPay`; only its hash ties it to
+      // the local transaction that does.
+      const { getByText } = renderWithProvider(
+        <PerpsDetails item={feedItem()} />,
+        {
+          state: stateWithPayTransaction('0xperpsdeposit'),
+        },
+      );
+
+      expect(getByText('Transaction fee')).toBeOnTheScreen();
+      expect(getByText('$1.23')).toBeOnTheScreen();
+      expect(getByText('Bridge fee')).toBeOnTheScreen();
+      expect(getByText('$0.09')).toBeOnTheScreen();
+      expect(getByText('Total amount')).toBeOnTheScreen();
+      expect(getByText('$1,001.24')).toBeOnTheScreen();
+      // The steps still render below the fees.
+      expect(getByText('Steps (4 completed)')).toBeOnTheScreen();
+    });
+
+    it('omits the fee rows when no local transaction backs the feed row', () => {
+      const { queryByText, getByText } = renderWithProvider(
+        <PerpsDetails item={feedItem()} />,
+      );
+
+      expect(queryByText('Transaction fee')).toBeNull();
+      expect(queryByText('Total amount')).toBeNull();
+      expect(getByText('Steps (4 completed)')).toBeOnTheScreen();
+    });
+
+    it('renders the funding screen with fees for a local-only deposit', () => {
+      // What "Track" opens: the feed has not returned the row yet, so the local
+      // transaction is all there is. It must still be the Perps funding screen.
+      const { getByText } = renderWithProvider(
+        <PerpsDetails item={localPerpsFundsItem()} />,
+      );
+
+      expect(getByText('Transaction fee')).toBeOnTheScreen();
+      expect(getByText('$1.23')).toBeOnTheScreen();
+      expect(getByText('Bridge fee')).toBeOnTheScreen();
+      expect(getByText('Total amount')).toBeOnTheScreen();
+      expect(getByText('Steps (4 completed)')).toBeOnTheScreen();
+      expect(getByText('Add funds')).toBeOnTheScreen();
+      expect(getByText('Fund again')).toBeOnTheScreen();
+    });
+
+    it('shows a local-only deposit still in flight as pending steps', () => {
+      const { getByText } = renderWithProvider(
+        <PerpsDetails item={localPerpsFundsItem('perpsAddFunds', 'pending')} />,
+      );
+
+      expect(getByText('Steps (1 completed, 3 pending)')).toBeOnTheScreen();
+    });
+
+    it('omits the fee rows for a local-only withdrawal', () => {
+      // Withdrawals relabel these rows and have no redesigned copy yet.
+      const { queryByText, getByText } = renderWithProvider(
+        <PerpsDetails item={localPerpsFundsItem('perpsWithdraw')} />,
+      );
+
+      expect(queryByText('Transaction fee')).toBeNull();
+      expect(queryByText('Total amount')).toBeNull();
+      expect(getByText('Initiate withdrawal')).toBeOnTheScreen();
+    });
+  });
+
+  describe('Network row', () => {
+    // Every perps row carries the same injected chain id (Arbitrum), which the
+    // Network row must never present as where the user transacted.
+    const withdrawalTransaction: PerpsTransaction = {
+      ...baseTransaction,
+      id: 'wallet-withdrawal-1',
+      type: 'withdrawal',
+      category: 'withdrawal',
+      title: 'Withdrawal',
+      asset: 'USDC',
+      depositWithdrawal: {
+        amount: '-$1,000',
+        amountNumber: 1000,
+        isPositive: false,
+        asset: 'USDC',
+        txHash: '0xperpswithdrawal',
+        status: 'completed',
+        type: 'withdrawal',
+      },
+    };
+
+    const depositTransaction: PerpsTransaction = {
+      ...baseTransaction,
+      id: 'wallet-deposit-network',
+      type: 'deposit',
+      category: 'deposit',
+      title: 'Account funded',
+      asset: 'USDC',
+      depositWithdrawal: {
+        amount: '+$1,000',
+        amountNumber: 1000,
+        isPositive: true,
+        asset: 'USDC',
+        txHash: '0xperpsdeposit',
+        status: 'completed',
+        type: 'deposit',
+      },
+    };
+
+    it('omits the row entirely for a feed-backed deposit', () => {
+      const item = {
+        ...perpsItem('perpsAddFunds', depositTransaction),
+        hash: '0xperpsdeposit',
+      } as ActivityListItem;
+
+      const { queryByTestId, queryByText } = renderWithProvider(
+        <PerpsDetails item={item} />,
+        { state: stateWithPayTransaction('0xperpsdeposit') },
+      );
+
+      expect(queryByTestId(ActivityDetailsSelectorsIDs.NETWORK_ROW)).toBeNull();
+      expect(queryByText('Arbitrum')).toBeNull();
+    });
+
+    it('omits the row entirely for a local-only deposit', () => {
+      const { queryByTestId, queryByText } = renderWithProvider(
+        <PerpsDetails item={localPerpsFundsItem()} />,
+        { state: stateWithNetworks },
+      );
+
+      expect(queryByTestId(ActivityDetailsSelectorsIDs.NETWORK_ROW)).toBeNull();
+      expect(queryByText('Arbitrum')).toBeNull();
+    });
+
+    it('names the payment chain on a withdrawal, not the injected perps chain', () => {
+      // PAY_METADATA pays from Ethereum while the row's chainId is Arbitrum.
+      const { getByTestId, getByText, queryByText } = renderWithProvider(
+        <PerpsDetails item={localPerpsFundsItem('perpsWithdraw')} />,
+        { state: stateWithNetworks },
+      );
+
+      expect(
+        getByTestId(ActivityDetailsSelectorsIDs.NETWORK_ROW),
+      ).toBeOnTheScreen();
+      expect(getByText('Ethereum')).toBeOnTheScreen();
+      expect(queryByText('Arbitrum')).toBeNull();
+    });
+
+    it("falls back to the row's chain on a withdrawal Pay did not route", () => {
+      const item = {
+        ...perpsItem('perpsWithdraw', withdrawalTransaction),
+        hash: '0xperpswithdrawal',
+      } as ActivityListItem;
+
+      const { getByTestId, getByText } = renderWithProvider(
+        <PerpsDetails item={item} />,
+        { state: stateWithNetworks },
+      );
+
+      expect(
+        getByTestId(ActivityDetailsSelectorsIDs.NETWORK_ROW),
+      ).toBeOnTheScreen();
+      expect(getByText('Arbitrum')).toBeOnTheScreen();
+    });
+  });
 });
diff --git a/app/components/Views/ActivityDetails/templates/PerpsDetails.tsx b/app/components/Views/ActivityDetails/templates/PerpsDetails.tsx
index e45e4343da3e..9fd70a6d4e37 100644
--- a/app/components/Views/ActivityDetails/templates/PerpsDetails.tsx
+++ b/app/components/Views/ActivityDetails/templates/PerpsDetails.tsx
@@ -4,10 +4,12 @@ import type { AppNavigationProp } from '../../../../core/NavigationService/types
 import BigNumber from 'bignumber.js';
 import {
   FontWeight,
+  SectionDivider,
   Text,
   TextColor,
   TextVariant,
 } from '@metamask/design-system-react-native';
+import type { MetamaskPayMetadata } from '@metamask/transaction-controller';
 import {
   PERPS_EVENT_VALUE,
   getPerpsDisplaySymbol,
@@ -15,6 +17,7 @@ import {
 } from '@metamask/perps-controller';
 import { strings } from '../../../../../locales/i18n';
 import Routes from '../../../../constants/navigation/Routes';
+import { useNavigateToPerpsHome } from '../../../UI/Perps/utils/perpsModeSwitch';
 import type { ActivityListItem } from '../../../../util/activity-adapters';
 import {
   ActivityDetailRow,
@@ -23,9 +26,12 @@ import {
   ActivityDetailsPerpsExplorerButton,
   ActivityDetailsPerpsHero,
   ActivityDetailsPerpsMetadata,
+  ActivityDetailsPayFeesAndTotal,
   ActivityDetailsPerpsStepTimeline,
   ActivityDetailsStatus,
   ActivityDetailsTemplateFrame,
+  formatActivityTokenAmount,
+  useActivityPayFiat,
 } from '../components';
 import { ActivityDetailsSelectorsIDs } from '../ActivityDetails.testIds';
 import {
@@ -41,12 +47,30 @@ import {
   getPerpsTransaction,
   shouldShowPerpsPnl,
   type PerpsActivityListItem,
+  type PerpsDepositWithdrawalStatus,
   type PerpsTransaction,
 } from '../components/ActivityDetailsPerps.utils';
 // eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): route-isolation backlog
 import { usePerpsOrderFees } from '../../../UI/Perps/hooks';
 import { resolvePerpsOrderStatusLabel } from '../../../UI/ActivityListItemRow/titleLabels';
 
+/**
+ * The local row's activity status in the terms the step timeline speaks. A
+ * cancelled deposit reads as failed — the timeline has no cancelled state, and
+ * neither outcome credited the account.
+ */
+function toPerpsFundsStatus(
+  status: ActivityListItem['status'],
+): PerpsDepositWithdrawalStatus {
+  if (status === 'success') {
+    return 'completed';
+  }
+  if (status === 'failed' || status === 'cancelled') {
+    return 'failed';
+  }
+  return 'pending';
+}
+
 function useTradeAgain(asset: string | undefined) {
   const navigation = useNavigation<AppNavigationProp>();
   const market = useMemo<Partial<PerpsMarketData> | undefined>(
@@ -69,17 +93,6 @@ function useTradeAgain(asset: string | undefined) {
   }, [market, navigation]);
 }
 
-function useOpenPerpsHome() {
-  const navigation = useNavigation<AppNavigationProp>();
-
-  return useCallback(() => {
-    navigation.navigate(Routes.PERPS.ROOT, {
-      screen: Routes.PERPS.PERPS_HOME,
-      params: {},
-    });
-  }, [navigation]);
-}
-
 function StatusAndDateRows({
   item,
   statusLabel,
@@ -306,6 +319,33 @@ function FundingDetails({
   );
 }
 
+/**
+ * The MetaMask Pay fee block above the step timeline, with the divider only
+ * when both are present. Perps labels the network fee "Transaction fee".
+ */
+function PerpsFundsDetailsBody({
+  pay,
+  timeline,
+}: {
+  pay: MetamaskPayMetadata | undefined;
+  timeline: React.ReactNode;
+}) {
+  if (!pay) {
+    return <>{timeline}</>;
+  }
+
+  return (
+    <>
+      <ActivityDetailsPayFeesAndTotal
+        pay={pay}
+        networkFeeLabel={strings('activity_details.transaction_fee')}
+      />
+      <SectionDivider marginVertical={3} />
+      {timeline}
+    </>
+  );
+}
+
 function FundsDetails({
   item,
   transaction,
@@ -314,7 +354,10 @@ function FundsDetails({
   transaction: PerpsTransaction;
 }) {
   const depositWithdrawal = transaction.depositWithdrawal;
-  const openPerpsHome = useOpenPerpsHome();
+  const openPerpsHome = useNavigateToPerpsHome();
+  // Provider-backed rows carry no `metamaskPay`; it is resolved from the local
+  // transaction behind this row's hash.
+  const pay = useActivityPayFiat(item);
   // The perps source prefixes wallet-originated funds movements with `wallet-`;
   // only those carry a real on-chain `txHash` we can link to a block explorer.
   // Other deposit/withdrawal ids (e.g. internal transfers) have no explorer tx.
@@ -328,6 +371,8 @@ function FundsDetails({
     return null;
   }
 
+  const isDeposit = transaction.type === 'deposit';
+
   return (
     <ActivityDetailsTemplateFrame
       hero={
@@ -337,21 +382,76 @@ function FundsDetails({
           symbol={depositWithdrawal.asset}
         />
       }
-      metadata={<ActivityDetailsPerpsMetadata item={item} />}
+      metadata={
+        <ActivityDetailsPerpsMetadata item={item} isDeposit={isDeposit} />
+      }
+      details={
+        <PerpsFundsDetailsBody
+          pay={isDeposit ? pay : undefined}
+          timeline={
+            <ActivityDetailsPerpsStepTimeline
+              explorerTarget={stepExplorerTarget}
+              status={depositWithdrawal.status}
+              timestamp={item.timestamp}
+              type={depositWithdrawal.type}
+            />
+          }
+        />
+      }
+      footer={
+        <ActivityDetailsDoItAgainButton
+          label={getPerpsFundsCtaLabel(item.status, isDeposit)}
+          onPress={openPerpsHome}
+        />
+      }
+    />
+  );
+}
+
+/**
+ * A perps deposit/withdrawal that only exists as a local transaction — the
+ * HyperLiquid feed has not returned it yet, which is the state the funding
+ * toast's "Track" opens into. Renders the same shape as {@link FundsDetails}
+ * from the local row, so both entry points land on the same screen.
+ */
+function LocalFundsDetails({ item }: { item: PerpsActivityListItem }) {
+  const openPerpsHome = useNavigateToPerpsHome();
+  const pay = useActivityPayFiat(item);
+  const isDeposit = item.type === 'perpsAddFunds';
+  const token = 'token' in item.data ? item.data.token : undefined;
+
+  return (
+    <ActivityDetailsTemplateFrame
+      hero={
+        <ActivityDetailsPerpsHero
+          amount={formatActivityTokenAmount(token)}
+          isPositive={isDeposit && item.status !== 'failed'}
+          symbol={token?.symbol}
+        />
+      }
+      metadata={
+        <ActivityDetailsPerpsMetadata item={item} isDeposit={isDeposit} />
+      }
       details={
-        <ActivityDetailsPerpsStepTimeline
-          explorerTarget={stepExplorerTarget}
-          status={depositWithdrawal.status}
-          timestamp={item.timestamp}
-          type={depositWithdrawal.type}
+        <PerpsFundsDetailsBody
+          pay={isDeposit ? pay : undefined}
+          timeline={
+            <ActivityDetailsPerpsStepTimeline
+              explorerTarget={
+                item.hash
+                  ? { chainId: item.chainId, hash: item.hash }
+                  : undefined
+              }
+              status={toPerpsFundsStatus(item.status)}
+              timestamp={item.timestamp}
+              type={isDeposit ? 'deposit' : 'withdrawal'}
+            />
+          }
         />
       }
       footer={
         <ActivityDetailsDoItAgainButton
-          label={getPerpsFundsCtaLabel(
-            item.status,
-            transaction.type === 'deposit',
-          )}
+          label={getPerpsFundsCtaLabel(item.status, isDeposit)}
           onPress={openPerpsHome}
         />
       }
@@ -364,6 +464,9 @@ export function PerpsDetails({ item }: { item: ActivityListItem }) {
   const transaction = getPerpsTransaction(item);
 
   if (!transaction) {
+    if (item.type === 'perpsAddFunds' || item.type === 'perpsWithdraw') {
+      return <LocalFundsDetails item={perpsItem} />;
+    }
     return null;
   }
 
diff --git a/app/components/Views/ActivityDetails/templates/PredictDetails.test.tsx b/app/components/Views/ActivityDetails/templates/PredictDetails.test.tsx
index aa8bb6280b60..e4b42d3d32fa 100644
--- a/app/components/Views/ActivityDetails/templates/PredictDetails.test.tsx
+++ b/app/components/Views/ActivityDetails/templates/PredictDetails.test.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
 import { fireEvent } from '@testing-library/react-native';
 import renderWithProvider from '../../../../util/test/renderWithProvider';
+import { backgroundState } from '../../../../util/test/initial-root-state';
 import type { ActivityListItem } from '../../../../util/activity-adapters';
 import Routes from '../../../../constants/navigation/Routes';
+import { ActivityDetailsSelectorsIDs } from '../ActivityDetails.testIds';
 import { PredictDetails } from './PredictDetails';
 
 const mockNavigate = jest.fn();
@@ -27,6 +29,10 @@ jest.mock(
   },
 );
 
+/**
+ * @param overrides - Fields to replace on the base row.
+ * @returns A Predict row, on the injected Polygon chain id.
+ */
 function predictItem(overrides: Partial<ActivityListItem>): ActivityListItem {
   return {
     type: 'predictionPlaced',
@@ -39,6 +45,9 @@ function predictItem(overrides: Partial<ActivityListItem>): ActivityListItem {
   } as ActivityListItem;
 }
 
+/** Real network configurations, so chain ids resolve to display names. */
+const stateWithNetworks = { engine: { backgroundState } };
+
 describe('PredictDetails', () => {
   beforeEach(() => jest.clearAllMocks());
 
@@ -280,20 +289,83 @@ describe('PredictDetails', () => {
     // The step timeline still renders without a fee section above it.
     expect(queryByText('Steps (2 completed)')).not.toBeNull();
   });
+
+  describe('Network row', () => {
+    // Every Predict row carries the same injected chain id (Polygon), so the
+    // row's own chain can't describe where the user paid.
+    it('omits the row entirely for a deposit', () => {
+      const { queryByTestId, queryByText } = renderWithProvider(
+        <PredictDetails
+          item={addFundsItemWithPayMetadata({ chainId: '0x1' })}
+        />,
+        { state: stateWithNetworks },
+      );
+
+      expect(queryByTestId(ActivityDetailsSelectorsIDs.NETWORK_ROW)).toBeNull();
+      expect(queryByText('Polygon')).toBeNull();
+    });
+
+    it('names the payment chain on a withdrawal, not the injected Predict chain', () => {
+      const { getByTestId, getByText, queryByText } = renderWithProvider(
+        <PredictDetails
+          item={fundsItemWithPayMetadata('predictionsWithdrawFunds', {
+            chainId: '0x1',
+          })}
+        />,
+        { state: stateWithNetworks },
+      );
+
+      expect(
+        getByTestId(ActivityDetailsSelectorsIDs.NETWORK_ROW),
+      ).toBeOnTheScreen();
+      expect(getByText('Ethereum')).toBeOnTheScreen();
+      expect(queryByText('Polygon')).toBeNull();
+    });
+
+    it("falls back to the row's chain on a withdrawal Pay did not route", () => {
+      const { getByTestId, getByText } = renderWithProvider(
+        <PredictDetails
+          item={fundsItemWithPayMetadata('predictionsWithdrawFunds', undefined)}
+        />,
+        { state: stateWithNetworks },
+      );
+
+      expect(
+        getByTestId(ActivityDetailsSelectorsIDs.NETWORK_ROW),
+      ).toBeOnTheScreen();
+      expect(getByText('Polygon')).toBeOnTheScreen();
+    });
+  });
 });
 
+/**
+ * @param metamaskPay - Pay metadata for the backing local transaction.
+ * @returns A Predict deposit row.
+ */
 function addFundsItemWithPayMetadata(
   metamaskPay: Record<string, string> | undefined,
+): ActivityListItem {
+  return fundsItemWithPayMetadata('predictionsAddFunds', metamaskPay);
+}
+
+/**
+ * @param type - Whether the row is a deposit or a withdrawal.
+ * @param metamaskPay - Pay metadata for the backing local transaction.
+ * @returns The activity row.
+ */
+function fundsItemWithPayMetadata(
+  type: 'predictionsAddFunds' | 'predictionsWithdrawFunds',
+  metamaskPay: Record<string, string> | undefined,
 ): ActivityListItem {
   return predictItem({
-    type: 'predictionsAddFunds',
+    type,
     hash: '0xfund',
     data: {
       token: {
         amount: '100000',
         decimals: 6,
         symbol: 'USDC',
-        direction: 'in',
+        direction: type === 'predictionsAddFunds' ? 'in' : 'out',
       },
     },
     raw: {
diff --git a/app/components/Views/ActivityDetails/templates/PredictDetails/PredictFundsDetails.tsx b/app/components/Views/ActivityDetails/templates/PredictDetails/PredictFundsDetails.tsx
index baa2edeae90f..ff20ae8f0133 100644
--- a/app/components/Views/ActivityDetails/templates/PredictDetails/PredictFundsDetails.tsx
+++ b/app/components/Views/ActivityDetails/templates/PredictDetails/PredictFundsDetails.tsx
@@ -9,15 +9,14 @@ import {
   ActivityDetailsAccountValue,
   ActivityDetailsBlockExplorerButton,
   ActivityDetailsDoItAgainButton,
-  ActivityDetailsNetworkValue,
   ActivityDetailsPayFeesAndTotal,
+  ActivityDetailsPayNetworkRow,
   ActivityDetailsStepTimeline,
   ActivityDetailsTemplateFrame,
   formatActivityTokenAmount,
-  hasActivityPayFiat,
+  useActivityPayFiat,
 } from '../../components';
 import { ActivityDetailsSelectorsIDs } from '../../ActivityDetails.testIds';
-import { useActivityNetworkName } from '../../hooks/useActivityNetworkName';
 import {
   getPredictFundsCtaLabel,
   type PredictActivityListItem,
@@ -29,8 +28,13 @@ import {
 } from './PredictDetails.utils';
 import { useOpenPredictHome } from './useOpenPredictHome';
 
-function PredictFundsMetadata({ item }: { item: PredictActivityListItem }) {
-  const networkName = useActivityNetworkName(item.chainId);
+function PredictFundsMetadata({
+  item,
+  isDeposit,
+}: {
+  item: PredictActivityListItem;
+  isDeposit: boolean;
+}) {
   const selectedAccount = useSelector(
     selectSelectedAccountGroupEvmInternalAccount,
   );
@@ -50,16 +54,7 @@ function PredictFundsMetadata({ item }: { item: PredictActivityListItem }) {
         }
         testID={ActivityDetailsSelectorsIDs.ACCOUNT_ROW}
       />
-      <ActivityDetailRow
-        label={strings('activity_details.network')}
-        value={
-          <ActivityDetailsNetworkValue
-            chainId={item.chainId}
-            name={networkName}
-          />
-        }
-        testID={ActivityDetailsSelectorsIDs.NETWORK_ROW}
-      />
+      <ActivityDetailsPayNetworkRow item={item} isDeposit={isDeposit} />
     </ActivityDetailSection>
   );
 }
@@ -82,7 +77,8 @@ export function PredictFundsDetails({
       ? getPredictFundsSteps(item.status, item.timestamp)
       : undefined;
   const completedCount = item.status === 'success' ? 2 : 1;
-  const showPaySection = isDeposit && hasActivityPayFiat(item);
+  const pay = useActivityPayFiat(item);
+  const showPaySection = isDeposit && Boolean(pay);
   const showDetails = showPaySection || Boolean(steps);
 
   return (
@@ -94,12 +90,12 @@ export function PredictFundsDetails({
           showTokenIcon
         />
       }
-      metadata={<PredictFundsMetadata item={item} />}
+      metadata={<PredictFundsMetadata item={item} isDeposit={isDeposit} />}
       details={
         showDetails ? (
           <>
-            {showPaySection ? (
-              <ActivityDetailsPayFeesAndTotal item={item} />
+            {showPaySection && pay ? (
+              <ActivityDetailsPayFeesAndTotal pay={pay} />
             ) : null}
             {showPaySection && steps ? (
               <SectionDivider marginVertical={3} />
diff --git a/app/components/Views/ActivityDetails/templates/SwapDetails.test.tsx b/app/components/Views/ActivityDetails/templates/SwapDetails.test.tsx
index 0ac07ef72799..a3af69b5f71f 100644
--- a/app/components/Views/ActivityDetails/templates/SwapDetails.test.tsx
+++ b/app/components/Views/ActivityDetails/templates/SwapDetails.test.tsx
@@ -1,15 +1,20 @@
 import React from 'react';
 import { render } from '@testing-library/react-native';
+import { strings } from '../../../../../locales/i18n';
 import type {
   ActivityListItem,
   TokenAmount,
 } from '../../../../util/activity-adapters';
 import { useTokensData } from '../../../hooks/useTokensData/useTokensData';
+import { useActivityDetailsLendAgain } from '../hooks/useActivityDetailsLendAgain';
 import { SwapDetails } from './SwapDetails';
 
 // Capture the token the amount header receives so we can assert it was enriched
 // with decimals before formatting.
 let capturedSentToken: TokenAmount | undefined;
+// Capture every "do it again" CTA the footer renders, so we can assert which
+// verb (if any) a given activity type gets.
+let mockCapturedCtas: { label: string; onPress: () => void }[] = [];
 
 jest.mock('../../../hooks/useTokensData/useTokensData', () => ({
   useTokensData: jest.fn(() => ({})),
@@ -17,8 +22,19 @@ jest.mock('../../../hooks/useTokensData/useTokensData', () => ({
 
 jest.mock('../components', () => ({
   ActivityDetailsBlockExplorerButton: () => null,
-  ActivityDetailsDoItAgainButton: () => null,
-  ActivityDetailsFooter: () => null,
+  ActivityDetailsDoItAgainButton: ({
+    label,
+    onPress,
+  }: {
+    label: string;
+    onPress: () => void;
+  }) => {
+    mockCapturedCtas.push({ label, onPress });
+    return null;
+  },
+  ActivityDetailsFooter: ({ children }: { children: React.ReactNode }) => (
+    <>{children}</>
+  ),
   ActivityDetailsMetadata: () => null,
   ActivityDetailsFeesAndTotal: () => null,
   ActivityDetailsDualAmountHeader: ({
@@ -31,30 +47,64 @@ jest.mock('../components', () => ({
   },
 }));
 
+const mockHandleDoItAgain = jest.fn();
 jest.mock('../hooks/useActivityDetailsDoItAgain', () => ({
-  useActivityDetailsDoItAgain: () => jest.fn(),
-  canRenderActivityDetailsDoItAgain: () => false,
+  useActivityDetailsDoItAgain: () => mockHandleDoItAgain,
+  canRenderActivityDetailsDoItAgain: jest.fn(() => true),
+}));
+
+const mockOnLendAgain = jest.fn();
+jest.mock('../hooks/useActivityDetailsLendAgain', () => ({
+  useActivityDetailsLendAgain: jest.fn(() => ({
+    canLendAgain: false,
+    onLendAgain: jest.fn(),
+  })),
 }));
+const mockUseActivityDetailsLendAgain = jest.mocked(
+  useActivityDetailsLendAgain,
+);
 
 const USDT_ASSET_ID =
   'eip155:42161/erc20:0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9';
 
-const makeLendingDepositItem = (
-  sourceToken: Partial<TokenAmount>,
+const makeItem = (
+  type: ActivityListItem['type'],
+  data: Record<string, unknown>,
 ): ActivityListItem =>
   ({
-    type: 'lendingDeposit',
+    type,
     chainId: 'eip155:42161',
     status: 'success',
     timestamp: 1,
     hash: '0xabc',
-    data: { sourceToken },
+    data,
   }) as unknown as ActivityListItem;
 
+const makeLendingDepositItem = (sourceToken: Partial<TokenAmount>) =>
+  makeItem('lendingDeposit', { sourceToken });
+
+const arrangeLendAgain = (canLendAgain: boolean) => {
+  mockUseActivityDetailsLendAgain.mockReturnValue({
+    canLendAgain,
+    onLendAgain: mockOnLendAgain,
+  });
+};
+
+const lendingSourceToken = {
+  direction: 'out',
+  amount: '10000',
+  assetId: USDT_ASSET_ID,
+  decimals: 6,
+  symbol: 'USDT',
+} as TokenAmount;
+
 describe('SwapDetails', () => {
   beforeEach(() => {
+    jest.clearAllMocks();
     capturedSentToken = undefined;
+    mockCapturedCtas = [];
     jest.mocked(useTokensData).mockReturnValue({});
+    arrangeLendAgain(false);
   });
 
   it('enriches the deposited token decimals from the tokens API so the amount is not rendered as raw base units', () => {
@@ -91,18 +141,118 @@ describe('SwapDetails', () => {
   it('leaves an already-populated token unchanged (no-op when decimals are present)', () => {
     render(
       <SwapDetails
-        item={
-          makeLendingDepositItem({
-            direction: 'out',
-            amount: '10000',
-            assetId: USDT_ASSET_ID,
-            decimals: 6,
-            symbol: 'USDT',
-          }) as never
-        }
+        item={makeLendingDepositItem(lendingSourceToken) as never}
       />,
     );
 
     expect(capturedSentToken?.decimals).toBe(6);
   });
+
+  describe('call-to-action', () => {
+    it('renders "Lend again" instead of "Swap again" for a lending deposit', () => {
+      arrangeLendAgain(true);
+
+      render(
+        <SwapDetails
+          item={makeLendingDepositItem(lendingSourceToken) as never}
+        />,
+      );
+
+      expect(mockCapturedCtas).toHaveLength(1);
+      expect(mockCapturedCtas[0].label).toBe(
+        strings('activity_details.lend_again'),
+      );
+      expect(mockCapturedCtas[0].label).not.toBe(
+        strings('activity_details.swap_again'),
+      );
+
+      mockCapturedCtas[0].onPress();
+      expect(mockOnLendAgain).toHaveBeenCalled();
+      expect(mockHandleDoItAgain).not.toHaveBeenCalled();
+    });
+
+    it('passes the deposited underlying token to the lend-again hook', () => {
+      arrangeLendAgain(true);
+
+      render(
+        <SwapDetails
+          item={makeLendingDepositItem(lendingSourceToken) as never}
+        />,
+      );
+
+      expect(mockUseActivityDetailsLendAgain).toHaveBeenCalledWith({
+        token: expect.objectContaining({ assetId: USDT_ASSET_ID }),
+        fallbackCaipChainId: 'eip155:42161',
+      });
+    });
+
+    it('renders no call-to-action for a lending deposit whose token is no longer lendable', () => {
+      arrangeLendAgain(false);
+
+      render(
+        <SwapDetails
+          item={makeLendingDepositItem(lendingSourceToken) as never}
+        />,
+      );
+
+      expect(mockCapturedCtas).toHaveLength(0);
+    });
+
+    it('renders no call-to-action for a lending withdrawal', () => {
+      // The withdrawal's source is the non-swappable aToken, so neither the
+      // swap view nor the deposit flow can repeat it.
+      arrangeLendAgain(true);
+
+      render(
+        <SwapDetails
+          item={
+            makeItem('lendingWithdrawal', {
+              sourceToken: {
+                direction: 'out',
+                amount: '10000',
+                assetId:
+                  'eip155:42161/erc20:0x724dc807b04555b71ed48a6896b6f41593b8c637',
+                decimals: 6,
+                symbol: 'aArbUSDCn',
+              },
+              destinationToken: lendingSourceToken,
+            }) as never
+          }
+        />,
+      );
+
+      expect(mockCapturedCtas).toHaveLength(0);
+      // The Earn token map isn't even subscribed to for a withdrawal.
+      expect(mockUseActivityDetailsLendAgain).not.toHaveBeenCalled();
+    });
+
+    it.each([
+      ['swap', 'activity_details.swap_again'],
+      ['convert', 'activity_details.convert_again'],
+      ['wrap', 'activity_details.wrap_again'],
+      ['unwrap', 'activity_details.unwrap_again'],
+    ] as const)('keeps the "%s" CTA unchanged', (type, labelKey) => {
+      arrangeLendAgain(true);
+
+      render(
+        <SwapDetails
+          item={
+            makeItem(type, {
+              sourceToken: lendingSourceToken,
+              destinationToken: lendingSourceToken,
+            }) as never
+          }
+        />,
+      );
+
+      // Even with a lendable token in the map, non-lending types keep the swap
+      // CTA and never subscribe to the Earn token map.
+      expect(mockUseActivityDetailsLendAgain).not.toHaveBeenCalled();
+      expect(mockCapturedCtas).toHaveLength(1);
+      expect(mockCapturedCtas[0].label).toBe(strings(labelKey));
+
+      mockCapturedCtas[0].onPress();
+      expect(mockHandleDoItAgain).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/app/components/Views/ActivityDetails/templates/SwapDetails.tsx b/app/components/Views/ActivityDetails/templates/SwapDetails.tsx
index 4322a5761584..4a5392cddef6 100644
--- a/app/components/Views/ActivityDetails/templates/SwapDetails.tsx
+++ b/app/components/Views/ActivityDetails/templates/SwapDetails.tsx
@@ -1,7 +1,10 @@
 import React from 'react';
 import { Box, SectionDivider } from '@metamask/design-system-react-native';
+import type { CaipChainId } from '@metamask/utils';
+import { strings } from '../../../../../locales/i18n';
 import {
   type ActivityListItem,
+  type TokenAmount,
   enrichTokenFromApi,
 } from '../../../../util/activity-adapters';
 import { useTokensData } from '../../../hooks/useTokensData/useTokensData';
@@ -17,8 +20,33 @@ import {
   canRenderActivityDetailsDoItAgain,
   useActivityDetailsDoItAgain,
 } from '../hooks/useActivityDetailsDoItAgain';
+import { useActivityDetailsLendAgain } from '../hooks/useActivityDetailsLendAgain';
 import { getSwapAgainLabel } from './swapAgainLabel';
 
+function LendAgainButton({
+  token,
+  fallbackCaipChainId,
+}: {
+  token?: TokenAmount;
+  fallbackCaipChainId: CaipChainId;
+}) {
+  const { canLendAgain, onLendAgain } = useActivityDetailsLendAgain({
+    token,
+    fallbackCaipChainId,
+  });
+
+  if (!canLendAgain) {
+    return null;
+  }
+
+  return (
+    <ActivityDetailsDoItAgainButton
+      label={strings('activity_details.lend_again')}
+      onPress={onLendAgain}
+    />
+  );
+}
+
 type SwapDetailsItem = Extract<
   ActivityListItem,
   {
@@ -51,6 +79,12 @@ export function SwapDetails({ item }: { item: SwapDetailsItem }) {
     destinationToken,
     fallbackCaipChainId: item.chainId,
   });
+
+  const swapAgainLabel =
+    item.type === 'lendingDeposit' || item.type === 'lendingWithdrawal'
+      ? undefined
+      : getSwapAgainLabel(item.type);
+  const isLendingDeposit = item.type === 'lendingDeposit';
   const canDoItAgain = canRenderActivityDetailsDoItAgain(
     sourceToken,
     item.chainId,
@@ -72,9 +106,15 @@ export function SwapDetails({ item }: { item: SwapDetailsItem }) {
             chainId={item.chainId}
             hash={item.hash}
           />
-          {canDoItAgain ? (
+          {isLendingDeposit ? (
+            <LendAgainButton
+              token={sourceToken}
+              fallbackCaipChainId={item.chainId}
+            />
+          ) : null}
+          {swapAgainLabel && canDoItAgain ? (
             <ActivityDetailsDoItAgainButton
-              label={getSwapAgainLabel(item.type)}
+              label={swapAgainLabel}
               onPress={handleDoItAgain}
             />
           ) : null}
diff --git a/app/components/Views/ActivityDetails/templates/TemplateLoader.test.tsx b/app/components/Views/ActivityDetails/templates/TemplateLoader.test.tsx
index b5948e0199b5..c9bcbdf012ea 100644
--- a/app/components/Views/ActivityDetails/templates/TemplateLoader.test.tsx
+++ b/app/components/Views/ActivityDetails/templates/TemplateLoader.test.tsx
@@ -33,6 +33,11 @@ jest.mock('../../../UI/Bridge/hooks/useTokensWithBalance', () => ({
   useTokensWithBalance: () => [],
 }));
 
+jest.mock('../../../UI/Earn/hooks/useEarnTokens', () => ({
+  __esModule: true,
+  default: () => ({ earnTokensByChainIdAndAddress: {} }),
+}));
+
 jest.mock(
   '../../../../selectors/multichainAccounts/accountTreeController',
   () => {
diff --git a/app/components/Views/ActivityDetails/templates/bridgeDetailsUtils.test.ts b/app/components/Views/ActivityDetails/templates/bridgeDetailsUtils.test.ts
index 4f9724fd6f2e..59f44b4ad9e3 100644
--- a/app/components/Views/ActivityDetails/templates/bridgeDetailsUtils.test.ts
+++ b/app/components/Views/ActivityDetails/templates/bridgeDetailsUtils.test.ts
@@ -1,7 +1,24 @@
 import type { BridgeHistoryItem } from '@metamask/bridge-status-controller';
 import type { ActivityListItem } from '../../../../util/activity-adapters';
 import type { TransactionGroup } from '../../../../util/activity-adapters/adapters/transaction-group';
-import { getBridgeHistoryItem } from './bridgeDetailsUtils';
+import {
+  getBridgeExplorerSheetTx,
+  getBridgeHistoryItem,
+} from './bridgeDetailsUtils';
+
+function bridgeItem(
+  raw: ActivityListItem['raw'],
+): Extract<ActivityListItem, { type: 'bridge' }> {
+  return {
+    type: 'bridge',
+    chainId: 'eip155:1',
+    status: 'success',
+    timestamp: 1,
+    hash: '0xsourcehash',
+    raw,
+    data: {},
+  };
+}
 
 describe('bridgeDetailsUtils', () => {
   it('finds bridge history by local transaction meta id before source hash', () => {
@@ -39,4 +56,46 @@ describe('bridgeDetailsUtils', () => {
       }),
     ).toBe(bridgeHistoryItem);
   });
+
+  describe('getBridgeExplorerSheetTx', () => {
+    it('hands the sheet the initial transaction, matching the history lookup', () => {
+      const initialTransaction = {
+        id: 'initial',
+      } as TransactionGroup['initialTransaction'];
+
+      expect(
+        getBridgeExplorerSheetTx(
+          bridgeItem({
+            type: 'localTransaction',
+            data: {
+              initialTransaction,
+              primaryTransaction: { id: 'primary' },
+            } as TransactionGroup,
+          }),
+        ),
+      ).toEqual({ evmTxMeta: initialTransaction });
+    });
+
+    it('hands the sheet a non-EVM transaction as multiChainTx', () => {
+      const data = { id: 'solana-tx' };
+
+      expect(
+        getBridgeExplorerSheetTx(
+          bridgeItem({
+            type: 'keyringTransaction',
+            data,
+          } as ActivityListItem['raw']),
+        ),
+      ).toEqual({ multiChainTx: data });
+    });
+
+    it.each([
+      ['an indexer-only row', { type: 'apiEvmTransaction', data: {} }],
+      ['a row with no raw transaction', undefined],
+    ])('returns nothing for %s', (_name, raw) => {
+      expect(
+        getBridgeExplorerSheetTx(bridgeItem(raw as ActivityListItem['raw'])),
+      ).toEqual({});
+    });
+  });
 });
diff --git a/app/components/Views/ActivityDetails/templates/bridgeDetailsUtils.ts b/app/components/Views/ActivityDetails/templates/bridgeDetailsUtils.ts
index 1ab40bd327ae..69708e599ab1 100644
--- a/app/components/Views/ActivityDetails/templates/bridgeDetailsUtils.ts
+++ b/app/components/Views/ActivityDetails/templates/bridgeDetailsUtils.ts
@@ -1,4 +1,6 @@
 import type { BridgeHistoryItem } from '@metamask/bridge-status-controller';
+import type { Transaction } from '@metamask/keyring-api';
+import type { TransactionMeta } from '@metamask/transaction-controller';
 import type {
   ActivityListItem,
   TokenAmount,
@@ -18,6 +20,24 @@ export function getBridgeDestinationTxHash(
   return bridgeHistoryItem?.status.destChain?.txHash;
 }
 
+/**
+ * The transaction the block-explorer sheet resolves both legs from. Uses
+ * `initialTransaction`, matching {@link getBridgeHistoryItem}, so the two can't
+ * land on different history items. Empty for indexer-only rows, which have no
+ * local transaction.
+ */
+export function getBridgeExplorerSheetTx(
+  item: Extract<ActivityListItem, { type: 'bridge' }>,
+): { evmTxMeta?: TransactionMeta; multiChainTx?: Transaction } {
+  if (item.raw?.type === 'localTransaction') {
+    return { evmTxMeta: item.raw.data.initialTransaction };
+  }
+  if (item.raw?.type === 'keyringTransaction') {
+    return { multiChainTx: item.raw.data };
+  }
+  return {};
+}
+
 export function getBridgeHistoryItem(
   item: Extract<ActivityListItem, { type: 'bridge' }>,
   bridgeHistory: Record<string, BridgeHistoryItem>,
diff --git a/app/components/Views/ActivityDetails/templates/swapAgainLabel.test.ts b/app/components/Views/ActivityDetails/templates/swapAgainLabel.test.ts
index 1e67ca1bd80d..5b84a2cffb3a 100644
--- a/app/components/Views/ActivityDetails/templates/swapAgainLabel.test.ts
+++ b/app/components/Views/ActivityDetails/templates/swapAgainLabel.test.ts
@@ -7,23 +7,12 @@ describe('getSwapAgainLabel', () => {
     ['convert', 'activity_details.convert_again'],
     ['wrap', 'activity_details.wrap_again'],
     ['unwrap', 'activity_details.unwrap_again'],
-    ['lendingDeposit', 'activity_details.swap_again'],
-    ['lendingWithdrawal', 'activity_details.swap_again'],
   ] as const)('maps %s to the %s label', (type, key) => {
     expect(getSwapAgainLabel(type)).toBe(strings(key));
   });
 
   it('never returns the generic "Do it again" copy', () => {
-    (
-      [
-        'swap',
-        'convert',
-        'wrap',
-        'unwrap',
-        'lendingDeposit',
-        'lendingWithdrawal',
-      ] as const
-    ).forEach((type) => {
+    (['swap', 'convert', 'wrap', 'unwrap'] as const).forEach((type) => {
       expect(getSwapAgainLabel(type)).not.toBe('Do it again');
     });
   });
diff --git a/app/components/Views/ActivityDetails/templates/swapAgainLabel.ts b/app/components/Views/ActivityDetails/templates/swapAgainLabel.ts
index b079469ff500..ebe5df2f87b6 100644
--- a/app/components/Views/ActivityDetails/templates/swapAgainLabel.ts
+++ b/app/components/Views/ActivityDetails/templates/swapAgainLabel.ts
@@ -1,6 +1,7 @@
 import { strings } from '../../../../../locales/i18n';
 import type { ActivityListItem } from '../../../../util/activity-adapters';
 
+/** Activity types routed to the `SwapDetails` template. Keep both lists in sync. */
 type SwapFamilyType = Extract<
   ActivityListItem,
   {
@@ -16,12 +17,20 @@ type SwapFamilyType = Extract<
 >['type'];
 
 /**
- * Transaction-type-specific verb for the "do it again" CTA on swap-family
- * details (the action opens the unified swap/bridge view seeded with the
- * original tokens). Lending in/out falls back to "Swap again" since the action
- * routes through the swap view. Never returns the generic "Do it again".
+ * The subset whose CTA re-opens the swap view. Lending in/out is excluded: the
+ * swap view can't repeat either action, so they get their own CTA (or none).
  */
-export function getSwapAgainLabel(type: SwapFamilyType): string {
+type SwapAgainType = Exclude<
+  SwapFamilyType,
+  'lendingDeposit' | 'lendingWithdrawal'
+>;
+
+/**
+ * Type-specific verb for the "do it again" CTA, which opens the unified
+ * swap/bridge view seeded with the original tokens. Never returns the generic
+ * "Do it again".
+ */
+export function getSwapAgainLabel(type: SwapAgainType): string {
   switch (type) {
     case 'convert':
       return strings('activity_details.convert_again');
@@ -30,8 +39,6 @@ export function getSwapAgainLabel(type: SwapFamilyType): string {
     case 'unwrap':
       return strings('activity_details.unwrap_again');
     case 'swap':
-    case 'lendingDeposit':
-    case 'lendingWithdrawal':
     default:
       return strings('activity_details.swap_again');
   }
diff --git a/app/components/Views/ActivityList/ActivityList.tsx b/app/components/Views/ActivityList/ActivityList.tsx
index 28cea60890b7..cec2e89e998a 100644
--- a/app/components/Views/ActivityList/ActivityList.tsx
+++ b/app/components/Views/ActivityList/ActivityList.tsx
@@ -130,6 +130,7 @@ import {
   resolveRampOrderTarget,
 } from './utils/resolveRampOrderTarget';
 import { useRampNavigation } from '../../UI/Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../UI/Ramp/constants/rampsBuyCufTags';
 import {
   INITIAL_PERPS_ACTIVITY_SOURCE_STATE,
   PerpsActivitySource,
@@ -837,7 +838,7 @@ const ActivityList = forwardRef<ActivityListHandle, ActivityListProps>(
         // Continue → Send Transaction flow which ActivityDetails does not.
         if (raw.type === 'rampOrder') {
           if (resolveRampOrderTarget(raw.data) === 'deposit-resume-buy') {
-            goToBuy();
+            goToBuy(undefined, { surface: RAMPS_BUY_CUF_SURFACE.ACTIVITY });
             return;
           }
 
@@ -864,10 +865,18 @@ const ActivityList = forwardRef<ActivityListHandle, ActivityListProps>(
           return;
         }
 
-        // Non-EVM swaps/bridges submitted from this device carry a
-        // bridge-history entry. Cross-chain bridges keep their dedicated
-        // bridge-status screen, mirroring hasDedicatedDetailScreen for local
-        // EVM bridges; same-chain swaps fall through to the shared detail flows.
+        // Bridges route to the redesigned details screen (BridgeDetails
+        // template); the legacy bridge-status screen below is the flag-off
+        // fallback.
+        if (isTransactionsRedesignEnabled) {
+          const detailsRoute = getActivityDetailsRoute(item);
+          if (detailsRoute) {
+            navigation.navigate(Routes.ACTIVITY_DETAILS, detailsRoute);
+            return;
+          }
+        }
+
+        // Flag off: non-EVM cross-chain bridges keep the bridge-status screen.
         if (raw.type === 'keyringTransaction') {
           const keyringBridgeHistoryItem = getBridgeHistoryItemByHash(
             item.hash,
@@ -885,14 +894,6 @@ const ActivityList = forwardRef<ActivityListHandle, ActivityListProps>(
           }
         }
 
-        if (isTransactionsRedesignEnabled) {
-          const detailsRoute = getActivityDetailsRoute(item);
-          if (detailsRoute) {
-            navigation.navigate(Routes.ACTIVITY_DETAILS, detailsRoute);
-            return;
-          }
-        }
-
         const pressToken = (activityPressTokenRef.current += 1);
 
         // Perps rows route to the dedicated perps detail screens, mirroring the
diff --git a/app/components/Views/ActivityList/getActivityDetailsRoute.test.ts b/app/components/Views/ActivityList/getActivityDetailsRoute.test.ts
index 16275c769ec6..3fa1f0265ab2 100644
--- a/app/components/Views/ActivityList/getActivityDetailsRoute.test.ts
+++ b/app/components/Views/ActivityList/getActivityDetailsRoute.test.ts
@@ -85,17 +85,24 @@ describe('getActivityDetailsRoute', () => {
     expect(route?.preloadKey).toBeDefined();
   });
 
-  it('returns null for a bridge local transaction (keeps its dedicated screen)', () => {
+  it('routes a bridge local transaction to ActivityDetails (BridgeDetails template)', () => {
     const bridgeItem = baseItem({
       raw: {
         type: 'localTransaction',
         data: {
-          primaryTransaction: { type: TransactionType.bridge },
+          primaryTransaction: {
+            id: 'bridge-meta-1',
+            type: TransactionType.bridge,
+          },
         },
       },
     } as unknown as Partial<ActivityListItem>);
 
-    expect(getActivityDetailsRoute(bridgeItem)).toBeNull();
+    // Bridges used to be excluded in favour of the legacy bridge-status
+    // screen, which predates the BridgeDetails template.
+    expect(getActivityDetailsRoute(bridgeItem)).toEqual(
+      expect.objectContaining({ txIdentifier: 'bridge-meta-1' }),
+    );
   });
 
   it('does not stash a preload key for plain API EVM rows', () => {
diff --git a/app/components/Views/ActivityList/getActivityDetailsRoute.ts b/app/components/Views/ActivityList/getActivityDetailsRoute.ts
index dc1d1075175e..1c76f714acb3 100644
--- a/app/components/Views/ActivityList/getActivityDetailsRoute.ts
+++ b/app/components/Views/ActivityList/getActivityDetailsRoute.ts
@@ -1,21 +1,8 @@
-import { TransactionType } from '@metamask/transaction-controller';
 import type { ActivityListItem } from '../../../util/activity-adapters';
 // eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): shared activity-details route type; route-isolation backlog
 import type { ActivityDetailsParams } from '../ActivityDetails/ActivityDetails.types';
 import { stashPreloadedActivityItem } from './preloadedActivityItemStore';
 
-/**
- * Bridge rows keep their dedicated bridge-status screen rather than routing to
- * the generic ActivityDetails screen.
- */
-function hasDedicatedDetailScreen(item: ActivityListItem): boolean {
-  const { raw } = item;
-  return (
-    raw?.type === 'localTransaction' &&
-    raw.data.primaryTransaction?.type === TransactionType.bridge
-  );
-}
-
 function getLocalTransactionMetaId(item: ActivityListItem): string | undefined {
   if (item.raw?.type !== 'localTransaction') {
     return undefined;
@@ -24,23 +11,18 @@ function getLocalTransactionMetaId(item: ActivityListItem): string | undefined {
 }
 
 /**
- * Route params for opening a row in the redesigned `ActivityDetails` screen, or
- * `null` when it can't be shown there (no stable identifier, or a bridge tx with
- * its own screen) — callers then fall back to their legacy detail flow. Shared
- * so the Activity list and per-asset lists route identically.
+ * Route params for the redesigned `ActivityDetails` screen, or `null` when the
+ * row has no stable identifier — callers then fall back to their legacy detail
+ * flow. Shared so every list routes identically.
  *
- * Local EVM rows navigate by `TransactionMeta.id` (stable across STX hash
- * assignment) and are stashed in `preloadedActivityItemStore` so Details can
- * recover if the live hash temporarily diverges. Provider-backed rows
- * (Perps/Predict) are also stashed. Call only when about to navigate.
+ * Local EVM rows use `TransactionMeta.id` rather than the hash, which can change
+ * on STX submission, and are stashed in `preloadedActivityItemStore` so Details
+ * can recover if the live hash diverges. Provider-backed rows (Perps/Predict)
+ * are stashed too, so call this only when about to navigate.
  */
 export function getActivityDetailsRoute(
   item: ActivityListItem,
 ): ActivityDetailsParams | null {
-  if (hasDedicatedDetailScreen(item)) {
-    return null;
-  }
-
   const localMetaId = getLocalTransactionMetaId(item);
   const txIdentifier = localMetaId ?? item.hash;
   if (!txIdentifier) {
diff --git a/app/components/Views/ActivityList/hooks/useLocalActivityItems.test.ts b/app/components/Views/ActivityList/hooks/useLocalActivityItems.test.ts
index c6320efa85ec..ffcb4606368d 100644
--- a/app/components/Views/ActivityList/hooks/useLocalActivityItems.test.ts
+++ b/app/components/Views/ActivityList/hooks/useLocalActivityItems.test.ts
@@ -500,4 +500,34 @@ describe('useLocalActivityItems', () => {
     expect(result.current).toHaveLength(1);
     expect(result.current[0]).toMatchObject({ hash: '0xsend' });
   });
+
+  it('keeps an in-flight perps deposit and maps it to perpsAddFunds', () => {
+    selectorState.localTransactions = [
+      makeTx({
+        id: 'perps-deposit-id',
+        hash: '0xperpsdeposit',
+        chainId: '0x2105',
+        status: TransactionStatus.submitted,
+        type: TransactionType.perpsDeposit,
+        txParams: {
+          from,
+          nonce: '0x1',
+          to: usdc,
+          // transfer(address,uint256) of 0.1 USDC to the bridge
+          data: `0xa9059cbb${recipient
+            .slice(2)
+            .padStart(64, '0')}${(100000).toString(16).padStart(64, '0')}`,
+        },
+      }),
+    ];
+
+    const { result } = renderHook(() => useLocalActivityItems());
+
+    expect(result.current).toHaveLength(1);
+    expect(result.current[0]).toMatchObject({
+      type: 'perpsAddFunds',
+      hash: '0xperpsdeposit',
+      raw: { type: 'localTransaction' },
+    });
+  });
 });
diff --git a/app/components/Views/ActivityList/hooks/useLocalActivityItems.ts b/app/components/Views/ActivityList/hooks/useLocalActivityItems.ts
index ba7242281fe2..9b52b546a679 100644
--- a/app/components/Views/ActivityList/hooks/useLocalActivityItems.ts
+++ b/app/components/Views/ActivityList/hooks/useLocalActivityItems.ts
@@ -168,25 +168,25 @@ function buildTransactionGroups(
 }
 
 /**
- * Returns bridge activity status override for a local bridge transaction.
+ * Status override for a local bridge transaction.
+ *
+ * A bridge is only done once the destination leg lands, which the local
+ * `TransactionMeta` can't know — it goes `confirmed` as soon as the source tx
+ * confirms. Takes an already-resolved history entry so every caller shares the
+ * single `findBridgeHistoryItem` lookup.
+ *
+ * Exported for the per-asset activity lists, which build the same
+ * {@link TransactionGroup} enrichment from a single transaction.
  */
-function getBridgeActivityStatus(
+export function getBridgeActivityStatus(
   tx: TransactionMeta,
-  bridgeHistory: ReturnType<typeof selectBridgeHistoryForAccount>,
+  bridgeHistoryItem: BridgeHistoryItem | undefined,
 ): Status | undefined {
-  if (tx.type !== TransactionType.bridge) return undefined;
-  const historyItem =
-    bridgeHistory[tx.id] ??
-    (tx.actionId ? bridgeHistory[tx.actionId] : undefined) ??
-    Object.values(bridgeHistory).find(
-      (item) =>
-        (item as unknown as { originalTransactionId?: string })
-          .originalTransactionId === tx.id,
-    );
-
-  if (!historyItem) return undefined;
+  if (tx.type !== TransactionType.bridge || !bridgeHistoryItem) {
+    return undefined;
+  }
 
-  if (historyItem.status?.destChain?.txHash) {
+  if (bridgeHistoryItem.status?.destChain?.txHash) {
     return 'success';
   }
 
@@ -230,8 +230,12 @@ function tokenFromQuoteAsset(
  * quote (symbol always, amount/decimals/assetId when present) so the row resolves
  * to a complete swap immediately and reactively; fall back to the legacy
  * on-device fields for older SwapsController transactions with no bridge quote.
+ *
+ * Exported for the per-asset activity lists, which would otherwise re-derive
+ * this and drift — an asset page that skips it renders every unified swap as
+ * `swapIncomplete`.
  */
-function getSwapTokenEnrichment(
+export function getSwapTokenEnrichment(
   tx: TransactionMeta,
   nativeSymbol: string | undefined,
   bridgeHistoryItem: BridgeHistoryItem | undefined,
@@ -348,7 +352,7 @@ export function useLocalActivityItems(): ActivityListItem[] {
       });
 
       // Bridge activity status override
-      const activityStatus = getBridgeActivityStatus(tx, bridgeHistory);
+      const activityStatus = getBridgeActivityStatus(tx, bridgeHistoryItem);
 
       // Swap token enrichment
       const { sourceToken, destinationToken } = getSwapTokenEnrichment(
diff --git a/app/components/Views/ActivityList/utils/resolveRampOrderTarget.ts b/app/components/Views/ActivityList/utils/resolveRampOrderTarget.ts
index edcbade636ab..d25c54407994 100644
--- a/app/components/Views/ActivityList/utils/resolveRampOrderTarget.ts
+++ b/app/components/Views/ActivityList/utils/resolveRampOrderTarget.ts
@@ -15,6 +15,7 @@ import {
 import { createOrderDetailsNavDetails } from '../../../UI/Ramp/Aggregator/Views/OrderDetails/OrderDetails';
 import { createRampsOrderDetailsNavDetails } from '../../../UI/Ramp/Views/OrderDetails';
 import { createDepositOrderDetailsNavDetails } from '../../../UI/Ramp/Views/OrderDetails/DepositOrderDetails/DepositOrderDetails';
+import { RAMPS_BUY_CUF_SURFACE } from '../../../UI/Ramp/constants/rampsBuyCufTags';
 
 export type RampOrderTarget =
   | 'ramps-v2-details'
@@ -47,7 +48,8 @@ export interface NavigateToRampOrderTargetArgs {
   data: FiatOrder | RampsOrder;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any -- mirrors React Navigation's navigate spread of create*NavDetails
   navigation: { navigate: (...args: any[]) => void };
-  goToBuy: () => void;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- useRampNavigation().goToBuy
+  goToBuy: (...args: any[]) => any;
 }
 
 /**
@@ -64,7 +66,7 @@ export function navigateToRampOrderTarget({
   const target = resolveRampOrderTarget(data);
 
   if (target === 'deposit-resume-buy') {
-    goToBuy();
+    goToBuy(undefined, { surface: RAMPS_BUY_CUF_SURFACE.ACTIVITY });
     return;
   }
 
diff --git a/app/components/Views/ActivityScreen/components/ActivityEmptyState/ActivityEmptyState.tsx b/app/components/Views/ActivityScreen/components/ActivityEmptyState/ActivityEmptyState.tsx
index 178a287a9efc..165b31e0abff 100644
--- a/app/components/Views/ActivityScreen/components/ActivityEmptyState/ActivityEmptyState.tsx
+++ b/app/components/Views/ActivityScreen/components/ActivityEmptyState/ActivityEmptyState.tsx
@@ -14,6 +14,7 @@ import ActivityEmptyDarkIcon from '../../../../../images/activity-empty-dark.svg
 import ActivityEmptyLightIcon from '../../../../../images/activity-empty-light.svg';
 // eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): route-isolation backlog
 import { useRampNavigation } from '../../../../UI/Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../../../UI/Ramp/constants/rampsBuyCufTags';
 // eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): route-isolation backlog
 import { ActivityScreenSelectorsIDs } from '../../ActivityScreen.testIds';
 import { ActivityTypeFilter } from '../../types';
@@ -61,7 +62,7 @@ const ActivityEmptyState: React.FC<ActivityEmptyStateProps> = ({
         });
         return;
       case ActivityEmptyStateAction.AddFunds:
-        goToBuy();
+        goToBuy(undefined, { surface: RAMPS_BUY_CUF_SURFACE.EMPTY_STATE });
         return;
       case ActivityEmptyStateAction.MakePrediction:
         navigation.navigate(Routes.PREDICT.ROOT, {
diff --git a/app/components/Views/ActivityScreen/components/PerpsActivityFilterSheet/PerpsActivityFilterSheet.test.tsx b/app/components/Views/ActivityScreen/components/PerpsActivityFilterSheet/PerpsActivityFilterSheet.test.tsx
index 590f78d3119e..e79ff5f33fc9 100644
--- a/app/components/Views/ActivityScreen/components/PerpsActivityFilterSheet/PerpsActivityFilterSheet.test.tsx
+++ b/app/components/Views/ActivityScreen/components/PerpsActivityFilterSheet/PerpsActivityFilterSheet.test.tsx
@@ -80,11 +80,11 @@ describe('PerpsActivityFilterSheet', () => {
     render(<PerpsActivityFilterSheet />);
 
     const props = lastProps();
-    expect(props.getLabel(PerpsActivityFilter.Order)).toBe(
-      strings(PERPS_ACTIVITY_FILTER_LABEL_KEY[PerpsActivityFilter.Order]),
+    expect(props.getLabel(PerpsActivityFilter.Orders)).toBe(
+      strings(PERPS_ACTIVITY_FILTER_LABEL_KEY[PerpsActivityFilter.Orders]),
     );
-    expect(props.getOptionTestID(PerpsActivityFilter.Order)).toBe(
-      `${ActivityScreenSelectorsIDs.PERPS_FILTER_OPTION_PREFIX}${PerpsActivityFilter.Order}`,
+    expect(props.getOptionTestID(PerpsActivityFilter.Orders)).toBe(
+      `${ActivityScreenSelectorsIDs.PERPS_FILTER_OPTION_PREFIX}${PerpsActivityFilter.Orders}`,
     );
   });
 
@@ -114,4 +114,15 @@ describe('PerpsActivityFilterSheet', () => {
       );
     }
   });
+
+  it.each([
+    [PerpsActivityFilter.Trades, 'Trades'],
+    [PerpsActivityFilter.Orders, 'Orders'],
+    [PerpsActivityFilter.Fundings, 'Funding payments'],
+    [PerpsActivityFilter.Deposits, 'Deposits'],
+  ])('labels %s as "%s"', (filter, expected) => {
+    render(<PerpsActivityFilterSheet />);
+
+    expect(lastProps().getLabel(filter)).toBe(expected);
+  });
 });
diff --git a/app/components/Views/ActivityScreen/components/PerpsActivityFilterSheet/PerpsActivityFilterSheet.tsx b/app/components/Views/ActivityScreen/components/PerpsActivityFilterSheet/PerpsActivityFilterSheet.tsx
index f48ca8ca5a31..61f6674abd5f 100644
--- a/app/components/Views/ActivityScreen/components/PerpsActivityFilterSheet/PerpsActivityFilterSheet.tsx
+++ b/app/components/Views/ActivityScreen/components/PerpsActivityFilterSheet/PerpsActivityFilterSheet.tsx
@@ -16,7 +16,7 @@ export const PERPS_ACTIVITY_FILTER_LABEL_KEY: Record<
   string
 > = {
   [PerpsActivityFilter.Trades]: 'activity_view.perps_filter.trades',
-  [PerpsActivityFilter.Order]: 'activity_view.perps_filter.order',
+  [PerpsActivityFilter.Orders]: 'activity_view.perps_filter.order',
   [PerpsActivityFilter.Fundings]: 'activity_view.perps_filter.fundings',
   [PerpsActivityFilter.Deposits]: 'activity_view.perps_filter.deposits',
 };
diff --git a/app/components/Views/ActivityScreen/types.test.ts b/app/components/Views/ActivityScreen/types.test.ts
index 2c19286c3261..e1931b8e7a0b 100644
--- a/app/components/Views/ActivityScreen/types.test.ts
+++ b/app/components/Views/ActivityScreen/types.test.ts
@@ -15,7 +15,7 @@ describe('Perps sub-filter buckets', () => {
     expect(PERPS_ACTIVITY_FILTER_ORDER[0]).toBe(PerpsActivityFilter.Trades);
     expect(PERPS_ACTIVITY_FILTER_ORDER).toEqual([
       PerpsActivityFilter.Trades,
-      PerpsActivityFilter.Order,
+      PerpsActivityFilter.Orders,
       PerpsActivityFilter.Fundings,
       PerpsActivityFilter.Deposits,
     ]);
@@ -57,7 +57,7 @@ describe('Perps sub-filter buckets', () => {
       ),
     ).toBe(true);
     expect(
-      PERPS_ACTIVITY_FILTER_KINDS[PerpsActivityFilter.Order].has('limitShort'),
+      PERPS_ACTIVITY_FILTER_KINDS[PerpsActivityFilter.Orders].has('limitShort'),
     ).toBe(true);
     expect(
       PERPS_ACTIVITY_FILTER_KINDS[PerpsActivityFilter.Fundings].has(
diff --git a/app/components/Views/ActivityScreen/types.ts b/app/components/Views/ActivityScreen/types.ts
index 1008c5ef5f36..4519f2cffb54 100644
--- a/app/components/Views/ActivityScreen/types.ts
+++ b/app/components/Views/ActivityScreen/types.ts
@@ -25,13 +25,14 @@ export enum ActivityTypeFilter {
  * (trade / order / funding / deposit|withdrawal) — see `perps-transaction.ts`.
  *
  * String values mirror metamask-extension's `PerpsTransactionFilter`
- * (`trade | order | funding | deposit`) for cross-platform parity. Display
- * labels intentionally follow the mobile ticket (Trades / Order / Fundings /
- * Deposits) — see PERPS_ACTIVITY_FILTER_LABEL_KEY.
+ * (`trade | order | funding | deposit`) for cross-platform parity, so they stay
+ * singular even where the member and its label are plural. Display labels are
+ * Trades / Orders / Funding payments / Deposits — see
+ * PERPS_ACTIVITY_FILTER_LABEL_KEY.
  */
 export enum PerpsActivityFilter {
   Trades = 'trade',
-  Order = 'order',
+  Orders = 'order',
   Fundings = 'funding',
   Deposits = 'deposit',
 }
@@ -60,7 +61,7 @@ export const PERPS_ACTIVITY_FILTER_KINDS: Record<
     'perpsCloseShortTakeProfit',
   ]),
 
-  [PerpsActivityFilter.Order]: new Set<ActivityKind>(PERPS_ORDER_KINDS),
+  [PerpsActivityFilter.Orders]: new Set<ActivityKind>(PERPS_ORDER_KINDS),
   [PerpsActivityFilter.Fundings]: new Set<ActivityKind>([
     'perpsPaidFundingFees',
     'perpsReceivedFundingFees',
@@ -74,7 +75,7 @@ export const PERPS_ACTIVITY_FILTER_KINDS: Record<
 // `Trades` is the default selection (per design).
 export const PERPS_ACTIVITY_FILTER_ORDER: PerpsActivityFilter[] = [
   PerpsActivityFilter.Trades,
-  PerpsActivityFilter.Order,
+  PerpsActivityFilter.Orders,
   PerpsActivityFilter.Fundings,
   PerpsActivityFilter.Deposits,
 ];
diff --git a/app/components/Views/ActivityView/ActivitiesView.testIds.ts b/app/components/Views/ActivityView/ActivitiesView.testIds.ts
index 011fdd694d46..d6446b57de17 100644
--- a/app/components/Views/ActivityView/ActivitiesView.testIds.ts
+++ b/app/components/Views/ActivityView/ActivitiesView.testIds.ts
@@ -33,6 +33,7 @@ export const ActivitiesViewSelectorsText = {
   PREDICT_DEPOSIT: enContent.transactions.tx_review_predict_deposit,
   PREDICT_WITHDRAW: enContent.transactions.tx_review_predict_withdraw,
   MUSD_CONVERSION: enContent.transactions.tx_review_musd_conversion,
+  MONEY_ACCOUNT_DEPOSIT: enContent.transactions.money_account_deposit,
   LENDING_DEPOSIT: enContent.transactions.tx_review_lending_deposit,
   LENDING_WITHDRAWAL: enContent.transactions.tx_review_lending_withdraw,
 };
diff --git a/app/components/Views/AddAsset/Views/ConfirmAddTokenView/ConfirmAddAsset.tsx b/app/components/Views/AddAsset/Views/ConfirmAddTokenView/ConfirmAddAsset.tsx
index cc037b02274c..be5aea4d9ddb 100644
--- a/app/components/Views/AddAsset/Views/ConfirmAddTokenView/ConfirmAddAsset.tsx
+++ b/app/components/Views/AddAsset/Views/ConfirmAddTokenView/ConfirmAddAsset.tsx
@@ -16,7 +16,7 @@ import BottomSheetFooter, {
 import ListItem from '../../../../../component-library/components/List/ListItem';
 import Routes from '../../../../../constants/navigation/Routes';
 import { ImportTokenViewSelectorsIDs } from '../../ImportAssetView.testIds';
-import { FlashList } from '@shopify/flash-list';
+import { FlashList, ListRenderItem } from '@shopify/flash-list';
 import {
   Box,
   HeaderStandard,
@@ -27,6 +27,29 @@ import { ImportAsset } from '../../utils/utils';
 import AddAssetTokenRow from '../../components/AddAssetTokenRow/AddAssetTokenRow';
 import Logger from '../../../../../util/Logger';
 
+interface ConfirmAddAssetRowProps {
+  asset: ImportAsset;
+  networkName: string;
+}
+
+const getAssetRowKey = (asset: ImportAsset) =>
+  `${asset.chainId}-${asset.address.toLowerCase()}`;
+
+function ConfirmAddAssetRowComponent({
+  asset,
+  networkName,
+}: ConfirmAddAssetRowProps) {
+  const tw = useTailwind();
+
+  return (
+    <ListItem gap={20} style={tw.style('p-0')}>
+      <AddAssetTokenRow asset={asset} networkName={networkName} />
+    </ListItem>
+  );
+}
+
+const ConfirmAddAssetRow = React.memo(ConfirmAddAssetRowComponent);
+
 const ConfirmAddAsset = () => {
   const { selectedAsset, networkName, addTokenList } = useParams<{
     selectedAsset: ImportAsset[];
@@ -61,6 +84,11 @@ const ConfirmAddAsset = () => {
     }
   }, [addTokenList, goToTokensFullView, isImporting]);
 
+  const renderItem = useCallback<ListRenderItem<ImportAsset>>(
+    ({ item }) => <ConfirmAddAssetRow asset={item} networkName={networkName} />,
+    [networkName],
+  );
+
   return (
     <SafeAreaView
       edges={['left', 'right', 'bottom']}
@@ -84,12 +112,8 @@ const ConfirmAddAsset = () => {
           data={selectedAsset}
           style={tw.style('flex-1 bg-default')}
           contentContainerStyle={tw.style('pt-6 px-6 pb-4')}
-          renderItem={({ item: asset, index }) => (
-            <ListItem key={index} gap={20} style={tw.style('p-0')}>
-              <AddAssetTokenRow asset={asset} networkName={networkName} />
-            </ListItem>
-          )}
-          keyExtractor={(_, index) => `token-search-row-${index}`}
+          renderItem={renderItem}
+          keyExtractor={getAssetRowKey}
         />
       </Box>
 
@@ -117,4 +141,5 @@ const ConfirmAddAsset = () => {
     </SafeAreaView>
   );
 };
+
 export default ConfirmAddAsset;
diff --git a/app/components/Views/AddAsset/components/NetworkListBottomSheet/NetworkListBottomSheet.tsx b/app/components/Views/AddAsset/components/NetworkListBottomSheet/NetworkListBottomSheet.tsx
index 1de75e54720f..41061a684b5f 100644
--- a/app/components/Views/AddAsset/components/NetworkListBottomSheet/NetworkListBottomSheet.tsx
+++ b/app/components/Views/AddAsset/components/NetworkListBottomSheet/NetworkListBottomSheet.tsx
@@ -1,5 +1,6 @@
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { ScrollView } from 'react-native-gesture-handler';
+import { FlashList, type ListRenderItem } from '@shopify/flash-list';
 import BottomSheet, {
   BottomSheetRef,
 } from '../../../../../component-library/components/BottomSheets/BottomSheet';
@@ -7,7 +8,6 @@ import { strings } from '../../../../../../locales/i18n';
 import { useSelector } from 'react-redux';
 import { selectNetworkConfigurations } from '../../../../../selectors/networkController';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import { useElevatedSurface } from '../../../../../util/theme/themeUtils';
 import { Box, HeaderStandard } from '@metamask/design-system-react-native';
 import Device from '../../../../../util/device';
 import Cell, {
@@ -28,6 +28,42 @@ import { isNonEvmChainId } from '../../../../../core/Multichain/utils';
 
 export const NETWORK_LIST_BOTTOM_SHEET = 'NETWORK_LIST_BOTTOM_SHEET';
 
+interface NetworkListRowProps {
+  network: MultichainNetworkConfiguration;
+  isSelected: boolean;
+  onPress: (chainId: SupportedCaipChainId | Hex) => void;
+}
+
+const keyExtractor = (network: MultichainNetworkConfiguration) =>
+  network.chainId;
+
+function NetworkListRowComponent({
+  network,
+  isSelected,
+  onPress,
+}: NetworkListRowProps) {
+  return (
+    <Box twClassName="items-start">
+      <Cell
+        variant={CellVariant.Select}
+        title={network.name}
+        avatarProps={{
+          variant: AvatarVariant.Network,
+          name: network.name,
+          imageSource: getNetworkImageSource({
+            chainId: network.chainId,
+          }),
+          size: AvatarSize.Sm,
+        }}
+        onPress={() => onPress(network.chainId as Hex)}
+        isSelected={isSelected}
+      />
+    </Box>
+  );
+}
+
+const NetworkListRow = React.memo(NetworkListRowComponent);
+
 export default function NetworkListBottomSheet({
   selectedNetwork,
   setSelectedNetwork,
@@ -42,12 +78,11 @@ export default function NetworkListBottomSheet({
   displayEvmNetworksOnly?: boolean;
 }) {
   const tw = useTailwind();
-  const surfaceClass = useElevatedSurface();
   const networkConfigurations = useSelector(selectNetworkConfigurations);
   const getAccountByScope = useSelector(selectSelectedInternalAccountByScope);
 
   const filteredNetworkConfigurations = useMemo(() => {
-    const configs = {} as Record<string, MultichainNetworkConfiguration>;
+    const configs: MultichainNetworkConfiguration[] = [];
 
     for (const [chainId, config] of Object.entries(networkConfigurations)) {
       // If displayEvmNetworksOnly is true, filter out non-EVM networks
@@ -68,21 +103,40 @@ export default function NetworkListBottomSheet({
         continue;
       }
 
-      configs[chainId] = config;
+      configs.push(config);
     }
 
     return configs;
   }, [displayEvmNetworksOnly, networkConfigurations, getAccountByScope]);
 
+  const handleSelectNetwork = useCallback(
+    (chainId: SupportedCaipChainId | Hex) => {
+      setSelectedNetwork(chainId);
+      sheetRef.current?.onCloseBottomSheet(() => {
+        setOpenNetworkSelector(false);
+      });
+    },
+    [setSelectedNetwork, setOpenNetworkSelector, sheetRef],
+  );
+
+  const renderItem = useCallback<
+    ListRenderItem<MultichainNetworkConfiguration>
+  >(
+    ({ item }) => (
+      <NetworkListRow
+        network={item}
+        isSelected={selectedNetwork === item.chainId}
+        onPress={handleSelectNetwork}
+      />
+    ),
+    [handleSelectNetwork, selectedNetwork],
+  );
+
   return (
     <BottomSheet
       shouldNavigateBack={false}
       ref={sheetRef}
       onClose={() => setOpenNetworkSelector(false)}
-      style={tw.style(
-        surfaceClass,
-        `max-h-[${Math.round(Device.getDeviceHeight() * 0.7)}px]`,
-      )}
       testID={NETWORK_LIST_BOTTOM_SHEET}
     >
       <HeaderStandard
@@ -94,31 +148,19 @@ export default function NetworkListBottomSheet({
         }}
       />
 
-      <ScrollView>
-        {Object.values(filteredNetworkConfigurations).map((network) => (
-          <Box twClassName="items-start" key={network.chainId}>
-            <Cell
-              variant={CellVariant.Select}
-              title={network.name}
-              avatarProps={{
-                variant: AvatarVariant.Network,
-                name: network.name,
-                imageSource: getNetworkImageSource({
-                  chainId: network.chainId,
-                }),
-                size: AvatarSize.Sm,
-              }}
-              onPress={() => {
-                setSelectedNetwork(network.chainId as Hex);
-                sheetRef.current?.onCloseBottomSheet(() => {
-                  setOpenNetworkSelector(false);
-                });
-              }}
-              isSelected={selectedNetwork === network.chainId}
-            />
-          </Box>
-        ))}
-      </ScrollView>
+      <Box
+        style={tw.style(
+          'grow shrink flex-row min-h-[200px]',
+          `max-h-[${Math.round(Device.getDeviceHeight() * 0.7)}px]`,
+        )}
+      >
+        <FlashList
+          data={filteredNetworkConfigurations}
+          renderItem={renderItem}
+          keyExtractor={keyExtractor}
+          renderScrollComponent={ScrollView}
+        />
+      </Box>
     </BottomSheet>
   );
 }
diff --git a/app/components/Views/AddAsset/components/SearchTokenResults/SearchTokenResults.test.tsx b/app/components/Views/AddAsset/components/SearchTokenResults/SearchTokenResults.test.tsx
index 16207b944bf4..277c16ad2362 100644
--- a/app/components/Views/AddAsset/components/SearchTokenResults/SearchTokenResults.test.tsx
+++ b/app/components/Views/AddAsset/components/SearchTokenResults/SearchTokenResults.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { fireEvent } from '@testing-library/react-native';
+import { fireEvent, within } from '@testing-library/react-native';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../../util/test/initial-root-state';
 import SearchTokenResults from './SearchTokenResults';
@@ -114,4 +114,59 @@ describe('SearchTokenResults', () => {
     fireEvent.press(listItem);
     expect(mockHandleSelectAsset).not.toHaveBeenCalled();
   });
+
+  it('keeps selection on the correct token when search results reorder', () => {
+    const tokenA = {
+      ...mockToken,
+      address: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+      symbol: 'AAA',
+      name: 'Token A',
+    };
+    const tokenB = {
+      ...mockToken,
+      address: '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      symbol: 'BBB',
+      name: 'Token B',
+      chainId: '0x89' as const,
+    };
+
+    const { getAllByTestId, rerender } = renderComponent({
+      searchResults: [tokenA, tokenB] as ImportAsset[],
+      selectedAsset: [tokenA] as ImportAsset[],
+      searchQuery: 'token',
+    });
+
+    const findRowByTokenName = (name: string) => {
+      const row = getAllByTestId(
+        ImportTokenViewSelectorsIDs.SEARCH_TOKEN_RESULT,
+      ).find((candidate) => within(candidate).queryByText(name));
+      if (!row) {
+        throw new Error(`Row for token "${name}" not found`);
+      }
+      return row;
+    };
+
+    expect(
+      within(findRowByTokenName('Token A')).getByRole('checkbox'),
+    ).toBeOnTheScreen();
+    expect(
+      within(findRowByTokenName('Token B')).queryByRole('checkbox'),
+    ).toBeNull();
+
+    rerender(
+      <SearchTokenResults
+        {...defaultProps}
+        searchResults={[tokenB, tokenA] as ImportAsset[]}
+        selectedAsset={[tokenA] as ImportAsset[]}
+        searchQuery="token"
+      />,
+    );
+
+    expect(
+      within(findRowByTokenName('Token A')).getByRole('checkbox'),
+    ).toBeOnTheScreen();
+    expect(
+      within(findRowByTokenName('Token B')).queryByRole('checkbox'),
+    ).toBeNull();
+  });
 });
diff --git a/app/components/Views/AddAsset/components/SearchTokenResults/SearchTokenResults.tsx b/app/components/Views/AddAsset/components/SearchTokenResults/SearchTokenResults.tsx
index 67a31199d620..e97121ac9caf 100644
--- a/app/components/Views/AddAsset/components/SearchTokenResults/SearchTokenResults.tsx
+++ b/app/components/Views/AddAsset/components/SearchTokenResults/SearchTokenResults.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import ListItemMultiSelect from '../../../../../component-library/components/List/ListItemMultiSelect';
 import { Image } from 'react-native';
 import { strings } from '../../../../../../locales/i18n';
 import { ImportTokenViewSelectorsIDs } from '../../ImportAssetView.testIds';
-import { FlashList } from '@shopify/flash-list';
+import { FlashList, ListRenderItem } from '@shopify/flash-list';
 import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
 import { useAssetFromTheme } from '../../../../../util/theme';
 import emptyStateDefiLight from '../../../../../images/empty-state-defi-light.png';
@@ -55,6 +55,43 @@ interface Props {
   isLoading?: boolean;
 }
 
+interface SearchTokenResultRowProps {
+  item: ImportAsset;
+  isSelected: boolean;
+  isAlreadyAdded: boolean;
+  networkName?: string;
+  onSelect: (asset: ImportAsset) => void;
+}
+
+const getTokenSearchRowKey = (token: ImportAsset) =>
+  `${token.chainId}-${token.address.toLowerCase()}`;
+
+const SearchTokenResultRow = React.memo(
+  ({
+    item,
+    isSelected,
+    isAlreadyAdded,
+    networkName,
+    onSelect,
+  }: SearchTokenResultRowProps) => {
+    const tw = useTailwind();
+    const isDisabled = isAlreadyAdded;
+
+    return (
+      <ListItemMultiSelect
+        isSelected={isSelected || isAlreadyAdded}
+        isDisabled={isDisabled}
+        gap={20}
+        style={tw.style('flex-1 py-0')}
+        onPress={() => !isDisabled && onSelect(item)}
+        testID={ImportTokenViewSelectorsIDs.SEARCH_TOKEN_RESULT}
+      >
+        <AddAssetTokenRow asset={item} networkName={networkName} />
+      </ListItemMultiSelect>
+    );
+  },
+);
+
 const TokenSkeleton = () => {
   const tw = useTailwind();
 
@@ -101,6 +138,36 @@ const SearchTokenResults = ({
     emptyStateDefiDark,
   );
 
+  const selectedAddresses = useMemo(
+    () => new Set(selectedAsset.map((token) => token.address)),
+    [selectedAsset],
+  );
+
+  const keyExtractor = useCallback(
+    (item: ImportAsset) => getTokenSearchRowKey(item),
+    [],
+  );
+
+  const renderItem = useCallback<ListRenderItem<ImportAsset>>(
+    ({ item }) => {
+      const { address } = item;
+      const isSelected = selectedAddresses.has(address);
+      const isAlreadyAdded =
+        alreadyAddedTokens?.has(address.toLowerCase()) ?? false;
+
+      return (
+        <SearchTokenResultRow
+          item={item}
+          isSelected={isSelected}
+          isAlreadyAdded={isAlreadyAdded}
+          networkName={networkName}
+          onSelect={handleSelectAsset}
+        />
+      );
+    },
+    [selectedAddresses, alreadyAddedTokens, networkName, handleSelectAsset],
+  );
+
   // Show skeleton loaders when loading
   if (isLoading) {
     return (
@@ -136,32 +203,8 @@ const SearchTokenResults = ({
   return (
     <FlashList
       data={searchResults}
-      renderItem={({ item, index }) => {
-        const { address } = item || {};
-        const isOnSelected = selectedAsset.some(
-          (token) => token.address === address,
-        );
-        const isSelected = selectedAsset && isOnSelected;
-
-        // Check if token is already added
-        const isAlreadyAdded = alreadyAddedTokens?.has(address.toLowerCase());
-        const isDisabled = isAlreadyAdded;
-
-        return (
-          <ListItemMultiSelect
-            isSelected={isSelected || isAlreadyAdded}
-            isDisabled={isDisabled}
-            gap={20}
-            style={tw.style('flex-1 py-0')}
-            key={`search-result-${index}`}
-            onPress={() => !isDisabled && handleSelectAsset(item)}
-            testID={ImportTokenViewSelectorsIDs.SEARCH_TOKEN_RESULT}
-          >
-            <AddAssetTokenRow asset={item} networkName={networkName} />
-          </ListItemMultiSelect>
-        );
-      }}
-      keyExtractor={(_, index) => `token-search-row-${index}`}
+      renderItem={renderItem}
+      keyExtractor={keyExtractor}
     />
   );
 };
diff --git a/app/components/Views/AddDeviceToWallet/index.test.tsx b/app/components/Views/AddDeviceToWallet/index.test.tsx
index dee1468a01cb..33b77a66b05c 100644
--- a/app/components/Views/AddDeviceToWallet/index.test.tsx
+++ b/app/components/Views/AddDeviceToWallet/index.test.tsx
@@ -79,6 +79,28 @@ jest.mock('../QRTabSwitcher', () => ({
   QRTabSwitcherScreens: { Scanner: 'Scanner' },
 }));
 
+jest.mock(
+  '../../../component-library/components-temp/HeaderCompactStandard',
+  () => {
+    const ActualReact = jest.requireActual('react');
+    const { Pressable } = jest.requireActual('react-native');
+
+    return {
+      __esModule: true,
+      default: jest.fn(
+        ({ onBack }: { onBack?: () => void; includesTopInset?: boolean }) =>
+          ActualReact.createElement(Pressable, {
+            testID: 'button-icon',
+            onPress: onBack,
+            accessibilityRole: 'button',
+          }),
+      ),
+    };
+  },
+);
+
+import HeaderCompactStandard from '../../../component-library/components-temp/HeaderCompactStandard';
+
 const renderComponent = (
   qrSyncState: Partial<typeof defaultQrSyncControllerState> = {},
   completedOnboarding = false,
@@ -106,6 +128,15 @@ describe('AddDeviceToWallet', () => {
   });
 
   describe('initial render', () => {
+    it('applies top safe-area inset to the header so the back button is tappable on iOS', () => {
+      renderComponent();
+
+      expect(HeaderCompactStandard).toHaveBeenCalledWith(
+        expect.objectContaining({ includesTopInset: true }),
+        undefined,
+      );
+    });
+
     it('renders the page heading', () => {
       const { getByText } = renderComponent();
 
diff --git a/app/components/Views/AddDeviceToWallet/index.tsx b/app/components/Views/AddDeviceToWallet/index.tsx
index 14c0277e90dc..846b417cca0a 100644
--- a/app/components/Views/AddDeviceToWallet/index.tsx
+++ b/app/components/Views/AddDeviceToWallet/index.tsx
@@ -150,10 +150,11 @@ const AddDeviceToWallet = () => {
 
   return (
     <SafeAreaView
+      edges={['bottom', 'left', 'right']}
       style={tw.style('flex-1 bg-default')}
       testID={AddDeviceToWalletTestIds.SCREEN}
     >
-      <HeaderCompactStandard onBack={handleBack} />
+      <HeaderCompactStandard onBack={handleBack} includesTopInset />
       <Box twClassName="flex-1 gap-5 px-4 py-4">
         <Image
           source={addDeviceToWalletImage}
diff --git a/app/components/Views/AddressSelector/AddressSelector.tsx b/app/components/Views/AddressSelector/AddressSelector.tsx
index 1e73fce1f7c6..a175c06e20e2 100644
--- a/app/components/Views/AddressSelector/AddressSelector.tsx
+++ b/app/components/Views/AddressSelector/AddressSelector.tsx
@@ -42,7 +42,6 @@ import { createAccountSelectorNavDetails } from '../AccountSelector';
 import { NetworkConfiguration } from '@metamask/network-controller';
 import { strings } from '../../../../locales/i18n';
 import { AddressSelectorSelectors } from './AddressSelector.testIds';
-import { useElevatedSurface } from '../../../util/theme/themeUtils';
 
 export const createAddressSelectorNavDetails =
   createNavigationDetails<AddressSelectorParams>(
@@ -75,7 +74,6 @@ const AddressSelector = () => {
   );
 
   const accountName = useAccountName();
-  const surfaceClass = useElevatedSurface();
   const selectedCaipChainId = isCaipChainId(selectedChainId)
     ? selectedChainId
     : toEvmCaipChainId(selectedChainId);
@@ -156,12 +154,7 @@ const AddressSelector = () => {
   }, [internalAccountsSpreadByScopes, isEvmOnly, displayOnlyCaipChainIds]);
 
   return (
-    <BottomSheet
-      ref={sheetRef}
-      isFullscreen
-      goBack={navigation.goBack}
-      twClassName={surfaceClass}
-    >
+    <BottomSheet ref={sheetRef} isFullscreen goBack={navigation.goBack}>
       <BottomSheetHeader onClose={() => sheetRef.current?.onCloseBottomSheet()}>
         {strings('address_selector.select_an_address')}
       </BottomSheetHeader>
diff --git a/app/components/Views/Browser/Browser.components.test.tsx b/app/components/Views/Browser/Browser.components.test.tsx
index 0c6f1dc975a4..7b19c229ae62 100644
--- a/app/components/Views/Browser/Browser.components.test.tsx
+++ b/app/components/Views/Browser/Browser.components.test.tsx
@@ -354,6 +354,52 @@ describe('Browser - Component Rendering', () => {
       );
     });
 
+    it('passes fromMarketInsights param to BrowserTab', () => {
+      const tabs = [
+        { id: 1, url: 'https://tab1.com', image: '', isArchived: false },
+      ];
+      const BrowserTabMock = jest.mocked(BrowserTab);
+
+      renderWithProvider(
+        <Provider store={mockStore(mockInitialState)}>
+          <NavigationContainer independent>
+            <Stack.Navigator>
+              <Stack.Screen name={Routes.BROWSER.VIEW}>
+                {() => (
+                  <Browser
+                    route={{ params: { fromMarketInsights: true } }}
+                    tabs={tabs}
+                    activeTab={1}
+                    navigation={mockNavigation}
+                    createNewTab={jest.fn()}
+                    closeTab={jest.fn()}
+                    setActiveTab={jest.fn()}
+                    updateTab={jest.fn()}
+                  />
+                )}
+              </Stack.Screen>
+            </Stack.Navigator>
+          </NavigationContainer>
+        </Provider>,
+        {
+          state: {
+            ...mockInitialState,
+            browser: {
+              tabs,
+              activeTab: 1,
+            },
+          },
+        },
+      );
+
+      expect(BrowserTabMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          fromMarketInsights: true,
+        }),
+        undefined,
+      );
+    });
+
     it('passes linkType param to BrowserTab', () => {
       const tabs = [
         {
diff --git a/app/components/Views/Browser/Browser.types.ts b/app/components/Views/Browser/Browser.types.ts
index d39a950df5a8..85200b371487 100644
--- a/app/components/Views/Browser/Browser.types.ts
+++ b/app/components/Views/Browser/Browser.types.ts
@@ -11,6 +11,7 @@ export interface BrowserParams {
   fromBenefit?: boolean;
   fromCard?: boolean;
   fromWhatsHappening?: boolean;
+  fromMarketInsights?: boolean;
   fromMoney?: boolean;
   linkType?: string;
   url?: string;
diff --git a/app/components/Views/Browser/index.js b/app/components/Views/Browser/index.js
index 8da16b3abcb5..b6cb5a384449 100644
--- a/app/components/Views/Browser/index.js
+++ b/app/components/Views/Browser/index.js
@@ -470,6 +470,7 @@ export const BrowserPure = (props) => {
               fromBenefit={route.params?.fromBenefit}
               fromCard={route.params?.fromCard}
               fromWhatsHappening={route.params?.fromWhatsHappening}
+              fromMarketInsights={route.params?.fromMarketInsights}
               fromMoney={route.params?.fromMoney}
             />
           ) : (
@@ -495,6 +496,7 @@ export const BrowserPure = (props) => {
       route.params?.fromBenefit,
       route.params?.fromCard,
       route.params?.fromWhatsHappening,
+      route.params?.fromMarketInsights,
       route.params?.fromMoney,
     ],
   );
diff --git a/app/components/Views/BrowserTab/BrowserTab.tsx b/app/components/Views/BrowserTab/BrowserTab.tsx
index 69a6d67be891..266a0e5b0de6 100644
--- a/app/components/Views/BrowserTab/BrowserTab.tsx
+++ b/app/components/Views/BrowserTab/BrowserTab.tsx
@@ -71,6 +71,7 @@ import {
   sortMultichainAccountsByLastSelected,
 } from '../../../core/Permissions';
 import Routes from '../../../constants/navigation/Routes';
+import { useNavigateToPerpsHome } from '../../UI/Perps/utils/perpsModeSwitch';
 import { isInternalDeepLink } from '../../../core/DeeplinkManager/util/deeplinks';
 import SharedDeeplinkManager from '../../../core/DeeplinkManager/DeeplinkManager';
 import {
@@ -165,11 +166,13 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
     fromBenefit,
     fromCard,
     fromWhatsHappening,
+    fromMarketInsights,
     fromMoney,
   }) => {
     // Opted out of the React Compiler since it's a large component and we don't want to risk breaking changes.
     'use no memo';
     const navigation = useNavigation();
+    const navigateToPerpsHome = useNavigateToPerpsHome();
     const { styles } = useStyles(styleSheet, {});
     const [backEnabled, setBackEnabled] = useState(false);
     const [forwardEnabled, setForwardEnabled] = useState(false);
@@ -191,6 +194,16 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
     >({});
     // Track if webview is loaded for the first time
     const isWebViewReadyToLoad = useRef(false);
+    // URL-bar / autocomplete / deeplink navigation must update WebView
+    // `source.uri` (native loadRequest) instead of injecting
+    // `window.location.href`. On iOS the latter can trigger Universal Links
+    // and open associated native apps instead of keeping the session in
+    // MetaMask's in-app browser. Explore already opens tabs via `source.uri`;
+    // this mirrors that behavior on both platforms for consistency (MCWP-748).
+    const [webViewUri, setWebViewUri] = useState(() =>
+      prefixUrlWithProtocol(initialUrl),
+    );
+    const webViewUriRef = useRef(webViewUri);
 
     /**
      * GESTURE NAVIGATION
@@ -838,6 +851,34 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
       [handleSuccessfulPageResolution, favicon],
     );
 
+    /**
+     * Navigates the WebView via `source.uri` (native loadRequest) rather than
+     * `window.location.href`. On iOS this prevents Universal Link handoff to
+     * associated native apps; applied on both platforms for a single code path
+     * (MCWP-748).
+     *
+     * Remounting (`webViewReloadKey`) is required because mid-session
+     * `source.uri` prop updates do not reliably trigger WKWebView loadRequest
+     * on iOS (RNCWebView's iOS `loadUrl` command is a no-op; Android uses
+     * native `loadUrl`). Remount matches Explore's fresh-tab loadRequest path.
+     */
+    const [webViewReloadKey, setWebViewReloadKey] = useState(0);
+    const navigateWebViewToUrl = useCallback((url: string) => {
+      const sanitizedUrl = sanitizeUrlInput(url);
+      if (!sanitizedUrl) {
+        return;
+      }
+
+      if (webViewUriRef.current === sanitizedUrl) {
+        webviewRef.current?.reload?.();
+        return;
+      }
+
+      webViewUriRef.current = sanitizedUrl;
+      setWebViewUri(sanitizedUrl);
+      setWebViewReloadKey((key) => key + 1);
+    }, []);
+
     /**
      * Function that allows custom handling of any web view requests.
      * Return `true` to continue loading the request and `false` to stop loading.
@@ -871,11 +912,8 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
               origin: AppConstants.DEEPLINKS.ORIGIN_IN_APP_BROWSER,
               browserCallBack: (url: string) => {
                 // If the deeplink handler wants to navigate to a different URL in the browser
-                if (url && webviewRef.current) {
-                  webviewRef.current.injectJavaScript(`
-                window.location.href = '${sanitizeUrlInput(url)}';
-                true;  // Required for iOS
-              `);
+                if (url) {
+                  navigateWebViewToUrl(url);
                 }
               },
             })
@@ -929,6 +967,7 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
         isResolvedIpfsUrl,
         setIpfsBannerVisible,
         isTabActive,
+        navigateWebViewToUrl,
       ],
     );
 
@@ -939,14 +978,15 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
      * On iOS, the native fallback loads the URL in the same WebView, but providing
      * this explicit handler ensures consistent behavior across both platforms.
      */
-    const handleOpenWindow = useCallback((event: WebViewOpenWindowEvent) => {
-      const { targetUrl } = event.nativeEvent;
-      if (targetUrl && webviewRef.current) {
-        webviewRef.current.injectJavaScript(
-          `window.location.href = '${sanitizeUrlInput(targetUrl)}'; true;`,
-        );
-      }
-    }, []);
+    const handleOpenWindow = useCallback(
+      (event: WebViewOpenWindowEvent) => {
+        const { targetUrl } = event.nativeEvent;
+        if (targetUrl) {
+          navigateWebViewToUrl(targetUrl);
+        }
+      },
+      [navigateWebViewToUrl],
+    );
 
     /**
      * Sets loading bar progress
@@ -1033,6 +1073,12 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
       [isAllowedUrl, handleNotAllowedUrl],
     );
 
+    const onAutocompleteSelectPressIn = useCallback(() => {
+      // Keep focus through pressIn → onPress so blur does not dismiss
+      // autocomplete before the selection handler runs.
+      urlBarRef.current?.suppressNextBlur();
+    }, []);
+
     /**
      * Handle message from website
      */
@@ -1266,7 +1312,6 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
         setConnectionType(ConnectionType.UNKNOWN);
         urlBarRef.current?.setNativeProps({ text });
         submittedUrlRef.current = text;
-        webviewRef.current?.stopLoading();
         // Format url for browser to be navigatable by webview
         const processedUrl = processUrlForBrowser(text, searchEngine);
         if (isENSUrl(processedUrl, ensIgnoreListRef.current)) {
@@ -1282,13 +1327,14 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
           }
           return onSubmitEditingRef.current(handledEnsUrl);
         }
-        // Directly update url in webview
-        webviewRef.current?.injectJavaScript(`
-      window.location.href = '${sanitizeUrlInput(processedUrl)}';
-      true;  // Required for iOS
-    `);
+        // Load via WebView source.uri (same as Explore) instead of
+        // window.location.href to avoid iOS Universal Link handoff (MCWP-748).
+        navigateWebViewToUrl(processedUrl);
+        // Bottom bar stays mounted while focused (hidden visually), so we can
+        // leave edit mode immediately without remounting it mid-navigation.
+        urlBarRef.current?.dismissEditing();
       },
-      [searchEngine, handleEnsUrl, setConnectionType],
+      [searchEngine, handleEnsUrl, setConnectionType, navigateWebViewToUrl],
     );
 
     // Assign the memoized function to the ref. This is needed since onSubmitEditing is a useCallback and is accessed recursively
@@ -1330,24 +1376,32 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
     }, [onSubmitEditing]);
 
     /**
-     * Render the bottom navigation bar
+     * Render the bottom navigation bar.
+     * Keep the bar mounted while the URL bar is focused and only hide it
+     * visually — unmounting remounts siblings and can cancel WebView
+     * loadRequest when navigating via source.uri (MCWP-748).
      */
     const renderBottomBar = () =>
-      isTabActive && !isUrlBarFocused ? (
-        <BrowserBottomBar
-          canGoBack={backEnabled}
-          canGoForward={forwardEnabled}
-          goBack={goBack}
-          goForward={goForward}
-          reload={reload}
-          openNewTab={openNewTab}
-          activeUrl={resolvedUrlRef.current}
-          getMaskedUrl={getMaskedUrl}
-          title={titleRef.current}
-          sessionENSNames={sessionENSNamesRef.current}
-          favicon={favicon}
-          icon={iconRef.current}
-        />
+      isTabActive ? (
+        <View
+          pointerEvents={isUrlBarFocused ? 'none' : 'auto'}
+          style={isUrlBarFocused ? styles.hide : undefined}
+        >
+          <BrowserBottomBar
+            canGoBack={backEnabled}
+            canGoForward={forwardEnabled}
+            goBack={goBack}
+            goForward={goForward}
+            reload={reload}
+            openNewTab={openNewTab}
+            activeUrl={resolvedUrlRef.current}
+            getMaskedUrl={getMaskedUrl}
+            title={titleRef.current}
+            sessionENSNames={sessionENSNamesRef.current}
+            favicon={favicon}
+            icon={iconRef.current}
+          />
+        </View>
       ) : null;
 
     /**
@@ -1409,8 +1463,6 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
           case UrlAutocompleteCategory.Recents:
           case UrlAutocompleteCategory.Favorites:
           default:
-            // Hide URL bar for URL-based navigation (user leaves browser)
-            urlBarRef.current?.hide();
             onSubmitEditing(item.url);
             break;
         }
@@ -1446,10 +1498,7 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
 
     const handleClosePress = useCallback(() => {
       if (fromPerps) {
-        // If opened from Perps, navigate back to PerpsHome
-        navigation.navigate(Routes.PERPS.ROOT, {
-          screen: Routes.PERPS.PERPS_HOME,
-        });
+        navigateToPerpsHome();
       } else if (fromBenefit) {
         navigation.goBack();
       } else if (fromCard) {
@@ -1462,6 +1511,9 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
       } else if (fromWhatsHappening) {
         // WhatsHappeningDetailView is in the stack navigator so goBack() works correctly.
         navigation.goBack();
+      } else if (fromMarketInsights) {
+        // MarketInsightsView is in the stack navigator so goBack() works correctly.
+        navigation.goBack();
       } else if (fromMoney) {
         navigation.navigate(Routes.HOME_TABS, {
           screen: Routes.MONEY.ROOT,
@@ -1478,10 +1530,12 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
       }
     }, [
       navigation,
+      navigateToPerpsHome,
       fromPerps,
       fromBenefit,
       fromCard,
       fromWhatsHappening,
+      fromMarketInsights,
       fromMoney,
     ]);
 
@@ -1609,10 +1663,10 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
 
     const webViewSource = useMemo(
       () => ({
-        uri: prefixUrlWithProtocol(initialUrl),
+        uri: webViewUri,
         ...(isExternalLink ? { headers: { Cookie: '' } } : null),
       }),
-      [initialUrl, isExternalLink],
+      [webViewUri, isExternalLink],
     );
 
     const webViewTestProps = useMemo(
@@ -1686,6 +1740,7 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
                   >
                     <View style={styles.webview}>
                       <WebView
+                        key={`browser-webview-${webViewReloadKey}`}
                         originWhitelist={webViewOriginWhitelist}
                         decelerationRate={0.998}
                         ref={webviewRef}
@@ -1727,6 +1782,7 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
               <UrlAutocomplete
                 ref={autocompleteRef}
                 onSelect={onSelect}
+                onSelectPressIn={onAutocompleteSelectPressIn}
                 onDismiss={onDismissAutocomplete}
               />
             </View>
diff --git a/app/components/Views/BrowserTab/components/PhishingModal/index.tsx b/app/components/Views/BrowserTab/components/PhishingModal/index.tsx
index aa5b59a84e19..1510c86caa23 100644
--- a/app/components/Views/BrowserTab/components/PhishingModal/index.tsx
+++ b/app/components/Views/BrowserTab/components/PhishingModal/index.tsx
@@ -109,6 +109,9 @@ const PhishingModal = ({
    */
   const goBackToSafety = () => {
     urlBarRef.current?.setNativeProps({ text: HOMEPAGE_URL });
+    // Leave edit mode immediately so the unfocused URL display text is
+    // exposed to Appium before the delayed homepage navigation runs.
+    urlBarRef.current?.dismissEditing();
     setTimeout(() => {
       goToUrl(HOMEPAGE_URL);
       setShowPhishingModal(false);
diff --git a/app/components/Views/BrowserTab/index.test.tsx b/app/components/Views/BrowserTab/index.test.tsx
index f33013257aa5..b2a41811d301 100644
--- a/app/components/Views/BrowserTab/index.test.tsx
+++ b/app/components/Views/BrowserTab/index.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { fireEvent, screen, waitFor } from '@testing-library/react-native';
+import { act, fireEvent, screen, waitFor } from '@testing-library/react-native';
 import AppConstants from '../../../core/AppConstants';
 import renderWithProvider from '../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../util/test/initial-root-state';
@@ -14,8 +14,12 @@ import {
 import { handleWebShare } from '../../../util/browser/handleWebShare';
 import { handleWebDownload } from '../../../util/browser/handleWebDownload';
 import { getPhishingTestResultAsync } from '../../../util/phishingDetection';
+import { PhishingDetectorResultType } from '@metamask/phishing-controller';
 
 const mockInjectJavaScript = jest.fn();
+const mockStopLoading = jest.fn();
+const mockReload = jest.fn();
+let webViewMountCount = 0;
 
 jest.mock('@metamask/react-native-webview', () => {
   const { View } = jest.requireActual('react-native');
@@ -23,8 +27,13 @@ jest.mock('@metamask/react-native-webview', () => {
 
   const MockWebView = ActualReact.forwardRef(
     (props: Record<string, unknown>, ref: React.Ref<unknown>) => {
+      ActualReact.useEffect(() => {
+        webViewMountCount += 1;
+      }, []);
       ActualReact.useImperativeHandle(ref, () => ({
         injectJavaScript: mockInjectJavaScript,
+        stopLoading: mockStopLoading,
+        reload: mockReload,
       }));
       return <View {...props} />;
     },
@@ -172,6 +181,7 @@ describe('BrowserTab', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockInjectJavaScript.mockClear();
+    webViewMountCount = 0;
   });
 
   it('render Browser', async () => {
@@ -212,6 +222,24 @@ describe('BrowserTab', () => {
       );
     });
 
+    it('goes back when close button is pressed and opened from market insights', async () => {
+      renderWithProvider(<BrowserTab {...mockProps} fromMarketInsights />, {
+        state: mockInitialState,
+      });
+
+      await waitFor(() =>
+        expect(screen.getByTestId('browser-webview')).toBeVisible(),
+      );
+
+      fireEvent.press(screen.getByTestId('browser-tab-close-button'));
+
+      expect(mockNavigation.goBack).toHaveBeenCalledTimes(1);
+      expect(mockNavigation.navigate).not.toHaveBeenCalledWith(
+        Routes.TRENDING_VIEW,
+        expect.anything(),
+      );
+    });
+
     it('navigates to Card Home when close button is pressed and opened from card', async () => {
       renderWithProvider(<BrowserTab {...mockProps} fromCard />, {
         state: mockInitialState,
@@ -263,12 +291,10 @@ describe('BrowserTab', () => {
         state: mockInitialState,
       });
 
-      await waitFor(() =>
-        expect(screen.getByTestId('browser-webview')).toBeVisible(),
-      );
-
-      const webView = screen.getByTestId('browser-webview');
-      expect(webView.props.originWhitelist).toEqual(['*']);
+      await waitFor(() => {
+        const webView = screen.getByTestId('browser-webview');
+        expect(webView.props.originWhitelist).toEqual(['*']);
+      });
     });
   });
 
@@ -389,13 +415,17 @@ describe('BrowserTab', () => {
       const fullUrl = 'https://shared-host.example/view/test-path';
 
       // Flag the URL so onLoadStart cancels the load (early return).
-      (getPhishingTestResultAsync as jest.Mock).mockResolvedValueOnce({
+      jest.mocked(getPhishingTestResultAsync).mockResolvedValueOnce({
         result: true,
         name: '',
+        type: 'DAPP_SCANNING' as PhishingDetectorResultType,
       });
 
-      const result = await webView.props.onLoadStart({
-        nativeEvent: { url: fullUrl },
+      let result: boolean | undefined;
+      await act(async () => {
+        result = await webView.props.onLoadStart({
+          nativeEvent: { url: fullUrl },
+        });
       });
 
       // The full URL (with path) must be forwarded to the scanner, not the origin.
@@ -423,7 +453,7 @@ describe('BrowserTab', () => {
       expect(typeof webView.props.onOpenWindow).toBe('function');
     });
 
-    it('calls injectJavaScript with sanitized target URL when onOpenWindow fires', async () => {
+    it('updates WebView source uri when onOpenWindow fires', async () => {
       renderWithProvider(<BrowserTab {...mockProps} />, {
         state: mockInitialState,
       });
@@ -432,20 +462,49 @@ describe('BrowserTab', () => {
         expect(screen.getByTestId('browser-webview')).toBeVisible(),
       );
 
-      const webView = screen.getByTestId('browser-webview');
-      const { onOpenWindow } = webView.props;
+      const { onOpenWindow } = screen.getByTestId('browser-webview').props;
 
-      onOpenWindow({
-        nativeEvent: { targetUrl: 'https://stake.lido.fi' },
+      await act(async () => {
+        onOpenWindow({
+          nativeEvent: { targetUrl: 'https://stake.lido.fi' },
+        });
       });
 
-      expect(mockInjectJavaScript).toHaveBeenCalledTimes(1);
-      expect(mockInjectJavaScript).toHaveBeenCalledWith(
-        "window.location.href = 'https://stake.lido.fi'; true;",
+      await waitFor(() => {
+        expect(screen.getByTestId('browser-webview').props.source.uri).toBe(
+          'https://stake.lido.fi',
+        );
+      });
+      expect(mockInjectJavaScript).not.toHaveBeenCalledWith(
+        expect.stringContaining('window.location.href'),
+      );
+    });
+
+    it('sanitizes single quotes in the target URL before updating source', async () => {
+      renderWithProvider(<BrowserTab {...mockProps} />, {
+        state: mockInitialState,
+      });
+
+      await waitFor(() =>
+        expect(screen.getByTestId('browser-webview')).toBeVisible(),
       );
+
+      const { onOpenWindow } = screen.getByTestId('browser-webview').props;
+
+      await act(async () => {
+        onOpenWindow({
+          nativeEvent: { targetUrl: "https://example.com/path?q='test'" },
+        });
+      });
+
+      await waitFor(() => {
+        expect(screen.getByTestId('browser-webview').props.source.uri).toBe(
+          'https://example.com/path?q=%27test%27',
+        );
+      });
     });
 
-    it('sanitizes single quotes in the target URL before injecting', async () => {
+    it('does not update WebView source when targetUrl is empty', async () => {
       renderWithProvider(<BrowserTab {...mockProps} />, {
         state: mockInitialState,
       });
@@ -455,19 +514,45 @@ describe('BrowserTab', () => {
       );
 
       const webView = screen.getByTestId('browser-webview');
+      const initialUri = webView.props.source.uri;
       const { onOpenWindow } = webView.props;
 
-      onOpenWindow({
-        nativeEvent: { targetUrl: "https://example.com/path?q='test'" },
+      await act(async () => {
+        onOpenWindow({
+          nativeEvent: { targetUrl: '' },
+        });
       });
 
-      expect(mockInjectJavaScript).toHaveBeenCalledTimes(1);
-      expect(mockInjectJavaScript).toHaveBeenCalledWith(
-        "window.location.href = 'https://example.com/path?q=%27test%27'; true;",
+      expect(screen.getByTestId('browser-webview').props.source.uri).toBe(
+        initialUri,
+      );
+      expect(mockStopLoading).not.toHaveBeenCalled();
+    });
+
+    it('reloads WebView when onOpenWindow targets the current uri', async () => {
+      renderWithProvider(<BrowserTab {...mockProps} />, {
+        state: mockInitialState,
+      });
+
+      await waitFor(() =>
+        expect(screen.getByTestId('browser-webview')).toBeVisible(),
+      );
+
+      const { onOpenWindow } = screen.getByTestId('browser-webview').props;
+
+      await act(async () => {
+        onOpenWindow({
+          nativeEvent: { targetUrl: mockProps.initialUrl },
+        });
+      });
+
+      expect(mockReload).toHaveBeenCalledTimes(1);
+      expect(screen.getByTestId('browser-webview').props.source.uri).toBe(
+        mockProps.initialUrl,
       );
     });
 
-    it('does not call injectJavaScript when targetUrl is empty', async () => {
+    it('does not navigate when targetUrl is a javascript: URL', async () => {
       renderWithProvider(<BrowserTab {...mockProps} />, {
         state: mockInitialState,
       });
@@ -477,13 +562,124 @@ describe('BrowserTab', () => {
       );
 
       const webView = screen.getByTestId('browser-webview');
-      const { onOpenWindow } = webView.props;
+      const initialUri = webView.props.source.uri;
+      const mountsBefore = webViewMountCount;
 
-      onOpenWindow({
-        nativeEvent: { targetUrl: '' },
+      await act(async () => {
+        webView.props.onOpenWindow({
+          // eslint-disable-next-line no-script-url
+          nativeEvent: { targetUrl: 'javascript:alert(1)' },
+        });
       });
 
-      expect(mockInjectJavaScript).not.toHaveBeenCalled();
+      expect(screen.getByTestId('browser-webview').props.source.uri).toBe(
+        initialUri,
+      );
+      expect(webViewMountCount).toBe(mountsBefore);
+      expect(mockReload).not.toHaveBeenCalled();
+    });
+
+    it('remounts WebView when onOpenWindow navigates to a new URL', async () => {
+      renderWithProvider(<BrowserTab {...mockProps} />, {
+        state: mockInitialState,
+      });
+
+      await waitFor(() =>
+        expect(screen.getByTestId('browser-webview')).toBeVisible(),
+      );
+
+      const mountsBefore = webViewMountCount;
+
+      await act(async () => {
+        screen.getByTestId('browser-webview').props.onOpenWindow({
+          nativeEvent: { targetUrl: 'https://example.com' },
+        });
+      });
+
+      await waitFor(() => {
+        expect(screen.getByTestId('browser-webview').props.source.uri).toBe(
+          'https://example.com',
+        );
+        expect(webViewMountCount).toBeGreaterThan(mountsBefore);
+      });
+    });
+  });
+
+  describe('URL bar navigation', () => {
+    it('updates WebView source uri when URL bar submits a new URL', async () => {
+      renderWithProvider(<BrowserTab {...mockProps} />, {
+        state: mockInitialState,
+      });
+
+      await waitFor(() =>
+        expect(screen.getByTestId('browser-webview')).toBeVisible(),
+      );
+
+      const mountsBefore = webViewMountCount;
+
+      fireEvent.press(screen.getByTestId('browser-url-display-text'));
+      const urlInput = screen.getByTestId('browser-modal-url-input');
+      fireEvent(urlInput, 'submitEditing', {
+        nativeEvent: { text: 'https://example.com' },
+      });
+
+      await waitFor(() => {
+        expect(screen.getByTestId('browser-webview').props.source.uri).toBe(
+          'https://example.com',
+        );
+        expect(webViewMountCount).toBeGreaterThan(mountsBefore);
+      });
+      expect(mockInjectJavaScript).not.toHaveBeenCalledWith(
+        expect.stringContaining('window.location.href'),
+      );
+    });
+
+    it('updates WebView source uri when a Recents result is pressed', async () => {
+      renderWithProvider(<BrowserTab {...mockProps} />, {
+        state: {
+          ...mockInitialState,
+          browser: {
+            ...mockInitialState.browser,
+            history: [{ url: 'https://example.com', name: 'Example' }],
+          },
+        },
+      });
+
+      await waitFor(() =>
+        expect(screen.getByTestId('browser-webview')).toBeVisible(),
+      );
+
+      fireEvent.press(screen.getByTestId('browser-url-display-text'));
+      // RNTL does not fire TextInput onFocus from ref.focus(); focus explicitly
+      // so isUrlBarFocused is true while editing.
+      fireEvent(screen.getByTestId('browser-modal-url-input'), 'focus');
+      expect(
+        screen.queryByTestId('browser-tab-close-button'),
+      ).not.toBeOnTheScreen();
+
+      const recentResult = await screen.findByText('Example', {
+        includeHiddenElements: true,
+      });
+      // pressIn suppresses URL-bar blur so onPress still runs
+      fireEvent(recentResult, 'pressIn');
+      fireEvent.press(recentResult);
+
+      await waitFor(() => {
+        expect(screen.getByTestId('browser-webview').props.source.uri).toBe(
+          'https://example.com',
+        );
+      });
+
+      // Bottom bar stays mounted while editing (hidden visually), so edit mode
+      // can end immediately after navigation without remounting it (MCWP-748).
+      await waitFor(() => {
+        expect(
+          screen.queryByTestId('browser-tab-close-button'),
+        ).toBeOnTheScreen();
+      });
+      expect(mockInjectJavaScript).not.toHaveBeenCalledWith(
+        expect.stringContaining('window.location.href'),
+      );
     });
   });
 
@@ -538,13 +734,15 @@ describe('BrowserTab', () => {
 
       mockNavigation.setParams.mockClear();
 
-      onNavigationStateChange({
-        url: 'https://example.org/page',
-        title: 'Example Org',
-        loading: false,
-        canGoBack: true,
-        canGoForward: false,
-        navigationType: 'backforward',
+      await act(async () => {
+        onNavigationStateChange({
+          url: 'https://example.org/page',
+          title: 'Example Org',
+          loading: false,
+          canGoBack: true,
+          canGoForward: false,
+          navigationType: 'backforward',
+        });
       });
 
       expect(mockInjectJavaScript).toHaveBeenCalledTimes(1);
@@ -552,17 +750,19 @@ describe('BrowserTab', () => {
 
       const requestId = extractRequestIdFromInjectScript();
 
-      onMessage({
-        nativeEvent: {
-          data: JSON.stringify({
-            type: DOCUMENT_URL_FOR_URL_BAR,
-            payload: {
-              requestId,
-              url: 'https://example.com/page',
-              title: 'Example',
-            },
-          }),
-        },
+      await act(async () => {
+        onMessage({
+          nativeEvent: {
+            data: JSON.stringify({
+              type: DOCUMENT_URL_FOR_URL_BAR,
+              payload: {
+                requestId,
+                url: 'https://example.com/page',
+                title: 'Example',
+              },
+            }),
+          },
+        });
       });
 
       await waitFor(() =>
@@ -639,7 +839,7 @@ describe('BrowserTab', () => {
     });
 
     it('injects the share result back into the WebView to settle navigator.share()', async () => {
-      (handleWebShare as jest.Mock).mockResolvedValueOnce({
+      jest.mocked(handleWebShare).mockResolvedValueOnce({
         status: 'cancelled',
       });
 
@@ -656,16 +856,18 @@ describe('BrowserTab', () => {
 
       mockInjectJavaScript.mockClear();
 
-      onMessage({
-        nativeEvent: {
-          data: JSON.stringify({
-            type: WEB_SHARE_MESSAGE_TYPE,
-            payload: {
-              id: 'mm-share-123',
-              url: 'https://example.com',
-            },
-          }),
-        },
+      await act(async () => {
+        onMessage({
+          nativeEvent: {
+            data: JSON.stringify({
+              type: WEB_SHARE_MESSAGE_TYPE,
+              payload: {
+                id: 'mm-share-123',
+                url: 'https://example.com',
+              },
+            }),
+          },
+        });
       });
 
       await waitFor(() => {
diff --git a/app/components/Views/BrowserTab/types.ts b/app/components/Views/BrowserTab/types.ts
index 1f77d42e24a5..553962debe92 100644
--- a/app/components/Views/BrowserTab/types.ts
+++ b/app/components/Views/BrowserTab/types.ts
@@ -143,6 +143,10 @@ export type BrowserTabProps = SharedTabProps & {
    * Whether browser was opened from the What's Happening detail view
    */
   fromWhatsHappening?: boolean;
+  /**
+   * Whether browser was opened from the Market Insights view
+   */
+  fromMarketInsights?: boolean;
   /**
    * Whether browser was opened from the Money tab
    */
diff --git a/app/components/Views/CashTokensFullView/CashTokensFullView.tsx b/app/components/Views/CashTokensFullView/CashTokensFullView.tsx
index 3f6662ea118f..f90ba235bb41 100644
--- a/app/components/Views/CashTokensFullView/CashTokensFullView.tsx
+++ b/app/components/Views/CashTokensFullView/CashTokensFullView.tsx
@@ -43,6 +43,7 @@ import {
   MUSD_TOKEN_ASSET_ID_BY_CHAIN,
 } from '../../UI/Earn/constants/musd';
 import { useRampNavigation } from '../../UI/Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../UI/Ramp/constants/rampsBuyCufTags';
 import {
   useSwapBridgeNavigation,
   SwapBridgeNavigationLocation,
@@ -215,9 +216,12 @@ const CashTokensFullView = () => {
         .build(),
     );
 
-    goToBuy({
-      assetId: MUSD_TOKEN_ASSET_ID_BY_CHAIN[MUSD_CONVERSION_DEFAULT_CHAIN_ID],
-    });
+    goToBuy(
+      {
+        assetId: MUSD_TOKEN_ASSET_ID_BY_CHAIN[MUSD_CONVERSION_DEFAULT_CHAIN_ID],
+      },
+      { surface: RAMPS_BUY_CUF_SURFACE.CASH },
+    );
   }, [createEventBuilder, goToBuy, trackEvent]);
 
   const balanceHeading = useMemo(
diff --git a/app/components/Views/ConnectHardware/SelectHardware/index.test.tsx b/app/components/Views/ConnectHardware/SelectHardware/index.test.tsx
index e7c436f00d92..520851edb57a 100644
--- a/app/components/Views/ConnectHardware/SelectHardware/index.test.tsx
+++ b/app/components/Views/ConnectHardware/SelectHardware/index.test.tsx
@@ -16,10 +16,6 @@ jest.mock('../../../../../locales/i18n', () => ({
   strings: jest.fn((key: string) => key),
 }));
 
-jest.mock('../../../UI/Navbar', () => ({
-  getNavigationOptionsTitle: jest.fn(),
-}));
-
 jest.mock('../../../../core/HardwareWallets/analytics');
 
 const mockNavigate = jest.fn();
diff --git a/app/components/Views/Homepage/BalanceBreakdown/constants.ts b/app/components/Views/Homepage/BalanceBreakdown/constants.ts
new file mode 100644
index 000000000000..bb7a0ffcc193
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/constants.ts
@@ -0,0 +1,12 @@
+import type { SliceKey } from './types';
+
+/** Ordered sequence for homepage aggregation and display */
+export const SLICE_ORDER: SliceKey[] = [
+  'money',
+  'tokens',
+  'perps',
+  'predict',
+  'defi',
+];
+
+export const PERPS_HOMEPAGE_THROTTLE_MS = 1000;
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useDefiSlice.test.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useDefiSlice.test.ts
new file mode 100644
index 000000000000..b88433aa9a49
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useDefiSlice.test.ts
@@ -0,0 +1,151 @@
+import type { GroupedDeFiPositions } from '@metamask/assets-controllers';
+import { renderHook } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import { selectDefiPositionsByChainIds } from '../../../../../../selectors/defiPositionsController';
+import { selectDeFiPositionsSectionEnabled } from '../../../../../../selectors/deFiPositionsSectionEnabled';
+import { useNetworkEnablement } from '../../../../../hooks/useNetworkEnablement/useNetworkEnablement';
+import { sumDefiPositionsUsd, useDefiSlice } from './useDefiSlice';
+
+jest.mock('react-redux', () => ({ useSelector: jest.fn() }));
+jest.mock('../../../../../../selectors/defiPositionsController', () => ({
+  selectDefiPositionsByChainIds: jest.fn(),
+}));
+jest.mock('../../../../../../selectors/deFiPositionsSectionEnabled', () => ({
+  selectDeFiPositionsSectionEnabled: jest.fn(),
+}));
+jest.mock(
+  '../../../../../hooks/useNetworkEnablement/useNetworkEnablement',
+  () => ({
+    useNetworkEnablement: jest.fn(),
+  }),
+);
+
+const mockUseSelector = jest.mocked(useSelector);
+const mockSelectDefiPositionsByChainIds = jest.mocked(
+  selectDefiPositionsByChainIds,
+);
+const mockUseNetworkEnablement = jest.mocked(useNetworkEnablement);
+
+const protocol = (
+  name: string,
+  aggregatedMarketValue: number,
+): GroupedDeFiPositions['protocols'][number] =>
+  ({
+    aggregatedMarketValue,
+    protocolDetails: { name },
+  }) as GroupedDeFiPositions['protocols'][number];
+
+describe('sumDefiPositionsUsd', () => {
+  it('aggregates nested protocols across chains and preserves debt signs', () => {
+    const positions = {
+      '0x1': {
+        protocols: {
+          aave: protocol('Aave', 100),
+          compound: protocol('Compound', -25),
+        },
+      },
+      '0xa': {
+        protocols: {
+          aave: protocol('Aave', 50),
+        },
+      },
+    } as unknown as Parameters<typeof sumDefiPositionsUsd>[0];
+
+    expect(sumDefiPositionsUsd(positions)).toBe(125);
+  });
+
+  it('ignores missing chains, protocols, and invalid market values', () => {
+    const positions = {
+      '0x1': undefined,
+      '0x2': {},
+      '0x3': {
+        protocols: {
+          invalid: protocol('Invalid', Number.NaN),
+        },
+      },
+    } as unknown as Parameters<typeof sumDefiPositionsUsd>[0];
+
+    expect(sumDefiPositionsUsd(positions)).toBe(0);
+  });
+});
+
+describe('useDefiSlice', () => {
+  let isEnabled: boolean;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    isEnabled = true;
+    mockUseNetworkEnablement.mockReturnValue({
+      popularEvmNetworks: ['0x1'],
+    } as unknown as ReturnType<typeof useNetworkEnablement>);
+    mockSelectDefiPositionsByChainIds.mockReturnValue({
+      '0x1': {
+        protocols: {
+          aave: protocol('Aave', 100),
+        },
+      },
+    } as unknown as ReturnType<typeof selectDefiPositionsByChainIds>);
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectDeFiPositionsSectionEnabled) return isEnabled;
+      return selector({} as never);
+    });
+  });
+
+  it('converts positions on popular EVM networks', () => {
+    const { result } = renderHook(() => useDefiSlice((amount) => amount * 2));
+
+    expect(mockSelectDefiPositionsByChainIds).toHaveBeenCalledWith({}, ['0x1']);
+    expect(result.current).toEqual({
+      key: 'defi',
+      isVisible: true,
+      valueFiat: 200,
+      status: 'ready',
+    });
+  });
+
+  it.each([
+    {
+      name: 'disabled',
+      enabled: false,
+      positions: {},
+      expectedStatus: 'ineligible',
+    },
+    {
+      name: 'unresolved positions',
+      enabled: true,
+      positions: undefined,
+      expectedStatus: 'loading',
+    },
+    {
+      name: 'failed positions',
+      enabled: true,
+      positions: null,
+      expectedStatus: 'error',
+    },
+  ])('returns zero when $name', ({ enabled, positions, expectedStatus }) => {
+    isEnabled = enabled;
+    mockSelectDefiPositionsByChainIds.mockReturnValue(
+      positions as ReturnType<typeof selectDefiPositionsByChainIds>,
+    );
+
+    const { result } = renderHook(() => useDefiSlice((amount) => amount));
+
+    expect(result.current).toEqual({
+      key: 'defi',
+      isVisible: enabled,
+      valueFiat: 0,
+      status: expectedStatus,
+    });
+  });
+
+  it('reports an error when fiat conversion is unavailable', () => {
+    const { result } = renderHook(() => useDefiSlice(() => undefined));
+
+    expect(result.current).toEqual({
+      key: 'defi',
+      isVisible: true,
+      valueFiat: 0,
+      status: 'error',
+    });
+  });
+});
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useDefiSlice.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useDefiSlice.ts
new file mode 100644
index 000000000000..e5ea048a3f23
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useDefiSlice.ts
@@ -0,0 +1,63 @@
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import type { GroupedDeFiPositions } from '@metamask/assets-controllers';
+import type { Hex } from '@metamask/utils';
+import { selectDefiPositionsByChainIds } from '../../../../../../selectors/defiPositionsController';
+import { selectDeFiPositionsSectionEnabled } from '../../../../../../selectors/deFiPositionsSectionEnabled';
+import type { RootState } from '../../../../../../reducers';
+import { useNetworkEnablement } from '../../../../../hooks/useNetworkEnablement/useNetworkEnablement';
+import type { BalanceSlice, FiatConverter } from '../../types';
+
+type DeFiPositionsByChain = Partial<Record<Hex, GroupedDeFiPositions>>;
+
+export function sumDefiPositionsUsd(
+  positionsByChain: DeFiPositionsByChain,
+): number {
+  return Object.values(positionsByChain).reduce(
+    (chainTotal, chainPositions) => {
+      if (!chainPositions) return chainTotal;
+      const { protocols = {} } = chainPositions;
+      return (
+        chainTotal +
+        Object.values(protocols).reduce(
+          (protocolTotal, protocol) =>
+            protocolTotal + (Number(protocol.aggregatedMarketValue) || 0),
+          0,
+        )
+      );
+    },
+    0,
+  );
+}
+
+export function useDefiSlice(toUserCurrency: FiatConverter): BalanceSlice {
+  const { popularEvmNetworks } = useNetworkEnablement();
+  const isEnabled = useSelector(selectDeFiPositionsSectionEnabled);
+  const positions = useSelector((state: RootState) =>
+    selectDefiPositionsByChainIds(state, popularEvmNetworks),
+  );
+
+  return useMemo(() => {
+    const base = {
+      key: 'defi' as const,
+      isVisible: isEnabled,
+    };
+
+    if (!isEnabled) {
+      return { ...base, valueFiat: 0, status: 'ineligible' as const };
+    }
+    if (positions === undefined) {
+      return { ...base, valueFiat: 0, status: 'loading' as const };
+    }
+    if (positions === null) {
+      return { ...base, valueFiat: 0, status: 'error' as const };
+    }
+
+    const valueFiat = toUserCurrency(
+      sumDefiPositionsUsd(positions as DeFiPositionsByChain),
+    );
+    return valueFiat === undefined
+      ? { ...base, valueFiat: 0, status: 'error' as const }
+      : { ...base, valueFiat, status: 'ready' as const };
+  }, [isEnabled, positions, toUserCurrency]);
+}
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useMoneySlice.test.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useMoneySlice.test.ts
new file mode 100644
index 000000000000..690f604c9682
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useMoneySlice.test.ts
@@ -0,0 +1,165 @@
+import { renderHook } from '@testing-library/react-native';
+import useMoneyAccountBalance from '../../../../../UI/Money/hooks/useMoneyAccountBalance';
+import useMoneyAccountInfo from '../../../../../UI/Money/hooks/useMoneyAccountInfo';
+import { getMoneySliceStatus, useMoneySlice } from './useMoneySlice';
+
+jest.mock('../../../../../UI/Money/hooks/useMoneyAccountBalance');
+jest.mock('../../../../../UI/Money/hooks/useMoneyAccountInfo');
+
+const mockUseMoneyAccountBalance = jest.mocked(useMoneyAccountBalance);
+const mockUseMoneyAccountInfo = jest.mocked(useMoneyAccountInfo);
+
+const READY_INPUT = {
+  isFeatureEnabled: true,
+  hasMoneyAccount: true,
+  isBalanceLoading: false,
+  isBalanceFetchError: false,
+  hasTokenTotal: true,
+};
+
+describe('getMoneySliceStatus', () => {
+  it('requires the feature and an existing account', () => {
+    expect(
+      getMoneySliceStatus({ ...READY_INPUT, hasMoneyAccount: false }),
+    ).toBe('ineligible');
+    expect(
+      getMoneySliceStatus({ ...READY_INPUT, isFeatureEnabled: false }),
+    ).toBe('ineligible');
+  });
+
+  it('distinguishes loading, error, and a canonical ready value', () => {
+    expect(
+      getMoneySliceStatus({ ...READY_INPUT, isBalanceLoading: true }),
+    ).toBe('loading');
+    expect(
+      getMoneySliceStatus({ ...READY_INPUT, isBalanceFetchError: true }),
+    ).toBe('error');
+    expect(getMoneySliceStatus(READY_INPUT)).toBe('ready');
+  });
+});
+
+describe('useMoneySlice', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseMoneyAccountInfo.mockReturnValue({
+      isMoneyAccountFeatureEnabled: true,
+      hasMoneyAccount: true,
+    } as ReturnType<typeof useMoneyAccountInfo>);
+    mockUseMoneyAccountBalance.mockReturnValue({
+      tokenTotal: { toNumber: () => 100 },
+      isBalanceLoading: false,
+      isBalanceFetchError: false,
+      apyPercent: 4.1,
+      vaultApyQuery: { isLoading: false },
+    } as ReturnType<typeof useMoneyAccountBalance>);
+  });
+
+  it('converts a ready balance and exposes its APY', () => {
+    const { result } = renderHook(() => useMoneySlice((amount) => amount * 2));
+
+    expect(result.current).toEqual({
+      key: 'money',
+      isVisible: true,
+      valueFiat: 200,
+      status: 'ready',
+      apyPercent: 4.1,
+      apyLoading: false,
+    });
+  });
+
+  it('reports an error when fiat conversion is unavailable', () => {
+    const { result } = renderHook(() => useMoneySlice(() => undefined));
+
+    expect(result.current).toEqual({
+      key: 'money',
+      isVisible: true,
+      valueFiat: 0,
+      status: 'error',
+      apyPercent: 4.1,
+      apyLoading: false,
+    });
+  });
+
+  it('exposes APY loading independently of balance readiness', () => {
+    mockUseMoneyAccountBalance.mockReturnValue({
+      tokenTotal: { toNumber: () => 100 },
+      isBalanceLoading: false,
+      isBalanceFetchError: false,
+      apyPercent: undefined,
+      vaultApyQuery: { isLoading: true },
+    } as ReturnType<typeof useMoneyAccountBalance>);
+
+    const { result } = renderHook(() => useMoneySlice((amount) => amount));
+
+    expect(result.current.apyLoading).toBe(true);
+    expect(result.current.apyPercent).toBeUndefined();
+  });
+
+  it('does not fabricate APY after a settled query without a rate', () => {
+    mockUseMoneyAccountBalance.mockReturnValue({
+      tokenTotal: { toNumber: () => 100 },
+      isBalanceLoading: false,
+      isBalanceFetchError: false,
+      apyPercent: undefined,
+      vaultApyQuery: { isLoading: false },
+    } as ReturnType<typeof useMoneyAccountBalance>);
+
+    const { result } = renderHook(() => useMoneySlice((amount) => amount));
+
+    expect(result.current.apyLoading).toBe(false);
+    expect(result.current.apyPercent).toBeUndefined();
+  });
+
+  it('preserves a genuine zero APY', () => {
+    mockUseMoneyAccountBalance.mockReturnValue({
+      tokenTotal: { toNumber: () => 100 },
+      isBalanceLoading: false,
+      isBalanceFetchError: false,
+      apyPercent: 0,
+      vaultApyQuery: { isLoading: false },
+    } as ReturnType<typeof useMoneyAccountBalance>);
+
+    const { result } = renderHook(() => useMoneySlice((amount) => amount));
+
+    expect(result.current.apyPercent).toBe(0);
+  });
+
+  it('exposes APY before an eligible user creates a Money account', () => {
+    mockUseMoneyAccountInfo.mockReturnValue({
+      isMoneyAccountFeatureEnabled: true,
+      hasMoneyAccount: false,
+    } as ReturnType<typeof useMoneyAccountInfo>);
+
+    const { result } = renderHook(() => useMoneySlice((amount) => amount));
+
+    expect(result.current.status).toBe('ineligible');
+    expect(result.current.apyPercent).toBe(4.1);
+    expect(result.current.apyLoading).toBe(false);
+  });
+
+  it('suppresses APY when the Money feature is disabled', () => {
+    mockUseMoneyAccountInfo.mockReturnValue({
+      isMoneyAccountFeatureEnabled: false,
+      hasMoneyAccount: false,
+    } as ReturnType<typeof useMoneyAccountInfo>);
+    mockUseMoneyAccountBalance.mockReturnValue({
+      tokenTotal: undefined,
+      isBalanceLoading: false,
+      isBalanceFetchError: false,
+      apyPercent: 4.1,
+      vaultApyQuery: { isLoading: false },
+    } as ReturnType<typeof useMoneyAccountBalance>);
+
+    const { result } = renderHook(() => useMoneySlice((amount) => amount));
+
+    expect(mockUseMoneyAccountBalance).toHaveBeenCalledWith({ enabled: false });
+    expect(result.current).toEqual({
+      key: 'money',
+      isVisible: false,
+      valueFiat: 0,
+      status: 'ineligible',
+      apyPercent: undefined,
+      apyLoading: false,
+    });
+  });
+});
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useMoneySlice.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useMoneySlice.ts
new file mode 100644
index 000000000000..96f89821490d
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useMoneySlice.ts
@@ -0,0 +1,77 @@
+import { useMemo } from 'react';
+import useMoneyAccountBalance from '../../../../../UI/Money/hooks/useMoneyAccountBalance';
+import useMoneyAccountInfo from '../../../../../UI/Money/hooks/useMoneyAccountInfo';
+import type { BalanceSlice, FiatConverter, SliceStatus } from '../../types';
+
+export function getMoneySliceStatus({
+  isFeatureEnabled,
+  hasMoneyAccount,
+  isBalanceLoading,
+  isBalanceFetchError,
+  hasTokenTotal,
+}: {
+  isFeatureEnabled: boolean;
+  hasMoneyAccount: boolean;
+  isBalanceLoading: boolean;
+  isBalanceFetchError: boolean;
+  hasTokenTotal: boolean;
+}): SliceStatus {
+  if (!isFeatureEnabled || !hasMoneyAccount) {
+    return 'ineligible';
+  }
+  if (isBalanceFetchError) return 'error';
+  if (isBalanceLoading || !hasTokenTotal) return 'loading';
+  return 'ready';
+}
+
+export function useMoneySlice(toUserCurrency: FiatConverter): BalanceSlice {
+  const { isMoneyAccountFeatureEnabled, hasMoneyAccount } =
+    useMoneyAccountInfo();
+  const {
+    tokenTotal,
+    isBalanceLoading,
+    isBalanceFetchError,
+    apyPercent,
+    vaultApyQuery,
+  } = useMoneyAccountBalance({ enabled: isMoneyAccountFeatureEnabled });
+  const moneyStatus = getMoneySliceStatus({
+    isFeatureEnabled: isMoneyAccountFeatureEnabled,
+    hasMoneyAccount,
+    isBalanceLoading,
+    isBalanceFetchError,
+    hasTokenTotal: tokenTotal !== undefined,
+  });
+
+  const convertedValue =
+    moneyStatus === 'ready'
+      ? toUserCurrency(tokenTotal?.toNumber() ?? 0)
+      : undefined;
+  const status =
+    moneyStatus === 'ready' && convertedValue === undefined
+      ? 'error'
+      : moneyStatus;
+  const valueFiat = status === 'ready' ? (convertedValue ?? 0) : 0;
+  const apyLoading = isMoneyAccountFeatureEnabled && vaultApyQuery.isLoading;
+  const visibleApyPercent =
+    isMoneyAccountFeatureEnabled && !apyLoading && apyPercent !== undefined
+      ? apyPercent
+      : undefined;
+
+  return useMemo(
+    () => ({
+      key: 'money',
+      isVisible: isMoneyAccountFeatureEnabled,
+      valueFiat,
+      status,
+      apyPercent: visibleApyPercent,
+      apyLoading,
+    }),
+    [
+      apyLoading,
+      isMoneyAccountFeatureEnabled,
+      status,
+      valueFiat,
+      visibleApyPercent,
+    ],
+  );
+}
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePerpsSlice.test.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePerpsSlice.test.ts
new file mode 100644
index 000000000000..5235b78036f2
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePerpsSlice.test.ts
@@ -0,0 +1,95 @@
+import { renderHook } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import { usePerpsLiveAccount } from '../../../../../UI/Perps/hooks';
+import { usePerpsConnection } from '../../../../../UI/Perps/hooks/usePerpsConnection';
+import { selectPerpsEnabledFlag } from '../../../../../UI/Perps/selectors/featureFlags';
+import {
+  selectPerpsBalances,
+  selectPerpsEligibility,
+  selectPerpsProvider,
+} from '../../../../../UI/Perps/selectors/perpsController';
+import { usePerpsSlice } from './usePerpsSlice';
+
+jest.mock('react-redux', () => ({ useSelector: jest.fn() }));
+jest.mock('../../../../../UI/Perps/hooks', () => ({
+  usePerpsLiveAccount: jest.fn(),
+}));
+jest.mock('../../../../../UI/Perps/hooks/usePerpsConnection');
+
+const mockUseSelector = jest.mocked(useSelector);
+const mockUsePerpsLiveAccount = jest.mocked(usePerpsLiveAccount);
+const mockUsePerpsConnection = jest.mocked(usePerpsConnection);
+
+describe('usePerpsSlice', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectPerpsEnabledFlag) return true;
+      if (selector === selectPerpsEligibility) return true;
+      if (selector === selectPerpsProvider) return 'hyperliquid';
+      if (selector === selectPerpsBalances) {
+        return {
+          hyperliquid: { accountValue1dAgo: '80' },
+        };
+      }
+      return undefined;
+    });
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: { totalBalance: '100' },
+      isInitialLoading: false,
+    } as ReturnType<typeof usePerpsLiveAccount>);
+    mockUsePerpsConnection.mockReturnValue({
+      error: null,
+    } as ReturnType<typeof usePerpsConnection>);
+  });
+
+  it('uses account total balance and the active provider baseline', () => {
+    const { result } = renderHook(() => usePerpsSlice((amount) => amount * 2));
+
+    expect(result.current).toMatchObject({
+      status: 'ready',
+      valueFiat: 200,
+      value1dAgoFiat: 160,
+    });
+  });
+
+  it('is ineligible when the feature is unavailable', () => {
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectPerpsEnabledFlag) return false;
+      if (selector === selectPerpsEligibility) return true;
+      if (selector === selectPerpsBalances) return {};
+      return undefined;
+    });
+
+    const { result } = renderHook(() => usePerpsSlice((amount) => amount * 2));
+
+    expect(mockUsePerpsLiveAccount).toHaveBeenCalledWith({
+      enabled: false,
+      throttleMs: 1000,
+    });
+    expect(result.current.status).toBe('ineligible');
+    expect(result.current.isVisible).toBe(false);
+    expect(result.current.valueFiat).toBe(0);
+  });
+
+  it('reports a connection error when no account data is available', () => {
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: null,
+      isInitialLoading: true,
+    });
+    mockUsePerpsConnection.mockReturnValue({
+      error: 'Connection failed',
+    } as ReturnType<typeof usePerpsConnection>);
+
+    const { result } = renderHook(() => usePerpsSlice((amount) => amount));
+
+    expect(result.current.status).toBe('error');
+  });
+
+  it('reports an error when fiat conversion is unavailable', () => {
+    const { result } = renderHook(() => usePerpsSlice(() => undefined));
+
+    expect(result.current.status).toBe('error');
+    expect(result.current.valueFiat).toBe(0);
+  });
+});
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePerpsSlice.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePerpsSlice.ts
new file mode 100644
index 000000000000..7153820cbe97
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePerpsSlice.ts
@@ -0,0 +1,73 @@
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import type { PerpsActiveProviderMode } from '@metamask/perps-controller';
+import BigNumber from 'bignumber.js';
+import { usePerpsLiveAccount } from '../../../../../UI/Perps/hooks';
+import { usePerpsConnection } from '../../../../../UI/Perps/hooks/usePerpsConnection';
+import { selectPerpsEnabledFlag } from '../../../../../UI/Perps/selectors/featureFlags';
+import {
+  selectPerpsBalances,
+  selectPerpsEligibility,
+  selectPerpsProvider,
+} from '../../../../../UI/Perps/selectors/perpsController';
+import type { BalanceSlice, FiatConverter } from '../../types';
+import { PERPS_HOMEPAGE_THROTTLE_MS } from '../../constants';
+
+export function usePerpsSlice(toUserCurrency: FiatConverter): BalanceSlice {
+  const isEnabled = useSelector(selectPerpsEnabledFlag);
+  const isEligible = useSelector(selectPerpsEligibility);
+  const perpsBalances = useSelector(selectPerpsBalances);
+  const activeProvider = useSelector(selectPerpsProvider) as
+    | PerpsActiveProviderMode
+    | undefined;
+  const { account, isInitialLoading } = usePerpsLiveAccount({
+    enabled: isEnabled && isEligible,
+    throttleMs: PERPS_HOMEPAGE_THROTTLE_MS,
+  });
+  const { error: connectionError } = usePerpsConnection();
+
+  // Perps is ineligible when the feature flag is off
+  const isIneligible = !isEnabled || !isEligible;
+
+  const totalBalanceUsd = parseFloat(account?.totalBalance ?? '0') || 0;
+  const convertedValue = toUserCurrency(totalBalanceUsd);
+  const totalBalance1dAgoFiat = useMemo(() => {
+    const rows =
+      activeProvider === 'aggregated' || activeProvider === undefined
+        ? Object.values(perpsBalances)
+        : [perpsBalances[activeProvider]];
+    const totalUsd = rows.reduce((sum, row) => {
+      if (!row || typeof row !== 'object' || !('accountValue1dAgo' in row)) {
+        return sum;
+      }
+      return sum + new BigNumber(row.accountValue1dAgo || '0').toNumber();
+    }, 0);
+    return toUserCurrency(totalUsd);
+  }, [activeProvider, perpsBalances, toUserCurrency]);
+
+  const status = useMemo(() => {
+    if (isIneligible) return 'ineligible' as const;
+    if (!account && connectionError) return 'error' as const;
+    if (isInitialLoading) return 'loading' as const;
+    if (!account) return 'loading' as const;
+    if (convertedValue === undefined) return 'error' as const;
+    return 'ready' as const;
+  }, [
+    account,
+    connectionError,
+    convertedValue,
+    isIneligible,
+    isInitialLoading,
+  ]);
+
+  return useMemo<BalanceSlice>(
+    () => ({
+      key: 'perps',
+      isVisible: isEnabled,
+      valueFiat: status === 'ready' ? (convertedValue ?? 0) : 0,
+      status,
+      value1dAgoFiat: status === 'ready' ? totalBalance1dAgoFiat : undefined,
+    }),
+    [convertedValue, isEnabled, status, totalBalance1dAgoFiat],
+  );
+}
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePredictSlice.test.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePredictSlice.test.ts
new file mode 100644
index 000000000000..7e6c3c90011a
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePredictSlice.test.ts
@@ -0,0 +1,91 @@
+import { renderHook } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import {
+  usePredictPortfolio,
+  type PredictPortfolioModel,
+} from '../../../../../UI/Predict/hooks/usePredictPortfolio';
+import { usePredictSlice } from './usePredictSlice';
+
+jest.mock('react-redux', () => ({ useSelector: jest.fn() }));
+jest.mock('../../../../../UI/Predict/hooks/usePredictPortfolio');
+
+const mockUseSelector = jest.mocked(useSelector);
+const mockUsePredictPortfolio = jest.mocked(usePredictPortfolio);
+
+const createPortfolio = (
+  overrides: Partial<PredictPortfolioModel> = {},
+): PredictPortfolioModel =>
+  ({
+    portfolioValue: 60,
+    isLoading: false,
+    error: null,
+    ...overrides,
+  }) as PredictPortfolioModel;
+
+describe('usePredictSlice', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSelector.mockReturnValue(true);
+    mockUsePredictPortfolio.mockReturnValue(createPortfolio());
+  });
+
+  it('maps the canonical portfolio value', () => {
+    const { result } = renderHook(() =>
+      usePredictSlice((amount) => amount * 2),
+    );
+
+    expect(mockUsePredictPortfolio).toHaveBeenCalledWith({
+      enabled: true,
+      livePriceUpdates: false,
+    });
+    expect(result.current.status).toBe('ready');
+    expect(result.current.valueFiat).toBe(120);
+  });
+
+  it.each([
+    {
+      name: 'portfolio loading',
+      portfolio: createPortfolio({ isLoading: true }),
+      enabled: true,
+      expected: 'loading',
+    },
+    {
+      name: 'portfolio error',
+      portfolio: createPortfolio({ error: new Error('failed') }),
+      enabled: true,
+      expected: 'error',
+    },
+  ])('returns zero for $name', ({ portfolio, enabled, expected }) => {
+    mockUseSelector.mockReturnValue(enabled);
+    mockUsePredictPortfolio.mockReturnValue(portfolio);
+
+    const { result } = renderHook(() =>
+      usePredictSlice((amount) => amount * 2),
+    );
+
+    expect(result.current.status).toBe(expected);
+    expect(result.current.valueFiat).toBe(0);
+  });
+
+  it('disables portfolio work and hides the slice with the feature off', () => {
+    mockUseSelector.mockReturnValue(false);
+
+    const { result } = renderHook(() =>
+      usePredictSlice((amount) => amount * 2),
+    );
+
+    expect(mockUsePredictPortfolio).toHaveBeenCalledWith({
+      enabled: false,
+      livePriceUpdates: false,
+    });
+    expect(result.current.status).toBe('ineligible');
+    expect(result.current.isVisible).toBe(false);
+  });
+
+  it('reports an error when fiat conversion is unavailable', () => {
+    const { result } = renderHook(() => usePredictSlice(() => undefined));
+
+    expect(result.current.status).toBe('error');
+    expect(result.current.valueFiat).toBe(0);
+  });
+});
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePredictSlice.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePredictSlice.ts
new file mode 100644
index 000000000000..8a9c159e2f8e
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/usePredictSlice.ts
@@ -0,0 +1,37 @@
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import { usePredictPortfolio } from '../../../../../UI/Predict/hooks/usePredictPortfolio';
+import { selectPredictEnabledFlag } from '../../../../../UI/Predict/selectors/featureFlags';
+import type { BalanceSlice, FiatConverter } from '../../types';
+
+export function usePredictSlice(toUserCurrency: FiatConverter): BalanceSlice {
+  const isEnabled = useSelector(selectPredictEnabledFlag);
+  const { portfolioValue, isLoading, error } = usePredictPortfolio({
+    enabled: isEnabled,
+    // PredictionsSection owns the homepage live-price subscription and updates
+    // the shared positions query cache consumed by this aggregate.
+    livePriceUpdates: false,
+  });
+
+  const convertedValue = toUserCurrency(portfolioValue);
+
+  const status = useMemo(() => {
+    if (!isEnabled) return 'ineligible' as const;
+    if (error) return 'error' as const;
+    if (isLoading) return 'loading' as const;
+    if (convertedValue === undefined) return 'error' as const;
+    return 'ready' as const;
+  }, [convertedValue, error, isEnabled, isLoading]);
+
+  const valueFiat = status === 'ready' ? (convertedValue ?? 0) : 0;
+
+  return useMemo(
+    () => ({
+      key: 'predict' as const,
+      isVisible: isEnabled,
+      valueFiat,
+      status,
+    }),
+    [isEnabled, status, valueFiat],
+  );
+}
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useTokensSlice.test.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useTokensSlice.test.ts
new file mode 100644
index 000000000000..b46f2bf29ca4
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useTokensSlice.test.ts
@@ -0,0 +1,75 @@
+import { renderHook } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import { useAccountGroupBalanceFetchState } from '../../../../../UI/Assets/components/Balance/useAccountGroupBalanceFetchState';
+import { useNetworkEnablement } from '../../../../../hooks/useNetworkEnablement/useNetworkEnablement';
+import { useTokensSlice } from './useTokensSlice';
+
+const mockBalanceSelector = jest.fn();
+const mockBalanceChangeSelector = jest.fn();
+const mockEmptyStateSelector = jest.fn();
+
+jest.mock('react-redux', () => ({ useSelector: jest.fn() }));
+jest.mock('../../../../../../selectors/assets/balances', () => ({
+  selectBalanceBySelectedAccountGroup: jest.fn(() => mockBalanceSelector),
+  selectBalanceChangeBySelectedAccountGroup: jest.fn(
+    () => mockBalanceChangeSelector,
+  ),
+  selectAccountGroupBalanceForEmptyState: mockEmptyStateSelector,
+}));
+jest.mock(
+  '../../../../../UI/Assets/components/Balance/useAccountGroupBalanceFetchState',
+);
+jest.mock('../../../../../hooks/useNetworkEnablement/useNetworkEnablement');
+
+const mockUseSelector = jest.mocked(useSelector);
+const mockUseAccountGroupBalanceFetchState = jest.mocked(
+  useAccountGroupBalanceFetchState,
+);
+const mockUseNetworkEnablement = jest.mocked(useNetworkEnablement);
+
+describe('useTokensSlice', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseNetworkEnablement.mockReturnValue({
+      popularNetworks: ['eip155:1'],
+    } as unknown as ReturnType<typeof useNetworkEnablement>);
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === mockBalanceSelector) {
+        return {
+          totalBalanceInUserCurrency: 125,
+          userCurrency: 'USD',
+        };
+      }
+      if (selector === mockBalanceChangeSelector) {
+        return {
+          amountChangeInUserCurrency: 5,
+          percentChange: 4,
+          userCurrency: 'USD',
+        };
+      }
+      if (selector === mockEmptyStateSelector) return 125;
+      return undefined;
+    });
+    mockUseAccountGroupBalanceFetchState.mockReturnValue(true);
+  });
+
+  it('uses the account-group balance and normalized one-day change', () => {
+    const { result } = renderHook(() => useTokensSlice());
+
+    expect(result.current).toMatchObject({
+      status: 'ready',
+      valueFiat: 125,
+      delta: { amount: 5, percent: 0.04 },
+    });
+  });
+
+  it('stays loading until the account-group balance is fetched', () => {
+    mockUseAccountGroupBalanceFetchState.mockReturnValue(false);
+
+    const { result } = renderHook(() => useTokensSlice());
+
+    expect(result.current.status).toBe('loading');
+    expect(result.current.valueFiat).toBe(0);
+    expect(result.current.delta).toBeUndefined();
+  });
+});
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useTokensSlice.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useTokensSlice.ts
new file mode 100644
index 000000000000..cfcae0503e59
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/slices/useTokensSlice.ts
@@ -0,0 +1,60 @@
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import type { CaipChainId } from '@metamask/utils';
+import {
+  selectAccountGroupBalanceForEmptyState,
+  selectBalanceBySelectedAccountGroup,
+  selectBalanceChangeBySelectedAccountGroup,
+} from '../../../../../../selectors/assets/balances';
+import { useAccountGroupBalanceFetchState } from '../../../../../UI/Assets/components/Balance/useAccountGroupBalanceFetchState';
+import { useNetworkEnablement } from '../../../../../hooks/useNetworkEnablement/useNetworkEnablement';
+import type { BalanceSlice } from '../../types';
+
+export function useTokensSlice(): BalanceSlice {
+  const { popularNetworks } = useNetworkEnablement();
+  const chainIdsKey = (popularNetworks ?? []).join(',');
+  const chainIds = useMemo<CaipChainId[]>(
+    () => (chainIdsKey ? (chainIdsKey.split(',') as CaipChainId[]) : []),
+    [chainIdsKey],
+  );
+
+  const balanceSelector = useMemo(
+    () => selectBalanceBySelectedAccountGroup(chainIds),
+    [chainIds],
+  );
+  const balanceChangeSelector = useMemo(
+    () => selectBalanceChangeBySelectedAccountGroup('1d', chainIds),
+    [chainIds],
+  );
+
+  const groupBalance = useSelector(balanceSelector);
+  const balanceChange1d = useSelector(balanceChangeSelector);
+  const accountGroupBalance = useSelector(
+    selectAccountGroupBalanceForEmptyState,
+  );
+  const hasBalanceFetched = useAccountGroupBalanceFetchState({
+    groupBalance,
+    accountGroupBalance,
+  });
+
+  const status = !groupBalance || !hasBalanceFetched ? 'loading' : 'ready';
+  const valueFiat =
+    status === 'ready' ? (groupBalance?.totalBalanceInUserCurrency ?? 0) : 0;
+
+  return useMemo(
+    () => ({
+      key: 'tokens' as const,
+      isVisible: true,
+      valueFiat,
+      delta:
+        status === 'ready' && balanceChange1d
+          ? {
+              amount: balanceChange1d.amountChangeInUserCurrency,
+              percent: balanceChange1d.percentChange / 100,
+            }
+          : undefined,
+      status,
+    }),
+    [balanceChange1d, status, valueFiat],
+  );
+}
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/useBalanceBreakdown.test.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/useBalanceBreakdown.test.ts
new file mode 100644
index 000000000000..3c470c00cb22
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/useBalanceBreakdown.test.ts
@@ -0,0 +1,269 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { useBalanceBreakdown } from './useBalanceBreakdown';
+import { useTokensSlice } from './slices/useTokensSlice';
+import { useMoneySlice } from './slices/useMoneySlice';
+import { usePerpsSlice } from './slices/usePerpsSlice';
+import { usePredictSlice } from './slices/usePredictSlice';
+import { useDefiSlice } from './slices/useDefiSlice';
+import { mockTheme } from '../../../../../util/theme';
+import { getBalanceBreakdownSliceColors } from '../utils/getBalanceBreakdownSliceColors';
+
+const mockUseTokensSlice = jest.mocked(useTokensSlice);
+const mockUseMoneySlice = jest.mocked(useMoneySlice);
+const mockUsePerpsSlice = jest.mocked(usePerpsSlice);
+const mockUsePredictSlice = jest.mocked(usePredictSlice);
+const mockUseDefiSlice = jest.mocked(useDefiSlice);
+// Mock all slice hooks to control their output
+jest.mock('./slices/useTokensSlice', () => ({
+  useTokensSlice: jest.fn(),
+}));
+jest.mock('./slices/useMoneySlice', () => ({
+  useMoneySlice: jest.fn(),
+}));
+jest.mock('./slices/usePerpsSlice', () => ({
+  usePerpsSlice: jest.fn(),
+}));
+jest.mock('./slices/usePredictSlice', () => ({
+  usePredictSlice: jest.fn(),
+}));
+jest.mock('./slices/useDefiSlice', () => ({
+  useDefiSlice: jest.fn(),
+}));
+jest.mock('./useFiatNormalizer', () => ({
+  useFiatNormalizer: () => ({
+    toUserCurrency: (v: number) => v,
+    userCurrency: 'USD',
+  }),
+}));
+
+jest.mock('../../../../../util/theme', () => {
+  const themeModule = jest.requireActual<
+    typeof import('../../../../../util/theme')
+  >('../../../../../util/theme');
+  return {
+    ...themeModule,
+    useTheme: () => themeModule.mockTheme,
+  };
+});
+
+function makeSlice(
+  key: 'tokens' | 'money' | 'perps' | 'predict' | 'defi',
+  valueFiat: number,
+  status: 'ready' | 'loading' | 'error' | 'ineligible' = 'ready',
+) {
+  const colors = getBalanceBreakdownSliceColors(mockTheme.themeAppearance);
+  return {
+    key,
+    color: colors[key],
+    isVisible: true,
+    valueFiat,
+    percentOfTotal: 0,
+    status,
+  };
+}
+
+describe('useBalanceBreakdown', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseTokensSlice.mockReturnValue(
+      makeSlice('tokens', 50000) as ReturnType<typeof useTokensSlice>,
+    );
+    mockUseMoneySlice.mockReturnValue(
+      makeSlice('money', 0) as ReturnType<typeof useMoneySlice>,
+    );
+    mockUsePerpsSlice.mockReturnValue(
+      makeSlice('perps', 30000) as ReturnType<typeof usePerpsSlice>,
+    );
+    mockUsePredictSlice.mockReturnValue(
+      makeSlice('predict', 20000) as ReturnType<typeof usePredictSlice>,
+    );
+    mockUseDefiSlice.mockReturnValue(
+      makeSlice('defi', 10000) as ReturnType<typeof useDefiSlice>,
+    );
+  });
+
+  it('computes totalFiat as sum of all eligible slice values', () => {
+    const { result } = renderHook(() => useBalanceBreakdown());
+    // 50000 + 30000 + 20000 + 10000 = 110000
+    expect(result.current.hero.totalFiat).toBe(110000);
+    expect(result.current.hero.isPartiallyLoaded).toBe(false);
+  });
+
+  it('computes percentOfTotal for each slice', () => {
+    const { result } = renderHook(() => useBalanceBreakdown());
+    const tokens = result.current.slices.tokens;
+    // 50000 / 110000 ≈ 0.4545
+    expect(tokens.percentOfTotal).toBeCloseTo(50000 / 110000);
+  });
+
+  it('excludes debt from the allocation denominator', () => {
+    mockUseTokensSlice.mockReturnValue(
+      makeSlice('tokens', 100) as ReturnType<typeof useTokensSlice>,
+    );
+    mockUsePerpsSlice.mockReturnValue(
+      makeSlice('perps', 0) as ReturnType<typeof usePerpsSlice>,
+    );
+    mockUsePredictSlice.mockReturnValue(
+      makeSlice('predict', 0) as ReturnType<typeof usePredictSlice>,
+    );
+    mockUseDefiSlice.mockReturnValue(
+      makeSlice('defi', -25) as ReturnType<typeof useDefiSlice>,
+    );
+
+    const { result } = renderHook(() => useBalanceBreakdown());
+
+    expect(result.current.hero.totalFiat).toBe(75);
+    expect(result.current.slices.tokens.percentOfTotal).toBe(1);
+    expect(result.current.slices.defi.percentOfTotal).toBe(0);
+  });
+
+  it('excludes ineligible slices from total', () => {
+    mockUsePerpsSlice.mockReturnValue(
+      makeSlice('perps', 30000, 'ineligible') as ReturnType<
+        typeof usePerpsSlice
+      >,
+    );
+    const { result } = renderHook(() => useBalanceBreakdown());
+    // 50000 + 20000 + 10000 = 80000
+    expect(result.current.hero.totalFiat).toBe(80000);
+  });
+
+  it('aggregates only ready values', () => {
+    mockUsePerpsSlice.mockReturnValue(
+      makeSlice('perps', 30000, 'loading') as ReturnType<typeof usePerpsSlice>,
+    );
+    const { result } = renderHook(() => useBalanceBreakdown());
+    expect(result.current.hero.totalFiat).toBe(80000);
+    expect(result.current.slices.perps.percentOfTotal).toBe(0);
+  });
+
+  it('keeps the hero ready when another eligible slice is still loading', () => {
+    mockUsePerpsSlice.mockReturnValue(
+      makeSlice('perps', 30000, 'loading') as ReturnType<typeof usePerpsSlice>,
+    );
+    const { result } = renderHook(() => useBalanceBreakdown());
+    expect(result.current.hero.status).toBe('ready');
+    expect(result.current.hero.isPartiallyLoaded).toBe(true);
+  });
+
+  it('marks a ready hero as incomplete without loading when a slice errors', () => {
+    mockUsePerpsSlice.mockReturnValue(
+      makeSlice('perps', 0, 'error') as ReturnType<typeof usePerpsSlice>,
+    );
+
+    const { result } = renderHook(() => useBalanceBreakdown());
+
+    expect(result.current.hero.status).toBe('ready');
+    expect(result.current.hero.isPartiallyLoaded).toBe(false);
+    expect(result.current.hero.hasErroredSlice).toBe(true);
+    expect(result.current.hero.totalFiat).toBe(80000);
+  });
+
+  it('keeps a zero-value hero loading while an eligible slice is unresolved', () => {
+    mockUseTokensSlice.mockReturnValue(
+      makeSlice('tokens', 0) as ReturnType<typeof useTokensSlice>,
+    );
+    mockUseMoneySlice.mockReturnValue(
+      makeSlice('money', 0, 'ineligible') as ReturnType<typeof useMoneySlice>,
+    );
+    mockUsePerpsSlice.mockReturnValue(
+      makeSlice('perps', 0, 'loading') as ReturnType<typeof usePerpsSlice>,
+    );
+    mockUsePredictSlice.mockReturnValue(
+      makeSlice('predict', 0, 'ineligible') as ReturnType<
+        typeof usePredictSlice
+      >,
+    );
+    mockUseDefiSlice.mockReturnValue(
+      makeSlice('defi', 0, 'ineligible') as ReturnType<typeof useDefiSlice>,
+    );
+
+    const { result } = renderHook(() => useBalanceBreakdown());
+
+    expect(result.current.hero.totalFiat).toBe(0);
+    expect(result.current.hero.status).toBe('loading');
+  });
+
+  it('hero status is loading when all eligible slices are loading', () => {
+    mockUseTokensSlice.mockReturnValue(
+      makeSlice('tokens', 0, 'loading') as ReturnType<typeof useTokensSlice>,
+    );
+    mockUseMoneySlice.mockReturnValue(
+      makeSlice('money', 0, 'loading') as ReturnType<typeof useMoneySlice>,
+    );
+    mockUsePerpsSlice.mockReturnValue(
+      makeSlice('perps', 0, 'loading') as ReturnType<typeof usePerpsSlice>,
+    );
+    mockUsePredictSlice.mockReturnValue(
+      makeSlice('predict', 0, 'loading') as ReturnType<typeof usePredictSlice>,
+    );
+    mockUseDefiSlice.mockReturnValue(
+      makeSlice('defi', 0, 'loading') as ReturnType<typeof useDefiSlice>,
+    );
+    const { result } = renderHook(() => useBalanceBreakdown());
+    expect(result.current.hero.status).toBe('loading');
+  });
+
+  it('returns correct userCurrency from normalizer', () => {
+    const { result } = renderHook(() => useBalanceBreakdown());
+    expect(result.current.hero.userCurrency).toBe('USD');
+  });
+
+  it('hero 24h delta combines token change with perps account value change', () => {
+    mockUseTokensSlice.mockReturnValue({
+      ...makeSlice('tokens', 50_000),
+      delta: { amount: 100, percent: 0.002 },
+    } as ReturnType<typeof useTokensSlice>);
+    mockUsePerpsSlice.mockReturnValue(
+      makeSlice('perps', 30_000) as ReturnType<typeof usePerpsSlice>,
+    );
+    mockUsePerpsSlice.mockReturnValue({
+      ...makeSlice('perps', 30_000),
+      value1dAgoFiat: 29_500,
+    } as ReturnType<typeof usePerpsSlice>);
+
+    const { result } = renderHook(() => useBalanceBreakdown());
+    // totalFiat = 110000; token +100 + perps +500 = +600
+    expect(result.current.hero.delta?.amount).toBeCloseTo(600);
+    expect(result.current.hero.delta?.percent).toBeCloseTo(
+      600 / (110_000 - 600),
+    );
+  });
+
+  it('does not mix perps session PnL into the 24h delta when the baseline is missing', () => {
+    mockUseTokensSlice.mockReturnValue({
+      ...makeSlice('tokens', 50_000),
+      delta: { amount: 100, percent: 0.002 },
+    } as ReturnType<typeof useTokensSlice>);
+    mockUsePerpsSlice.mockReturnValue(
+      makeSlice('perps', 30_000) as ReturnType<typeof usePerpsSlice>,
+    );
+    mockUsePerpsSlice.mockReturnValue({
+      ...makeSlice('perps', 30_000),
+      value1dAgoFiat: 0,
+    } as ReturnType<typeof usePerpsSlice>);
+
+    const { result } = renderHook(() => useBalanceBreakdown());
+    expect(result.current.hero.delta?.amount).toBe(100);
+    expect(result.current.hero.delta?.percent).toBeCloseTo(
+      100 / (110_000 - 100),
+    );
+  });
+
+  it('does not add perps when session PnL is zero and 24h baseline is missing', () => {
+    mockUseTokensSlice.mockReturnValue({
+      ...makeSlice('tokens', 50_000),
+      delta: { amount: 100, percent: 0.002 },
+    } as ReturnType<typeof useTokensSlice>);
+    mockUsePerpsSlice.mockReturnValue(
+      makeSlice('perps', 30_000) as ReturnType<typeof usePerpsSlice>,
+    );
+    mockUsePerpsSlice.mockReturnValue({
+      ...makeSlice('perps', 30_000),
+      value1dAgoFiat: 0,
+    } as ReturnType<typeof usePerpsSlice>);
+
+    const { result } = renderHook(() => useBalanceBreakdown());
+    expect(result.current.hero.delta?.amount).toBe(100);
+  });
+});
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/useBalanceBreakdown.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/useBalanceBreakdown.ts
new file mode 100644
index 000000000000..d9ae40c2b2b3
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/useBalanceBreakdown.ts
@@ -0,0 +1,185 @@
+import { useMemo } from 'react';
+import { useTheme } from '../../../../../util/theme';
+import { useTokensSlice } from './slices/useTokensSlice';
+import { useMoneySlice } from './slices/useMoneySlice';
+import { usePerpsSlice } from './slices/usePerpsSlice';
+import { usePredictSlice } from './slices/usePredictSlice';
+import { useDefiSlice } from './slices/useDefiSlice';
+import { useFiatNormalizer } from './useFiatNormalizer';
+import { SLICE_ORDER } from '../constants';
+import { computeAggregateHero24hDelta } from '../utils/aggregateHero24hDelta';
+import { getBalanceBreakdownSliceColors } from '../utils/getBalanceBreakdownSliceColors';
+import type {
+  BalanceSlice,
+  BreakdownData,
+  HeroData,
+  SliceData,
+  SliceKey,
+} from '../types';
+
+function computePercentages(slices: Record<SliceKey, SliceData>): {
+  slices: Record<SliceKey, SliceData>;
+  totalFiat: number;
+} {
+  const ready = SLICE_ORDER.filter((k) => slices[k].status === 'ready');
+  // Money vault accounts are not part of AccountsController/account groups, so
+  // the Money and Tokens slice sources are disjoint and can be summed directly.
+  const totalFiat = ready.reduce((s, k) => s + slices[k].valueFiat, 0);
+  // Allocation represents positive holdings. Debt still reduces the hero's net
+  // total, but cannot be used as the denominator for a proportional asset bar.
+  const allocationTotalFiat = ready.reduce(
+    (sum, key) => sum + Math.max(slices[key].valueFiat, 0),
+    0,
+  );
+
+  const updated = { ...slices };
+  for (const key of SLICE_ORDER) {
+    updated[key] = {
+      ...slices[key],
+      percentOfTotal:
+        allocationTotalFiat > 0 &&
+        slices[key].status === 'ready' &&
+        slices[key].valueFiat > 0
+          ? slices[key].valueFiat / allocationTotalFiat
+          : 0,
+    };
+  }
+  return { slices: updated, totalFiat };
+}
+
+function aggregateStatus(
+  slices: Record<SliceKey, SliceData>,
+  totalFiat: number,
+): HeroData['status'] {
+  const eligibleSlices = SLICE_ORDER.filter(
+    (k) => slices[k].status !== 'ineligible',
+  );
+  const hasReadySlice = eligibleSlices.some(
+    (k) => slices[k].status === 'ready',
+  );
+  const hasLoadingSlice = eligibleSlices.some(
+    (k) => slices[k].status === 'loading',
+  );
+
+  // A zero-valued ready slice is not enough to conclude the portfolio is empty
+  // while another eligible balance is still loading.
+  if (hasReadySlice && (totalFiat !== 0 || !hasLoadingSlice)) {
+    return 'ready';
+  }
+
+  if (hasLoadingSlice) {
+    return 'loading';
+  }
+
+  if (eligibleSlices.some((k) => slices[k].status === 'error')) {
+    return 'error';
+  }
+
+  return 'ineligible';
+}
+
+export function useBalanceBreakdown(): BreakdownData {
+  const { themeAppearance } = useTheme();
+  const { toUserCurrency, userCurrency } = useFiatNormalizer();
+  const tokensSlice = useTokensSlice();
+  const moneySlice = useMoneySlice(toUserCurrency);
+  const perpsSlice = usePerpsSlice(toUserCurrency);
+  const predictSlice = usePredictSlice(toUserCurrency);
+  const defiSlice = useDefiSlice(toUserCurrency);
+
+  const slicesRaw: Record<SliceKey, BalanceSlice> = useMemo(
+    () => ({
+      tokens: tokensSlice,
+      money: moneySlice,
+      perps: perpsSlice,
+      predict: predictSlice,
+      defi: defiSlice,
+    }),
+    [tokensSlice, moneySlice, perpsSlice, predictSlice, defiSlice],
+  );
+
+  const sliceStrokeColors = useMemo(
+    () => getBalanceBreakdownSliceColors(themeAppearance),
+    [themeAppearance],
+  );
+
+  const slicesWithThemeColors: Record<SliceKey, SliceData> = useMemo(
+    () =>
+      Object.fromEntries(
+        SLICE_ORDER.map((key) => [
+          key,
+          {
+            ...slicesRaw[key],
+            color: sliceStrokeColors[key],
+            percentOfTotal: 0,
+          },
+        ]),
+      ) as Record<SliceKey, SliceData>,
+    [slicesRaw, sliceStrokeColors],
+  );
+
+  const { slices, totalFiat } = useMemo(
+    () => computePercentages(slicesWithThemeColors),
+    [slicesWithThemeColors],
+  );
+
+  const heroStatus = useMemo(
+    () => aggregateStatus(slices, totalFiat),
+    [slices, totalFiat],
+  );
+  const isHeroPartiallyLoaded = useMemo(
+    () =>
+      heroStatus === 'ready' &&
+      SLICE_ORDER.some((key) => slices[key].status === 'loading'),
+    [heroStatus, slices],
+  );
+  const hasHeroErroredSlice = useMemo(
+    () =>
+      heroStatus === 'ready' &&
+      SLICE_ORDER.some((key) => slices[key].status === 'error'),
+    [heroStatus, slices],
+  );
+
+  const hero = useMemo<HeroData>(() => {
+    /** A missing Perps baseline must not turn session PnL into a “Today” value. */
+    const PERPS_24H_BASELINE_EPS = 1e-6;
+    const hasTrustworthyPerps24hBaseline =
+      perpsSlice.valueFiat <= PERPS_24H_BASELINE_EPS ||
+      (perpsSlice.value1dAgoFiat ?? 0) > PERPS_24H_BASELINE_EPS;
+
+    const includePerpsContribution =
+      perpsSlice.status === 'ready' &&
+      perpsSlice.value1dAgoFiat !== undefined &&
+      hasTrustworthyPerps24hBaseline;
+
+    const perpsFiatContribution = includePerpsContribution
+      ? perpsSlice.valueFiat - (perpsSlice.value1dAgoFiat ?? 0)
+      : 0;
+
+    return {
+      totalFiat,
+      userCurrency,
+      delta: computeAggregateHero24hDelta({
+        totalFiat,
+        tokensDelta: tokensSlice.delta,
+        perpsFiatContribution,
+        includePerpsContribution,
+      }),
+      status: heroStatus,
+      isPartiallyLoaded: isHeroPartiallyLoaded,
+      hasErroredSlice: hasHeroErroredSlice,
+    };
+  }, [
+    totalFiat,
+    userCurrency,
+    tokensSlice.delta,
+    heroStatus,
+    hasHeroErroredSlice,
+    isHeroPartiallyLoaded,
+    perpsSlice.status,
+    perpsSlice.value1dAgoFiat,
+    perpsSlice.valueFiat,
+  ]);
+
+  return { hero, slices };
+}
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/useFiatNormalizer.test.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/useFiatNormalizer.test.ts
new file mode 100644
index 000000000000..bd9158e63430
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/useFiatNormalizer.test.ts
@@ -0,0 +1,88 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { Provider } from 'react-redux';
+import configureStore from 'redux-mock-store';
+import React from 'react';
+import { useFiatNormalizer } from './useFiatNormalizer';
+
+const mockStore = configureStore([]);
+
+function buildStore(usdRate: number | undefined, currentCurrency: string) {
+  return mockStore({
+    engine: {
+      backgroundState: {
+        CurrencyRateController: {
+          currentCurrency,
+          currencyRates:
+            usdRate === undefined ? {} : { usd: { conversionRate: usdRate } },
+        },
+      },
+    },
+  });
+}
+
+function wrapper(store: ReturnType<typeof mockStore>) {
+  const StoreProvider = Provider as unknown as React.ComponentType<{
+    store: ReturnType<typeof mockStore>;
+  }>;
+  return ({ children }: { children: React.ReactNode }) =>
+    React.createElement(StoreProvider, { store }, children);
+}
+
+describe('useFiatNormalizer', () => {
+  it('passes through USD amounts when user currency is USD', () => {
+    const store = buildStore(1, 'USD');
+    const { result } = renderHook(() => useFiatNormalizer(), {
+      wrapper: wrapper(store),
+    });
+    expect(result.current.toUserCurrency(100)).toBe(100);
+  });
+
+  it('converts USD → EUR using conversionRate', () => {
+    const store = buildStore(0.92, 'EUR');
+    const { result } = renderHook(() => useFiatNormalizer(), {
+      wrapper: wrapper(store),
+    });
+    expect(result.current.toUserCurrency(100)).toBeCloseTo(92);
+  });
+
+  it('does not relabel USD when a non-USD conversion rate is unavailable', () => {
+    const store = buildStore(undefined, 'EUR');
+    const { result } = renderHook(() => useFiatNormalizer(), {
+      wrapper: wrapper(store),
+    });
+    expect(result.current.toUserCurrency(100)).toBeUndefined();
+  });
+
+  it('returns 0 for zero amount', () => {
+    const store = buildStore(1, 'USD');
+    const { result } = renderHook(() => useFiatNormalizer(), {
+      wrapper: wrapper(store),
+    });
+    expect(result.current.toUserCurrency(0)).toBe(0);
+  });
+
+  it('does not mark zero ready when a non-USD rate is unavailable', () => {
+    const store = buildStore(undefined, 'EUR');
+    const { result } = renderHook(() => useFiatNormalizer(), {
+      wrapper: wrapper(store),
+    });
+
+    expect(result.current.toUserCurrency(0)).toBeUndefined();
+  });
+
+  it('returns 0 for NaN input', () => {
+    const store = buildStore(1, 'USD');
+    const { result } = renderHook(() => useFiatNormalizer(), {
+      wrapper: wrapper(store),
+    });
+    expect(result.current.toUserCurrency(NaN)).toBe(0);
+  });
+
+  it('returns userCurrency from state', () => {
+    const store = buildStore(1, 'GBP');
+    const { result } = renderHook(() => useFiatNormalizer(), {
+      wrapper: wrapper(store),
+    });
+    expect(result.current.userCurrency).toBe('GBP');
+  });
+});
diff --git a/app/components/Views/Homepage/BalanceBreakdown/hooks/useFiatNormalizer.ts b/app/components/Views/Homepage/BalanceBreakdown/hooks/useFiatNormalizer.ts
new file mode 100644
index 000000000000..bcfc1ea1804d
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/hooks/useFiatNormalizer.ts
@@ -0,0 +1,31 @@
+import { useCallback } from 'react';
+import { useSelector } from 'react-redux';
+import { RootState } from '../../../../../reducers';
+import {
+  selectConversionRateBySymbol,
+  selectCurrentCurrency,
+} from '../../../../../selectors/currencyRateController';
+
+/** Converts USD-denominated primitive balances to the user's display currency. */
+export function useFiatNormalizer() {
+  const userCurrency = useSelector(selectCurrentCurrency);
+
+  // USD rate in user currency
+  const usdRate = useSelector((state: RootState) =>
+    selectConversionRateBySymbol(state, 'usd'),
+  );
+
+  const toUserCurrency = useCallback(
+    (amount: number): number | undefined => {
+      if (!Number.isFinite(amount)) return 0;
+      if (userCurrency.toLowerCase() === 'usd') return amount;
+      if (!Number.isFinite(usdRate) || usdRate <= 0) {
+        return undefined;
+      }
+      return amount * usdRate;
+    },
+    [usdRate, userCurrency],
+  );
+
+  return { toUserCurrency, userCurrency };
+}
diff --git a/app/components/Views/Homepage/BalanceBreakdown/types.ts b/app/components/Views/Homepage/BalanceBreakdown/types.ts
new file mode 100644
index 000000000000..63e3042a97ca
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/types.ts
@@ -0,0 +1,42 @@
+export type SliceKey = 'tokens' | 'money' | 'perps' | 'predict' | 'defi';
+
+export type SliceStatus = 'loading' | 'ready' | 'error' | 'ineligible';
+
+export type FiatConverter = (usdAmount: number) => number | undefined;
+
+export interface SliceDelta {
+  amount: number;
+  /** Fractional change (e.g. 0.0124 → 1.24%). */
+  percent?: number;
+}
+
+export interface BalanceSlice {
+  key: SliceKey;
+  /** Whether the product should be exposed on the homepage. */
+  isVisible: boolean;
+  valueFiat: number;
+  delta?: SliceDelta;
+  status: SliceStatus;
+  apyPercent?: number;
+  apyLoading?: boolean;
+  value1dAgoFiat?: number;
+}
+
+export interface SliceData extends BalanceSlice {
+  color: string;
+  percentOfTotal: number;
+}
+
+export interface HeroData {
+  totalFiat: number;
+  userCurrency: string;
+  delta?: SliceDelta;
+  status: SliceStatus;
+  isPartiallyLoaded?: boolean;
+  hasErroredSlice?: boolean;
+}
+
+export interface BreakdownData {
+  hero: HeroData;
+  slices: Record<SliceKey, SliceData>;
+}
diff --git a/app/components/Views/Homepage/BalanceBreakdown/utils/aggregateHero24hDelta.test.ts b/app/components/Views/Homepage/BalanceBreakdown/utils/aggregateHero24hDelta.test.ts
new file mode 100644
index 000000000000..7e5dfaa2020d
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/utils/aggregateHero24hDelta.test.ts
@@ -0,0 +1,66 @@
+import { computeAggregateHero24hDelta } from './aggregateHero24hDelta';
+
+describe('computeAggregateHero24hDelta', () => {
+  it('returns undefined when neither tokens nor perps signals are present', () => {
+    expect(
+      computeAggregateHero24hDelta({
+        totalFiat: 1000,
+        perpsFiatContribution: 50,
+        includePerpsContribution: false,
+      }),
+    ).toBeUndefined();
+  });
+
+  it('uses portfolio denominator when total includes non-token slices', () => {
+    const totalFiat = 110_000;
+    const tokenChange = 500;
+    const delta = computeAggregateHero24hDelta({
+      totalFiat,
+      tokensDelta: {
+        amount: tokenChange,
+        percent: 0.01,
+      },
+      perpsFiatContribution: 0,
+      includePerpsContribution: false,
+    });
+    expect(delta).toBeDefined();
+    expect(delta?.amount).toBe(500);
+    const prev = totalFiat - 500;
+    expect(delta?.percent).toBeCloseTo(500 / prev);
+  });
+
+  it('adds perps change to token change and recomputes percent', () => {
+    const totalFiat = 100_000;
+    const delta = computeAggregateHero24hDelta({
+      totalFiat,
+      tokensDelta: { amount: 100, percent: 0.001 },
+      perpsFiatContribution: 400,
+      includePerpsContribution: true,
+    });
+    expect(delta?.amount).toBe(500);
+    const prev = totalFiat - 500;
+    expect(delta?.percent).toBeCloseTo(500 / prev);
+  });
+
+  it('supports perps-only when tokens have no balance change', () => {
+    const totalFiat = 40_000;
+    const delta = computeAggregateHero24hDelta({
+      totalFiat,
+      perpsFiatContribution: -200,
+      includePerpsContribution: true,
+    });
+    expect(delta?.amount).toBe(-200);
+    expect(delta?.percent).toBeCloseTo(-200 / (totalFiat + 200));
+  });
+
+  it('omits percent when previous total is non-positive', () => {
+    const delta = computeAggregateHero24hDelta({
+      totalFiat: 100,
+      tokensDelta: { amount: 200 },
+      perpsFiatContribution: 0,
+      includePerpsContribution: false,
+    });
+    expect(delta?.amount).toBe(200);
+    expect(delta?.percent).toBeUndefined();
+  });
+});
diff --git a/app/components/Views/Homepage/BalanceBreakdown/utils/aggregateHero24hDelta.ts b/app/components/Views/Homepage/BalanceBreakdown/utils/aggregateHero24hDelta.ts
new file mode 100644
index 000000000000..29f335026e48
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/utils/aggregateHero24hDelta.ts
@@ -0,0 +1,45 @@
+import type { SliceDelta } from '../types';
+
+const PREV_TOTAL_EPS = 1e-9;
+
+/**
+ * Combined hero line for Total Balance: tokens (assets controller 24h) + perps.
+ * Perps uses account value − 24h snapshot only when the Redux baseline is
+ * trustworthy. Predict / DeFi / Money are included in total value but treated
+ * as flat because they do not expose comparable 24h history.
+ */
+export function computeAggregateHero24hDelta(params: {
+  totalFiat: number;
+  tokensDelta?: SliceDelta;
+  /** Display-currency Perps NAV change over 24h. */
+  perpsFiatContribution: number;
+  /** True when the user has an active perps account included in the breakdown. */
+  includePerpsContribution: boolean;
+}): SliceDelta | undefined {
+  const tokenAmount = params.tokensDelta?.amount ?? 0;
+  const perpsAmount =
+    params.includePerpsContribution &&
+    Number.isFinite(params.perpsFiatContribution)
+      ? params.perpsFiatContribution
+      : 0;
+
+  const amount = tokenAmount + perpsAmount;
+
+  const tokenSignal = params.tokensDelta !== undefined;
+  const perpsSignal = params.includePerpsContribution;
+
+  if (!tokenSignal && !perpsSignal) {
+    return undefined;
+  }
+
+  const prevTotal = params.totalFiat - amount;
+  let percent: number | undefined;
+  if (prevTotal > PREV_TOTAL_EPS) {
+    percent = amount / prevTotal;
+  }
+
+  return {
+    amount,
+    percent,
+  };
+}
diff --git a/app/components/Views/Homepage/BalanceBreakdown/utils/getBalanceBreakdownSliceColors.test.ts b/app/components/Views/Homepage/BalanceBreakdown/utils/getBalanceBreakdownSliceColors.test.ts
new file mode 100644
index 000000000000..e513be533085
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/utils/getBalanceBreakdownSliceColors.test.ts
@@ -0,0 +1,35 @@
+import { brandColor } from '@metamask/design-tokens';
+import { AppThemeKey } from '../../../../../util/theme/models';
+import {
+  DARK_ALLOCATION_COLORS,
+  getBalanceBreakdownSliceColors,
+  LIGHT_ALLOCATION_COLORS,
+} from './getBalanceBreakdownSliceColors';
+
+describe('getBalanceBreakdownSliceColors', () => {
+  it('uses the light allocation palette', () => {
+    expect(getBalanceBreakdownSliceColors(AppThemeKey.light)).toEqual(
+      LIGHT_ALLOCATION_COLORS,
+    );
+    expect(Object.values(LIGHT_ALLOCATION_COLORS)).toEqual([
+      brandColor.blue600,
+      brandColor.blue500,
+      brandColor.blue300,
+      brandColor.indigo300,
+      brandColor.blue100,
+    ]);
+  });
+
+  it('uses the dark allocation palette', () => {
+    expect(getBalanceBreakdownSliceColors(AppThemeKey.dark)).toEqual(
+      DARK_ALLOCATION_COLORS,
+    );
+    expect(Object.values(DARK_ALLOCATION_COLORS)).toEqual([
+      brandColor.blue300,
+      brandColor.indigo100,
+      brandColor.grey200,
+      brandColor.grey400,
+      brandColor.grey500,
+    ]);
+  });
+});
diff --git a/app/components/Views/Homepage/BalanceBreakdown/utils/getBalanceBreakdownSliceColors.ts b/app/components/Views/Homepage/BalanceBreakdown/utils/getBalanceBreakdownSliceColors.ts
new file mode 100644
index 000000000000..d6fb41a70ce5
--- /dev/null
+++ b/app/components/Views/Homepage/BalanceBreakdown/utils/getBalanceBreakdownSliceColors.ts
@@ -0,0 +1,32 @@
+import { brandColor } from '@metamask/design-tokens';
+import { AppThemeKey, type Theme } from '../../../../../util/theme/models';
+import type { SliceKey } from '../types';
+
+/*
+ * TMCU-1209 palettes matched to the nearest static brand color tokens.
+ * Category identity stays identical between the allocation bar and its dots.
+ */
+export const LIGHT_ALLOCATION_COLORS: Record<SliceKey, string> = {
+  money: brandColor.blue600,
+  tokens: brandColor.blue500,
+  perps: brandColor.blue300,
+  predict: brandColor.indigo300,
+  defi: brandColor.blue100,
+};
+
+export const DARK_ALLOCATION_COLORS: Record<SliceKey, string> = {
+  money: brandColor.blue300,
+  tokens: brandColor.indigo100,
+  perps: brandColor.grey200,
+  predict: brandColor.grey400,
+  defi: brandColor.grey500,
+};
+
+/** Blue-to-slate allocation palette shared by the bar and row indicators. */
+export function getBalanceBreakdownSliceColors(
+  themeAppearance: Theme['themeAppearance'],
+): Record<SliceKey, string> {
+  return themeAppearance === AppThemeKey.light
+    ? LIGHT_ALLOCATION_COLORS
+    : DARK_ALLOCATION_COLORS;
+}
diff --git a/app/components/Views/Homepage/Homepage.test.tsx b/app/components/Views/Homepage/Homepage.test.tsx
index 8f6b55511bd6..11fc39972fef 100644
--- a/app/components/Views/Homepage/Homepage.test.tsx
+++ b/app/components/Views/Homepage/Homepage.test.tsx
@@ -56,10 +56,12 @@ jest.mock('./Sections/NFTs/hooks', () => ({
 }));
 
 // Mock feature flags - enable all sections
+const mockPerpsEnabled = true;
 jest.mock('../../UI/Perps', () => ({
-  selectPerpsEnabledFlag: jest.fn(() => true),
+  selectPerpsEnabledFlag: jest.fn(() => mockPerpsEnabled),
 }));
 
+const mockPerpsConnectionProvider = jest.fn();
 jest.mock('../../UI/Perps/providers/PerpsConnectionProvider', () => {
   const ReactLib = jest.requireActual<typeof import('react')>('react');
   const PerpsConnectionContext = ReactLib.createContext({
@@ -75,8 +77,16 @@ jest.mock('../../UI/Perps/providers/PerpsConnectionProvider', () => {
 
   return {
     PerpsConnectionContext,
-    PerpsConnectionProvider: ({ children }: { children: React.ReactNode }) =>
+    PerpsConnectionProvider: ({
       children,
+      isEnabled,
+    }: {
+      children: React.ReactNode;
+      isEnabled?: boolean;
+    }) => {
+      mockPerpsConnectionProvider({ isEnabled });
+      return children;
+    },
   };
 });
 
@@ -153,45 +163,6 @@ jest.mock('../../UI/NftGrid/NftGridItemBottomSheet', () => () => null);
 
 jest.mock('../../UI/Predict/selectors/featureFlags', () => ({
   selectPredictEnabledFlag: jest.fn(() => true),
-  selectPredictWorldCupConfig: jest.fn(() => ({
-    enabled: false,
-    minimumVersion: '',
-    showMainFeedBanner: false,
-    showMainFeedTab: false,
-    showWorldCupScreen: false,
-    seriesId: '10218',
-    tagSlug: 'fifa-world-cup',
-    gamesTagId: '100639',
-    stages: [],
-  })),
-  selectPredictWorldCupScreenEnabledFlag: jest.fn(() => false),
-}));
-
-jest.mock('../../UI/Predict/hooks/usePredictWorldCup', () => ({
-  usePredictWorldCupMarkets: () => ({
-    marketData: [],
-    isFetching: false,
-    isFetchingMore: false,
-    error: null,
-    hasMore: false,
-    refetch: jest.fn().mockResolvedValue(undefined),
-    fetchMore: jest.fn().mockResolvedValue(undefined),
-  }),
-  usePredictWorldCupAvailability: () => ({
-    availability: { live: false, props: false, stages: {} },
-    isFetching: false,
-    isLoading: false,
-    errors: [],
-    refetch: jest.fn(),
-  }),
-  usePredictWorldCupAvailableTabs: () => ({
-    availability: { live: false, props: false, stages: {} },
-    tabs: [],
-    isFetching: false,
-    isLoading: false,
-    errors: [],
-    refetch: jest.fn(),
-  }),
 }));
 
 jest.mock('@tanstack/react-query', () => {
@@ -242,6 +213,10 @@ jest.mock('../../../selectors/deFiPositionsSectionEnabled', () => ({
   selectDeFiPositionsSectionEnabled: jest.fn(() => true),
 }));
 
+jest.mock('../../../selectors/deFiPositionsV2SectionEnabled', () => ({
+  selectDeFiPositionsV2SectionEnabled: jest.fn(() => false),
+}));
+
 jest.mock('../../../selectors/featureFlagController/socialLeaderboard', () => ({
   selectSocialLeaderboardEnabled: jest.fn(() => false),
   selectSocialLeaderboardPerpsEnabled: jest.fn(() => true),
@@ -260,6 +235,18 @@ jest.mock('../../UI/Assets/watchlist/hooks/useTokenWatchlistQuery', () => ({
   })),
 }));
 
+const mockBalanceBreakdownSection = jest.fn();
+jest.mock('./Sections/BalanceBreakdown', () => {
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: (props: unknown) => {
+      mockBalanceBreakdownSection(props);
+      return <View testID="balance-breakdown-section-mock" />;
+    },
+  };
+});
+
 jest.mock('./Sections/TopTraders/hooks', () => ({
   useTopTraders: jest.fn(() => ({
     traders: [],
@@ -388,6 +375,9 @@ describe('Homepage', () => {
     jest
       .requireMock('../../../selectors/deFiPositionsSectionEnabled')
       .selectDeFiPositionsSectionEnabled.mockReturnValue(true);
+    jest
+      .requireMock('../../../selectors/deFiPositionsV2SectionEnabled')
+      .selectDeFiPositionsV2SectionEnabled.mockReturnValue(false);
     jest
       .requireMock('../../../selectors/featureFlagController/socialLeaderboard')
       .selectSocialLeaderboardEnabled.mockReturnValue(false);
@@ -404,6 +394,57 @@ describe('Homepage', () => {
     mockIsNetworkEnabled.mockReturnValue(true);
   });
 
+  it('uses one enabled Perps connection provider for the homepage', () => {
+    renderWithProvider(<Homepage />, { state: stateWithPreferences });
+
+    expect(mockPerpsConnectionProvider).toHaveBeenCalledTimes(1);
+    expect(mockPerpsConnectionProvider).toHaveBeenCalledWith({
+      isEnabled: true,
+    });
+  });
+
+  it('keeps the shared provider inert when Perps is disabled', () => {
+    jest
+      .requireMock('../../UI/Perps')
+      .selectPerpsEnabledFlag.mockReturnValue(false);
+
+    renderWithProvider(<Homepage />, { state: stateWithPreferences });
+
+    expect(mockPerpsConnectionProvider).toHaveBeenCalledTimes(1);
+    expect(mockPerpsConnectionProvider).toHaveBeenCalledWith({
+      isEnabled: false,
+    });
+  });
+
+  it('renders the treatment breakdown before homepage sections when provided', () => {
+    const balanceBreakdownSectionProps = {
+      accountGroupBalanceProps: {},
+      hideRows: false,
+      layout: 'icons' as const,
+    };
+
+    renderWithProvider(
+      <Homepage balanceBreakdownSectionProps={balanceBreakdownSectionProps} />,
+      { state: stateWithPreferences },
+    );
+
+    expect(
+      screen.getByTestId('balance-breakdown-section-mock'),
+    ).toBeOnTheScreen();
+    expect(mockBalanceBreakdownSection).toHaveBeenCalledWith(
+      balanceBreakdownSectionProps,
+    );
+  });
+
+  it('does not render a breakdown section for control', () => {
+    renderWithProvider(<Homepage />, { state: stateWithPreferences });
+
+    expect(
+      screen.queryByTestId('balance-breakdown-section-mock'),
+    ).not.toBeOnTheScreen();
+    expect(mockBalanceBreakdownSection).not.toHaveBeenCalled();
+  });
+
   it('calls enableAllPopularNetworks when Homepage is focused and a popular network is disabled', () => {
     mockPopularNetworks = ['eip155:1'];
     mockIsNetworkEnabled.mockReturnValue(false);
@@ -531,6 +572,9 @@ describe('Homepage', () => {
       jest
         .requireMock('../../../selectors/deFiPositionsSectionEnabled')
         .selectDeFiPositionsSectionEnabled.mockReturnValue(false);
+      jest
+        .requireMock('../../../selectors/deFiPositionsV2SectionEnabled')
+        .selectDeFiPositionsV2SectionEnabled.mockReturnValue(false);
     });
 
     it('passes totalSectionsLoaded=2 when only Tokens and NFTs are enabled', () => {
diff --git a/app/components/Views/Homepage/Homepage.tsx b/app/components/Views/Homepage/Homepage.tsx
index 268347b6e524..8678ed80a661 100644
--- a/app/components/Views/Homepage/Homepage.tsx
+++ b/app/components/Views/Homepage/Homepage.tsx
@@ -22,6 +22,7 @@ import { WalletViewSelectorsIDs } from '../Wallet/WalletView.testIds';
 import { selectPerpsEnabledFlag } from '../../UI/Perps';
 import { selectPredictEnabledFlag } from '../../UI/Predict/selectors/featureFlags';
 import { selectDeFiPositionsSectionEnabled } from '../../../selectors/deFiPositionsSectionEnabled';
+import { selectDeFiPositionsV2SectionEnabled } from '../../../selectors/deFiPositionsV2SectionEnabled';
 import { selectSocialLeaderboardEnabled } from '../../../selectors/featureFlagController/socialLeaderboard';
 import { selectTokenWatchlistEnabled } from '../../UI/Assets/selectors/featureFlags';
 import { HomeSectionNames, HomeSectionName } from './hooks/useHomeViewedEvent';
@@ -29,6 +30,9 @@ import useHomeSessionSummary from './hooks/useHomeSessionSummary';
 import { useNetworkEnablement } from '../../hooks/useNetworkEnablement/useNetworkEnablement';
 import { PerpsConnectionProvider } from '../../UI/Perps/providers/PerpsConnectionProvider';
 import { PerpsStreamProvider } from '../../UI/Perps/providers/PerpsStreamManager';
+import BalanceBreakdownSection, {
+  type BalanceBreakdownSectionProps,
+} from './Sections/BalanceBreakdown';
 
 /**
  * Homepage component - Main view for the redesigned wallet homepage.
@@ -36,154 +40,165 @@ import { PerpsStreamProvider } from '../../UI/Perps/providers/PerpsStreamManager
  * This component orchestrates all homepage sections and coordinates
  * their refresh functionality via refs.
  */
-const Homepage = forwardRef<SectionRefreshHandle, object>((_props, ref) => {
-  const tokensSectionRef = useRef<SectionRefreshHandle>(null);
-  const perpsSectionRef = useRef<SectionRefreshHandle>(null);
-  const predictionsSectionRef = useRef<SectionRefreshHandle>(null);
-  const topTradersSectionRef = useRef<SectionRefreshHandle>(null);
-  const defiSectionRef = useRef<SectionRefreshHandle>(null);
-  const nftsSectionRef = useRef<SectionRefreshHandle>(null);
-  const watchlistSectionRef = useRef<SectionRefreshHandle>(null);
+export interface HomepageProps {
+  balanceBreakdownSectionProps?: BalanceBreakdownSectionProps;
+}
 
-  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
-  const isPredictEnabled = useSelector(selectPredictEnabledFlag);
-  const isDeFiEnabled = useSelector(selectDeFiPositionsSectionEnabled);
-  const isTopTradersEnabled = useSelector(selectSocialLeaderboardEnabled);
-  const isWatchlistEnabled = useSelector(selectTokenWatchlistEnabled);
+const Homepage = forwardRef<SectionRefreshHandle, HomepageProps>(
+  ({ balanceBreakdownSectionProps }, ref) => {
+    const tokensSectionRef = useRef<SectionRefreshHandle>(null);
+    const perpsSectionRef = useRef<SectionRefreshHandle>(null);
+    const predictionsSectionRef = useRef<SectionRefreshHandle>(null);
+    const topTradersSectionRef = useRef<SectionRefreshHandle>(null);
+    const defiSectionRef = useRef<SectionRefreshHandle>(null);
+    const nftsSectionRef = useRef<SectionRefreshHandle>(null);
+    const watchlistSectionRef = useRef<SectionRefreshHandle>(null);
 
-  const { enableAllPopularNetworks, isNetworkEnabled, popularNetworks } =
-    useNetworkEnablement();
-  const popularNetworksKey = popularNetworks.join(',');
-  const areAllPopularNetworksEnabled = useMemo(() => {
-    if (popularNetworksKey === '') {
-      return true;
-    }
-    return popularNetworksKey
-      .split(',')
-      .every((chainId) =>
-        isNetworkEnabled(chainId as Parameters<typeof isNetworkEnabled>[0]),
-      );
-  }, [isNetworkEnabled, popularNetworksKey]);
+    const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
+    const isPredictEnabled = useSelector(selectPredictEnabledFlag);
+    const isDeFiV1Enabled = useSelector(selectDeFiPositionsSectionEnabled);
+    const isDeFiV2Enabled = useSelector(selectDeFiPositionsV2SectionEnabled);
+    const isDeFiEnabled = isDeFiV1Enabled || isDeFiV2Enabled;
+    const isTopTradersEnabled = useSelector(selectSocialLeaderboardEnabled);
+    const isWatchlistEnabled = useSelector(selectTokenWatchlistEnabled);
 
-  // useFocusEffect (not useEffect) so we run every time the user focuses this screen
-  // (e.g. switches to Wallet tab or returns from a section). With useEffect we would
-  // only run on first mount, so "all popular networks" would not be re-applied when
-  // they come back to the homepage.
-  useFocusEffect(
-    useCallback(() => {
-      if (!areAllPopularNetworksEnabled) {
-        enableAllPopularNetworks();
+    const { enableAllPopularNetworks, isNetworkEnabled, popularNetworks } =
+      useNetworkEnablement();
+    const popularNetworksKey = popularNetworks.join(',');
+    const areAllPopularNetworksEnabled = useMemo(() => {
+      if (popularNetworksKey === '') {
+        return true;
       }
-    }, [areAllPopularNetworksEnabled, enableAllPopularNetworks]),
-  );
+      return popularNetworksKey
+        .split(',')
+        .every((chainId) =>
+          isNetworkEnabled(chainId as Parameters<typeof isNetworkEnabled>[0]),
+        );
+    }, [isNetworkEnabled, popularNetworksKey]);
 
-  /**
-   * Compute the ordered list of enabled sections. Tokens are always present;
-   * NFTs, Perps, Predictions, and DeFi are conditional.
-   */
-  const enabledSections = useMemo(
-    () =>
+    // useFocusEffect (not useEffect) so we run every time the user focuses this screen
+    // (e.g. switches to Wallet tab or returns from a section). With useEffect we would
+    // only run on first mount, so "all popular networks" would not be re-applied when
+    // they come back to the homepage.
+    useFocusEffect(
+      useCallback(() => {
+        if (!areAllPopularNetworksEnabled) {
+          enableAllPopularNetworks();
+        }
+      }, [areAllPopularNetworksEnabled, enableAllPopularNetworks]),
+    );
+
+    /**
+     * Compute the ordered list of enabled sections. Tokens are always present;
+     * NFTs, Perps, Predictions, and DeFi are conditional.
+     */
+    const enabledSections = useMemo(
+      () =>
+        [
+          { name: HomeSectionNames.TOKENS, enabled: true },
+          { name: HomeSectionNames.PERPS, enabled: isPerpsEnabled },
+          { name: HomeSectionNames.PREDICT, enabled: isPredictEnabled },
+          { name: HomeSectionNames.WATCHLIST, enabled: isWatchlistEnabled },
+          {
+            name: HomeSectionNames.TOP_TRADERS,
+            enabled: isTopTradersEnabled,
+          },
+          { name: HomeSectionNames.DEFI, enabled: isDeFiEnabled },
+          { name: HomeSectionNames.NFTS, enabled: true },
+        ].filter((section) => section.enabled),
       [
-        { name: HomeSectionNames.TOKENS, enabled: true },
-        { name: HomeSectionNames.PERPS, enabled: isPerpsEnabled },
-        { name: HomeSectionNames.PREDICT, enabled: isPredictEnabled },
-        { name: HomeSectionNames.WATCHLIST, enabled: isWatchlistEnabled },
-        {
-          name: HomeSectionNames.TOP_TRADERS,
-          enabled: isTopTradersEnabled,
-        },
-        { name: HomeSectionNames.DEFI, enabled: isDeFiEnabled },
-        { name: HomeSectionNames.NFTS, enabled: true },
-      ].filter((section) => section.enabled),
-    [
-      isPerpsEnabled,
-      isPredictEnabled,
-      isDeFiEnabled,
-      isTopTradersEnabled,
-      isWatchlistEnabled,
-    ],
-  );
+        isPerpsEnabled,
+        isPredictEnabled,
+        isDeFiEnabled,
+        isTopTradersEnabled,
+        isWatchlistEnabled,
+      ],
+    );
 
-  const totalSectionsLoaded = enabledSections.length;
+    const totalSectionsLoaded = enabledSections.length;
 
-  useHomeSessionSummary({ totalSectionsLoaded });
+    useHomeSessionSummary({ totalSectionsLoaded });
 
-  const getSectionIndex = useCallback(
-    (name: HomeSectionName) =>
-      enabledSections.findIndex((s) => s.name === name),
-    [enabledSections],
-  );
+    const getSectionIndex = useCallback(
+      (name: HomeSectionName) =>
+        enabledSections.findIndex((s) => s.name === name),
+      [enabledSections],
+    );
 
-  const refresh = useCallback(async () => {
-    await Promise.allSettled([
-      tokensSectionRef.current?.refresh(),
-      perpsSectionRef.current?.refresh(),
-      predictionsSectionRef.current?.refresh(),
-      watchlistSectionRef.current?.refresh(),
-      topTradersSectionRef.current?.refresh(),
-      defiSectionRef.current?.refresh(),
-      nftsSectionRef.current?.refresh(),
-    ]);
-  }, []);
+    const refresh = useCallback(async () => {
+      await Promise.allSettled([
+        tokensSectionRef.current?.refresh(),
+        perpsSectionRef.current?.refresh(),
+        predictionsSectionRef.current?.refresh(),
+        watchlistSectionRef.current?.refresh(),
+        topTradersSectionRef.current?.refresh(),
+        defiSectionRef.current?.refresh(),
+        nftsSectionRef.current?.refresh(),
+      ]);
+    }, []);
 
-  useImperativeHandle(ref, () => ({ refresh }), [refresh]);
+    useImperativeHandle(ref, () => ({ refresh }), [refresh]);
 
-  return (
-    <Box
-      marginBottom={8}
-      testID={WalletViewSelectorsIDs.HOMEPAGE_CONTAINER}
-      accessible={false}
-    >
-      <TokensSection
-        ref={tokensSectionRef}
-        sectionIndex={getSectionIndex(HomeSectionNames.TOKENS)}
-        totalSectionsLoaded={totalSectionsLoaded}
-      />
-      {isPerpsEnabled && (
-        <PerpsConnectionProvider suppressErrorView>
-          <PerpsStreamProvider>
-            <HomepagePerpsHomeSlot
-              ref={perpsSectionRef}
-              sectionIndex={getSectionIndex(HomeSectionNames.PERPS)}
+    return (
+      <PerpsConnectionProvider isEnabled={isPerpsEnabled} suppressErrorView>
+        <PerpsStreamProvider>
+          <Box
+            marginBottom={8}
+            testID={WalletViewSelectorsIDs.HOMEPAGE_CONTAINER}
+            accessible={false}
+          >
+            {balanceBreakdownSectionProps ? (
+              <BalanceBreakdownSection {...balanceBreakdownSectionProps} />
+            ) : null}
+            <TokensSection
+              ref={tokensSectionRef}
+              sectionIndex={getSectionIndex(HomeSectionNames.TOKENS)}
+              totalSectionsLoaded={totalSectionsLoaded}
+            />
+            {isPerpsEnabled && (
+              <HomepagePerpsHomeSlot
+                ref={perpsSectionRef}
+                sectionIndex={getSectionIndex(HomeSectionNames.PERPS)}
+                totalSectionsLoaded={totalSectionsLoaded}
+              />
+            )}
+            <PredictionsSection
+              ref={predictionsSectionRef}
+              sectionIndex={getSectionIndex(HomeSectionNames.PREDICT)}
+              totalSectionsLoaded={totalSectionsLoaded}
+            />
+            {isWatchlistEnabled && (
+              <WatchlistSection
+                ref={watchlistSectionRef}
+                sectionIndex={getSectionIndex(HomeSectionNames.WATCHLIST)}
+                totalSectionsLoaded={totalSectionsLoaded}
+              />
+            )}
+            {isTopTradersEnabled && (
+              <TopTradersSection
+                ref={topTradersSectionRef}
+                sectionIndex={getSectionIndex(HomeSectionNames.TOP_TRADERS)}
+                totalSectionsLoaded={totalSectionsLoaded}
+              />
+            )}
+            {isDeFiEnabled && (
+              <DeFiSection
+                ref={defiSectionRef}
+                sectionIndex={getSectionIndex(HomeSectionNames.DEFI)}
+                totalSectionsLoaded={totalSectionsLoaded}
+              />
+            )}
+            <NFTsSection
+              ref={nftsSectionRef}
+              sectionIndex={getSectionIndex(HomeSectionNames.NFTS)}
               totalSectionsLoaded={totalSectionsLoaded}
             />
-          </PerpsStreamProvider>
-        </PerpsConnectionProvider>
-      )}
-      <PredictionsSection
-        ref={predictionsSectionRef}
-        sectionIndex={getSectionIndex(HomeSectionNames.PREDICT)}
-        totalSectionsLoaded={totalSectionsLoaded}
-      />
-      {isWatchlistEnabled && (
-        <WatchlistSection
-          ref={watchlistSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.WATCHLIST)}
-          totalSectionsLoaded={totalSectionsLoaded}
-        />
-      )}
-      {isTopTradersEnabled && (
-        <TopTradersSection
-          ref={topTradersSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.TOP_TRADERS)}
-          totalSectionsLoaded={totalSectionsLoaded}
-        />
-      )}
-      {isDeFiEnabled && (
-        <DeFiSection
-          ref={defiSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.DEFI)}
-          totalSectionsLoaded={totalSectionsLoaded}
-        />
-      )}
-      <NFTsSection
-        ref={nftsSectionRef}
-        sectionIndex={getSectionIndex(HomeSectionNames.NFTS)}
-        totalSectionsLoaded={totalSectionsLoaded}
-      />
-      <MoreSection />
-    </Box>
-  );
-});
+            <MoreSection />
+          </Box>
+        </PerpsStreamProvider>
+      </PerpsConnectionProvider>
+    );
+  },
+);
 
 export default Homepage;
diff --git a/app/components/Views/Homepage/Sections/BalanceBreakdown/BalanceBreakdownSection.test.tsx b/app/components/Views/Homepage/Sections/BalanceBreakdown/BalanceBreakdownSection.test.tsx
new file mode 100644
index 000000000000..6c477f7f6629
--- /dev/null
+++ b/app/components/Views/Homepage/Sections/BalanceBreakdown/BalanceBreakdownSection.test.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { render } from '@testing-library/react-native';
+import BalanceBreakdownSection, {
+  BALANCE_BREAKDOWN_SECTION_TEST_ID,
+} from './BalanceBreakdownSection';
+
+const mockHomepageBalanceBreakdown = jest.fn();
+
+jest.mock('../../components/HomepageBalanceBreakdown', () => {
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: (props: unknown) => {
+      mockHomepageBalanceBreakdown(props);
+      return <View testID="homepage-balance-breakdown-mock" />;
+    },
+  };
+});
+
+describe('BalanceBreakdownSection', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it.each(['icons', 'allocation'] as const)(
+    'renders the %s treatment with section-local spacing',
+    (layout) => {
+      const children = <></>;
+      const { getByTestId } = render(
+        <BalanceBreakdownSection
+          accountGroupBalanceProps={{}}
+          hideRows
+          layout={layout}
+        >
+          {children}
+        </BalanceBreakdownSection>,
+      );
+
+      expect(getByTestId(BALANCE_BREAKDOWN_SECTION_TEST_ID)).toHaveStyle({
+        paddingBottom: 4,
+      });
+      expect(getByTestId('homepage-balance-breakdown-mock')).toBeOnTheScreen();
+      expect(mockHomepageBalanceBreakdown).toHaveBeenCalledWith(
+        expect.objectContaining({
+          accountGroupBalanceProps: {},
+          children,
+          hideRows: true,
+          layout,
+        }),
+      );
+    },
+  );
+});
diff --git a/app/components/Views/Homepage/Sections/BalanceBreakdown/BalanceBreakdownSection.tsx b/app/components/Views/Homepage/Sections/BalanceBreakdown/BalanceBreakdownSection.tsx
new file mode 100644
index 000000000000..2ba869d103cc
--- /dev/null
+++ b/app/components/Views/Homepage/Sections/BalanceBreakdown/BalanceBreakdownSection.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { Box } from '@metamask/design-system-react-native';
+import HomepageBalanceBreakdown from '../../components/HomepageBalanceBreakdown';
+import type { HomepageBalanceBreakdownProps } from '../../components/HomepageBalanceBreakdown/HomepageBalanceBreakdown';
+
+export const BALANCE_BREAKDOWN_SECTION_TEST_ID =
+  'homepage-balance-breakdown-section';
+
+export type BalanceBreakdownSectionProps = HomepageBalanceBreakdownProps;
+
+const BalanceBreakdownSection = (props: BalanceBreakdownSectionProps) => (
+  <Box paddingBottom={1} testID={BALANCE_BREAKDOWN_SECTION_TEST_ID}>
+    <HomepageBalanceBreakdown {...props} />
+  </Box>
+);
+
+export default BalanceBreakdownSection;
diff --git a/app/components/Views/Homepage/Sections/BalanceBreakdown/index.ts b/app/components/Views/Homepage/Sections/BalanceBreakdown/index.ts
new file mode 100644
index 000000000000..c530c3ea33a8
--- /dev/null
+++ b/app/components/Views/Homepage/Sections/BalanceBreakdown/index.ts
@@ -0,0 +1,5 @@
+export { default } from './BalanceBreakdownSection';
+export {
+  BALANCE_BREAKDOWN_SECTION_TEST_ID,
+  type BalanceBreakdownSectionProps,
+} from './BalanceBreakdownSection';
diff --git a/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.test.tsx b/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.test.tsx
index 451c00c864cf..3806f76ce2d8 100644
--- a/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.test.tsx
+++ b/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { fireEvent, screen } from '@testing-library/react-native';
+import { act, fireEvent, screen } from '@testing-library/react-native';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import CashGetMusdEmptyState from './CashGetMusdEmptyState';
@@ -109,23 +109,32 @@ describe('CashGetMusdEmptyState', () => {
   it('calls initiateCustomConversion when Get mUSD pressed and has convertible tokens', async () => {
     renderWithProvider(<CashGetMusdEmptyState />);
 
-    fireEvent.press(screen.getByTestId(CashGetMusdEmptyStateSelectors.BUTTON));
+    await act(async () => {
+      fireEvent.press(
+        screen.getByTestId(CashGetMusdEmptyStateSelectors.BUTTON),
+      );
+    });
 
     expect(mockInitiateCustomConversion).toHaveBeenCalled();
     expect(mockGoToBuy).not.toHaveBeenCalled();
   });
 
-  it('calls goToBuy when Get mUSD pressed and mUSD buyable (no convertible tokens)', () => {
+  it('calls goToBuy when Get mUSD pressed and mUSD buyable (no convertible tokens)', async () => {
     mockUseMusdConversionFlowData.hasConvertibleTokens = false;
 
     renderWithProvider(<CashGetMusdEmptyState />);
 
-    fireEvent.press(screen.getByTestId(CashGetMusdEmptyStateSelectors.BUTTON));
+    await act(async () => {
+      fireEvent.press(
+        screen.getByTestId(CashGetMusdEmptyStateSelectors.BUTTON),
+      );
+    });
 
     expect(mockGoToBuy).toHaveBeenCalledWith(
       expect.objectContaining({
         assetId: expect.stringContaining('eip155:1/erc20:'),
       }),
+      { surface: 'cash' },
     );
     expect(mockInitiateCustomConversion).not.toHaveBeenCalled();
   });
diff --git a/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.tsx b/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.tsx
index c0523ae79081..19b78f8db955 100644
--- a/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.tsx
+++ b/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.tsx
@@ -28,6 +28,7 @@ import {
   MUSD_TOKEN_ASSET_ID_BY_CHAIN,
 } from '../../../../UI/Earn/constants/musd';
 import { useRampNavigation } from '../../../../UI/Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../../../UI/Ramp/constants/rampsBuyCufTags';
 import { RampIntent } from '../../../../UI/Ramp/types';
 import { useMusdConversion } from '../../../../UI/Earn/hooks/useMusdConversion';
 import { useMusdConversionFlowData } from '../../../../UI/Earn/hooks/useMusdConversionFlowData';
@@ -259,7 +260,7 @@ const CashGetMusdEmptyState = ({
       const rampIntent: RampIntent = {
         assetId: MUSD_TOKEN_ASSET_ID_BY_CHAIN[chainId],
       };
-      goToBuy(rampIntent);
+      goToBuy(rampIntent, { surface: RAMPS_BUY_CUF_SURFACE.CASH });
     }
   }, [
     isMusdBuyableOnAnyChain,
diff --git a/app/components/Views/Homepage/Sections/Cash/MusdAggregatedRow.test.tsx b/app/components/Views/Homepage/Sections/Cash/MusdAggregatedRow.test.tsx
deleted file mode 100644
index f15d8215f667..000000000000
--- a/app/components/Views/Homepage/Sections/Cash/MusdAggregatedRow.test.tsx
+++ /dev/null
@@ -1,203 +0,0 @@
-import React from 'react';
-import { fireEvent, screen } from '@testing-library/react-native';
-import renderWithProvider from '../../../../../util/test/renderWithProvider';
-import MusdAggregatedRow from './MusdAggregatedRow';
-import Routes from '../../../../../constants/navigation/Routes';
-
-const mockNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => ({
-  ...jest.requireActual('@react-navigation/native'),
-  useNavigation: () => ({
-    navigate: mockNavigate,
-  }),
-}));
-
-const mockUseMusdBalance = jest.fn(() => ({
-  tokenBalanceAggregated: '1800.5',
-  fiatBalanceAggregatedFormatted: '$1,800.50',
-  hasMusdBalanceOnAnyChain: false,
-}));
-jest.mock('../../../../UI/Earn/hooks/useMusdBalance', () => ({
-  useMusdBalance: () => mockUseMusdBalance(),
-}));
-
-jest.mock('../../../../../selectors/preferencesController', () => ({
-  selectPrivacyMode: () => false,
-}));
-
-const mockSelectMoneyEnableMoneyAccountFlag = jest.fn().mockReturnValue(false);
-jest.mock('../../../../UI/Money/selectors/featureFlags', () => ({
-  selectMoneyEnableMoneyAccountFlag: (state: unknown) =>
-    mockSelectMoneyEnableMoneyAccountFlag(state),
-}));
-
-const mockClaimRewards = jest.fn();
-const mockUseMerklBonusClaim = jest.fn(
-  (_asset?: unknown, _location?: unknown, _isVisible?: unknown) => ({
-    claimableReward: null as string | null,
-    hasPendingClaim: false,
-    isClaiming: false,
-    claimRewards: mockClaimRewards,
-    lifetimeBonusClaimed: '0',
-  }),
-);
-jest.mock(
-  '../../../../UI/Earn/components/MerklRewards/hooks/useMerklBonusClaim',
-  () => ({
-    useMerklBonusClaim: (...args: [unknown, unknown, unknown?]) =>
-      mockUseMerklBonusClaim(...args),
-  }),
-);
-
-const mockSelectMusdConversionEducationSeen = jest.fn().mockReturnValue(true);
-jest.mock('../../../../../reducers/user/selectors', () => ({
-  ...jest.requireActual('../../../../../reducers/user/selectors'),
-  selectMusdConversionEducationSeen: (state: unknown) =>
-    mockSelectMusdConversionEducationSeen(state),
-}));
-
-describe('MusdAggregatedRow', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockSelectMoneyEnableMoneyAccountFlag.mockReturnValue(false);
-    mockSelectMusdConversionEducationSeen.mockReturnValue(true);
-    mockUseMusdBalance.mockReturnValue({
-      tokenBalanceAggregated: '1800.5',
-      fiatBalanceAggregatedFormatted: '$1,800.50',
-      hasMusdBalanceOnAnyChain: false,
-    });
-    mockUseMerklBonusClaim.mockReturnValue({
-      claimableReward: null,
-      hasPendingClaim: false,
-      isClaiming: false,
-      claimRewards: mockClaimRewards,
-      lifetimeBonusClaimed: '0',
-    });
-  });
-
-  it('renders token name and balances', () => {
-    renderWithProvider(<MusdAggregatedRow />);
-
-    expect(screen.getByText('MetaMask USD')).toBeOnTheScreen();
-    expect(screen.getByText('$1,800.50')).toBeOnTheScreen();
-    expect(screen.getByText(/1,800\.5\s*mUSD/)).toBeOnTheScreen();
-  });
-
-  it('shows green "3% bonus" when no claimable reward', () => {
-    renderWithProvider(<MusdAggregatedRow />);
-
-    expect(screen.queryByText('Claim 3% bonus')).toBeNull();
-    expect(screen.getByText('3% bonus')).toBeOnTheScreen();
-  });
-
-  it('shows blue "Claim 3% bonus" when claimable reward exists', () => {
-    mockUseMerklBonusClaim.mockReturnValue({
-      claimableReward: '0.02',
-      hasPendingClaim: false,
-      isClaiming: false,
-      claimRewards: mockClaimRewards,
-      lifetimeBonusClaimed: '0',
-    });
-
-    renderWithProvider(<MusdAggregatedRow />);
-
-    expect(screen.getByText('Claim 3% bonus')).toBeOnTheScreen();
-    expect(screen.queryByText('3% bonus')).toBeNull();
-  });
-
-  it('calls claimRewards when "Claim 3% bonus" is tapped', () => {
-    mockUseMerklBonusClaim.mockReturnValue({
-      claimableReward: '0.02',
-      hasPendingClaim: false,
-      isClaiming: false,
-      claimRewards: mockClaimRewards,
-      lifetimeBonusClaimed: '0',
-    });
-
-    renderWithProvider(<MusdAggregatedRow />);
-
-    fireEvent.press(screen.getByText('Claim 3% bonus'));
-    expect(mockClaimRewards).toHaveBeenCalledTimes(1);
-  });
-
-  it('has cash-section-musd-row testID', () => {
-    renderWithProvider(<MusdAggregatedRow />);
-    expect(screen.getByTestId('cash-section-musd-row')).toBeOnTheScreen();
-  });
-
-  describe('handleTokenRowPress', () => {
-    it('navigates to Cash tokens full view when Money Home is disabled', () => {
-      mockSelectMoneyEnableMoneyAccountFlag.mockReturnValue(false);
-
-      renderWithProvider(<MusdAggregatedRow />);
-
-      fireEvent.press(screen.getByTestId('cash-section-musd-row'));
-
-      expect(mockNavigate).toHaveBeenCalledWith(
-        Routes.WALLET.CASH_TOKENS_FULL_VIEW,
-        undefined,
-      );
-    });
-
-    it('navigates to Money Home when Money Home is enabled', () => {
-      mockSelectMoneyEnableMoneyAccountFlag.mockReturnValue(true);
-
-      renderWithProvider(<MusdAggregatedRow />);
-
-      fireEvent.press(screen.getByTestId('cash-section-musd-row'));
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.ROOT, {
-        screen: Routes.MONEY.HOME,
-      });
-    });
-
-    it('navigates to education screen with returnTo when user has not seen education', () => {
-      mockSelectMoneyEnableMoneyAccountFlag.mockReturnValue(false);
-      mockSelectMusdConversionEducationSeen.mockReturnValue(false);
-
-      renderWithProvider(<MusdAggregatedRow />);
-
-      fireEvent.press(screen.getByTestId('cash-section-musd-row'));
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.EARN.ROOT, {
-        screen: Routes.EARN.MUSD.CONVERSION_EDUCATION,
-        params: {
-          returnTo: { screen: Routes.WALLET.CASH_TOKENS_FULL_VIEW },
-        },
-      });
-    });
-
-    it('navigates directly to CashTokensFullView when education already seen', () => {
-      mockSelectMoneyEnableMoneyAccountFlag.mockReturnValue(false);
-      mockSelectMusdConversionEducationSeen.mockReturnValue(true);
-
-      renderWithProvider(<MusdAggregatedRow />);
-
-      fireEvent.press(screen.getByTestId('cash-section-musd-row'));
-
-      expect(mockNavigate).toHaveBeenCalledWith(
-        Routes.WALLET.CASH_TOKENS_FULL_VIEW,
-        undefined,
-      );
-    });
-
-    it('navigates to MONEY.ROOT when Money account flag is enabled (regardless of education)', () => {
-      mockSelectMoneyEnableMoneyAccountFlag.mockReturnValue(true);
-      mockSelectMusdConversionEducationSeen.mockReturnValue(false);
-
-      renderWithProvider(<MusdAggregatedRow />);
-
-      fireEvent.press(screen.getByTestId('cash-section-musd-row'));
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.EARN.ROOT, {
-        screen: Routes.EARN.MUSD.CONVERSION_EDUCATION,
-        params: {
-          returnTo: {
-            screen: Routes.MONEY.ROOT,
-            params: { screen: Routes.MONEY.HOME },
-          },
-        },
-      });
-    });
-  });
-});
diff --git a/app/components/Views/Homepage/Sections/Cash/MusdAggregatedRow.tsx b/app/components/Views/Homepage/Sections/Cash/MusdAggregatedRow.tsx
deleted file mode 100644
index b849e5b80489..000000000000
--- a/app/components/Views/Homepage/Sections/Cash/MusdAggregatedRow.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import React, { useCallback } from 'react';
-import { Pressable, TouchableOpacity } from 'react-native';
-import {
-  Spinner,
-  Box,
-  Text,
-  TextVariant,
-  TextColor,
-  FontWeight,
-  BoxFlexDirection,
-  BoxAlignItems,
-  BoxJustifyContent,
-  AvatarToken,
-  AvatarTokenSize,
-  IconColor,
-} from '@metamask/design-system-react-native';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import SensitiveText, {
-  SensitiveTextLength,
-} from '../../../../../component-library/components/Texts/SensitiveText';
-import {
-  TextVariant as CLTextVariant,
-  TextColor as CLTextColor,
-} from '../../../../../component-library/components/Texts/Text/Text.types';
-import { useSelector } from 'react-redux';
-import I18n, { strings } from '../../../../../../locales/i18n';
-import { getIntlNumberFormatter } from '../../../../../util/intl';
-import {
-  MUSD_CONVERSION_APY,
-  MUSD_TOKEN,
-} from '../../../../UI/Earn/constants/musd';
-import { useMusdBalance } from '../../../../UI/Earn/hooks/useMusdBalance';
-import { selectPrivacyMode } from '../../../../../selectors/preferencesController';
-import { useCashNavigation } from './useCashNavigation';
-import { useMerklBonusClaim } from '../../../../UI/Earn/components/MerklRewards/hooks/useMerklBonusClaim';
-import { MUSD_EVENTS_CONSTANTS } from '../../../../UI/Earn/constants/events';
-import { LINEA_MUSD_ASSET_FOR_MERKL } from './CashGetMusdEmptyState.constants';
-import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
-import { MetaMetricsEvents } from '../../../../../core/Analytics';
-
-const MusdAggregatedRow = () => {
-  const tw = useTailwind();
-  const privacyMode = useSelector(selectPrivacyMode);
-  const { tokenBalanceAggregated, fiatBalanceAggregatedFormatted } =
-    useMusdBalance();
-  const { claimableReward, hasPendingClaim, isClaiming, claimRewards } =
-    useMerklBonusClaim(
-      LINEA_MUSD_ASSET_FOR_MERKL,
-      MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.HOME_CASH_SECTION,
-    );
-  const hasClaimableBonus = !!claimableReward && !hasPendingClaim;
-  const { trackEvent, createEventBuilder } = useAnalytics();
-
-  const handleClaimBonus = useCallback(() => {
-    trackEvent(
-      createEventBuilder(MetaMetricsEvents.MUSD_CLAIM_BONUS_BUTTON_CLICKED)
-        .addProperties({
-          location: MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.HOME_CASH_SECTION,
-          action_type: 'claim_bonus',
-          network_chain_id: LINEA_MUSD_ASSET_FOR_MERKL.chainId,
-          asset_symbol: LINEA_MUSD_ASSET_FOR_MERKL.symbol,
-        })
-        .build(),
-    );
-    claimRewards();
-  }, [trackEvent, createEventBuilder, claimRewards]);
-
-  const { navigateToCash: handleTokenRowPress } = useCashNavigation();
-
-  const tokenBalanceDisplay = `${getIntlNumberFormatter(I18n.locale, {
-    minimumFractionDigits: 0,
-    maximumFractionDigits: 2,
-  }).format(Number(tokenBalanceAggregated))} ${MUSD_TOKEN.symbol}`;
-
-  return (
-    <Pressable
-      style={({ pressed }) =>
-        tw.style('flex-row items-center py-1', pressed && 'opacity-80')
-      }
-      testID="cash-section-musd-row"
-      onPress={handleTokenRowPress}
-    >
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Center}
-        twClassName="flex-1"
-      >
-        <AvatarToken
-          name={MUSD_TOKEN.symbol}
-          src={MUSD_TOKEN.imageSource as number}
-          size={AvatarTokenSize.Lg}
-        />
-        <Box twClassName="flex-1 ml-5">
-          <Box
-            flexDirection={BoxFlexDirection.Row}
-            justifyContent={BoxJustifyContent.Between}
-            twClassName="gap-2.5"
-          >
-            <Text
-              variant={TextVariant.BodyMd}
-              fontWeight={FontWeight.Medium}
-              color={TextColor.TextDefault}
-            >
-              {MUSD_TOKEN.name}
-            </Text>
-            <SensitiveText
-              variant={CLTextVariant.BodyMDMedium}
-              isHidden={privacyMode}
-              length={SensitiveTextLength.Medium}
-            >
-              {fiatBalanceAggregatedFormatted}
-            </SensitiveText>
-          </Box>
-          <Box
-            flexDirection={BoxFlexDirection.Row}
-            justifyContent={BoxJustifyContent.Between}
-            twClassName="gap-2.5"
-          >
-            <SensitiveText
-              variant={CLTextVariant.BodySMMedium}
-              color={CLTextColor.Alternative}
-              isHidden={privacyMode}
-              length={SensitiveTextLength.Short}
-              numberOfLines={1}
-            >
-              {tokenBalanceDisplay}
-            </SensitiveText>
-            {isClaiming ? (
-              <Spinner color={IconColor.PrimaryDefault} />
-            ) : (
-              <TouchableOpacity
-                disabled={!hasClaimableBonus}
-                onPress={handleClaimBonus}
-              >
-                <Text
-                  variant={TextVariant.BodySm}
-                  fontWeight={FontWeight.Medium}
-                  color={
-                    hasClaimableBonus
-                      ? TextColor.PrimaryDefault
-                      : TextColor.SuccessDefault
-                  }
-                >
-                  {hasClaimableBonus
-                    ? strings('earn.musd_conversion.claim_percentage_bonus', {
-                        percentage: MUSD_CONVERSION_APY,
-                      })
-                    : strings('earn.musd_conversion.percentage_bonus', {
-                        percentage: MUSD_CONVERSION_APY,
-                      })}
-                </Text>
-              </TouchableOpacity>
-            )}
-          </Box>
-        </Box>
-      </Box>
-    </Pressable>
-  );
-};
-
-export default MusdAggregatedRow;
diff --git a/app/components/Views/Homepage/Sections/Cash/index.ts b/app/components/Views/Homepage/Sections/Cash/index.ts
deleted file mode 100644
index f7869d99bdf7..000000000000
--- a/app/components/Views/Homepage/Sections/Cash/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as MusdAggregatedRow } from './MusdAggregatedRow';
diff --git a/app/components/Views/Homepage/Sections/DeFi/DeFiSection.shared.tsx b/app/components/Views/Homepage/Sections/DeFi/DeFiSection.shared.tsx
new file mode 100644
index 000000000000..ad64476daa13
--- /dev/null
+++ b/app/components/Views/Homepage/Sections/DeFi/DeFiSection.shared.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import { View } from 'react-native';
+import SkeletonPlaceholder from 'react-native-skeleton-placeholder';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { useTheme } from '../../../../../util/theme';
+
+/** Maximum number of DeFi positions shown in the homepage section. */
+export const MAX_POSITIONS_DISPLAYED = 5;
+
+export interface DeFiSectionProps {
+  sectionIndex: number;
+  totalSectionsLoaded: number;
+}
+
+/**
+ * Skeleton placeholder for loading / idle state - matches DeFi list item layout.
+ */
+export const DeFiPositionsSkeleton = ({ rows = 1 }: { rows?: number }) => {
+  const { colors } = useTheme();
+  const tw = useTailwind();
+
+  return (
+    <SkeletonPlaceholder
+      backgroundColor={colors.background.section}
+      highlightColor={colors.background.subsection}
+    >
+      <View style={tw.style('gap-4')}>
+        {Array.from({ length: rows }, (_, index) => (
+          <View
+            key={index}
+            style={tw.style('flex-row items-center gap-5 py-2')}
+          >
+            <View style={tw.style('w-10 h-10 rounded-full')} />
+            <View style={tw.style('flex-1 gap-1')}>
+              <View style={tw.style('w-32 h-5 rounded')} />
+              <View style={tw.style('w-24 h-4 rounded')} />
+            </View>
+            <View style={tw.style('items-end gap-1')}>
+              <View style={tw.style('w-16 h-5 rounded')} />
+              <View style={tw.style('w-12 h-4 rounded')} />
+            </View>
+          </View>
+        ))}
+      </View>
+    </SkeletonPlaceholder>
+  );
+};
diff --git a/app/components/Views/Homepage/Sections/DeFi/DeFiSection.test.tsx b/app/components/Views/Homepage/Sections/DeFi/DeFiSection.test.tsx
index 838588dda5b0..e7ca8047a94d 100644
--- a/app/components/Views/Homepage/Sections/DeFi/DeFiSection.test.tsx
+++ b/app/components/Views/Homepage/Sections/DeFi/DeFiSection.test.tsx
@@ -7,6 +7,7 @@ import Routes from '../../../../../constants/navigation/Routes';
 
 const mockNavigate = jest.fn();
 const mockExecutePoll = jest.fn().mockResolvedValue(undefined);
+const mockFetchDeFiPositions = jest.fn().mockResolvedValue(undefined);
 
 jest.mock('@react-navigation/native', () => {
   const ReactActual = jest.requireActual<typeof import('react')>('react');
@@ -31,6 +32,10 @@ jest.mock('../../../../../core/Engine', () => ({
     DeFiPositionsController: {
       _executePoll: (...args: unknown[]) => mockExecutePoll(...args),
     },
+    DeFiPositionsControllerV2: {
+      fetchDeFiPositions: (...args: unknown[]) =>
+        mockFetchDeFiPositions(...args),
+    },
   },
 }));
 
@@ -38,10 +43,20 @@ jest.mock('../../../../../selectors/deFiPositionsSectionEnabled', () => ({
   selectDeFiPositionsSectionEnabled: jest.fn(() => true),
 }));
 
+jest.mock('../../../../../selectors/deFiPositionsV2SectionEnabled', () => ({
+  selectDeFiPositionsV2SectionEnabled: jest.fn(() => false),
+}));
+
 jest.mock('../../../../../selectors/preferencesController', () => ({
   selectPrivacyMode: jest.fn(() => false),
 }));
 
+const mockSelectEnabledNetworks = jest.fn();
+jest.mock('../../../../../selectors/networkEnablementController', () => ({
+  ...jest.requireActual('../../../../../selectors/networkEnablementController'),
+  selectEnabledNetworksByNamespace: () => mockSelectEnabledNetworks(),
+}));
+
 jest.mock('../../hooks/useHomeViewedEvent', () => ({
   __esModule: true,
   default: jest.fn(() => ({ onLayout: jest.fn() })),
@@ -54,15 +69,21 @@ jest.mock('../../hooks/useHomeViewedEvent', () => ({
   },
 }));
 
+jest.mock('../../hooks/useSectionViewportVisible', () => ({
+  __esModule: true,
+  default: jest.fn(() => ({ isVisible: false, onLayout: jest.fn() })),
+}));
+
 const mockUseDeFiPositionsForHomepage = jest.fn();
+const mockUseDeFiPositionsV2 = jest.fn();
 
 jest.mock('./hooks', () => ({
   useDeFiPositionsForHomepage: (...args: unknown[]) =>
     mockUseDeFiPositionsForHomepage(...args),
+  useDeFiPositionsV2: (...args: unknown[]) => mockUseDeFiPositionsV2(...args),
   DeFiPositionEntry: {},
 }));
 
-// Mock DeFiPositionsListItem to avoid deep import chain issues
 jest.mock('../../../../UI/DeFiPositions/DeFiPositionsListItem', () => {
   const { Text } = jest.requireActual('react-native');
   const ReactActual = jest.requireActual('react');
@@ -80,6 +101,21 @@ jest.mock('../../../../UI/DeFiPositions/DeFiPositionsListItem', () => {
   return MockComponent;
 });
 
+jest.mock(
+  '../../../../UI/Assets/DeFiPositions/components/DeFiPositionsListItemV2',
+  () => {
+    const { Text } = jest.requireActual('react-native');
+    const ReactActual = jest.requireActual('react');
+    const MockComponent = ({
+      position,
+    }: {
+      position: { protocolId: string };
+    }) => ReactActual.createElement(Text, null, position.protocolId);
+    MockComponent.displayName = 'DeFiPositionsListItemV2';
+    return MockComponent;
+  },
+);
+
 const createMockPosition = (name: string) => ({
   chainId: '0x1',
   protocolId: name.toLowerCase(),
@@ -93,13 +129,30 @@ const createMockPosition = (name: string) => ({
   },
 });
 
+const createMockV2Position = (
+  protocolId: string,
+  overrides: { chainId?: string; marketValue?: number } = {},
+) => ({
+  protocolId,
+  productName: protocolId,
+  protocolIconUrl: `https://example.com/${protocolId}.png`,
+  chainId: overrides.chainId ?? 'eip155:1',
+  marketValue: overrides.marketValue ?? 1000,
+  iconGroup: [],
+  sections: [],
+});
+
 describe('DeFiSection', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    // Reset mock return values to defaults
     jest
       .requireMock('../../../../../selectors/deFiPositionsSectionEnabled')
       .selectDeFiPositionsSectionEnabled.mockReturnValue(true);
+    jest
+      .requireMock('../../../../../selectors/deFiPositionsV2SectionEnabled')
+      .selectDeFiPositionsV2SectionEnabled.mockReturnValue(false);
+
+    mockSelectEnabledNetworks.mockReturnValue({ eip155: { '0x1': true } });
 
     mockUseDeFiPositionsForHomepage.mockReturnValue({
       positions: [],
@@ -107,156 +160,352 @@ describe('DeFiSection', () => {
       hasError: false,
       isEmpty: true,
     });
-  });
 
-  it('renders section title when enabled with positions', () => {
-    mockUseDeFiPositionsForHomepage.mockReturnValue({
-      positions: [createMockPosition('Aave')],
+    mockUseDeFiPositionsV2.mockReturnValue({
+      positions: [],
       isLoading: false,
-      hasError: false,
-      isEmpty: false,
+      isError: false,
+      hasFetched: false,
+      refresh: jest.fn().mockResolvedValue(undefined),
     });
 
-    renderWithProvider(
-      <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
-    );
-
-    expect(screen.getByText('DeFi')).toBeOnTheScreen();
+    jest
+      .requireMock('../../hooks/useSectionViewportVisible')
+      .default.mockReturnValue({ isVisible: false, onLayout: jest.fn() });
   });
 
-  it('returns null when DeFi is disabled', () => {
-    jest
-      .requireMock('../../../../../selectors/deFiPositionsSectionEnabled')
-      .selectDeFiPositionsSectionEnabled.mockReturnValue(false);
+  describe('V1 path', () => {
+    it('renders section title when enabled with positions', () => {
+      mockUseDeFiPositionsForHomepage.mockReturnValue({
+        positions: [createMockPosition('Aave')],
+        isLoading: false,
+        hasError: false,
+        isEmpty: false,
+      });
 
-    const { toJSON } = renderWithProvider(
-      <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
-    );
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
 
-    expect(toJSON()).toBeNull();
-  });
+      expect(screen.getByText('DeFi')).toBeOnTheScreen();
+    });
 
-  it('returns null when positions are empty and not loading', () => {
-    mockUseDeFiPositionsForHomepage.mockReturnValue({
-      positions: [],
-      isLoading: false,
-      hasError: false,
-      isEmpty: true,
+    it('returns null when DeFi is disabled', () => {
+      jest
+        .requireMock('../../../../../selectors/deFiPositionsSectionEnabled')
+        .selectDeFiPositionsSectionEnabled.mockReturnValue(false);
+
+      const { toJSON } = renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(toJSON()).toBeNull();
     });
 
-    const { toJSON } = renderWithProvider(
-      <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
-    );
+    it('returns null when positions are empty and not loading', () => {
+      mockUseDeFiPositionsForHomepage.mockReturnValue({
+        positions: [],
+        isLoading: false,
+        hasError: false,
+        isEmpty: true,
+      });
 
-    expect(toJSON()).toBeNull();
-  });
+      const { toJSON } = renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
 
-  it('renders error state with retry when there is an error and not loading', () => {
-    mockUseDeFiPositionsForHomepage.mockReturnValue({
-      positions: [],
-      isLoading: false,
-      hasError: true,
-      isEmpty: false,
+      expect(toJSON()).toBeNull();
     });
 
-    renderWithProvider(
-      <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
-    );
+    it('renders error state with retry when there is an error and not loading', () => {
+      mockUseDeFiPositionsForHomepage.mockReturnValue({
+        positions: [],
+        isLoading: false,
+        hasError: true,
+        isEmpty: false,
+      });
+
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(screen.getByText('DeFi')).toBeOnTheScreen();
+      expect(screen.getByText(/unable to load/i)).toBeOnTheScreen();
+      expect(screen.getByText(/retry/i)).toBeOnTheScreen();
+    });
 
-    expect(screen.getByText('DeFi')).toBeOnTheScreen();
-    expect(screen.getByText(/unable to load/i)).toBeOnTheScreen();
-    expect(screen.getByText(/retry/i)).toBeOnTheScreen();
-  });
+    it('calls _executePoll on retry button press', async () => {
+      mockUseDeFiPositionsForHomepage.mockReturnValue({
+        positions: [],
+        isLoading: false,
+        hasError: true,
+        isEmpty: false,
+      });
 
-  it('calls _executePoll on retry button press', async () => {
-    mockUseDeFiPositionsForHomepage.mockReturnValue({
-      positions: [],
-      isLoading: false,
-      hasError: true,
-      isEmpty: false,
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      await act(async () => {
+        fireEvent.press(screen.getByText(/retry/i));
+      });
+
+      expect(mockExecutePoll).toHaveBeenCalled();
     });
 
-    renderWithProvider(
-      <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
-    );
+    it('renders skeleton when loading', () => {
+      mockUseDeFiPositionsForHomepage.mockReturnValue({
+        positions: [],
+        isLoading: true,
+        hasError: false,
+        isEmpty: false,
+      });
 
-    await act(async () => {
-      fireEvent.press(screen.getByText(/retry/i));
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(screen.getByText('DeFi')).toBeOnTheScreen();
     });
 
-    expect(mockExecutePoll).toHaveBeenCalled();
-  });
+    it('renders DeFi positions list items', () => {
+      mockUseDeFiPositionsForHomepage.mockReturnValue({
+        positions: [createMockPosition('Aave'), createMockPosition('Uniswap')],
+        isLoading: false,
+        hasError: false,
+        isEmpty: false,
+      });
 
-  it('renders skeleton when loading', () => {
-    mockUseDeFiPositionsForHomepage.mockReturnValue({
-      positions: [],
-      isLoading: true,
-      hasError: false,
-      isEmpty: false,
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(screen.getByText('Aave')).toBeOnTheScreen();
+      expect(screen.getByText('Uniswap')).toBeOnTheScreen();
     });
 
-    renderWithProvider(
-      <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
-    );
+    it('navigates to DeFi full view when title is pressed', () => {
+      mockUseDeFiPositionsForHomepage.mockReturnValue({
+        positions: [createMockPosition('Aave')],
+        isLoading: false,
+        hasError: false,
+        isEmpty: false,
+      });
 
-    expect(screen.getByText('DeFi')).toBeOnTheScreen();
-    // Skeleton renders 3 placeholder items
-  });
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
 
-  it('renders DeFi positions list items', () => {
-    mockUseDeFiPositionsForHomepage.mockReturnValue({
-      positions: [createMockPosition('Aave'), createMockPosition('Uniswap')],
-      isLoading: false,
-      hasError: false,
-      isEmpty: false,
+      fireEvent.press(screen.getByText('DeFi'));
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.DEFI_FULL_VIEW);
     });
 
-    renderWithProvider(
-      <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
-    );
+    it('exposes refresh function via ref', async () => {
+      mockUseDeFiPositionsForHomepage.mockReturnValue({
+        positions: [createMockPosition('Aave')],
+        isLoading: false,
+        hasError: false,
+        isEmpty: false,
+      });
 
-    expect(screen.getByText('Aave')).toBeOnTheScreen();
-    expect(screen.getByText('Uniswap')).toBeOnTheScreen();
-  });
+      const ref = createRef<SectionRefreshHandle>();
 
-  it('navigates to DeFi full view when title is pressed', () => {
-    mockUseDeFiPositionsForHomepage.mockReturnValue({
-      positions: [createMockPosition('Aave')],
-      isLoading: false,
-      hasError: false,
-      isEmpty: false,
+      renderWithProvider(
+        <DeFiSection ref={ref} sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(ref.current).not.toBeNull();
+      expect(typeof ref.current?.refresh).toBe('function');
+
+      await act(async () => {
+        await ref.current?.refresh();
+      });
+
+      expect(mockExecutePoll).toHaveBeenCalled();
     });
 
-    renderWithProvider(
-      <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
-    );
+    it('calls _executePoll on focus when V1 is enabled', () => {
+      mockUseDeFiPositionsForHomepage.mockReturnValue({
+        positions: [createMockPosition('Aave')],
+        isLoading: false,
+        hasError: false,
+        isEmpty: false,
+      });
 
-    fireEvent.press(screen.getByText('DeFi'));
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
 
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.DEFI_FULL_VIEW);
+      expect(mockExecutePoll).toHaveBeenCalled();
+    });
   });
 
-  it('exposes refresh function via ref', async () => {
-    mockUseDeFiPositionsForHomepage.mockReturnValue({
-      positions: [createMockPosition('Aave')],
-      isLoading: false,
-      hasError: false,
-      isEmpty: false,
+  describe('V2 path', () => {
+    beforeEach(() => {
+      jest
+        .requireMock('../../../../../selectors/deFiPositionsV2SectionEnabled')
+        .selectDeFiPositionsV2SectionEnabled.mockReturnValue(true);
+      jest
+        .requireMock('../../../../../selectors/deFiPositionsSectionEnabled')
+        .selectDeFiPositionsSectionEnabled.mockReturnValue(false);
     });
 
-    const ref = createRef<SectionRefreshHandle>();
+    it('renders a measurable placeholder while idle (not yet fetched)', () => {
+      mockUseDeFiPositionsV2.mockReturnValue({
+        positions: [],
+        isLoading: false,
+        isError: false,
+        hasFetched: false,
+        refresh: jest.fn().mockResolvedValue(undefined),
+      });
 
-    renderWithProvider(
-      <DeFiSection ref={ref} sectionIndex={0} totalSectionsLoaded={1} />,
-    );
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(screen.getByText('DeFi')).toBeOnTheScreen();
+    });
+
+    it('collapses to null only after a completed empty fetch', () => {
+      mockUseDeFiPositionsV2.mockReturnValue({
+        positions: [],
+        isLoading: false,
+        isError: false,
+        hasFetched: true,
+        refresh: jest.fn().mockResolvedValue(undefined),
+      });
 
-    expect(ref.current).not.toBeNull();
-    expect(typeof ref.current?.refresh).toBe('function');
+      const { toJSON } = renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(toJSON()).toBeNull();
+    });
+
+    it('renders V2 positions when loaded', () => {
+      mockUseDeFiPositionsV2.mockReturnValue({
+        positions: [
+          createMockV2Position('aave'),
+          createMockV2Position('uniswap'),
+        ],
+        isLoading: false,
+        isError: false,
+        hasFetched: true,
+        refresh: jest.fn().mockResolvedValue(undefined),
+      });
+
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(screen.getByText('aave')).toBeOnTheScreen();
+      expect(screen.getByText('uniswap')).toBeOnTheScreen();
+    });
+
+    it('filters out V2 positions on disabled EVM networks', () => {
+      mockSelectEnabledNetworks.mockReturnValue({ eip155: { '0x1': true } });
+      mockUseDeFiPositionsV2.mockReturnValue({
+        positions: [
+          createMockV2Position('aave'),
+          createMockV2Position('avalanche-lending', {
+            chainId: 'eip155:43114',
+          }),
+        ],
+        isLoading: false,
+        isError: false,
+        hasFetched: true,
+        refresh: jest.fn().mockResolvedValue(undefined),
+      });
+
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(screen.getByText('aave')).toBeOnTheScreen();
+      expect(screen.queryByText('avalanche-lending')).toBeNull();
+    });
 
-    await act(async () => {
-      await ref.current?.refresh();
+    it('collapses when all V2 positions are on disabled networks', () => {
+      mockSelectEnabledNetworks.mockReturnValue({ eip155: { '0x1': true } });
+      mockUseDeFiPositionsV2.mockReturnValue({
+        positions: [
+          createMockV2Position('avalanche-only', { chainId: 'eip155:43114' }),
+        ],
+        isLoading: false,
+        isError: false,
+        hasFetched: true,
+        refresh: jest.fn().mockResolvedValue(undefined),
+      });
+
+      const { toJSON } = renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(toJSON()).toBeNull();
     });
 
-    expect(mockExecutePoll).toHaveBeenCalled();
+    it('does not call V1 _executePoll on focus when V2 is enabled', () => {
+      mockUseDeFiPositionsV2.mockReturnValue({
+        positions: [createMockV2Position('aave')],
+        isLoading: false,
+        isError: false,
+        hasFetched: true,
+        refresh: jest.fn().mockResolvedValue(undefined),
+      });
+
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(mockExecutePoll).not.toHaveBeenCalled();
+    });
+
+    it('passes isVisible into useDeFiPositionsV2 when section is visible', () => {
+      jest
+        .requireMock('../../hooks/useSectionViewportVisible')
+        .default.mockReturnValue({ isVisible: true, onLayout: jest.fn() });
+
+      mockUseDeFiPositionsV2.mockReturnValue({
+        positions: [],
+        isLoading: false,
+        isError: false,
+        hasFetched: false,
+        refresh: jest.fn().mockResolvedValue(undefined),
+      });
+
+      renderWithProvider(
+        <DeFiSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      expect(mockUseDeFiPositionsV2).toHaveBeenCalledWith({
+        enabled: true,
+        isVisible: true,
+      });
+    });
+
+    it('refresh via ref calls V2 refresh', async () => {
+      const mockRefresh = jest.fn().mockResolvedValue(undefined);
+      mockUseDeFiPositionsV2.mockReturnValue({
+        positions: [createMockV2Position('aave')],
+        isLoading: false,
+        isError: false,
+        hasFetched: true,
+        refresh: mockRefresh,
+      });
+
+      const ref = createRef<SectionRefreshHandle>();
+
+      renderWithProvider(
+        <DeFiSection ref={ref} sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      await act(async () => {
+        await ref.current?.refresh();
+      });
+
+      expect(mockRefresh).toHaveBeenCalled();
+      expect(mockExecutePoll).not.toHaveBeenCalled();
+    });
   });
 });
diff --git a/app/components/Views/Homepage/Sections/DeFi/DeFiSection.tsx b/app/components/Views/Homepage/Sections/DeFi/DeFiSection.tsx
index a3149a921082..5fe3656e1671 100644
--- a/app/components/Views/Homepage/Sections/DeFi/DeFiSection.tsx
+++ b/app/components/Views/Homepage/Sections/DeFi/DeFiSection.tsx
@@ -8,12 +8,8 @@ import { View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
 import { useSelector } from 'react-redux';
-import SkeletonPlaceholder from 'react-native-skeleton-placeholder';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import { useTheme } from '../../../../../util/theme';
 import {
   SectionDivider,
-  Box,
   SectionHeader,
 } from '@metamask/design-system-react-native';
 import SectionRow from '../../components/SectionRow';
@@ -23,6 +19,7 @@ import { useDeFiPositionsForHomepage, DeFiPositionEntry } from './hooks';
 import { selectPrivacyMode } from '../../../../../selectors/preferencesController';
 import DeFiPositionsListItem from '../../../../UI/DeFiPositions/DeFiPositionsListItem';
 import { selectDeFiPositionsSectionEnabled } from '../../../../../selectors/deFiPositionsSectionEnabled';
+import { selectDeFiPositionsV2SectionEnabled } from '../../../../../selectors/deFiPositionsV2SectionEnabled';
 import { strings } from '../../../../../../locales/i18n';
 import Routes from '../../../../../constants/navigation/Routes';
 import Engine from '../../../../../core/Engine';
@@ -33,55 +30,20 @@ import { useThrottledFocusEffect } from '../../../../hooks/useThrottledFocusEffe
 import { useSectionPerformance } from '../../hooks/useSectionPerformance';
 // eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): route-isolation backlog
 import { WalletViewSelectorsIDs } from '../../../Wallet/WalletView.testIds';
-
-const MAX_POSITIONS_DISPLAYED = 5;
-
-interface DeFiSectionProps {
-  sectionIndex: number;
-  totalSectionsLoaded: number;
-}
-
-/**
- * Skeleton placeholder for loading state - matches DeFi list item layout
- */
-const DeFiPositionsSkeleton = () => {
-  const { colors } = useTheme();
-  const tw = useTailwind();
-
-  return (
-    <SkeletonPlaceholder
-      backgroundColor={colors.background.section}
-      highlightColor={colors.background.subsection}
-    >
-      <View style={tw.style('gap-4')}>
-        {Array.from({ length: 3 }, (_, index) => (
-          <View
-            key={index}
-            style={tw.style('flex-row items-center gap-5 py-2')}
-          >
-            <View style={tw.style('w-10 h-10 rounded-full')} />
-            <View style={tw.style('flex-1 gap-1')}>
-              <View style={tw.style('w-32 h-5 rounded')} />
-              <View style={tw.style('w-24 h-4 rounded')} />
-            </View>
-            <View style={tw.style('items-end gap-1')}>
-              <View style={tw.style('w-16 h-5 rounded')} />
-              <View style={tw.style('w-12 h-4 rounded')} />
-            </View>
-          </View>
-        ))}
-      </View>
-    </SkeletonPlaceholder>
-  );
-};
+import {
+  DeFiPositionsSkeleton,
+  DeFiSectionProps,
+  MAX_POSITIONS_DISPLAYED,
+} from './DeFiSection.shared';
+import DeFiSectionV2 from './DeFiSectionV2';
 
 /**
- * DeFiSection - Displays user's DeFi positions on the homepage.
+ * DeFiSectionV1 - Displays user's DeFi positions on the homepage.
  *
  * Only renders if the user has DeFi positions.
  * Uses Redux state from DeFiPositionsController.
  */
-const DeFiSection = forwardRef<SectionRefreshHandle, DeFiSectionProps>(
+const DeFiSectionV1 = forwardRef<SectionRefreshHandle, DeFiSectionProps>(
   ({ sectionIndex, totalSectionsLoaded }, ref) => {
     const sectionViewRef = useRef<View>(null);
     const navigation = useNavigation<AppNavigationProp>();
@@ -200,4 +162,23 @@ const DeFiSection = forwardRef<SectionRefreshHandle, DeFiSectionProps>(
   },
 );
 
+/**
+ * DeFiSection - homepage DeFi positions section.
+ *
+ * Feature-flag switch: renders the V2 implementation when the V2 flag is on,
+ * otherwise the (unchanged) V1 implementation. V1 keeps its own
+ * enablement/empty gating, so it returns null when neither flag is active.
+ */
+const DeFiSection = forwardRef<SectionRefreshHandle, DeFiSectionProps>(
+  (props, ref) => {
+    const isV2Enabled = useSelector(selectDeFiPositionsV2SectionEnabled);
+
+    return isV2Enabled ? (
+      <DeFiSectionV2 ref={ref} {...props} />
+    ) : (
+      <DeFiSectionV1 ref={ref} {...props} />
+    );
+  },
+);
+
 export default DeFiSection;
diff --git a/app/components/Views/Homepage/Sections/DeFi/DeFiSectionV2.tsx b/app/components/Views/Homepage/Sections/DeFi/DeFiSectionV2.tsx
new file mode 100644
index 000000000000..282899e3b695
--- /dev/null
+++ b/app/components/Views/Homepage/Sections/DeFi/DeFiSectionV2.tsx
@@ -0,0 +1,168 @@
+import React, {
+  forwardRef,
+  useCallback,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+} from 'react';
+import { View } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import {
+  SectionDivider,
+  SectionHeader,
+} from '@metamask/design-system-react-native';
+import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
+import SectionRow from '../../components/SectionRow';
+import ErrorState from '../../components/ErrorState';
+import { SectionRefreshHandle } from '../../types';
+import { useDeFiPositionsV2 } from './hooks';
+import { selectPrivacyMode } from '../../../../../selectors/preferencesController';
+import { selectEnabledNetworksByNamespace } from '../../../../../selectors/networkEnablementController';
+import DeFiPositionsListItemV2 from '../../../../UI/Assets/DeFiPositions/components/DeFiPositionsListItemV2';
+import { filterDeFiPositionsByEnabledNetworks } from '../../../../UI/Assets/DeFiPositions/utils/filter-defi-positions-by-enabled-networks';
+import { strings } from '../../../../../../locales/i18n';
+import Routes from '../../../../../constants/navigation/Routes';
+import useHomeViewedEvent, {
+  HomeSectionNames,
+} from '../../hooks/useHomeViewedEvent';
+import useSectionViewportVisible from '../../hooks/useSectionViewportVisible';
+import { useSectionPerformance } from '../../hooks/useSectionPerformance';
+// eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): route-isolation backlog
+import { WalletViewSelectorsIDs } from '../../../Wallet/WalletView.testIds';
+import {
+  DeFiPositionsSkeleton,
+  DeFiSectionProps,
+  MAX_POSITIONS_DISPLAYED,
+} from './DeFiSection.shared';
+
+/**
+ * DeFiSectionV2 - DeFi positions homepage section backed by the on-demand V2
+ * controller.
+ *
+ * Always mounted while enabled (measurable placeholder while idle); fetches
+ * only when scrolled into the viewport; collapses after a confirmed empty
+ * fetch. Rendered by {@link DeFiSection} when the V2 flag is enabled.
+ */
+const DeFiSectionV2 = forwardRef<SectionRefreshHandle, DeFiSectionProps>(
+  ({ sectionIndex, totalSectionsLoaded }, ref) => {
+    const sectionViewRef = useRef<View>(null);
+    const navigation = useNavigation<AppNavigationProp>();
+    const privacyMode = useSelector(selectPrivacyMode);
+    const enabledNetworksByNamespace = useSelector(
+      selectEnabledNetworksByNamespace,
+    );
+    const title = strings('homepage.sections.defi');
+
+    const { isVisible, onLayout: visibilityOnLayout } =
+      useSectionViewportVisible(sectionViewRef, { isLoading: false });
+
+    const { positions, isLoading, isError, hasFetched, refresh } =
+      useDeFiPositionsV2({ enabled: true, isVisible });
+
+    const displayedPositions = useMemo(() => {
+      const filtered = filterDeFiPositionsByEnabledNetworks(
+        positions,
+        enabledNetworksByNamespace,
+      );
+
+      return [...filtered]
+        .sort((a, b) => b.marketValue - a.marketValue)
+        .slice(0, MAX_POSITIONS_DISPLAYED);
+    }, [positions, enabledNetworksByNamespace]);
+
+    const handleViewAllDeFi = useCallback(() => {
+      navigation.navigate(Routes.WALLET.DEFI_FULL_VIEW);
+    }, [navigation]);
+
+    useImperativeHandle(ref, () => ({ refresh }), [refresh]);
+
+    const isEmpty =
+      hasFetched && !isLoading && !isError && displayedPositions.length === 0;
+
+    // Stays mounted while enabled until a completed fetch confirms empty.
+    const sectionMountsVisibleRoot = !isEmpty;
+
+    const { onLayout: homeViewedOnLayout } = useHomeViewedEvent({
+      sectionRef: sectionMountsVisibleRoot ? sectionViewRef : null,
+      isLoading,
+      sectionName: HomeSectionNames.DEFI,
+      sectionIndex,
+      totalSectionsLoaded,
+      isEmpty: isEmpty || isError,
+      itemCount: isEmpty ? 0 : displayedPositions.length,
+      fireImmediateWhenNoView: false,
+    });
+
+    const handleLayout = useCallback(() => {
+      homeViewedOnLayout();
+      visibilityOnLayout();
+    }, [homeViewedOnLayout, visibilityOnLayout]);
+
+    useSectionPerformance({
+      sectionId: HomeSectionNames.DEFI,
+      contentReady: !isLoading,
+      isEmpty: isEmpty && !isError,
+      contentStateForTrace: isError ? 'error' : undefined,
+      isLoading,
+      enabled: true,
+    });
+
+    // Collapse only after a completed empty fetch.
+    if (!isLoading && isEmpty) {
+      return null;
+    }
+
+    if (!isLoading && isError) {
+      return (
+        <View ref={sectionViewRef} onLayout={handleLayout}>
+          <SectionDivider />
+          <SectionHeader
+            title={title}
+            isInteractive
+            onPress={handleViewAllDeFi}
+            testID={WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('defi')}
+          />
+          <ErrorState
+            title={strings('homepage.error.unable_to_load', {
+              section: title.toLowerCase(),
+            })}
+            onRetry={refresh}
+          />
+        </View>
+      );
+    }
+
+    // V2 fetches only when scrolled into view, so before the first fetch we are
+    // idle (not loading). Keep a measurable skeleton so layout/viewport
+    // detection still works; collapse to null only after a confirmed empty fetch.
+    const showIdlePlaceholder = !hasFetched && !isLoading && !isError;
+
+    return (
+      <View ref={sectionViewRef} onLayout={handleLayout}>
+        <SectionDivider />
+        <SectionHeader
+          title={title}
+          isInteractive
+          onPress={handleViewAllDeFi}
+          testID={WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('defi')}
+        />
+        <SectionRow>
+          {isLoading || showIdlePlaceholder ? (
+            <DeFiPositionsSkeleton />
+          ) : (
+            displayedPositions.map((position) => (
+              <DeFiPositionsListItemV2
+                key={`${position.chainId}-${position.protocolId}`}
+                position={position}
+                privacyMode={privacyMode}
+              />
+            ))
+          )}
+        </SectionRow>
+      </View>
+    );
+  },
+);
+
+export default DeFiSectionV2;
diff --git a/app/components/Views/Homepage/Sections/DeFi/hooks/index.ts b/app/components/Views/Homepage/Sections/DeFi/hooks/index.ts
index c2a47e0a1bfe..c0a261fd68c6 100644
--- a/app/components/Views/Homepage/Sections/DeFi/hooks/index.ts
+++ b/app/components/Views/Homepage/Sections/DeFi/hooks/index.ts
@@ -1 +1,2 @@
 export * from './useDeFiPositionsForHomepage';
+export * from '../../../../../UI/Assets/DeFiPositions/hooks/useDeFiPositionsV2';
diff --git a/app/components/Views/Homepage/Sections/Predictions/hooks/useHomepagePredictWorldCupMarkets.test.ts b/app/components/Views/Homepage/Sections/Predictions/hooks/useHomepagePredictWorldCupMarkets.test.ts
index 0c3ac4ba141a..772417d8e12e 100644
--- a/app/components/Views/Homepage/Sections/Predictions/hooks/useHomepagePredictWorldCupMarkets.test.ts
+++ b/app/components/Views/Homepage/Sections/Predictions/hooks/useHomepagePredictWorldCupMarkets.test.ts
@@ -1,29 +1,32 @@
 import React from 'react';
 import { renderHook, waitFor } from '@testing-library/react-native';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { useSelector } from 'react-redux';
-import { DEFAULT_PREDICT_WORLD_CUP_FLAG } from '../../../../../UI/Predict/constants/flags';
-import { usePredictWorldCupMarkets } from '../../../../../UI/Predict/hooks/usePredictWorldCup';
-import { PREDICT_WORLD_CUP_TAB_KEYS } from '../../../../../UI/Predict/constants/worldCupTabs';
+import { usePredictMarketData } from '../../../../../UI/Predict/hooks/usePredictMarketData';
+import type { PredictMarket } from '../../../../../UI/Predict/types';
 import {
   useHomepagePredictLiveWorldCupMarkets,
   useHomepagePredictWorldCupEventCount,
   useHomepagePredictWorldCupMarkets,
 } from './useHomepagePredictWorldCupMarkets';
 
-jest.mock('react-redux', () => ({
-  useSelector: jest.fn(),
+jest.mock('../../../../../UI/Predict/hooks/usePredictMarketData', () => ({
+  usePredictMarketData: jest.fn(),
 }));
 
-jest.mock('../../../../../UI/Predict/hooks/usePredictWorldCup', () => ({
-  usePredictWorldCupMarkets: jest.fn(),
-}));
-
-const mockUseSelector = useSelector as jest.Mock;
-const mockUsePredictWorldCupMarkets = jest.mocked(usePredictWorldCupMarkets);
+const mockUsePredictMarketData = jest.mocked(usePredictMarketData);
 const mockFetch = jest.fn();
 global.fetch = mockFetch;
 
+const mockMarketDataResult = {
+  marketData: [{ id: 'market-1' }] as PredictMarket[],
+  isFetching: false,
+  isFetchingMore: false,
+  error: null,
+  hasMore: false,
+  refetch: jest.fn(),
+  fetchMore: jest.fn(),
+};
+
 const createWrapper = () => {
   const queryClient = new QueryClient({
     defaultOptions: { queries: { cacheTime: Infinity, retry: false } },
@@ -36,23 +39,10 @@ const createWrapper = () => {
 describe('useHomepagePredictWorldCupMarkets', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    mockUseSelector.mockReturnValue(DEFAULT_PREDICT_WORLD_CUP_FLAG);
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: [{ id: 'market-1' }] as never,
-      isFetching: false,
-      isFetchingMore: false,
-      error: null,
-      hasMore: false,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
+    mockUsePredictMarketData.mockReturnValue(mockMarketDataResult);
   });
 
-  it('fetches the homepage World Cup event count using the configured World Cup tag', async () => {
-    mockUseSelector.mockReturnValue({
-      ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-      tagSlug: 'remote-configured-world-cup-tag',
-    });
+  it('fetches the homepage World Cup event count', async () => {
     mockFetch.mockResolvedValue({
       ok: true,
       json: jest.fn().mockResolvedValue({
@@ -68,7 +58,7 @@ describe('useHomepagePredictWorldCupMarkets', () => {
     await waitFor(() => expect(result.current.eventCount).toBe(48));
 
     expect(mockFetch).toHaveBeenCalledWith(
-      'https://gamma-api.polymarket.com/events/pagination?tag_slug=remote-configured-world-cup-tag&limit=1&active=true&closed=false&archived=false',
+      'https://gamma-api.polymarket.com/events/pagination?tag_slug=fifa-world-cup&limit=1&active=true&closed=false&archived=false',
     );
   });
 
@@ -108,18 +98,7 @@ describe('useHomepagePredictWorldCupMarkets', () => {
     expect(result.current.eventCount).toBeUndefined();
   });
 
-  it('does not fall back to the loaded market count while the event count is loading', () => {
-    mockUsePredictWorldCupMarkets.mockReturnValue({
-      marketData: Array.from({ length: 19 }, (_, index) => ({
-        id: `market-${index}`,
-      })) as never,
-      isFetching: false,
-      isFetchingMore: false,
-      error: null,
-      hasMore: false,
-      refetch: jest.fn(),
-      fetchMore: jest.fn(),
-    });
+  it('keeps the event count empty while the request is loading', () => {
     mockFetch.mockReturnValue(new Promise(() => undefined));
 
     const { result } = renderHook(
@@ -139,37 +118,48 @@ describe('useHomepagePredictWorldCupMarkets', () => {
     expect(mockFetch).not.toHaveBeenCalled();
   });
 
-  it('keeps the market hook scoped to market data only', () => {
-    const { result } = renderHook(
-      () => useHomepagePredictWorldCupMarkets({ enabled: true }),
-      { wrapper: createWrapper() },
-    );
-
-    expect(result.current).not.toHaveProperty('eventCount');
-    expect(result.current).not.toHaveProperty('totalResults');
-  });
-
-  it('loads homepage World Cup markets from the all tab', () => {
+  it('loads homepage World Cup markets with homepage-owned query parameters', () => {
     renderHook(() => useHomepagePredictWorldCupMarkets({ enabled: true }), {
       wrapper: createWrapper(),
     });
 
-    expect(mockUsePredictWorldCupMarkets).toHaveBeenCalledWith({
-      tabKey: PREDICT_WORLD_CUP_TAB_KEYS.ALL,
-      config: DEFAULT_PREDICT_WORLD_CUP_FLAG,
+    expect(mockUsePredictMarketData).toHaveBeenCalledWith({
+      category: 'hot',
+      customQueryParams:
+        'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&order=volume24hr&ascending=false',
+      refine: expect.any(Function),
       enabled: true,
     });
   });
 
-  it('loads homepage live World Cup markets from the live tab', () => {
+  it('loads live World Cup markets with the live query parameter', () => {
     renderHook(() => useHomepagePredictLiveWorldCupMarkets({ enabled: true }), {
       wrapper: createWrapper(),
     });
 
-    expect(mockUsePredictWorldCupMarkets).toHaveBeenCalledWith({
-      tabKey: PREDICT_WORLD_CUP_TAB_KEYS.LIVE,
-      config: DEFAULT_PREDICT_WORLD_CUP_FLAG,
+    expect(mockUsePredictMarketData).toHaveBeenCalledWith({
+      category: 'hot',
+      customQueryParams:
+        'active=true&archived=false&closed=false&tag_slug=fifa-world-cup&tag_id=100639&live=true&order=startDate',
+      refine: expect.any(Function),
       enabled: true,
     });
   });
+
+  it('normalizes homepage World Cup markets to the sports category', () => {
+    renderHook(() => useHomepagePredictWorldCupMarkets({ enabled: true }), {
+      wrapper: createWrapper(),
+    });
+    const options = mockUsePredictMarketData.mock.calls[0][0];
+    const market = {
+      id: 'world-cup-market',
+      category: 'hot',
+    } as PredictMarket;
+
+    const result = options?.refine?.([market]);
+
+    expect(result?.[0]).toEqual(
+      expect.objectContaining({ id: 'world-cup-market', category: 'sports' }),
+    );
+  });
 });
diff --git a/app/components/Views/Homepage/Sections/Predictions/hooks/useHomepagePredictWorldCupMarkets.ts b/app/components/Views/Homepage/Sections/Predictions/hooks/useHomepagePredictWorldCupMarkets.ts
index 4c14ad847cae..fd82d08b52d1 100644
--- a/app/components/Views/Homepage/Sections/Predictions/hooks/useHomepagePredictWorldCupMarkets.ts
+++ b/app/components/Views/Homepage/Sections/Predictions/hooks/useHomepagePredictWorldCupMarkets.ts
@@ -1,9 +1,9 @@
-import { useSelector } from 'react-redux';
 import { useQuery } from '@tanstack/react-query';
-import { usePredictWorldCupMarkets } from '../../../../../UI/Predict/hooks/usePredictWorldCup';
-import type { UsePredictMarketDataResult } from '../../../../../UI/Predict/hooks/usePredictMarketData';
-import { PREDICT_WORLD_CUP_TAB_KEYS } from '../../../../../UI/Predict/constants/worldCupTabs';
-import { selectPredictWorldCupConfig } from '../../../../../UI/Predict/selectors/featureFlags';
+import {
+  usePredictMarketData,
+  type UsePredictMarketDataResult,
+} from '../../../../../UI/Predict/hooks/usePredictMarketData';
+import type { PredictMarket } from '../../../../../UI/Predict/types';
 import { getPolymarketEndpoints } from '../../../../../UI/Predict/providers/polymarket/utils';
 
 interface UseHomepagePredictWorldCupMarketsArgs {
@@ -18,6 +18,44 @@ interface UseHomepagePredictWorldCupEventCountResult {
 
 const HOMEPAGE_PREDICT_WORLD_CUP_EVENT_COUNT_LIMIT = 1;
 const HOMEPAGE_PREDICT_WORLD_CUP_EVENT_COUNT_STALE_TIME = 10_000;
+const HOMEPAGE_PREDICT_WORLD_CUP_TAG_SLUG = 'fifa-world-cup';
+const HOMEPAGE_PREDICT_WORLD_CUP_GAMES_TAG_ID = '100639';
+
+const buildHomepagePredictWorldCupMarketsQuery = ({
+  live = false,
+}: {
+  live?: boolean;
+} = {}): string => {
+  const queryParams = new URLSearchParams({
+    active: 'true',
+    archived: 'false',
+    closed: 'false',
+    tag_slug: HOMEPAGE_PREDICT_WORLD_CUP_TAG_SLUG,
+  });
+
+  if (live) {
+    queryParams.set('tag_id', HOMEPAGE_PREDICT_WORLD_CUP_GAMES_TAG_ID);
+    queryParams.set('live', 'true');
+    queryParams.set('order', 'startDate');
+  } else {
+    queryParams.set('order', 'volume24hr');
+    queryParams.set('ascending', 'false');
+  }
+
+  return queryParams.toString();
+};
+
+const normalizeHomepageWorldCupMarkets = (
+  markets: PredictMarket[],
+): PredictMarket[] =>
+  markets.map((market) =>
+    market.category === 'sports' ? market : { ...market, category: 'sports' },
+  );
+
+const HOMEPAGE_PREDICT_WORLD_CUP_MARKETS_QUERY =
+  buildHomepagePredictWorldCupMarketsQuery();
+const HOMEPAGE_PREDICT_LIVE_WORLD_CUP_MARKETS_QUERY =
+  buildHomepagePredictWorldCupMarketsQuery({ live: true });
 
 const homepagePredictWorldCupEventCountKeys = {
   all: (queryParams: string) =>
@@ -74,9 +112,8 @@ const fetchHomepagePredictWorldCupEventCount = async (
 export function useHomepagePredictWorldCupEventCount({
   enabled,
 }: UseHomepagePredictWorldCupMarketsArgs): UseHomepagePredictWorldCupEventCountResult {
-  const config = useSelector(selectPredictWorldCupConfig);
   const eventCountQueryParams = buildHomepagePredictWorldCupEventCountQuery(
-    config.tagSlug,
+    HOMEPAGE_PREDICT_WORLD_CUP_TAG_SLUG,
   );
   const eventCountQuery = useQuery({
     queryKey: homepagePredictWorldCupEventCountKeys.all(eventCountQueryParams),
@@ -97,33 +134,31 @@ export function useHomepagePredictWorldCupEventCount({
 }
 
 /**
- * Homepage discovery: loads World Cup markets using the same ALL-tab query path
- * as the dedicated World Cup screen.
+ * Homepage-owned World Cup discovery query. It deliberately uses the legacy
+ * exact-query path so the temporary dedicated Predict screen can be retired
+ * without changing this homepage surface.
  */
 export function useHomepagePredictWorldCupMarkets({
   enabled,
 }: UseHomepagePredictWorldCupMarketsArgs): UseHomepagePredictWorldCupMarketsResult {
-  const config = useSelector(selectPredictWorldCupConfig);
-
-  return usePredictWorldCupMarkets({
-    tabKey: PREDICT_WORLD_CUP_TAB_KEYS.ALL,
-    config,
+  return usePredictMarketData({
+    category: 'hot',
+    customQueryParams: HOMEPAGE_PREDICT_WORLD_CUP_MARKETS_QUERY,
+    refine: normalizeHomepageWorldCupMarkets,
     enabled,
   });
 }
 
 /**
- * Homepage discovery: loads live World Cup games using the same LIVE-tab query
- * path as the dedicated World Cup screen.
+ * Homepage-owned live World Cup discovery query.
  */
 export function useHomepagePredictLiveWorldCupMarkets({
   enabled,
 }: UseHomepagePredictWorldCupMarketsArgs): UseHomepagePredictWorldCupMarketsResult {
-  const config = useSelector(selectPredictWorldCupConfig);
-
-  return usePredictWorldCupMarkets({
-    tabKey: PREDICT_WORLD_CUP_TAB_KEYS.LIVE,
-    config,
+  return usePredictMarketData({
+    category: 'hot',
+    customQueryParams: HOMEPAGE_PREDICT_LIVE_WORLD_CUP_MARKETS_QUERY,
+    refine: normalizeHomepageWorldCupMarkets,
     enabled,
   });
 }
diff --git a/app/components/Views/Homepage/Sections/Predictions/utils/marketResolvers.test.ts b/app/components/Views/Homepage/Sections/Predictions/utils/marketResolvers.test.ts
index b41751446247..ef8642916598 100644
--- a/app/components/Views/Homepage/Sections/Predictions/utils/marketResolvers.test.ts
+++ b/app/components/Views/Homepage/Sections/Predictions/utils/marketResolvers.test.ts
@@ -27,7 +27,7 @@ const createMarket = (
   image: 'https://example.com/image.png',
   status: 'open',
   recurrence: Recurrence.NONE,
-  category: 'world-cup',
+  category: 'sports',
   tags: ['world-cup'],
   outcomes: [],
   liquidity: 0,
diff --git a/app/components/Views/Homepage/Sections/Tokens/TokensSection.test.tsx b/app/components/Views/Homepage/Sections/Tokens/TokensSection.test.tsx
index 5e2e11bd0a99..50f80e898d74 100644
--- a/app/components/Views/Homepage/Sections/Tokens/TokensSection.test.tsx
+++ b/app/components/Views/Homepage/Sections/Tokens/TokensSection.test.tsx
@@ -243,7 +243,10 @@ jest.mock('./components/PopularTokenRow', () => {
               jest
                 .requireMock('../../../../UI/Ramp/hooks/useRampNavigation')
                 .useRampNavigation()
-                .goToBuy({ assetId: token.assetId }),
+                .goToBuy(
+                  { assetId: token.assetId },
+                  { buyFlowOrigin: 'homeTokenList' },
+                ),
           },
           ReactActual.createElement(Text, null, 'Buy'),
         ),
@@ -428,9 +431,12 @@ describe('TokensSection', () => {
     const buyButtons = screen.getAllByText('Buy');
     fireEvent.press(buyButtons[0]);
 
-    expect(mockGoToBuy).toHaveBeenCalledWith({
-      assetId: 'eip155:1/erc20:0xaca92e438df0b2401ff60da7e4337b687a2435da',
-    });
+    expect(mockGoToBuy).toHaveBeenCalledWith(
+      {
+        assetId: 'eip155:1/erc20:0xaca92e438df0b2401ff60da7e4337b687a2435da',
+      },
+      { buyFlowOrigin: 'homeTokenList' },
+    );
   });
 
   it('uses popular network list for token list (selectSortedAssetsBySelectedAccountGroupForChainIdsByBalance)', () => {
diff --git a/app/components/Views/Homepage/abTestConfig.ts b/app/components/Views/Homepage/abTestConfig.ts
index 3237e00c39cb..72ffd563d0d1 100644
--- a/app/components/Views/Homepage/abTestConfig.ts
+++ b/app/components/Views/Homepage/abTestConfig.ts
@@ -256,3 +256,54 @@ export const HOMEPAGE_ACTION_BUTTONS_GRID_AB_TEST_ANALYTICS_MAPPING: ABTestAnaly
     validVariants: Object.values(HomepageActionButtonsGridVariant),
     eventNames: [EVENT_NAME.HOME_VIEWED, EVENT_NAME.ACTION_BUTTON_CLICKED],
   };
+
+// ─── Homepage balance breakdown ──────────────────────────────────────────────
+
+export const HOMEPAGE_BALANCE_BREAKDOWN_AB_KEY =
+  'homeTMCU1209AbtestHomepageBalanceBreakdown';
+
+export enum HomepageBalanceBreakdownVariant {
+  Control = 'control',
+  Icons = 'icons',
+  Allocation = 'allocation',
+}
+
+export type HomepageBalanceBreakdownLayout = 'icons' | 'allocation';
+
+interface HomepageBalanceBreakdownVariantConfig {
+  layout: HomepageBalanceBreakdownLayout | null;
+}
+
+export const HOMEPAGE_BALANCE_BREAKDOWN_VARIANTS: Record<
+  HomepageBalanceBreakdownVariant,
+  HomepageBalanceBreakdownVariantConfig
+> = {
+  [HomepageBalanceBreakdownVariant.Control]: {
+    layout: null,
+  },
+  [HomepageBalanceBreakdownVariant.Icons]: {
+    layout: 'icons',
+  },
+  [HomepageBalanceBreakdownVariant.Allocation]: {
+    layout: 'allocation',
+  },
+};
+
+export const HOMEPAGE_BALANCE_BREAKDOWN_AB_TEST_EXPOSURE_OPTIONS = {
+  experimentName: 'Homepage balance breakdown',
+  variationNames: {
+    control: 'Current homepage without balance breakdown',
+    icons: 'Primitive breakdown with icons',
+    allocation: 'Primitive allocation breakdown',
+  },
+} as const;
+
+export const HOMEPAGE_BALANCE_BREAKDOWN_AB_TEST_ANALYTICS_MAPPING: ABTestAnalyticsMapping =
+  {
+    flagKey: HOMEPAGE_BALANCE_BREAKDOWN_AB_KEY,
+    validVariants: Object.values(HomepageBalanceBreakdownVariant),
+    eventNames: [
+      EVENT_NAME.HOME_VIEWED,
+      EVENT_NAME.BALANCE_BREAKDOWN_SLICE_TAPPED,
+    ],
+  };
diff --git a/app/components/Views/Homepage/components/HomepageActionButtonsGrid/buttons/BuyButton.tsx b/app/components/Views/Homepage/components/HomepageActionButtonsGrid/buttons/BuyButton.tsx
index 9674ddb182dc..4f25c5ff35d3 100644
--- a/app/components/Views/Homepage/components/HomepageActionButtonsGrid/buttons/BuyButton.tsx
+++ b/app/components/Views/Homepage/components/HomepageActionButtonsGrid/buttons/BuyButton.tsx
@@ -5,6 +5,7 @@ import { strings } from '../../../../../../../locales/i18n';
 import { selectCanSignTransactions } from '../../../../../../selectors/accountsController';
 import { useAnalytics } from '../../../../../hooks/useAnalytics/useAnalytics';
 import { useRampNavigation } from '../../../../../UI/Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../../../../UI/Ramp/constants/rampsBuyCufTags';
 import {
   ActionButtonType,
   ActionLocation,
@@ -30,7 +31,7 @@ const BuyButton = ({
       button_label: label,
       location: ActionLocation.HOME,
     });
-    goToBuy();
+    goToBuy(undefined, { surface: RAMPS_BUY_CUF_SURFACE.HOME });
   }, [actionPosition, createEventBuilder, goToBuy, label, trackEvent]);
 
   return (
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdown.test.tsx b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdown.test.tsx
new file mode 100644
index 000000000000..739962be242f
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdown.test.tsx
@@ -0,0 +1,592 @@
+import React from 'react';
+import { brandColor } from '@metamask/design-tokens';
+import { fireEvent, render } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import I18n from '../../../../../../locales/i18n';
+import HomepageBalanceBreakdown from './HomepageBalanceBreakdown';
+import { HomepageBalanceBreakdownTestIds } from './HomepageBalanceBreakdown.testIds';
+import { useBalanceBreakdown } from '../../BalanceBreakdown/hooks/useBalanceBreakdown';
+import type {
+  BreakdownData,
+  SliceData,
+  SliceKey,
+} from '../../BalanceBreakdown/types';
+import Routes from '../../../../../constants/navigation/Routes';
+import { selectAccountGroupBalanceForEmptyState } from '../../../../../selectors/assets/balances';
+import { selectEvmChainId } from '../../../../../selectors/networkController';
+import { selectShouldShowWalletHomeOnboardingSteps } from '../../../../../selectors/onboarding';
+import { selectPrivacyMode } from '../../../../../selectors/preferencesController';
+import { mockTheme } from '../../../../../util/theme';
+// eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): route-isolation backlog
+import { WalletViewSelectorsIDs } from '../../../Wallet/WalletView.testIds';
+
+const mockNavigate = jest.fn();
+const mockNavigateToMoneyHome = jest.fn();
+const mockHandleViewAllPerps = jest.fn();
+const mockTrackEvent = jest.fn();
+const mockBuild = jest.fn(() => ({ name: 'Balance Breakdown Slice Tapped' }));
+const mockAddProperties = jest.fn(() => ({ build: mockBuild }));
+const mockCreateEventBuilder = jest.fn(() => ({
+  addProperties: mockAddProperties,
+}));
+let mockPrivacyMode = false;
+let mockIsWalletHomeOnboardingActive = false;
+const mockAccountGroupBalance = jest.fn();
+const originalLocale = I18n.locale;
+
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({ navigate: mockNavigate }),
+}));
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../../hooks/useFormatters', () => ({
+  useFormatters: () => ({
+    formatCurrency: (value: number, currency: string) =>
+      `${currency.toUpperCase()} ${value.toFixed(2)}`,
+  }),
+}));
+
+jest.mock('../../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  }),
+}));
+
+jest.mock('../../../../UI/Money/hooks/useMoneyNavigation', () => ({
+  useMoneyNavigation: () => ({
+    navigateToMoneyHome: mockNavigateToMoneyHome,
+  }),
+}));
+
+jest.mock('../../Sections/Perpetuals/hooks/usePerpsNavigationHandlers', () => ({
+  usePerpsNavigationHandlers: () => ({
+    handleViewAllPerps: mockHandleViewAllPerps,
+  }),
+}));
+
+jest.mock('../../BalanceBreakdown/hooks/useBalanceBreakdown');
+
+jest.mock(
+  '../../../../UI/Assets/components/Balance/AccountGroupBalance',
+  () => {
+    const ReactMock = jest.requireActual('react');
+    const { Pressable } = jest.requireActual('react-native');
+    return {
+      __esModule: true,
+      default: (props: object) => {
+        mockAccountGroupBalance(props);
+        return ReactMock.createElement(Pressable, {
+          accessibilityRole: 'button',
+          testID: 'aggregate-hero',
+        });
+      },
+    };
+  },
+);
+
+jest.mock('../../../../UI/BalanceEmptyState', () => {
+  const ReactMock = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return ({ testID }: { testID?: string }) =>
+    ReactMock.createElement(View, { testID });
+});
+
+jest.mock('../../../../../component-library/components-temp/Skeleton', () => {
+  const ReactMock = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    Skeleton: ({
+      children,
+      hideChildren,
+      testID,
+    }: {
+      children: React.ReactNode;
+      hideChildren: boolean;
+      testID?: string;
+    }) =>
+      ReactMock.createElement(
+        View,
+        { testID, accessibilityState: { busy: hideChildren } },
+        children,
+      ),
+  };
+});
+
+const makeSlice = (
+  key: SliceKey,
+  overrides: Partial<SliceData> = {},
+): SliceData => ({
+  key,
+  color: 'transparent',
+  isVisible: true,
+  valueFiat: 10,
+  percentOfTotal: 0.2,
+  status: 'ready',
+  ...overrides,
+});
+
+const breakdown: BreakdownData = {
+  hero: {
+    totalFiat: 50,
+    userCurrency: 'USD',
+    status: 'ready',
+    delta: { amount: 2, percent: 0.04 },
+  },
+  slices: {
+    money: makeSlice('money', {
+      apyPercent: 4.1,
+    }),
+    tokens: makeSlice('tokens', { valueFiat: 20 }),
+    perps: makeSlice('perps'),
+    predict: makeSlice('predict'),
+    defi: makeSlice('defi'),
+  },
+};
+
+describe('HomepageBalanceBreakdown', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    I18n.locale = 'en-US';
+    mockPrivacyMode = false;
+    mockIsWalletHomeOnboardingActive = false;
+    jest.mocked(useSelector).mockImplementation((selector) => {
+      if (selector === selectPrivacyMode) return mockPrivacyMode;
+      if (selector === selectEvmChainId) return '0x1';
+      if (selector === selectAccountGroupBalanceForEmptyState) {
+        return { totalBalanceInUserCurrency: 0 };
+      }
+      if (selector === selectShouldShowWalletHomeOnboardingSteps) {
+        return mockIsWalletHomeOnboardingActive;
+      }
+      return undefined;
+    });
+    jest.mocked(useBalanceBreakdown).mockReturnValue(breakdown);
+  });
+
+  afterAll(() => {
+    I18n.locale = originalLocale;
+  });
+
+  it('renders the aggregate hero and rows in screenshot order', () => {
+    const { getByTestId, getAllByRole } = render(
+      <HomepageBalanceBreakdown layout="icons" />,
+    );
+
+    expect(mockAccountGroupBalance).not.toHaveBeenCalled();
+    expect(getByTestId(HomepageBalanceBreakdownTestIds.HERO)).toHaveStyle({
+      alignItems: 'flex-start',
+      backgroundColor: 'transparent',
+      flexDirection: 'column',
+    });
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.HERO_CONTENT),
+    ).toHaveStyle({
+      alignItems: 'flex-start',
+      flexDirection: 'column',
+      gap: 4,
+    });
+    expect(
+      getAllByRole('button')
+        .slice(1)
+        .map((row) => row.props.testID),
+    ).toEqual([
+      HomepageBalanceBreakdownTestIds.ROW('money'),
+      HomepageBalanceBreakdownTestIds.ROW('tokens'),
+      HomepageBalanceBreakdownTestIds.ROW('perps'),
+      HomepageBalanceBreakdownTestIds.ROW('predict'),
+      HomepageBalanceBreakdownTestIds.ROW('defi'),
+    ]);
+    expect(getByTestId(HomepageBalanceBreakdownTestIds.APY)).toHaveTextContent(
+      '4.1% APY',
+    );
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.PERCENTAGE('money')),
+    ).toHaveTextContent('20%');
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.ICON('money')).props.name,
+    ).toBe('Musd');
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.ICON('tokens')).props.name,
+    ).toBe('Ethereum');
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.ICON('perps')),
+    ).toHaveTextContent('∞');
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.ICON('predict')).props.name,
+    ).toBe('Predictions');
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.ICON('defi')),
+    ).toHaveTextContent('%');
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.HERO).props
+        .accessibilityLabel,
+    ).toContain('USD 50.00');
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.HERO).props.accessibilityHint,
+    ).toBe('Hide total balance');
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.ROW('tokens')).props
+        .accessibilityLabel,
+    ).toBe('Tokens, USD 20.00, 20%');
+  });
+
+  it('localizes allocation percentages and APY numbers', () => {
+    I18n.locale = 'de-DE';
+
+    const { getByTestId } = render(<HomepageBalanceBreakdown layout="icons" />);
+
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.PERCENTAGE('money')),
+    ).toHaveTextContent('20 %');
+    expect(getByTestId(HomepageBalanceBreakdownTestIds.APY)).toHaveTextContent(
+      'APY von 4,1 %',
+    );
+  });
+
+  it('omits slices hidden by their product flags', () => {
+    jest.mocked(useBalanceBreakdown).mockReturnValue({
+      ...breakdown,
+      slices: {
+        ...breakdown.slices,
+        predict: makeSlice('predict', {
+          isVisible: false,
+          status: 'ineligible',
+        }),
+      },
+    });
+
+    const { queryByTestId } = render(
+      <HomepageBalanceBreakdown layout="icons" />,
+    );
+
+    expect(
+      queryByTestId(HomepageBalanceBreakdownTestIds.ROW('predict')),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('renders an amount-only aggregate delta without a legacy percentage', () => {
+    jest.mocked(useBalanceBreakdown).mockReturnValue({
+      ...breakdown,
+      hero: {
+        ...breakdown.hero,
+        delta: { amount: 2 },
+      },
+    });
+
+    const { getByTestId, queryByTestId } = render(
+      <HomepageBalanceBreakdown layout="icons" />,
+    );
+
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.HERO_DELTA_AMOUNT),
+    ).toHaveStyle({ color: mockTheme.colors.success.default });
+    expect(
+      queryByTestId(HomepageBalanceBreakdownTestIds.HERO_DELTA_PERCENT),
+    ).not.toBeOnTheScreen();
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.HERO_PERIOD),
+    ).toHaveTextContent('Today');
+  });
+
+  it('mutes a partially loaded aggregate hero', () => {
+    jest.mocked(useBalanceBreakdown).mockReturnValue({
+      ...breakdown,
+      hero: {
+        ...breakdown.hero,
+        isPartiallyLoaded: true,
+      },
+    });
+
+    const { getByTestId } = render(<HomepageBalanceBreakdown layout="icons" />);
+
+    expect(getByTestId(WalletViewSelectorsIDs.TOTAL_BALANCE_TEXT)).toHaveStyle({
+      color: mockTheme.colors.text.muted,
+    });
+  });
+
+  it('mutes an incomplete aggregate without treating an error as loading', () => {
+    jest.mocked(useBalanceBreakdown).mockReturnValue({
+      ...breakdown,
+      hero: {
+        ...breakdown.hero,
+        hasErroredSlice: true,
+        isPartiallyLoaded: false,
+      },
+    });
+
+    const { getByTestId } = render(<HomepageBalanceBreakdown layout="icons" />);
+
+    expect(getByTestId(WalletViewSelectorsIDs.TOTAL_BALANCE_TEXT)).toHaveStyle({
+      color: mockTheme.colors.text.muted,
+    });
+  });
+
+  it('renders the experiment empty state for a settled zero portfolio', () => {
+    jest.mocked(useBalanceBreakdown).mockReturnValue({
+      ...breakdown,
+      hero: {
+        ...breakdown.hero,
+        totalFiat: 0,
+      },
+    });
+
+    const { getByTestId, queryByTestId } = render(
+      <HomepageBalanceBreakdown layout="icons" />,
+    );
+
+    expect(
+      getByTestId(WalletViewSelectorsIDs.BALANCE_EMPTY_STATE_CONTAINER),
+    ).toBeOnTheScreen();
+    expect(
+      queryByTestId(HomepageBalanceBreakdownTestIds.HERO),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('renders allocation segments and colored row dots', () => {
+    jest.mocked(useBalanceBreakdown).mockReturnValue({
+      ...breakdown,
+      slices: {
+        ...breakdown.slices,
+        tokens: makeSlice('tokens', { color: brandColor.blue700 }),
+      },
+    });
+
+    const { getByTestId } = render(
+      <HomepageBalanceBreakdown layout="allocation" />,
+    );
+
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.ALLOCATION_TITLE),
+    ).toHaveTextContent('Allocation');
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.ALLOCATION_SEGMENT('tokens')),
+    ).toHaveStyle({
+      backgroundColor: brandColor.blue700,
+      borderRadius: 999,
+    });
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.DOT('tokens')),
+    ).toHaveStyle({ backgroundColor: brandColor.blue700 });
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.PERCENTAGE('tokens')),
+    ).toHaveTextContent('20%');
+    expect(getByTestId(HomepageBalanceBreakdownTestIds.APY)).toHaveTextContent(
+      '4.1% APY',
+    );
+  });
+
+  it('uses alternative text color for a ready zero balance', () => {
+    jest.mocked(useBalanceBreakdown).mockReturnValue({
+      ...breakdown,
+      slices: {
+        ...breakdown.slices,
+        tokens: makeSlice('tokens', {
+          valueFiat: 0,
+          percentOfTotal: 0,
+        }),
+      },
+    });
+
+    const { getByTestId } = render(<HomepageBalanceBreakdown layout="icons" />);
+
+    const value = getByTestId(HomepageBalanceBreakdownTestIds.VALUE('tokens'));
+    expect(value).toHaveTextContent('USD 0.00');
+    expect(value).toHaveStyle({ color: mockTheme.colors.text.alternative });
+  });
+
+  it('renders less than one percent for a non-zero rounded allocation', () => {
+    jest.mocked(useBalanceBreakdown).mockReturnValue({
+      ...breakdown,
+      slices: {
+        ...breakdown.slices,
+        tokens: makeSlice('tokens', {
+          valueFiat: 0.01,
+          percentOfTotal: 0.004,
+        }),
+      },
+    });
+
+    const { getByTestId } = render(
+      <HomepageBalanceBreakdown layout="allocation" />,
+    );
+
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.PERCENTAGE('tokens')),
+    ).toHaveTextContent('<1%');
+  });
+
+  it('renders the Money APY loading slot', () => {
+    jest.mocked(useBalanceBreakdown).mockReturnValue({
+      ...breakdown,
+      slices: {
+        ...breakdown.slices,
+        money: makeSlice('money', {
+          apyLoading: true,
+          apyPercent: undefined,
+        }),
+      },
+    });
+
+    const { getByTestId, queryByTestId } = render(
+      <HomepageBalanceBreakdown layout="allocation" />,
+    );
+
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.APY_SKELETON),
+    ).toBeOnTheScreen();
+    expect(queryByTestId(HomepageBalanceBreakdownTestIds.APY)).toBeNull();
+  });
+
+  it('keeps the category dot when its allocation segment is zero', () => {
+    jest.mocked(useBalanceBreakdown).mockReturnValue({
+      ...breakdown,
+      slices: {
+        ...breakdown.slices,
+        tokens: makeSlice('tokens', { percentOfTotal: 0 }),
+      },
+    });
+
+    const { queryByTestId } = render(
+      <HomepageBalanceBreakdown layout="allocation" />,
+    );
+
+    expect(
+      queryByTestId(
+        HomepageBalanceBreakdownTestIds.ALLOCATION_SEGMENT('tokens'),
+      ),
+    ).not.toBeOnTheScreen();
+    expect(
+      queryByTestId(HomepageBalanceBreakdownTestIds.DOT('tokens')),
+    ).toBeOnTheScreen();
+  });
+
+  it('opens the canonical primitive destinations from each row', () => {
+    const { getByTestId } = render(<HomepageBalanceBreakdown layout="icons" />);
+
+    fireEvent.press(getByTestId(HomepageBalanceBreakdownTestIds.ROW('money')));
+    fireEvent.press(getByTestId(HomepageBalanceBreakdownTestIds.ROW('tokens')));
+    fireEvent.press(getByTestId(HomepageBalanceBreakdownTestIds.ROW('perps')));
+    fireEvent.press(
+      getByTestId(HomepageBalanceBreakdownTestIds.ROW('predict')),
+    );
+    fireEvent.press(getByTestId(HomepageBalanceBreakdownTestIds.ROW('defi')));
+
+    expect(mockNavigateToMoneyHome).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenNthCalledWith(
+      1,
+      Routes.WALLET.TOKENS_FULL_VIEW,
+    );
+    expect(mockHandleViewAllPerps).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenNthCalledWith(2, Routes.PREDICT.ROOT, {
+      screen: Routes.PREDICT.MARKET_LIST,
+      params: {
+        entryPoint: 'homepage_balance',
+      },
+    });
+    expect(mockNavigate).toHaveBeenNthCalledWith(
+      3,
+      Routes.WALLET.DEFI_FULL_VIEW,
+    );
+    expect(mockTrackEvent).toHaveBeenCalledTimes(5);
+    expect(mockAddProperties).toHaveBeenNthCalledWith(1, {
+      slice: 'money',
+      source: 'homepage',
+    });
+  });
+
+  it('renders skeletons while loading and em dashes for failed rows', () => {
+    jest.mocked(useBalanceBreakdown).mockReturnValue({
+      ...breakdown,
+      slices: {
+        ...breakdown.slices,
+        money: makeSlice('money', { status: 'loading' }),
+        tokens: makeSlice('tokens', { status: 'error' }),
+        defi: makeSlice('defi', { status: 'ineligible' }),
+      },
+    });
+
+    const { getByTestId } = render(<HomepageBalanceBreakdown layout="icons" />);
+
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.SKELETON('money')).props
+        .accessibilityState,
+    ).toEqual({ busy: true });
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.VALUE('tokens')),
+    ).toHaveTextContent('—');
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.VALUE('defi')),
+    ).toHaveTextContent('—');
+  });
+
+  it('keeps fiat and PnL values privacy-sensitive', () => {
+    mockPrivacyMode = true;
+
+    const { getByTestId, queryByText } = render(
+      <HomepageBalanceBreakdown layout="icons" />,
+    );
+
+    expect(queryByText('USD 20.00')).not.toBeOnTheScreen();
+    expect(queryByText('20%')).not.toBeOnTheScreen();
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.HERO).props
+        .accessibilityLabel,
+    ).toBe('Show total balance');
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.ROW('tokens')).props
+        .accessibilityLabel,
+    ).toBe('Tokens');
+  });
+
+  it('does not expose proportional allocation while privacy mode is enabled', () => {
+    mockPrivacyMode = true;
+
+    const { getByLabelText, getByTestId, queryByTestId } = render(
+      <HomepageBalanceBreakdown layout="allocation" />,
+    );
+
+    expect(
+      getByTestId(HomepageBalanceBreakdownTestIds.ALLOCATION_PRIVATE),
+    ).toBeOnTheScreen();
+    expect(
+      queryByTestId(
+        HomepageBalanceBreakdownTestIds.ALLOCATION_SEGMENT('tokens'),
+      ),
+    ).not.toBeOnTheScreen();
+    expect(getByLabelText('Show total balance')).toBeOnTheScreen();
+  });
+
+  it('does not render rows during the onboarding checklist flow', () => {
+    mockIsWalletHomeOnboardingActive = true;
+
+    const { queryByTestId } = render(
+      <HomepageBalanceBreakdown
+        hideRows
+        accountGroupBalanceProps={{}}
+        layout="icons"
+      />,
+    );
+
+    expect(
+      queryByTestId(HomepageBalanceBreakdownTestIds.ROWS),
+    ).not.toBeOnTheScreen();
+    expect(queryByTestId('aggregate-hero')).toBeOnTheScreen();
+    expect(mockAccountGroupBalance).toHaveBeenCalledWith({});
+  });
+
+  it('keeps the experiment hero when rows are hidden outside onboarding', () => {
+    const { getByTestId, queryByTestId } = render(
+      <HomepageBalanceBreakdown hideRows layout="icons" />,
+    );
+
+    expect(getByTestId(HomepageBalanceBreakdownTestIds.HERO)).toBeOnTheScreen();
+    expect(
+      queryByTestId(HomepageBalanceBreakdownTestIds.ROWS),
+    ).not.toBeOnTheScreen();
+    expect(mockAccountGroupBalance).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdown.testIds.ts b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdown.testIds.ts
new file mode 100644
index 000000000000..b454b6c11eec
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdown.testIds.ts
@@ -0,0 +1,24 @@
+import type { SliceKey } from '../../BalanceBreakdown/types';
+
+export const HomepageBalanceBreakdownTestIds = {
+  CONTAINER: 'homepage-balance-breakdown',
+  HERO: 'homepage-balance-breakdown-hero',
+  HERO_CONTENT: 'homepage-balance-breakdown-hero-content',
+  HERO_DELTA_AMOUNT: 'homepage-balance-breakdown-hero-delta-amount',
+  HERO_DELTA_PERCENT: 'homepage-balance-breakdown-hero-delta-percent',
+  HERO_PERIOD: 'homepage-balance-breakdown-hero-period',
+  ROWS: 'homepage-balance-breakdown-rows',
+  ALLOCATION_TITLE: 'homepage-balance-breakdown-allocation-title',
+  ALLOCATION_BAR: 'homepage-balance-breakdown-allocation-bar',
+  ALLOCATION_PRIVATE: 'homepage-balance-breakdown-allocation-private',
+  ALLOCATION_SEGMENT: (key: SliceKey) =>
+    `homepage-balance-breakdown-allocation-segment-${key}`,
+  ROW: (key: SliceKey) => `homepage-balance-breakdown-row-${key}`,
+  ICON: (key: SliceKey) => `homepage-balance-breakdown-icon-${key}`,
+  DOT: (key: SliceKey) => `homepage-balance-breakdown-dot-${key}`,
+  PERCENTAGE: (key: SliceKey) => `homepage-balance-breakdown-percentage-${key}`,
+  VALUE: (key: SliceKey) => `homepage-balance-breakdown-value-${key}`,
+  SKELETON: (key: SliceKey) => `homepage-balance-breakdown-skeleton-${key}`,
+  APY: 'homepage-balance-breakdown-money-apy',
+  APY_SKELETON: 'homepage-balance-breakdown-money-apy-skeleton',
+} as const;
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdown.tsx b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdown.tsx
new file mode 100644
index 000000000000..41db94e4328f
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdown.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { Box } from '@metamask/design-system-react-native';
+import AccountGroupBalance from '../../../../UI/Assets/components/Balance/AccountGroupBalance';
+import { selectShouldShowWalletHomeOnboardingSteps } from '../../../../../selectors/onboarding';
+import { SLICE_ORDER } from '../../BalanceBreakdown/constants';
+import { useBalanceBreakdown } from '../../BalanceBreakdown/hooks/useBalanceBreakdown';
+import type { HomepageBalanceBreakdownLayout } from '../../abTestConfig';
+import HomepageBalanceBreakdownAllocationBar from './HomepageBalanceBreakdownAllocationBar';
+import HomepageBalanceBreakdownHero from './HomepageBalanceBreakdownHero';
+import HomepageBalanceBreakdownRow from './HomepageBalanceBreakdownRow';
+import { HomepageBalanceBreakdownTestIds } from './HomepageBalanceBreakdown.testIds';
+import { useHomepageBalanceBreakdownNavigation } from './useHomepageBalanceBreakdownNavigation';
+
+export interface HomepageBalanceBreakdownProps {
+  hideRows?: boolean;
+  accountGroupBalanceProps?: React.ComponentProps<typeof AccountGroupBalance>;
+  layout: HomepageBalanceBreakdownLayout;
+  children?: React.ReactNode;
+}
+
+const HomepageBalanceBreakdown = ({
+  hideRows = false,
+  accountGroupBalanceProps,
+  layout,
+  children,
+}: HomepageBalanceBreakdownProps) => {
+  const { hero, slices } = useBalanceBreakdown();
+  const { openSlice } = useHomepageBalanceBreakdownNavigation();
+  const isWalletHomeOnboardingActive = useSelector(
+    selectShouldShowWalletHomeOnboardingSteps,
+  );
+  const visibleSliceKeys = SLICE_ORDER.filter((key) => slices[key].isVisible);
+
+  return (
+    <Box testID={HomepageBalanceBreakdownTestIds.CONTAINER}>
+      {isWalletHomeOnboardingActive ? (
+        <AccountGroupBalance {...accountGroupBalanceProps} />
+      ) : (
+        <HomepageBalanceBreakdownHero hero={hero} />
+      )}
+      {children ? <Box twClassName="mt-4 gap-4">{children}</Box> : null}
+      {!hideRows ? (
+        <Box
+          testID={HomepageBalanceBreakdownTestIds.ROWS}
+          twClassName="mt-3 px-4 pt-2"
+        >
+          {layout === 'allocation' ? (
+            <HomepageBalanceBreakdownAllocationBar slices={slices} />
+          ) : null}
+          {visibleSliceKeys.map((key) => (
+            <HomepageBalanceBreakdownRow
+              key={key}
+              layout={layout}
+              onPress={() => openSlice(key)}
+              slice={slices[key]}
+              userCurrency={hero.userCurrency}
+            />
+          ))}
+        </Box>
+      ) : null}
+    </Box>
+  );
+};
+
+export default HomepageBalanceBreakdown;
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdownAllocationBar.tsx b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdownAllocationBar.tsx
new file mode 100644
index 000000000000..8d6d1aef6df0
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdownAllocationBar.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import { View, type ViewStyle } from 'react-native';
+import { useSelector } from 'react-redux';
+import {
+  Box,
+  BoxFlexDirection,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import { selectPrivacyMode } from '../../../../../selectors/preferencesController';
+import { SLICE_ORDER } from '../../BalanceBreakdown/constants';
+import type { SliceData, SliceKey } from '../../BalanceBreakdown/types';
+import { HomepageBalanceBreakdownTestIds } from './HomepageBalanceBreakdown.testIds';
+
+const getAllocationSegmentStyle = (slice: SliceData): ViewStyle => ({
+  backgroundColor: slice.color,
+  borderRadius: 999,
+  flexBasis: 0,
+  flexGrow: slice.percentOfTotal,
+  minWidth: 4,
+});
+
+interface HomepageBalanceBreakdownAllocationBarProps {
+  slices: Record<SliceKey, SliceData>;
+}
+
+const HomepageBalanceBreakdownAllocationBar = ({
+  slices,
+}: HomepageBalanceBreakdownAllocationBarProps) => {
+  const privacyMode = useSelector(selectPrivacyMode);
+
+  return (
+    <Box twClassName="mb-2 gap-3 pt-1">
+      <Text
+        testID={HomepageBalanceBreakdownTestIds.ALLOCATION_TITLE}
+        variant={TextVariant.HeadingMd}
+      >
+        {strings('balance_breakdown.allocation')}
+      </Text>
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        gap={1}
+        testID={HomepageBalanceBreakdownTestIds.ALLOCATION_BAR}
+        twClassName="h-1.5 overflow-hidden rounded-full"
+      >
+        {privacyMode ? (
+          <Box
+            testID={HomepageBalanceBreakdownTestIds.ALLOCATION_PRIVATE}
+            twClassName="h-full flex-1 bg-muted"
+          />
+        ) : (
+          SLICE_ORDER.filter(
+            (key) =>
+              slices[key].status === 'ready' && slices[key].percentOfTotal > 0,
+          ).map((key) => (
+            <View
+              key={key}
+              testID={HomepageBalanceBreakdownTestIds.ALLOCATION_SEGMENT(key)}
+              style={getAllocationSegmentStyle(slices[key])}
+            />
+          ))
+        )}
+      </Box>
+    </Box>
+  );
+};
+
+export default HomepageBalanceBreakdownAllocationBar;
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdownHero.tsx b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdownHero.tsx
new file mode 100644
index 000000000000..d0ae5a637cb8
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdownHero.tsx
@@ -0,0 +1,128 @@
+import React from 'react';
+import Animated from 'react-native-reanimated';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  ButtonBase,
+  FontWeight,
+  SensitiveText,
+  SensitiveTextLength,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
+import BalanceEmptyState from '../../../../UI/BalanceEmptyState';
+// eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): route-isolation backlog
+import { WalletViewSelectorsIDs } from '../../../Wallet/WalletView.testIds';
+import type { HeroData } from '../../BalanceBreakdown/types';
+import { HomepageBalanceBreakdownTestIds } from './HomepageBalanceBreakdown.testIds';
+import { useHomepageBalanceBreakdownHero } from './useHomepageBalanceBreakdownHero';
+
+interface HomepageBalanceBreakdownHeroProps {
+  hero: HeroData;
+}
+
+const HomepageBalanceBreakdownHero = ({
+  hero,
+}: HomepageBalanceBreakdownHeroProps) => {
+  const {
+    accessibilityHint,
+    accessibilityLabel,
+    amountText,
+    animatedBalanceStyle,
+    deltaColor,
+    displayBalance,
+    isLoading,
+    percentText,
+    privacyMode,
+    shouldShowEmptyState,
+    togglePrivacy,
+  } = useHomepageBalanceBreakdownHero(hero);
+
+  if (!isLoading && shouldShowEmptyState) {
+    return (
+      <Box marginHorizontal={4}>
+        <BalanceEmptyState
+          testID={WalletViewSelectorsIDs.BALANCE_EMPTY_STATE_CONTAINER}
+        />
+      </Box>
+    );
+  }
+
+  return (
+    <ButtonBase
+      accessibilityHint={accessibilityHint}
+      accessibilityLabel={accessibilityLabel}
+      contentWrapperProps={{
+        testID: HomepageBalanceBreakdownTestIds.HERO_CONTENT,
+        twClassName: 'w-full flex-col items-start gap-1',
+      }}
+      onPress={togglePrivacy}
+      testID={HomepageBalanceBreakdownTestIds.HERO}
+      twClassName="mx-4 h-auto self-stretch flex-col items-start justify-start overflow-visible rounded-none bg-transparent p-0"
+    >
+      <Skeleton hideChildren={isLoading}>
+        <Animated.View style={animatedBalanceStyle}>
+          <SensitiveText
+            color={
+              hero.isPartiallyLoaded || hero.hasErroredSlice
+                ? TextColor.TextMuted
+                : TextColor.TextDefault
+            }
+            isHidden={privacyMode}
+            length={SensitiveTextLength.Long}
+            testID={WalletViewSelectorsIDs.TOTAL_BALANCE_TEXT}
+            variant={TextVariant.DisplayLg}
+          >
+            {displayBalance}
+          </SensitiveText>
+        </Animated.View>
+      </Skeleton>
+
+      {hero.delta && amountText ? (
+        <Skeleton hideChildren={isLoading}>
+          <Box
+            alignItems={BoxAlignItems.Center}
+            flexDirection={BoxFlexDirection.Row}
+            twClassName="gap-1.5"
+          >
+            <SensitiveText
+              color={deltaColor}
+              fontWeight={FontWeight.Medium}
+              isHidden={privacyMode}
+              length={SensitiveTextLength.Medium}
+              testID={HomepageBalanceBreakdownTestIds.HERO_DELTA_AMOUNT}
+              variant={TextVariant.BodyMd}
+            >
+              {amountText}
+            </SensitiveText>
+            {percentText ? (
+              <SensitiveText
+                color={deltaColor}
+                fontWeight={FontWeight.Medium}
+                isHidden={privacyMode}
+                length={SensitiveTextLength.Medium}
+                testID={HomepageBalanceBreakdownTestIds.HERO_DELTA_PERCENT}
+                variant={TextVariant.BodyMd}
+              >
+                {percentText}
+              </SensitiveText>
+            ) : null}
+            <Text
+              color={TextColor.TextAlternative}
+              testID={HomepageBalanceBreakdownTestIds.HERO_PERIOD}
+              variant={TextVariant.BodyMd}
+            >
+              {strings('asset_overview.chart_time_period.1d')}
+            </Text>
+          </Box>
+        </Skeleton>
+      ) : null}
+    </ButtonBase>
+  );
+};
+
+export default HomepageBalanceBreakdownHero;
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdownRow.tsx b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdownRow.tsx
new file mode 100644
index 000000000000..5057072ed8fe
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/HomepageBalanceBreakdownRow.tsx
@@ -0,0 +1,233 @@
+import React from 'react';
+import { Pressable, View, type ViewStyle } from 'react-native';
+import { useSelector } from 'react-redux';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconSize,
+  SensitiveText,
+  SensitiveTextLength,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import I18n, { strings } from '../../../../../../locales/i18n';
+import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
+import { selectPrivacyMode } from '../../../../../selectors/preferencesController';
+import { formatWithThreshold } from '../../../../../util/assets';
+import { getIntlNumberFormatter } from '../../../../../util/intl';
+import { useFormatters } from '../../../../hooks/useFormatters';
+import type { SliceData } from '../../BalanceBreakdown/types';
+import type { HomepageBalanceBreakdownLayout } from '../../abTestConfig';
+import { HomepageBalanceBreakdownTestIds } from './HomepageBalanceBreakdown.testIds';
+import {
+  getSliceLabel,
+  SLICE_ICONS,
+  SLICE_ICON_SYMBOLS,
+} from './homepageBalanceBreakdown.constants';
+
+const getAllocationColorStyle = (slice: SliceData): ViewStyle => ({
+  backgroundColor: slice.color,
+});
+
+export interface HomepageBalanceBreakdownRowProps {
+  slice: SliceData;
+  userCurrency: string;
+  onPress: () => void;
+  layout: HomepageBalanceBreakdownLayout;
+}
+
+const HomepageBalanceBreakdownRow = ({
+  slice,
+  userCurrency,
+  onPress,
+  layout,
+}: HomepageBalanceBreakdownRowProps) => {
+  const tw = useTailwind();
+  const privacyMode = useSelector(selectPrivacyMode);
+  const { formatCurrency } = useFormatters();
+  const isLoading = slice.status === 'loading';
+  const percentageLabel =
+    slice.status !== 'ready'
+      ? null
+      : formatWithThreshold(slice.percentOfTotal, 0.01, I18n.locale, {
+          style: 'percent',
+          maximumFractionDigits: 0,
+        });
+  const displayValue =
+    slice.status === 'error' || slice.status === 'ineligible'
+      ? '—'
+      : formatCurrency(slice.valueFiat, userCurrency);
+  const valueColor =
+    slice.status === 'ready' && slice.valueFiat === 0
+      ? TextColor.TextAlternative
+      : TextColor.TextDefault;
+  const moneyApy = slice.apyPercent;
+  const formattedMoneyApy =
+    moneyApy !== undefined
+      ? getIntlNumberFormatter(I18n.locale, {
+          maximumFractionDigits: 1,
+        }).format(moneyApy)
+      : undefined;
+  const apyLabel =
+    formattedMoneyApy !== undefined
+      ? strings('money.apy_label', { percentage: formattedMoneyApy })
+      : undefined;
+  const accessibilityLabel = privacyMode
+    ? getSliceLabel(slice.key)
+    : [
+        getSliceLabel(slice.key),
+        slice.status === 'ready' ? displayValue : undefined,
+        percentageLabel,
+        apyLabel,
+      ]
+        .filter(Boolean)
+        .join(', ');
+  const showIcon = layout === 'icons';
+  const showAllocationDot = layout === 'allocation';
+  const iconName = SLICE_ICONS[slice.key];
+  const iconSymbol = SLICE_ICON_SYMBOLS[slice.key];
+
+  return (
+    <Pressable
+      accessibilityLabel={accessibilityLabel}
+      accessibilityRole="button"
+      onPress={onPress}
+      testID={HomepageBalanceBreakdownTestIds.ROW(slice.key)}
+      style={({ pressed }) =>
+        tw.style('flex-row items-center', 'min-h-10', pressed && 'opacity-80')
+      }
+    >
+      {showIcon ? (
+        <Box
+          alignItems={BoxAlignItems.Center}
+          justifyContent={BoxJustifyContent.Center}
+          twClassName="h-8 w-8 rounded-full bg-muted"
+        >
+          {iconName ? (
+            <Icon
+              color={IconColor.IconDefault}
+              name={iconName}
+              size={IconSize.Md}
+              testID={HomepageBalanceBreakdownTestIds.ICON(slice.key)}
+            />
+          ) : (
+            <Text
+              color={TextColor.TextDefault}
+              fontWeight={FontWeight.Medium}
+              testID={HomepageBalanceBreakdownTestIds.ICON(slice.key)}
+              variant={TextVariant.HeadingSm}
+            >
+              {iconSymbol}
+            </Text>
+          )}
+        </Box>
+      ) : null}
+      <Box twClassName={showIcon ? 'ml-3 min-w-0 flex-1' : 'min-w-0 flex-1'}>
+        <Box
+          alignItems={BoxAlignItems.Center}
+          flexDirection={BoxFlexDirection.Row}
+          justifyContent={BoxJustifyContent.Between}
+          gap={3}
+        >
+          <Box
+            alignItems={BoxAlignItems.Center}
+            flexDirection={BoxFlexDirection.Row}
+            twClassName="min-w-0 flex-1"
+            gap={2}
+          >
+            <Box
+              alignItems={BoxAlignItems.Center}
+              flexDirection={BoxFlexDirection.Row}
+              twClassName="min-w-0 shrink"
+              gap={1}
+            >
+              {showAllocationDot ? (
+                <View
+                  testID={HomepageBalanceBreakdownTestIds.DOT(slice.key)}
+                  style={[
+                    tw.style('h-2 w-2 rounded-full mr-1'),
+                    getAllocationColorStyle(slice),
+                  ]}
+                />
+              ) : null}
+              <Text
+                color={TextColor.TextDefault}
+                fontWeight={FontWeight.Medium}
+                numberOfLines={1}
+                twClassName="shrink"
+                variant={TextVariant.BodyMd}
+              >
+                {getSliceLabel(slice.key)}
+              </Text>
+              {percentageLabel ? (
+                <>
+                  <Text
+                    color={TextColor.TextAlternative}
+                    variant={TextVariant.BodyMd}
+                  >
+                    •
+                  </Text>
+                  <SensitiveText
+                    color={TextColor.TextAlternative}
+                    isHidden={privacyMode}
+                    length={SensitiveTextLength.Short}
+                    testID={HomepageBalanceBreakdownTestIds.PERCENTAGE(
+                      slice.key,
+                    )}
+                    variant={TextVariant.BodyMd}
+                  >
+                    {percentageLabel}
+                  </SensitiveText>
+                </>
+              ) : null}
+            </Box>
+            {slice.key === 'money' && slice.apyLoading ? (
+              <Skeleton
+                height={20}
+                testID={HomepageBalanceBreakdownTestIds.APY_SKELETON}
+                twClassName="shrink-0"
+                width={60}
+              />
+            ) : moneyApy !== undefined ? (
+              <Box
+                testID={HomepageBalanceBreakdownTestIds.APY}
+                twClassName="shrink-0 rounded-md bg-success-muted px-1.5 py-0.5"
+              >
+                <Text
+                  color={TextColor.SuccessDefault}
+                  fontWeight={FontWeight.Medium}
+                  variant={TextVariant.BodySm}
+                >
+                  {apyLabel}
+                </Text>
+              </Box>
+            ) : null}
+          </Box>
+          <Skeleton
+            hideChildren={isLoading}
+            testID={HomepageBalanceBreakdownTestIds.SKELETON(slice.key)}
+          >
+            <SensitiveText
+              color={valueColor}
+              isHidden={privacyMode}
+              length={SensitiveTextLength.Medium}
+              testID={HomepageBalanceBreakdownTestIds.VALUE(slice.key)}
+              variant={TextVariant.BodyMd}
+            >
+              {displayValue}
+            </SensitiveText>
+          </Skeleton>
+        </Box>
+      </Box>
+    </Pressable>
+  );
+};
+
+export default HomepageBalanceBreakdownRow;
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/balanceBreakdownEvents.ts b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/balanceBreakdownEvents.ts
new file mode 100644
index 000000000000..7aa022a99a5a
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/balanceBreakdownEvents.ts
@@ -0,0 +1,12 @@
+import type { SliceKey } from '../../BalanceBreakdown/types';
+
+export const BalanceBreakdownEventProperties = {
+  Slice: 'slice',
+  Source: 'source',
+} as const;
+
+export const BalanceBreakdownEventSource = {
+  Homepage: 'homepage',
+} as const;
+
+export type BalanceBreakdownEventSlice = SliceKey;
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/homepageBalanceBreakdown.constants.ts b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/homepageBalanceBreakdown.constants.ts
new file mode 100644
index 000000000000..5bca07d4e28a
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/homepageBalanceBreakdown.constants.ts
@@ -0,0 +1,25 @@
+import { IconName } from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import type { SliceKey } from '../../BalanceBreakdown/types';
+
+export const SLICE_ICONS: Partial<Record<SliceKey, IconName>> = {
+  money: IconName.Musd,
+  tokens: IconName.Ethereum,
+  predict: IconName.Predictions,
+};
+
+export const SLICE_ICON_SYMBOLS: Partial<Record<SliceKey, string>> = {
+  perps: '∞',
+  defi: '%',
+};
+
+const SLICE_LABEL_KEYS = {
+  money: 'homepage.sections.money',
+  tokens: 'homepage.sections.tokens',
+  perps: 'homepage.sections.perpetuals',
+  predict: 'homepage.sections.predictions',
+  defi: 'homepage.sections.defi',
+} as const;
+
+export const getSliceLabel = (key: SliceKey): string =>
+  strings(SLICE_LABEL_KEYS[key]);
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/index.ts b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/index.ts
new file mode 100644
index 000000000000..794f24b6d20c
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/index.ts
@@ -0,0 +1,3 @@
+export { default } from './HomepageBalanceBreakdown';
+export { HomepageBalanceBreakdownTestIds } from './HomepageBalanceBreakdown.testIds';
+export { useHomepageBalanceBreakdownNavigation } from './useHomepageBalanceBreakdownNavigation';
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/useHomepageBalanceBreakdownHero.test.ts b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/useHomepageBalanceBreakdownHero.test.ts
new file mode 100644
index 000000000000..99fc2dc20a3b
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/useHomepageBalanceBreakdownHero.test.ts
@@ -0,0 +1,167 @@
+import { act, renderHook } from '@testing-library/react-native';
+import { TextColor } from '@metamask/design-system-react-native';
+import { useSelector } from 'react-redux';
+import {
+  cancelAnimation,
+  withRepeat,
+  withTiming,
+} from 'react-native-reanimated';
+import I18n from '../../../../../../locales/i18n';
+import { TEST_NETWORK_IDS } from '../../../../../constants/network';
+import Engine from '../../../../../core/Engine';
+import { selectAccountGroupBalanceForEmptyState } from '../../../../../selectors/assets/balances';
+import { selectEvmChainId } from '../../../../../selectors/networkController';
+import { selectPrivacyMode } from '../../../../../selectors/preferencesController';
+import type { HeroData } from '../../BalanceBreakdown/types';
+import { useHomepageBalanceBreakdownHero } from './useHomepageBalanceBreakdownHero';
+
+jest.mock('react-redux', () => ({ useSelector: jest.fn() }));
+jest.mock('react-native-reanimated', () => ({
+  ...jest.requireActual('react-native-reanimated'),
+  cancelAnimation: jest.fn(),
+  withRepeat: jest.fn((animation) => animation),
+  withTiming: jest.fn((value) => value),
+}));
+jest.mock('../../../../../core/Engine', () => ({
+  context: {
+    PreferencesController: {
+      setPrivacyMode: jest.fn(),
+    },
+  },
+}));
+jest.mock('../../../../hooks/useFormatters', () => ({
+  useFormatters: () => ({
+    formatCurrency: (amount: number, currency: string) =>
+      `${currency} ${amount.toFixed(2)}`,
+  }),
+}));
+
+const baseHero: HeroData = {
+  status: 'ready',
+  totalFiat: 100,
+  userCurrency: 'USD',
+  delta: { amount: 10, percent: 0.1 },
+};
+
+const mockUseSelector = jest.mocked(useSelector);
+const originalLocale = I18n.locale;
+
+describe('useHomepageBalanceBreakdownHero', () => {
+  let privacyMode: boolean;
+  let selectedChainId: string;
+  let allNetworkBalance: number;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    privacyMode = false;
+    selectedChainId = '0x1';
+    allNetworkBalance = 100;
+    I18n.locale = 'en-US';
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectPrivacyMode) return privacyMode;
+      if (selector === selectEvmChainId) return selectedChainId;
+      if (selector === selectAccountGroupBalanceForEmptyState) {
+        return { totalBalanceInUserCurrency: allNetworkBalance };
+      }
+      return undefined;
+    });
+  });
+
+  afterAll(() => {
+    I18n.locale = originalLocale;
+  });
+
+  it('uses the all-network control balance for the empty state', () => {
+    const hero = { ...baseHero, totalFiat: 0 };
+    const { result, rerender } = renderHook(() =>
+      useHomepageBalanceBreakdownHero(hero),
+    );
+
+    expect(result.current.shouldShowEmptyState).toBe(false);
+
+    allNetworkBalance = 0;
+    rerender({});
+
+    expect(result.current.shouldShowEmptyState).toBe(true);
+  });
+
+  it('suppresses the empty state on testnets', () => {
+    selectedChainId = TEST_NETWORK_IDS[0];
+    allNetworkBalance = 0;
+    const { result } = renderHook(() =>
+      useHomepageBalanceBreakdownHero({
+        ...baseHero,
+        totalFiat: 0,
+      }),
+    );
+
+    expect(result.current.shouldShowEmptyState).toBe(false);
+  });
+
+  it('suppresses the empty state for incomplete portfolios', () => {
+    allNetworkBalance = 0;
+    const { result } = renderHook(() =>
+      useHomepageBalanceBreakdownHero({
+        ...baseHero,
+        hasErroredSlice: true,
+        totalFiat: 0,
+      }),
+    );
+
+    expect(result.current.shouldShowEmptyState).toBe(false);
+  });
+
+  it('mutes delta colors in privacy mode', () => {
+    privacyMode = true;
+    const { result } = renderHook(() =>
+      useHomepageBalanceBreakdownHero(baseHero),
+    );
+
+    expect(result.current.deltaColor).toBe(TextColor.TextAlternative);
+  });
+
+  it('toggles privacy through PreferencesController', () => {
+    const { result } = renderHook(() =>
+      useHomepageBalanceBreakdownHero(baseHero),
+    );
+
+    act(() => result.current.togglePrivacy());
+
+    expect(
+      Engine.context.PreferencesController.setPrivacyMode,
+    ).toHaveBeenCalledWith(true);
+  });
+
+  it('reformats the percentage after the locale changes', () => {
+    const { result, rerender } = renderHook(() =>
+      useHomepageBalanceBreakdownHero(baseHero),
+    );
+    const englishPercentage = result.current.percentText;
+
+    I18n.locale = 'de-DE';
+    rerender({});
+
+    expect(result.current.percentText).not.toBe(englishPercentage);
+    expect(result.current.percentText).toContain(',');
+  });
+
+  it('pulses only while another slice is loading', () => {
+    const { rerender } = renderHook(
+      ({ isPartiallyLoaded }) =>
+        useHomepageBalanceBreakdownHero({
+          ...baseHero,
+          isPartiallyLoaded,
+        }),
+      { initialProps: { isPartiallyLoaded: true } },
+    );
+
+    expect(withTiming).toHaveBeenCalledWith(0.6, { duration: 900 });
+    expect(withRepeat).toHaveBeenCalled();
+
+    jest.mocked(withRepeat).mockClear();
+    rerender({ isPartiallyLoaded: false });
+
+    expect(cancelAnimation).toHaveBeenCalled();
+    expect(withRepeat).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/useHomepageBalanceBreakdownHero.ts b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/useHomepageBalanceBreakdownHero.ts
new file mode 100644
index 000000000000..cce2a163c2d7
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/useHomepageBalanceBreakdownHero.ts
@@ -0,0 +1,129 @@
+import { useCallback, useEffect, useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import {
+  cancelAnimation,
+  useAnimatedStyle,
+  useSharedValue,
+  withRepeat,
+  withTiming,
+} from 'react-native-reanimated';
+import { TextColor } from '@metamask/design-system-react-native';
+import I18n, { strings } from '../../../../../../locales/i18n';
+import {
+  getFormattedAmountChange,
+  getFormattedPercentageChange,
+} from '../../../../../component-library/components-temp/Price/AggregatedPercentage/utils';
+import { TEST_NETWORK_IDS } from '../../../../../constants/network';
+import Engine from '../../../../../core/Engine';
+import { selectAccountGroupBalanceForEmptyState } from '../../../../../selectors/assets/balances';
+import { selectEvmChainId } from '../../../../../selectors/networkController';
+import { selectPrivacyMode } from '../../../../../selectors/preferencesController';
+import { useFormatters } from '../../../../hooks/useFormatters';
+import type { HeroData } from '../../BalanceBreakdown/types';
+
+const getDeltaColor = (
+  privacyMode: boolean,
+  amount: number,
+  percent?: number,
+) => {
+  if (privacyMode) return TextColor.TextAlternative;
+
+  const change = percent ?? amount;
+  if (change > 0) return TextColor.SuccessDefault;
+  if (change < 0) return TextColor.ErrorDefault;
+  return TextColor.TextAlternative;
+};
+
+export function useHomepageBalanceBreakdownHero(hero: HeroData) {
+  const { PreferencesController } = Engine.context;
+  const { formatCurrency } = useFormatters();
+  const privacyMode = useSelector(selectPrivacyMode);
+  const selectedChainId = useSelector(selectEvmChainId);
+  const accountGroupBalance = useSelector(
+    selectAccountGroupBalanceForEmptyState,
+  );
+  const balanceOpacity = useSharedValue(1);
+  const locale = I18n.locale;
+  const animatedBalanceStyle = useAnimatedStyle(() => ({
+    opacity: balanceOpacity.value,
+  }));
+  const isLoading = hero.status === 'loading';
+  const isCurrentNetworkTestnet = TEST_NETWORK_IDS.includes(selectedChainId);
+  const shouldShowEmptyState =
+    hero.status === 'ready' &&
+    hero.totalFiat === 0 &&
+    accountGroupBalance?.totalBalanceInUserCurrency === 0 &&
+    !hero.isPartiallyLoaded &&
+    !hero.hasErroredSlice &&
+    !isCurrentNetworkTestnet;
+  const displayBalance =
+    hero.status === 'error' || hero.status === 'ineligible'
+      ? '—'
+      : formatCurrency(hero.totalFiat, hero.userCurrency);
+  const amountText = useMemo(
+    () =>
+      hero.delta
+        ? getFormattedAmountChange(hero.delta.amount, hero.userCurrency)
+        : undefined,
+    [hero.delta, hero.userCurrency],
+  );
+  const percentText = useMemo(
+    () =>
+      hero.delta?.percent === undefined
+        ? undefined
+        : getFormattedPercentageChange(hero.delta.percent * 100, locale),
+    [hero.delta?.percent, locale],
+  );
+  const accessibilityHint = strings(
+    privacyMode
+      ? 'balance_breakdown.show_balance'
+      : 'balance_breakdown.hide_balance',
+  );
+  const accessibilityLabel = privacyMode
+    ? accessibilityHint
+    : [
+        displayBalance,
+        amountText?.trim(),
+        percentText,
+        hero.delta ? strings('asset_overview.chart_time_period.1d') : undefined,
+      ]
+        .filter(Boolean)
+        .join(', ');
+  const deltaColor = hero.delta
+    ? getDeltaColor(Boolean(privacyMode), hero.delta.amount, hero.delta.percent)
+    : TextColor.TextAlternative;
+
+  const togglePrivacy = useCallback(() => {
+    PreferencesController.setPrivacyMode(!privacyMode);
+  }, [PreferencesController, privacyMode]);
+
+  useEffect(() => {
+    cancelAnimation(balanceOpacity);
+
+    if (hero.isPartiallyLoaded) {
+      balanceOpacity.value = withRepeat(
+        withTiming(0.6, { duration: 900 }),
+        -1,
+        true,
+      );
+    } else {
+      balanceOpacity.value = 1;
+    }
+
+    return () => cancelAnimation(balanceOpacity);
+  }, [balanceOpacity, hero.isPartiallyLoaded]);
+
+  return {
+    accessibilityHint,
+    accessibilityLabel,
+    amountText,
+    animatedBalanceStyle,
+    deltaColor,
+    displayBalance,
+    isLoading,
+    percentText,
+    privacyMode,
+    shouldShowEmptyState,
+    togglePrivacy,
+  };
+}
diff --git a/app/components/Views/Homepage/components/HomepageBalanceBreakdown/useHomepageBalanceBreakdownNavigation.ts b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/useHomepageBalanceBreakdownNavigation.ts
new file mode 100644
index 000000000000..5e47d0aa30de
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageBalanceBreakdown/useHomepageBalanceBreakdownNavigation.ts
@@ -0,0 +1,66 @@
+import { useCallback } from 'react';
+import { useNavigation } from '@react-navigation/native';
+import Routes from '../../../../../constants/navigation/Routes';
+import { MetaMetricsEvents } from '../../../../../core/Analytics/MetaMetrics.events';
+import { useMoneyNavigation } from '../../../../UI/Money/hooks/useMoneyNavigation';
+import { PredictEventValues } from '../../../../UI/Predict/constants/eventNames';
+import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
+import { usePerpsNavigationHandlers } from '../../Sections/Perpetuals/hooks/usePerpsNavigationHandlers';
+import type { SliceKey } from '../../BalanceBreakdown/types';
+import {
+  BalanceBreakdownEventProperties,
+  BalanceBreakdownEventSource,
+} from './balanceBreakdownEvents';
+
+export function useHomepageBalanceBreakdownNavigation() {
+  const navigation = useNavigation();
+  const { navigateToMoneyHome } = useMoneyNavigation();
+  const { handleViewAllPerps } = usePerpsNavigationHandlers();
+  const { trackEvent, createEventBuilder } = useAnalytics();
+
+  const openSlice = useCallback(
+    (key: SliceKey) => {
+      trackEvent(
+        createEventBuilder(MetaMetricsEvents.BALANCE_BREAKDOWN_SLICE_TAPPED)
+          .addProperties({
+            [BalanceBreakdownEventProperties.Slice]: key,
+            [BalanceBreakdownEventProperties.Source]:
+              BalanceBreakdownEventSource.Homepage,
+          })
+          .build(),
+      );
+
+      switch (key) {
+        case 'money':
+          navigateToMoneyHome();
+          break;
+        case 'tokens':
+          navigation.navigate(Routes.WALLET.TOKENS_FULL_VIEW);
+          break;
+        case 'perps':
+          handleViewAllPerps();
+          break;
+        case 'predict':
+          navigation.navigate(Routes.PREDICT.ROOT, {
+            screen: Routes.PREDICT.MARKET_LIST,
+            params: {
+              entryPoint: PredictEventValues.ENTRY_POINT.HOMEPAGE_BALANCE,
+            },
+          });
+          break;
+        case 'defi':
+          navigation.navigate(Routes.WALLET.DEFI_FULL_VIEW);
+          break;
+      }
+    },
+    [
+      createEventBuilder,
+      handleViewAllPerps,
+      navigateToMoneyHome,
+      navigation,
+      trackEvent,
+    ],
+  );
+
+  return { openSlice };
+}
diff --git a/app/components/Views/ImportFromSecretRecoveryPhrase/index.test.tsx b/app/components/Views/ImportFromSecretRecoveryPhrase/index.test.tsx
index 356acf0c5344..66f1ced13787 100644
--- a/app/components/Views/ImportFromSecretRecoveryPhrase/index.test.tsx
+++ b/app/components/Views/ImportFromSecretRecoveryPhrase/index.test.tsx
@@ -1320,12 +1320,7 @@ describe('ImportFromSecretRecoveryPhrase', () => {
                 jest
                   .spyOn(navigation, 'navigate')
                   .mockImplementation(mockNavigate);
-                return (
-                  <ImportFromSecretRecoveryPhrase
-                    navigation={navigation}
-                    route={{ params: {} }}
-                  />
-                );
+                return <ImportFromSecretRecoveryPhrase />;
               }}
             </Stack.Screen>
           </Stack.Navigator>
@@ -1373,14 +1368,9 @@ describe('ImportFromSecretRecoveryPhrase', () => {
               name={Routes.ONBOARDING.IMPORT_FROM_SECRET_RECOVERY_PHRASE}
               initialParams={{ qrSyncImport: true }}
             >
-              {({ navigation, route }) => {
+              {({ navigation }) => {
                 jest.spyOn(navigation, 'goBack').mockImplementation(mockGoBack);
-                return (
-                  <ImportFromSecretRecoveryPhrase
-                    navigation={navigation}
-                    route={route}
-                  />
-                );
+                return <ImportFromSecretRecoveryPhrase />;
               }}
             </Stack.Screen>
           </Stack.Navigator>
@@ -1808,6 +1798,8 @@ describe('ImportFromSecretRecoveryPhrase', () => {
 
       await act(async () => {
         fireEvent.changeText(passwordInput, 'StrongPass123!');
+      });
+      await act(async () => {
         fireEvent.changeText(confirmPasswordInput, 'StrongPass123!');
       });
 
diff --git a/app/components/Views/ImportFromSecretRecoveryPhrase/index.js b/app/components/Views/ImportFromSecretRecoveryPhrase/index.tsx
similarity index 83%
rename from app/components/Views/ImportFromSecretRecoveryPhrase/index.js
rename to app/components/Views/ImportFromSecretRecoveryPhrase/index.tsx
index a33e6d95f5a6..c99120158c00 100644
--- a/app/components/Views/ImportFromSecretRecoveryPhrase/index.js
+++ b/app/components/Views/ImportFromSecretRecoveryPhrase/index.tsx
@@ -6,7 +6,6 @@ import React, {
   useContext,
   useMemo,
 } from 'react';
-import PropTypes from 'prop-types';
 import {
   Alert,
   TouchableOpacity,
@@ -14,14 +13,23 @@ import {
   Dimensions,
   Keyboard,
   Platform,
+  TextInput,
 } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import { connect, useSelector } from 'react-redux';
+import { useSelector, useDispatch } from 'react-redux';
 import {
   KeyboardAwareScrollView,
   KeyboardStickyView,
   useKeyboardState,
 } from 'react-native-keyboard-controller';
+import {
+  CommonActions,
+  ParamListBase,
+  RouteProp,
+  useNavigation,
+  useRoute,
+} from '@react-navigation/native';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { isTestEnvironment } from '../../../util/test/utils';
 import AppConstants from '../../../core/AppConstants';
 import {
@@ -36,6 +44,11 @@ import {
   MIN_PASSWORD_LENGTH,
 } from '../../../util/password';
 import { MetaMetricsEvents } from '../../../core/Analytics';
+import type {
+  IMetaMetricsEvent,
+  ITrackingEvent,
+  JsonMap,
+} from '../../../core/Analytics/MetaMetrics.types';
 import { useTheme } from '../../../util/theme';
 import { saveOnboardingEvent as saveEvent } from '../../../actions/onboarding';
 import { passwordSet, seedphraseBackedUp } from '../../../actions/user';
@@ -57,14 +70,20 @@ import {
   ButtonVariant,
   FontWeight,
   HeaderStandard,
-  IconName as DSIconName,
   Label,
   Text,
   TextColor,
   TextVariant,
+  Icon,
+  IconName,
+  IconSize,
+  IconColor,
+  Checkbox,
+  TextField,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { Authentication } from '../../../core';
+import type { AuthData } from '../../../core/Authentication/Authentication';
 import Engine from '../../../core/Engine';
 import AUTHENTICATION_TYPE from '../../../constants/userProperties';
 import { passcodeType } from '../../../util/authentication';
@@ -74,19 +93,12 @@ import { ChoosePasswordSelectorsIDs } from '../ChoosePassword/ChoosePassword.tes
 import trackOnboarding from '../../../util/metrics/TrackOnboarding/trackOnboarding';
 import { AnalyticsEventBuilder } from '../../../util/analytics/AnalyticsEventBuilder';
 import { selectWalletSetupCompletedAttributionAnalyticsProps } from '../../../selectors/attribution';
-import Checkbox from '../../../component-library/components/Checkbox';
-import OldButton, {
-  ButtonVariants,
-} from '../../../component-library/components/Buttons/Button';
-import Icon, {
-  IconName,
-  IconSize,
-  IconColor,
-} from '../../../component-library/components/Icons/Icon';
 import { ToastContext } from '../../../component-library/components/Toast/Toast.context';
 import { ToastVariants } from '../../../component-library/components/Toast/Toast.types';
-import TextField from '../../../component-library/components/Form/TextField/TextField';
-import { CommonActions } from '@react-navigation/native';
+import {
+  IconName as ToastIconName,
+  IconColor as ToastIconColor,
+} from '../../../component-library/components/Icons/Icon';
 import { SRP_LENGTHS, SPACE_CHAR, PASSCODE_NOT_SET_ERROR } from './constant';
 import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import {
@@ -99,9 +111,10 @@ import {
   endTrace,
   trace,
   TraceOperation,
+  TraceContext,
 } from '../../../util/trace';
 import { v4 as uuidv4 } from 'uuid';
-import SrpInputGrid from '../../UI/SrpInputGrid';
+import SrpInputGrid, { SrpInputGridRef } from '../../UI/SrpInputGrid';
 import SrpWordSuggestions from '../../UI/SrpWordSuggestions';
 import { selectAddDeviceSyncEnabled } from '../../../selectors/featureFlagController/addDeviceSync';
 import {
@@ -115,13 +128,26 @@ import { useScreenPerformance } from '../../../hooks/performance/useScreenPerfor
 
 const SCREEN_WIDTH = Dimensions.get('window').width;
 
+type TrackFn = (
+  event: IMetaMetricsEvent | ITrackingEvent,
+  properties?: JsonMap,
+) => void;
+
+interface HandleWalletImportFailureParams {
+  importError: Error;
+  track: TrackFn;
+  navigation: NativeStackNavigationProp<ParamListBase>;
+  isMetricsEnabled: () => boolean;
+  onboardingTraceCtx?: TraceContext;
+}
+
 function handleWalletImportFailure({
   importError,
   track,
   navigation,
   isMetricsEnabled,
   onboardingTraceCtx,
-}) {
+}: HandleWalletImportFailureParams) {
   track(MetaMetricsEvents.WALLET_SETUP_FAILURE, {
     wallet_setup_type: 'import',
     error_type: importError.toString(),
@@ -169,19 +195,45 @@ function handleWalletImportFailure({
   });
 }
 
+interface ImportFromSecretRecoveryPhraseRouteParams {
+  qrSyncImport?: boolean;
+  onboardingTraceCtx?: TraceContext;
+  oauthLoginSuccess?: boolean;
+  previous_screen?: string;
+}
+
+interface PasswordVisibilityToggleProps {
+  isVisible: boolean;
+  onToggle: () => void;
+  testID: string;
+}
+
+const PasswordVisibilityToggle = ({
+  isVisible,
+  onToggle,
+  testID,
+}: PasswordVisibilityToggleProps) => (
+  <TouchableOpacity onPress={onToggle} testID={testID}>
+    <Icon
+      name={isVisible ? IconName.Eye : IconName.EyeSlash}
+      size={IconSize.Lg}
+      color={IconColor.IconAlternative}
+    />
+  </TouchableOpacity>
+);
+
 /**
  * View where users can set restore their account
  * using a secret recovery phrase (SRP)
  * The SRP was formally called the seed phrase
  */
-const ImportFromSecretRecoveryPhrase = ({
-  navigation,
-  passwordSet,
-  setLockTime,
-  seedphraseBackedUp,
-  saveOnboardingEvent,
-  route,
-}) => {
+const ImportFromSecretRecoveryPhrase = () => {
+  const navigation = useNavigation<NativeStackNavigationProp<ParamListBase>>();
+  const route =
+    useRoute<
+      RouteProp<{ params: ImportFromSecretRecoveryPhraseRouteParams }, 'params'>
+    >();
+  const dispatch = useDispatch();
   const isQrSyncImport = Boolean(route?.params?.qrSyncImport);
   const qrSyncPrimaryMnemonic = useSelector(selectQrSyncPrimaryMnemonic);
   const qrSyncImportMnemonic = useSelector(selectQrSyncImportMnemonic);
@@ -189,28 +241,30 @@ const ImportFromSecretRecoveryPhrase = ({
   const walletSetupCompletedAttributionProps = useSelector(
     selectWalletSetupCompletedAttributionAnalyticsProps,
   );
-  const { colors, themeAppearance } = useTheme();
+  const { themeAppearance } = useTheme();
   const tw = useTailwind();
   const isAddDeviceSyncEnabled = useSelector(selectAddDeviceSyncEnabled);
 
-  const confirmPasswordInput = useRef();
+  const confirmPasswordInputRef = useRef<TextInput | null>(null);
 
   const { toastRef } = useContext(ToastContext);
-  const passwordSetupAttemptTraceCtxRef = useRef(null);
+  const passwordSetupAttemptTraceCtxRef = useRef<TraceContext | null>(null);
 
   const [password, setPassword] = useState('');
   const [confirmPassword, setConfirmPassword] = useState('');
-  const [biometryType, setBiometryType] = useState(null);
+  const [biometryType, setBiometryType] = useState<string | null | undefined>(
+    null,
+  );
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState('');
   const [hideSeedPhraseInput, setHideSeedPhraseInput] = useState(true);
-  const [seedPhrase, setSeedPhrase] = useState(['']);
+  const [seedPhrase, setSeedPhrase] = useState<string[]>(['']);
   const [currentStep, setCurrentStep] = useState(0);
   const [learnMore, setLearnMore] = useState(false);
-  const [showPasswordIndex, setShowPasswordIndex] = useState([0, 1]);
+  const [showPasswordIndex, setShowPasswordIndex] = useState<number[]>([0, 1]);
   const [isPasswordFieldFocused, setIsPasswordFieldFocused] = useState(false);
 
-  const srpInputGridRef = useRef(null);
+  const srpInputGridRef = useRef<SrpInputGridRef>(null);
   const [slideAnim] = useState(() => new Animated.Value(0));
   const [currentInputWord, setCurrentInputWord] = useState('');
 
@@ -296,13 +350,17 @@ const ImportFromSecretRecoveryPhrase = ({
 
   const { isEnabled: isMetricsEnabled } = useAnalytics();
 
-  const track = useCallback(
+  const track = useCallback<TrackFn>(
     (event, properties) => {
       const eventBuilder = AnalyticsEventBuilder.createEventBuilder(event);
-      eventBuilder.addProperties(properties);
-      trackOnboarding(eventBuilder.build(), saveOnboardingEvent);
+      if (properties) {
+        eventBuilder.addProperties(properties);
+      }
+      trackOnboarding(eventBuilder.build(), (savedEvent: ITrackingEvent) =>
+        dispatch(saveEvent([savedEvent])),
+      );
     },
-    [saveOnboardingEvent],
+    [dispatch],
   );
 
   const onQrCodePress = useCallback(() => {
@@ -315,7 +373,7 @@ const ImportFromSecretRecoveryPhrase = ({
     navigation.navigate(Routes.QR_TAB_SWITCHER, {
       initialScreen: QRTabSwitcherScreens.Scanner,
       disableTabber: true,
-      onScanSuccess: ({ seed = undefined }) => {
+      onScanSuccess: ({ seed }: { seed?: string }) => {
         if (seed) {
           srpInputGridRef.current?.handleSeedPhraseChange(seed);
         } else {
@@ -333,7 +391,7 @@ const ImportFromSecretRecoveryPhrase = ({
   }, [hideSeedPhraseInput, navigation]);
 
   const animateToStep = useCallback(
-    (nextStep) => {
+    (nextStep: number) => {
       if (isTestEnvironment) {
         setCurrentStep(nextStep);
         return;
@@ -412,19 +470,19 @@ const ImportFromSecretRecoveryPhrase = ({
     [],
   );
 
-  const onPasswordChange = (value) => {
+  const onPasswordChange = (value: string) => {
     setPassword(value);
     if (value === '') {
       setConfirmPassword('');
     }
   };
 
-  const onPasswordConfirmChange = (value) => {
+  const onPasswordConfirmChange = (value: string) => {
     setConfirmPassword(value);
   };
 
   const jumpToConfirmPassword = () => {
-    const { current } = confirmPasswordInput;
+    const { current } = confirmPasswordInputRef;
     current && current.focus();
   };
 
@@ -442,8 +500,8 @@ const ImportFromSecretRecoveryPhrase = ({
           { label: strings('import_from_seed.seed_phrase_length_error') },
         ],
         hasNoTimeout: false,
-        iconName: IconName.Error,
-        iconColor: IconColor.Error,
+        iconName: ToastIconName.Error,
+        iconColor: ToastIconColor.Error,
       });
       return false;
     }
@@ -490,7 +548,7 @@ const ImportFromSecretRecoveryPhrase = ({
     [isPasswordFieldFocused, password],
   );
 
-  const toggleShowPassword = (index) => {
+  const toggleShowPassword = (index: number) => {
     setShowPasswordIndex((prev) => {
       if (prev.includes(index)) {
         return prev.filter((item) => item !== index);
@@ -534,7 +592,7 @@ const ImportFromSecretRecoveryPhrase = ({
     const onboardingTraceCtx = route?.params?.onboardingTraceCtx;
     const oauthLoginSuccess = route?.params?.oauthLoginSuccess || false;
 
-    let authData;
+    let authData: AuthData;
     try {
       trace({
         name: TraceName.OnboardingSRPAccountImportTime,
@@ -566,7 +624,7 @@ const ImportFromSecretRecoveryPhrase = ({
     } catch (importError) {
       setLoading(false);
       handleWalletImportFailure({
-        importError,
+        importError: importError as Error,
         track,
         navigation,
         isMetricsEnabled,
@@ -577,9 +635,9 @@ const ImportFromSecretRecoveryPhrase = ({
 
     setBiometryType(authData.availableBiometryType);
     setLoading(false);
-    passwordSet();
-    setLockTime(AppConstants.DEFAULT_LOCK_TIMEOUT);
-    seedphraseBackedUp();
+    dispatch(passwordSet());
+    dispatch(setLockTime(AppConstants.DEFAULT_LOCK_TIMEOUT));
+    dispatch(seedphraseBackedUp());
     track(MetaMetricsEvents.WALLET_IMPORTED, {
       biometrics_enabled: Boolean(biometryType),
     });
@@ -664,7 +722,7 @@ const ImportFromSecretRecoveryPhrase = ({
           currentStep === 0
             ? [
                 {
-                  iconName: DSIconName.Scan,
+                  iconName: IconName.Scan,
                   onPress: onQrCodePress,
                   testID: ImportFromSeedSelectorsIDs.QR_CODE_BUTTON_ID,
                 },
@@ -744,7 +802,7 @@ const ImportFromSecretRecoveryPhrase = ({
                       <Icon
                         name={IconName.Info}
                         size={IconSize.Md}
-                        color={colors.icon.alternative}
+                        color={IconColor.IconAlternative}
                       />
                     </TouchableOpacity>
                   </Box>
@@ -799,32 +857,27 @@ const ImportFromSecretRecoveryPhrase = ({
                   onChangeText={onPasswordChange}
                   onFocus={() => setIsPasswordFieldFocused(true)}
                   onBlur={() => setIsPasswordFieldFocused(false)}
-                  secureTextEntry={showPasswordIndex.includes(0)}
-                  returnKeyType="next"
-                  autoCapitalize="none"
-                  autoComplete="new-password"
-                  keyboardAppearance={themeAppearance || 'light'}
-                  onSubmitEditing={jumpToConfirmPassword}
                   isError={isPasswordTooShort}
                   endAccessory={
-                    <Icon
-                      name={
-                        showPasswordIndex.includes(0)
-                          ? IconName.Eye
-                          : IconName.EyeSlash
-                      }
-                      size={IconSize.Lg}
-                      color={colors.icon.alternative}
-                      onPress={() => toggleShowPassword(0)}
+                    <PasswordVisibilityToggle
+                      isVisible={showPasswordIndex.includes(0)}
+                      onToggle={() => toggleShowPassword(0)}
                       testID={
                         ImportFromSeedSelectorsIDs.NEW_PASSWORD_VISIBILITY_ID
                       }
                     />
                   }
-                  testID={ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID}
-                  accessibilityLabel={
-                    ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID
-                  }
+                  inputProps={{
+                    secureTextEntry: showPasswordIndex.includes(0),
+                    testID: ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID,
+                    accessibilityLabel:
+                      ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID,
+                    onSubmitEditing: jumpToConfirmPassword,
+                    autoComplete: 'password-new',
+                    returnKeyType: 'next',
+                    autoCapitalize: 'none',
+                    keyboardAppearance: themeAppearance,
+                  }}
                 />
                 <Text
                   variant={TextVariant.BodySm}
@@ -850,36 +903,32 @@ const ImportFromSecretRecoveryPhrase = ({
                   {strings('import_from_seed.confirm_password')}
                 </Label>
                 <TextField
-                  ref={confirmPasswordInput}
+                  inputRef={confirmPasswordInputRef}
                   onChangeText={onPasswordConfirmChange}
-                  secureTextEntry={showPasswordIndex.includes(1)}
-                  autoComplete="new-password"
-                  returnKeyType="done"
-                  autoCapitalize="none"
                   value={confirmPassword}
                   isError={isError}
-                  keyboardAppearance={themeAppearance || 'light'}
-                  onSubmitEditing={Keyboard.dismiss}
                   endAccessory={
-                    <Icon
-                      name={
-                        showPasswordIndex.includes(1)
-                          ? IconName.Eye
-                          : IconName.EyeSlash
-                      }
-                      size={IconSize.Lg}
-                      color={colors.icon.alternative}
-                      onPress={() => toggleShowPassword(1)}
+                    <PasswordVisibilityToggle
+                      isVisible={showPasswordIndex.includes(1)}
+                      onToggle={() => toggleShowPassword(1)}
                       testID={
                         ImportFromSeedSelectorsIDs.CONFIRM_PASSWORD_VISIBILITY_ID
                       }
                     />
                   }
-                  testID={ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID}
-                  accessibilityLabel={
-                    ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID
-                  }
                   isDisabled={password === ''}
+                  inputProps={{
+                    secureTextEntry: showPasswordIndex.includes(1),
+                    testID:
+                      ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID,
+                    accessibilityLabel:
+                      ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID,
+                    onSubmitEditing: Keyboard.dismiss,
+                    autoComplete: 'password-new',
+                    returnKeyType: 'done',
+                    autoCapitalize: 'none',
+                    keyboardAppearance: themeAppearance,
+                  }}
                 />
                 {isError && (
                   <Text
@@ -898,35 +947,35 @@ const ImportFromSecretRecoveryPhrase = ({
                 twClassName="gap-2 mt-2 mb-4 bg-background-section rounded-lg p-4"
               >
                 <Checkbox
-                  onPress={() => setLearnMore(!learnMore)}
-                  isChecked={learnMore}
-                  style={tw.style('items-start')}
+                  onChange={() => setLearnMore(!learnMore)}
+                  isSelected={learnMore}
                   testID={ChoosePasswordSelectorsIDs.I_UNDERSTAND_CHECKBOX_ID}
+                  accessibilityLabel={
+                    ChoosePasswordSelectorsIDs.I_UNDERSTAND_CHECKBOX_ID
+                  }
                 />
-                <OldButton
-                  variant={ButtonVariants.Link}
+                <TouchableOpacity
                   onPress={() => setLearnMore(!learnMore)}
+                  testID={ImportFromSeedSelectorsIDs.CHECKBOX_TEXT_ID}
                   style={tw.style(
-                    'flex-row items-start justify-start gap-px flex-wrap w-[90%] -mt-1.5',
+                    'flex-row items-start justify-start flex-wrap w-[90%] -mt-1.5',
                   )}
-                  testID={ImportFromSeedSelectorsIDs.CHECKBOX_TEXT_ID}
-                  label={
+                >
+                  <Text
+                    variant={TextVariant.BodyMd}
+                    color={TextColor.TextDefault}
+                  >
+                    {strings('import_from_seed.learn_more')}
                     <Text
                       variant={TextVariant.BodyMd}
-                      color={TextColor.TextDefault}
+                      color={TextColor.PrimaryDefault}
+                      onPress={learnMoreLink}
+                      testID={ImportFromSeedSelectorsIDs.LEARN_MORE_LINK_ID}
                     >
-                      {strings('import_from_seed.learn_more')}
-                      <Text
-                        variant={TextVariant.BodyMd}
-                        color={TextColor.PrimaryDefault}
-                        onPress={learnMoreLink}
-                        testID={ImportFromSeedSelectorsIDs.LEARN_MORE_LINK_ID}
-                      >
-                        {' ' + strings('reset_password.learn_more')}
-                      </Text>
+                      {' ' + strings('reset_password.learn_more')}
                     </Text>
-                  }
-                />
+                  </Text>
+                </TouchableOpacity>
               </Box>
             </Box>
           )}
@@ -988,44 +1037,4 @@ const ImportFromSecretRecoveryPhrase = ({
   );
 };
 
-ImportFromSecretRecoveryPhrase.propTypes = {
-  /**
-   * The navigator object
-   */
-  navigation: PropTypes.object,
-  /**
-   * The action to update the password set flag
-   * in the redux store
-   */
-  passwordSet: PropTypes.func,
-  /**
-   * The action to set the locktime
-   * in the redux store
-   */
-  setLockTime: PropTypes.func,
-  /**
-   * The action to update the seedphrase backed up flag
-   * in the redux store
-   */
-  seedphraseBackedUp: PropTypes.func,
-  /**
-   * Action to save onboarding event
-   */
-  saveOnboardingEvent: PropTypes.func,
-  /**
-   * Object that represents the current route info like params passed to it
-   */
-  route: PropTypes.object,
-};
-
-const mapDispatchToProps = (dispatch) => ({
-  setLockTime: (time) => dispatch(setLockTime(time)),
-  passwordSet: () => dispatch(passwordSet()),
-  seedphraseBackedUp: () => dispatch(seedphraseBackedUp()),
-  saveOnboardingEvent: (...eventArgs) => dispatch(saveEvent(eventArgs)),
-});
-
-export default connect(
-  null,
-  mapDispatchToProps,
-)(ImportFromSecretRecoveryPhrase);
+export default ImportFromSecretRecoveryPhrase;
diff --git a/app/components/Views/ImportNewSecretRecoveryPhrase/ImportNewSecretRecoveryPhrase.view.test.tsx b/app/components/Views/ImportNewSecretRecoveryPhrase/ImportNewSecretRecoveryPhrase.view.test.tsx
index 57f920c2f90d..b2453cd559c5 100644
--- a/app/components/Views/ImportNewSecretRecoveryPhrase/ImportNewSecretRecoveryPhrase.view.test.tsx
+++ b/app/components/Views/ImportNewSecretRecoveryPhrase/ImportNewSecretRecoveryPhrase.view.test.tsx
@@ -11,10 +11,10 @@ import Routes from '../../../constants/navigation/Routes';
 /**
  * Component View tests for ImportNewSecretRecoveryPhrase (multi-SRP import flow).
  *
- * Mirrors (partial): tests/smoke-appium/accounts/import-srp.spec.ts
- * — screen render, disabled import button, and SRP validation error.
+ * Covers screen render / validation from accounts import-srp Appium;
+ * former google-login-add-srp Appium smoke removed. Successful vault import
+ * remains on SmokeAccounts import-srp.
  *
- * Run: yarn jest -c jest.config.view.js ImportNewSecretRecoveryPhrase.view.test.tsx --runInBand
  */
 
 function renderImportNewSRP() {
diff --git a/app/components/Views/Login/index.test.tsx b/app/components/Views/Login/index.test.tsx
index a9f460c40ebd..daa5310fe060 100644
--- a/app/components/Views/Login/index.test.tsx
+++ b/app/components/Views/Login/index.test.tsx
@@ -34,6 +34,11 @@ import {
   VAULT_ERROR,
   DENY_PIN_ERROR_ANDROID,
 } from './constants';
+import {
+  LOGIN_APP_START_TYPE,
+  LOGIN_CONTENT_STATE,
+  resetLoginAppStartTypeForTesting,
+} from './loginPerformanceTags';
 import trackErrorAsAnalytics from '../../../util/metrics/TrackError/trackErrorAsAnalytics';
 import { trackVaultCorruption } from '../../../util/analytics/vaultCorruptionTracking';
 import { downloadStateLogs } from '../../../util/logs';
@@ -345,6 +350,7 @@ describe('Login', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    resetLoginAppStartTypeForTesting();
     Alert.alert = mockAlertAlert;
     mockNavigate.mockClear();
     mockReplace.mockClear();
@@ -1795,7 +1801,27 @@ describe('Login', () => {
   });
 
   describe('Trace integration', () => {
-    it('calls trace for AuthenticateUser during login', async () => {
+    it('starts LoginUserInteraction with locked and app_start_type tags', () => {
+      mockRoute.mockReturnValue({
+        params: { locked: true, oauthLoginSuccess: false },
+      });
+
+      renderWithProvider(<Login />);
+
+      expect(mockTrace).toHaveBeenCalledWith({
+        name: TraceName.LoginUserInteraction,
+        op: TraceOperation.Login,
+        tags: {
+          locked: true,
+          app_start_type: LOGIN_APP_START_TYPE.COLD,
+        },
+      });
+    });
+
+    it('ends LoginUserInteraction with content_state on password unlock', async () => {
+      mockRoute.mockReturnValue({
+        params: { locked: false, oauthLoginSuccess: false },
+      });
       const { getByTestId } = renderWithProvider(<Login />);
       const passwordInput = getByTestId(LoginViewSelectors.PASSWORD_INPUT);
 
@@ -1806,16 +1832,69 @@ describe('Login', () => {
         fireEvent(passwordInput, 'submitEditing');
       });
 
-      expect(mockTrace).toHaveBeenCalledTimes(2);
-      expect(mockTrace).toHaveBeenNthCalledWith(1, {
+      expect(mockEndTrace).toHaveBeenCalledWith({
         name: TraceName.LoginUserInteraction,
-        op: TraceOperation.Login,
+        data: {
+          success: true,
+          content_state: LOGIN_CONTENT_STATE.FILLED,
+        },
       });
-      expect(mockTrace).toHaveBeenNthCalledWith(
-        2,
+      expect(mockTrace).toHaveBeenCalledWith(
         {
           name: TraceName.AuthenticateUser,
           op: TraceOperation.Login,
+          tags: {
+            locked: false,
+            app_start_type: LOGIN_APP_START_TYPE.COLD,
+          },
+        },
+        expect.any(Function),
+      );
+    });
+
+    it('ends LoginUserInteraction on device authentication unlock', async () => {
+      mockRoute.mockReturnValue({
+        params: { locked: false, oauthLoginSuccess: false },
+      });
+      mockUseAuthCapabilities.mockReturnValue({
+        capabilities: defaultCapabilities,
+        isLoading: false,
+      });
+      mockGetAuthType.mockResolvedValue({
+        currentAuthType: AUTHENTICATION_TYPE.DEVICE_AUTHENTICATION,
+        availableBiometryType: 'TouchID',
+      });
+      mockUnlockWallet.mockResolvedValueOnce(true);
+
+      const { getByTestId } = renderWithProvider(<Login />);
+
+      await act(async () => {
+        await new Promise((resolve) => setTimeout(resolve, 100));
+      });
+
+      const biometryButton = getByTestId(
+        LoginViewSelectors.DEVICE_AUTHENTICATION_ICON,
+      );
+
+      await act(async () => {
+        fireEvent.press(biometryButton);
+      });
+
+      expect(mockEndTrace).toHaveBeenCalledWith({
+        name: TraceName.LoginUserInteraction,
+        data: {
+          success: true,
+          content_state: LOGIN_CONTENT_STATE.FILLED,
+        },
+      });
+      expect(mockTrace).toHaveBeenCalledWith(
+        {
+          name: TraceName.LoginBiometricAuthentication,
+          op: TraceOperation.Login,
+          tags: {
+            locked: false,
+            app_start_type: LOGIN_APP_START_TYPE.COLD,
+          },
         },
         expect.any(Function),
       );
diff --git a/app/components/Views/Login/index.tsx b/app/components/Views/Login/index.tsx
index ee2c88fcdc52..4ca9fbe77c4a 100644
--- a/app/components/Views/Login/index.tsx
+++ b/app/components/Views/Login/index.tsx
@@ -94,6 +94,11 @@ import {
   isBiometricUnlockCancelledByUser,
 } from '../../../core/Authentication/utils';
 import AUTHENTICATION_TYPE from '../../../constants/userProperties';
+import {
+  getLoginInteractionEndData,
+  getLoginPerformanceTags,
+  markLoginInteractionCompleted,
+} from './loginPerformanceTags';
 
 interface LoginRouteParams {
   locked: boolean;
@@ -128,11 +133,14 @@ const Login: React.FC<LoginProps> = ({ saveOnboardingEvent }) => {
     checkIsSeedlessPasswordOutdated,
   } = useAuthentication();
   const { capabilities } = useAuthCapabilities();
+  const isLocked = Boolean(route.params?.locked);
+  const loginPerformanceTags = useRef(getLoginPerformanceTags(isLocked));
 
   useEffect(() => {
     trace({
       name: TraceName.LoginUserInteraction,
       op: TraceOperation.Login,
+      tags: loginPerformanceTags.current,
     });
     trackOnboarding(MetaMetricsEvents.LOGIN_SCREEN_VIEWED, saveOnboardingEvent);
     setStartFoxAnimation('Start');
@@ -300,13 +308,18 @@ const Login: React.FC<LoginProps> = ({ saveOnboardingEvent }) => {
     setLoading(true);
     setError(null);
 
-    endTrace({ name: TraceName.LoginUserInteraction });
+    endTrace({
+      name: TraceName.LoginUserInteraction,
+      data: getLoginInteractionEndData(),
+    });
+    markLoginInteractionCompleted();
 
     try {
       await trace(
         {
           name: TraceName.AuthenticateUser,
           op: TraceOperation.Login,
+          tags: loginPerformanceTags.current,
         },
         async () => {
           const isSeedlessPasswordOutdated =
@@ -358,11 +371,18 @@ const Login: React.FC<LoginProps> = ({ saveOnboardingEvent }) => {
     setLoading(true);
     setError(null);
 
+    endTrace({
+      name: TraceName.LoginUserInteraction,
+      data: getLoginInteractionEndData(),
+    });
+    markLoginInteractionCompleted();
+
     try {
       await trace(
         {
           name: TraceName.LoginBiometricAuthentication,
           op: TraceOperation.Login,
+          tags: loginPerformanceTags.current,
         },
         async () => {
           await unlockWallet();
diff --git a/app/components/Views/Login/loginPerformanceTags.test.ts b/app/components/Views/Login/loginPerformanceTags.test.ts
new file mode 100644
index 000000000000..0aebc50119fe
--- /dev/null
+++ b/app/components/Views/Login/loginPerformanceTags.test.ts
@@ -0,0 +1,73 @@
+import {
+  getLoginAppStartType,
+  getLoginInteractionEndData,
+  getLoginPerformanceTags,
+  LOGIN_APP_START_TYPE,
+  LOGIN_CONTENT_STATE,
+  markLoginInteractionCompleted,
+  resetLoginAppStartTypeForTesting,
+} from './loginPerformanceTags';
+
+describe('loginPerformanceTags', () => {
+  beforeEach(() => {
+    resetLoginAppStartTypeForTesting();
+  });
+
+  describe('getLoginAppStartType', () => {
+    it('returns cold before any login interaction completes', () => {
+      const result = getLoginAppStartType();
+
+      expect(result).toBe(LOGIN_APP_START_TYPE.COLD);
+    });
+
+    it('returns warm after a login interaction completes', () => {
+      markLoginInteractionCompleted();
+
+      const result = getLoginAppStartType();
+
+      expect(result).toBe(LOGIN_APP_START_TYPE.WARM);
+    });
+  });
+
+  describe('getLoginPerformanceTags', () => {
+    it('includes locked and cold app_start_type before unlock', () => {
+      const result = getLoginPerformanceTags(true);
+
+      expect(result).toEqual({
+        locked: true,
+        app_start_type: LOGIN_APP_START_TYPE.COLD,
+      });
+    });
+
+    it('includes warm app_start_type after unlock completes', () => {
+      markLoginInteractionCompleted();
+
+      const result = getLoginPerformanceTags(false);
+
+      expect(result).toEqual({
+        locked: false,
+        app_start_type: LOGIN_APP_START_TYPE.WARM,
+      });
+    });
+  });
+
+  describe('getLoginInteractionEndData', () => {
+    it('returns success with filled content_state by default', () => {
+      const result = getLoginInteractionEndData();
+
+      expect(result).toEqual({
+        success: true,
+        content_state: LOGIN_CONTENT_STATE.FILLED,
+      });
+    });
+
+    it('returns the provided content_state', () => {
+      const result = getLoginInteractionEndData(LOGIN_CONTENT_STATE.EMPTY);
+
+      expect(result).toEqual({
+        success: true,
+        content_state: LOGIN_CONTENT_STATE.EMPTY,
+      });
+    });
+  });
+});
diff --git a/app/components/Views/Login/loginPerformanceTags.ts b/app/components/Views/Login/loginPerformanceTags.ts
new file mode 100644
index 000000000000..70bbd702e4b0
--- /dev/null
+++ b/app/components/Views/Login/loginPerformanceTags.ts
@@ -0,0 +1,70 @@
+/**
+ * Login span tags for Sentry (TO-981).
+ *
+ * `app_start_type` is process-scoped: Login mounts before the first unlock
+ * interaction completes are `cold`; mounts after that are `warm` (e.g. lock
+ * then unlock again in the same process).
+ */
+
+export const LOGIN_APP_START_TYPE = {
+  COLD: 'cold',
+  WARM: 'warm',
+} as const;
+
+export type LoginAppStartType =
+  (typeof LOGIN_APP_START_TYPE)[keyof typeof LOGIN_APP_START_TYPE];
+
+export const LOGIN_CONTENT_STATE = {
+  FILLED: 'filled',
+  EMPTY: 'empty',
+} as const;
+
+export type LoginContentState =
+  (typeof LOGIN_CONTENT_STATE)[keyof typeof LOGIN_CONTENT_STATE];
+
+let hasCompletedLoginInteractionInProcess = false;
+
+/**
+ * Returns cold until the first login interaction ends in this process, then warm.
+ * Exported for unit tests.
+ */
+export function getLoginAppStartType(): LoginAppStartType {
+  return hasCompletedLoginInteractionInProcess
+    ? LOGIN_APP_START_TYPE.WARM
+    : LOGIN_APP_START_TYPE.COLD;
+}
+
+/**
+ * Marks that a login interaction has completed so later mounts read as warm.
+ * Exported for unit tests.
+ */
+export function markLoginInteractionCompleted(): void {
+  hasCompletedLoginInteractionInProcess = true;
+}
+
+/** Reset process-scoped start-type tracking. Exported for unit tests. */
+export function resetLoginAppStartTypeForTesting(): void {
+  hasCompletedLoginInteractionInProcess = false;
+}
+
+export interface LoginPerformanceTags {
+  locked: boolean;
+  app_start_type: LoginAppStartType;
+  [key: string]: boolean | string;
+}
+
+export function getLoginPerformanceTags(locked: boolean): LoginPerformanceTags {
+  return {
+    locked,
+    app_start_type: getLoginAppStartType(),
+  };
+}
+
+export function getLoginInteractionEndData(
+  contentState: LoginContentState = LOGIN_CONTENT_STATE.FILLED,
+): { success: true; content_state: LoginContentState } {
+  return {
+    success: true,
+    content_state: contentState,
+  };
+}
diff --git a/app/components/Views/MultichainAccounts/MultichainAccountConnect/MultichainAccountConnect.test.tsx b/app/components/Views/MultichainAccounts/MultichainAccountConnect/MultichainAccountConnect.test.tsx
index 80284dc591ef..560ab36a073e 100644
--- a/app/components/Views/MultichainAccounts/MultichainAccountConnect/MultichainAccountConnect.test.tsx
+++ b/app/components/Views/MultichainAccounts/MultichainAccountConnect/MultichainAccountConnect.test.tsx
@@ -813,7 +813,7 @@ describe('MultichainAccountConnect', () => {
         ...createMockState(),
         sdk: {
           v2Connections: {},
-          wc2Metadata: { id: 'mock-wc2-id' },
+          wc2Metadata: { id: mockChannelId },
         },
       };
 
@@ -2274,7 +2274,7 @@ describe('MultichainAccountConnect', () => {
         ...state,
         sdk: {
           wc2Metadata: {
-            id: 'mock-wc2-id',
+            id: 'wc-channel-id',
             url: 'https://malicious-dapp.com',
             name: 'Malicious Dapp',
             icon: '',
@@ -2572,7 +2572,7 @@ describe('MultichainAccountConnect', () => {
       const { getByTestId } = renderForReferrer(channelId, {
         sdk: {
           v2Connections: {},
-          wc2Metadata: { id: 'wc-id', url: wcUrl },
+          wc2Metadata: { id: channelId, url: wcUrl },
         },
       });
 
@@ -2585,6 +2585,28 @@ describe('MultichainAccountConnect', () => {
       });
     });
 
+    it('ignores stale wc2 metadata for in-app browser origins', async () => {
+      const origin = 'https://app.uniswap.org';
+
+      const { getByTestId } = renderForReferrer(origin, {
+        sdk: {
+          v2Connections: {},
+          wc2Metadata: {
+            id: 'stale-pairing-topic',
+            url: 'https://chikn.farm',
+          },
+        },
+      });
+
+      fireEvent.press(getByTestId(CommonSelectorsIDs.CONNECT_BUTTON));
+
+      await waitFor(() => {
+        expect(mockAddProperties).toHaveBeenCalledWith(
+          expect.objectContaining({ referrer: origin }),
+        );
+      });
+    });
+
     it('falls back to the hostname for non-SDK / non-WC connections', async () => {
       const origin = 'https://example.com';
 
diff --git a/app/components/Views/MultichainAccounts/MultichainAccountConnect/MultichainAccountConnect.tsx b/app/components/Views/MultichainAccounts/MultichainAccountConnect/MultichainAccountConnect.tsx
index 67deef4d533f..cab18850d828 100644
--- a/app/components/Views/MultichainAccounts/MultichainAccountConnect/MultichainAccountConnect.tsx
+++ b/app/components/Views/MultichainAccounts/MultichainAccountConnect/MultichainAccountConnect.tsx
@@ -43,6 +43,7 @@ import {
 import AppConstants from '../../../../core/AppConstants.ts';
 import SDKConnect from '../../../../core/SDKConnect/SDKConnect.ts';
 import DevLogger from '../../../../core/SDKConnect/utils/DevLogger.ts';
+import { isWalletConnectPermissionOrigin } from '../../../../core/WalletConnect/wc-utils.ts';
 import { RootState } from '../../../../reducers/index.ts';
 import { trackDappViewedEvent } from '../../../../util/metrics/index.ts';
 import { useTheme } from '../../../../util/theme/index.ts';
@@ -278,7 +279,8 @@ const MultichainAccountConnect = (props: AccountConnectProps) => {
   const isOriginMMSDKRemoteConn = sdkConnection !== undefined;
 
   const isOriginWalletConnect =
-    !isOriginMMSDKRemoteConn && wc2Metadata?.id && wc2Metadata?.id.length > 0;
+    !isOriginMMSDKRemoteConn &&
+    isWalletConnectPermissionOrigin(channelIdOrHostname, wc2Metadata);
 
   const isMaliciousDapp = Boolean(
     isOriginWalletConnect && wc2Metadata?.verifyContext?.isScam,
@@ -494,7 +496,7 @@ const MultichainAccountConnect = (props: AccountConnectProps) => {
   if (isOriginMMSDKRemoteConn || isOriginMMSDKV2RemoteConn) {
     referrer = dappUrl;
   } else if (isOriginWalletConnect) {
-    referrer = wc2Metadata?.url;
+    referrer = wc2Metadata?.url ?? '';
   }
 
   const { domainTitle, hostname } = useMemo(() => {
diff --git a/app/components/Views/MultichainAccounts/MultichainAccountsConnectedList/MultichainAccountsConnectedList.test.tsx b/app/components/Views/MultichainAccounts/MultichainAccountsConnectedList/MultichainAccountsConnectedList.test.tsx
index c90dd6cb4431..bc07d04d3c63 100644
--- a/app/components/Views/MultichainAccounts/MultichainAccountsConnectedList/MultichainAccountsConnectedList.test.tsx
+++ b/app/components/Views/MultichainAccounts/MultichainAccountsConnectedList/MultichainAccountsConnectedList.test.tsx
@@ -59,13 +59,6 @@ jest.mock('../../../../selectors/smartTransactionsController', () => ({
   selectSmartTransactionsEnabled: () => false,
 }));
 
-jest.mock('../../../../selectors/multichain/evm', () => ({
-  selectHideZeroBalanceTokens: () => false,
-  selectAccountTokensAcrossChains: () => [],
-  selectTokensBalances: () => ({}),
-  selectEvmTokensWithZeroBalanceFilter: () => [],
-}));
-
 jest.mock('../../../../core/SDKConnectV2', () => ({
   default: {
     initialize: jest.fn(),
diff --git a/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.test.tsx b/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.test.tsx
index bc1946b580a2..16d90f7197bc 100644
--- a/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.test.tsx
+++ b/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.test.tsx
@@ -11,6 +11,7 @@ import type { AppNavigationProp } from '../../../core/NavigationService/types';
 import MultichainAssetDetailsActivityListItem from './MultichainAssetDetailsActivityListItem';
 import Routes from '../../../constants/navigation/Routes';
 import { selectIsTransactionsRedesignEnabled } from '../../../selectors/featureFlagController/activityRedesign';
+import { handleUnifiedSwapsTxHistoryItemClick } from '../../UI/Bridge/utils/transaction-history';
 
 jest.mock('react-redux', () => ({
   useSelector: jest.fn(),
@@ -46,6 +47,14 @@ jest.mock('../../hooks/useMultichainTransactionDisplay', () => ({
   })),
 }));
 
+jest.mock('../../UI/Bridge/utils/transaction-history', () => ({
+  isBridgeTxHistoryItemBridge: jest.fn(
+    (item: { quote: { srcChainId: unknown; destChainId: unknown } }) =>
+      item.quote.srcChainId !== item.quote.destChainId,
+  ),
+  handleUnifiedSwapsTxHistoryItemClick: jest.fn(),
+}));
+
 jest.mock('../../UI/ActivityListItemRow/ActivityListItemRow', () => ({
   ActivityListItemRow: jest.fn(({ onPress, item }) => {
     const { TouchableOpacity } = jest.requireActual('react-native');
@@ -173,4 +182,135 @@ describe('MultichainAssetDetailsActivityListItem', () => {
       }),
     );
   });
+
+  describe('rows carrying a bridge-history entry', () => {
+    const createBridgeHistoryItem = (srcChainId: string, destChainId: string) =>
+      ({
+        status: { status: 'COMPLETE', srcChain: { txHash: 'tx-1' } },
+        quote: {
+          srcChainId,
+          destChainId,
+          srcTokenAmount: '1000000000',
+          destTokenAmount: '1000000',
+          srcAsset: {
+            chainId: srcChainId,
+            assetId: `${srcChainId}/slip44:501`,
+            decimals: 9,
+            symbol: 'SOL',
+          },
+          destAsset: {
+            chainId: destChainId,
+            assetId: `${destChainId}/slip44:60`,
+            decimals: 6,
+            symbol: 'USDC',
+          },
+        },
+      }) as never;
+
+    it('routes a same-chain swap to the redesigned ActivityDetails screen', () => {
+      mockUseSelector.mockImplementation(
+        (selector) => selector === selectIsTransactionsRedesignEnabled,
+      );
+      const navigation = createNavigation();
+
+      const { getByTestId } = render(
+        <MultichainAssetDetailsActivityListItem
+          transaction={createTransaction({ type: TransactionType.Swap })}
+          bridgeHistoryItem={createBridgeHistoryItem(
+            SolScope.Mainnet,
+            SolScope.Mainnet,
+          )}
+          index={0}
+          chainId={SolScope.Mainnet}
+          navigation={navigation}
+        />,
+      );
+
+      fireEvent.press(getByTestId('activity-list-item-row'));
+
+      expect(handleUnifiedSwapsTxHistoryItemClick).not.toHaveBeenCalled();
+      expect(navigation.navigate).toHaveBeenCalledWith(
+        Routes.ACTIVITY_DETAILS,
+        expect.objectContaining({ txIdentifier: 'tx-1' }),
+      );
+    });
+
+    it('routes a cross-chain bridge to the redesigned ActivityDetails screen', () => {
+      mockUseSelector.mockImplementation(
+        (selector) => selector === selectIsTransactionsRedesignEnabled,
+      );
+      const navigation = createNavigation();
+      const transaction = createTransaction({ type: TransactionType.Swap });
+
+      const { getByTestId } = render(
+        <MultichainAssetDetailsActivityListItem
+          transaction={transaction}
+          bridgeHistoryItem={createBridgeHistoryItem(
+            SolScope.Mainnet,
+            'eip155:1',
+          )}
+          index={0}
+          chainId={SolScope.Mainnet}
+          navigation={navigation}
+        />,
+      );
+
+      fireEvent.press(getByTestId('activity-list-item-row'));
+
+      expect(handleUnifiedSwapsTxHistoryItemClick).not.toHaveBeenCalled();
+      expect(navigation.navigate).toHaveBeenCalledWith(
+        Routes.ACTIVITY_DETAILS,
+        expect.objectContaining({ txIdentifier: 'tx-1' }),
+      );
+    });
+
+    it('falls back to the bridge-status screen for a cross-chain bridge when the redesign is off', () => {
+      // mockUseSelector default in beforeEach returns false for every selector.
+      const navigation = createNavigation();
+      const transaction = createTransaction({ type: TransactionType.Swap });
+
+      const { getByTestId } = render(
+        <MultichainAssetDetailsActivityListItem
+          transaction={transaction}
+          bridgeHistoryItem={createBridgeHistoryItem(
+            SolScope.Mainnet,
+            'eip155:1',
+          )}
+          index={0}
+          chainId={SolScope.Mainnet}
+          navigation={navigation}
+        />,
+      );
+
+      fireEvent.press(getByTestId('activity-list-item-row'));
+
+      expect(handleUnifiedSwapsTxHistoryItemClick).toHaveBeenCalledWith(
+        expect.objectContaining({ multiChainTx: transaction }),
+      );
+    });
+
+    it('passes the bridge-history entry to the shared row for enrichment', () => {
+      const { ActivityListItemRow } = jest.requireMock(
+        '../../UI/ActivityListItemRow/ActivityListItemRow',
+      );
+      const bridgeHistoryItem = createBridgeHistoryItem(
+        SolScope.Mainnet,
+        SolScope.Mainnet,
+      );
+
+      render(
+        <MultichainAssetDetailsActivityListItem
+          transaction={createTransaction({ type: TransactionType.Swap })}
+          bridgeHistoryItem={bridgeHistoryItem}
+          index={0}
+          chainId={SolScope.Mainnet}
+          navigation={createNavigation()}
+        />,
+      );
+
+      expect(ActivityListItemRow.mock.calls[0][0].bridgeHistoryItem).toBe(
+        bridgeHistoryItem,
+      );
+    });
+  });
 });
diff --git a/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.tsx b/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.tsx
index a21fbc58839d..a993fcf0e607 100644
--- a/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.tsx
+++ b/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.tsx
@@ -2,6 +2,7 @@ import React, { useCallback, useMemo } from 'react';
 import { Box } from '@metamask/design-system-react-native';
 import { useSelector } from 'react-redux';
 import type { Transaction } from '@metamask/keyring-api';
+import type { BridgeHistoryItem } from '@metamask/bridge-status-controller';
 import { SupportedCaipChainId } from '@metamask/multichain-network-controller';
 import type { AppNavigationProp } from '../../../core/NavigationService/types';
 import Routes from '../../../constants/navigation/Routes';
@@ -10,17 +11,22 @@ import { selectIsTransactionsRedesignEnabled } from '../../../selectors/featureF
 import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import { useMultichainTransactionDisplay } from '../../hooks/useMultichainTransactionDisplay';
 import { ActivityListItemRow } from '../../UI/ActivityListItemRow/ActivityListItemRow';
+import {
+  handleUnifiedSwapsTxHistoryItemClick,
+  isBridgeTxHistoryItemBridge,
+} from '../../UI/Bridge/utils/transaction-history';
 // eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): shared activity-details routing; route-isolation backlog
 import { getActivityDetailsRoute } from '../ActivityList/getActivityDetailsRoute';
+import { mapKeyringTransaction } from '../../../util/activity-adapters';
 import {
   getMultichainTransactionDetailEventProperties,
-  mapMultichainTransactionToActivityItem,
   TRANSACTION_DETAIL_EVENTS,
 } from './MultichainAssetDetailsActivityListItem.utils';
 
 interface MultichainAssetDetailsActivityListItemProps {
   transaction: Transaction;
   chainId: SupportedCaipChainId;
+  bridgeHistoryItem?: BridgeHistoryItem;
   navigation: AppNavigationProp;
   index: number;
   location?: TransactionDetailLocation;
@@ -29,6 +35,7 @@ interface MultichainAssetDetailsActivityListItemProps {
 export const MultichainAssetDetailsActivityListItem = ({
   transaction,
   chainId,
+  bridgeHistoryItem,
   navigation,
   index,
   location,
@@ -39,8 +46,12 @@ export const MultichainAssetDetailsActivityListItem = ({
   );
   const displayData = useMultichainTransactionDisplay(transaction, chainId);
   const activityItem = useMemo(
-    () => mapMultichainTransactionToActivityItem({ transaction, chainId }),
-    [transaction, chainId],
+    () =>
+      mapKeyringTransaction({
+        transaction,
+        bridgeHistory: bridgeHistoryItem,
+      }),
+    [transaction, bridgeHistoryItem],
   );
 
   const handlePress = useCallback(() => {
@@ -51,6 +62,7 @@ export const MultichainAssetDetailsActivityListItem = ({
             transaction,
             chainId,
             location,
+            bridgeHistoryItem,
           }),
         )
         .build(),
@@ -64,12 +76,22 @@ export const MultichainAssetDetailsActivityListItem = ({
       }
     }
 
+    if (bridgeHistoryItem && isBridgeTxHistoryItemBridge(bridgeHistoryItem)) {
+      handleUnifiedSwapsTxHistoryItemClick({
+        navigation,
+        multiChainTx: transaction,
+        bridgeTxHistoryItem: bridgeHistoryItem,
+      });
+      return;
+    }
+
     navigation.navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
       screen: Routes.SHEET.MULTICHAIN_TRANSACTION_DETAILS,
       params: { displayData, transaction },
     });
   }, [
     activityItem,
+    bridgeHistoryItem,
     chainId,
     createEventBuilder,
     displayData,
@@ -83,6 +105,7 @@ export const MultichainAssetDetailsActivityListItem = ({
   return (
     <Box twClassName="px-4">
       <ActivityListItemRow
+        bridgeHistoryItem={bridgeHistoryItem}
         item={activityItem}
         index={index}
         onPress={handlePress}
diff --git a/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.utils.test.ts b/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.utils.test.ts
index f52957ef26ee..31982b912c88 100644
--- a/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.utils.test.ts
+++ b/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.utils.test.ts
@@ -5,10 +5,9 @@ import {
   TransactionType,
 } from '@metamask/keyring-api';
 import { TransactionDetailLocation } from '../../../core/Analytics/events/transactions';
-import {
-  getMultichainTransactionDetailEventProperties,
-  mapMultichainTransactionToActivityItem,
-} from './MultichainAssetDetailsActivityListItem.utils';
+import { MonetizedPrimitive } from '../../../core/Analytics/MetaMetrics.types';
+import { mapKeyringTransaction } from '../../../util/activity-adapters';
+import { getMultichainTransactionDetailEventProperties } from './MultichainAssetDetailsActivityListItem.utils';
 
 const createTransaction = (overrides: Partial<Transaction> = {}): Transaction =>
   ({
@@ -36,13 +35,10 @@ const createTransaction = (overrides: Partial<Transaction> = {}): Transaction =>
   }) as Transaction;
 
 describe('MultichainAssetDetailsActivityListItem utils', () => {
-  it('maps keyring transaction to activity item with fallback chain id', () => {
-    const transaction = createTransaction({ chain: undefined });
+  it('maps a keyring transaction to an activity item on its own chain', () => {
+    const transaction = createTransaction();
 
-    const item = mapMultichainTransactionToActivityItem({
-      transaction,
-      chainId: SolScope.Mainnet,
-    });
+    const item = mapKeyringTransaction({ transaction });
 
     expect(item).toEqual(
       expect.objectContaining({
@@ -74,6 +70,88 @@ describe('MultichainAssetDetailsActivityListItem utils', () => {
     });
   });
 
+  it('reports the quote chains as CAIP ids and the swaps primitive when a bridge history entry exists', () => {
+    // Real quotes carry chain ids as bridge-API numbers, not CAIP strings.
+    const SOLANA_NUMERIC_CHAIN_ID = 1151111081099710;
+    const transaction = createTransaction({ type: TransactionType.Swap });
+
+    const properties = getMultichainTransactionDetailEventProperties({
+      transaction,
+      chainId: SolScope.Mainnet,
+      location: TransactionDetailLocation.AssetDetails,
+      bridgeHistoryItem: {
+        quote: {
+          srcChainId: SOLANA_NUMERIC_CHAIN_ID,
+          destChainId: 1,
+        },
+      } as never,
+    });
+
+    expect(properties).toStrictEqual({
+      transaction_type: 'bridge',
+      transaction_status: TransactionStatus.Confirmed,
+      location: TransactionDetailLocation.AssetDetails,
+      chain_id_source: SolScope.Mainnet,
+      chain_id_destination: 'eip155:1',
+      monetized_primitive: MonetizedPrimitive.Swaps,
+    });
+  });
+
+  it('classifies a same-chain bridge history entry as a swap', () => {
+    const SOLANA_NUMERIC_CHAIN_ID = 1151111081099710;
+    const transaction = createTransaction({ type: TransactionType.Swap });
+
+    const properties = getMultichainTransactionDetailEventProperties({
+      transaction,
+      chainId: SolScope.Mainnet,
+      bridgeHistoryItem: {
+        quote: {
+          srcChainId: SOLANA_NUMERIC_CHAIN_ID,
+          destChainId: SOLANA_NUMERIC_CHAIN_ID,
+        },
+      } as never,
+    });
+
+    expect(properties).toEqual(
+      expect.objectContaining({
+        transaction_type: 'swap',
+        chain_id_source: SolScope.Mainnet,
+        chain_id_destination: SolScope.Mainnet,
+      }),
+    );
+  });
+
+  it('maps a keyring swap that carries cross-chain bridge history to a bridge item', () => {
+    const transaction = createTransaction({ type: TransactionType.Swap });
+
+    const item = mapKeyringTransaction({
+      transaction,
+      bridgeHistory: {
+        status: { status: 'COMPLETE' },
+        quote: {
+          srcChainId: SolScope.Mainnet,
+          destChainId: 'eip155:1',
+          srcTokenAmount: '1000000000',
+          destTokenAmount: '1000000',
+          srcAsset: {
+            chainId: SolScope.Mainnet,
+            assetId: `${SolScope.Mainnet}/slip44:501`,
+            decimals: 9,
+            symbol: 'SOL',
+          },
+          destAsset: {
+            chainId: 'eip155:1',
+            assetId: 'eip155:1/slip44:60',
+            decimals: 6,
+            symbol: 'USDC',
+          },
+        },
+      } as never,
+    });
+
+    expect(item.type).toBe('bridge');
+  });
+
   it('defaults transaction detail event location to home', () => {
     const transaction = createTransaction({ status: undefined });
 
diff --git a/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.utils.ts b/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.utils.ts
index c4bb2fc40aaa..c5ce93844f4f 100644
--- a/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.utils.ts
+++ b/app/components/Views/MultichainTransactionsView/MultichainAssetDetailsActivityListItem.utils.ts
@@ -1,39 +1,47 @@
 import type { Transaction } from '@metamask/keyring-api';
 import type { SupportedCaipChainId } from '@metamask/multichain-network-controller';
+import type { BridgeHistoryItem } from '@metamask/bridge-status-controller';
 import {
   TRANSACTION_DETAIL_EVENTS,
   TransactionDetailLocation,
 } from '../../../core/Analytics/events/transactions';
-import { mapKeyringTransaction } from '../../../util/activity-adapters';
-
-export const mapMultichainTransactionToActivityItem = ({
-  transaction,
-  chainId,
-}: {
-  transaction: Transaction;
-  chainId: SupportedCaipChainId;
-}) =>
-  mapKeyringTransaction({
-    transaction: {
-      ...transaction,
-      chain: transaction.chain ?? chainId,
-    },
-  });
+import { MonetizedPrimitive } from '../../../core/Analytics/MetaMetrics.types';
+import { formatChainIdToCaip } from '@metamask/bridge-controller';
+import { isBridgeTxHistoryItemBridge } from '../../UI/Bridge/utils/transaction-history';
 
 export const getMultichainTransactionDetailEventProperties = ({
   transaction,
   chainId,
   location,
+  bridgeHistoryItem,
 }: {
   transaction: Transaction;
   chainId: SupportedCaipChainId;
   location?: TransactionDetailLocation;
-}) => ({
-  transaction_type: transaction.type?.toLowerCase() ?? 'unknown',
-  transaction_status: transaction.status ?? 'unknown',
-  location: location ?? TransactionDetailLocation.Home,
-  chain_id_source: String(chainId),
-  chain_id_destination: String(chainId),
-});
+  bridgeHistoryItem?: BridgeHistoryItem;
+}) => {
+  const baseProperties = {
+    transaction_type: transaction.type?.toLowerCase() ?? 'unknown',
+    transaction_status: transaction.status ?? 'unknown',
+    location: location ?? TransactionDetailLocation.Home,
+    chain_id_source: String(chainId),
+    chain_id_destination: String(chainId),
+  };
+
+  if (!bridgeHistoryItem) {
+    return baseProperties;
+  }
+
+  const { quote } = bridgeHistoryItem;
+  return {
+    ...baseProperties,
+    transaction_type: isBridgeTxHistoryItemBridge(bridgeHistoryItem)
+      ? 'bridge'
+      : 'swap',
+    chain_id_source: formatChainIdToCaip(quote.srcChainId),
+    chain_id_destination: formatChainIdToCaip(quote.destChainId),
+    monetized_primitive: MonetizedPrimitive.Swaps,
+  };
+};
 
 export { TRANSACTION_DETAIL_EVENTS };
diff --git a/app/components/Views/MultichainTransactionsView/MultichainTransactionsView.test.tsx b/app/components/Views/MultichainTransactionsView/MultichainTransactionsView.test.tsx
index 4e982a7a1228..2b4a17c509c8 100644
--- a/app/components/Views/MultichainTransactionsView/MultichainTransactionsView.test.tsx
+++ b/app/components/Views/MultichainTransactionsView/MultichainTransactionsView.test.tsx
@@ -16,9 +16,15 @@ import { selectSelectedInternalAccountFormattedAddress } from '../../../selector
 import { ButtonProps } from '../../../component-library/components/Buttons/Button/Button.types';
 import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import { configureUseAnalyticsExternalLinkMock } from '../../../util/test/analyticsMock';
-import { selectIsActivityRedesignEnabled } from '../../../selectors/featureFlagController/activityRedesign';
+import {
+  selectIsActivityRedesignEnabled,
+  selectIsTransactionsRedesignEnabled,
+} from '../../../selectors/featureFlagController/activityRedesign';
 import { ActivityListItemRow } from '../../UI/ActivityListItemRow/ActivityListItemRow';
 import { TransactionDetailLocation } from '../../../core/Analytics/events/transactions';
+import { selectBridgeHistoryForAccount } from '../../../selectors/bridgeStatusController';
+import { handleUnifiedSwapsTxHistoryItemClick } from '../../UI/Bridge/utils/transaction-history';
+import Routes from '../../../constants/navigation/Routes';
 jest.useFakeTimers();
 
 jest.mock('../../../util/analytics/externalLinkTracking', () => ({
@@ -48,6 +54,14 @@ jest.mock('../../UI/ActivityListItemRow/ActivityListItemRow', () => ({
 }));
 jest.mock('../../../selectors/featureFlagController/activityRedesign', () => ({
   selectIsActivityRedesignEnabled: jest.fn(() => false),
+  selectIsTransactionsRedesignEnabled: jest.fn(() => false),
+}));
+jest.mock('../../UI/Bridge/utils/transaction-history', () => ({
+  handleUnifiedSwapsTxHistoryItemClick: jest.fn(),
+  isBridgeTxHistoryItemBridge: jest.fn(
+    (item: { quote: { srcChainId: unknown; destChainId: unknown } }) =>
+      item.quote.srcChainId !== item.quote.destChainId,
+  ),
 }));
 jest.mock('../../hooks/useMultichainTransactionDisplay', () => ({
   useMultichainTransactionDisplay: jest.fn(() => ({
@@ -107,7 +121,7 @@ describe('MultichainTransactionsView', () => {
   const mockTransactions = [
     {
       id: 'tx-123',
-      chainId: 'solana:mainnet',
+      chain: SolScope.Mainnet,
       from: [{ address: '7RoSF9fUNf1XgRYsb7Qh4SoVkRmirHzZVELGNiNQzZNV' }],
       to: [{ address: '5FHwkrdxD5AKmYrGNQYV66qPt3YxmkBzMJ8youBGNFAY' }],
       value: '1500000000',
@@ -117,7 +131,7 @@ describe('MultichainTransactionsView', () => {
     },
     {
       id: 'tx-456',
-      chainId: 'solana:mainnet',
+      chain: SolScope.Mainnet,
       from: [{ address: '5FHwkrdxD5AKmYrGNQYV66qPt3YxmkBzMJ8youBGNFAY' }],
       to: [{ address: '7RoSF9fUNf1XgRYsb7Qh4SoVkRmirHzZVELGNiNQzZNV' }],
       value: '2000000000',
@@ -159,6 +173,11 @@ describe('MultichainTransactionsView', () => {
     jest.clearAllMocks();
     jest.clearAllTimers();
 
+    const { default: MockButton } = jest.requireMock(
+      '../../../component-library/components/Buttons/Button',
+    ) as { default: { lastProps: ButtonProps } };
+    MockButton.lastProps = {} as ButtonProps;
+
     configureUseAnalyticsExternalLinkMock();
     mockUseTheme.mockReturnValue({
       colors: {
@@ -265,6 +284,345 @@ describe('MultichainTransactionsView', () => {
     expect(queryAllByTestId('activity-list-date-header')).toHaveLength(2);
   });
 
+  it('keeps swaps carrying bridge history on the redesigned row instead of the legacy bridge row', async () => {
+    const bridgeHistoryItem = {
+      status: { srcChain: { txHash: 'tx-123' } },
+      quote: {
+        srcChainId: SolScope.Mainnet,
+        destChainId: SolScope.Mainnet,
+        srcAsset: { chainId: SolScope.Mainnet, symbol: 'SOL' },
+        destAsset: { chainId: SolScope.Mainnet, symbol: 'USDC' },
+      },
+    };
+
+    (useSelector as jest.Mock).mockImplementation((selector) => {
+      if (selector === selectSelectedInternalAccountFormattedAddress) {
+        return mockSelectedAddress;
+      }
+      if (selector === selectNonEvmTransactions) {
+        return { transactions: mockTransactions };
+      }
+      if (selector === selectIsActivityRedesignEnabled) {
+        return true;
+      }
+      if (selector === selectBridgeHistoryForAccount) {
+        return { 'bridge-1': bridgeHistoryItem };
+      }
+      return null;
+    });
+
+    customRender(
+      <MultichainTransactionsView
+        selectedAddress={mockSelectedAddress}
+        chainId={SolScope.Mainnet}
+        location={TransactionDetailLocation.AssetDetails}
+      />,
+    );
+
+    expect(ActivityListItemRow).toHaveBeenCalledWith(
+      expect.objectContaining({ bridgeHistoryItem }),
+      undefined,
+    );
+  });
+
+  it('classifies the receiving leg of a cross-chain bridge as a bridge row', async () => {
+    // The fill tx's signature only exists on status.destChain — matched there,
+    // the row must map as `bridge`, not fall back to the snap's own type.
+    const bridgeHistoryItem = {
+      status: {
+        status: 'COMPLETE',
+        srcChain: { txHash: '0xbase-source-hash' },
+        destChain: { txHash: 'tx-123' },
+      },
+      quote: {
+        srcChainId: 8453,
+        destChainId: 1151111081099710,
+        srcTokenAmount: '93470',
+        destTokenAmount: '18260000',
+        srcAsset: {
+          chainId: 8453,
+          assetId:
+            'eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          decimals: 6,
+          symbol: 'USDC',
+        },
+        destAsset: {
+          chainId: 1151111081099710,
+          assetId: `${SolScope.Mainnet}/slip44:501`,
+          decimals: 9,
+          symbol: 'SOL',
+        },
+      },
+    };
+
+    (useSelector as jest.Mock).mockImplementation((selector) => {
+      if (selector === selectSelectedInternalAccountFormattedAddress) {
+        return mockSelectedAddress;
+      }
+      if (selector === selectNonEvmTransactions) {
+        return { transactions: mockTransactions };
+      }
+      if (selector === selectIsActivityRedesignEnabled) {
+        return true;
+      }
+      if (selector === selectBridgeHistoryForAccount) {
+        return { 'bridge-1': bridgeHistoryItem };
+      }
+      return null;
+    });
+
+    customRender(
+      <MultichainTransactionsView
+        selectedAddress={mockSelectedAddress}
+        chainId={SolScope.Mainnet}
+        location={TransactionDetailLocation.AssetDetails}
+      />,
+    );
+
+    expect(ActivityListItemRow).toHaveBeenCalledWith(
+      expect.objectContaining({
+        bridgeHistoryItem,
+        item: expect.objectContaining({ type: 'bridge' }),
+      }),
+      undefined,
+    );
+  });
+
+  it('falls back to the page chainId when a transaction has no chain', async () => {
+    (useSelector as jest.Mock).mockImplementation((selector) => {
+      if (selector === selectSelectedInternalAccountFormattedAddress) {
+        return mockSelectedAddress;
+      }
+      if (selector === selectNonEvmTransactions) {
+        return { transactions: [{ ...mockTransactions[0], chain: undefined }] };
+      }
+      if (selector === selectIsActivityRedesignEnabled) {
+        return true;
+      }
+      return null;
+    });
+
+    customRender(
+      <MultichainTransactionsView
+        selectedAddress={mockSelectedAddress}
+        chainId={SolScope.Mainnet}
+        location={TransactionDetailLocation.AssetDetails}
+      />,
+    );
+
+    expect(ActivityListItemRow).toHaveBeenCalledWith(
+      expect.objectContaining({
+        item: expect.objectContaining({ chainId: SolScope.Mainnet }),
+      }),
+      undefined,
+    );
+  });
+
+  it('shows an EVM bridge arriving at this non-EVM asset', async () => {
+    // A Base USDC -> Solana SOL bridge's only local tx is the EVM source tx, so
+    // the keyring-only list can never contain it; it arrives via the prop.
+    const bridgeArrival = {
+      id: 'bridge-arrival-1',
+      chainId: '0x2105',
+      hash: '0xbase-source-hash',
+      status: 'confirmed',
+      time: 1742500000000,
+      type: 'bridge',
+      txParams: { from: '0xabc', to: '0xrouter', value: '0x0' },
+    };
+    const bridgeHistoryItem = {
+      status: {
+        status: 'COMPLETE',
+        srcChain: { txHash: '0xbase-source-hash' },
+        destChain: { txHash: 'solana-fill-sig' },
+      },
+      quote: {
+        srcChainId: 8453,
+        destChainId: 1151111081099710,
+        srcTokenAmount: '93440',
+        destTokenAmount: '971500',
+        srcAsset: {
+          chainId: 8453,
+          assetId:
+            'eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          decimals: 6,
+          symbol: 'USDC',
+        },
+        destAsset: {
+          chainId: 1151111081099710,
+          assetId: `${SolScope.Mainnet}/slip44:501`,
+          decimals: 9,
+          symbol: 'SOL',
+        },
+      },
+    };
+
+    (useSelector as jest.Mock).mockImplementation((selector) => {
+      if (selector === selectSelectedInternalAccountFormattedAddress) {
+        return mockSelectedAddress;
+      }
+      if (selector === selectNonEvmTransactions) {
+        return { transactions: mockTransactions };
+      }
+      if (selector === selectIsActivityRedesignEnabled) {
+        return true;
+      }
+      if (selector === selectBridgeHistoryForAccount) {
+        return { 'bridge-arrival-1': bridgeHistoryItem };
+      }
+      return null;
+    });
+
+    customRender(
+      <MultichainTransactionsView
+        selectedAddress={mockSelectedAddress}
+        chainId={SolScope.Mainnet}
+        location={TransactionDetailLocation.AssetDetails}
+        bridgeArrivalTransactions={[bridgeArrival] as never}
+      />,
+    );
+
+    expect(ActivityListItemRow).toHaveBeenCalledWith(
+      expect.objectContaining({
+        item: expect.objectContaining({
+          type: 'bridge',
+          raw: expect.objectContaining({ type: 'localTransaction' }),
+        }),
+      }),
+      undefined,
+    );
+  });
+
+  it('shows one row when the arrival and its indexed destination fill both exist', async () => {
+    // Once the snap indexes the fill, the same bridge is reachable from the
+    // arrival prop AND as a keyring tx matched by destChain.txHash.
+    const FILL_SIGNATURE = 'tx-123';
+    const bridgeArrival = {
+      id: 'bridge-arrival-1',
+      chainId: '0x2105',
+      hash: '0xbase-source-hash',
+      status: 'confirmed',
+      time: 1742500000000,
+      type: 'bridge',
+      txParams: { from: '0xabc', to: '0xrouter', value: '0x0' },
+    };
+    const bridgeHistoryItem = {
+      status: {
+        status: 'COMPLETE',
+        srcChain: { txHash: '0xbase-source-hash' },
+        destChain: { txHash: FILL_SIGNATURE },
+      },
+      quote: {
+        srcChainId: 8453,
+        destChainId: 1151111081099710,
+        srcTokenAmount: '93440',
+        destTokenAmount: '971500',
+        srcAsset: {
+          chainId: 8453,
+          assetId:
+            'eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          decimals: 6,
+          symbol: 'USDC',
+        },
+        destAsset: {
+          chainId: 1151111081099710,
+          assetId: `${SolScope.Mainnet}/slip44:501`,
+          decimals: 9,
+          symbol: 'SOL',
+        },
+      },
+    };
+
+    (useSelector as jest.Mock).mockImplementation((selector) => {
+      if (selector === selectSelectedInternalAccountFormattedAddress) {
+        return mockSelectedAddress;
+      }
+      if (selector === selectNonEvmTransactions) {
+        // mockTransactions[0].id === FILL_SIGNATURE, i.e. the indexed fill.
+        return { transactions: mockTransactions };
+      }
+      if (selector === selectIsActivityRedesignEnabled) {
+        return true;
+      }
+      if (selector === selectBridgeHistoryForAccount) {
+        return { 'bridge-arrival-1': bridgeHistoryItem };
+      }
+      return null;
+    });
+
+    customRender(
+      <MultichainTransactionsView
+        selectedAddress={mockSelectedAddress}
+        chainId={SolScope.Mainnet}
+        location={TransactionDetailLocation.AssetDetails}
+        bridgeArrivalTransactions={[bridgeArrival] as never}
+      />,
+    );
+
+    const bridgeRows = jest
+      .mocked(ActivityListItemRow)
+      .mock.calls.filter(([props]) => props.item?.type === 'bridge');
+
+    expect(bridgeRows).toHaveLength(1);
+    // The surviving row is the arrival (the EVM source tx), not the fill.
+    expect(bridgeRows[0][0].item.raw?.type).toBe('localTransaction');
+  });
+
+  it('falls back to the bridge-status screen when a bridge arrival is tapped with details redesign off', async () => {
+    const bridgeArrival = {
+      id: 'bridge-arrival-1',
+      chainId: '0x2105',
+      hash: '0xbase-source-hash',
+      status: 'confirmed',
+      time: 1742500000000,
+      type: 'bridge',
+      txParams: { from: '0xabc', to: '0xrouter', value: '0x0' },
+    };
+
+    (useSelector as jest.Mock).mockImplementation((selector) => {
+      if (selector === selectSelectedInternalAccountFormattedAddress) {
+        return mockSelectedAddress;
+      }
+      if (selector === selectNonEvmTransactions) {
+        return { transactions: [] };
+      }
+      // List redesign on, details redesign off.
+      if (selector === selectIsActivityRedesignEnabled) {
+        return true;
+      }
+      if (selector === selectIsTransactionsRedesignEnabled) {
+        return false;
+      }
+      if (selector === selectBridgeHistoryForAccount) {
+        return {};
+      }
+      return null;
+    });
+
+    customRender(
+      <MultichainTransactionsView
+        selectedAddress={mockSelectedAddress}
+        chainId={SolScope.Mainnet}
+        location={TransactionDetailLocation.AssetDetails}
+        bridgeArrivalTransactions={[bridgeArrival] as never}
+      />,
+    );
+
+    const rowProps = jest.mocked(ActivityListItemRow).mock.calls[0][0];
+    rowProps.onPress?.(rowProps.item);
+
+    // Must not be inert.
+    expect(handleUnifiedSwapsTxHistoryItemClick).toHaveBeenCalledWith(
+      expect.objectContaining({
+        evmTxMeta: expect.objectContaining({ id: 'bridge-arrival-1' }),
+      }),
+    );
+    expect(mockNavigation.navigate).not.toHaveBeenCalledWith(
+      Routes.ACTIVITY_DETAILS,
+      expect.anything(),
+    );
+  });
+
   it('does not render view more link for bitcoin activity', async () => {
     const { queryByText } = customRender(
       <MultichainTransactionsView
diff --git a/app/components/Views/MultichainTransactionsView/MultichainTransactionsView.tsx b/app/components/Views/MultichainTransactionsView/MultichainTransactionsView.tsx
index 06813f64beba..0165745d96ef 100644
--- a/app/components/Views/MultichainTransactionsView/MultichainTransactionsView.tsx
+++ b/app/components/Views/MultichainTransactionsView/MultichainTransactionsView.tsx
@@ -10,6 +10,7 @@ import { useNavigation } from '@react-navigation/native';
 import { FlashList } from '@shopify/flash-list';
 import type { AppNavigationProp } from '../../../core/NavigationService/types';
 import { CaipChainId, Transaction } from '@metamask/keyring-api';
+import type { TransactionMeta } from '@metamask/transaction-controller';
 import { useTheme } from '../../../util/theme';
 import { strings } from '../../../../locales/i18n';
 import { baseStyles } from '../../../styles/common';
@@ -33,15 +34,28 @@ import { TabEmptyState } from '../../../component-library/components-temp/TabEmp
 import { TransactionDetailLocation } from '../../../core/Analytics/events/transactions';
 import { useMultichainActivityMaliciousTokenKeys } from '../../hooks/useMultichainActivityMaliciousTokenKeys/useMultichainActivityMaliciousTokenKeys';
 import { filterMultichainTransactionsExcludingMaliciousTokenActivity } from '../../../util/multichain/multichainTransactionTokenScan';
-import { selectIsActivityRedesignEnabled } from '../../../selectors/featureFlagController/activityRedesign';
+import {
+  selectIsActivityRedesignEnabled,
+  selectIsTransactionsRedesignEnabled,
+} from '../../../selectors/featureFlagController/activityRedesign';
 import {
   getGroupedActivityListItemKey,
   groupActivityListItems,
+  mapKeyringTransaction,
+  type ActivityListItem,
   type GroupedActivityListItem,
 } from '../../../util/activity-adapters';
 import ActivityListDateHeader from '../../UI/ActivityListItemRow/ActivityListDateHeader';
+import { ActivityListItemRow } from '../../UI/ActivityListItemRow/ActivityListItemRow';
+import { Box } from '@metamask/design-system-react-native';
+import { selectBridgeHistoryForAccount } from '../../../selectors/bridgeStatusController';
+import { findBridgeHistoryItem } from '../../../util/bridge/findBridgeHistoryItem';
+import { handleUnifiedSwapsTxHistoryItemClick } from '../../UI/Bridge/utils/transaction-history';
+// eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): shared activity-details routing; route-isolation backlog
+import { getActivityDetailsRoute } from '../ActivityList/getActivityDetailsRoute';
+import Routes from '../../../constants/navigation/Routes';
+import { mapTransactionToActivityItem } from '../../UI/Transactions/AssetDetailsActivityListItem.utils';
 import MultichainAssetDetailsActivityListItem from './MultichainAssetDetailsActivityListItem';
-import { mapMultichainTransactionToActivityItem } from './MultichainAssetDetailsActivityListItem.utils';
 
 interface MultichainTransactionsViewProps {
   /**
@@ -84,6 +98,10 @@ interface MultichainTransactionsViewProps {
    * Location context for analytics tracking (home or asset_details)
    */
   location?: TransactionDetailLocation;
+  /**
+   * EVM bridge transactions
+   */
+  bridgeArrivalTransactions?: TransactionMeta[];
 }
 
 export const getMultichainTransactionItemType = (
@@ -126,6 +144,7 @@ const MultichainTransactionsView = ({
   showDisclaimer = false,
   onScroll,
   location,
+  bridgeArrivalTransactions,
 }: MultichainTransactionsViewProps) => {
   const { colors } = useTheme();
   const style = styles();
@@ -160,26 +179,114 @@ const MultichainTransactionsView = ({
     [txList, maliciousTokenKeys],
   );
 
-  const { bridgeHistoryItemsBySrcTxHash } = useBridgeHistoryItemBySrcTxHash();
+  const { bridgeHistoryItemsBySrcTxHash, bridgeHistoryItemsByDestTxHash } =
+    useBridgeHistoryItemBySrcTxHash();
+  const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
+  const isTransactionsRedesignEnabled = useSelector(
+    selectIsTransactionsRedesignEnabled,
+  );
   const isActivityRedesignEnabled = useSelector(
     selectIsActivityRedesignEnabled,
   );
   const shouldUseActivityRedesign =
     isActivityRedesignEnabled &&
     location === TransactionDetailLocation.AssetDetails;
+  const { bridgeArrivalItems, arrivalDestTxHashes } = useMemo(() => {
+    const items: ActivityListItem[] = [];
+    const destTxHashes = new Set<string>();
+
+    for (const tx of bridgeArrivalTransactions ?? []) {
+      const bridgeHistoryItem = findBridgeHistoryItem({
+        bridgeHistory,
+        transactionMetaId: tx.id,
+        // eslint-disable-next-line @typescript-eslint/no-deprecated -- Older persisted bridge history can still be keyed by actionId.
+        transactionActionId: tx.actionId,
+        transactionHash: tx.hash,
+      });
+
+      const destTxHash = bridgeHistoryItem?.status?.destChain?.txHash;
+      if (destTxHash) {
+        destTxHashes.add(destTxHash.toLowerCase());
+      }
+
+      items.push(
+        mapTransactionToActivityItem({
+          transaction: tx,
+          currentChainId: tx.chainId,
+          bridgeHistoryItem,
+        }),
+      );
+    }
+
+    return { bridgeArrivalItems: items, arrivalDestTxHashes: destTxHashes };
+  }, [bridgeArrivalTransactions, bridgeHistory]);
+
   const activityListData = useMemo(
     () =>
       shouldUseActivityRedesign
-        ? groupActivityListItems(
-            visibleMultichainTransactions.map((transaction) =>
-              mapMultichainTransactionToActivityItem({
-                transaction,
-                chainId,
-              }),
-            ),
-          )
+        ? groupActivityListItems([
+            ...bridgeArrivalItems,
+            ...visibleMultichainTransactions
+              .filter(
+                (transaction) =>
+                  !arrivalDestTxHashes.has(transaction.id?.toLowerCase()),
+              )
+              .map((transaction) =>
+                mapKeyringTransaction({
+                  transaction: {
+                    ...transaction,
+                    chain: transaction.chain ?? chainId,
+                  },
+                  bridgeHistory:
+                    bridgeHistoryItemsBySrcTxHash[transaction.id] ??
+                    bridgeHistoryItemsByDestTxHash[transaction.id],
+                }),
+              ),
+          ])
         : visibleMultichainTransactions,
-    [chainId, shouldUseActivityRedesign, visibleMultichainTransactions],
+    [
+      arrivalDestTxHashes,
+      bridgeArrivalItems,
+      bridgeHistoryItemsByDestTxHash,
+      bridgeHistoryItemsBySrcTxHash,
+      chainId,
+      shouldUseActivityRedesign,
+      visibleMultichainTransactions,
+    ],
+  );
+
+  const handleBridgeArrivalPress = React.useCallback(
+    (item: ActivityListItem) => {
+      if (isTransactionsRedesignEnabled) {
+        const detailsRoute = getActivityDetailsRoute(item);
+        if (detailsRoute) {
+          nav.navigate(Routes.ACTIVITY_DETAILS, detailsRoute);
+          return;
+        }
+      }
+
+      const evmTxMeta =
+        item.raw?.type === 'localTransaction'
+          ? item.raw.data.primaryTransaction
+          : undefined;
+
+      if (!evmTxMeta) {
+        return;
+      }
+
+      handleUnifiedSwapsTxHistoryItemClick({
+        navigation: nav,
+        evmTxMeta,
+        bridgeTxHistoryItem: findBridgeHistoryItem({
+          bridgeHistory,
+          transactionMetaId: evmTxMeta.id,
+          // eslint-disable-next-line @typescript-eslint/no-deprecated -- Older persisted bridge history can still be keyed by actionId.
+          transactionActionId: evmTxMeta.actionId,
+          transactionHash: evmTxMeta.hash,
+        }),
+      });
+    },
+    [bridgeHistory, isTransactionsRedesignEnabled, nav],
   );
 
   const [refreshing, setRefreshing] = React.useState(false);
@@ -233,28 +340,28 @@ const MultichainTransactionsView = ({
     const srcTxHash = item.id;
     const bridgeHistoryItem = bridgeHistoryItemsBySrcTxHash[srcTxHash];
 
-    if (bridgeHistoryItem) {
+    if (shouldUseActivityRedesign) {
       return (
-        <MultichainBridgeTransactionListItem
+        <MultichainAssetDetailsActivityListItem
           transaction={item}
-          bridgeHistoryItem={bridgeHistoryItem}
+          bridgeHistoryItem={
+            bridgeHistoryItem ?? bridgeHistoryItemsByDestTxHash[srcTxHash]
+          }
           navigation={nav}
           index={index}
+          chainId={chainId}
           location={location}
         />
       );
     }
 
-    if (
-      isActivityRedesignEnabled &&
-      location === TransactionDetailLocation.AssetDetails
-    ) {
+    if (bridgeHistoryItem) {
       return (
-        <MultichainAssetDetailsActivityListItem
+        <MultichainBridgeTransactionListItem
           transaction={item}
+          bridgeHistoryItem={bridgeHistoryItem}
           navigation={nav}
           index={index}
-          chainId={chainId}
           location={location}
         />
       );
@@ -286,6 +393,18 @@ const MultichainTransactionsView = ({
       return <ActivityListDateHeader timestamp={item.date} />;
     }
 
+    if (item.item.raw?.type === 'localTransaction') {
+      return (
+        <Box twClassName="px-4">
+          <ActivityListItemRow
+            item={item.item}
+            index={index}
+            onPress={handleBridgeArrivalPress}
+          />
+        </Box>
+      );
+    }
+
     const transaction =
       item.item.raw?.type === 'keyringTransaction'
         ? item.item.raw.data
diff --git a/app/components/Views/NetworksManagement/components/DeleteNetworkModal.tsx b/app/components/Views/NetworksManagement/components/DeleteNetworkModal.tsx
index 8c48e1707502..346bb344bcbb 100644
--- a/app/components/Views/NetworksManagement/components/DeleteNetworkModal.tsx
+++ b/app/components/Views/NetworksManagement/components/DeleteNetworkModal.tsx
@@ -14,7 +14,6 @@ import {
 import { strings } from '../../../../../locales/i18n';
 
 import { NetworksManagementViewSelectorsIDs } from '../NetworksManagementView.testIds';
-import { useElevatedSurface } from '../../../../util/theme/themeUtils';
 
 interface DeleteNetworkModalProps {
   networkName: string;
@@ -38,15 +37,12 @@ const DeleteNetworkModal = forwardRef<BottomSheetRef, DeleteNetworkModalProps>(
       testID: NetworksManagementViewSelectorsIDs.DELETE_CONFIRM_BUTTON,
     };
 
-    const surfaceClass = useElevatedSurface();
-
     return (
       <BottomSheet
         ref={ref}
         onClose={onClose}
         goBack={onClose}
         testID={NetworksManagementViewSelectorsIDs.DELETE_MODAL}
-        twClassName={surfaceClass}
       >
         <BottomSheetHeader onClose={onClose}>
           {`${strings('app_settings.delete')} ${networkName} ${strings('app_settings.network')}`}
diff --git a/app/components/Views/Notifications/PushNotificationOnboarding/NewUserSheet/NewUserSheet.test.tsx b/app/components/Views/Notifications/PushNotificationOnboarding/NewUserSheet/NewUserSheet.test.tsx
index 2c68f1826408..77068555ca99 100644
--- a/app/components/Views/Notifications/PushNotificationOnboarding/NewUserSheet/NewUserSheet.test.tsx
+++ b/app/components/Views/Notifications/PushNotificationOnboarding/NewUserSheet/NewUserSheet.test.tsx
@@ -52,8 +52,8 @@ describe('NewUserSheet', () => {
   });
 
   it('renders title, body and buttons when visible', () => {
-    const { getByTestId } = renderWithProvider(
-      <NewUserSheet {...defaultProps} />,
+    const { getByTestId, getByText } = renderWithProvider(
+      <NewUserSheet {...defaultProps} yesLabel="Turn on notifications" />,
     );
     expect(getByTestId(NewUserSheetSelectorsIDs.TITLE)).toBeOnTheScreen();
     expect(getByTestId(NewUserSheetSelectorsIDs.BODY)).toBeOnTheScreen();
@@ -61,6 +61,34 @@ describe('NewUserSheet', () => {
     expect(
       getByTestId(NewUserSheetSelectorsIDs.BUTTON_NOT_NOW),
     ).toBeOnTheScreen();
+    expect(getByText('Turn on notifications')).toBeOnTheScreen();
+  });
+
+  it('renders custom notification-preview content', () => {
+    const { getByText } = renderWithProvider(
+      <NewUserSheet
+        {...defaultProps}
+        previewTitle="Transaction request"
+        previewMessage="Your agent needs approval on a new limit."
+        previewTimestamp="now"
+      />,
+    );
+
+    expect(getByText('Transaction request')).toBeOnTheScreen();
+    expect(
+      getByText('Your agent needs approval on a new limit.'),
+    ).toBeOnTheScreen();
+    expect(getByText('now')).toBeOnTheScreen();
+  });
+
+  it('closes when the close button is pressed', () => {
+    const { getAllByRole } = renderWithProvider(
+      <NewUserSheet {...defaultProps} />,
+    );
+
+    fireEvent.press(getAllByRole('button')[0]);
+
+    expect(mockOnCloseBottomSheet).toHaveBeenCalledTimes(1);
   });
 
   it('closes the sheet before calling onYes when Yes is pressed', () => {
diff --git a/app/components/Views/Notifications/PushNotificationOnboarding/NewUserSheet/NewUserSheet.tsx b/app/components/Views/Notifications/PushNotificationOnboarding/NewUserSheet/NewUserSheet.tsx
index 184ba9900bce..cf6c8bb0ae76 100644
--- a/app/components/Views/Notifications/PushNotificationOnboarding/NewUserSheet/NewUserSheet.tsx
+++ b/app/components/Views/Notifications/PushNotificationOnboarding/NewUserSheet/NewUserSheet.tsx
@@ -24,6 +24,18 @@ export interface NewUserSheetProps {
   onYes?: () => void;
   onNotNow?: () => void;
   testID?: string;
+  /** Optional heading override. Defaults to the push-onboarding copy. */
+  title?: string;
+  /** Optional body override. Defaults to the push-onboarding copy. */
+  body?: string;
+  /** Optional primary-button label override. */
+  yesLabel?: string;
+  /** Whether to render the notification preview card. Defaults to true. */
+  showPreview?: boolean;
+  /** Optional notification-preview content overrides. */
+  previewTitle?: string;
+  previewMessage?: string;
+  previewTimestamp?: string;
 }
 
 const NewUserSheet: React.FC<NewUserSheetProps> = ({
@@ -32,6 +44,13 @@ const NewUserSheet: React.FC<NewUserSheetProps> = ({
   onYes,
   onNotNow,
   testID,
+  title = strings('notifications.push_onboarding.new_user.title'),
+  body = strings('notifications.push_onboarding.new_user.body'),
+  yesLabel = strings('notifications.push_onboarding.new_user.button_yes'),
+  showPreview = true,
+  previewTitle,
+  previewMessage,
+  previewTimestamp,
 }) => {
   const bottomSheetRef = useRef<BottomSheetRef>(null);
 
@@ -69,9 +88,15 @@ const NewUserSheet: React.FC<NewUserSheetProps> = ({
             onPress={() => bottomSheetRef.current?.onCloseBottomSheet()}
           />
         </Box>
-        <Box twClassName="mb-2 px-6">
-          <NotifCard />
-        </Box>
+        {showPreview && (
+          <Box twClassName="mb-2 px-6">
+            <NotifCard
+              title={previewTitle}
+              message={previewMessage}
+              timestamp={previewTimestamp}
+            />
+          </Box>
+        )}
 
         <Box twClassName="px-4">
           <Text
@@ -79,7 +104,7 @@ const NewUserSheet: React.FC<NewUserSheetProps> = ({
             twClassName="mb-2 text-center"
             testID={NewUserSheetSelectorsIDs.TITLE}
           >
-            {strings('notifications.push_onboarding.new_user.title')}
+            {title}
           </Text>
 
           <Text
@@ -87,7 +112,7 @@ const NewUserSheet: React.FC<NewUserSheetProps> = ({
             twClassName="mb-7 text-center text-alternative"
             testID={NewUserSheetSelectorsIDs.BODY}
           >
-            {strings('notifications.push_onboarding.new_user.body')}
+            {body}
           </Text>
 
           <Box twClassName="gap-3">
@@ -99,7 +124,7 @@ const NewUserSheet: React.FC<NewUserSheetProps> = ({
               twClassName="rounded-xl"
               testID={NewUserSheetSelectorsIDs.BUTTON_YES}
             >
-              {strings('notifications.push_onboarding.new_user.button_yes')}
+              {yesLabel}
             </Button>
             <Button
               variant={ButtonVariant.Tertiary}
diff --git a/app/components/Views/Notifications/PushNotificationOnboarding/PushNotificationPermissionFallback.test.tsx b/app/components/Views/Notifications/PushNotificationOnboarding/PushNotificationPermissionFallback.test.tsx
index f67e59c2cbc2..ef33a37fbc00 100644
--- a/app/components/Views/Notifications/PushNotificationOnboarding/PushNotificationPermissionFallback.test.tsx
+++ b/app/components/Views/Notifications/PushNotificationOnboarding/PushNotificationPermissionFallback.test.tsx
@@ -18,6 +18,17 @@ jest.mock('../../../../util/notifications/hooks/useNotifications', () => ({
   useEnableNotifications: jest.fn(),
 }));
 
+const mockShouldShowWalletHomeOnboardingSteps = jest.fn();
+
+jest.mock('react-redux', () => ({
+  useSelector: (selector: unknown) => (selector as () => boolean)(),
+}));
+
+jest.mock('../../../../selectors/onboarding', () => ({
+  selectShouldShowWalletHomeOnboardingSteps: () =>
+    mockShouldShowWalletHomeOnboardingSteps(),
+}));
+
 const mockUsePushPrePromptVariant = jest.mocked(usePushPrePromptVariant);
 const mockUseEnableNotifications = jest.mocked(useEnableNotifications);
 
@@ -36,6 +47,7 @@ const mockVariant = (variant: PushPrePromptVariant) => {
 describe('PushNotificationPermissionFallback', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockShouldShowWalletHomeOnboardingSteps.mockReturnValue(false);
     mockUseEnableNotifications.mockReturnValue({
       enableNotifications: mockEnableNotifications,
       isEnablingNotifications: false,
@@ -84,4 +96,26 @@ describe('PushNotificationPermissionFallback', () => {
     render(<PushNotificationPermissionFallback />);
     expect(mockEnableNotifications).not.toHaveBeenCalled();
   });
+
+  it('holds off the OS request while the wallet home onboarding checklist is active', () => {
+    mockVariant('push_permission');
+    mockShouldShowWalletHomeOnboardingSteps.mockReturnValue(true);
+
+    render(<PushNotificationPermissionFallback />);
+
+    expect(mockEnableNotifications).not.toHaveBeenCalled();
+  });
+
+  it('requests once the checklist is no longer active', () => {
+    mockVariant('push_permission');
+    mockShouldShowWalletHomeOnboardingSteps.mockReturnValue(true);
+
+    const { rerender } = render(<PushNotificationPermissionFallback />);
+    expect(mockEnableNotifications).not.toHaveBeenCalled();
+
+    mockShouldShowWalletHomeOnboardingSteps.mockReturnValue(false);
+    rerender(<PushNotificationPermissionFallback />);
+
+    expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/app/components/Views/Notifications/PushNotificationOnboarding/PushNotificationPermissionFallback.tsx b/app/components/Views/Notifications/PushNotificationOnboarding/PushNotificationPermissionFallback.tsx
index 619c071682df..c75533ccb120 100644
--- a/app/components/Views/Notifications/PushNotificationOnboarding/PushNotificationPermissionFallback.tsx
+++ b/app/components/Views/Notifications/PushNotificationOnboarding/PushNotificationPermissionFallback.tsx
@@ -1,6 +1,8 @@
 import { useEffect, useRef } from 'react';
+import { useSelector } from 'react-redux';
 import { usePushPrePromptVariant } from '../../../../util/notifications/hooks/usePushPrePromptVariant';
 import { useEnableNotifications } from '../../../../util/notifications/hooks/useNotifications';
+import { selectShouldShowWalletHomeOnboardingSteps } from '../../../../selectors/onboarding';
 
 /**
  * Rendered when the `prePushPromptEnabled` flag is OFF. Suppresses the soft pre-prompt
@@ -11,20 +13,31 @@ import { useEnableNotifications } from '../../../../util/notifications/hooks/use
  * `push_permission` variant means the user is eligible, OS push is not yet enabled, and the
  * OS dialog is still promptable. `markPrePromptShown` is NOT called here, so the soft prompt
  * remains available if the flag is later enabled.
+ *
+ * Held off while the wallet home onboarding checklist is active, which owns the notifications
+ * ask in its own step — same guard as `useEnableNotificationsByDefaultEffect`. Without it this
+ * auto-request would ask for OS push behind the checklist and drop its notifications step.
  */
 const PushNotificationPermissionFallback = () => {
   const { variant } = usePushPrePromptVariant();
   const { enableNotifications } = useEnableNotifications(); // nudgeEnablePush: true
+  const isWalletHomeOnboardingChecklistActive = useSelector(
+    selectShouldShowWalletHomeOnboardingSteps,
+  );
   const handledRef = useRef(false);
 
   useEffect(() => {
     // Only push_permission involves an OS prompt; marketing_consent needs none.
-    if (variant !== 'push_permission' || handledRef.current) {
+    if (
+      variant !== 'push_permission' ||
+      isWalletHomeOnboardingChecklistActive ||
+      handledRef.current
+    ) {
       return;
     }
     handledRef.current = true;
     enableNotifications().catch(() => undefined);
-  }, [variant, enableNotifications]);
+  }, [variant, enableNotifications, isWalletHomeOnboardingChecklistActive]);
 
   return null;
 };
diff --git a/app/components/Views/OnboardingSheet/index.tsx b/app/components/Views/OnboardingSheet/index.tsx
index a73b83c861be..33f63a057566 100644
--- a/app/components/Views/OnboardingSheet/index.tsx
+++ b/app/components/Views/OnboardingSheet/index.tsx
@@ -2,7 +2,6 @@ import React, { useCallback, useRef } from 'react';
 import { strings } from '../../../../locales/i18n';
 import { useTheme } from '../../../util/theme';
 import { AppThemeKey } from '../../../util/theme/models';
-import { useElevatedSurface } from '../../../util/theme/themeUtils';
 
 import GoogleIcon from 'images/google.svg';
 import AppleIcon from 'images/apple.svg';
@@ -59,7 +58,7 @@ const OnboardingSheet = () => {
     onPressContinueWithTelegram,
     createWallet = false,
   } = params ?? {};
-  const { colors } = useTheme();
+  const { colors, themeAppearance } = useTheme();
   const tw = useTailwind();
   const onPressCreateAction = () => {
     if (onPressCreate) {
@@ -111,16 +110,10 @@ const OnboardingSheet = () => {
     goTo(url, strings('onboarding.privacy_notice'));
   };
 
-  const { themeAppearance } = useTheme();
-  const surfaceClass = useElevatedSurface();
   const isDark = themeAppearance === AppThemeKey.dark;
 
   return (
-    <BottomSheet
-      goBack={navigation.goBack}
-      ref={sheetRef}
-      twClassName={surfaceClass}
-    >
+    <BottomSheet goBack={navigation.goBack} ref={sheetRef}>
       <Box
         flexDirection={BoxFlexDirection.Column}
         alignItems={BoxAlignItems.Center}
diff --git a/app/components/Views/SDK/SDKConnectV2OtpModal/SDKConnectV2OtpModal.test.tsx b/app/components/Views/SDK/SDKConnectV2OtpModal/SDKConnectV2OtpModal.test.tsx
index b9c1aec96dec..029efa31a3de 100644
--- a/app/components/Views/SDK/SDKConnectV2OtpModal/SDKConnectV2OtpModal.test.tsx
+++ b/app/components/Views/SDK/SDKConnectV2OtpModal/SDKConnectV2OtpModal.test.tsx
@@ -109,11 +109,10 @@ jest.mock('../../../../../locales/i18n', () => ({
       'sdk_connect_v2.show_otp.modal_title': 'Link MetaMask Agent CLI',
       'sdk_connect_v2.show_otp.modal_description':
         'Pair MetaMask Mobile with your MetaMask Agent CLI.',
-      'sdk_connect_v2.show_otp.code_label': 'ENTER THIS CODE IN THE CLI',
+      'sdk_connect_v2.show_otp.code_label': 'ENTER CODE IN TERMINAL',
       'sdk_connect_v2.show_otp.expires_in': `Expires in ${params?.time}`,
       'sdk_connect_v2.show_otp.expired': 'Code expired',
-      'sdk_connect_v2.show_otp.security_notice':
-        "Securing the connection first. You'll authorize CLI access in the next step",
+      'sdk_connect_v2.show_otp.security_notice': 'Securing the connection',
     };
     return translations[key] ?? key;
   },
@@ -144,6 +143,8 @@ describe('SDKConnectV2OtpModal', () => {
       getByTestId(SDKConnectV2OtpModalSelectors.CONTAINER),
     ).toBeOnTheScreen();
     expect(getByText('Link MetaMask Agent CLI')).toBeOnTheScreen();
+    expect(getByText('ENTER CODE IN TERMINAL')).toBeOnTheScreen();
+    expect(getByText('Securing the connection')).toBeOnTheScreen();
     expect(
       getByTestId(SDKConnectV2OtpModalSelectors.OTP_CODE),
     ).toHaveTextContent('4892–AKJ7');
diff --git a/app/components/Views/SelectSRP/SelectSRPBottomSheet.tsx b/app/components/Views/SelectSRP/SelectSRPBottomSheet.tsx
index a0930dcc2191..8bf917964e8c 100644
--- a/app/components/Views/SelectSRP/SelectSRPBottomSheet.tsx
+++ b/app/components/Views/SelectSRP/SelectSRPBottomSheet.tsx
@@ -12,13 +12,11 @@ import SelectSRP from './SelectSRP';
 import { strings } from '../../../../locales/i18n';
 import { SelectSRPBottomSheetTestIds } from './SelectSRPBottomSheet.testIds';
 import { goBackIfFocused } from './SelectSRPBottomSheet.utils';
-import { useElevatedSurface } from '../../../util/theme/themeUtils';
 import Routes from '../../../constants/navigation/Routes';
 
 export const SelectSRPBottomSheet = () => {
   const bottomSheetRef = useRef<BottomSheetRef>(null);
   const navigation = useNavigation<AppNavigationProp>();
-  const surfaceClass = useElevatedSurface();
   const goBack = useCallback(() => {
     goBackIfFocused(navigation);
   }, [navigation]);
@@ -39,11 +37,7 @@ export const SelectSRPBottomSheet = () => {
   );
 
   return (
-    <BottomSheet
-      ref={bottomSheetRef}
-      goBack={goBack}
-      twClassName={surfaceClass}
-    >
+    <BottomSheet ref={bottomSheetRef} goBack={goBack}>
       <BottomSheetHeader
         onBack={goBack}
         backButtonProps={{
diff --git a/app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.test.tsx b/app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.test.tsx
index 18f330c10f7e..9a5e0e3fba2d 100644
--- a/app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.test.tsx
+++ b/app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.test.tsx
@@ -36,6 +36,16 @@ jest.mock(
   }),
 );
 
+const mockRefetchPreferences = jest.fn();
+jest.mock('./hooks/useNotificationStoragePreferences', () => ({
+  useNotificationStoragePreferences: () => ({
+    refetch: mockRefetchPreferences,
+  }),
+}));
+
+// Un-spy the notification hook modules between tests (clearAllMocks does not).
+afterEach(() => jest.restoreAllMocks());
+
 const MOCK_KEYRING_TYPE = 'HD Key Tree' as KeyringTypes;
 const EVM_ADDRESSES = [
   '0xb2B92547A92C1aC55EAe3F6632Fa1aF87dc05a29',
@@ -358,6 +368,16 @@ describe('useNotificationAccountListProps', () => {
       expect(mocks.mockUpdate).toHaveBeenCalledWith(addresses);
     });
   });
+
+  it('refetches the preferences blob alongside account settings', async () => {
+    const { hook } = arrange(['0x123', '0x456']);
+
+    await act(async () => hook.result.current.refetchAccountSettings());
+
+    await waitFor(() => {
+      expect(mockRefetchPreferences).toHaveBeenCalledTimes(1);
+    });
+  });
 });
 
 describe('useNotificationWalletAccountGroups', () => {
diff --git a/app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.tsx b/app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.tsx
index 7817a7ea8f94..51361e939433 100644
--- a/app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.tsx
+++ b/app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.tsx
@@ -10,19 +10,24 @@ import { selectAvatarAccountType } from '../../../../selectors/settings';
 import { selectAccountGroupsByWallet } from '../../../../selectors/multichainAccounts/accountTreeController';
 import { selectInternalAccountsById } from '../../../../selectors/accountsController';
 import { isEvmAccountType } from '@metamask/keyring-api';
+import { useNotificationStoragePreferences } from './hooks/useNotificationStoragePreferences';
 
 export function useNotificationAccountListProps() {
   const accountAddresses = useSelector(getValidNotificationAccounts);
   const accountsMap = useSelector(selectInternalAccountsById);
   const { update, initialLoading, accountsBeingUpdated, data } =
     useFetchAccountNotifications(accountAddresses);
+  const { refetch: refetchPreferences } = useNotificationStoragePreferences();
 
   // Only disable switches during initial data loading, not when individual accounts are updating
   const shouldDisableSwitches = initialLoading;
 
+  // Account toggles rewrite `walletActivity.accounts` behind the cached
+  // preferences, so refresh both — otherwise the next section write PUTs a
+  // stale accounts array.
   const refetchAccountSettings = useCallback(async () => {
-    await update(accountAddresses);
-  }, [accountAddresses, update]);
+    await Promise.all([update(accountAddresses), refetchPreferences()]);
+  }, [accountAddresses, update, refetchPreferences]);
 
   // Helper to get addresses from account IDs
   const getEvmAddressesFromAccountIds = useCallback(
diff --git a/app/components/Views/Settings/NotificationsSettings/NotificationSettingsSection.test.tsx b/app/components/Views/Settings/NotificationsSettings/NotificationSettingsSection.test.tsx
index 81d24d77e0e7..6e2465ff96e5 100644
--- a/app/components/Views/Settings/NotificationsSettings/NotificationSettingsSection.test.tsx
+++ b/app/components/Views/Settings/NotificationsSettings/NotificationSettingsSection.test.tsx
@@ -92,6 +92,22 @@ jest.mock('./AccountsList.hooks', () => ({
   }),
 }));
 
+interface WalletActivitySection {
+  pushNotificationsEnabled: boolean;
+  inAppNotificationsEnabled: boolean;
+  accounts: { address: string; enabled: boolean }[];
+}
+
+// Runs the updater passed to updatePreferencesSection to get the persisted section.
+const applyWalletActivityUpdate = (
+  walletActivity: WalletActivitySection = mockPreferences.walletActivity,
+) => {
+  const [, sectionUpdate] = mockUpdatePreferencesSection.mock.calls[0];
+  return (sectionUpdate as (section: WalletActivitySection) => unknown)(
+    walletActivity,
+  );
+};
+
 const marketingDisclaimer =
   'By turning this on, you agree to receive product news and marketing updates from MetaMask.';
 
@@ -156,8 +172,8 @@ describe('NotificationSettingsSection', () => {
   it('disables both channels and tracks an ALL update when deselecting all accounts', async () => {
     renderSection({
       type: 'walletActivity',
-      title: 'Wallet Activity',
-      description: 'Buy, sells, transfers, swaps and rewards',
+      title: 'Wallet activity',
+      description: 'Buy, sells, transfers, and swaps',
     });
 
     const button = screen.getByTestId(
@@ -165,7 +181,9 @@ describe('NotificationSettingsSection', () => {
     );
     expect(screen.getByText('Deselect all')).toBeOnTheScreen();
 
-    fireEvent.press(button);
+    await act(async () => {
+      fireEvent.press(button);
+    });
 
     expect(mockToggleAllAccounts).toHaveBeenCalledTimes(1);
     await waitFor(() => {
@@ -184,12 +202,13 @@ describe('NotificationSettingsSection', () => {
     expect(mockUpdatePreferencesSection).toHaveBeenCalledTimes(1);
     expect(mockUpdatePreferencesSection).toHaveBeenCalledWith(
       'walletActivity',
-      {
-        ...mockPreferences.walletActivity,
-        pushNotificationsEnabled: false,
-        inAppNotificationsEnabled: false,
-      },
+      expect.any(Function),
     );
+    expect(applyWalletActivityUpdate()).toStrictEqual({
+      ...mockPreferences.walletActivity,
+      pushNotificationsEnabled: false,
+      inAppNotificationsEnabled: false,
+    });
   });
 
   it('enables both channels and tracks an ALL update when selecting all accounts', async () => {
@@ -197,8 +216,8 @@ describe('NotificationSettingsSection', () => {
 
     renderSection({
       type: 'walletActivity',
-      title: 'Wallet Activity',
-      description: 'Buy, sells, transfers, swaps and rewards',
+      title: 'Wallet activity',
+      description: 'Buy, sells, transfers, and swaps',
     });
 
     const button = screen.getByTestId(
@@ -206,7 +225,9 @@ describe('NotificationSettingsSection', () => {
     );
     expect(screen.getByText('Select all')).toBeOnTheScreen();
 
-    fireEvent.press(button);
+    await act(async () => {
+      fireEvent.press(button);
+    });
 
     expect(mockToggleAllAccounts).toHaveBeenCalledTimes(1);
     await waitFor(() => {
@@ -225,12 +246,46 @@ describe('NotificationSettingsSection', () => {
     expect(mockUpdatePreferencesSection).toHaveBeenCalledTimes(1);
     expect(mockUpdatePreferencesSection).toHaveBeenCalledWith(
       'walletActivity',
-      {
-        ...mockPreferences.walletActivity,
-        pushNotificationsEnabled: true,
-        inAppNotificationsEnabled: true,
-      },
+      expect.any(Function),
     );
+    expect(applyWalletActivityUpdate()).toStrictEqual({
+      ...mockPreferences.walletActivity,
+      pushNotificationsEnabled: true,
+      inAppNotificationsEnabled: true,
+    });
+  });
+
+  it('keeps the accounts written by the controller when flipping channels for all accounts', async () => {
+    renderSection({
+      type: 'walletActivity',
+      title: 'Wallet Activity',
+      description: 'Buy, sells, transfers, swaps and rewards',
+    });
+
+    await act(async () => {
+      fireEvent.press(
+        screen.getByTestId(
+          NotificationSettingsViewSelectorsIDs.ACCOUNT_NOTIFICATIONS_SELECT_ALL,
+        ),
+      );
+    });
+
+    await waitFor(() => {
+      expect(mockUpdatePreferencesSection).toHaveBeenCalledTimes(1);
+    });
+
+    // Updater must apply to the refreshed preferences, not this render's copy.
+    const refreshedWalletActivity = {
+      pushNotificationsEnabled: true,
+      inAppNotificationsEnabled: true,
+      accounts: [{ address: '0x1', enabled: false }],
+    };
+
+    expect(applyWalletActivityUpdate(refreshedWalletActivity)).toStrictEqual({
+      pushNotificationsEnabled: false,
+      inAppNotificationsEnabled: false,
+      accounts: [{ address: '0x1', enabled: false }],
+    });
   });
 
   it('updates and tracks the push channel when toggling push notifications', async () => {
@@ -376,8 +431,8 @@ describe('NotificationSettingsSection', () => {
     );
     renderSection({
       type: 'walletActivity',
-      title: 'Wallet Activity',
-      description: 'Buy, sells, transfers, swaps and rewards',
+      title: 'Wallet activity',
+      description: 'Buy, sells, transfers, swaps',
     });
 
     const pushToggle = screen.getByTestId(
@@ -416,8 +471,8 @@ describe('NotificationSettingsSection', () => {
       .mockResolvedValueOnce(undefined);
     renderSection({
       type: 'walletActivity',
-      title: 'Wallet Activity',
-      description: 'Buy, sells, transfers, swaps and rewards',
+      title: 'Wallet activity',
+      description: 'Buy, sells, transfers, and swaps',
     });
 
     fireEvent(
diff --git a/app/components/Views/Settings/NotificationsSettings/NotificationSettingsSection.tsx b/app/components/Views/Settings/NotificationsSettings/NotificationSettingsSection.tsx
index 6b929e68f615..da5a27898197 100644
--- a/app/components/Views/Settings/NotificationsSettings/NotificationSettingsSection.tsx
+++ b/app/components/Views/Settings/NotificationsSettings/NotificationSettingsSection.tsx
@@ -63,8 +63,7 @@ const CHANNEL_BY_KEY: Record<
 const WalletActivitySectionContent = ({ styles }: SectionContentProps) => {
   const { trackEvent, createEventBuilder } = useAnalytics();
   const { profileId } = useSessionProfileId();
-  const { preferences, updatePreferencesSection } =
-    useNotificationStoragePreferences();
+  const { updatePreferencesSection } = useNotificationStoragePreferences();
   const {
     accountProps,
     notificationAccountListProps,
@@ -74,20 +73,20 @@ const WalletActivitySectionContent = ({ styles }: SectionContentProps) => {
     toggleAllAccounts,
   } = useWalletActivityAccountSelection();
 
-  // Toggling all accounts flips both wallet-activity channels in one section
-  // update so they don't race on the shared (stale) preferences snapshot.
+  // Flip both channels in one write. The updater form is required:
+  // `toggleAllAccounts` just rewrote the accounts, so building the section
+  // from this render's preferences would PUT the pre-toggle accounts array
+  // and re-enable every account.
   const handleToggleAllAccounts = useCallback(async () => {
     const nextEnabled = !hasEnabledAccount;
 
     await toggleAllAccounts();
 
-    if (preferences) {
-      await updatePreferencesSection('walletActivity', {
-        ...preferences.walletActivity,
-        pushNotificationsEnabled: nextEnabled,
-        inAppNotificationsEnabled: nextEnabled,
-      });
-    }
+    await updatePreferencesSection('walletActivity', (walletActivity) => ({
+      ...walletActivity,
+      pushNotificationsEnabled: nextEnabled,
+      inAppNotificationsEnabled: nextEnabled,
+    }));
 
     trackEvent(
       createEventBuilder(MetaMetricsEvents.NOTIFICATIONS_SETTINGS_UPDATED)
@@ -101,7 +100,6 @@ const WalletActivitySectionContent = ({ styles }: SectionContentProps) => {
   }, [
     hasEnabledAccount,
     toggleAllAccounts,
-    preferences,
     updatePreferencesSection,
     trackEvent,
     createEventBuilder,
diff --git a/app/components/Views/Settings/NotificationsSettings/NotificationsSettings.view.test.tsx b/app/components/Views/Settings/NotificationsSettings/NotificationsSettings.view.test.tsx
index f255cbacb31b..58a787113849 100644
--- a/app/components/Views/Settings/NotificationsSettings/NotificationsSettings.view.test.tsx
+++ b/app/components/Views/Settings/NotificationsSettings/NotificationsSettings.view.test.tsx
@@ -54,12 +54,12 @@ const GET_NOTIFICATION_PREFERENCES_ACTION =
   'AuthenticatedUserStorageService:getNotificationPreferences';
 
 const SECTION_TITLES = {
-  walletActivity: 'Wallet Activity',
-  perps: 'Trading Activity',
+  walletActivity: 'Wallet activity',
+  perps: 'Trading activity',
   agenticCli: 'Agentic CLI',
-  socialAI: 'Trading Signals',
-  marketing: 'Updates and Rewards',
-  priceAlerts: 'Price Alerts',
+  socialAI: 'Trading signals',
+  marketing: 'Updates and rewards',
+  priceAlerts: 'Price alerts',
 };
 
 const hasFetchedNotificationPreferences = () =>
diff --git a/app/components/Views/Snaps/KeyringSnapRemovalWarning/index.ts b/app/components/Views/Snaps/KeyringSnapRemovalWarning/index.ts
deleted file mode 100644
index 94d58b3d4128..000000000000
--- a/app/components/Views/Snaps/KeyringSnapRemovalWarning/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-export { default as KeyringSnapRemovalWarning } from './KeyringSnapRemovalWarning';
-///: END:ONLY_INCLUDE_IF
diff --git a/app/components/Views/Snaps/SnapsSettingsList/SnapsSettingsList.constants.ts b/app/components/Views/Snaps/SnapsSettingsList/SnapsSettingsList.constants.ts
index e0c2e9f58995..bb6055f6985d 100644
--- a/app/components/Views/Snaps/SnapsSettingsList/SnapsSettingsList.constants.ts
+++ b/app/components/Views/Snaps/SnapsSettingsList/SnapsSettingsList.constants.ts
@@ -5,7 +5,6 @@ export const SNAPS_SETTINGS_LIST_HEADER = 'snaps-settings-list-header';
 export const SNAPS_SETTINGS_LIST_BACK_BUTTON =
   'snaps-settings-list-back-button';
 
-/** Matches legacy `getNavigationOptionsTitle` primary header title color. */
 export const SNAPS_HEADER_TITLE_PROPS = {
   color: TextColor.PrimaryDefault,
 } as const;
diff --git a/app/components/Views/SocialLeaderboard/TopTradersView/TopTradersView.test.tsx b/app/components/Views/SocialLeaderboard/TopTradersView/TopTradersView.test.tsx
index 2d01056ef932..f2471bcba054 100644
--- a/app/components/Views/SocialLeaderboard/TopTradersView/TopTradersView.test.tsx
+++ b/app/components/Views/SocialLeaderboard/TopTradersView/TopTradersView.test.tsx
@@ -484,9 +484,9 @@ describe('TopTradersView', () => {
       screen: Routes.SETTINGS.NOTIFICATION_SETTINGS_SECTION,
       params: {
         type: 'socialAI',
-        title: 'Trading Signals',
+        title: 'Trading signals',
         description:
-          'Updates from traders and assets you follow, plus currated market news',
+          'Updates from traders and assets you follow, plus curated market news',
       },
     });
   });
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.tsx
index 1e5c9ee4648f..dcc308e279b8 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.tsx
@@ -15,7 +15,6 @@ import type { LayoutChangeEvent } from 'react-native';
 import Animated, { useSharedValue } from 'react-native-reanimated';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { MetaMetricsEvents } from '../../../../../../core/Analytics';
-import { useElevatedSurface } from '../../../../../../util/theme/themeUtils';
 import {
   buildQuickBuySharedAnalyticsProperties,
   QuickBuyEventProperties,
@@ -99,7 +98,6 @@ const QuickBuyRootInner: React.FC<QuickBuyRootInnerProps> = ({
   // True once a dismissal is requested via the CTA/Cancel so the content drops
   // with the sheet instead of running its horizontal screen-exit transition.
   const [isClosing, setIsClosing] = useState(false);
-  const surfaceClass = useElevatedSurface();
 
   const directionSV = useSharedValue<ScreenDirection>(1);
   // Suppresses the enter animation on the initial screen when the sheet opens;
@@ -192,11 +190,7 @@ const QuickBuyRootInner: React.FC<QuickBuyRootInnerProps> = ({
   const shouldLockHeight = lockedHeight !== null && !isDynamicHeightScreen;
 
   return (
-    <BottomSheetDialog
-      ref={bottomSheetRef}
-      onClose={onClose}
-      twClassName={surfaceClass}
-    >
+    <BottomSheetDialog ref={bottomSheetRef} onClose={onClose}>
       {isContentReady ? (
         <QuickBuyProvider
           target={target}
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyController.ts b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyController.ts
index 34aacc364241..175907e448c9 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyController.ts
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyController.ts
@@ -601,6 +601,37 @@ export function useQuickBuyController(
     liveSourceCurrencyExchangeRate && liveSourceCurrencyExchangeRate > 0,
   );
 
+  // Buy mode freezes the quote conversion rate via the pay-with `useState`
+  // snapshot (`selectedSourceToken`). Sell mode's `positionToken` is
+  // selector-driven, so without an explicit freeze every market-data tick
+  // retargets `sourceTokenAmount` for the same fiat input — quotes look
+  // stale/`isPendingQuoteRefresh` and Sell stays disabled with no error label
+  // (TSA-976). Keep display rates live above; freeze only the rate used to
+  // convert committed fiat into the quote request amount.
+  const sellQuoteExchangeRateRef = useRef<number | undefined>(undefined);
+  const sellQuoteSourceTokenKeyRef = useRef<string | undefined>(undefined);
+  const positionTokenKey =
+    positionToken?.address != null && positionToken.chainId != null
+      ? getTokenKey(positionToken)
+      : undefined;
+  if (positionTokenKey !== sellQuoteSourceTokenKeyRef.current) {
+    sellQuoteSourceTokenKeyRef.current = positionTokenKey;
+    sellQuoteExchangeRateRef.current = positionToken?.currencyExchangeRate;
+  } else if (
+    sellQuoteExchangeRateRef.current == null &&
+    positionToken?.currencyExchangeRate != null &&
+    positionToken.currencyExchangeRate > 0
+  ) {
+    // Price arrived after the token was already selected — adopt it once so
+    // the first committed amount can convert; later ticks stay frozen.
+    sellQuoteExchangeRateRef.current = positionToken.currencyExchangeRate;
+  }
+  const sellQuoteExchangeRate = sellQuoteExchangeRateRef.current;
+  const quoteSourceExchangeRate =
+    tradeMode === 'sell'
+      ? sellQuoteExchangeRate
+      : sourceToken?.currencyExchangeRate;
+
   // The live balance for whichever token is the *source* this mode: the
   // resynced pay-with token in buy mode, or the already-live position token in
   // sell mode.
@@ -632,14 +663,14 @@ export function useQuickBuyController(
       return latestSourceBalance.displayBalance;
     }
     if (hasSourcePrice) {
-      if (!quotedFiatAmount || !sourceToken?.currencyExchangeRate) {
+      if (!quotedFiatAmount || !quoteSourceExchangeRate) {
         return undefined;
       }
       // `currencyExchangeRate` is user-currency-per-token and `quotedFiatAmount`
       // is in the user's display currency, so fiat / rate yields token units.
       const fiat = parseFloat(quotedFiatAmount);
       if (isNaN(fiat) || fiat <= 0) return undefined;
-      return (fiat / sourceToken.currencyExchangeRate).toString();
+      return (fiat / quoteSourceExchangeRate).toString();
     }
     // Unpriced path: source amount is entered directly in token units.
     if (!sourceAmountTokens) return undefined;
@@ -650,9 +681,9 @@ export function useQuickBuyController(
     hasSourcePrice,
     isMaxSourceAmount,
     latestSourceBalance?.displayBalance,
+    quoteSourceExchangeRate,
     quotedFiatAmount,
     sourceAmountTokens,
-    sourceToken?.currencyExchangeRate,
   ]);
 
   useEffect(() => {
@@ -1627,11 +1658,27 @@ export function useQuickBuyController(
         sourceTokenAmount,
         sourceToken.decimals,
       ).toFixed(0);
-      const sent = calcTokenValue(
-        activeQuote.sentAmount?.amount,
-        sourceToken.decimals,
-      ).toFixed(0);
-      return sent === requested;
+      // Prefer `sentAmount` (full wallet deduction). Required for gas-included /
+      // gas-sponsored quotes where `quote.srcTokenAmount` is the post-fee
+      // routing amount and would never equal the request.
+      const sentAmountDecimal = activeQuote.sentAmount?.amount;
+      if (sentAmountDecimal != null && sentAmountDecimal !== '') {
+        const sent = calcTokenValue(
+          sentAmountDecimal,
+          sourceToken.decimals,
+        ).toFixed(0);
+        if (sent === requested) {
+          return true;
+        }
+      }
+      // Fallback when `sentAmount` is missing (partial QuoteMetadata) or inflated
+      // by src-token protocol fees on top of an already-full request amount:
+      // match the quote's atomic routing amount against the request.
+      const srcTokenAmountAtomic = activeQuote.quote?.srcTokenAmount;
+      return (
+        srcTokenAmountAtomic != null &&
+        String(srcTokenAmountAtomic) === requested
+      );
     } catch {
       return false;
     }
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/useQuickBuyController.test.ts b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/useQuickBuyController.test.ts
index 44caabb1fdda..f0f41f1fe70d 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/useQuickBuyController.test.ts
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/useQuickBuyController.test.ts
@@ -1537,6 +1537,48 @@ describe('useQuickBuyController', () => {
       expect(result.current.isConfirmDisabled).toBe(false);
     });
 
+    it('enables the CTA when sentAmount is missing but quote.srcTokenAmount matches the request', () => {
+      // Partial QuoteMetadata (#33559) can omit sentAmount. Without a fallback
+      // to quote.srcTokenAmount the CTA stayed disabled with a valid quote.
+      const quoteState: UseQuickBuyQuotesResult = {
+        activeQuote: undefined,
+        destTokenAmount: undefined,
+        isQuoteLoading: false,
+        isNoQuotesAvailable: false,
+        quoteFetchError: null,
+        isActiveQuoteForCurrentTokenPair: true,
+        isQuoteRequestStale: false,
+        sortedQuotes: [],
+        quoteCount: 0,
+        quotesLastFetchedAt: null,
+        refreshCount: 0,
+        quoteRefreshRateMs: 30000,
+        maxRefreshCount: 5,
+        refetchQuotes: jest.fn(),
+      };
+      (useQuickBuyQuotes as jest.Mock).mockImplementation(() => quoteState);
+
+      const props = {
+        target: createTarget(),
+        onClose: jest.fn(),
+      };
+      const { result, rerender } = renderHook(
+        ({ target, onClose }) => useQuickBuyController(target, onClose),
+        { initialProps: props },
+      );
+
+      act(() => {
+        result.current.handleAmountChange('20');
+      });
+      quoteState.activeQuote = createActiveQuote({
+        quote: { srcTokenAmount: '10000000000000000' },
+        sentAmount: { amount: undefined },
+      });
+      rerender(props);
+
+      expect(result.current.isConfirmDisabled).toBe(false);
+    });
+
     it('enables the CTA for a gas-included quote whose srcTokenAmount is the post-fee amount', () => {
       const quoteState: UseQuickBuyQuotesResult = {
         activeQuote: undefined,
@@ -2389,13 +2431,92 @@ describe('useQuickBuyController', () => {
   });
 
   describe('sell mode availability', () => {
-    const createPositionToken = () =>
+    const createPositionToken = (overrides: Partial<BridgeToken> = {}) =>
       createSourceToken({
         address: '0xDEST',
         chainId: '0x1',
         symbol: 'TARGET',
+        ...overrides,
+      });
+
+    const createSellReceiveNative = () =>
+      createSourceToken({
+        address: '0x0000000000000000000000000000000000000000',
+        chainId: '0x1',
+        symbol: 'ETH',
+        currencyExchangeRate: 2000,
       });
 
+    it('keeps Sell enabled when the position token price ticks after a quote settles', () => {
+      // Regression (TSA-976): sell mode derived sourceTokenAmount from the live
+      // position-token rate. Market-data ticks changed the amount for the same
+      // fiat input, so isPendingQuoteRefresh stayed true and Sell remained
+      // disabled even with a valid quote on screen (no error label).
+      let positionToken = createPositionToken({ currencyExchangeRate: 2000 });
+      (usePositionTokenBalance as jest.Mock).mockImplementation(
+        () => positionToken,
+      );
+      (useReceiveTokens as jest.Mock).mockReturnValue([
+        createSellReceiveNative(),
+      ]);
+      (useLatestBalance as jest.Mock).mockReturnValue({
+        displayBalance: '1.0',
+        atomicBalance: '1000000000000000000',
+      });
+
+      const quoteState: UseQuickBuyQuotesResult = {
+        activeQuote: undefined,
+        destTokenAmount: undefined,
+        isQuoteLoading: false,
+        isNoQuotesAvailable: false,
+        quoteFetchError: null,
+        isActiveQuoteForCurrentTokenPair: true,
+        isQuoteRequestStale: false,
+        sortedQuotes: [],
+        quoteCount: 0,
+        quotesLastFetchedAt: null,
+        refreshCount: 0,
+        quoteRefreshRateMs: 30000,
+        maxRefreshCount: 5,
+        refetchQuotes: jest.fn(),
+      };
+      (useQuickBuyQuotes as jest.Mock).mockImplementation(() => quoteState);
+
+      const props = {
+        target: createTarget(),
+        onClose: jest.fn(),
+      };
+      const { result, rerender } = renderHook(
+        ({ target, onClose }) => useQuickBuyController(target, onClose),
+        { initialProps: props },
+      );
+
+      act(() => {
+        result.current.setTradeMode('sell');
+      });
+      act(() => {
+        result.current.handleAmountChange('20');
+      });
+
+      const committedSourceAmount = result.current.sourceTokenAmount;
+      expect(committedSourceAmount).toBe('0.01');
+
+      quoteState.activeQuote = createActiveQuote({
+        sentAmount: { amount: '0.01' },
+      });
+      rerender(props);
+      expect(result.current.isConfirmDisabled).toBe(false);
+
+      // Price tick: same token identity, new exchange rate. The committed sell
+      // amount (and CTA) must stay stable — buy mode gets this for free via the
+      // pay-with useState snapshot; sell must freeze the quote conversion rate.
+      positionToken = createPositionToken({ currencyExchangeRate: 2500 });
+      rerender(props);
+
+      expect(result.current.sourceTokenAmount).toBe(committedSourceAmount);
+      expect(result.current.isConfirmDisabled).toBe(false);
+    });
+
     it('resets tradeMode to buy when the position token balance becomes zero', () => {
       (usePositionTokenBalance as jest.Mock).mockReturnValue(
         createPositionToken(),
diff --git a/app/components/Views/SocialLoginIosUser/SocialLoginIosUser.view.test.tsx b/app/components/Views/SocialLoginIosUser/SocialLoginIosUser.view.test.tsx
index e34590ed40b1..d3e189e7d962 100644
--- a/app/components/Views/SocialLoginIosUser/SocialLoginIosUser.view.test.tsx
+++ b/app/components/Views/SocialLoginIosUser/SocialLoginIosUser.view.test.tsx
@@ -10,10 +10,13 @@
  * MetaMetrics opt-in, and wallet home — keep those specs active.
  *
  * Not migratable to CV (keep E2E):
- * - google-login-add-srp.spec.ts — full onboarding + wallet + SRP import
  * - google-login-lock-unlock.spec.ts — native Keychain lock/unlock
  * - google-login-reset-wallet.spec.ts — native Keychain reset from login
+ * - qr-sync-srp.spec.ts — mobile ↔ extension device sync
  *
+ * Former google-login-add-srp Appium smoke removed: Import SRP UI is
+ * covered by ImportNewSecretRecoveryPhrase.view.test.tsx; successful import by
+ * SmokeAccounts import-srp.
  * Run:
  * yarn jest -c jest.config.view.js SocialLoginIosUser.view.test.tsx --runInBand
  */
diff --git a/app/components/Views/SrpInput/index.test.tsx b/app/components/Views/SrpInput/index.test.tsx
index 7a009ce199ec..1c15bd1e1c44 100644
--- a/app/components/Views/SrpInput/index.test.tsx
+++ b/app/components/Views/SrpInput/index.test.tsx
@@ -10,9 +10,6 @@ import {
   TEXTFIELD_ENDACCESSORY_TEST_ID,
 } from '../../../component-library/components/Form/TextField/TextField.constants';
 import { act, fireEvent, render } from '@testing-library/react-native';
-import Device from '../../../util/device';
-
-jest.mock('../../../util/device');
 
 const INPUT_TEST_ID = 'testingInputID';
 describe('SrpInput', () => {
@@ -57,161 +54,130 @@ describe('SrpInput', () => {
   });
 
   describe('selection updates', () => {
-    describe('Android', () => {
-      beforeEach(() => {
-        (Device.isAndroid as jest.Mock).mockReturnValue(true);
+    it('sets selection to end of value on focus', () => {
+      const testValue = 'test recovery phrase';
+      const wrapper = render(
+        <SrpInput value={testValue} testID={INPUT_TEST_ID} />,
+      );
+      const input = wrapper.getByTestId(INPUT_TEST_ID);
+
+      act(() => {
+        fireEvent(input, 'focus');
       });
 
-      it('sets selection to end of value on focus', () => {
-        const testValue = 'test recovery phrase';
-        const wrapper = render(
-          <SrpInput value={testValue} testID={INPUT_TEST_ID} />,
-        );
-        const input = wrapper.getByTestId(INPUT_TEST_ID);
-
-        act(() => {
-          fireEvent(input, 'focus');
-        });
-
-        expect(input.props.selection).toEqual({
-          start: testValue.length,
-          end: testValue.length,
-        });
+      expect(input.props.selection).toEqual({
+        start: testValue.length,
+        end: testValue.length,
       });
+    });
 
-      it('sets selection to beginning on blur', () => {
-        const wrapper = render(
-          <SrpInput value="test value" testID={INPUT_TEST_ID} />,
-        );
-        const input = wrapper.getByTestId(INPUT_TEST_ID);
-
-        act(() => {
-          fireEvent(input, 'focus');
-        });
-
-        act(() => {
-          fireEvent(input, 'blur');
-        });
+    it('keeps selection at end of value on blur', () => {
+      const testValue = 'test value';
+      const wrapper = render(
+        <SrpInput value={testValue} testID={INPUT_TEST_ID} />,
+      );
+      const input = wrapper.getByTestId(INPUT_TEST_ID);
 
-        expect(input.props.selection).toEqual({
-          start: 0,
-          end: 0,
-        });
+      act(() => {
+        fireEvent(input, 'focus');
       });
 
-      it('updates selection state on selection change', () => {
-        const wrapper = render(
-          <SrpInput value="test value" testID={INPUT_TEST_ID} />,
-        );
-        const input = wrapper.getByTestId(INPUT_TEST_ID);
-        const mockSelection = { start: 5, end: 5 };
-
-        act(() => {
-          fireEvent(input, 'selectionChange', {
-            nativeEvent: { selection: mockSelection },
-          });
+      act(() => {
+        fireEvent(input, 'selectionChange', {
+          nativeEvent: { selection: { start: 0, end: 0 } },
         });
-
-        expect(input.props.selection).toEqual(mockSelection);
       });
 
-      it('does not update selection when disabled on focus', () => {
-        const wrapper = render(
-          <SrpInput value="test" isDisabled testID={INPUT_TEST_ID} />,
-        );
-        const input = wrapper.getByTestId(INPUT_TEST_ID);
+      act(() => {
+        fireEvent(input, 'blur');
+      });
 
-        const initialSelection = input.props.selection;
+      expect(input.props.selection).toEqual({
+        start: testValue.length,
+        end: testValue.length,
+      });
+    });
 
-        act(() => {
-          fireEvent(input, 'focus');
-        });
+    it('places caret at end again after blur then focus', () => {
+      const testValue = 'wallet';
+      const wrapper = render(
+        <SrpInput value={testValue} testID={INPUT_TEST_ID} />,
+      );
+      const input = wrapper.getByTestId(INPUT_TEST_ID);
 
-        expect(input.props.selection).toBe(initialSelection);
+      act(() => {
+        fireEvent(input, 'focus');
+      });
+      act(() => {
+        fireEvent(input, 'blur');
+      });
+      act(() => {
+        fireEvent(input, 'focus');
       });
-    });
 
-    describe('iOS', () => {
-      beforeEach(() => {
-        (Device.isAndroid as jest.Mock).mockReturnValue(false);
+      expect(input.props.selection).toEqual({
+        start: testValue.length,
+        end: testValue.length,
       });
+    });
 
-      it('does not set selection on focus', () => {
-        const testValue = 'test recovery phrase';
-        const wrapper = render(
-          <SrpInput value={testValue} testID={INPUT_TEST_ID} />,
-        );
-        const input = wrapper.getByTestId(INPUT_TEST_ID);
+    it('updates selection state on selection change', () => {
+      const wrapper = render(
+        <SrpInput value="test value" testID={INPUT_TEST_ID} />,
+      );
+      const input = wrapper.getByTestId(INPUT_TEST_ID);
+      const mockSelection = { start: 5, end: 5 };
 
-        act(() => {
-          fireEvent(input, 'focus');
+      act(() => {
+        fireEvent(input, 'selectionChange', {
+          nativeEvent: { selection: mockSelection },
         });
-
-        expect(input.props.selection).toBeUndefined();
       });
 
-      it('does not set selection on blur', () => {
-        const wrapper = render(
-          <SrpInput value="test value" testID={INPUT_TEST_ID} />,
-        );
-        const input = wrapper.getByTestId(INPUT_TEST_ID);
+      expect(input.props.selection).toEqual(mockSelection);
+    });
 
-        act(() => {
-          fireEvent(input, 'focus');
-        });
+    it('does not update selection when disabled on focus', () => {
+      const wrapper = render(
+        <SrpInput value="test" isDisabled testID={INPUT_TEST_ID} />,
+      );
+      const input = wrapper.getByTestId(INPUT_TEST_ID);
 
-        act(() => {
-          fireEvent(input, 'blur');
-        });
+      const initialSelection = input.props.selection;
 
-        expect(input.props.selection).toBeUndefined();
+      act(() => {
+        fireEvent(input, 'focus');
       });
 
-      it('does not update selection on selection change', () => {
-        const wrapper = render(
-          <SrpInput value="test value" testID={INPUT_TEST_ID} />,
-        );
-        const input = wrapper.getByTestId(INPUT_TEST_ID);
-        const mockSelection = { start: 5, end: 5 };
-
-        act(() => {
-          fireEvent(input, 'selectionChange', {
-            nativeEvent: { selection: mockSelection },
-          });
-        });
-
-        expect(input.props.selection).toBeUndefined();
-      });
+      expect(input.props.selection).toBe(initialSelection);
     });
 
-    describe('callbacks', () => {
-      it('calls provided onFocus callback when focused', () => {
-        const mockOnFocus = jest.fn();
-        const wrapper = render(
-          <SrpInput onFocus={mockOnFocus} testID={INPUT_TEST_ID} />,
-        );
-        const input = wrapper.getByTestId(INPUT_TEST_ID);
-
-        act(() => {
-          fireEvent(input, 'focus');
-        });
+    it('calls provided onFocus callback when focused', () => {
+      const mockOnFocus = jest.fn();
+      const wrapper = render(
+        <SrpInput onFocus={mockOnFocus} testID={INPUT_TEST_ID} />,
+      );
+      const input = wrapper.getByTestId(INPUT_TEST_ID);
 
-        expect(mockOnFocus).toHaveBeenCalledTimes(1);
+      act(() => {
+        fireEvent(input, 'focus');
       });
 
-      it('calls provided onBlur callback when blurred', () => {
-        const mockOnBlur = jest.fn();
-        const wrapper = render(
-          <SrpInput onBlur={mockOnBlur} testID={INPUT_TEST_ID} />,
-        );
-        const input = wrapper.getByTestId(INPUT_TEST_ID);
+      expect(mockOnFocus).toHaveBeenCalledTimes(1);
+    });
 
-        act(() => {
-          fireEvent(input, 'blur');
-        });
+    it('calls provided onBlur callback when blurred', () => {
+      const mockOnBlur = jest.fn();
+      const wrapper = render(
+        <SrpInput onBlur={mockOnBlur} testID={INPUT_TEST_ID} />,
+      );
+      const input = wrapper.getByTestId(INPUT_TEST_ID);
 
-        expect(mockOnBlur).toHaveBeenCalledTimes(1);
+      act(() => {
+        fireEvent(input, 'blur');
       });
+
+      expect(mockOnBlur).toHaveBeenCalledTimes(1);
     });
   });
 });
diff --git a/app/components/Views/SrpInput/index.tsx b/app/components/Views/SrpInput/index.tsx
index cb5c1ced36fe..f3ce4291e7e0 100644
--- a/app/components/Views/SrpInput/index.tsx
+++ b/app/components/Views/SrpInput/index.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react/prop-types */
 
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useRef, useState } from 'react';
 import {
   StyleProp,
   StyleSheet,
@@ -24,7 +24,6 @@ import {
   TEXTFIELD_ENDACCESSORY_TEST_ID,
 } from '../../../component-library/components/Form/TextField/TextField.constants';
 import { TextVariant } from '../../../component-library/components/Texts/Text';
-import Device from '../../../util/device';
 
 const TextField = React.forwardRef<
   TextInput,
@@ -53,22 +52,41 @@ const TextField = React.forwardRef<
     ref,
   ) => {
     const tw = useTailwind();
+    const inputRef = useRef<TextInput | null>(null);
     const [isFocused, setIsFocused] = useState(false);
     const [inputSelection, setInputSelection] = useState<
       { start: number; end: number } | undefined
     >(undefined);
 
+    const assignRef = useCallback(
+      (node: TextInput | null) => {
+        inputRef.current = node;
+        if (typeof ref === 'function') {
+          ref(node);
+        } else if (ref) {
+          ref.current = node;
+        }
+      },
+      [ref],
+    );
+
+    const placeCaretAtEnd = useCallback(() => {
+      const end = value?.length ?? 0;
+      const selection = { start: end, end };
+      setInputSelection(selection);
+      inputRef.current?.setNativeProps({ selection });
+    }, [value]);
+
     const onBlurHandler = useCallback(
       (e: BlurEvent) => {
         if (!isDisabled) {
           setIsFocused(false);
           onBlur?.(e);
         }
-        if (Device.isAndroid()) {
-          setInputSelection({ start: 0, end: 0 });
-        }
+        const end = value?.length ?? 0;
+        setInputSelection({ start: end, end });
       },
-      [isDisabled, setIsFocused, onBlur],
+      [isDisabled, onBlur, value],
     );
 
     const onFocusHandler = useCallback(
@@ -76,24 +94,16 @@ const TextField = React.forwardRef<
         if (!isDisabled) {
           setIsFocused(true);
           onFocus?.(e);
-
-          if (Device.isAndroid()) {
-            setInputSelection({
-              start: value?.length ?? 0,
-              end: value?.length ?? 0,
-            });
-          }
+          placeCaretAtEnd();
         }
       },
-      [isDisabled, setIsFocused, onFocus, value],
+      [isDisabled, onFocus, placeCaretAtEnd],
     );
 
     const handleSelectionChange = (
       event: NativeSyntheticEvent<TextInputSelectionChangeEventData>,
     ) => {
-      if (Device.isAndroid()) {
-        setInputSelection(event.nativeEvent.selection);
-      }
+      setInputSelection(event.nativeEvent.selection);
     };
 
     let borderStyleClass = 'border-muted';
@@ -129,7 +139,7 @@ const TextField = React.forwardRef<
                 onFocus={onFocusHandler}
                 testID={testID}
                 {...props}
-                ref={ref}
+                ref={assignRef}
                 isStateStylesDisabled
                 inputStyle={inputStyle}
                 selection={inputSelection}
diff --git a/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx b/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx
index 9ea7f2aa0f7c..0ab6b8005907 100644
--- a/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx
+++ b/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx
@@ -33,6 +33,7 @@ import {
   selectIsFirstTimePerpsUser,
   selectPerpsMode,
 } from '../../UI/Perps/selectors/perpsController';
+import { usePerpsMode } from '../../UI/Perps/hooks';
 import { selectPredictEnabledFlag } from '../../UI/Predict';
 import { selectIsEvmNetworkSelected } from '../../../selectors/multichainNetworkController';
 import { isHardwareAccount } from '../../../util/address';
@@ -118,28 +119,18 @@ jest.mock('../../UI/Perps/selectors/featureFlags', () => ({
   selectPerpsProModeEnabledFlag: jest.fn(),
 }));
 
-const mockSetPerpsMode = jest.fn();
 jest.mock('../../UI/Perps/hooks', () => ({
   usePerpsMode: jest.fn(() => ({
     mode: 'lite',
-    setMode: mockSetPerpsMode,
   })),
 }));
 
-jest.mock('../../UI/Perps/components/PerpsModeToggle', () => {
-  const ReactActual = jest.requireActual('react');
-  const { TouchableOpacity } = jest.requireActual('react-native');
-  return {
-    __esModule: true,
-    default: ({ onChange }: { onChange?: (mode: string) => void }) =>
-      ReactActual.createElement(TouchableOpacity, {
-        testID: 'perps-mode-toggle',
-        // Simulate the user switching to Pro from the stubbed toggle.
-        onPress: () => onChange?.('pro'),
-      }),
-    PerpsMode: { Lite: 'lite', Pro: 'pro' },
-  };
-});
+const mockHasCompletedPerpsModeSelection = jest.fn(() =>
+  Promise.resolve(false),
+);
+jest.mock('../../UI/Perps/utils/perpsModeSelectionStorage', () => ({
+  hasCompletedPerpsModeSelection: () => mockHasCompletedPerpsModeSelection(),
+}));
 
 jest.mock('../../UI/Predict', () => ({
   selectPredictEnabledFlag: jest.fn(),
@@ -388,6 +379,8 @@ const pressActionButton = async (
 ) => {
   await act(async () => {
     fireEvent.press(getByTestId(testId));
+    // Flush async post-dismiss callbacks (e.g. mode-selection storage check).
+    await Promise.resolve();
   });
 };
 
@@ -411,6 +404,15 @@ describe('TradeWalletActions', () => {
     jest.clearAllMocks();
     mockIsPureBlack = false;
     mockParentCanGoBack = true;
+    mockHasCompletedPerpsModeSelection.mockResolvedValue(false);
+    (
+      selectPerpsProModeEnabledFlag as jest.MockedFunction<
+        typeof selectPerpsProModeEnabledFlag
+      >
+    ).mockReturnValue(false);
+    (
+      selectPerpsMode as jest.MockedFunction<typeof selectPerpsMode>
+    ).mockReturnValue(PerpsMode.Lite);
     jest
       .spyOn(global, 'requestAnimationFrame')
       .mockImplementation((callback) => {
@@ -421,6 +423,10 @@ describe('TradeWalletActions', () => {
       remove: jest.fn(),
     });
     (selectCanSignTransactions as unknown as jest.Mock).mockReturnValue(true);
+    jest.mocked(usePerpsMode).mockReturnValue({
+      mode: PerpsMode.Lite,
+      setMode: jest.fn(),
+    });
     jest.mocked(isHardwareAccount).mockReturnValue(false);
 
     mockUseStakingEligibility.mockReturnValue({
@@ -678,7 +684,7 @@ describe('TradeWalletActions', () => {
     ).toBeDefined();
   });
 
-  it('should render the Lite/Pro toggle on the Perps row when the Pro mode flag is enabled', () => {
+  it('renders the Lite badge on the Perps row when Lite mode is active', () => {
     (
       selectPerpsEnabledFlag as jest.MockedFunction<
         typeof selectPerpsEnabledFlag
@@ -700,10 +706,12 @@ describe('TradeWalletActions', () => {
       },
     );
 
-    expect(getByTestId('perps-mode-toggle')).toBeOnTheScreen();
+    expect(
+      getByTestId(WalletActionsBottomSheetSelectorsIDs.PERPS_MODE_BADGE),
+    ).toHaveTextContent('Lite');
   });
 
-  it('should not render the Lite/Pro toggle when the Pro mode flag is disabled', () => {
+  it('renders the Pro badge on the Perps row when Pro mode is active', () => {
     (
       selectPerpsEnabledFlag as jest.MockedFunction<
         typeof selectPerpsEnabledFlag
@@ -713,9 +721,13 @@ describe('TradeWalletActions', () => {
       selectPerpsProModeEnabledFlag as jest.MockedFunction<
         typeof selectPerpsProModeEnabledFlag
       >
-    ).mockReturnValue(false);
+    ).mockReturnValue(true);
+    jest.mocked(usePerpsMode).mockReturnValue({
+      mode: PerpsMode.Pro,
+      setMode: jest.fn(),
+    });
 
-    const { getByTestId, queryByTestId } = renderScreen(
+    const { getByTestId } = renderScreen(
       TradeWalletActions,
       {
         name: 'TradeWalletActions',
@@ -726,47 +738,11 @@ describe('TradeWalletActions', () => {
     );
 
     expect(
-      getByTestId(WalletActionsBottomSheetSelectorsIDs.PERPS_BUTTON),
-    ).toBeDefined();
-    expect(queryByTestId('perps-mode-toggle')).toBeNull();
-  });
-
-  it('routes into the default Pro market after dismissing the sheet when the toggle switches to Pro', async () => {
-    (
-      selectPerpsEnabledFlag as jest.MockedFunction<
-        typeof selectPerpsEnabledFlag
-      >
-    ).mockReturnValue(true);
-    (
-      selectPerpsProModeEnabledFlag as jest.MockedFunction<
-        typeof selectPerpsProModeEnabledFlag
-      >
-    ).mockReturnValue(true);
-
-    const { getByTestId } = renderScreen(
-      TradeWalletActions,
-      { name: 'TradeWalletActions' },
-      { state: mockInitialState },
-    );
-
-    await pressActionButton(getByTestId, 'perps-mode-toggle');
-
-    expect(mockSetPerpsMode).toHaveBeenCalledWith('pro');
-    // No `initial: false`: Perps Home must never be seeded beneath the
-    // default market screen, so it stays unreachable via back navigation.
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
-      screen: Routes.PERPS.MARKET_DETAILS,
-      params: expect.objectContaining({
-        market: expect.objectContaining({ symbol: 'BTC' }),
-      }),
-    });
-    expect(mockNavigate).not.toHaveBeenCalledWith(
-      Routes.PERPS.ROOT,
-      expect.objectContaining({ initial: false }),
-    );
+      getByTestId(WalletActionsBottomSheetSelectorsIDs.PERPS_MODE_BADGE),
+    ).toHaveTextContent('Pro');
   });
 
-  it('hides the Lite/Pro toggle when the selected account cannot sign transactions', () => {
+  it('hides the mode badge when the Pro mode flag is disabled', () => {
     (
       selectPerpsEnabledFlag as jest.MockedFunction<
         typeof selectPerpsEnabledFlag
@@ -776,30 +752,27 @@ describe('TradeWalletActions', () => {
       selectPerpsProModeEnabledFlag as jest.MockedFunction<
         typeof selectPerpsProModeEnabledFlag
       >
-    ).mockReturnValue(true);
-    (selectCanSignTransactions as unknown as jest.Mock).mockReturnValue(false);
+    ).mockReturnValue(false);
 
     const { getByTestId, queryByTestId } = renderScreen(
       TradeWalletActions,
-      { name: 'TradeWalletActions' },
-      { state: mockInitialState },
+      {
+        name: 'TradeWalletActions',
+      },
+      {
+        state: mockInitialState,
+      },
     );
 
     expect(
       getByTestId(WalletActionsBottomSheetSelectorsIDs.PERPS_BUTTON),
     ).toBeDefined();
-    expect(queryByTestId('perps-mode-toggle')).toBeNull();
-
-    // Without the toggle, mode switching / navigation into Perps cannot be
-    // triggered from the Trade menu accessory.
-    expect(mockSetPerpsMode).not.toHaveBeenCalled();
-    expect(mockNavigate).not.toHaveBeenCalledWith(
-      Routes.PERPS.ROOT,
-      expect.anything(),
-    );
+    expect(
+      queryByTestId(WalletActionsBottomSheetSelectorsIDs.PERPS_MODE_BADGE),
+    ).not.toBeOnTheScreen();
   });
 
-  it('routes first-time users to the Perps tutorial when the toggle switches mode', async () => {
+  it('keeps the mode badge visible when the Perps action is disabled', () => {
     (
       selectPerpsEnabledFlag as jest.MockedFunction<
         typeof selectPerpsEnabledFlag
@@ -810,11 +783,7 @@ describe('TradeWalletActions', () => {
         typeof selectPerpsProModeEnabledFlag
       >
     ).mockReturnValue(true);
-    (
-      selectIsFirstTimePerpsUser as jest.MockedFunction<
-        typeof selectIsFirstTimePerpsUser
-      >
-    ).mockReturnValue(true);
+    (selectCanSignTransactions as unknown as jest.Mock).mockReturnValue(false);
 
     const { getByTestId } = renderScreen(
       TradeWalletActions,
@@ -822,25 +791,9 @@ describe('TradeWalletActions', () => {
       { state: mockInitialState },
     );
 
-    await pressActionButton(getByTestId, 'perps-mode-toggle');
-
-    // Mode is still persisted, but onboarding is not skipped: the user is sent
-    // to the tutorial instead of the mode-switch/home shortcut. The tutorial
-    // redirect still points at the default Pro market (not Perps Home) so
-    // completing onboarding doesn't violate the Pro-mode invariant (TAT-3612).
-    expect(mockSetPerpsMode).toHaveBeenCalledWith('pro');
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.TUTORIAL, {
-      source: 'trade_menu_action',
-      redirectScreen: Routes.PERPS.MARKET_DETAILS,
-      redirectParams: {
-        market: { symbol: 'BTC' },
-        source: 'trade_menu_action',
-      },
-    });
-    expect(mockNavigate).not.toHaveBeenCalledWith(
-      Routes.PERPS.ROOT,
-      expect.objectContaining({ screen: Routes.PERPS.MARKET_DETAILS }),
-    );
+    expect(
+      getByTestId(WalletActionsBottomSheetSelectorsIDs.PERPS_MODE_BADGE),
+    ).toHaveTextContent('Lite');
   });
 
   it('should render the Predict button if the Predict feature flag is enabled', () => {
@@ -1127,6 +1080,7 @@ describe('TradeWalletActions', () => {
       (
         selectPerpsMode as jest.MockedFunction<typeof selectPerpsMode>
       ).mockReturnValue(PerpsMode.Pro);
+      mockHasCompletedPerpsModeSelection.mockResolvedValue(true);
 
       const { getByTestId } = renderScreen(
         TradeWalletActions,
@@ -1158,6 +1112,11 @@ describe('TradeWalletActions', () => {
           typeof selectIsFirstTimePerpsUser
         >
       ).mockReturnValue(true);
+      (
+        selectPerpsProModeEnabledFlag as jest.MockedFunction<
+          typeof selectPerpsProModeEnabledFlag
+        >
+      ).mockReturnValue(false);
 
       const { getByTestId } = renderScreen(
         TradeWalletActions,
@@ -1173,6 +1132,86 @@ describe('TradeWalletActions', () => {
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.TUTORIAL);
     });
 
+    it('opens the mode selection sheet when Pro mode is enabled and mode has not been chosen', async () => {
+      (
+        selectPerpsEnabledFlag as jest.MockedFunction<
+          typeof selectPerpsEnabledFlag
+        >
+      ).mockReturnValue(true);
+      (
+        selectIsFirstTimePerpsUser as jest.MockedFunction<
+          typeof selectIsFirstTimePerpsUser
+        >
+      ).mockReturnValue(false);
+      (
+        selectPerpsProModeEnabledFlag as jest.MockedFunction<
+          typeof selectPerpsProModeEnabledFlag
+        >
+      ).mockReturnValue(true);
+      mockHasCompletedPerpsModeSelection.mockResolvedValue(false);
+
+      const { getByTestId } = renderScreen(
+        TradeWalletActions,
+        { name: 'TradeWalletActions' },
+        { state: mockInitialState },
+      );
+
+      await pressActionButton(
+        getByTestId,
+        WalletActionsBottomSheetSelectorsIDs.PERPS_BUTTON,
+      );
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.MODALS.ROOT, {
+        screen: Routes.PERPS.MODALS.MODE_SELECTION,
+        params: {
+          entry: 'trade',
+          source: 'trade_menu_action',
+        },
+      });
+    });
+
+    it('skips the mode selection sheet when the user has already chosen a mode', async () => {
+      (
+        selectPerpsEnabledFlag as jest.MockedFunction<
+          typeof selectPerpsEnabledFlag
+        >
+      ).mockReturnValue(true);
+      (
+        selectIsFirstTimePerpsUser as jest.MockedFunction<
+          typeof selectIsFirstTimePerpsUser
+        >
+      ).mockReturnValue(false);
+      (
+        selectPerpsProModeEnabledFlag as jest.MockedFunction<
+          typeof selectPerpsProModeEnabledFlag
+        >
+      ).mockReturnValue(true);
+      mockHasCompletedPerpsModeSelection.mockResolvedValue(true);
+
+      const { getByTestId } = renderScreen(
+        TradeWalletActions,
+        { name: 'TradeWalletActions' },
+        { state: mockInitialState },
+      );
+
+      await pressActionButton(
+        getByTestId,
+        WalletActionsBottomSheetSelectorsIDs.PERPS_BUTTON,
+      );
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+        screen: Routes.PERPS.PERPS_HOME,
+        params: {},
+      });
+      expect(mockNavigate).not.toHaveBeenCalledWith(Routes.PERPS.MODALS.ROOT, {
+        screen: Routes.PERPS.MODALS.MODE_SELECTION,
+        params: {
+          entry: 'trade',
+          source: 'trade_menu_action',
+        },
+      });
+    });
+
     it('navigates to Predict markets after dismissing RootModalFlow', async () => {
       (
         selectPredictEnabledFlag as jest.MockedFunction<
diff --git a/app/components/Views/TradeWalletActions/TradeWalletActions.tsx b/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
index f965c56d25b2..32cbc958be73 100644
--- a/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
+++ b/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
@@ -28,6 +28,9 @@ import { useParams } from '../../../util/navigation/navUtils';
 
 import {
   ActionListItem,
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
   FontWeight,
   IconName,
   Tag,
@@ -44,6 +47,7 @@ import {
   useElevatedSurface,
 } from '../../../util/theme/themeUtils';
 import { BatchSellMetricsLocation } from '@metamask/bridge-controller';
+import { PerpsMode } from '@metamask/perps-controller';
 import {
   useSafeAreaFrame,
   useSafeAreaInsets,
@@ -75,17 +79,15 @@ import {
   selectPooledStakingEnabledFlag,
   selectStablecoinLendingEnabledFlag,
 } from '../../UI/Earn/selectors/featureFlags';
-import { PERPS_EVENT_VALUE, PerpsMode } from '@metamask/perps-controller';
 import { selectPerpsEnabledFlag } from '../../UI/Perps';
 import { selectPerpsProModeEnabledFlag } from '../../UI/Perps/selectors/featureFlags';
 import { usePerpsMode } from '../../UI/Perps/hooks';
-import PerpsModeToggle from '../../UI/Perps/components/PerpsModeToggle';
-import { showPerpsModeFlash } from '../../UI/Perps/utils/perpsModeFlash';
 import {
-  buildDefaultProMarket,
   toPerpsNavigatorScreenParams,
   useGetPerpsHomeNavigationTarget,
 } from '../../UI/Perps/utils/perpsModeSwitch';
+import { openPerpsModeSelection } from '../../UI/Perps/utils/openPerpsModeSelection';
+import { hasCompletedPerpsModeSelection } from '../../UI/Perps/utils/perpsModeSelectionStorage';
 import { selectPredictEnabledFlag } from '../../UI/Predict';
 import { PredictEventValues } from '../../UI/Predict/constants/eventNames';
 import { EVENT_LOCATIONS as STAKE_EVENT_LOCATIONS } from '../../UI/Stake/constants/events';
@@ -121,7 +123,9 @@ function TradeWalletActions() {
   const { onDismiss, buttonLayout } = useParams<TradeWalletActionsParams>();
   const isFirstTimePerpsUser = useSelector(selectIsFirstTimePerpsUser);
 
-  const postCallback = useRef<(() => void) | undefined>(undefined);
+  const postCallback = useRef<(() => void | Promise<void>) | undefined>(
+    undefined,
+  );
   const [visible, setIsVisible] = useState(true);
   const { width: windowWidth, height: windowHeight } = useWindowDimensions();
   const { height: screenHeight } = useSafeAreaFrame();
@@ -176,7 +180,10 @@ function TradeWalletActions() {
   const isPerpsProModeEnabled = useSelector(selectPerpsProModeEnabledFlag);
   const isPredictEnabled = useSelector(selectPredictEnabledFlag);
 
-  const { mode: perpsMode, setMode: setPerpsMode } = usePerpsMode();
+  const { mode: perpsMode } = usePerpsMode();
+  // Product default is Lite; only Pro gets the gold badge treatment.
+  const perpsModeBadge =
+    perpsMode === PerpsMode.Pro ? PerpsMode.Pro : PerpsMode.Lite;
   const getPerpsHomeNavigationTarget = useGetPerpsHomeNavigationTarget();
 
   const isStablecoinLendingEnabled = useSelector(
@@ -237,7 +244,16 @@ function TradeWalletActions() {
   }, [handleNavigateBack, navigate]);
 
   const onPerps = useCallback(() => {
-    postCallback.current = () => {
+    postCallback.current = async () => {
+      if (isPerpsProModeEnabled) {
+        const hasCompletedModeSelection =
+          await hasCompletedPerpsModeSelection();
+        if (!hasCompletedModeSelection) {
+          openPerpsModeSelection(navigation, { entry: 'trade' });
+          return;
+        }
+      }
+
       if (isFirstTimePerpsUser) {
         navigate(Routes.PERPS.TUTORIAL);
       } else {
@@ -251,63 +267,12 @@ function TradeWalletActions() {
   }, [
     handleNavigateBack,
     navigate,
+    navigation,
     isFirstTimePerpsUser,
+    isPerpsProModeEnabled,
     getPerpsHomeNavigationTarget,
   ]);
 
-  const onPerpsModeChange = useCallback(
-    (nextMode: PerpsMode) => {
-      setPerpsMode(nextMode);
-      // Dismiss the Trade sheet, then route the user into Perps.
-      postCallback.current = () => {
-        // First-time users must still go through onboarding (same as tapping
-        // the Perps row): routing straight into Perps would skip the tutorial
-        // otherwise, so no mode-switch flash is shown here. The redirect
-        // mirrors the Pro/Lite branches below so completing the tutorial
-        // doesn't land back on Perps Home while Pro mode is active
-        // (TAT-3612).
-        if (isFirstTimePerpsUser) {
-          navigate(
-            Routes.PERPS.TUTORIAL,
-            nextMode === PerpsMode.Pro
-              ? {
-                  source: PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION,
-                  redirectScreen: Routes.PERPS.MARKET_DETAILS,
-                  redirectParams: {
-                    market: buildDefaultProMarket(),
-                    source: PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION,
-                  },
-                }
-              : undefined,
-          );
-          return;
-        }
-        // Flash the destination mode on top of the Perps stack once it mounts.
-        showPerpsModeFlash(nextMode);
-        if (nextMode === PerpsMode.Pro) {
-          // Pro lands on the default (BTC) market screen. Deliberately no
-          // `initial: false` here: Perps Home must never be seeded beneath
-          // it, so it stays unreachable via back navigation.
-          navigate(Routes.PERPS.ROOT, {
-            screen: Routes.PERPS.MARKET_DETAILS,
-            params: {
-              market: buildDefaultProMarket(),
-              source: PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION,
-            },
-          });
-          return;
-        }
-        // Lite lands on Perps home.
-        navigate(Routes.PERPS.ROOT, {
-          screen: Routes.PERPS.PERPS_HOME,
-          initial: false,
-        });
-      };
-      handleNavigateBack();
-    },
-    [handleNavigateBack, navigate, setPerpsMode, isFirstTimePerpsUser],
-  );
-
   const onPredict = useCallback(() => {
     postCallback.current = () => {
       navigate(Routes.PREDICT.ROOT, {
@@ -433,21 +398,34 @@ function TradeWalletActions() {
       )}
       {isPerpsEnabled && (
         <ActionListItem
-          label={strings('asset_overview.perps_button')}
+          label={
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              gap={2}
+            >
+              <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+                {strings('asset_overview.perps_button')}
+              </Text>
+              {isPerpsProModeEnabled ? (
+                <Tag
+                  severity={
+                    perpsModeBadge === PerpsMode.Pro
+                      ? TagSeverity.Warning
+                      : TagSeverity.Neutral
+                  }
+                  testID={WalletActionsBottomSheetSelectorsIDs.PERPS_MODE_BADGE}
+                >
+                  {strings(`perps.mode.${perpsModeBadge}`)}
+                </Tag>
+              ) : null}
+            </Box>
+          }
           description={strings('asset_overview.perps_description')}
           iconName={IconName.Candlestick}
           onPress={onPerps}
           testID={WalletActionsBottomSheetSelectorsIDs.PERPS_BUTTON}
           isDisabled={!canSignTransactions}
-          endAccessory={
-            isPerpsProModeEnabled && canSignTransactions ? (
-              <PerpsModeToggle
-                mode={perpsMode}
-                onChange={onPerpsModeChange}
-                source={PERPS_EVENT_VALUE.SOURCE.TRADE_MENU_ACTION}
-              />
-            ) : undefined
-          }
         />
       )}
       {isPredictEnabled && (
diff --git a/app/components/Views/TrendingView/TrendingView.test.tsx b/app/components/Views/TrendingView/TrendingView.test.tsx
index fac2910f48cf..4887f228fb3a 100644
--- a/app/components/Views/TrendingView/TrendingView.test.tsx
+++ b/app/components/Views/TrendingView/TrendingView.test.tsx
@@ -3,6 +3,8 @@ import { render, fireEvent, waitFor } from '@testing-library/react-native';
 import { NavigationContainer } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { MetaMetricsEvents } from '../../../core/Analytics';
+import { analytics } from '../../../util/analytics/analytics';
 
 const mockNavigate = jest.fn();
 const mockGoBack = jest.fn();
@@ -131,6 +133,12 @@ jest.mock('../../../components/hooks/useAnalytics/useAnalytics', () => ({
   }),
 }));
 
+jest.mock('../../../util/analytics/analytics', () => ({
+  analytics: {
+    trackEvent: jest.fn(),
+  },
+}));
+
 jest.mock('../../../util/browser', () => ({
   buildPortfolioUrl: jest.fn((url) => ({
     href: `${url}?metamaskEntry=mobile&metricsEnabled=true&marketingEnabled=false`,
@@ -396,6 +404,27 @@ describe('TrendingView', () => {
     expect(mockNavigate).toHaveBeenCalledWith('ExploreSearch');
   });
 
+  it('tracks the search opened event with the explore entry point', () => {
+    const { getByTestId } = renderTrendingView();
+
+    fireEvent.press(getByTestId('explore-view-search-button'));
+
+    const openedEvent = (
+      analytics.trackEvent as jest.MockedFunction<typeof analytics.trackEvent>
+    ).mock.calls
+      .map(([event]) => event)
+      .find((event) => event.properties?.interaction_type === 'opened');
+
+    expect(openedEvent?.name).toBe(
+      MetaMetricsEvents.EXPLORE_SEARCH_INTERACTED.category,
+    );
+    expect(openedEvent?.properties).toEqual({
+      interaction_type: 'opened',
+      search_query: '',
+      entry_point: 'explore',
+    });
+  });
+
   describe('tab switching', () => {
     it('does not re-render an inactive tab just because the active tab changed', async () => {
       const { getByTestId } = renderTrendingView();
diff --git a/app/components/Views/TrendingView/TrendingView.tsx b/app/components/Views/TrendingView/TrendingView.tsx
index f982d161fc29..96459024190a 100644
--- a/app/components/Views/TrendingView/TrendingView.tsx
+++ b/app/components/Views/TrendingView/TrendingView.tsx
@@ -48,6 +48,7 @@ import DappsTab from './tabs/DappsTab';
 import { TrendingViewSelectorsIDs } from './TrendingView.testIds';
 import {
   trackExploreInteracted,
+  trackExploreSearchOpened,
   type ExploreTabName,
 } from './search/analytics';
 import { EXPLORE_TAB_INDEX } from '../../../constants/navigation/exploreTabIndices';
@@ -256,6 +257,7 @@ export const ExploreFeed: React.FC = () => {
   }, [navigation, portfolioUrl.href, browserTabsCount]);
 
   const handleSearchPress = useCallback(() => {
+    trackExploreSearchOpened('explore');
     navigation.navigate(Routes.EXPLORE_SEARCH);
   }, [navigation]);
 
diff --git a/app/components/Views/TrendingView/search/analytics.test.ts b/app/components/Views/TrendingView/search/analytics.test.ts
index 14f9e7198174..86857b8cda11 100644
--- a/app/components/Views/TrendingView/search/analytics.test.ts
+++ b/app/components/Views/TrendingView/search/analytics.test.ts
@@ -5,6 +5,7 @@ import {
   getExploreSearchResultCount,
   getTotalSectionResultCount,
   trackExplorePredictTrendingAssetViewed,
+  trackExploreSearchOpened,
   trackExploreSectionSeeAll,
   useInstrumentedSearchEffect,
 } from './analytics';
@@ -216,6 +217,35 @@ describe('Explore search analytics', () => {
     });
   });
 
+  describe('trackExploreSearchOpened', () => {
+    it.each([['home' as const], ['explore' as const]])(
+      'tracks the opened interaction with entry_point %s',
+      (entryPoint) => {
+        trackExploreSearchOpened(entryPoint);
+
+        expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+
+        const event = mockTrackEvent.mock.calls[0][0];
+
+        expect(event.name).toBe(
+          MetaMetricsEvents.EXPLORE_SEARCH_INTERACTED.category,
+        );
+        expect(event.properties).toEqual({
+          interaction_type: 'opened',
+          search_query: '',
+          entry_point: entryPoint,
+        });
+      },
+    );
+
+    it('fires once per call so re-entering search re-fires', () => {
+      trackExploreSearchOpened('home');
+      trackExploreSearchOpened('explore');
+
+      expect(mockTrackEvent).toHaveBeenCalledTimes(2);
+    });
+  });
+
   describe('trackExploreSectionSeeAll', () => {
     it('tracks Explore Page Interacted and Asset Viewed for predictions_trending', () => {
       trackExploreSectionSeeAll({
diff --git a/app/components/Views/TrendingView/search/analytics.ts b/app/components/Views/TrendingView/search/analytics.ts
index 590e25374182..ec0949100d78 100644
--- a/app/components/Views/TrendingView/search/analytics.ts
+++ b/app/components/Views/TrendingView/search/analytics.ts
@@ -34,6 +34,7 @@ export const getExploreSearchResultCount = (
 };
 
 export type SearchInteractionType =
+  | 'opened'
   | 'result_clicked'
   | 'scrolled'
   | 'tab_switched'
@@ -42,9 +43,14 @@ export type SearchInteractionType =
 /** 'all' = aggregated view; other values are a specific feed pill. */
 export type SearchFeedPill = SearchFeedId | 'all';
 
+/** Surface the user tapped to open search. Only set on `opened`. */
+export type SearchEntryPoint = 'home' | 'explore';
+
 export interface ExploreSearchInteractedProperties {
   interaction_type: SearchInteractionType;
   search_query: string;
+  /** Only set on `opened`. */
+  entry_point?: SearchEntryPoint;
   /** Only set on result_clicked when tab_name is 'all'. */
   section_name?: SearchFeedId;
   tab_name?: SearchFeedPill;
@@ -170,6 +176,24 @@ export const trackExploreSearchEvent = (
   );
 };
 
+/**
+ * Fired when the user opens the search screen, so opens can be attributed to
+ * the surface they came from. Called from the tap handler rather than on screen
+ * mount, so a remount (or a deeplink into search) never duplicates the event.
+ *
+ * `search_query` is sent as an empty string: the schema requires the property
+ * and the user has not typed anything yet.
+ */
+export const trackExploreSearchOpened = (
+  entryPoint: SearchEntryPoint,
+): void => {
+  trackExploreSearchEvent({
+    interaction_type: 'opened',
+    search_query: '',
+    entry_point: entryPoint,
+  });
+};
+
 /**
  * Side effect hook to invoke analytics when searching.
  * Fires the 'searched' event once per unique settled query (after loading
diff --git a/app/components/Views/UnmountOnBlur/UnmountOnTabBlur.test.tsx b/app/components/Views/UnmountOnBlur/UnmountOnTabBlur.test.tsx
new file mode 100644
index 000000000000..0f1882dc8156
--- /dev/null
+++ b/app/components/Views/UnmountOnBlur/UnmountOnTabBlur.test.tsx
@@ -0,0 +1,139 @@
+import React from 'react';
+import { Text } from 'react-native';
+import { act, render, screen } from '@testing-library/react-native';
+import {
+  NavigationContainer,
+  createNavigationContainerRef,
+} from '@react-navigation/native';
+import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import UnmountOnBlur from './index';
+import { withUnmountOnTabBlur } from './UnmountOnTabBlur';
+
+const Tab = createBottomTabNavigator();
+const Stack = createNativeStackNavigator();
+
+const mockMount = jest.fn();
+const mockUnmount = jest.fn();
+
+const TrackedTabScreen = () => {
+  React.useEffect(() => {
+    mockMount();
+    return () => mockUnmount();
+  }, []);
+
+  return <Text>Tracked tab</Text>;
+};
+
+const OtherTabScreen = () => <Text>Other tab</Text>;
+const PushedScreen = () => <Text>Pushed screen</Text>;
+
+const renderNavigation = (TrackedTab: React.ComponentType) => {
+  const navigationRef = createNavigationContainerRef();
+
+  render(
+    <NavigationContainer ref={navigationRef}>
+      <Stack.Navigator screenOptions={{ headerShown: false }}>
+        <Stack.Screen name="Tabs">
+          {() => (
+            <Tab.Navigator
+              tabBar={() => null}
+              screenOptions={{ headerShown: false }}
+            >
+              <Tab.Screen name="TrackedTab" component={TrackedTab} />
+              <Tab.Screen name="OtherTab" component={OtherTabScreen} />
+            </Tab.Navigator>
+          )}
+        </Stack.Screen>
+        <Stack.Screen name="Pushed" component={PushedScreen} />
+      </Stack.Navigator>
+    </NavigationContainer>,
+  );
+
+  return navigationRef;
+};
+
+const navigateTo = async (
+  navigationRef: ReturnType<typeof createNavigationContainerRef>,
+  name: string,
+) => {
+  await act(async () => {
+    navigationRef.navigate(name as never);
+  });
+};
+
+describe('withUnmountOnTabBlur', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the wrapped tab while it is the selected tab', () => {
+    renderNavigation(withUnmountOnTabBlur(TrackedTabScreen));
+
+    expect(screen.getByText('Tracked tab')).toBeOnTheScreen();
+    expect(mockMount).toHaveBeenCalledTimes(1);
+  });
+
+  it('unmounts the wrapped tab when another tab is selected', async () => {
+    const navigationRef = renderNavigation(
+      withUnmountOnTabBlur(TrackedTabScreen),
+    );
+
+    await navigateTo(navigationRef, 'OtherTab');
+
+    expect(screen.queryByText('Tracked tab')).toBeNull();
+    expect(mockUnmount).toHaveBeenCalledTimes(1);
+  });
+
+  it('remounts the wrapped tab when it is selected again', async () => {
+    const navigationRef = renderNavigation(
+      withUnmountOnTabBlur(TrackedTabScreen),
+    );
+
+    await navigateTo(navigationRef, 'OtherTab');
+    await navigateTo(navigationRef, 'TrackedTab');
+
+    expect(screen.getByText('Tracked tab')).toBeOnTheScreen();
+    expect(mockMount).toHaveBeenCalledTimes(2);
+  });
+
+  it('keeps the wrapped tab mounted while a parent navigator pushes a screen over the tabs', async () => {
+    const navigationRef = renderNavigation(
+      withUnmountOnTabBlur(TrackedTabScreen),
+    );
+
+    await navigateTo(navigationRef, 'Pushed');
+
+    expect(mockUnmount).not.toHaveBeenCalled();
+  });
+
+  it('unmounts on a parent push when using the useIsFocused based UnmountOnBlur, which is why the tab scoped wrapper exists', async () => {
+    const FocusScopedTab = () => (
+      <UnmountOnBlur>
+        <TrackedTabScreen />
+      </UnmountOnBlur>
+    );
+
+    const navigationRef = renderNavigation(FocusScopedTab);
+
+    await navigateTo(navigationRef, 'Pushed');
+
+    expect(mockUnmount).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders the wrapped component when mounted outside a navigator', () => {
+    const WrappedScreen = withUnmountOnTabBlur(TrackedTabScreen);
+
+    render(<WrappedScreen />);
+
+    expect(screen.getByText('Tracked tab')).toBeOnTheScreen();
+  });
+
+  it('names the wrapper after the wrapped component for debugging', () => {
+    const WrappedScreen = withUnmountOnTabBlur(TrackedTabScreen);
+
+    expect(WrappedScreen.displayName).toBe(
+      'WithUnmountOnTabBlur(TrackedTabScreen)',
+    );
+  });
+});
diff --git a/app/components/Views/UnmountOnBlur/UnmountOnTabBlur.tsx b/app/components/Views/UnmountOnBlur/UnmountOnTabBlur.tsx
new file mode 100644
index 000000000000..83cc9927da4d
--- /dev/null
+++ b/app/components/Views/UnmountOnBlur/UnmountOnTabBlur.tsx
@@ -0,0 +1,78 @@
+import React, { useContext } from 'react';
+import {
+  NavigationContext,
+  NavigationRouteContext,
+  useNavigationState,
+  useRoute,
+} from '@react-navigation/native';
+
+export interface UnmountOnTabBlurProps {
+  children: React.ReactNode;
+}
+
+/**
+ * Renders children only while this screen is the selected tab.
+ * Unlike `useIsFocused`, parent modals do not count as a blur.
+ */
+const UnmountOnSelectedRouteChange: React.FC<UnmountOnTabBlurProps> = ({
+  children,
+}) => {
+  const route = useRoute();
+  const selectedRouteKey = useNavigationState(
+    (state) => state.routes[state.index]?.key,
+  );
+
+  if (selectedRouteKey !== route.key) {
+    return null;
+  }
+
+  return children;
+};
+
+/**
+ * Unmounts children while another tab is selected.
+ * Drop-in for the `unmountOnBlur` tab option removed in React Navigation v7.
+ */
+export const UnmountOnTabBlur: React.FC<UnmountOnTabBlurProps> = ({
+  children,
+}) => {
+  const route = useContext(NavigationRouteContext);
+  const navigation = useContext(NavigationContext);
+
+  // Outside a navigator (e.g. unit tests) there is no blur state — render as-is.
+  if (!route || !navigation) {
+    return children;
+  }
+
+  return (
+    <UnmountOnSelectedRouteChange>{children}</UnmountOnSelectedRouteChange>
+  );
+};
+
+/**
+ * Wraps a tab screen so it unmounts when another tab is selected.
+ * Define at module scope to keep a stable component identity.
+ *
+ * Pair with `freezeOnBlur: false` on the tab options — this wrapper unmounts
+ * from inside the screen, and a frozen screen blocks that unmount.
+ *
+ * @param TabScreen - The tab screen component to wrap.
+ * @returns The wrapped tab screen component.
+ */
+export function withUnmountOnTabBlur<P extends object>(
+  TabScreen: React.ComponentType<P>,
+): React.FC<P> {
+  const WithUnmountOnTabBlur: React.FC<P> = (props) => (
+    <UnmountOnTabBlur>
+      <TabScreen {...props} />
+    </UnmountOnTabBlur>
+  );
+
+  WithUnmountOnTabBlur.displayName = `WithUnmountOnTabBlur(${
+    TabScreen.displayName || TabScreen.name || 'Component'
+  })`;
+
+  return WithUnmountOnTabBlur;
+}
+
+export default UnmountOnTabBlur;
diff --git a/app/components/Views/Wallet/Wallet.view.test.tsx b/app/components/Views/Wallet/Wallet.view.test.tsx
index 70d7871d8d26..c33e896e0fbd 100644
--- a/app/components/Views/Wallet/Wallet.view.test.tsx
+++ b/app/components/Views/Wallet/Wallet.view.test.tsx
@@ -8,10 +8,11 @@ import { renderComponentViewScreen } from '../../../../tests/component-view/rend
 import { WalletViewSelectorsIDs } from './WalletView.testIds';
 import { MoneyBalanceCardTestIds } from '../../UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.testIds';
 import { WalletHomeOnboardingStepsSelectors } from '../../UI/WalletHomeOnboardingSteps/WalletHomeOnboardingSteps.testIds';
-import { WALLET_HOME_ONBOARDING_VISIBLE_STEPS } from '../../UI/WalletHomeOnboardingSteps/walletHomeOnboardingStepsModel';
+import { walletHomeOnboardingVisibleSteps } from '../../UI/WalletHomeOnboardingSteps/walletHomeOnboardingStepsModel';
 import { describeForPlatforms } from '../../../../tests/component-view/platform';
 import { fireEvent } from '@testing-library/react-native';
 import Routes from '../../../constants/navigation/Routes';
+import { strings } from '../../../../locales/i18n';
 import Wallet from './index';
 import React from 'react';
 
@@ -100,6 +101,52 @@ describeForPlatforms('Wallet', () => {
     ).toBeOnTheScreen();
   });
 
+  it('navigates to Explore search when the header search button is pressed', async () => {
+    const { getByTestId, findByTestId } = renderWalletViewWithRoutes({
+      extraRoutes: [
+        { name: Routes.QR_TAB_SWITCHER },
+        { name: Routes.EXPLORE_SEARCH },
+      ],
+      overrides: {
+        settings: {
+          basicFunctionalityEnabled: true,
+        },
+        engine: {
+          backgroundState: {
+            MultichainNetworkController: {
+              isEvmSelected: true,
+            },
+            RewardsController: {
+              activeAccount: null,
+            },
+            PreferencesController: {
+              tokenSortConfig: {
+                key: 'tokenFiatAmount',
+                order: 'dsc',
+                sortCallback: 'stringNumeric',
+              },
+            },
+          },
+        },
+      } as unknown as Record<string, unknown>,
+    });
+
+    const searchButton = getByTestId(
+      WalletViewSelectorsIDs.WALLET_SEARCH_BUTTON,
+    );
+
+    // Icon-only button, so screen readers have nothing to announce without this.
+    expect(searchButton).toHaveAccessibleName(
+      strings('wallet.search_accessibility_label'),
+    );
+
+    fireEvent.press(searchButton);
+
+    expect(
+      await findByTestId(`route-${Routes.EXPLORE_SEARCH}`),
+    ).toBeOnTheScreen();
+  });
+
   const defaultWalletOverrides = {
     overrides: {
       settings: {
@@ -289,7 +336,11 @@ describeForPlatforms('Wallet', () => {
     });
 
     it('shows the Money balance card after the user skips the last checklist step', () => {
-      const lastStepIndex = WALLET_HOME_ONBOARDING_VISIBLE_STEPS.length - 1;
+      // This preset leaves `pushNotificationOsPromptRequested` unset, so the notifications
+      // step is part of the flow (TMCU-924).
+      const lastStepIndex =
+        walletHomeOnboardingVisibleSteps({ includeNotificationsStep: true })
+          .length - 1;
       const { getByTestId, queryByTestId } = renderMoneyAccountVisibleWallet({
         walletHomeOnboardingSteps: {
           suppressedReason: null,
diff --git a/app/components/Views/Wallet/WalletView.testIds.ts b/app/components/Views/Wallet/WalletView.testIds.ts
index 989487417240..f7d86e36fd88 100644
--- a/app/components/Views/Wallet/WalletView.testIds.ts
+++ b/app/components/Views/Wallet/WalletView.testIds.ts
@@ -67,6 +67,8 @@ export const WalletViewSelectorsIDs = {
   PROFILE_BUTTON_AVATAR_NETWORK_SUBTITLE_CONTAINER:
     'profile-button-avatar-network-subtitle-container',
   HOMEPAGE_CONTAINER: 'homepage-container',
+  HOMEPAGE_BANNER_CONTAINER: 'homepage-banner-container',
+  HOMEPAGE_BANNER_CONTENT: 'homepage-banner-content',
   HOMEPAGE_MORE_SECTION: 'homepage-more-section',
   HOMEPAGE_MORE_CONTACT_SUPPORT_BUTTON: 'homepage-more-contact-support-button',
   CAROUSEL_CONTAINER: 'carousel-container',
@@ -95,6 +97,7 @@ export const WalletViewSelectorsIDs = {
   BALANCE_EMPTY_STATE_ACTION_BUTTON:
     'account-group-balance-empty-state-action-button',
   WALLET_ACTIVITY_BUTTON: 'wallet-activity-button',
+  WALLET_SEARCH_BUTTON: 'wallet-search-button',
   WALLET_HEADER_ROOT: 'wallet-header-root',
   WALLET_SAFE_AREA: 'wallet-safe-area',
   WALLET_SCROLL_VIEW: 'wallet-scroll-view',
diff --git a/app/components/Views/Wallet/index.test.tsx b/app/components/Views/Wallet/index.test.tsx
index e453ba042ed8..7851ccb0a128 100644
--- a/app/components/Views/Wallet/index.test.tsx
+++ b/app/components/Views/Wallet/index.test.tsx
@@ -101,13 +101,40 @@ jest.mock('../../UI/Money/components/MoneyBalanceCard', () => {
 // NetworkController / controllerMessenger APIs. Without this, the banner hook
 // throws during render and the ErrorBoundary swallows the failure, making
 // negative-assert tests pass for the wrong reason.
-jest.mock('../../UI/NetworkConnectionBanner', () => () => null);
+jest.mock('../../UI/NetworkConnectionBanner', () => ({
+  NetworkConnectionBannerContent: () => null,
+}));
+let mockNetworkConnectionBannerVisible = false;
+jest.mock('../../hooks/useNetworkConnectionBanner', () => ({
+  useNetworkConnectionBanner: () => ({
+    networkConnectionBannerState: {
+      visible: mockNetworkConnectionBannerVisible,
+    },
+    updateRpc: jest.fn(),
+    switchToInfura: jest.fn(),
+  }),
+}));
 
 let mockDiscoveryPillsVariantName = 'control';
 let mockActionButtonsGridVariantName = 'control';
+let mockBalanceBreakdownVariantName = 'unresolved';
 jest.mock('../../../hooks', () => ({
   ...jest.requireActual('../../../hooks'),
   useABTest: jest.fn((flagKey: string) => {
+    if (flagKey === 'homeTMCU1209AbtestHomepageBalanceBreakdown') {
+      return {
+        variantName: mockBalanceBreakdownVariantName,
+        variant: {
+          layout:
+            mockBalanceBreakdownVariantName === 'icons' ||
+            mockBalanceBreakdownVariantName === 'allocation'
+              ? mockBalanceBreakdownVariantName
+              : null,
+        },
+        isActive: mockBalanceBreakdownVariantName !== 'unresolved',
+      };
+    }
+
     if (flagKey === 'homeTMCU926AbtestDiscoveryPills') {
       const isGrayIcons = mockDiscoveryPillsVariantName === 'grayIcons';
       const isColorIcons = mockDiscoveryPillsVariantName === 'colorIcons';
@@ -212,6 +239,7 @@ jest.mock('../../UI/Carousel', () => {
 // Capture the HomepageScrollContext value by rendering a context-aware mock Homepage.
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let capturedContext: any = null;
+const mockHomepage = jest.fn();
 jest.mock('../Homepage', () => {
   const React = jest.requireActual('react');
   const { HomepageScrollContext: HomepageCtx } = jest.requireActual(
@@ -219,7 +247,8 @@ jest.mock('../Homepage', () => {
   );
   return {
     __esModule: true,
-    default: React.forwardRef((_props: unknown, _ref: unknown) => {
+    default: React.forwardRef((props: unknown, _ref: unknown) => {
+      mockHomepage(props);
       capturedContext = React.useContext(HomepageCtx);
       return null;
     }),
@@ -741,6 +770,19 @@ const renderWalletWithRootState = (rootState: typeof mockInitialState) =>
     },
   );
 
+beforeEach(() => {
+  jest.clearAllMocks();
+  mockPerpsEnabled = true;
+  mockPerpsGTMModalEnabled = false;
+  mockPredictEnabled = true;
+  mockPredictGTMModalEnabled = false;
+  mockMoneyAccountEnabled = false;
+  mockDiscoveryPillsVariantName = 'control';
+  mockActionButtonsGridVariantName = 'control';
+  mockBalanceBreakdownVariantName = 'unresolved';
+  mockNetworkConnectionBannerVisible = false;
+});
+
 describe('Wallet', () => {
   afterEach(() => {
     jest.clearAllMocks();
@@ -1477,6 +1519,7 @@ describe('Homepage deep links', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    jest.useFakeTimers();
 
     mockNavigation = {
       navigate: mockNavigate,
@@ -1501,8 +1544,12 @@ describe('Homepage deep links', () => {
       );
   });
 
+  afterEach(() => {
+    jest.runOnlyPendingTimers();
+    jest.useRealTimers();
+  });
+
   it('navigates to Perps screen for Perps deeplinks', () => {
-    jest.useFakeTimers();
     jest.mocked(useRoute).mockReturnValue({
       key: 'route',
       name: 'route',
@@ -1525,12 +1572,9 @@ describe('Homepage deep links', () => {
       screen: Routes.PERPS.PERPS_HOME,
       params: { source: 'deeplink' },
     });
-
-    jest.useRealTimers();
   });
 
   it('navigates to network selector from deeplink params', () => {
-    jest.useFakeTimers();
     jest.mocked(useRoute).mockReturnValue({
       key: 'route',
       name: 'route',
@@ -1552,8 +1596,6 @@ describe('Homepage deep links', () => {
     expect(mockNavigate).toHaveBeenCalledWith(Routes.MODAL.ROOT_MODAL_FLOW, {
       screen: Routes.SHEET.NETWORK_SELECTOR,
     });
-
-    jest.useRealTimers();
   });
 });
 
@@ -1827,6 +1869,7 @@ describe('useHomeDeepLinkEffects', () => {
 describe('MoneyBalanceCard slot', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockBalanceBreakdownVariantName = 'unresolved';
     jest
       .mocked(useSelector)
       .mockImplementation((callback: (state: unknown) => unknown) =>
@@ -1836,6 +1879,7 @@ describe('MoneyBalanceCard slot', () => {
 
   afterEach(() => {
     mockMoneyAccountEnabled = false;
+    mockBalanceBreakdownVariantName = 'unresolved';
   });
 
   it('renders the MoneyBalanceCard when Money account is enabled', () => {
@@ -1853,4 +1897,133 @@ describe('MoneyBalanceCard slot', () => {
 
     expect(queryByTestId('money-balance-card-mock')).not.toBeOnTheScreen();
   });
+
+  it('suppresses the standalone MoneyBalanceCard in breakdown treatment', () => {
+    mockMoneyAccountEnabled = true;
+    mockBalanceBreakdownVariantName = 'icons';
+
+    const { queryByTestId } = render(Wallet);
+
+    expect(mockHomepage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        balanceBreakdownSectionProps: expect.objectContaining({
+          layout: 'icons',
+        }),
+      }),
+    );
+    expect(queryByTestId('money-balance-card-mock')).not.toBeOnTheScreen();
+  });
+});
+
+describe('Homepage balance breakdown ABC test', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockBalanceBreakdownVariantName = 'unresolved';
+    jest
+      .mocked(useSelector)
+      .mockImplementation((callback: (state: unknown) => unknown) =>
+        callback(mockInitialState),
+      );
+  });
+
+  afterEach(() => {
+    mockBalanceBreakdownVariantName = 'unresolved';
+  });
+
+  it('does not mount the aggregation UI while assignment is unresolved', () => {
+    render(Wallet);
+
+    expect(mockHomepage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        balanceBreakdownSectionProps: undefined,
+      }),
+    );
+  });
+
+  it('keeps the current homepage for the control assignment', () => {
+    mockBalanceBreakdownVariantName = 'control';
+
+    const { queryByTestId } = render(Wallet);
+
+    expect(mockHomepage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        balanceBreakdownSectionProps: undefined,
+      }),
+    );
+    expect(
+      queryByTestId(WalletViewSelectorsIDs.HOMEPAGE_BANNER_CONTENT),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('renders control banner spacing when the network banner is visible', () => {
+    mockBalanceBreakdownVariantName = 'control';
+    mockNetworkConnectionBannerVisible = true;
+
+    const { getByTestId } = render(Wallet);
+
+    expect(
+      getByTestId(WalletViewSelectorsIDs.HOMEPAGE_BANNER_CONTENT),
+    ).toBeOnTheScreen();
+  });
+
+  it.each([
+    ['icons', 'icons'],
+    ['allocation', 'allocation'],
+  ])('maps %s assignment to the %s layout', (variantName, layout) => {
+    mockBalanceBreakdownVariantName = variantName;
+
+    render(Wallet);
+
+    expect(mockHomepage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        balanceBreakdownSectionProps: expect.objectContaining({
+          children: expect.anything(),
+          hideRows: false,
+          layout,
+        }),
+      }),
+    );
+  });
+
+  it('does not reserve banner spacing when treatment banners are hidden', () => {
+    mockBalanceBreakdownVariantName = 'icons';
+
+    const { queryByTestId } = render(Wallet);
+
+    expect(
+      queryByTestId(WalletViewSelectorsIDs.HOMEPAGE_BANNER_CONTAINER),
+    ).not.toBeOnTheScreen();
+    expect(
+      queryByTestId(WalletViewSelectorsIDs.HOMEPAGE_BANNER_CONTENT),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('keeps treatment banner spacing when the network banner is visible', () => {
+    mockBalanceBreakdownVariantName = 'icons';
+    mockNetworkConnectionBannerVisible = true;
+
+    const { getByTestId } = render(Wallet);
+
+    expect(
+      getByTestId(WalletViewSelectorsIDs.HOMEPAGE_BANNER_CONTAINER),
+    ).toHaveStyle({ paddingBottom: 16 });
+  });
+
+  it('hides treatment rows during wallet-home post-onboarding', () => {
+    mockBalanceBreakdownVariantName = 'icons';
+    const state = mockStateWalletHomePostOnboardingActive;
+    jest.mocked(useSelector).mockImplementation((callback) => callback(state));
+
+    renderWalletWithRootState(state);
+
+    expect(mockHomepage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        balanceBreakdownSectionProps: expect.objectContaining({
+          children: null,
+          hideRows: true,
+          layout: 'icons',
+        }),
+      }),
+    );
+  });
 });
diff --git a/app/components/Views/Wallet/index.tsx b/app/components/Views/Wallet/index.tsx
index 8d48195990df..e030b68b3c18 100644
--- a/app/components/Views/Wallet/index.tsx
+++ b/app/components/Views/Wallet/index.tsx
@@ -119,6 +119,9 @@ import {
   HOMEPAGE_ACTION_BUTTONS_GRID_AB_KEY,
   HOMEPAGE_ACTION_BUTTONS_GRID_AB_TEST_EXPOSURE_OPTIONS,
   HOMEPAGE_ACTION_BUTTONS_GRID_VARIANTS,
+  HOMEPAGE_BALANCE_BREAKDOWN_AB_KEY,
+  HOMEPAGE_BALANCE_BREAKDOWN_AB_TEST_EXPOSURE_OPTIONS,
+  HOMEPAGE_BALANCE_BREAKDOWN_VARIANTS,
   HOMEPAGE_DISCOVERY_PILLS_AB_KEY,
   HOMEPAGE_DISCOVERY_PILLS_AB_TEST_EXPOSURE_OPTIONS,
   HOMEPAGE_DISCOVERY_PILLS_VARIANTS,
@@ -133,6 +136,8 @@ import { useABTest } from '../../../hooks';
 import { HomepageScrollContext } from '../Homepage/context/HomepageScrollContext';
 // eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): route-isolation backlog
 import type { HomeSectionName } from '../Homepage/hooks/useHomeViewedEvent';
+// eslint-disable-next-line import-x/no-restricted-paths -- TODO(ADR-0020): route-isolation backlog
+import { trackExploreSearchOpened } from '../TrendingView/search/analytics';
 import AccountGroupBalance from '../../UI/Assets/components/Balance/AccountGroupBalance';
 import useCheckNftAutoDetectionModal from '../../hooks/useCheckNftAutoDetectionModal';
 import useCheckMultiRpcModal from '../../hooks/useCheckMultiRpcModal';
@@ -142,7 +147,8 @@ import Logger from '../../../util/Logger';
 import BrazeBanner from '../../UI/BrazeBanner';
 import ComponentErrorBoundary from '../../UI/ComponentErrorBoundary';
 import { BRAZE_BANNER_WALLET_HOME_PLACEMENT_ID } from '../../../core/Braze/constants';
-import NetworkConnectionBanner from '../../UI/NetworkConnectionBanner';
+import { NetworkConnectionBannerContent } from '../../UI/NetworkConnectionBanner';
+import { useNetworkConnectionBanner } from '../../hooks/useNetworkConnectionBanner';
 
 import {
   SwapBridgeNavigationLocation,
@@ -203,6 +209,9 @@ const createStyles = ({ colors }: Theme) =>
       gap: 16,
       paddingBottom: 12,
     },
+    treatmentBannerContainer: {
+      paddingBottom: 16,
+    },
     tabContainer: {
       flex: 1,
     },
@@ -769,6 +778,19 @@ const Wallet = ({
     HOMEPAGE_ACTION_BUTTONS_GRID_AB_TEST_EXPOSURE_OPTIONS,
   );
 
+  const {
+    variant: balanceBreakdownVariant,
+    isActive: isBalanceBreakdownExperimentActive,
+  } = useABTest(
+    HOMEPAGE_BALANCE_BREAKDOWN_AB_KEY,
+    HOMEPAGE_BALANCE_BREAKDOWN_VARIANTS,
+    HOMEPAGE_BALANCE_BREAKDOWN_AB_TEST_EXPOSURE_OPTIONS,
+  );
+
+  const balanceBreakdownLayout = isBalanceBreakdownExperimentActive
+    ? balanceBreakdownVariant.layout
+    : null;
+
   const discoveryPillsIconStyle = discoveryPillsVariant.iconStyle;
   const showDiscoveryPills =
     discoveryPillsVariant.showPills &&
@@ -846,6 +868,11 @@ const Wallet = ({
     navigation.navigate(Routes.TRANSACTIONS_VIEW);
   }, [navigation, trackEvent]);
 
+  const handleSearchPress = useCallback(() => {
+    trackExploreSearchOpened('home');
+    navigation.navigate(Routes.EXPLORE_SEARCH);
+  }, [navigation]);
+
   const turnOnBasicFunctionality = useCallback(() => {
     navigation.navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
       screen: Routes.SHEET.BASIC_FUNCTIONALITY,
@@ -967,8 +994,15 @@ const Wallet = ({
       </View>
     ) : null;
 
-  const bannerContent = (
-    <View style={styles.banner}>
+  const networkConnectionBanner = useNetworkConnectionBanner();
+  const hasBannerContent =
+    !basicFunctionalityEnabled ||
+    networkConnectionBanner.networkConnectionBannerState.visible;
+  const bannerContent = hasBannerContent ? (
+    <View
+      style={styles.banner}
+      testID={WalletViewSelectorsIDs.HOMEPAGE_BANNER_CONTENT}
+    >
       {!basicFunctionalityEnabled ? (
         <BannerAlert
           severity={BannerAlertSeverity.Error}
@@ -983,9 +1017,9 @@ const Wallet = ({
           }
         />
       ) : null}
-      <NetworkConnectionBanner />
+      <NetworkConnectionBannerContent {...networkConnectionBanner} />
     </View>
-  );
+  ) : null;
 
   /** Same wiring as legacy `content` cluster — homepage v1 header paths must hide main actions and pass checklist callbacks. */
   const walletHomeAccountGroupBalanceProps = {
@@ -1022,19 +1056,52 @@ const Wallet = ({
     <HomepageDiscoveryPills iconStyle={discoveryPillsIconStyle} />
   ) : null;
 
-  const portfolioHeader = (
+  // Hide growth banners when money account is enabled but user is geo-blocked.
+  const growthBanner =
+    !isMoneyAccountEnabled || isMoneyAccountGeoEligible
+      ? homeGrowthBannerContent
+      : null;
+
+  const hasContentBeforeBalanceBreakdown = Boolean(
+    walletHomeMainAssetDetailsActions || growthBanner || homepageDiscoveryPills,
+  );
+  const contentBeforeBalanceBreakdown = hasContentBeforeBalanceBreakdown ? (
+    <>
+      {walletHomeMainAssetDetailsActions}
+      {growthBanner}
+      {homepageDiscoveryPills}
+    </>
+  ) : null;
+
+  const portfolioHeader = balanceBreakdownLayout ? (
+    hasBannerContent ? (
+      <View
+        style={styles.treatmentBannerContainer}
+        testID={WalletViewSelectorsIDs.HOMEPAGE_BANNER_CONTAINER}
+      >
+        {bannerContent}
+      </View>
+    ) : null
+  ) : (
     <View style={styles.portfolioHeaderCluster}>
       {bannerContent}
       <AccountGroupBalance {...walletHomeAccountGroupBalanceProps} />
       {walletHomeMainAssetDetailsActions}
-      {/* Hide growth banners when money account is enabled but user is geo-blocked */}
-      {(!isMoneyAccountEnabled || isMoneyAccountGeoEligible) &&
-        homeGrowthBannerContent}
+      {growthBanner}
       {homepageDiscoveryPills}
       {showMoneyBalanceCard && <MoneyBalanceCard />}
     </View>
   );
 
+  const balanceBreakdownSectionProps = balanceBreakdownLayout
+    ? {
+        accountGroupBalanceProps: walletHomeAccountGroupBalanceProps,
+        hideRows: inWalletHomePostOnboardingFlow,
+        layout: balanceBreakdownLayout,
+        children: contentBeforeBalanceBreakdown,
+      }
+    : undefined;
+
   const renderLoader = useCallback(
     () => (
       <View style={styles.loader}>
@@ -1066,6 +1133,19 @@ const Wallet = ({
                       style={styles.headerActionButtonsContainer}
                       accessible={false}
                     >
+                      <ButtonIcon
+                        iconProps={{
+                          color: MMDSIconColor.IconDefault,
+                        }}
+                        onPress={handleSearchPress}
+                        iconName={MMDSIconName.Search}
+                        size={ButtonIconSize.Md}
+                        testID={WalletViewSelectorsIDs.WALLET_SEARCH_BUTTON}
+                        accessibilityLabel={strings(
+                          'wallet.search_accessibility_label',
+                        )}
+                        hitSlop={touchAreaSlop}
+                      />
                       {isMoneyAccountVisible && (
                         <ButtonIcon
                           iconProps={{
@@ -1185,7 +1265,12 @@ const Wallet = ({
                     }}
                   >
                     {portfolioHeader}
-                    <Homepage ref={homepageRef} />
+                    <Homepage
+                      ref={homepageRef}
+                      balanceBreakdownSectionProps={
+                        balanceBreakdownSectionProps
+                      }
+                    />
                   </ConditionalScrollView>
                 </HomepageScrollContext.Provider>
               </View>
diff --git a/app/components/Views/WalletActions/WalletActionsBottomSheet.testIds.ts b/app/components/Views/WalletActions/WalletActionsBottomSheet.testIds.ts
index 7c655fdca2d9..f9927abe9b7b 100644
--- a/app/components/Views/WalletActions/WalletActionsBottomSheet.testIds.ts
+++ b/app/components/Views/WalletActions/WalletActionsBottomSheet.testIds.ts
@@ -14,6 +14,7 @@ export const WalletActionsBottomSheetSelectorsIDs = {
   BRIDGE_BUTTON: 'wallet-bridge-button',
   EARN_BUTTON: 'wallet-earn-action',
   PERPS_BUTTON: 'wallet-perps-action',
+  PERPS_MODE_BADGE: 'wallet-perps-mode-badge',
   PREDICT_BUTTON: 'wallet-predict-action',
 };
 
diff --git a/app/components/Views/WalletRecovery/index.test.tsx b/app/components/Views/WalletRecovery/index.test.tsx
index 12e2266a8250..f0f86ef53376 100644
--- a/app/components/Views/WalletRecovery/index.test.tsx
+++ b/app/components/Views/WalletRecovery/index.test.tsx
@@ -6,16 +6,8 @@ import renderWithProvider from '../../../util/test/renderWithProvider';
 import WalletRecovery from './index';
 
 jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
   useNavigation: jest.fn(),
-  NavigationContainer: ({ children }: { children: React.ReactNode }) =>
-    children,
-}));
-
-jest.mock('@react-navigation/native-stack', () => ({
-  createNativeStackNavigator: jest.fn(() => ({
-    Navigator: ({ children }: { children: React.ReactNode }) => children,
-    Screen: ({ children }: { children: React.ReactNode }) => children,
-  })),
 }));
 
 jest.mock('../SelectSRP', () => {
diff --git a/app/components/Views/WhatsHappeningDetailView/WhatsHappeningDetailView.tsx b/app/components/Views/WhatsHappeningDetailView/WhatsHappeningDetailView.tsx
index bb20aa10001b..a116e21f4582 100644
--- a/app/components/Views/WhatsHappeningDetailView/WhatsHappeningDetailView.tsx
+++ b/app/components/Views/WhatsHappeningDetailView/WhatsHappeningDetailView.tsx
@@ -246,8 +246,17 @@ const WhatsHappeningDetailView = () => {
   const hasError = !isLoading && items.length === 0 && !!error;
 
   return (
-    <SafeAreaView style={tw`flex-1 bg-default`}>
+    // The top edge is deliberately off: a native SafeAreaView top padding is
+    // recalculated as the view is attached, which lands after this screen's
+    // `slide_from_right` push and visibly drops the header into place. The top
+    // inset comes from `includesTopInset` (JS `marginTop` off the already
+    // resolved provider) instead, matching PerpsMarketDetailsView.
+    <SafeAreaView
+      edges={['bottom', 'left', 'right']}
+      style={tw`flex-1 bg-default`}
+    >
       <HeaderStandard
+        includesTopInset
         title={strings('whats_happening.title')}
         onBack={handleBackPress}
         backButtonProps={{ testID: 'whats-happening-detail-back-button' }}
diff --git a/app/components/Views/confirmations/ConfirmationView.testIds.ts b/app/components/Views/confirmations/ConfirmationView.testIds.ts
index 5a80e4824a20..8aa28bbe9d91 100644
--- a/app/components/Views/confirmations/ConfirmationView.testIds.ts
+++ b/app/components/Views/confirmations/ConfirmationView.testIds.ts
@@ -68,6 +68,8 @@ export const ConfirmAlertModalSelectorsIDs = {
 export const AlertModalSelectorsIDs = {
   ALERT_MODAL_CHECKBOX: 'alert-modal-checkbox',
   ALERT_MODAL_ACKNOWLEDGE_BUTTON: 'alert-modal-acknowledge-button',
+  ALERT_MODAL_CLOSE_BUTTON: 'alert-modal-close-button',
+  ALERT_MODAL_ACTION_BUTTON: 'alert-modal-action-button',
 } as const;
 
 export const AlertModalSelectorsText = {
diff --git a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.styles.ts b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.styles.ts
index 44071f10f59c..1ddf31bbdb12 100644
--- a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.styles.ts
+++ b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.styles.ts
@@ -24,7 +24,7 @@ const stylesheet = (params: { theme: Theme }) => {
     modalRoot: {
       flex: 1,
     },
-    /** Lets the account list consume remaining height under HeaderStandard inside BottomSheet. */
+    /** Lets the account list consume remaining height under BottomSheetHeader inside BottomSheet. */
     modalSheetBody: {
       flex: 1,
       minHeight: 0,
diff --git a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.test.tsx b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.test.tsx
index 16805d6f7f02..f27cdcc32f45 100644
--- a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.test.tsx
+++ b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.test.tsx
@@ -21,77 +21,6 @@ jest.mock('../../../../../component-library/hooks', () => ({
   }),
 }));
 
-jest.mock('@metamask/design-system-twrnc-preset', () => ({
-  useTailwind: () => {
-    const tw = (..._args: unknown[]) => ({});
-    tw.style = (...args: unknown[]) =>
-      args.reduce<Record<string, unknown>>((acc, arg) => {
-        if (typeof arg === 'object' && arg !== null) {
-          return { ...acc, ...(arg as Record<string, unknown>) };
-        }
-        return acc;
-      }, {});
-    return tw;
-  },
-}));
-
-jest.mock('@metamask/design-system-react-native', () => {
-  const actual = jest.requireActual('@metamask/design-system-react-native');
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const ReactActual = require('react');
-  const { Text: RNText, View: RNView } = jest.requireActual('react-native');
-  const MockText = ({
-    children,
-    ...props
-  }: {
-    children: React.ReactNode;
-    style?: unknown;
-    variant?: string;
-    color?: string;
-    testID?: string;
-    twClassName?: string;
-  }) => <RNText {...props}>{children}</RNText>;
-  const MockSkeleton = (props: {
-    height?: number;
-    width?: number;
-    twClassName?: string;
-  }) => <RNText testID="skeleton">{`${props.height}x${props.width}`}</RNText>;
-  const MockBottomSheet = ReactActual.forwardRef(
-    (
-      {
-        children,
-        onClose,
-        testID,
-      }: {
-        children: React.ReactNode;
-        onClose?: (hasPendingAction?: boolean) => void;
-        testID?: string;
-      },
-      ref: React.Ref<{
-        onCloseBottomSheet: (cb?: () => void) => void;
-        onOpenBottomSheet: (cb?: () => void) => void;
-      }>,
-    ) => {
-      ReactActual.useImperativeHandle(ref, () => ({
-        onCloseBottomSheet: (cb?: () => void) => {
-          onClose?.(false);
-          cb?.();
-        },
-        onOpenBottomSheet: jest.fn(),
-      }));
-      return <RNView testID={testID}>{children}</RNView>;
-    },
-  );
-  return {
-    ...actual,
-    BottomSheet: MockBottomSheet,
-    Text: MockText,
-    Skeleton: MockSkeleton,
-    TextVariant: { BodyMd: 'BodyMd', HeadingMd: 'HeadingMd' },
-    TextColor: { TextAlternative: 'TextAlternative' },
-  };
-});
-
 jest.mock('../../../../../component-library/components/Avatars/Avatar', () => {
   const { View } = jest.requireActual('react-native');
   return {
diff --git a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.tsx b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.tsx
index 7b5bbdc03d8d..816853733b2f 100644
--- a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.tsx
+++ b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.tsx
@@ -21,8 +21,8 @@ import Icon, {
 } from '../../../../../component-library/components/Icons/Icon';
 import {
   BottomSheet,
+  BottomSheetHeader,
   BottomSheetRef,
-  HeaderStandard,
   Skeleton,
   Text,
   TextColor,
@@ -40,12 +40,9 @@ import {
 import { selectAvatarAccountType } from '../../../../../selectors/settings';
 import stylesheet from './AccountSelector.styles';
 
-import { useElevatedSurface } from '../../../../../util/theme/themeUtils';
-
 export const ACCOUNT_SELECTOR_TEST_IDS = {
   PILL: 'account-selector-pill',
   MODAL: 'account-selector-modal',
-  /** Used when `BottomSheet` is mocked in unit tests (production sheet has no wrapper testID). */
   BOTTOM_SHEET: 'account-selector-bottom-sheet',
 };
 
@@ -68,7 +65,6 @@ const AccountSelector: React.FC<AccountSelectorProps> = ({
 }) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const bottomSheetRef = useRef<BottomSheetRef>(null);
-  const surfaceClass = useElevatedSurface();
   const { styles } = useStyles(stylesheet, {});
 
   const internalAccountsById = useSelector(selectInternalAccountsById);
@@ -229,12 +225,10 @@ const AccountSelector: React.FC<AccountSelectorProps> = ({
             isFullscreen
             keyboardAvoidingViewEnabled={false}
             onClose={handleSheetClosed}
-            twClassName={surfaceClass}
           >
-            <HeaderStandard
-              title={selectorTitle}
-              onClose={() => closeAccountSheet()}
-            />
+            <BottomSheetHeader onClose={() => closeAccountSheet()}>
+              {selectorTitle}
+            </BottomSheetHeader>
             <View style={styles.modalSheetBody}>
               <MultichainAccountSelectorList
                 selectedAccountGroups={
diff --git a/app/components/Views/confirmations/components/UI/info-row/info-section/style.ts b/app/components/Views/confirmations/components/UI/info-row/info-section/style.ts
deleted file mode 100644
index 4e2b168e8088..000000000000
--- a/app/components/Views/confirmations/components/UI/info-row/info-section/style.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-import { Colors } from '../../../../../../../util/theme/models';
-
-const createStyles = (colors: Colors) =>
-  StyleSheet.create({
-    container: {
-      backgroundColor: colors.background.default,
-      borderColor: colors.border.muted,
-      borderRadius: 8,
-      borderWidth: 1,
-      padding: 8,
-      minWidth: '100%',
-      marginVertical: 4,
-    },
-  });
-
-export default createStyles;
diff --git a/app/components/Views/confirmations/components/UI/info-row/info-value/network/style.ts b/app/components/Views/confirmations/components/UI/info-row/info-value/network/style.ts
deleted file mode 100644
index 139166ef4c15..000000000000
--- a/app/components/Views/confirmations/components/UI/info-row/info-value/network/style.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-import { Colors } from '../../../../../../../../util/theme/models';
-import { fontStyles } from '../../../../../../../../styles/common';
-
-const createStyles = (colors: Colors) =>
-  StyleSheet.create({
-    container: {
-      display: 'flex',
-      flexDirection: 'row',
-      alignItems: 'center',
-    },
-    value: {
-      color: colors.text.default,
-      ...fontStyles.normal,
-      marginTop: 8,
-    },
-    warningContainer: {
-      display: 'flex',
-      flexDirection: 'row',
-      alignItems: 'center',
-      marginRight: 8,
-      marginTop: 8,
-      paddingVertical: 2,
-      paddingHorizontal: 4,
-      backgroundColor: colors.error.muted,
-      borderRadius: 4,
-    },
-    warningText: {
-      color: colors.error.default,
-      marginLeft: 4,
-    },
-  });
-
-export default createStyles;
diff --git a/app/components/Views/confirmations/components/UI/navbar/index.ts b/app/components/Views/confirmations/components/UI/navbar/index.ts
deleted file mode 100644
index a4741c67a87e..000000000000
--- a/app/components/Views/confirmations/components/UI/navbar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { getNavbar as getStakingNavbar } from './navbar';
diff --git a/app/components/Views/confirmations/components/activity/transaction-detail-divider/index.ts b/app/components/Views/confirmations/components/activity/transaction-detail-divider/index.ts
deleted file mode 100644
index d666c098ba99..000000000000
--- a/app/components/Views/confirmations/components/activity/transaction-detail-divider/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './transaction-detail-divider';
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-row/index.ts b/app/components/Views/confirmations/components/activity/transaction-details-row/index.ts
deleted file mode 100644
index cfc4425ae870..000000000000
--- a/app/components/Views/confirmations/components/activity/transaction-details-row/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './transaction-details-row';
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-status/transaction-details-status.styles.ts b/app/components/Views/confirmations/components/activity/transaction-details-status/transaction-details-status.styles.ts
deleted file mode 100644
index 79f4b11a8042..000000000000
--- a/app/components/Views/confirmations/components/activity/transaction-details-status/transaction-details-status.styles.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-import { Theme } from '../../../../../../util/theme/models';
-
-const styleSheet = (_params: { theme: Theme }) =>
-  StyleSheet.create({
-    tooltipIcon: {
-      width: 20,
-      height: 20,
-    },
-  });
-
-export default styleSheet;
diff --git a/app/components/Views/confirmations/components/activity/transaction-details/index.ts b/app/components/Views/confirmations/components/activity/transaction-details/index.ts
deleted file mode 100644
index 7e674b637740..000000000000
--- a/app/components/Views/confirmations/components/activity/transaction-details/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './transaction-details';
diff --git a/app/components/Views/confirmations/components/alert-banner/alert-banner.test.tsx b/app/components/Views/confirmations/components/alert-banner/alert-banner.test.tsx
index 679ccdee12c0..79bbccb3d381 100644
--- a/app/components/Views/confirmations/components/alert-banner/alert-banner.test.tsx
+++ b/app/components/Views/confirmations/components/alert-banner/alert-banner.test.tsx
@@ -1,14 +1,12 @@
 import React from 'react';
+import { Text } from 'react-native';
 import { render } from '@testing-library/react-native';
-import { BannerAlertSeverity } from '../../../../../component-library/components/Banners/Banner';
-import Text from '../../../../../component-library/components/Texts/Text';
+import { TransactionType } from '@metamask/transaction-controller';
 import { Alert, Severity } from '../../types/alerts';
 import { useAlerts } from '../../context/alert-system-context';
 import AlertBanner from './alert-banner';
-import { getBannerAlertSeverity } from '../../utils/alert-system';
 import { RowAlertKey } from '../UI/info-row/alert-row/constants';
 import { useTransactionMetadataRequest } from '../../hooks/transactions/useTransactionMetadataRequest';
-import { TransactionType } from '@metamask/transaction-controller';
 import { AlertKeys } from '../../constants/alerts';
 
 jest.mock('../../hooks/transactions/useTransactionMetadataRequest');
@@ -75,14 +73,12 @@ describe('AlertBanner', () => {
     (useTransactionMetadataRequest as jest.Mock).mockReturnValue({});
   });
 
-  it('renders correctly when there are general alerts', () => {
-    const { getByText, queryByText } = render(<AlertBanner />);
+  it('renders general alert banners', () => {
+    const { getByTestId, queryByTestId } = render(<AlertBanner />);
 
-    expect(getByText('Alert 1')).toBeDefined();
-    expect(getByText('Alert 2')).toBeDefined();
-    expect(queryByText('Alert 3')).toBeNull();
-    expect(queryByText('Alert 4')).toBeNull();
-    expect(queryByText('Alert 5')).toBeNull();
+    expect(getByTestId('security-alert-banner-0')).toBeOnTheScreen();
+    expect(getByTestId('security-alert-banner-1')).toBeOnTheScreen();
+    expect(queryByTestId('security-alert-banner-2')).toBeNull();
   });
 
   it('does not render when there are no general alerts', () => {
@@ -90,60 +86,47 @@ describe('AlertBanner', () => {
       generalAlerts: [],
     });
 
-    const { toJSON } = render(<AlertBanner />);
-    expect(toJSON()).toBeNull();
-  });
+    const { queryByTestId } = render(<AlertBanner />);
 
-  it('converts severity correctly', () => {
-    expect(getBannerAlertSeverity(Severity.Danger)).toBe(
-      BannerAlertSeverity.Error,
-    );
-
-    expect(getBannerAlertSeverity(Severity.Warning)).toBe(
-      BannerAlertSeverity.Warning,
-    );
-
-    expect(getBannerAlertSeverity(Severity.Info)).toBe(
-      BannerAlertSeverity.Info,
-    );
+    expect(queryByTestId('security-alert-banner-0')).toBeNull();
   });
 
-  it('renders field alerts if includeFields set', () => {
-    const { getByText } = render(<AlertBanner includeFields />);
+  it('renders field alerts when includeFields is set', () => {
+    const { getByTestId } = render(<AlertBanner includeFields />);
 
-    expect(getByText('Alert 1')).toBeDefined();
-    expect(getByText('Alert 2')).toBeDefined();
-    expect(getByText('Alert 3')).toBeDefined();
-    expect(getByText('Alert 4')).toBeDefined();
-    expect(getByText('Alert 5')).toBeDefined();
+    expect(getByTestId('security-alert-banner-0')).toBeOnTheScreen();
+    expect(getByTestId('security-alert-banner-1')).toBeOnTheScreen();
+    expect(getByTestId('security-alert-banner-2')).toBeOnTheScreen();
+    expect(getByTestId('security-alert-banner-3')).toBeOnTheScreen();
+    expect(getByTestId('security-alert-banner-4')).toBeOnTheScreen();
   });
 
-  it('renders blocking only if set', () => {
-    const { getByText, queryByText } = render(
+  it('renders only blocking alerts when blockingOnly is set', () => {
+    const { getByTestId, queryByTestId, getByText } = render(
       <AlertBanner blockingOnly includeFields />,
     );
 
-    expect(queryByText('Alert 1')).toBeNull();
-    expect(queryByText('Alert 2')).toBeNull();
-    expect(getByText('Alert 3')).toBeDefined();
-    expect(getByText('Alert 4')).toBeDefined();
-    expect(queryByText('Alert 5')).toBeNull();
+    expect(getByTestId('security-alert-banner-0')).toBeOnTheScreen();
+    expect(getByTestId('security-alert-banner-1')).toBeOnTheScreen();
+    expect(queryByTestId('security-alert-banner-2')).toBeNull();
+    expect(getByText('Alert 3')).toBeOnTheScreen();
+    expect(getByText('Alert 4')).toBeOnTheScreen();
   });
 
-  it('renders nothing if transaction type ignored', () => {
+  it('renders nothing when transaction type is ignored', () => {
     (useTransactionMetadataRequest as jest.Mock).mockReturnValue({
       type: TransactionType.perpsDeposit,
     });
 
-    const { toJSON } = render(
+    const { queryByTestId } = render(
       <AlertBanner ignoreTypes={[TransactionType.perpsDeposit]} />,
     );
 
-    expect(toJSON()).toBeNull();
+    expect(queryByTestId('security-alert-banner-0')).toBeNull();
   });
 
   it('does not render excluded keys', () => {
-    const { getByText, queryByText } = render(
+    const { getByTestId, queryByTestId, getByText, queryByText } = render(
       <AlertBanner
         blockingOnly
         includeFields
@@ -151,10 +134,9 @@ describe('AlertBanner', () => {
       />,
     );
 
-    expect(queryByText('Alert 1')).toBeNull();
-    expect(queryByText('Alert 2')).toBeNull();
-    expect(getByText('Alert 3')).toBeDefined();
+    expect(getByTestId('security-alert-banner-0')).toBeOnTheScreen();
+    expect(queryByTestId('security-alert-banner-1')).toBeNull();
+    expect(getByText('Alert 3')).toBeOnTheScreen();
     expect(queryByText('Alert 4')).toBeNull();
-    expect(queryByText('Alert 5')).toBeNull();
   });
 });
diff --git a/app/components/Views/confirmations/components/alert-banner/alert-banner.tsx b/app/components/Views/confirmations/components/alert-banner/alert-banner.tsx
index 62e56b400029..312c432f4eaa 100644
--- a/app/components/Views/confirmations/components/alert-banner/alert-banner.tsx
+++ b/app/components/Views/confirmations/components/alert-banner/alert-banner.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
-import { useAlerts } from '../../context/alert-system-context';
-import BannerAlert from '../../../../../component-library/components/Banners/Banner/variants/BannerAlert';
-import styleSheet from './alert-banner.styles';
-import { useStyles } from '../../../../hooks/useStyles';
-import { getBannerAlertSeverity } from '../../utils/alert-system';
+import { BannerAlert } from '@metamask/design-system-react-native';
 import {
   TransactionType,
   hasTransactionType,
 } from '@metamask/transaction-controller';
+import { useAlerts } from '../../context/alert-system-context';
+import styleSheet from './alert-banner.styles';
+import { useStyles } from '../../../../hooks/useStyles';
+import { getBannerAlertSeverity } from '../../utils/alert-system';
 import { useTransactionMetadataRequest } from '../../hooks/transactions/useTransactionMetadataRequest';
 import { AlertKeys } from '../../constants/alerts';
 export interface AlertBannerProps {
diff --git a/app/components/Views/confirmations/components/alerts/alert-message/alert-message.styles.ts b/app/components/Views/confirmations/components/alerts/alert-message/alert-message.styles.ts
index e0463cc7869f..cf20c2a858e2 100644
--- a/app/components/Views/confirmations/components/alerts/alert-message/alert-message.styles.ts
+++ b/app/components/Views/confirmations/components/alerts/alert-message/alert-message.styles.ts
@@ -13,10 +13,12 @@ const styleSheet = (params: { theme: Theme }) =>
       width: 4,
       backgroundColor: params.theme.colors.error.default,
     },
-    message: {
+    content: {
       flex: 1,
       paddingVertical: 12,
       paddingHorizontal: 12,
+    },
+    message: {
       color: params.theme.colors.text.default,
     },
   });
diff --git a/app/components/Views/confirmations/components/alerts/alert-message/alert-message.test.tsx b/app/components/Views/confirmations/components/alerts/alert-message/alert-message.test.tsx
index fe46bf3b0e7a..9c0674eb8cf3 100644
--- a/app/components/Views/confirmations/components/alerts/alert-message/alert-message.test.tsx
+++ b/app/components/Views/confirmations/components/alerts/alert-message/alert-message.test.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
+import { Text } from 'react-native';
 import { render } from '@testing-library/react-native';
 import { AlertMessage } from './alert-message';
 
 const MESSAGE_MOCK = 'Test message';
+const CONTENT_MOCK = <Text testID="custom-content">Custom content</Text>;
 
 describe('AlertMessage', () => {
   it('renders message in a banner', () => {
@@ -13,8 +15,16 @@ describe('AlertMessage', () => {
     expect(getByTestId('alert-message-banner')).toBeDefined();
   });
 
-  it('renders nothing if no message is provided', () => {
+  it('renders nothing if no message or content is provided', () => {
     const { toJSON } = render(<AlertMessage alertMessage={undefined} />);
     expect(toJSON()).toBeNull();
   });
+
+  it('renders content instead of message when content is provided', () => {
+    const { getByTestId, queryByText } = render(
+      <AlertMessage content={CONTENT_MOCK} alertMessage={MESSAGE_MOCK} />,
+    );
+    expect(getByTestId('custom-content')).toBeDefined();
+    expect(queryByText(MESSAGE_MOCK)).toBeNull();
+  });
 });
diff --git a/app/components/Views/confirmations/components/alerts/alert-message/alert-message.tsx b/app/components/Views/confirmations/components/alerts/alert-message/alert-message.tsx
index e12c922b8e73..11f42473d49c 100644
--- a/app/components/Views/confirmations/components/alerts/alert-message/alert-message.tsx
+++ b/app/components/Views/confirmations/components/alerts/alert-message/alert-message.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactElement } from 'react';
 import { View } from 'react-native';
 import Text, {
   TextVariant,
@@ -7,23 +7,28 @@ import { useStyles } from '../../../../../hooks/useStyles';
 import styleSheet from './alert-message.styles';
 
 export interface AlertMessageProps {
+  content?: ReactElement;
   alertMessage: string | undefined;
 }
 
 export const AlertMessage: React.FC<AlertMessageProps> = React.memo((props) => {
-  const { alertMessage } = props;
+  const { content, alertMessage } = props;
   const { styles } = useStyles(styleSheet, {});
 
-  if (!alertMessage) {
+  if (!content && !alertMessage) {
     return null;
   }
 
   return (
     <View style={styles.container} testID="alert-message-banner">
       <View style={styles.border} />
-      <Text variant={TextVariant.BodySM} style={styles.message}>
-        {alertMessage}
-      </Text>
+      <View style={styles.content}>
+        {content ?? (
+          <Text variant={TextVariant.BodySM} style={styles.message}>
+            {alertMessage}
+          </Text>
+        )}
+      </View>
     </View>
   );
 });
diff --git a/app/components/Views/confirmations/components/alerts/no-quote-alert/index.ts b/app/components/Views/confirmations/components/alerts/no-quote-alert/index.ts
new file mode 100644
index 000000000000..22d0f1b1872a
--- /dev/null
+++ b/app/components/Views/confirmations/components/alerts/no-quote-alert/index.ts
@@ -0,0 +1 @@
+export * from './no-quote-alert';
diff --git a/app/components/Views/confirmations/components/alerts/no-quote-alert/no-quote-alert.styles.ts b/app/components/Views/confirmations/components/alerts/no-quote-alert/no-quote-alert.styles.ts
new file mode 100644
index 000000000000..3336d6b299c5
--- /dev/null
+++ b/app/components/Views/confirmations/components/alerts/no-quote-alert/no-quote-alert.styles.ts
@@ -0,0 +1,21 @@
+import { StyleSheet } from 'react-native';
+import { Theme } from '../../../../../../util/theme/models';
+
+const styleSheet = (params: { theme: Theme }) =>
+  StyleSheet.create({
+    message: {
+      color: params.theme.colors.text.default,
+    },
+    detailsBlock: {
+      marginTop: 6,
+      paddingVertical: 6,
+      paddingHorizontal: 8,
+      backgroundColor: params.theme.colors.background.alternative,
+      borderRadius: 4,
+    },
+    detailRow: {
+      color: params.theme.colors.text.alternative,
+    },
+  });
+
+export default styleSheet;
diff --git a/app/components/Views/confirmations/components/alerts/no-quote-alert/no-quote-alert.test.tsx b/app/components/Views/confirmations/components/alerts/no-quote-alert/no-quote-alert.test.tsx
new file mode 100644
index 000000000000..60d0299059b2
--- /dev/null
+++ b/app/components/Views/confirmations/components/alerts/no-quote-alert/no-quote-alert.test.tsx
@@ -0,0 +1,116 @@
+import React from 'react';
+import { fireEvent, render } from '@testing-library/react-native';
+import type { QuoteErrorInfo } from '@metamask/transaction-pay-controller';
+import { NoQuoteAlert } from './no-quote-alert';
+import { strings } from '../../../../../../../locales/i18n';
+
+const ERROR_MESSAGE_MOCK = 'Insufficient balance for this route';
+const DETAIL_MOCK = ['reason: INSUFFICIENT_BALANCE', 'required: 100 USDC'];
+const COLLAPSED_MESSAGE = strings('alert_system.no_pay_token_quotes.message');
+
+function createError(overrides?: Partial<QuoteErrorInfo>): QuoteErrorInfo {
+  return {
+    message: ERROR_MESSAGE_MOCK,
+    detail: DETAIL_MOCK,
+    ...overrides,
+  } as QuoteErrorInfo;
+}
+
+function tap(target: Parameters<typeof fireEvent.press>[0], times: number) {
+  for (let i = 0; i < times; i++) {
+    fireEvent.press(target);
+  }
+}
+
+describe('NoQuoteAlert', () => {
+  it('renders the generic collapsed message by default', () => {
+    const { getByText, queryByText, queryByTestId } = render(
+      <NoQuoteAlert error={createError()} />,
+    );
+
+    expect(getByText(COLLAPSED_MESSAGE)).toBeDefined();
+    expect(queryByText(ERROR_MESSAGE_MOCK)).toBeNull();
+    expect(queryByTestId('no-quote-alert-details')).toBeNull();
+  });
+
+  it('renders the insufficient balance collapsed message for that reason', () => {
+    const insufficientMessage = strings(
+      'alert_system.insufficient_pay_method_balance.message',
+    );
+
+    const { getByText, queryByText } = render(
+      <NoQuoteAlert
+        error={createError({ reason: 'insufficient-source-balance' })}
+      />,
+    );
+
+    expect(getByText(insufficientMessage)).toBeDefined();
+    expect(queryByText(COLLAPSED_MESSAGE)).toBeNull();
+  });
+
+  it('does not expand after a single tap', () => {
+    const { getByText, queryByText, queryByTestId } = render(
+      <NoQuoteAlert error={createError()} />,
+    );
+
+    tap(getByText(COLLAPSED_MESSAGE), 1);
+
+    expect(getByText(COLLAPSED_MESSAGE)).toBeDefined();
+    expect(queryByText(ERROR_MESSAGE_MOCK)).toBeNull();
+    expect(queryByTestId('no-quote-alert-details')).toBeNull();
+  });
+
+  it('expands to show the error message and detail rows after two taps', () => {
+    const { getByText, queryByText, getByTestId } = render(
+      <NoQuoteAlert error={createError()} />,
+    );
+
+    tap(getByText(COLLAPSED_MESSAGE), 2);
+
+    expect(getByText(ERROR_MESSAGE_MOCK)).toBeDefined();
+    expect(queryByText(COLLAPSED_MESSAGE)).toBeNull();
+    expect(getByTestId('no-quote-alert-details')).toBeDefined();
+    DETAIL_MOCK.forEach((row) => {
+      expect(getByText(row)).toBeDefined();
+    });
+  });
+
+  it('collapses again after another two taps', () => {
+    const { getByTestId, getByText, queryByText, queryByTestId } = render(
+      <NoQuoteAlert error={createError()} />,
+    );
+
+    const pressable = getByTestId('no-quote-alert');
+
+    tap(pressable, 2);
+    expect(getByText(ERROR_MESSAGE_MOCK)).toBeDefined();
+    expect(getByTestId('no-quote-alert-details')).toBeDefined();
+
+    tap(pressable, 2);
+    expect(getByText(COLLAPSED_MESSAGE)).toBeDefined();
+    expect(queryByText(ERROR_MESSAGE_MOCK)).toBeNull();
+    expect(queryByTestId('no-quote-alert-details')).toBeNull();
+  });
+
+  it('expands the message but omits the details block when detail is empty', () => {
+    const { getByText, queryByTestId } = render(
+      <NoQuoteAlert error={createError({ detail: [] })} />,
+    );
+
+    tap(getByText(COLLAPSED_MESSAGE), 2);
+
+    expect(getByText(ERROR_MESSAGE_MOCK)).toBeDefined();
+    expect(queryByTestId('no-quote-alert-details')).toBeNull();
+  });
+
+  it('omits the details block when detail is undefined', () => {
+    const { getByText, queryByTestId } = render(
+      <NoQuoteAlert error={createError({ detail: undefined })} />,
+    );
+
+    tap(getByText(COLLAPSED_MESSAGE), 2);
+
+    expect(getByText(ERROR_MESSAGE_MOCK)).toBeDefined();
+    expect(queryByTestId('no-quote-alert-details')).toBeNull();
+  });
+});
diff --git a/app/components/Views/confirmations/components/alerts/no-quote-alert/no-quote-alert.tsx b/app/components/Views/confirmations/components/alerts/no-quote-alert/no-quote-alert.tsx
new file mode 100644
index 000000000000..b80fb8730489
--- /dev/null
+++ b/app/components/Views/confirmations/components/alerts/no-quote-alert/no-quote-alert.tsx
@@ -0,0 +1,48 @@
+import React, { useCallback, useState } from 'react';
+import { Pressable, View } from 'react-native';
+import Text, {
+  TextVariant,
+} from '../../../../../../component-library/components/Texts/Text';
+import { strings } from '../../../../../../../locales/i18n';
+import { useStyles } from '../../../../../hooks/useStyles';
+import type { QuoteErrorInfo } from '@metamask/transaction-pay-controller';
+import styleSheet from './no-quote-alert.styles';
+
+const TAPS_TO_TOGGLE = 2;
+
+interface Props {
+  error: QuoteErrorInfo;
+}
+
+export function NoQuoteAlert({ error }: Props) {
+  const { styles } = useStyles(styleSheet, {});
+  const [tapCount, setTapCount] = useState(0);
+  const isExpanded = Math.floor(tapCount / TAPS_TO_TOGGLE) % 2 === 1;
+  const handlePress = useCallback(() => setTapCount((c) => c + 1), []);
+
+  const collapsedMessage =
+    error.reason === 'insufficient-source-balance'
+      ? strings('alert_system.insufficient_pay_method_balance.message')
+      : strings('alert_system.no_pay_token_quotes.message');
+
+  return (
+    <Pressable onPress={handlePress} testID="no-quote-alert">
+      <Text variant={TextVariant.BodySM} style={styles.message}>
+        {isExpanded ? error.message : collapsedMessage}
+      </Text>
+      {isExpanded && error.detail && error.detail.length > 0 && (
+        <View style={styles.detailsBlock} testID="no-quote-alert-details">
+          {error.detail.map((row) => (
+            <Text
+              key={row}
+              variant={TextVariant.BodyXS}
+              style={styles.detailRow}
+            >
+              {row}
+            </Text>
+          ))}
+        </View>
+      )}
+    </Pressable>
+  );
+}
diff --git a/app/components/Views/confirmations/components/blockaid-alert-content/blockaid-alert-content.test.tsx b/app/components/Views/confirmations/components/blockaid-alert-content/blockaid-alert-content.test.tsx
index 19f69cd68266..20919a4a899e 100644
--- a/app/components/Views/confirmations/components/blockaid-alert-content/blockaid-alert-content.test.tsx
+++ b/app/components/Views/confirmations/components/blockaid-alert-content/blockaid-alert-content.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, fireEvent, waitFor, act } from '@testing-library/react-native';
+import { fireEvent, waitFor, act } from '@testing-library/react-native';
 import BlockaidAlertContent from './blockaid-alert-content';
 // TODO: Remove legacy import
 import {
@@ -7,14 +7,36 @@ import {
   Reason,
 } from '../../components/blockaid-banner/BlockaidBanner.types';
 import { deflate } from 'react-native-gzip';
-import { BLOCKAID_SUPPORTED_NETWORK_NAMES } from '../../../../../util/networks';
+import type { Hex } from '@metamask/utils';
 import { ResultType as BlockaidResultType } from '../../constants/signatures';
 import { strings } from '../../../../../../locales/i18n';
+import renderWithProvider, {
+  DeepPartial,
+} from '../../../../../util/test/renderWithProvider';
+import { RootState } from '../../../../../reducers';
 
 jest.mock('react-native-gzip', () => ({
   deflate: jest.fn().mockResolvedValue('compressedData'),
 }));
 
+const networkStateWith = (
+  chainId: Hex,
+  name: string,
+): DeepPartial<RootState> => ({
+  engine: {
+    backgroundState: {
+      NetworkController: {
+        networkConfigurationsByChainId: {
+          [chainId]: { chainId, name },
+        },
+      },
+    },
+  },
+});
+
+const MAINNET_CHAIN_ID: Hex = '0x1';
+const MAINNET_STATE = networkStateWith(MAINNET_CHAIN_ID, 'Ethereum');
+
 describe('BlockaidAlertContent', () => {
   const DETAILS_ACCORDION_TITLE = 'See details';
   const REPORT_LINK_TEXT = 'Report an issue';
@@ -31,7 +53,7 @@ describe('BlockaidAlertContent', () => {
     features: ALERT_DETAILS_MOCK,
     block: BLOCK_NUMBER_MOCK,
     req: REQUEST_MOCK,
-    chainId: '1',
+    chainId: MAINNET_CHAIN_ID,
   };
 
   const mockOnContactUsClicked = jest.fn();
@@ -41,12 +63,13 @@ describe('BlockaidAlertContent', () => {
   });
 
   it('renders correctly with given props', () => {
-    const { getByText } = render(
+    const { getByText } = renderWithProvider(
       <BlockaidAlertContent
         alertDetails={ALERT_DETAILS_MOCK}
         securityAlertResponse={mockSecurityAlertResponse}
         onContactUsClicked={mockOnContactUsClicked}
       />,
+      { state: MAINNET_STATE },
     );
 
     expect(getByText(DETAILS_ACCORDION_TITLE)).toBeDefined();
@@ -56,12 +79,13 @@ describe('BlockaidAlertContent', () => {
   });
 
   it('toggles accordion details on press', () => {
-    const { getByText, queryByText } = render(
+    const { getByText, queryByText } = renderWithProvider(
       <BlockaidAlertContent
         alertDetails={ALERT_DETAILS_MOCK}
         securityAlertResponse={mockSecurityAlertResponse}
         onContactUsClicked={mockOnContactUsClicked}
       />,
+      { state: MAINNET_STATE },
     );
 
     const accordionTitle = getByText(DETAILS_ACCORDION_TITLE);
@@ -79,12 +103,13 @@ describe('BlockaidAlertContent', () => {
   });
 
   it('generates the correct report URL', async () => {
-    render(
+    renderWithProvider(
       <BlockaidAlertContent
         alertDetails={ALERT_DETAILS_MOCK}
         securityAlertResponse={mockSecurityAlertResponse}
         onContactUsClicked={mockOnContactUsClicked}
       />,
+      { state: MAINNET_STATE },
     );
 
     await waitFor(() => {
@@ -94,7 +119,7 @@ describe('BlockaidAlertContent', () => {
           jsonRpcMethod: REQUEST_MOCK.method,
           jsonRpcParams: '["param1","param2"]',
           blockNumber: BLOCK_NUMBER_MOCK,
-          chain: BLOCKAID_SUPPORTED_NETWORK_NAMES['1'],
+          chain: 'Ethereum',
           classification: Reason.other,
           resultType: BlockaidResultType.Malicious,
           reproduce: '["Detail 1","Detail 2"]',
@@ -104,12 +129,13 @@ describe('BlockaidAlertContent', () => {
   });
 
   it('calls onContactUsClicked when report link is clicked', async () => {
-    const { getByText } = render(
+    const { getByText } = renderWithProvider(
       <BlockaidAlertContent
         alertDetails={ALERT_DETAILS_MOCK}
         securityAlertResponse={mockSecurityAlertResponse}
         onContactUsClicked={mockOnContactUsClicked}
       />,
+      { state: MAINNET_STATE },
     );
 
     const accordionTitle = getByText(DETAILS_ACCORDION_TITLE);
@@ -131,12 +157,13 @@ describe('BlockaidAlertContent', () => {
       req: null,
     } as unknown as SecurityAlertResponse;
 
-    render(
+    renderWithProvider(
       <BlockaidAlertContent
         alertDetails={ALERT_DETAILS_MOCK}
         securityAlertResponse={mockSecurityAlertResponseWithoutReq}
         onContactUsClicked={mockOnContactUsClicked}
       />,
+      { state: MAINNET_STATE },
     );
 
     await waitFor(() => {
@@ -148,12 +175,13 @@ describe('BlockaidAlertContent', () => {
       chainId: null,
     } as unknown as SecurityAlertResponse;
 
-    render(
+    renderWithProvider(
       <BlockaidAlertContent
         alertDetails={ALERT_DETAILS_MOCK}
         securityAlertResponse={mockSecurityAlertResponseWithoutChainId}
         onContactUsClicked={mockOnContactUsClicked}
       />,
+      { state: MAINNET_STATE },
     );
 
     await waitFor(() => {
@@ -161,18 +189,63 @@ describe('BlockaidAlertContent', () => {
     });
   });
 
+  it('reports the network name for a chain absent from the legacy Blockaid network map', async () => {
+    const ROBINHOOD_CHAIN_ID: Hex = '0x1237';
+
+    renderWithProvider(
+      <BlockaidAlertContent
+        alertDetails={ALERT_DETAILS_MOCK}
+        securityAlertResponse={{
+          ...mockSecurityAlertResponse,
+          chainId: ROBINHOOD_CHAIN_ID,
+        }}
+        onContactUsClicked={mockOnContactUsClicked}
+      />,
+      {
+        state: networkStateWith(ROBINHOOD_CHAIN_ID, 'Robinhood Chain'),
+      },
+    );
+
+    await waitFor(() => {
+      expect(deflate).toHaveBeenCalledWith(
+        expect.stringContaining('"chain":"Robinhood Chain"'),
+      );
+    });
+  });
+
+  it('omits the chain when the network is not configured', async () => {
+    renderWithProvider(
+      <BlockaidAlertContent
+        alertDetails={ALERT_DETAILS_MOCK}
+        securityAlertResponse={{
+          ...mockSecurityAlertResponse,
+          chainId: '0xdead',
+        }}
+        onContactUsClicked={mockOnContactUsClicked}
+      />,
+      { state: MAINNET_STATE },
+    );
+
+    await waitFor(() => {
+      expect(deflate).toHaveBeenCalledWith(
+        expect.not.stringContaining('"chain"'),
+      );
+    });
+  });
+
   it('renders generic reason message if reason not recognised', () => {
     const mockSecurityAlertResponseWithUnknownReason: SecurityAlertResponse = {
       ...mockSecurityAlertResponse,
       reason: 'unknown_reason' as Reason,
     };
 
-    const { getByText } = render(
+    const { getByText } = renderWithProvider(
       <BlockaidAlertContent
         alertDetails={ALERT_DETAILS_MOCK}
         securityAlertResponse={mockSecurityAlertResponseWithUnknownReason}
         onContactUsClicked={mockOnContactUsClicked}
       />,
+      { state: MAINNET_STATE },
     );
 
     expect(
diff --git a/app/components/Views/confirmations/components/blockaid-alert-content/blockaid-alert-content.tsx b/app/components/Views/confirmations/components/blockaid-alert-content/blockaid-alert-content.tsx
index 6e87a7d22509..2913850a72a2 100644
--- a/app/components/Views/confirmations/components/blockaid-alert-content/blockaid-alert-content.tsx
+++ b/app/components/Views/confirmations/components/blockaid-alert-content/blockaid-alert-content.tsx
@@ -1,9 +1,11 @@
 import React, { useEffect, useState } from 'react';
 import { View } from 'react-native';
+import { useSelector } from 'react-redux';
 import { deflate } from 'react-native-gzip';
+import type { Hex } from '@metamask/utils';
 import { strings } from '../../../../../../locales/i18n';
 import AppConstants from '../../../../../core/AppConstants';
-import { BLOCKAID_SUPPORTED_NETWORK_NAMES } from '../../../../../util/networks';
+import { selectEvmNetworkConfigurationsByChainId } from '../../../../../selectors/networkController';
 import { WALLET_CONNECT_ORIGIN } from '../../../../../util/walletconnect';
 import {
   FALSE_POSITIVE_REPORT_BASE_URL,
@@ -46,6 +48,9 @@ const BlockaidAlertContent: React.FC<BlockaidAlertContentProps> = ({
   const [isExpanded, setIsExpanded] = useState(false);
   const [reportUrl, setReportUrl] = useState<string>('');
   const { styles } = useStyles(styleSheet, {});
+  const networkConfigurations = useSelector(
+    selectEvmNetworkConfigurationsByChainId,
+  );
 
   const onToggleShowDetails = () => {
     setIsExpanded(!isExpanded);
@@ -71,7 +76,7 @@ const BlockaidAlertContent: React.FC<BlockaidAlertContentProps> = ({
       jsonRpcMethod: req.method,
       jsonRpcParams: JSON.stringify(req.params),
       blockNumber: block,
-      chain: BLOCKAID_SUPPORTED_NETWORK_NAMES[chainId],
+      chain: networkConfigurations?.[chainId as Hex]?.name,
       classification: reason,
       resultType: result_type,
       reproduce: JSON.stringify(features),
@@ -83,7 +88,7 @@ const BlockaidAlertContent: React.FC<BlockaidAlertContentProps> = ({
         setReportUrl(getReportUrl(compressed));
       }
     })();
-  }, [securityAlertResponse, isExpanded]);
+  }, [securityAlertResponse, isExpanded, networkConfigurations]);
 
   return (
     <>
diff --git a/app/components/Views/confirmations/components/blockaid-alert-content/index.ts b/app/components/Views/confirmations/components/blockaid-alert-content/index.ts
deleted file mode 100644
index 77c6cde1ea9e..000000000000
--- a/app/components/Views/confirmations/components/blockaid-alert-content/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './blockaid-alert-content';
diff --git a/app/components/Views/confirmations/components/blockaid-banner/BlockaidBanner.styles.ts b/app/components/Views/confirmations/components/blockaid-banner/BlockaidBanner.styles.ts
deleted file mode 100644
index 4ab64b9daa03..000000000000
--- a/app/components/Views/confirmations/components/blockaid-banner/BlockaidBanner.styles.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// Third party dependencies.
-import { Theme } from '../../../../../util/theme/models';
-import { StyleSheet, ViewStyle } from 'react-native';
-import { BlockaidBannerStyleSheetVars } from './BlockaidBanner.types';
-/**
- * Style sheet function for BannerAlert component.
- *
- * @param params Style sheet params.
- * @param params.theme App theme from ThemeContext.
- * @param params.vars Inputs that the style sheet depends on.
- * @returns StyleSheet object.
- */
-const styleSheet = (_params: {
-  theme: Theme;
-  vars: BlockaidBannerStyleSheetVars;
-}) =>
-  StyleSheet.create({
-    attributionBase: Object.assign({
-      height: 40,
-      marginTop: 8,
-    } as ViewStyle),
-    attributionItem: {
-      marginRight: 4,
-    },
-    detailsItem: {
-      marginBottom: 4,
-    },
-    details: { marginLeft: 10, marginBottom: 10 },
-    bannerWrapperMargined: {
-      marginTop: 10,
-      marginLeft: 10,
-      marginRight: 10,
-      marginBottom: 20,
-    },
-    bannerSectionSmall: {
-      alignItems: 'center',
-      marginTop: 10,
-      marginBottom: 10,
-    },
-    bannerSectionSmallSpaced: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      justifyContent: 'space-around',
-      borderWidth: 1,
-      borderRadius: 4,
-      borderColor: _params.theme.colors.border.default,
-      marginTop: 20,
-      marginLeft: 10,
-      marginRight: 10,
-      marginBottom: 20,
-      padding: 10,
-    },
-    infoText: {
-      marginHorizontal: 5,
-    },
-    flexRowSection: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      marginRight: 10,
-    },
-  });
-
-export default styleSheet;
diff --git a/app/components/Views/confirmations/components/blockaid-banner/BlockaidBanner.test.tsx b/app/components/Views/confirmations/components/blockaid-banner/BlockaidBanner.test.tsx
deleted file mode 100644
index 2bfac622ae4c..000000000000
--- a/app/components/Views/confirmations/components/blockaid-banner/BlockaidBanner.test.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-import React from 'react';
-
-import { fireEvent } from '@testing-library/react-native';
-
-import { TESTID_ACCORDION_CONTENT } from '../../../../../component-library/components/Accordions/Accordion/Accordion.constants';
-import { TESTID_ACCORDIONHEADER } from '../../../../../component-library/components/Accordions/Accordion/foundation/AccordionHeader/AccordionHeader.constants';
-import BlockaidBanner from './BlockaidBanner';
-import { ResultType, Reason } from './BlockaidBanner.types';
-import renderWithProvider, {
-  DeepPartial,
-} from '../../../../../util/test/renderWithProvider';
-import { RootState } from '../../../../../reducers';
-
-jest.mock('../../../../../util/blockaid', () => ({
-  isBlockaidFeatureEnabled: jest.fn().mockReturnValue(true),
-}));
-
-jest.mock('react-native-gzip', () => ({
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  deflate: (val: any) => val,
-}));
-
-const mockState: DeepPartial<RootState> = {
-  engine: {
-    backgroundState: {
-      PreferencesController: { securityAlertsEnabled: true },
-    },
-  },
-};
-
-const mockFeatures = [
-  'We found attack vectors in this request',
-  'This request shows a fake token name and icon.',
-  'If you approve this request, a third party known for scams might take all your assets.',
-  'Operator is an EOA',
-  'Operator is untrusted according to previous activity',
-];
-
-const securityAlertResponse = {
-  result_type: ResultType.Failed,
-  reason: Reason.failed,
-  features: mockFeatures,
-  block: 123,
-  req: {},
-  chainId: '0x1',
-};
-
-describe('BlockaidBanner', () => {
-  it('should render correctly', () => {
-    const wrapper = renderWithProvider(
-      <BlockaidBanner
-        securityAlertResponse={{
-          ...securityAlertResponse,
-          result_type: ResultType.Warning,
-          reason: Reason.approvalFarming,
-        }}
-      />,
-      { state: mockState },
-    );
-
-    expect(wrapper.getByTestId('security-alert-banner')).toBeOnTheScreen();
-  });
-
-  it('should render correctly with reason "raw_signature_farming"', () => {
-    const wrapper = renderWithProvider(
-      <BlockaidBanner
-        securityAlertResponse={{
-          ...securityAlertResponse,
-          result_type: ResultType.Malicious,
-          reason: Reason.rawSignatureFarming,
-        }}
-      />,
-      { state: mockState },
-    );
-
-    expect(wrapper.getByTestId('security-alert-banner')).toBeOnTheScreen();
-    expect(wrapper.getByTestId(TESTID_ACCORDIONHEADER)).toBeOnTheScreen();
-    expect(wrapper.getByText('This is a suspicious request')).toBeOnTheScreen();
-    expect(
-      wrapper.getByText(
-        'If you approve this request, you might lose your assets.',
-      ),
-    ).toBeOnTheScreen();
-  });
-
-  it('should render correctly with list attack details', () => {
-    const wrapper = renderWithProvider(
-      <BlockaidBanner
-        securityAlertResponse={{
-          ...securityAlertResponse,
-          result_type: ResultType.Malicious,
-          reason: Reason.approvalFarming,
-        }}
-      />,
-      { state: mockState },
-    );
-
-    expect(wrapper.getByTestId('security-alert-banner')).toBeOnTheScreen();
-    expect(wrapper.getByTestId(TESTID_ACCORDIONHEADER)).toBeOnTheScreen();
-    expect(wrapper.queryByTestId(TESTID_ACCORDION_CONTENT)).toBeNull();
-
-    fireEvent.press(wrapper.getByText('See details'));
-
-    expect(wrapper.getByTestId(TESTID_ACCORDION_CONTENT)).toBeOnTheScreen();
-    expect(
-      wrapper.getByText(/We found attack vectors in this request/),
-    ).toBeOnTheScreen();
-    expect(
-      wrapper.getByText(/This request shows a fake token name and icon\./),
-    ).toBeOnTheScreen();
-    expect(wrapper.getByText(/Operator is an EOA/)).toBeOnTheScreen();
-    expect(
-      wrapper.getByText(/Operator is untrusted according to previous activity/),
-    ).toBeOnTheScreen();
-  });
-
-  it('should render something does not look right with contact us link when expanded', () => {
-    const wrapper = renderWithProvider(
-      <BlockaidBanner
-        securityAlertResponse={{
-          ...securityAlertResponse,
-          result_type: ResultType.Malicious,
-          reason: Reason.approvalFarming,
-        }}
-      />,
-      { state: mockState },
-    );
-
-    expect(wrapper.getByTestId('security-alert-banner')).toBeOnTheScreen();
-    expect(wrapper.getByTestId(TESTID_ACCORDIONHEADER)).toBeOnTheScreen();
-    expect(wrapper.queryByTestId(TESTID_ACCORDION_CONTENT)).toBeNull();
-
-    fireEvent.press(wrapper.getByText('See details'));
-
-    expect(wrapper.getByTestId(TESTID_ACCORDION_CONTENT)).toBeOnTheScreen();
-    expect(
-      wrapper.getByText(/Something doesn\u2019t look right\?/),
-    ).toBeOnTheScreen();
-  });
-
-  it('should not render if securityAlertResponse is undefined', () => {
-    const wrapper = renderWithProvider(<BlockaidBanner />, {
-      state: mockState,
-    });
-
-    expect(wrapper.queryByTestId(TESTID_ACCORDIONHEADER)).toBeNull();
-    expect(wrapper.queryByTestId(TESTID_ACCORDION_CONTENT)).toBeNull();
-  });
-
-  it('should not render if blockaid does not support network', () => {
-    const wrapper = renderWithProvider(<BlockaidBanner />, {
-      state: mockState,
-    });
-
-    expect(wrapper.queryByTestId(TESTID_ACCORDIONHEADER)).toBeNull();
-    expect(wrapper.queryByTestId(TESTID_ACCORDION_CONTENT)).toBeNull();
-  });
-
-  it('should not render if user has not enabled blockaid', () => {
-    const wrapper = renderWithProvider(<BlockaidBanner />, {
-      state: mockState,
-    });
-
-    expect(wrapper.queryByTestId(TESTID_ACCORDIONHEADER)).toBeNull();
-    expect(wrapper.queryByTestId(TESTID_ACCORDION_CONTENT)).toBeNull();
-  });
-
-  it('should render loader if reason is requestInProgress', () => {
-    const wrapper = renderWithProvider(
-      <BlockaidBanner
-        securityAlertResponse={{
-          result_type: ResultType.RequestInProgress,
-          reason: Reason.requestInProgress,
-        }}
-      />,
-      {
-        state: mockState,
-      },
-    );
-
-    expect(wrapper.getByTestId('blockaid-banner-loader')).toBeOnTheScreen();
-    expect(wrapper.queryByTestId(TESTID_ACCORDIONHEADER)).toBeNull();
-    expect(wrapper.queryByTestId('security-alert-banner')).toBeNull();
-  });
-
-  it('should not render if resultType is benign', () => {
-    const wrapper = renderWithProvider(
-      <BlockaidBanner
-        securityAlertResponse={{
-          ...securityAlertResponse,
-          result_type: ResultType.Benign,
-          reason: Reason.rawSignatureFarming,
-        }}
-      />,
-      { state: mockState },
-    );
-
-    expect(wrapper.queryByTestId(TESTID_ACCORDIONHEADER)).toBeNull();
-    expect(wrapper.queryByTestId(TESTID_ACCORDION_CONTENT)).toBeNull();
-  });
-
-  it('should render normal banner alert if resultType is failed', () => {
-    const wrapper = renderWithProvider(
-      <BlockaidBanner securityAlertResponse={securityAlertResponse} />,
-      { state: mockState },
-    );
-
-    expect(wrapper.queryByTestId(TESTID_ACCORDIONHEADER)).toBeNull();
-    expect(wrapper.queryByTestId(TESTID_ACCORDION_CONTENT)).toBeNull();
-    expect(
-      wrapper.getByTestId('security-alert-response-failed-banner'),
-    ).toBeOnTheScreen();
-    expect(wrapper.getByText('Request may not be safe')).toBeOnTheScreen();
-    expect(
-      wrapper.getByText(
-        'Because of an error, this request was not verified by the security provider. Proceed with caution.',
-      ),
-    ).toBeOnTheScreen();
-  });
-});
diff --git a/app/components/Views/confirmations/components/blockaid-banner/BlockaidBanner.tsx b/app/components/Views/confirmations/components/blockaid-banner/BlockaidBanner.tsx
deleted file mode 100644
index f83183f9002c..000000000000
--- a/app/components/Views/confirmations/components/blockaid-banner/BlockaidBanner.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { ActivityIndicator } from 'react-native';
-import { View } from 'react-native-animatable';
-import { captureException } from '@sentry/react-native';
-import { deflate } from 'react-native-gzip';
-
-import { strings } from '../../../../../../locales/i18n';
-import { AccordionHeaderHorizontalAlignment } from '../../../../../component-library/components/Accordions/Accordion';
-import Accordion from '../../../../../component-library/components/Accordions/Accordion/Accordion';
-import { BannerAlertSeverity } from '../../../../../component-library/components/Banners/Banner';
-import { DEFAULT_BANNERBASE_DESCRIPTION_TEXTVARIANT } from '../../../../../component-library/components/Banners/Banner/foundation/BannerBase/BannerBase.constants';
-import BannerAlert from '../../../../../component-library/components/Banners/Banner/variants/BannerAlert/BannerAlert';
-import Text from '../../../../../component-library/components/Texts/Text/Text';
-import { useStyles } from '../../../../../component-library/hooks/useStyles';
-import {
-  FALSE_POSITIVE_REPOST_LINE_TEST_ID,
-  REASON_DESCRIPTION_I18N_KEY_MAP,
-  REASON_TITLE_I18N_KEY_MAP,
-} from './BlockaidBanner.constants';
-import styleSheet from './BlockaidBanner.styles';
-import {
-  BlockaidBannerProps,
-  Reason,
-  ResultType,
-} from './BlockaidBanner.types';
-import BlockaidBannerLink from './BlockaidBannerLink';
-import {
-  FALSE_POSITIVE_REPORT_BASE_URL,
-  UTM_SOURCE,
-} from '../../../../../constants/urls';
-import { BLOCKAID_SUPPORTED_NETWORK_NAMES } from '../../../../../util/networks';
-import { WALLET_CONNECT_ORIGIN } from '../../../../../util/walletconnect';
-import AppConstants from '../../../../../core/AppConstants';
-import { ConfirmationTopSheetSelectorsIDs } from '../../ConfirmationView.testIds';
-
-const getReportUrl = (encodedData: string) =>
-  `${FALSE_POSITIVE_REPORT_BASE_URL}?data=${encodeURIComponent(
-    encodedData.toString(),
-  )}&utm_source=${UTM_SOURCE}`;
-
-const getTitle = (reason: Reason): string =>
-  strings(
-    REASON_TITLE_I18N_KEY_MAP[reason] ||
-      'blockaid_banner.deceptive_request_title',
-  );
-
-const getDescription = (reason: Reason) =>
-  strings(
-    REASON_DESCRIPTION_I18N_KEY_MAP[reason] ||
-      REASON_DESCRIPTION_I18N_KEY_MAP[Reason.other],
-  );
-
-const BlockaidBanner = (bannerProps: BlockaidBannerProps) => {
-  const {
-    style,
-    securityAlertResponse,
-    onToggleShowDetails,
-    onContactUsClicked,
-  } = bannerProps;
-  const { styles, theme } = useStyles(styleSheet, { style });
-  const [reportUrl, setReportUrl] = useState<string>('');
-
-  useEffect(() => {
-    if (!securityAlertResponse) {
-      return;
-    }
-    const { result_type, reason, features, block, req, chainId } =
-      securityAlertResponse;
-
-    if (!req || !chainId) {
-      return;
-    }
-
-    const domain = req.origin as string;
-
-    const reportData = {
-      domain: domain
-        ?.replace(WALLET_CONNECT_ORIGIN, '')
-        ?.replace(AppConstants.MM_SDK.SDK_REMOTE_ORIGIN, ''),
-      jsonRpcMethod: req.method,
-      jsonRpcParams: JSON.stringify(req.params),
-      blockNumber: block,
-      chain: BLOCKAID_SUPPORTED_NETWORK_NAMES[chainId],
-      classification: reason,
-      resultType: result_type,
-      reproduce: JSON.stringify(features),
-    };
-
-    (async () => {
-      const compressed = await deflate(JSON.stringify(reportData));
-      setReportUrl(getReportUrl(compressed));
-    })();
-  }, [securityAlertResponse]);
-
-  if (!securityAlertResponse) {
-    return null;
-  }
-
-  const { result_type, reason, features } = securityAlertResponse;
-
-  if (securityAlertResponse.reason === Reason.requestInProgress) {
-    return (
-      <ActivityIndicator
-        testID="blockaid-banner-loader"
-        style={styles.bannerSectionSmall}
-        size="small"
-        color={theme.colors.warning.default}
-      />
-    );
-  }
-
-  if (result_type === ResultType.Benign) {
-    return null;
-  }
-
-  const title = getTitle(reason);
-  const description = getDescription(reason);
-
-  if (result_type === ResultType.Failed) {
-    return (
-      <View style={styles.bannerWrapperMargined}>
-        <BannerAlert
-          severity={BannerAlertSeverity.Warning}
-          title={title}
-          description={description}
-          testID={
-            ConfirmationTopSheetSelectorsIDs.SECURITY_ALERT_RESPONSE_FAILED_BANNER
-          }
-        />
-      </View>
-    );
-  }
-
-  if (!REASON_DESCRIPTION_I18N_KEY_MAP[reason]) {
-    const unidentifiedReasonError = new Error(
-      `BlockaidBannerAlert: Unidentified reason '${reason}'`,
-    );
-    captureException(unidentifiedReasonError);
-  }
-
-  const renderDetails = () =>
-    features?.length && features?.length <= 0 ? null : (
-      <Accordion
-        title={strings('blockaid_banner.see_details')}
-        onPress={onToggleShowDetails}
-        isExpanded={false}
-        horizontalAlignment={AccordionHeaderHorizontalAlignment.Start}
-      >
-        <View style={styles.details}>
-          {features?.map((feature, i) => (
-            <Text key={`feature-${i}`} style={styles.detailsItem}>
-              • {JSON.stringify(feature)}
-            </Text>
-          ))}
-        </View>
-        <View style={styles.attributionBase}>
-          <View style={styles.attributionItem}>
-            <Text
-              variant={DEFAULT_BANNERBASE_DESCRIPTION_TEXTVARIANT}
-              data-testid={FALSE_POSITIVE_REPOST_LINE_TEST_ID}
-            >
-              {strings('blockaid_banner.does_not_look_right')}
-            </Text>
-          </View>
-          <View style={styles.attributionItem}>
-            <BlockaidBannerLink
-              text={strings('blockaid_banner.report_an_issue')}
-              link={reportUrl}
-              onContactUsClicked={onContactUsClicked}
-            />
-          </View>
-        </View>
-      </Accordion>
-    );
-
-  return (
-    <BannerAlert
-      severity={
-        result_type === ResultType.Malicious
-          ? BannerAlertSeverity.Error
-          : BannerAlertSeverity.Warning
-      }
-      title={title}
-      description={description}
-      {...bannerProps}
-      testID={ConfirmationTopSheetSelectorsIDs.SECURITY_ALERT_BANNER}
-    >
-      {renderDetails()}
-    </BannerAlert>
-  );
-};
-
-export default BlockaidBanner;
diff --git a/app/components/Views/confirmations/components/confirm/confirm-component.tsx b/app/components/Views/confirmations/components/confirm/confirm-component.tsx
index 0c8bdaf76f0a..e12893aa1a5a 100755
--- a/app/components/Views/confirmations/components/confirm/confirm-component.tsx
+++ b/app/components/Views/confirmations/components/confirm/confirm-component.tsx
@@ -12,7 +12,7 @@ import type { AppNavigationProp } from '../../../../../core/NavigationService/ty
 import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 
 import { ConfirmationUIType } from '../../ConfirmationView.testIds';
-import BottomSheet from '../../../../../component-library/components/BottomSheets/BottomSheet';
+import { BottomSheet } from '@metamask/design-system-react-native';
 import { useStyles } from '../../../../../component-library/hooks';
 import { UnstakeConfirmationViewProps } from '../../../../UI/Stake/Views/UnstakeConfirmationView/UnstakeConfirmationView.types';
 import useConfirmationAlerts from '../../hooks/alerts/useConfirmationAlerts';
@@ -205,7 +205,6 @@ export const Confirm = ({
   return (
     <BottomSheet
       onClose={() => onReject()}
-      shouldNavigateBack={false}
       style={styles.bottomSheetDialogSheet}
       testID={ConfirmationUIType.MODAL}
     >
diff --git a/app/components/Views/confirmations/components/confirmation-asset-polling-provider/index.ts b/app/components/Views/confirmations/components/confirmation-asset-polling-provider/index.ts
deleted file mode 100644
index 60bc0b2339fb..000000000000
--- a/app/components/Views/confirmations/components/confirmation-asset-polling-provider/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ConfirmationAssetPollingProvider } from './confirmation-asset-polling-provider';
diff --git a/app/components/Views/confirmations/components/custom-amount/custom-amount-buy/custom-amount-buy.test.tsx b/app/components/Views/confirmations/components/custom-amount/custom-amount-buy/custom-amount-buy.test.tsx
new file mode 100644
index 000000000000..f594fbfbbca5
--- /dev/null
+++ b/app/components/Views/confirmations/components/custom-amount/custom-amount-buy/custom-amount-buy.test.tsx
@@ -0,0 +1,119 @@
+import React from 'react';
+import { fireEvent } from '@testing-library/react-native';
+import { merge } from 'lodash';
+import renderWithProvider from '../../../../../../util/test/renderWithProvider';
+import { CustomAmountBuy } from './custom-amount-buy';
+import { simpleSendTransactionControllerMock } from '../../../__mocks__/controllers/transaction-controller-mock';
+import { transactionApprovalControllerMock } from '../../../__mocks__/controllers/approval-controller-mock';
+import { otherControllersMock } from '../../../__mocks__/controllers/other-controllers-mock';
+import { useRampNavigation } from '../../../../../UI/Ramp/hooks/useRampNavigation';
+import { useAccountTokens } from '../../../hooks/send/useAccountTokens';
+import { useTransactionPayRequiredTokens } from '../../../hooks/pay/useTransactionPayData';
+import { useTransactionMetadataRequest } from '../../../hooks/transactions/useTransactionMetadataRequest';
+import { strings } from '../../../../../../../locales/i18n';
+import { TransactionType } from '@metamask/transaction-controller';
+import { AssetType } from '../../../types/token';
+import { TransactionPayRequiredToken } from '@metamask/transaction-pay-controller';
+import { Hex } from '@metamask/utils';
+
+jest.mock('../../../../../UI/Ramp/hooks/useRampNavigation');
+jest.mock('../../../hooks/send/useAccountTokens');
+jest.mock('../../../hooks/pay/useTransactionPayData');
+jest.mock('../../../hooks/transactions/useTransactionMetadataRequest');
+
+const mockGoToBuy = jest.fn();
+
+const TOKEN_ADDRESS_MOCK = '0x123' as Hex;
+const CHAIN_ID_MOCK = '0x1' as Hex;
+
+function render() {
+  return renderWithProvider(<CustomAmountBuy />, {
+    state: merge(
+      {},
+      simpleSendTransactionControllerMock,
+      transactionApprovalControllerMock,
+      otherControllersMock,
+    ),
+  });
+}
+
+describe('CustomAmountBuy', () => {
+  const useRampNavigationMock = jest.mocked(useRampNavigation);
+  const useAccountTokensMock = jest.mocked(useAccountTokens);
+  const useTransactionPayRequiredTokensMock = jest.mocked(
+    useTransactionPayRequiredTokens,
+  );
+  const useTransactionMetadataRequestMock = jest.mocked(
+    useTransactionMetadataRequest,
+  );
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    useRampNavigationMock.mockReturnValue({
+      goToBuy: mockGoToBuy,
+    } as never);
+
+    useAccountTokensMock.mockReturnValue([]);
+    useTransactionPayRequiredTokensMock.mockReturnValue([]);
+    useTransactionMetadataRequestMock.mockReturnValue({
+      type: TransactionType.contractInteraction,
+      txParams: { from: '0x123' },
+    } as never);
+  });
+
+  it('renders without crashing', () => {
+    const { getByText } = render();
+
+    expect(
+      getByText(strings('confirm.custom_amount.buy_button')),
+    ).toBeDefined();
+  });
+
+  it('renders the buy button text', () => {
+    const { getByText } = render();
+
+    expect(
+      getByText(strings('confirm.custom_amount.buy_button')),
+    ).toBeOnTheScreen();
+  });
+
+  it('calls goToBuy when the buy button is pressed', () => {
+    useAccountTokensMock.mockReturnValue([
+      {
+        address: TOKEN_ADDRESS_MOCK,
+        assetId: TOKEN_ADDRESS_MOCK,
+        chainId: CHAIN_ID_MOCK,
+      } as AssetType,
+    ]);
+
+    useTransactionPayRequiredTokensMock.mockReturnValue([
+      {
+        address: TOKEN_ADDRESS_MOCK,
+        chainId: CHAIN_ID_MOCK,
+      },
+    ] as TransactionPayRequiredToken[]);
+
+    const { getByText } = render();
+
+    fireEvent.press(getByText(strings('confirm.custom_amount.buy_button')));
+
+    expect(mockGoToBuy).toHaveBeenCalledTimes(1);
+    expect(mockGoToBuy).toHaveBeenCalledWith(
+      {
+        assetId: 'eip155:1/erc20:0x123',
+      },
+      { surface: 'confirmation' },
+    );
+  });
+
+  it('renders the perps deposit buy message when no tokens available', () => {
+    useTransactionMetadataRequestMock.mockReturnValue({
+      type: TransactionType.perpsDeposit,
+    } as never);
+    const { getByText } = render();
+    expect(
+      getByText(strings('confirm.custom_amount.buy_perps')),
+    ).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/Views/confirmations/components/custom-amount/custom-amount-buy/custom-amount-buy.tsx b/app/components/Views/confirmations/components/custom-amount/custom-amount-buy/custom-amount-buy.tsx
new file mode 100644
index 000000000000..d0ee14e7b536
--- /dev/null
+++ b/app/components/Views/confirmations/components/custom-amount/custom-amount-buy/custom-amount-buy.tsx
@@ -0,0 +1,82 @@
+import React, { useCallback } from 'react';
+import {
+  TransactionType,
+  hasTransactionType,
+} from '@metamask/transaction-controller';
+import { toCaipAssetType } from '@metamask/utils';
+import { getNativeTokenAddress } from '@metamask/assets-controllers';
+import {
+  Button,
+  ButtonSize,
+  ButtonVariant,
+} from '@metamask/design-system-react-native';
+import { Box } from '../../../../../UI/Box/Box';
+import Text, {
+  TextColor,
+  TextVariant,
+} from '../../../../../../component-library/components/Texts/Text';
+import { AlignItems } from '../../../../../UI/Box/box.types';
+import { strings } from '../../../../../../../locales/i18n';
+import { useRampNavigation } from '../../../../../UI/Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../../../../UI/Ramp/constants/rampsBuyCufTags';
+import { useAccountTokens } from '../../../hooks/send/useAccountTokens';
+import { useTransactionPayRequiredTokens } from '../../../hooks/pay/useTransactionPayData';
+import { useTransactionMetadataRequest } from '../../../hooks/transactions/useTransactionMetadataRequest';
+
+export function CustomAmountBuy() {
+  const transactionMeta = useTransactionMetadataRequest();
+  const tokens = useAccountTokens({ includeNoBalance: true });
+  const requiredTokens = useTransactionPayRequiredTokens();
+
+  const primaryRequiredToken = requiredTokens.find(
+    (token) => token.address !== getNativeTokenAddress(token.chainId),
+  );
+
+  const asset = tokens.find(
+    (token) =>
+      token.address?.toLowerCase() ===
+        primaryRequiredToken?.address.toLowerCase() &&
+      token.chainId === primaryRequiredToken?.chainId,
+  );
+
+  const assetId = toCaipAssetType(
+    'eip155',
+    Number(primaryRequiredToken?.chainId ?? '0x0').toString(),
+    'erc20',
+    asset?.assetId ?? '0x0',
+  );
+
+  const { goToBuy } = useRampNavigation();
+
+  const handleBuyPress = useCallback(() => {
+    goToBuy({ assetId }, { surface: RAMPS_BUY_CUF_SURFACE.CONFIRMATION });
+  }, [assetId, goToBuy]);
+
+  let message: string | undefined;
+
+  if (hasTransactionType(transactionMeta, [TransactionType.perpsDeposit])) {
+    message = strings('confirm.custom_amount.buy_perps');
+  }
+
+  if (hasTransactionType(transactionMeta, [TransactionType.predictDeposit])) {
+    message = strings('confirm.custom_amount.buy_predict');
+  }
+
+  return (
+    <Box alignItems={AlignItems.center} gap={20}>
+      {message && (
+        <Text variant={TextVariant.BodySM} color={TextColor.Error}>
+          {message}
+        </Text>
+      )}
+      <Button
+        variant={ButtonVariant.Primary}
+        onPress={handleBuyPress}
+        isFullWidth
+        size={ButtonSize.Lg}
+      >
+        {strings('confirm.custom_amount.buy_button')}
+      </Button>
+    </Box>
+  );
+}
diff --git a/app/components/Views/confirmations/components/custom-amount/custom-amount-buy/index.ts b/app/components/Views/confirmations/components/custom-amount/custom-amount-buy/index.ts
new file mode 100644
index 000000000000..fc9c34fcbff6
--- /dev/null
+++ b/app/components/Views/confirmations/components/custom-amount/custom-amount-buy/index.ts
@@ -0,0 +1 @@
+export { CustomAmountBuy } from './custom-amount-buy';
diff --git a/app/components/Views/confirmations/components/custom-amount/custom-amount-confirm-button/custom-amount-confirm-button.test.tsx b/app/components/Views/confirmations/components/custom-amount/custom-amount-confirm-button/custom-amount-confirm-button.test.tsx
new file mode 100644
index 000000000000..c9062541eb23
--- /dev/null
+++ b/app/components/Views/confirmations/components/custom-amount/custom-amount-confirm-button/custom-amount-confirm-button.test.tsx
@@ -0,0 +1,200 @@
+import React from 'react';
+import { act, fireEvent } from '@testing-library/react-native';
+import { merge, noop } from 'lodash';
+import renderWithProvider from '../../../../../../util/test/renderWithProvider';
+import { CustomAmountConfirmButton } from './custom-amount-confirm-button';
+import { CustomAmountStage } from '../../../hooks/custom-amount/useCustomAmountStage';
+import { simpleSendTransactionControllerMock } from '../../../__mocks__/controllers/transaction-controller-mock';
+import { transactionApprovalControllerMock } from '../../../__mocks__/controllers/approval-controller-mock';
+import { otherControllersMock } from '../../../__mocks__/controllers/other-controllers-mock';
+import {
+  useAlerts,
+  AlertsContextParams,
+} from '../../../context/alert-system-context';
+import { useConfirmationContext } from '../../../context/confirmation-context';
+import { useConfirmActions } from '../../../hooks/useConfirmActions';
+import { useTransactionMetadataRequest } from '../../../hooks/transactions/useTransactionMetadataRequest';
+import { ConfirmationFooterSelectorIDs } from '../../../ConfirmationView.testIds';
+import { TransactionType } from '@metamask/transaction-controller';
+import { Alert } from '../../../types/alerts';
+import { useRoute } from '@react-navigation/native';
+
+jest.mock('../../../context/alert-system-context');
+jest.mock('../../../context/confirmation-context');
+jest.mock('../../../hooks/useConfirmActions');
+jest.mock('../../../hooks/transactions/useTransactionMetadataRequest');
+
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: jest.fn(),
+  useRoute: jest.fn(),
+}));
+
+function render(props: {
+  alertTitle?: string;
+  isDisabled?: boolean;
+  onContinue?: () => void;
+  stage?: CustomAmountStage;
+}) {
+  return renderWithProvider(
+    <CustomAmountConfirmButton
+      alertTitle={props.alertTitle}
+      isDisabled={props.isDisabled ?? false}
+      onContinue={props.onContinue}
+      stage={props.stage ?? CustomAmountStage.ShowTotals}
+    />,
+    {
+      state: merge(
+        {},
+        simpleSendTransactionControllerMock,
+        transactionApprovalControllerMock,
+        otherControllersMock,
+      ),
+    },
+  );
+}
+
+describe('CustomAmountConfirmButton', () => {
+  const useAlertsMock = jest.mocked(useAlerts);
+  const useConfirmationContextMock = jest.mocked(useConfirmationContext);
+  const useConfirmActionsMock = jest.mocked(useConfirmActions);
+  const useTransactionMetadataRequestMock = jest.mocked(
+    useTransactionMetadataRequest,
+  );
+  const useRouteMock = jest.mocked(useRoute);
+  const setIsConfirmationSubmittingMock = jest.fn();
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    useRouteMock.mockReturnValue({
+      key: 'mock-route',
+      name: 'MockScreen',
+      params: {},
+    } as never);
+
+    useAlertsMock.mockReturnValue({
+      alerts: [] as Alert[],
+      generalAlerts: [] as Alert[],
+      fieldAlerts: [] as Alert[],
+    } as AlertsContextParams);
+
+    useConfirmationContextMock.mockReturnValue({
+      mmPayRequestInProgressNavHandler: { current: false },
+      headlessBuyError: undefined,
+      isFooterVisible: true,
+      isConfirmationSubmitting: false,
+      isConfirmationSubmittingRef: { current: false },
+      setIsConfirmationSubmitting: setIsConfirmationSubmittingMock,
+      isHeadlessBuyInProgress: false,
+      isTransactionDataUpdating: false,
+      isTransactionValueUpdating: false,
+      setHeadlessBuyError: noop,
+      setIsFooterVisible: noop,
+      setIsHeadlessBuyInProgress: noop,
+      setIsTransactionDataUpdating: noop,
+      setIsTransactionValueUpdating: noop,
+      isMaxDeposit: false,
+      setIsMaxDeposit: noop,
+    } as ReturnType<typeof useConfirmationContext>);
+
+    useConfirmActionsMock.mockReturnValue({
+      onConfirm: jest.fn(),
+      onReject: jest.fn(),
+    });
+
+    useTransactionMetadataRequestMock.mockReturnValue({
+      type: TransactionType.contractInteraction,
+      txParams: { from: '0x123' },
+    } as never);
+  });
+
+  it('renders the confirm button', () => {
+    const { getByTestId } = render({});
+
+    expect(
+      getByTestId(ConfirmationFooterSelectorIDs.CONFIRM_BUTTON),
+    ).toBeOnTheScreen();
+  });
+
+  it('shows the default label during loading even when alertTitle is set', () => {
+    // useTransactionMetadataRequest returns undefined → useButtonLabel returns the default 'done' string
+    const { getByTestId, queryByText } = renderWithProvider(
+      <CustomAmountConfirmButton
+        alertTitle="Test Alert Title"
+        isDisabled={false}
+        stage={CustomAmountStage.Loading}
+      />,
+      {},
+    );
+    const button = getByTestId(ConfirmationFooterSelectorIDs.CONFIRM_BUTTON);
+    expect(button).toBeOnTheScreen();
+    expect(queryByText('Test Alert Title')).toBeNull();
+  });
+
+  it('calls onConfirm and onContinue when pressed (enabled state)', async () => {
+    const onConfirmMock = jest.fn();
+    const onContinueMock = jest.fn();
+
+    useConfirmActionsMock.mockReturnValue({
+      onConfirm: onConfirmMock,
+      onReject: jest.fn(),
+    });
+
+    const { getByTestId } = render({
+      stage: CustomAmountStage.ShowTotals,
+      isDisabled: false,
+      onContinue: onContinueMock,
+    });
+
+    await act(async () => {
+      fireEvent.press(
+        getByTestId(ConfirmationFooterSelectorIDs.CONFIRM_BUTTON),
+      );
+    });
+
+    expect(setIsConfirmationSubmittingMock).toHaveBeenCalledWith(true);
+    expect(onContinueMock).toHaveBeenCalledTimes(1);
+    expect(onConfirmMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('button is disabled when isDisabled is true', () => {
+    const { getByTestId } = render({
+      isDisabled: true,
+      stage: CustomAmountStage.ShowTotals,
+    });
+
+    expect(
+      getByTestId(ConfirmationFooterSelectorIDs.CONFIRM_BUTTON),
+    ).toBeDisabled();
+  });
+
+  it('button is disabled when stage is not ShowTotals', () => {
+    const { getByTestId } = render({
+      isDisabled: false,
+      stage: CustomAmountStage.Loading,
+    });
+
+    expect(
+      getByTestId(ConfirmationFooterSelectorIDs.CONFIRM_BUTTON),
+    ).toBeDisabled();
+  });
+
+  it('button is disabled when hasBlockingAlerts is true', () => {
+    useAlertsMock.mockReturnValue({
+      alerts: [],
+      generalAlerts: [],
+      fieldAlerts: [],
+      hasBlockingAlerts: true,
+    } as unknown as AlertsContextParams);
+
+    const { getByTestId } = render({
+      isDisabled: false,
+      stage: CustomAmountStage.ShowTotals,
+    });
+
+    expect(
+      getByTestId(ConfirmationFooterSelectorIDs.CONFIRM_BUTTON),
+    ).toBeDisabled();
+  });
+});
diff --git a/app/components/Views/confirmations/components/custom-amount/custom-amount-confirm-button/custom-amount-confirm-button.tsx b/app/components/Views/confirmations/components/custom-amount/custom-amount-confirm-button/custom-amount-confirm-button.tsx
new file mode 100644
index 000000000000..d3f207f4b25f
--- /dev/null
+++ b/app/components/Views/confirmations/components/custom-amount/custom-amount-confirm-button/custom-amount-confirm-button.tsx
@@ -0,0 +1,117 @@
+import React, { useCallback } from 'react';
+import {
+  TransactionType,
+  hasTransactionType,
+} from '@metamask/transaction-controller';
+import {
+  Button,
+  ButtonSize,
+  ButtonVariant,
+} from '@metamask/design-system-react-native';
+import { useStyles } from '../../../../../hooks/useStyles';
+import styleSheet from '../../info/custom-amount-info/custom-amount-info.styles';
+import { strings } from '../../../../../../../locales/i18n';
+import { useParams } from '../../../../../../util/navigation/navUtils';
+import {
+  ConfirmationParams,
+  PayWithOption,
+} from '../../confirm/confirm-component';
+import { useTransactionMetadataRequest } from '../../../hooks/transactions/useTransactionMetadataRequest';
+import { useAlerts } from '../../../context/alert-system-context';
+import { useConfirmActions } from '../../../hooks/useConfirmActions';
+import { useConfirmationContext } from '../../../context/confirmation-context';
+import { ConfirmationFooterSelectorIDs } from '../../../ConfirmationView.testIds';
+import { CustomAmountStage } from '../../../hooks/custom-amount/useCustomAmountStage';
+
+export function CustomAmountConfirmButton({
+  alertTitle,
+  isDisabled,
+  onContinue,
+  stage,
+}: Readonly<{
+  alertTitle: string | undefined;
+  isDisabled: boolean;
+  onContinue?: () => void;
+  stage: CustomAmountStage;
+}>) {
+  const { styles } = useStyles(styleSheet, {});
+  const { hasBlockingAlerts } = useAlerts();
+  const { isHeadlessBuyInProgress, setIsConfirmationSubmitting } =
+    useConfirmationContext();
+  const { onConfirm } = useConfirmActions();
+
+  const handleConfirm = useCallback(async () => {
+    setIsConfirmationSubmitting(true);
+    onContinue?.();
+
+    try {
+      await onConfirm();
+    } catch (error) {
+      setIsConfirmationSubmitting(false);
+      throw error;
+    }
+  }, [onConfirm, onContinue, setIsConfirmationSubmitting]);
+
+  const disabled =
+    isDisabled ||
+    stage !== CustomAmountStage.ShowTotals ||
+    hasBlockingAlerts ||
+    isHeadlessBuyInProgress;
+
+  const enabledButtonLabel = useButtonLabel();
+
+  const buttonLabel =
+    stage === CustomAmountStage.Loading
+      ? enabledButtonLabel
+      : (alertTitle ?? enabledButtonLabel);
+
+  return (
+    <Button
+      style={[disabled && styles.disabledButton]}
+      size={ButtonSize.Lg}
+      variant={ButtonVariant.Primary}
+      isFullWidth
+      isDisabled={disabled}
+      isLoading={isHeadlessBuyInProgress}
+      loadingText={strings('confirm.preparing_order')}
+      onPress={handleConfirm}
+      testID={ConfirmationFooterSelectorIDs.CONFIRM_BUTTON}
+    >
+      {buttonLabel}
+    </Button>
+  );
+}
+
+function useButtonLabel() {
+  const transaction = useTransactionMetadataRequest();
+  const { payWithOption } = useParams<ConfirmationParams>({});
+
+  if (hasTransactionType(transaction, [TransactionType.moneyAccountWithdraw])) {
+    return strings('confirm.deposit_edit_amount_money_account_send');
+  }
+
+  if (
+    hasTransactionType(transaction, [
+      TransactionType.predictWithdraw,
+      TransactionType.perpsWithdraw,
+    ])
+  ) {
+    return strings('confirm.deposit_edit_amount_predict_withdraw');
+  }
+
+  if (hasTransactionType(transaction, [TransactionType.musdConversion])) {
+    return strings('earn.musd_conversion.confirm');
+  }
+
+  if (
+    payWithOption === PayWithOption.MoneyAccount &&
+    hasTransactionType(transaction, [
+      TransactionType.perpsDeposit,
+      TransactionType.predictDeposit,
+    ])
+  ) {
+    return strings('confirm.deposit_edit_amount_money_account_send');
+  }
+
+  return strings('confirm.deposit_edit_amount_done');
+}
diff --git a/app/components/Views/confirmations/components/custom-amount/custom-amount-confirm-button/index.ts b/app/components/Views/confirmations/components/custom-amount/custom-amount-confirm-button/index.ts
new file mode 100644
index 000000000000..20ef76460c50
--- /dev/null
+++ b/app/components/Views/confirmations/components/custom-amount/custom-amount-confirm-button/index.ts
@@ -0,0 +1 @@
+export { CustomAmountConfirmButton } from './custom-amount-confirm-button';
diff --git a/app/components/Views/confirmations/components/custom-amount/custom-amount-totals/custom-amount-totals.test.tsx b/app/components/Views/confirmations/components/custom-amount/custom-amount-totals/custom-amount-totals.test.tsx
new file mode 100644
index 000000000000..1e53d0410b12
--- /dev/null
+++ b/app/components/Views/confirmations/components/custom-amount/custom-amount-totals/custom-amount-totals.test.tsx
@@ -0,0 +1,97 @@
+import React from 'react';
+import { merge } from 'lodash';
+import renderWithProvider from '../../../../../../util/test/renderWithProvider';
+import { CustomAmountTotals } from './custom-amount-totals';
+import { CustomAmountStage } from '../../../hooks/custom-amount/useCustomAmountStage';
+import { simpleSendTransactionControllerMock } from '../../../__mocks__/controllers/transaction-controller-mock';
+import { transactionApprovalControllerMock } from '../../../__mocks__/controllers/approval-controller-mock';
+import { otherControllersMock } from '../../../__mocks__/controllers/other-controllers-mock';
+
+jest.mock('../../rows/bridge-fee-row', () => ({
+  BridgeFeeRow: () => null,
+}));
+
+jest.mock('../../rows/bridge-time-row', () => ({
+  BridgeTimeRow: () => null,
+}));
+
+jest.mock('../../rows/total-row', () => {
+  const { View } = jest.requireActual('react-native');
+  return {
+    TotalRow: () => <View testID="total-row" />,
+  };
+});
+
+jest.mock('../../rows/receive-row', () => {
+  const { View } = jest.requireActual('react-native');
+  return {
+    ReceiveRow: () => <View testID="receive-row" />,
+  };
+});
+
+function render(props: {
+  amountFiat?: string;
+  canSelectWithdrawToken?: boolean;
+  stage: CustomAmountStage;
+}) {
+  return renderWithProvider(
+    <CustomAmountTotals
+      amountFiat={props.amountFiat ?? '100'}
+      canSelectWithdrawToken={props.canSelectWithdrawToken ?? false}
+      stage={props.stage}
+    />,
+    {
+      state: merge(
+        {},
+        simpleSendTransactionControllerMock,
+        transactionApprovalControllerMock,
+        otherControllersMock,
+      ),
+    },
+  );
+}
+
+describe('CustomAmountTotals', () => {
+  it('renders loading skeleton when stage is Loading', () => {
+    const { getByTestId } = render({ stage: CustomAmountStage.Loading });
+
+    expect(getByTestId('bridge-fee-row-skeleton')).toBeOnTheScreen();
+    expect(getByTestId('bridge-time-row-skeleton')).toBeOnTheScreen();
+    expect(getByTestId('total-row-skeleton')).toBeOnTheScreen();
+  });
+
+  it('returns null when stage is NoQuote', () => {
+    const { queryByTestId } = render({ stage: CustomAmountStage.NoQuote });
+
+    expect(queryByTestId('bridge-fee-row-skeleton')).toBeNull();
+    expect(queryByTestId('bridge-time-row-skeleton')).toBeNull();
+    expect(queryByTestId('total-row-skeleton')).toBeNull();
+  });
+
+  it('renders without skeletons when stage is ShowTotals', () => {
+    const { queryByTestId } = render({ stage: CustomAmountStage.ShowTotals });
+
+    expect(queryByTestId('bridge-fee-row-skeleton')).toBeNull();
+    expect(queryByTestId('total-row-skeleton')).toBeNull();
+  });
+
+  it('renders ReceiveRow when canSelectWithdrawToken is true and stage is ShowTotals', () => {
+    const { getByTestId, queryByTestId } = render({
+      stage: CustomAmountStage.ShowTotals,
+      canSelectWithdrawToken: true,
+    });
+
+    expect(getByTestId('receive-row')).toBeOnTheScreen();
+    expect(queryByTestId('total-row')).toBeNull();
+  });
+
+  it('renders TotalRow when canSelectWithdrawToken is false and stage is ShowTotals', () => {
+    const { getByTestId, queryByTestId } = render({
+      stage: CustomAmountStage.ShowTotals,
+      canSelectWithdrawToken: false,
+    });
+
+    expect(getByTestId('total-row')).toBeOnTheScreen();
+    expect(queryByTestId('receive-row')).toBeNull();
+  });
+});
diff --git a/app/components/Views/confirmations/components/custom-amount/custom-amount-totals/custom-amount-totals.tsx b/app/components/Views/confirmations/components/custom-amount/custom-amount-totals/custom-amount-totals.tsx
new file mode 100644
index 000000000000..cb195e1b180e
--- /dev/null
+++ b/app/components/Views/confirmations/components/custom-amount/custom-amount-totals/custom-amount-totals.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import { BridgeFeeRow } from '../../rows/bridge-fee-row';
+import { BridgeTimeRow } from '../../rows/bridge-time-row';
+import { TotalRow } from '../../rows/total-row';
+import { ReceiveRow } from '../../rows/receive-row';
+import { InfoRowSkeleton } from '../../UI/info-row/info-row';
+import { CustomAmountStage } from '../../../hooks/custom-amount/useCustomAmountStage';
+
+export function CustomAmountTotals({
+  amountFiat,
+  canSelectWithdrawToken,
+  stage,
+}: Readonly<{
+  amountFiat: string;
+  canSelectWithdrawToken: boolean;
+  stage: CustomAmountStage;
+}>) {
+  if (stage === CustomAmountStage.Loading) {
+    return <CustomAmountTotalsSkeleton />;
+  }
+
+  if (stage === CustomAmountStage.NoQuote) {
+    return null;
+  }
+
+  return (
+    <>
+      <BridgeFeeRow />
+      <BridgeTimeRow />
+      {canSelectWithdrawToken ? (
+        <ReceiveRow inputAmountUsd={amountFiat} />
+      ) : (
+        <TotalRow />
+      )}
+    </>
+  );
+}
+
+function CustomAmountTotalsSkeleton() {
+  return (
+    <>
+      <InfoRowSkeleton testId="bridge-fee-row-skeleton" />
+      <InfoRowSkeleton testId="bridge-time-row-skeleton" />
+      <InfoRowSkeleton testId="total-row-skeleton" />
+    </>
+  );
+}
diff --git a/app/components/Views/confirmations/components/custom-amount/custom-amount-totals/index.ts b/app/components/Views/confirmations/components/custom-amount/custom-amount-totals/index.ts
new file mode 100644
index 000000000000..bb8f447f86b0
--- /dev/null
+++ b/app/components/Views/confirmations/components/custom-amount/custom-amount-totals/index.ts
@@ -0,0 +1 @@
+export { CustomAmountTotals } from './custom-amount-totals';
diff --git a/app/components/Views/confirmations/components/developer/confirmations-developer-options/confirmations-developer-options.test.tsx b/app/components/Views/confirmations/components/developer/confirmations-developer-options/confirmations-developer-options.test.tsx
index bc7ecbd60572..56b2a2b60af8 100644
--- a/app/components/Views/confirmations/components/developer/confirmations-developer-options/confirmations-developer-options.test.tsx
+++ b/app/components/Views/confirmations/components/developer/confirmations-developer-options/confirmations-developer-options.test.tsx
@@ -189,6 +189,7 @@ describe('ConfirmationsDeveloperOptions', () => {
       networkClientId: MOCK_NETWORK_CLIENT_ID,
       disableHook: true,
       disableSequential: true,
+      overwriteUpgrade: true,
       transactions: [
         {
           params: {
diff --git a/app/components/Views/confirmations/components/flat-nav-header/flat-nav-header.styles.ts b/app/components/Views/confirmations/components/flat-nav-header/flat-nav-header.styles.ts
deleted file mode 100644
index 5ba9589b7243..000000000000
--- a/app/components/Views/confirmations/components/flat-nav-header/flat-nav-header.styles.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const styleSheet = () =>
-  StyleSheet.create({
-    container: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      justifyContent: 'center',
-      paddingVertical: 4,
-      marginBottom: 16,
-    },
-    left: {
-      position: 'absolute',
-      left: 0,
-    },
-    title: {
-      textAlign: 'center',
-    },
-  });
-
-export default styleSheet;
diff --git a/app/components/Views/confirmations/components/flat-nav-header/flat-nav-header.test.tsx b/app/components/Views/confirmations/components/flat-nav-header/flat-nav-header.test.tsx
deleted file mode 100644
index 33c633b1da36..000000000000
--- a/app/components/Views/confirmations/components/flat-nav-header/flat-nav-header.test.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import { render, fireEvent } from '@testing-library/react-native';
-
-import { useConfirmActions } from '../../hooks/useConfirmActions';
-import FlatNavHeader from './flat-nav-header';
-
-jest.mock('../../hooks/useConfirmActions', () => ({
-  useConfirmActions: jest.fn(),
-}));
-
-describe('FlatNavHeader', () => {
-  const mockUseConfirmActions = jest.mocked(useConfirmActions);
-  const mockReject = jest.fn();
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockUseConfirmActions.mockReturnValue({
-      onReject: mockReject,
-    } as unknown as ReturnType<typeof useConfirmActions>);
-  });
-
-  it('renders the title correctly', () => {
-    const { getByText } = render(<FlatNavHeader title="Title" />);
-    expect(getByText('Title')).toBeTruthy();
-  });
-
-  it('calls onLeftPress when the button is pressed', () => {
-    const onLeftPressMock = jest.fn();
-    const { getByTestId } = render(
-      <FlatNavHeader title="HeaderText" onLeftPress={onLeftPressMock} />,
-    );
-
-    const button = getByTestId('flat-nav-header-back-button');
-    fireEvent.press(button);
-
-    expect(onLeftPressMock).toHaveBeenCalled();
-  });
-
-  it('calls onReject when the button is pressed and onLeftPress is not provided', () => {
-    const { getByTestId } = render(<FlatNavHeader title="HeaderText" />);
-
-    const button = getByTestId('flat-nav-header-back-button');
-    fireEvent.press(button);
-
-    expect(mockReject).toHaveBeenCalled();
-  });
-});
diff --git a/app/components/Views/confirmations/components/flat-nav-header/flat-nav-header.tsx b/app/components/Views/confirmations/components/flat-nav-header/flat-nav-header.tsx
deleted file mode 100644
index 480d5b13c7b0..000000000000
--- a/app/components/Views/confirmations/components/flat-nav-header/flat-nav-header.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { useCallback } from 'react';
-import { View } from 'react-native';
-
-import ButtonIcon, {
-  ButtonIconSizes,
-} from '../../../../../component-library/components/Buttons/ButtonIcon';
-import { IconName } from '../../../../../component-library/components/Icons/Icon';
-import { useStyles } from '../../../../../component-library/hooks';
-import {
-  default as MorphText,
-  TextVariant,
-} from '../../../../../component-library/components/Texts/Text';
-import { useConfirmActions } from '../../hooks/useConfirmActions';
-import styleSheet from './flat-nav-header.styles';
-
-interface FlatNavHeaderProps {
-  title: string;
-  onLeftPress?: () => void;
-}
-
-const FlatNavHeader = ({ title, onLeftPress }: FlatNavHeaderProps) => {
-  const { onReject } = useConfirmActions();
-  const { styles } = useStyles(styleSheet, {});
-
-  const handleLeftPress = useCallback(() => {
-    if (onLeftPress) {
-      onLeftPress();
-      return;
-    }
-
-    onReject();
-  }, [onLeftPress, onReject]);
-
-  return (
-    <View style={styles.container}>
-      <ButtonIcon
-        iconName={IconName.ArrowLeft}
-        onPress={handleLeftPress}
-        size={ButtonIconSizes.Md}
-        style={styles.left}
-        testID="flat-nav-header-back-button"
-      />
-      <MorphText variant={TextVariant.HeadingMD}>{title}</MorphText>
-    </View>
-  );
-};
-
-export default FlatNavHeader;
diff --git a/app/components/Views/confirmations/components/flat-nav-header/index.tsx b/app/components/Views/confirmations/components/flat-nav-header/index.tsx
deleted file mode 100644
index df6238639d02..000000000000
--- a/app/components/Views/confirmations/components/flat-nav-header/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './flat-nav-header';
diff --git a/app/components/Views/confirmations/components/footer/footer.test.tsx b/app/components/Views/confirmations/components/footer/footer.test.tsx
index 79e4976ba59d..1eed8b602d71 100644
--- a/app/components/Views/confirmations/components/footer/footer.test.tsx
+++ b/app/components/Views/confirmations/components/footer/footer.test.tsx
@@ -29,7 +29,9 @@ import { simpleSendTransactionControllerMock } from '../../__mocks__/controllers
 import { transactionApprovalControllerMock } from '../../__mocks__/controllers/approval-controller-mock';
 import { emptySignatureControllerMock } from '../../__mocks__/controllers/signature-controller-mock';
 import { useIsTransactionPayLoading } from '../../hooks/pay/useTransactionPayData';
+import { useIsTransactionPayAmountStale } from '../../hooks/pay/useIsTransactionPayAmountStale';
 import { useIsGaslessLoading } from '../../hooks/gas/useIsGaslessLoading';
+import { SCAM_QUESTIONNAIRE_FLAG_KEY } from '../../../../product-safety/scam-questionnaire/scam-questionnaire.constants';
 
 const mockConfirmSpy = jest.fn();
 const mockRejectSpy = jest.fn();
@@ -74,6 +76,8 @@ jest.mock('../../hooks/alerts/useSecurityAlertResponse', () => ({
 
 jest.mock('../../hooks/pay/useTransactionPayData');
 
+jest.mock('../../hooks/pay/useIsTransactionPayAmountStale');
+
 jest.mock('../../hooks/ui/useFullScreenConfirmation', () => ({
   useFullScreenConfirmation: jest.fn(() => ({
     isFullScreenConfirmation: true,
@@ -109,6 +113,9 @@ describe('Footer', () => {
   const useIsTransactionPayLoadingMock = jest.mocked(
     useIsTransactionPayLoading,
   );
+  const useIsTransactionPayAmountStaleMock = jest.mocked(
+    useIsTransactionPayAmountStale,
+  );
   const useIsGaslessLoadingMock = jest.mocked(useIsGaslessLoading);
 
   beforeEach(() => {
@@ -144,6 +151,7 @@ describe('Footer', () => {
     });
 
     useIsTransactionPayLoadingMock.mockReturnValue(false);
+    useIsTransactionPayAmountStaleMock.mockReturnValue(false);
     useIsGaslessLoadingMock.mockReturnValue({ isGaslessLoading: false });
   });
 
@@ -303,6 +311,44 @@ describe('Footer', () => {
     ).toBe(true);
   });
 
+  it('disables confirm button when pay amount is stale for an MM Pay transaction', () => {
+    useIsTransactionPayAmountStaleMock.mockReturnValue(true);
+
+    const musdClaimConfirmation = {
+      chainId: '0x1',
+      id: 'musd-claim-id',
+      networkClientId: 'mainnet',
+      origin: 'metamask',
+      txParams: {
+        from: '0x935e73edb9ff52e23bac7f7e043a1ecd06d05477',
+        to: '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174',
+        value: '0x0',
+      },
+      type: TransactionType.musdClaim,
+    } as unknown as TransactionMeta;
+
+    const { getByTestId } = renderWithProvider(<Footer />, {
+      state: getAppStateForConfirmation(musdClaimConfirmation),
+    });
+
+    expect(
+      getByTestId(ConfirmationFooterSelectorIDs.CONFIRM_BUTTON).props
+        .accessibilityState?.disabled,
+    ).toBe(true);
+  });
+
+  it('keeps confirm button enabled when pay amount is stale for a non-MM Pay transaction', () => {
+    useIsTransactionPayAmountStaleMock.mockReturnValue(true);
+
+    const { getByTestId } = renderWithProvider(<Footer />, {
+      state: personalSignatureConfirmationState,
+    });
+
+    expect(
+      getByTestId(ConfirmationFooterSelectorIDs.CONFIRM_BUTTON),
+    ).not.toBeDisabled();
+  });
+
   it('hides footer by default for moneyAccountDeposit transaction type', () => {
     mockUseConfirmationContext.mockReturnValue({
       mmPayRequestInProgressNavHandler: { current: false },
@@ -563,11 +609,24 @@ describe('Footer', () => {
         transactionApprovalControllerMock,
         emptySignatureControllerMock,
         { securityAlerts: { alerts: {} } },
+        {
+          engine: {
+            backgroundState: {
+              RemoteFeatureFlagController: {
+                remoteFeatureFlags: {
+                  [SCAM_QUESTIONNAIRE_FLAG_KEY]: { name: 'treatment' },
+                },
+                cacheTimestamp: 0,
+              },
+            },
+          },
+        },
       );
 
     beforeEach(() => {
       (useAlerts as jest.Mock).mockReturnValue({
         fieldAlerts: [],
+        generalAlerts: [],
         hasDangerAlerts: false,
       });
     });
@@ -634,6 +693,7 @@ describe('Footer', () => {
       const setAlertConfirmed = jest.fn();
       (useAlerts as jest.Mock).mockReturnValue({
         fieldAlerts: [],
+        generalAlerts: [],
         hasDangerAlerts: true,
         hasUnconfirmedDangerAlerts: true,
         setAlertConfirmed,
@@ -653,11 +713,21 @@ describe('Footer', () => {
       });
 
       // Answer all three questions with non-red-flag options → clean pass.
-      fireEvent.press(getByTestId('scam-questionnaire-option-q1_no'));
-      fireEvent.press(getByTestId('scam-questionnaire-continue'));
-      fireEvent.press(getByTestId('scam-questionnaire-option-q2_goods'));
-      fireEvent.press(getByTestId('scam-questionnaire-continue'));
-      fireEvent.press(getByTestId('scam-questionnaire-option-q3_no'));
+      await act(async () => {
+        fireEvent.press(getByTestId('scam-questionnaire-option-q1_no'));
+      });
+      await act(async () => {
+        fireEvent.press(getByTestId('scam-questionnaire-continue'));
+      });
+      await act(async () => {
+        fireEvent.press(getByTestId('scam-questionnaire-option-q2_goods'));
+      });
+      await act(async () => {
+        fireEvent.press(getByTestId('scam-questionnaire-continue'));
+      });
+      await act(async () => {
+        fireEvent.press(getByTestId('scam-questionnaire-option-q3_no'));
+      });
       await act(async () => {
         fireEvent.press(getByTestId('scam-questionnaire-continue'));
       });
@@ -672,6 +742,7 @@ describe('Footer', () => {
     it('skips the danger-alert checkbox modal and submits on the next confirm after the questionnaire is completed', async () => {
       (useAlerts as jest.Mock).mockReturnValue({
         fieldAlerts: [],
+        generalAlerts: [],
         hasDangerAlerts: true,
         hasUnconfirmedDangerAlerts: true,
         setAlertConfirmed: jest.fn(),
@@ -690,11 +761,21 @@ describe('Footer', () => {
         );
       });
 
-      fireEvent.press(getByTestId('scam-questionnaire-option-q1_no'));
-      fireEvent.press(getByTestId('scam-questionnaire-continue'));
-      fireEvent.press(getByTestId('scam-questionnaire-option-q2_goods'));
-      fireEvent.press(getByTestId('scam-questionnaire-continue'));
-      fireEvent.press(getByTestId('scam-questionnaire-option-q3_no'));
+      await act(async () => {
+        fireEvent.press(getByTestId('scam-questionnaire-option-q1_no'));
+      });
+      await act(async () => {
+        fireEvent.press(getByTestId('scam-questionnaire-continue'));
+      });
+      await act(async () => {
+        fireEvent.press(getByTestId('scam-questionnaire-option-q2_goods'));
+      });
+      await act(async () => {
+        fireEvent.press(getByTestId('scam-questionnaire-continue'));
+      });
+      await act(async () => {
+        fireEvent.press(getByTestId('scam-questionnaire-option-q3_no'));
+      });
       await act(async () => {
         fireEvent.press(getByTestId('scam-questionnaire-continue'));
       });
diff --git a/app/components/Views/confirmations/components/footer/footer.tsx b/app/components/Views/confirmations/components/footer/footer.tsx
index 7d4e90709f0e..9b9833c8d494 100644
--- a/app/components/Views/confirmations/components/footer/footer.tsx
+++ b/app/components/Views/confirmations/components/footer/footer.tsx
@@ -6,13 +6,12 @@ import type { AppNavigationProp } from '../../../../../core/NavigationService/ty
 
 import { ConfirmationFooterSelectorIDs } from '../../ConfirmationView.testIds';
 import { strings } from '../../../../../../locales/i18n';
-import BottomSheetFooter from '../../../../../component-library/components/BottomSheets/BottomSheetFooter';
-import { ButtonsAlignment } from '../../../../../component-library/components/BottomSheets/BottomSheetFooter/BottomSheetFooter.types';
 import {
+  BottomSheetFooter,
   ButtonSize,
-  ButtonVariants,
-} from '../../../../../component-library/components/Buttons/Button';
-import { IconName } from '../../../../../component-library/components/Icons/Icon';
+  ButtonsAlignment,
+  IconName,
+} from '@metamask/design-system-react-native';
 import Text, {
   TextVariant,
 } from '../../../../../component-library/components/Texts/Text';
@@ -38,10 +37,12 @@ import {
 } from '@metamask/transaction-controller';
 import {
   MMM_ORIGIN,
+  MM_PAY_TRANSACTION_TYPES,
   TRANSFER_TRANSACTION_TYPES,
 } from '../../constants/confirmations';
 import { PredictClaimFooter } from '../predict-confirmations/predict-claim-footer/predict-claim-footer';
 import { useIsTransactionPayLoading } from '../../hooks/pay/useTransactionPayData';
+import { useIsTransactionPayAmountStale } from '../../hooks/pay/useIsTransactionPayAmountStale';
 import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
 import { useQRHardwareContext } from '../../context/qr-hardware-context';
 import { useIsConfirmationFromQrAccount } from '../../../../../core/HardwareWallet/hooks/useIsConfirmationFromQrAccount';
@@ -78,6 +79,11 @@ export const Footer = () => {
     TRANSFER_TRANSACTION_TYPES.includes(transactionType) &&
     transactionMetadata?.origin === MMM_ORIGIN;
   const isPayLoading = useIsTransactionPayLoading();
+  const isMMPayTransaction = hasTransactionType(
+    transactionMetadata,
+    MM_PAY_TRANSACTION_TYPES,
+  );
+  const isPayAmountStale = useIsTransactionPayAmountStale();
   const { isGaslessLoading } = useIsGaslessLoading();
   const { isFooterVisible: isFooterVisibleFlag, isTransactionValueUpdating } =
     useConfirmationContext();
@@ -183,32 +189,9 @@ export const Footer = () => {
     hasBlockingAlerts ||
     isTransactionValueUpdating ||
     isPayLoading ||
+    (isMMPayTransaction && isPayAmountStale) ||
     isGaslessLoading;
 
-  const buttons = [
-    {
-      variant: ButtonVariants.Secondary,
-      label: strings('confirm.cancel'),
-      size: ButtonSize.Lg,
-      onPress: () =>
-        onReject(providerErrors.userRejectedRequest(), undefined, isMMSendReq),
-      testID: ConfirmationFooterSelectorIDs.CANCEL_BUTTON,
-    },
-    {
-      variant: ButtonVariants.Primary,
-      isDanger:
-        !isPayLoading &&
-        (securityAlertResponse?.result_type === ResultType.Malicious ||
-          hasDangerAlerts),
-      isDisabled: isConfirmDisabled,
-      label: confirmButtonLabel(),
-      size: ButtonSize.Lg,
-      onPress: onSignConfirm,
-      testID: ConfirmationFooterSelectorIDs.CONFIRM_BUTTON,
-      startIconName: getStartIcon(),
-    },
-  ];
-
   const isFooterVisible =
     isFooterVisibleFlag ??
     (!transactionMetadata ||
@@ -238,7 +221,29 @@ export const Footer = () => {
       )}
       <BottomSheetFooter
         buttonsAlignment={ButtonsAlignment.Horizontal}
-        buttonPropsArray={buttons}
+        secondaryButtonProps={{
+          children: strings('confirm.cancel'),
+          size: ButtonSize.Lg,
+          onPress: () =>
+            onReject(
+              providerErrors.userRejectedRequest(),
+              undefined,
+              isMMSendReq,
+            ),
+          testID: ConfirmationFooterSelectorIDs.CANCEL_BUTTON,
+        }}
+        primaryButtonProps={{
+          children: confirmButtonLabel(),
+          size: ButtonSize.Lg,
+          onPress: onSignConfirm,
+          isDisabled: isConfirmDisabled,
+          isDanger:
+            !isPayLoading &&
+            (securityAlertResponse?.result_type === ResultType.Malicious ||
+              hasDangerAlerts),
+          startIconName: getStartIcon(),
+          testID: ConfirmationFooterSelectorIDs.CONFIRM_BUTTON,
+        }}
         style={styles.base}
       />
       {isStakingConfirmationBool && (
diff --git a/app/components/Views/confirmations/components/gas/gas-fee-token-icon/gas-fee-token-icon.test.tsx b/app/components/Views/confirmations/components/gas/gas-fee-token-icon/gas-fee-token-icon.test.tsx
index f5169d4df73a..c8d8cae7e221 100644
--- a/app/components/Views/confirmations/components/gas/gas-fee-token-icon/gas-fee-token-icon.test.tsx
+++ b/app/components/Views/confirmations/components/gas/gas-fee-token-icon/gas-fee-token-icon.test.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { Hex } from '@metamask/utils';
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import useNetworkInfo from '../../../hooks/useNetworkInfo';
 import { NATIVE_TOKEN_ADDRESS } from '../../../constants/tokens';
@@ -8,6 +9,8 @@ import { useTokenWithBalance } from '../../../hooks/tokens/useTokenWithBalance';
 import { useTransactionBatchesMetadata } from '../../../hooks/transactions/useTransactionBatchesMetadata';
 import { merge } from 'lodash';
 import { useTransactionMetadataRequest } from '../../../hooks/transactions/useTransactionMetadataRequest';
+import { getAssetImageUrl } from '../../../../../UI/Bridge/hooks/useAssetMetadata/utils';
+import AvatarToken from '../../../../../../component-library/components/Avatars/Avatar/variants/AvatarToken';
 
 jest.mock('../../../hooks/transactions/useTransactionMetadataRequest');
 jest.mock('../../../hooks/transactions/useTransactionBatchesMetadata');
@@ -18,6 +21,13 @@ jest.mock('../../../hooks/tokens/useTokenWithBalance', () => ({
     .mockReturnValue({ asset: { logo: 'logo.png' } }),
 }));
 jest.mock('../../../hooks/transactions/useTransactionMetadataRequest');
+jest.mock('../../../../../UI/Bridge/hooks/useAssetMetadata/utils', () => ({
+  getAssetImageUrl: jest.fn(),
+}));
+jest.mock(
+  '../../../../../../component-library/components/Avatars/Avatar/variants/AvatarToken',
+  () => jest.fn(() => null),
+);
 
 describe('GasFeeTokenIcon', () => {
   const mockUseNetworkInfo = jest.mocked(useNetworkInfo);
@@ -28,8 +38,11 @@ describe('GasFeeTokenIcon', () => {
   const mockUseTransactionMetadataRequest = jest.mocked(
     useTransactionMetadataRequest,
   );
+  const mockGetAssetImageUrl = jest.mocked(getAssetImageUrl);
+  const mockAvatarToken = jest.mocked(AvatarToken);
 
   beforeEach(() => {
+    jest.clearAllMocks();
     mockUseNetworkInfo.mockReturnValue({
       networkImage: 10,
       networkNativeCurrency: 'ETH',
@@ -41,11 +54,17 @@ describe('GasFeeTokenIcon', () => {
     } as Partial<
       ReturnType<typeof useTransactionMetadataRequest>
     > as ReturnType<typeof useTransactionMetadataRequest>);
-    jest.clearAllMocks();
+    mockUseTokenWithBalance.mockReturnValue({
+      image: 'logo.png',
+      symbol: 'TOKEN',
+    } as ReturnType<typeof useTokenWithBalance>);
+    mockGetAssetImageUrl.mockReturnValue(
+      'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0xtoken.png',
+    );
   });
 
   it('renders the token icon when tokenAddress is not the native', () => {
-    const tokenAddress = '0xTokenAddress';
+    const tokenAddress = '0xTokenAddress' as Hex;
 
     const { getByTestId } = renderWithProvider(
       <GasFeeTokenIcon tokenAddress={tokenAddress} />,
@@ -55,6 +74,37 @@ describe('GasFeeTokenIcon', () => {
     expect(getByTestId('token-icon')).toBeOnTheScreen();
   });
 
+  it('falls back to CDN token image when TokensController image is missing', () => {
+    const tokenAddress = '0xaca92e438df0b2401ff60da7e4337b687a2435da' as Hex;
+    const chainId = '0xe708' as Hex;
+    const cdnImageUrl =
+      'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/59144/erc20/0xaca92e438df0b2401ff60da7e4337b687a2435da.png';
+
+    mockUseTransactionMetadataRequest.mockReturnValue({
+      chainId,
+    } as Partial<
+      ReturnType<typeof useTransactionMetadataRequest>
+    > as ReturnType<typeof useTransactionMetadataRequest>);
+    mockUseTokenWithBalance.mockReturnValue({
+      image: undefined,
+      symbol: 'mUSD',
+    } as unknown as ReturnType<typeof useTokenWithBalance>);
+    mockGetAssetImageUrl.mockReturnValue(cdnImageUrl);
+
+    renderWithProvider(<GasFeeTokenIcon tokenAddress={tokenAddress} />, {
+      state: transferTransactionStateMock,
+    });
+
+    expect(mockGetAssetImageUrl).toHaveBeenCalledWith(tokenAddress, chainId);
+    expect(mockAvatarToken).toHaveBeenCalledWith(
+      expect.objectContaining({
+        imageSource: { uri: cdnImageUrl },
+        name: 'mUSD',
+      }),
+      undefined,
+    );
+  });
+
   it('renders the native token icon when tokenAddress is the native', () => {
     const { getByTestId } = renderWithProvider(
       <GasFeeTokenIcon tokenAddress={NATIVE_TOKEN_ADDRESS} />,
diff --git a/app/components/Views/confirmations/components/gas/gas-fee-token-icon/gas-fee-token-icon.tsx b/app/components/Views/confirmations/components/gas/gas-fee-token-icon/gas-fee-token-icon.tsx
index e74848fae215..11e0d96fe149 100644
--- a/app/components/Views/confirmations/components/gas/gas-fee-token-icon/gas-fee-token-icon.tsx
+++ b/app/components/Views/confirmations/components/gas/gas-fee-token-icon/gas-fee-token-icon.tsx
@@ -17,6 +17,7 @@ import Badge, {
 import NetworkAssetLogo from '../../../../../UI/NetworkAssetLogo';
 import { useTokenWithBalance } from '../../../hooks/tokens/useTokenWithBalance';
 import { useTransactionBatchesMetadata } from '../../../hooks/transactions/useTransactionBatchesMetadata';
+import { getAssetImageUrl } from '../../../../../UI/Bridge/hooks/useAssetMetadata/utils';
 
 export enum GasFeeTokenIconSize {
   Sm = 'sm',
@@ -52,6 +53,8 @@ export function GasFeeTokenIcon({
         <TokenIconWithNetworkBadge
           size={size}
           token={token}
+          tokenAddress={tokenAddress}
+          chainId={chainId as Hex}
           networkName={networkName}
           networkImage={networkImage}
           nativeCurrency={nativeCurrency}
@@ -78,17 +81,25 @@ export function GasFeeTokenIcon({
 function TokenIconWithNetworkBadge({
   size,
   token,
+  tokenAddress,
+  chainId,
   networkName,
   networkImage,
   nativeCurrency,
 }: {
   size: GasFeeTokenIconSize;
   token?: ReturnType<typeof useTokenWithBalance>;
+  tokenAddress: Hex;
+  chainId?: Hex;
   networkName?: string;
   networkImage?: object;
   nativeCurrency?: string;
 }) {
   const { styles } = useStyles(styleSheet, {});
+  const imageUri =
+    token?.image ||
+    (chainId ? getAssetImageUrl(tokenAddress, chainId) : undefined);
+
   return (
     <View>
       <BadgeWrapper
@@ -103,8 +114,8 @@ function TokenIconWithNetworkBadge({
         style={styles.badgeWrapper}
       >
         <AvatarToken
-          imageSource={token ? { uri: token?.image } : networkImage}
-          name={nativeCurrency}
+          imageSource={imageUri ? { uri: imageUri } : networkImage}
+          name={token?.symbol ?? nativeCurrency}
           size={size === GasFeeTokenIconSize.Md ? AvatarSize.Md : AvatarSize.Xs}
         />
       </BadgeWrapper>
diff --git a/app/components/Views/confirmations/components/info-root/info-root.test.tsx b/app/components/Views/confirmations/components/info-root/info-root.test.tsx
index 40f127746b78..45b47fe268af 100644
--- a/app/components/Views/confirmations/components/info-root/info-root.test.tsx
+++ b/app/components/Views/confirmations/components/info-root/info-root.test.tsx
@@ -65,6 +65,13 @@ jest.mock('../../hooks/alerts/useInsufficientBalanceAlert', () => ({
   useInsufficientBalanceAlert: jest.fn().mockReturnValue([]),
 }));
 
+jest.mock(
+  '../../../../../components/UI/Ramp/hooks/useEnsureCompatibleProvider',
+  () => ({
+    useEnsureCompatibleProvider: jest.fn(),
+  }),
+);
+
 jest.mock(
   '../../../../hooks/useNetworkEnablement/useNetworkEnablement',
   () => ({
diff --git a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.test.tsx b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.test.tsx
index 0480e470c3a0..856e2061ea4e 100644
--- a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.test.tsx
+++ b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.test.tsx
@@ -385,6 +385,7 @@ describe('CustomAmountInfo', () => {
       amountHumanDebounced: '0',
       amountFiatDebounced: '0',
       hasInput: true,
+      hasPrefetchedQuote: false,
       isDepositPrefillEnabled: false,
       isDepositPrefilled: false,
       isInputChanged: false,
@@ -543,6 +544,7 @@ describe('CustomAmountInfo', () => {
       amountHumanDebounced: '0',
       amountFiatDebounced: '0',
       hasInput: false,
+      hasPrefetchedQuote: false,
       isDepositPrefillEnabled: false,
       isDepositPrefilled: false,
       isInputChanged: false,
@@ -646,37 +648,6 @@ describe('CustomAmountInfo', () => {
     expect(queryByText(strings('confirm.custom_amount.buy_button'))).toBeNull();
   });
 
-  it('navigates to ramps if buy button pressed', () => {
-    useTransactionPayAvailableTokensMock.mockReturnValue({
-      availableTokens: [],
-      hasTokens: false,
-    });
-
-    useAccountTokensMock.mockReturnValue([
-      {
-        address: TOKEN_ADDRESS_MOCK,
-        assetId: TOKEN_ADDRESS_MOCK,
-        chainId: CHAIN_ID_MOCK,
-      } as AssetType,
-    ]);
-
-    useTransactionPayRequiredTokensMock.mockReturnValue([
-      {
-        address: TOKEN_ADDRESS_MOCK,
-        chainId: CHAIN_ID_MOCK,
-      },
-    ] as TransactionPayRequiredToken[]);
-
-    const { getByText } = render();
-
-    fireEvent.press(getByText(strings('confirm.custom_amount.buy_button')));
-
-    expect(mockGoToBuy).toHaveBeenCalledTimes(1);
-    expect(mockGoToBuy).toHaveBeenCalledWith({
-      assetId: 'eip155:1/erc20:0x123',
-    });
-  });
-
   it.each([TransactionType.predictWithdraw, TransactionType.perpsWithdraw])(
     'renders the withdraw confirm label for %s transactions',
     async (transactionType) => {
@@ -833,7 +804,7 @@ describe('CustomAmountInfo', () => {
       });
     });
 
-    it('keeps the loading review throughout quote loading', async () => {
+    it('unblocks account and payment rows while waiting for quotes', async () => {
       const { deferred } = arrangePendingPreparation();
       const view = render({
         transactionType: TransactionType.moneyAccountDeposit,
@@ -861,45 +832,12 @@ describe('CustomAmountInfo', () => {
       expect(
         view.getByTestId(CustomAmountInfoTestIds.REVIEW_ROWS).props
           .pointerEvents,
-      ).toBe('none');
+      ).toBe('auto');
       expect(
         view.getByTestId('custom-amount-input').props.onPress,
       ).toBeUndefined();
     });
 
-    it('shows the default confirm label, not the alert title, during loading', async () => {
-      const { deferred } = arrangePendingPreparation();
-      const view = render({
-        transactionType: TransactionType.moneyAccountDeposit,
-      });
-      fireEvent.press(view.getByTestId('deposit-keyboard-done-button'));
-
-      setControllerTransactionData({ isLoading: true });
-      useIsTransactionPayLoadingMock.mockReturnValue(true);
-      await act(async () => {
-        deferred.resolve();
-        await deferred.promise;
-      });
-
-      // An alert arrives while already in the loading review.
-      useTransactionCustomAmountAlertsMock.mockReturnValue({
-        alertTitle: 'Test Alert Title',
-        alertMessage: 'Test Alert Message',
-      });
-      view.rerender(
-        createCustomAmountInfo({
-          transactionType: TransactionType.moneyAccountDeposit,
-        }),
-      );
-
-      // The alert title is suppressed on the disabled button while loading; the
-      // default "Done" label shows instead.
-      expect(
-        view.getByText(strings('confirm.deposit_edit_amount_done')),
-      ).toBeOnTheScreen();
-      expect(view.queryByText('Test Alert Title')).not.toBeOnTheScreen();
-    });
-
     it('keeps the loading review until Redux observes controller loading', async () => {
       const { deferred } = arrangePendingPreparation();
       const view = render({
@@ -1068,6 +1006,10 @@ describe('CustomAmountInfo', () => {
       expect(
         view.getByTestId(ConfirmationFooterSelectorIDs.CONFIRM_BUTTON),
       ).toBeDisabled();
+      expect(
+        view.getByTestId(CustomAmountInfoTestIds.REVIEW_ROWS).props
+          .pointerEvents,
+      ).toBe('none');
 
       await act(async () => {
         deferred.resolve();
@@ -1165,6 +1107,11 @@ describe('CustomAmountInfo', () => {
 
       useIsTransactionPayLoadingMock.mockReturnValue(true);
       view.rerender(createCustomAmountInfo());
+      expect(
+        view.getByTestId(CustomAmountInfoTestIds.REVIEW_ROWS).props
+          .pointerEvents,
+      ).toBe('none');
+
       // A fresh, non-empty quote settles the override into the populated review.
       useIsTransactionPayLoadingMock.mockReturnValue(false);
       useTransactionPayQuotesMock.mockReturnValue([{}] as never);
@@ -1195,6 +1142,7 @@ describe('CustomAmountInfo', () => {
       amountHumanDebounced: '0',
       amountFiatDebounced: '0',
       hasInput: true,
+      hasPrefetchedQuote: false,
       isDepositPrefillEnabled: false,
       isDepositPrefilled: false,
       isInputChanged: false,
@@ -1261,6 +1209,7 @@ describe('CustomAmountInfo', () => {
       amountHumanDebounced: '0',
       amountFiatDebounced: '0',
       hasInput: true,
+      hasPrefetchedQuote: false,
       isDepositPrefillEnabled: false,
       isDepositPrefilled: false,
       isInputChanged: false,
@@ -1313,6 +1262,7 @@ describe('CustomAmountInfo', () => {
       amountHumanDebounced: '0',
       amountFiatDebounced: '0',
       hasInput: true,
+      hasPrefetchedQuote: false,
       isDepositPrefillEnabled: false,
       isDepositPrefilled: false,
       isInputChanged: false,
@@ -1353,6 +1303,7 @@ describe('CustomAmountInfo', () => {
       amountHumanDebounced: '0',
       amountFiatDebounced: '0',
       hasInput: true,
+      hasPrefetchedQuote: false,
       isDepositPrefillEnabled: false,
       isDepositPrefilled: false,
       isInputChanged: false,
@@ -1467,6 +1418,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: false,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: false,
         isDepositPrefilled: false,
         isInputChanged: false,
@@ -1604,6 +1556,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: false,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: false,
         isDepositPrefilled: false,
         isInputChanged: false,
@@ -1650,6 +1603,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: false,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: false,
         isDepositPrefilled: false,
         isInputChanged: false,
@@ -1688,6 +1642,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: false,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: false,
         isDepositPrefilled: false,
         isInputChanged: false,
@@ -1743,6 +1698,36 @@ describe('CustomAmountInfo', () => {
       expect(queryByTestId('deposit-keyboard')).toBeOnTheScreen();
       expect(updateTokenAmountMock).not.toHaveBeenCalled();
     });
+
+    it('auto-submits when Max leaves amountFiat unchanged (already at max)', async () => {
+      // amountFiat is already the max (e.g. defaultAmount / prefill) while
+      // percentage buttons are still shown. Max must commit via the Loading
+      // stage transition, not wait for amountFiat to change.
+      useTransactionCustomAmountMock.mockReturnValue({
+        amountFiat: '50',
+        amountHuman: '0.05',
+        amountHumanDebounced: '0',
+        amountFiatDebounced: '0',
+        hasInput: false,
+        hasPrefetchedQuote: false,
+        isDepositPrefillEnabled: false,
+        isDepositPrefilled: false,
+        isInputChanged: false,
+        isPrefillPending: false,
+        isDepositPrefillLoading: false,
+        updatePendingAmount: noop,
+        updatePendingAmountPercentage: updatePendingAmountPercentageMock,
+        updateTokenAmount: updateTokenAmountMock,
+      });
+
+      const { getByText } = render({ hasMax: true });
+
+      await act(async () => {
+        fireEvent.press(getByText('Max'));
+      });
+
+      expect(updateTokenAmountMock).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe('showPaymentDetails', () => {
@@ -2149,6 +2134,7 @@ describe('CustomAmountInfo', () => {
       amountHumanDebounced: '0',
       amountFiatDebounced: '0',
       hasInput: true,
+      hasPrefetchedQuote: false,
       isDepositPrefillEnabled: false,
       isDepositPrefilled: false,
       isInputChanged: false,
@@ -2216,6 +2202,7 @@ describe('CustomAmountInfo', () => {
       amountHumanDebounced: '0',
       amountFiatDebounced: '0',
       hasInput: true,
+      hasPrefetchedQuote: false,
       isDepositPrefillEnabled: true,
       isDepositPrefilled: false,
       isInputChanged: false,
@@ -2231,26 +2218,6 @@ describe('CustomAmountInfo', () => {
     expect(getByTestId('deposit-keyboard')).toBeOnTheScreen();
   });
 
-  it('renders perps buy message when no tokens available for perpsDeposit', () => {
-    useTransactionMetadataRequestMock.mockReturnValue({
-      type: TransactionType.perpsDeposit,
-      txParams: { from: '0x123' },
-    } as never);
-
-    useTransactionPayAvailableTokensMock.mockReturnValue({
-      availableTokens: [],
-      hasTokens: false,
-    });
-
-    const { getByText } = render({
-      transactionType: TransactionType.perpsDeposit,
-    });
-
-    expect(
-      getByText(strings('confirm.custom_amount.buy_perps')),
-    ).toBeOnTheScreen();
-  });
-
   it('renders predict buy message when no tokens available for predictDeposit', () => {
     useTransactionMetadataRequestMock.mockReturnValue({
       type: TransactionType.predictDeposit,
@@ -2316,6 +2283,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: true,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: true,
         isDepositPrefilled: false,
         isInputChanged: false,
@@ -2336,6 +2304,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: true,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: true,
         isDepositPrefilled: false,
         isInputChanged: false,
@@ -2366,6 +2335,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: true,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: true,
         isDepositPrefilled: true,
         isInputChanged: false,
@@ -2393,6 +2363,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: true,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: false,
         isDepositPrefilled: true,
         isInputChanged: false,
@@ -2417,6 +2388,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: true,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: false,
         isDepositPrefilled: true,
         isInputChanged: false,
@@ -2451,6 +2423,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: false,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: true,
         isDepositPrefilled: false,
         isInputChanged: false,
@@ -2518,6 +2491,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: false,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: true,
         isDepositPrefilled: false,
         isInputChanged: false,
@@ -2543,6 +2517,7 @@ describe('CustomAmountInfo', () => {
         amountHumanDebounced: '0',
         amountFiatDebounced: '0',
         hasInput: false,
+        hasPrefetchedQuote: false,
         isDepositPrefillEnabled: true,
         isDepositPrefilled: false,
         isInputChanged: false,
diff --git a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.tsx b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.tsx
index 21fa38a501b8..f3d344f49246 100644
--- a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.tsx
+++ b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.tsx
@@ -5,9 +5,9 @@ import React, {
   useContext,
   useEffect,
   useRef,
+  useState,
 } from 'react';
 import { View } from 'react-native';
-import { toCaipAssetType } from '@metamask/utils';
 import {
   TransactionType,
   hasTransactionType,
@@ -15,10 +15,6 @@ import {
 import { PayTokenAmount, PayTokenAmountSkeleton } from '../../pay-token-amount';
 import { BalanceProjection } from '../../../../../UI/Money/components/BalanceProjection';
 import { PayWithRow, PayWithRowSkeleton } from '../../rows/pay-with-row';
-import { BridgeFeeRow } from '../../rows/bridge-fee-row';
-import { BridgeTimeRow } from '../../rows/bridge-time-row';
-import { TotalRow } from '../../rows/total-row';
-import { ReceiveRow } from '../../rows/receive-row';
 import { PercentageRow } from '../../rows/percentage-row';
 import {
   DepositKeyboard,
@@ -48,9 +44,8 @@ import {
   CustomAmountSkeleton,
 } from '../../transactions/custom-amount';
 import {
-  useIsTransactionPayLoading,
+  useIsTransactionPayQuoteLoading,
   useTransactionPayFiatPayment,
-  useTransactionPayRequiredTokens,
 } from '../../../hooks/pay/useTransactionPayData';
 import { usePayWithMoneyAccountSection } from '../../../hooks/pay/sections/usePayWithMoneyAccountSection';
 import { useTransactionPayMetrics } from '../../../hooks/pay/useTransactionPayMetrics';
@@ -59,34 +54,18 @@ import Text, {
   TextColor,
   TextVariant,
 } from '../../../../../../component-library/components/Texts/Text';
-import { useRampNavigation } from '../../../../../UI/Ramp/hooks/useRampNavigation';
-import { useAccountTokens } from '../../../hooks/send/useAccountTokens';
-import { AlignItems } from '../../../../../UI/Box/box.types';
-import { strings } from '../../../../../../../locales/i18n';
 import { isTransactionPayWithdraw } from '../../../utils/transaction';
 import { useParams } from '../../../../../../util/navigation/navUtils';
-import {
-  ConfirmationParams,
-  PayWithOption,
-} from '../../confirm/confirm-component';
+import { ConfirmationParams } from '../../confirm/confirm-component';
 import { useTransactionMetadataRequest } from '../../../hooks/transactions/useTransactionMetadataRequest';
-import {
-  Button,
-  ButtonSize,
-  ButtonVariant,
-} from '@metamask/design-system-react-native';
-import { useAlerts } from '../../../context/alert-system-context';
 import { useAccountNoFundsAlert } from '../../../hooks/alerts/useAccountNoFundsAlert';
-import { useConfirmActions } from '../../../hooks/useConfirmActions';
 import EngineService from '../../../../../../core/EngineService';
 import Engine from '../../../../../../core/Engine';
 import { getAmountUpdateErrorToastOptions } from '../../../../../../util/confirmation/transactions';
 import { ToastContext } from '../../../../../../component-library/components/Toast';
 import { prefixError } from '../../../../../../util/transactions/error-prefix';
-import { ConfirmationFooterSelectorIDs } from '../../../ConfirmationView.testIds';
 import { useTransactionPayToken } from '../../../hooks/pay/useTransactionPayToken';
 import { useMoneyNoFeeTokens } from '../../../hooks/pay/useMoneyNoFeeTokens';
-import { getNativeTokenAddress } from '@metamask/assets-controllers';
 import PayAccountSelector from '../../PayAccountSelector';
 import { AccountSelectorSkeleton } from '../../AccountSelector';
 import { PerpsAccountPickerRow } from '../../rows/perps-account-picker-row';
@@ -96,8 +75,10 @@ import { CustomAmountInfoTestIds } from './custom-amount-info.testIds';
 import { useConfirmationContext } from '../../../context/confirmation-context';
 import { useFiatFunnelMetricsAdapter } from '../../../../../UI/Ramp/hooks/useFiatFunnelMetricsAdapter';
 import { getMoneyAccountDepositIntent } from '../../../../../UI/Money/hooks/useMoneyAccount';
-import { InfoRowSkeleton } from '../../UI/info-row/info-row';
 import { Skeleton } from '../../../../../../component-library/components-temp/Skeleton';
+import { CustomAmountBuy } from '../../custom-amount/custom-amount-buy';
+import { CustomAmountTotals } from '../../custom-amount/custom-amount-totals';
+import { CustomAmountConfirmButton } from '../../custom-amount/custom-amount-confirm-button';
 
 const AMOUNT_UPDATE_ERROR_PREFIX = 'MetaMask Pay: Amount Update: ';
 
@@ -178,6 +159,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
       amountHuman,
       amountHumanDebounced,
       hasInput,
+      hasPrefetchedQuote,
       isDepositPrefillEnabled,
       isDepositPrefilled,
       isDepositPrefillLoading,
@@ -207,6 +189,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
       amountFiat,
       disablePay,
       hasAccountNoFunds,
+      hasPrefetchedQuote,
       isAddMusdIntent,
       isDepositPrefillEnabled,
       isDepositPrefillLoading,
@@ -216,6 +199,8 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
     // React batches rapid presses before the state update rerenders, so keep a
     // synchronous guard separate from the render state.
     const isAmountUpdateInProgressRef = useRef(false);
+    const [isAmountUpdatePending, setIsAmountUpdatePending] = useState(false);
+    const isQuotesLoading = useIsTransactionPayQuoteLoading();
     useMMPayNavigation(stage, setStage);
     const isFiatAvailable = useIsFiatPaymentAvailable();
     const moneyAccountSection = usePayWithMoneyAccountSection();
@@ -234,12 +219,13 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
 
     const { toastRef } = useContext(ToastContext);
 
-    const { alertMessage, alertTitle } = useTransactionCustomAmountAlerts({
-      isInputChanged,
-      isKeyboardVisible: stage === CustomAmountStage.AmountInput,
-      pendingTokenAmount: amountHumanDebounced,
-      pendingFiatAmount: amountFiatDebounced,
-    });
+    const { alertContent, alertMessage, alertTitle } =
+      useTransactionCustomAmountAlerts({
+        isInputChanged,
+        isKeyboardVisible: stage === CustomAmountStage.AmountInput,
+        pendingTokenAmount: amountHumanDebounced,
+        pendingFiatAmount: amountFiatDebounced,
+      });
 
     const hasAutoSubmittedPrefill = useRef(false);
 
@@ -249,6 +235,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
       }
 
       isAmountUpdateInProgressRef.current = true;
+      setIsAmountUpdatePending(true);
       // Enter the loading stage: keyboard hidden, totals skeletons shown.
       setStage(CustomAmountStage.Loading);
 
@@ -288,6 +275,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
         return;
       } finally {
         isAmountUpdateInProgressRef.current = false;
+        setIsAmountUpdatePending(false);
       }
       EngineService.flushState();
       hasAutoSubmittedPrefill.current = true;
@@ -357,11 +345,18 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
     );
 
     useEffect(() => {
-      if (isMaxAutoSubmitPending.current && amountFiat !== '0') {
+      // Include `stage` so Max still commits when amountFiat is unchanged
+      // (e.g. user already typed the max). Waiting only on amountFiat leaves
+      // isMaxAutoSubmitPending armed and the Loading stage stranded.
+      if (
+        isMaxAutoSubmitPending.current &&
+        stage === CustomAmountStage.Loading &&
+        amountFiat !== '0'
+      ) {
         isMaxAutoSubmitPending.current = false;
         handleDone();
       }
-    }, [amountFiat, handleDone]);
+    }, [amountFiat, handleDone, stage]);
 
     const handleAmountPress = useCallback(() => {
       setStage(CustomAmountStage.AmountInput);
@@ -374,6 +369,13 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
       Boolean(accountOverride) &&
       (hasAccountNoFunds || stage === CustomAmountStage.Loading);
 
+    // Keep payment details fixed while the amount update prepares the request.
+    // Once a Money Account deposit quote is in flight, reopening either picker
+    // is safe and keeps the loading screen responsive.
+    const shouldBlockReviewRows =
+      stage === CustomAmountStage.Loading &&
+      (isAmountUpdatePending || !isMoneyAccountDeposit || !isQuotesLoading);
+
     const { headlessBuyError } = useConfirmationContext();
 
     return (
@@ -416,7 +418,10 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
           style={styles.bottomBlock}
         >
           {stage !== CustomAmountStage.Loading && (
-            <AlertMessage alertMessage={alertMessage ?? headlessBuyError} />
+            <AlertMessage
+              content={alertContent}
+              alertMessage={alertMessage ?? headlessBuyError}
+            />
           )}
           {stage === CustomAmountStage.AmountInput && !isAddMusdIntent && (
             <>
@@ -433,9 +438,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
           )}
           {stage !== CustomAmountStage.AmountInput && (
             <View
-              pointerEvents={
-                stage === CustomAmountStage.Loading ? 'none' : 'auto'
-              }
+              pointerEvents={shouldBlockReviewRows ? 'none' : 'auto'}
               testID={CustomAmountInfoTestIds.REVIEW_ROWS}
             >
               {supportAccountSelection &&
@@ -447,7 +450,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
                 <PayWithRow isResultReady />
               )}
               {!hasAccountNoFunds && (
-                <Quote
+                <CustomAmountTotals
                   amountFiat={amountFiat}
                   canSelectWithdrawToken={canSelectWithdrawToken}
                   stage={stage}
@@ -486,9 +489,9 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
             )}
           {(!hasPaymentOption || hasAccountNoFunds) &&
             !hideBuyForNoFunds &&
-            !isDepositPrefillEnabled && <BuySection />}
+            !isDepositPrefillEnabled && <CustomAmountBuy />}
           {stage !== CustomAmountStage.AmountInput && (
-            <ConfirmButton
+            <CustomAmountConfirmButton
               alertTitle={alertTitle}
               isDisabled={
                 disableConfirm || isAccountSelectionNeeded || isPrefillPending
@@ -590,194 +593,3 @@ export function AdvancedCustomAmountInfoSkeleton() {
     </View>
   );
 }
-
-function BuySection() {
-  const transactionMeta = useTransactionMetadataRequest();
-  const tokens = useAccountTokens({ includeNoBalance: true });
-  const requiredTokens = useTransactionPayRequiredTokens();
-
-  const primaryRequiredToken = requiredTokens.find(
-    (token) => token.address !== getNativeTokenAddress(token.chainId),
-  );
-
-  const asset = tokens.find(
-    (token) =>
-      token.address?.toLowerCase() ===
-        primaryRequiredToken?.address.toLowerCase() &&
-      token.chainId === primaryRequiredToken?.chainId,
-  );
-
-  const assetId = toCaipAssetType(
-    'eip155',
-    Number(primaryRequiredToken?.chainId ?? '0x0').toString(),
-    'erc20',
-    asset?.assetId ?? '0x0',
-  );
-
-  const { goToBuy } = useRampNavigation();
-
-  const handleBuyPress = useCallback(() => {
-    goToBuy({ assetId });
-  }, [assetId, goToBuy]);
-
-  let message: string | undefined;
-
-  if (hasTransactionType(transactionMeta, [TransactionType.perpsDeposit])) {
-    message = strings('confirm.custom_amount.buy_perps');
-  }
-
-  if (hasTransactionType(transactionMeta, [TransactionType.predictDeposit])) {
-    message = strings('confirm.custom_amount.buy_predict');
-  }
-
-  return (
-    <Box alignItems={AlignItems.center} gap={20}>
-      {message && (
-        <Text variant={TextVariant.BodySM} color={TextColor.Error}>
-          {message}
-        </Text>
-      )}
-      <Button
-        variant={ButtonVariant.Primary}
-        onPress={handleBuyPress}
-        isFullWidth
-        size={ButtonSize.Lg}
-      >
-        {strings('confirm.custom_amount.buy_button')}
-      </Button>
-    </Box>
-  );
-}
-
-function Quote({
-  amountFiat,
-  canSelectWithdrawToken,
-  stage,
-}: Readonly<{
-  amountFiat: string;
-  canSelectWithdrawToken: boolean;
-  stage: CustomAmountStage;
-}>) {
-  if (stage === CustomAmountStage.Loading) {
-    return <PaymentDetailsSkeleton />;
-  }
-
-  if (stage === CustomAmountStage.NoQuote) {
-    return null;
-  }
-
-  return (
-    <>
-      <BridgeFeeRow />
-      <BridgeTimeRow />
-      {canSelectWithdrawToken ? (
-        <ReceiveRow inputAmountUsd={amountFiat} />
-      ) : (
-        <TotalRow />
-      )}
-    </>
-  );
-}
-
-function PaymentDetailsSkeleton() {
-  return (
-    <>
-      <InfoRowSkeleton testId="bridge-fee-row-skeleton" />
-      <InfoRowSkeleton testId="bridge-time-row-skeleton" />
-      <InfoRowSkeleton testId="total-row-skeleton" />
-    </>
-  );
-}
-
-function ConfirmButton({
-  alertTitle,
-  isDisabled,
-  onContinue,
-  stage,
-}: Readonly<{
-  alertTitle: string | undefined;
-  isDisabled: boolean;
-  onContinue?: () => void;
-  stage: CustomAmountStage;
-}>) {
-  const { styles } = useStyles(styleSheet, {});
-  const { hasBlockingAlerts } = useAlerts();
-  const { isHeadlessBuyInProgress, setIsConfirmationSubmitting } =
-    useConfirmationContext();
-  const { onConfirm } = useConfirmActions();
-
-  const handleConfirm = useCallback(async () => {
-    setIsConfirmationSubmitting(true);
-    onContinue?.();
-
-    try {
-      await onConfirm();
-    } catch (error) {
-      setIsConfirmationSubmitting(false);
-      throw error;
-    }
-  }, [onConfirm, onContinue, setIsConfirmationSubmitting]);
-
-  const disabled =
-    isDisabled ||
-    stage !== CustomAmountStage.ShowTotals ||
-    hasBlockingAlerts ||
-    isHeadlessBuyInProgress;
-
-  const enabledButtonLabel = useButtonLabel();
-
-  const buttonLabel =
-    stage === CustomAmountStage.Loading
-      ? enabledButtonLabel
-      : (alertTitle ?? enabledButtonLabel);
-
-  return (
-    <Button
-      style={[disabled && styles.disabledButton]}
-      size={ButtonSize.Lg}
-      variant={ButtonVariant.Primary}
-      isFullWidth
-      isDisabled={disabled}
-      isLoading={isHeadlessBuyInProgress}
-      loadingText={strings('confirm.preparing_order')}
-      onPress={handleConfirm}
-      testID={ConfirmationFooterSelectorIDs.CONFIRM_BUTTON}
-    >
-      {buttonLabel}
-    </Button>
-  );
-}
-
-function useButtonLabel() {
-  const transaction = useTransactionMetadataRequest();
-  const { payWithOption } = useParams<ConfirmationParams>({});
-
-  if (hasTransactionType(transaction, [TransactionType.moneyAccountWithdraw])) {
-    return strings('confirm.deposit_edit_amount_money_account_send');
-  }
-
-  if (
-    hasTransactionType(transaction, [
-      TransactionType.predictWithdraw,
-      TransactionType.perpsWithdraw,
-    ])
-  ) {
-    return strings('confirm.deposit_edit_amount_predict_withdraw');
-  }
-
-  if (hasTransactionType(transaction, [TransactionType.musdConversion])) {
-    return strings('earn.musd_conversion.confirm');
-  }
-
-  if (
-    payWithOption === PayWithOption.MoneyAccount &&
-    hasTransactionType(transaction, [
-      TransactionType.perpsDeposit,
-      TransactionType.predictDeposit,
-    ])
-  ) {
-    return strings('confirm.deposit_edit_amount_money_account_send');
-  }
-
-  return strings('confirm.deposit_edit_amount_done');
-}
diff --git a/app/components/Views/confirmations/components/info/money-account-deposit-info/money-account-deposit-info.test.tsx b/app/components/Views/confirmations/components/info/money-account-deposit-info/money-account-deposit-info.test.tsx
index 52275ec8fd94..821581fdf36f 100644
--- a/app/components/Views/confirmations/components/info/money-account-deposit-info/money-account-deposit-info.test.tsx
+++ b/app/components/Views/confirmations/components/info/money-account-deposit-info/money-account-deposit-info.test.tsx
@@ -36,6 +36,10 @@ jest.mock('../../../../../../../locales/i18n', () => ({
     ({ 'confirm.title.money_account_add_money': 'Add funds' })[key] ?? key,
 }));
 
+jest.mock('../../../../../UI/Ramp/hooks/useEnsureCompatibleProvider', () => ({
+  useEnsureCompatibleProvider: jest.fn(),
+}));
+
 describe('MoneyAccountDepositInfo', () => {
   beforeEach(() => {
     jest.clearAllMocks();
diff --git a/app/components/Views/confirmations/components/info/money-account-deposit-info/money-account-deposit-info.tsx b/app/components/Views/confirmations/components/info/money-account-deposit-info/money-account-deposit-info.tsx
index 08f6b45a42c7..e8496af12021 100644
--- a/app/components/Views/confirmations/components/info/money-account-deposit-info/money-account-deposit-info.tsx
+++ b/app/components/Views/confirmations/components/info/money-account-deposit-info/money-account-deposit-info.tsx
@@ -1,14 +1,18 @@
 import React from 'react';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { CustomAmountInfo } from '../custom-amount-info';
 import { strings } from '../../../../../../../locales/i18n';
 import useNavbar from '../../../hooks/ui/useNavbar';
 import { useParams } from '../../../../../../util/navigation/navUtils';
 import { ConfirmationParams } from '../../confirm/confirm-component';
+import { MUSD_TOKEN_ASSET_ID_BY_CHAIN } from '../../../../../UI/Earn/constants/musd';
+import { useEnsureCompatibleProvider } from '../../../../../UI/Ramp/hooks/useEnsureCompatibleProvider';
 
 export const MONEY_ACCOUNT_CURRENCY = 'usd';
 
 export function MoneyAccountDepositInfo() {
   useNavbar(strings('confirm.title.money_account_add_money'), true);
+  useEnsureCompatibleProvider(MUSD_TOKEN_ASSET_ID_BY_CHAIN[CHAIN_IDS.MONAD]);
   const { preferredPaymentToken } = useParams<ConfirmationParams>({});
 
   const params = useParams<ConfirmationParams>();
@@ -21,6 +25,7 @@ export function MoneyAccountDepositInfo() {
       hideAccountSelector={autoFiat}
       supportAccountSelection
       preferredToken={preferredPaymentToken}
+      hasMax
     />
   );
 }
diff --git a/app/components/Views/confirmations/components/info/musd-max-conversion-info/musd-max-conversion-info.test.tsx b/app/components/Views/confirmations/components/info/musd-max-conversion-info/musd-max-conversion-info.test.tsx
index ac2fcc98f243..4817e1ec51db 100644
--- a/app/components/Views/confirmations/components/info/musd-max-conversion-info/musd-max-conversion-info.test.tsx
+++ b/app/components/Views/confirmations/components/info/musd-max-conversion-info/musd-max-conversion-info.test.tsx
@@ -9,6 +9,7 @@ import {
 import { AssetType } from '../../../types/token';
 import { useTransactionMetadataRequest } from '../../../hooks/transactions/useTransactionMetadataRequest';
 import { useIsTransactionPayLoading } from '../../../hooks/pay/useTransactionPayData';
+import { useIsTransactionPayAmountStale } from '../../../hooks/pay/useIsTransactionPayAmountStale';
 import { useConfirmActions } from '../../../hooks/useConfirmActions';
 import { useAlerts } from '../../../context/alert-system-context';
 import useFiatFormatter from '../../../../../UI/SimulationDetails/FiatDisplay/useFiatFormatter';
@@ -51,6 +52,13 @@ jest.mock('../../../hooks/transactions/useTransactionMetadataRequest', () => ({
 
 jest.mock('../../../hooks/pay/useTransactionPayData', () => ({
   useIsTransactionPayLoading: jest.fn(),
+  useTransactionPayIsMaxAmount: jest.fn(() => false),
+  useTransactionPayIsPostQuote: jest.fn(() => false),
+  useTransactionPayRequiredTokens: jest.fn(() => []),
+}));
+
+jest.mock('../../../hooks/pay/useIsTransactionPayAmountStale', () => ({
+  useIsTransactionPayAmountStale: jest.fn(),
 }));
 
 jest.mock('../../../hooks/useConfirmActions', () => ({
@@ -93,6 +101,9 @@ const mockUseTransactionMetadataRequest = jest.mocked(
   useTransactionMetadataRequest,
 );
 const mockUseIsTransactionPayLoading = jest.mocked(useIsTransactionPayLoading);
+const mockUseIsTransactionPayAmountStale = jest.mocked(
+  useIsTransactionPayAmountStale,
+);
 const mockUseConfirmActions = jest.mocked(useConfirmActions);
 const mockUseAlerts = jest.mocked(useAlerts);
 const mockUseFiatFormatter = jest.mocked(useFiatFormatter);
@@ -103,6 +114,7 @@ function setupMocksForSuccessPath() {
     chainId: '0x1',
   } as unknown as ReturnType<typeof useTransactionMetadataRequest>);
   mockUseIsTransactionPayLoading.mockReturnValue(false);
+  mockUseIsTransactionPayAmountStale.mockReturnValue(false);
   mockUseConfirmActions.mockReturnValue({
     onConfirm: jest.fn(),
     onReject: jest.fn(),
@@ -235,6 +247,17 @@ describe('MusdMaxConversionInfo', () => {
       expect(confirmButton).toBeDisabled();
     });
 
+    it('disables confirm button when pay amount is stale', () => {
+      mockUseIsTransactionPayAmountStale.mockReturnValue(true);
+
+      renderWithProvider(<MusdMaxConversionInfo />, { state: {} });
+
+      const confirmButton = screen.getByTestId(
+        MusdMaxConversionInfoTestIds.CONFIRM_BUTTON,
+      );
+      expect(confirmButton).toBeDisabled();
+    });
+
     it('disables confirm button when alerts contain isBlocking entry', () => {
       mockUseAlerts.mockReturnValue({
         alerts: [
diff --git a/app/components/Views/confirmations/components/info/musd-max-conversion-info/musd-max-conversion-info.tsx b/app/components/Views/confirmations/components/info/musd-max-conversion-info/musd-max-conversion-info.tsx
index 636e48d22c03..5f6fae64b4a2 100644
--- a/app/components/Views/confirmations/components/info/musd-max-conversion-info/musd-max-conversion-info.tsx
+++ b/app/components/Views/confirmations/components/info/musd-max-conversion-info/musd-max-conversion-info.tsx
@@ -10,6 +10,7 @@ import {
 } from '@metamask/design-system-react-native';
 import { useTransactionMetadataRequest } from '../../../hooks/transactions/useTransactionMetadataRequest';
 import { useIsTransactionPayLoading } from '../../../hooks/pay/useTransactionPayData';
+import { useIsTransactionPayAmountStale } from '../../../hooks/pay/useIsTransactionPayAmountStale';
 import { useConfirmActions } from '../../../hooks/useConfirmActions';
 import { useAlerts } from '../../../context/alert-system-context';
 import { TotalRow } from '../../rows/total-row';
@@ -48,6 +49,7 @@ export const MusdMaxConversionInfo = () => {
 
   const transactionMetadata = useTransactionMetadataRequest();
   const isQuoteLoading = useIsTransactionPayLoading();
+  const isPayAmountStale = useIsTransactionPayAmountStale();
 
   const { onConfirm } = useConfirmActions();
   const { alerts } = useAlerts();
@@ -60,7 +62,8 @@ export const MusdMaxConversionInfo = () => {
 
   const isLoading = !transactionMetadata || isQuoteLoading;
 
-  const isConfirmDisabled = isLoading || Boolean(blockingAlert);
+  const isConfirmDisabled =
+    isLoading || isPayAmountStale || Boolean(blockingAlert);
 
   const buttonLabel = useMemo(
     () => blockingAlert?.title ?? strings('earn.musd_conversion.convert'),
diff --git a/app/components/Views/confirmations/components/info/predict-withdraw-info/predict-withdraw-info.test.tsx b/app/components/Views/confirmations/components/info/predict-withdraw-info/predict-withdraw-info.test.tsx
index e653c8570f04..f0c063dac2b2 100644
--- a/app/components/Views/confirmations/components/info/predict-withdraw-info/predict-withdraw-info.test.tsx
+++ b/app/components/Views/confirmations/components/info/predict-withdraw-info/predict-withdraw-info.test.tsx
@@ -31,11 +31,11 @@ describe('PredictWithdrawInfo', () => {
     });
   });
 
-  it('does not pass hasMax to CustomAmountInfo', () => {
+  it('passes hasMax to CustomAmountInfo', () => {
     render(<PredictWithdrawInfo />);
 
     expect(CustomAmountInfoMock).toHaveBeenCalledWith(
-      expect.not.objectContaining({ hasMax: true }),
+      expect.objectContaining({ hasMax: true }),
       undefined,
     );
   });
diff --git a/app/components/Views/confirmations/components/info/predict-withdraw-info/predict-withdraw-info.tsx b/app/components/Views/confirmations/components/info/predict-withdraw-info/predict-withdraw-info.tsx
index 4b152cf10f8f..109ee0db3940 100644
--- a/app/components/Views/confirmations/components/info/predict-withdraw-info/predict-withdraw-info.tsx
+++ b/app/components/Views/confirmations/components/info/predict-withdraw-info/predict-withdraw-info.tsx
@@ -27,6 +27,7 @@ export function PredictWithdrawInfo() {
     <CustomAmountInfo
       currency={PREDICT_CURRENCY}
       disablePay={!canSelectWithdrawToken}
+      hasMax
     >
       <PredictWithdrawBalance />
     </CustomAmountInfo>
diff --git a/app/components/Views/confirmations/components/modals/alert-modal/alert-modal.test.tsx b/app/components/Views/confirmations/components/modals/alert-modal/alert-modal.test.tsx
index 649595f33d0e..5ce9b753857d 100644
--- a/app/components/Views/confirmations/components/modals/alert-modal/alert-modal.test.tsx
+++ b/app/components/Views/confirmations/components/modals/alert-modal/alert-modal.test.tsx
@@ -6,6 +6,7 @@ import { IconName } from '../../../../../../component-library/components/Icons/I
 import Text from '../../../../../../component-library/components/Texts/Text';
 import { Severity } from '../../../types/alerts';
 import { useConfirmationAlertMetrics } from '../../../hooks/metrics/useConfirmationAlertMetrics';
+import { AlertModalSelectorsIDs } from '../../../ConfirmationView.testIds';
 
 jest.mock('../../../context/alert-system-context', () => ({
   useAlerts: jest.fn(),
@@ -108,7 +109,7 @@ describe('AlertModal', () => {
 
     const { getByTestId } = render(<AlertModal />);
 
-    const checkbox = getByTestId('alert-modal-checkbox');
+    const checkbox = getByTestId(AlertModalSelectorsIDs.ALERT_MODAL_CHECKBOX);
 
     await act(async () => {
       fireEvent.press(checkbox);
@@ -131,11 +132,12 @@ describe('AlertModal', () => {
       ],
     });
 
-    const { getByText } = render(<AlertModal />);
-    const actionButton1 = getByText('Action 1');
+    const { getByTestId } = render(<AlertModal />);
 
     await act(async () => {
-      fireEvent.press(actionButton1);
+      fireEvent.press(
+        getByTestId(AlertModalSelectorsIDs.ALERT_MODAL_ACTION_BUTTON),
+      );
     });
     expect(action1Callback).toHaveBeenCalled();
     expect(hideAlertModal).toHaveBeenCalled();
@@ -147,9 +149,11 @@ describe('AlertModal', () => {
       ...baseMockUseAlerts,
       hideAlertModal,
     });
-    const { getByText } = render(<AlertModal />);
+    const { getByTestId } = render(<AlertModal />);
     await act(async () => {
-      fireEvent.press(getByText('Got it'));
+      fireEvent.press(
+        getByTestId(AlertModalSelectorsIDs.ALERT_MODAL_ACKNOWLEDGE_BUTTON),
+      );
     });
     expect(hideAlertModal).toHaveBeenCalledTimes(1);
   });
@@ -159,11 +163,14 @@ describe('AlertModal', () => {
       ...baseMockUseAlerts,
       alertKey: 'alert1', // Warning severity
     });
-    const { queryByTestId, queryByText } = render(<AlertModal />);
-
-    expect(queryByTestId('alert-modal-close-button')).toBeNull();
-    expect(queryByText('Close')).toBeNull();
-    expect(queryByText('Got it')).toBeOnTheScreen();
+    const { queryByTestId } = render(<AlertModal />);
+
+    expect(
+      queryByTestId(AlertModalSelectorsIDs.ALERT_MODAL_CLOSE_BUTTON),
+    ).toBeNull();
+    expect(
+      queryByTestId(AlertModalSelectorsIDs.ALERT_MODAL_ACKNOWLEDGE_BUTTON),
+    ).toBeOnTheScreen();
   });
 
   it('renders Acknowledge and Close buttons for Danger severity alerts', () => {
@@ -171,12 +178,14 @@ describe('AlertModal', () => {
       ...baseMockUseAlerts,
       alertKey: 'alert2',
     });
-    const { getByText, getByTestId } = render(<AlertModal />);
+    const { getByTestId } = render(<AlertModal />);
 
-    expect(getByText('Acknowledge')).toBeOnTheScreen();
-    expect(getByText('Close')).toBeOnTheScreen();
-    expect(getByTestId('alert-modal-acknowledge-button')).toBeOnTheScreen();
-    expect(getByTestId('alert-modal-close-button')).toBeOnTheScreen();
+    expect(
+      getByTestId(AlertModalSelectorsIDs.ALERT_MODAL_ACKNOWLEDGE_BUTTON),
+    ).toBeOnTheScreen();
+    expect(
+      getByTestId(AlertModalSelectorsIDs.ALERT_MODAL_CLOSE_BUTTON),
+    ).toBeOnTheScreen();
   });
 
   it('disables Acknowledge button when checkbox is not checked for Danger alerts', () => {
@@ -187,7 +196,9 @@ describe('AlertModal', () => {
     });
     const { getByTestId } = render(<AlertModal />);
 
-    const acknowledgeButton = getByTestId('alert-modal-acknowledge-button');
+    const acknowledgeButton = getByTestId(
+      AlertModalSelectorsIDs.ALERT_MODAL_ACKNOWLEDGE_BUTTON,
+    );
     expect(acknowledgeButton).toBeDisabled();
   });
 
@@ -199,7 +210,9 @@ describe('AlertModal', () => {
     });
     const { getByTestId } = render(<AlertModal />);
 
-    const acknowledgeButton = getByTestId('alert-modal-acknowledge-button');
+    const acknowledgeButton = getByTestId(
+      AlertModalSelectorsIDs.ALERT_MODAL_ACKNOWLEDGE_BUTTON,
+    );
     expect(acknowledgeButton).not.toBeDisabled();
   });
 
@@ -213,7 +226,9 @@ describe('AlertModal', () => {
     const { getByTestId } = render(<AlertModal />);
 
     await act(async () => {
-      fireEvent.press(getByTestId('alert-modal-close-button'));
+      fireEvent.press(
+        getByTestId(AlertModalSelectorsIDs.ALERT_MODAL_CLOSE_BUTTON),
+      );
     });
     expect(hideAlertModal).toHaveBeenCalledTimes(1);
   });
@@ -231,7 +246,9 @@ describe('AlertModal', () => {
     });
     const { getByTestId } = render(<AlertModal />);
 
-    const acknowledgeButton = getByTestId('alert-modal-acknowledge-button');
+    const acknowledgeButton = getByTestId(
+      AlertModalSelectorsIDs.ALERT_MODAL_ACKNOWLEDGE_BUTTON,
+    );
     expect(acknowledgeButton).toBeDisabled();
   });
 
@@ -249,7 +266,9 @@ describe('AlertModal', () => {
     );
 
     await act(async () => {
-      fireEvent.press(getByTestId('alert-modal-close-button'));
+      fireEvent.press(
+        getByTestId(AlertModalSelectorsIDs.ALERT_MODAL_CLOSE_BUTTON),
+      );
     });
 
     expect(onAcknowledgeClick).not.toHaveBeenCalled();
@@ -271,8 +290,11 @@ describe('AlertModal', () => {
       ...baseMockUseAlerts,
       alertKey: 'alert1',
     });
-    const { queryByText } = render(<AlertModal />);
+    const { queryByText, queryByTestId } = render(<AlertModal />);
     expect(queryByText(CHECKBOX_LABEL)).toBeNull();
+    expect(
+      queryByTestId(AlertModalSelectorsIDs.ALERT_MODAL_CHECKBOX),
+    ).toBeNull();
   });
 
   it('renders checkbox if the severity is Danger', () => {
@@ -280,8 +302,11 @@ describe('AlertModal', () => {
       ...baseMockUseAlerts,
       alertKey: 'alert2',
     });
-    const { queryByText } = render(<AlertModal />);
+    const { queryByText, getByTestId } = render(<AlertModal />);
     expect(queryByText(CHECKBOX_LABEL)).toBeDefined();
+    expect(
+      getByTestId(AlertModalSelectorsIDs.ALERT_MODAL_CHECKBOX),
+    ).toBeDefined();
   });
 
   it('renders content component correctly', () => {
@@ -322,8 +347,11 @@ describe('AlertModal', () => {
         },
       ],
     });
-    const { queryByText } = render(<AlertModal />);
+    const { queryByText, queryByTestId } = render(<AlertModal />);
     expect(queryByText(CHECKBOX_LABEL)).toBeNull();
+    expect(
+      queryByTestId(AlertModalSelectorsIDs.ALERT_MODAL_CHECKBOX),
+    ).toBeNull();
   });
 
   it('renders header accessory when provided', () => {
@@ -340,7 +368,9 @@ describe('AlertModal', () => {
       <AlertModal onAcknowledgeClick={onAcknowledgeClick} />,
     );
     await act(async () => {
-      fireEvent.press(getByTestId('alert-modal-acknowledge-button'));
+      fireEvent.press(
+        getByTestId(AlertModalSelectorsIDs.ALERT_MODAL_ACKNOWLEDGE_BUTTON),
+      );
     });
     expect(onAcknowledgeClick).toHaveBeenCalled();
   });
diff --git a/app/components/Views/confirmations/components/modals/alert-modal/alert-modal.tsx b/app/components/Views/confirmations/components/modals/alert-modal/alert-modal.tsx
index aec9c944c6b8..bb7f558962b2 100755
--- a/app/components/Views/confirmations/components/modals/alert-modal/alert-modal.tsx
+++ b/app/components/Views/confirmations/components/modals/alert-modal/alert-modal.tsx
@@ -1,11 +1,11 @@
 import React, { useCallback, useEffect } from 'react';
 import { TouchableOpacity, View, ViewStyle } from 'react-native';
-import BottomModal from '../../../components/UI/bottom-modal';
-import Button, {
+import {
+  Button,
   ButtonSize,
-  ButtonVariants,
-  ButtonWidthTypes,
-} from '../../../../../../component-library/components/Buttons/Button';
+  ButtonVariant,
+} from '@metamask/design-system-react-native';
+import BottomModal from '../../../components/UI/bottom-modal';
 import Checkbox from '../../../../../../component-library/components/Checkbox';
 import Icon, {
   IconName,
@@ -21,6 +21,7 @@ import { useAlerts } from '../../../context/alert-system-context';
 import { useConfirmationAlertMetrics } from '../../../hooks/metrics/useConfirmationAlertMetrics';
 import { useStyles } from '../../../../../hooks/useStyles';
 import { useTheme } from '../../../../../../util/theme';
+import { AlertModalSelectorsIDs } from '../../../ConfirmationView.testIds';
 import styleSheet from './alert-modal.styles';
 
 interface HeaderProps {
@@ -125,7 +126,7 @@ const AlertCheckbox: React.FC<CheckboxProps> = ({
       <Checkbox
         onPress={() => onCheckboxClick(isConfirmed)}
         isChecked={isConfirmed}
-        testID="alert-modal-checkbox"
+        testID={AlertModalSelectorsIDs.ALERT_MODAL_CHECKBOX}
       />
       <Text style={styles.checkboxText}>
         {strings('alert_system.confirm_modal.checkbox_label')}
@@ -170,37 +171,41 @@ const Buttons: React.FC<ButtonsProps> = ({
         <>
           <Button
             onPress={onClose}
-            label={strings('alert_system.alert_modal.close_btn')}
             style={styles.footerButton}
             size={ButtonSize.Lg}
-            variant={ButtonVariants.Secondary}
-            width={ButtonWidthTypes.Full}
-            testID="alert-modal-close-button"
-          />
+            variant={ButtonVariant.Secondary}
+            isFullWidth
+            testID={AlertModalSelectorsIDs.ALERT_MODAL_CLOSE_BUTTON}
+          >
+            {strings('alert_system.alert_modal.close_btn')}
+          </Button>
           <View style={styles.buttonDivider} />
         </>
       )}
       <Button
         onPress={onAcknowledge}
-        label={primaryButtonLabel}
         style={styles.footerButton}
         size={ButtonSize.Lg}
-        variant={action ? ButtonVariants.Secondary : ButtonVariants.Primary}
-        width={ButtonWidthTypes.Full}
+        variant={action ? ButtonVariant.Secondary : ButtonVariant.Primary}
+        isFullWidth
         isDisabled={isButtonDisabled}
-        testID="alert-modal-acknowledge-button"
-      />
+        testID={AlertModalSelectorsIDs.ALERT_MODAL_ACKNOWLEDGE_BUTTON}
+      >
+        {primaryButtonLabel}
+      </Button>
       {action ? (
         <>
           <View style={styles.buttonDivider} />
           <Button
             onPress={() => onHandleActionClick(action.callback)}
-            label={action.label}
             style={styles.footerButton}
             size={ButtonSize.Lg}
-            variant={ButtonVariants.Primary}
-            width={ButtonWidthTypes.Full}
-          />
+            variant={ButtonVariant.Primary}
+            isFullWidth
+            testID={AlertModalSelectorsIDs.ALERT_MODAL_ACTION_BUTTON}
+          >
+            {action.label}
+          </Button>
         </>
       ) : null}
     </View>
diff --git a/app/components/Views/confirmations/components/modals/cancel-speedup-modal/cancel-speedup-modal.test.tsx b/app/components/Views/confirmations/components/modals/cancel-speedup-modal/cancel-speedup-modal.test.tsx
index ffe54795470b..53c3c5c9037c 100644
--- a/app/components/Views/confirmations/components/modals/cancel-speedup-modal/cancel-speedup-modal.test.tsx
+++ b/app/components/Views/confirmations/components/modals/cancel-speedup-modal/cancel-speedup-modal.test.tsx
@@ -27,35 +27,6 @@ jest.mock('../../../../../UI/NetworkAssetLogo', () => ({
   },
 }));
 
-jest.mock(
-  '../../../../../../component-library/components/BottomSheets/BottomSheet',
-  () => {
-    const RN = jest.requireActual<typeof import('react')>('react');
-    return {
-      __esModule: true,
-      default: RN.forwardRef(
-        (
-          props: { children: React.ReactNode },
-          ref: React.Ref<{
-            onCloseBottomSheet: (cb?: () => void) => void;
-            onOpenBottomSheet: (cb?: () => void) => void;
-          }>,
-        ) => {
-          RN.useImperativeHandle(ref, () => ({
-            onCloseBottomSheet: (callback?: () => void | Promise<void>) => {
-              Promise.resolve(callback?.()).catch(() => {
-                // Ignore errors from callback
-              });
-            },
-            onOpenBottomSheet: () => undefined,
-          }));
-          return RN.createElement(RN.Fragment, null, props.children);
-        },
-      ),
-    };
-  },
-);
-
 const defaultGasValues = {
   paramsForController: {
     maxFeePerGas: '0x1',
diff --git a/app/components/Views/confirmations/components/modals/cancel-speedup-modal/cancel-speedup-modal.tsx b/app/components/Views/confirmations/components/modals/cancel-speedup-modal/cancel-speedup-modal.tsx
index 7c4027d57fc1..24b01fba4033 100644
--- a/app/components/Views/confirmations/components/modals/cancel-speedup-modal/cancel-speedup-modal.tsx
+++ b/app/components/Views/confirmations/components/modals/cancel-speedup-modal/cancel-speedup-modal.tsx
@@ -11,17 +11,13 @@ import { Hex } from '@metamask/utils';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { strings } from '../../../../../../../locales/i18n';
 import { useTheme } from '../../../../../../util/theme';
-import BottomSheet, {
-  BottomSheetRef,
-} from '../../../../../../component-library/components/BottomSheets/BottomSheet';
-import BottomSheetFooter from '../../../../../../component-library/components/BottomSheets/BottomSheetFooter';
-import { ButtonsAlignment } from '../../../../../../component-library/components/BottomSheets/BottomSheetFooter/BottomSheetFooter.types';
 import {
+  BottomSheet,
+  BottomSheetFooter,
+  BottomSheetHeader,
+  BottomSheetRef,
   ButtonSize,
-  ButtonVariants,
-} from '../../../../../../component-library/components/Buttons/Button';
-import {
-  HeaderStandard,
+  ButtonsAlignment,
   Icon,
   IconColor,
   IconName,
@@ -262,16 +258,6 @@ export function CancelSpeedupModal({
 
   const chainId = (tx?.chainId ?? '') as Hex;
 
-  const buttons = [
-    {
-      variant: ButtonVariants.Primary,
-      label: strings('transaction.confirm'),
-      size: ButtonSize.Lg,
-      onPress: handleConfirm,
-      isDisabled: effectiveConfirmDisabled,
-    },
-  ];
-
   return (
     <Modal
       isVisible={isVisible}
@@ -286,11 +272,10 @@ export function CancelSpeedupModal({
     >
       <BottomSheet
         ref={bottomSheetRef}
-        shouldNavigateBack={false}
         onClose={onClose}
         style={styles.bottomSheetDialogSheet}
       >
-        <HeaderStandard title={title} onClose={close} />
+        <BottomSheetHeader onClose={close}>{title}</BottomSheetHeader>
         <Box style={tw.style('px-3')}>
           <Box gap={4}>
             <InfoSection>
@@ -307,7 +292,12 @@ export function CancelSpeedupModal({
           </Box>
           <BottomSheetFooter
             buttonsAlignment={ButtonsAlignment.Vertical}
-            buttonPropsArray={buttons}
+            primaryButtonProps={{
+              children: strings('transaction.confirm'),
+              size: ButtonSize.Lg,
+              onPress: handleConfirm,
+              isDisabled: effectiveConfirmDisabled,
+            }}
             style={tw.style('px-0')}
           />
         </Box>
diff --git a/app/components/Views/confirmations/components/modals/gas-fee-modal/gas-fee-modal.styles.ts b/app/components/Views/confirmations/components/modals/gas-fee-modal/gas-fee-modal.styles.ts
deleted file mode 100644
index 66d5c542c89b..000000000000
--- a/app/components/Views/confirmations/components/modals/gas-fee-modal/gas-fee-modal.styles.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { StyleSheet } from 'react-native';
-import { Theme } from '../../../../../../util/theme/models';
-
-const styleSheet = (params: { theme: Theme }) => {
-  const { theme } = params;
-
-  return StyleSheet.create({
-    container: {
-      backgroundColor: theme.colors.background.default,
-      padding: 16,
-      borderRadius: 16,
-      height: 370,
-    },
-  });
-};
-
-export default styleSheet;
diff --git a/app/components/Views/confirmations/components/modals/pay-with-bottom-sheet/index.ts b/app/components/Views/confirmations/components/modals/pay-with-bottom-sheet/index.ts
deleted file mode 100644
index baef6206827f..000000000000
--- a/app/components/Views/confirmations/components/modals/pay-with-bottom-sheet/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export {
-  PayWithBottomSheet,
-  PAY_WITH_BOTTOM_SHEET_TEST_ID,
-} from './pay-with-bottom-sheet';
-export type {
-  PayWithSectionConfig,
-  PayWithRowConfig,
-  PayWithRowTrailingVariant,
-  PayWithSectionId,
-} from './pay-with-bottom-sheet.types';
diff --git a/app/components/Views/confirmations/components/modals/pay-with-bottom-sheet/pay-with-bottom-sheet.test.tsx b/app/components/Views/confirmations/components/modals/pay-with-bottom-sheet/pay-with-bottom-sheet.test.tsx
index 5827025fd8a9..0971c4cd4a34 100644
--- a/app/components/Views/confirmations/components/modals/pay-with-bottom-sheet/pay-with-bottom-sheet.test.tsx
+++ b/app/components/Views/confirmations/components/modals/pay-with-bottom-sheet/pay-with-bottom-sheet.test.tsx
@@ -29,27 +29,6 @@ jest.mock('@react-navigation/native', () => ({
   useNavigation: () => ({ goBack: jest.fn() }),
 }));
 
-jest.mock('@metamask/design-system-react-native', () => {
-  const actual = jest.requireActual('@metamask/design-system-react-native');
-  const ReactActual = jest.requireActual('react');
-  const { View: RNView, Text: RNText } = jest.requireActual('react-native');
-  return {
-    ...actual,
-    BottomSheet: ReactActual.forwardRef(
-      (
-        { children, testID }: { children: React.ReactNode; testID?: string },
-        _ref: unknown,
-      ) => <RNView testID={testID}>{children}</RNView>,
-    ),
-    BottomSheetHeader: ({ children }: { children: React.ReactNode }) => (
-      <RNView testID="bottom-sheet-header">{children}</RNView>
-    ),
-    Text: ({ children, ...props }: { children: React.ReactNode }) => (
-      <RNText {...props}>{children}</RNText>
-    ),
-  };
-});
-
 jest.mock('../../UI/pay-with-section', () => {
   const { View: RNView, Text: RNText } = jest.requireActual('react-native');
   return {
diff --git a/app/components/Views/confirmations/components/modals/pay-with-bottom-sheet/pay-with-bottom-sheet.tsx b/app/components/Views/confirmations/components/modals/pay-with-bottom-sheet/pay-with-bottom-sheet.tsx
index 6d5455fa2c26..a5351b39126e 100644
--- a/app/components/Views/confirmations/components/modals/pay-with-bottom-sheet/pay-with-bottom-sheet.tsx
+++ b/app/components/Views/confirmations/components/modals/pay-with-bottom-sheet/pay-with-bottom-sheet.tsx
@@ -15,7 +15,6 @@ import { useDismissOnPaymentChange } from '../../../hooks/pay/useDismissOnPaymen
 import { usePayWithSections } from '../../../hooks/pay/usePayWithSections';
 import { isTransactionPayWithdraw } from '../../../utils/transaction';
 import { useTransactionMetadataRequest } from '../../../hooks/transactions/useTransactionMetadataRequest';
-import { useElevatedSurface } from '../../../../../../util/theme/themeUtils';
 
 export const PAY_WITH_BOTTOM_SHEET_TEST_ID = 'pay-with-bottom-sheet';
 
@@ -24,7 +23,6 @@ export function PayWithBottomSheet() {
   const navigation = useNavigation<AppNavigationProp>();
   const { sections } = usePayWithSections();
   const transactionMeta = useTransactionMetadataRequest();
-  const surfaceClass = useElevatedSurface();
   useDismissOnPaymentChange({ dismissOnPayTokenChange: false });
   const isWithdraw = isTransactionPayWithdraw(transactionMeta);
   const title = isWithdraw
@@ -45,7 +43,6 @@ export function PayWithBottomSheet() {
       goBack={handleGoBack}
       testID={PAY_WITH_BOTTOM_SHEET_TEST_ID}
       keyboardAvoidingViewEnabled={false}
-      twClassName={surfaceClass}
     >
       <BottomSheetHeader onClose={handleClose}>
         <Text variant={TextVariant.HeadingSm}>{title}</Text>
diff --git a/app/components/Views/confirmations/components/modals/pay-with-modal/pay-with-modal.tsx b/app/components/Views/confirmations/components/modals/pay-with-modal/pay-with-modal.tsx
index 81e51d9de108..8efac76d26c5 100644
--- a/app/components/Views/confirmations/components/modals/pay-with-modal/pay-with-modal.tsx
+++ b/app/components/Views/confirmations/components/modals/pay-with-modal/pay-with-modal.tsx
@@ -1,5 +1,9 @@
 import React, { useCallback, useMemo, useRef } from 'react';
-import { HeaderStandard } from '@metamask/design-system-react-native';
+import {
+  BottomSheet,
+  BottomSheetHeader,
+  type BottomSheetRef,
+} from '@metamask/design-system-react-native';
 import { Hex } from '@metamask/utils';
 import { StackActions, useNavigation } from '@react-navigation/native';
 import type { AppNavigationProp } from '../../../../../../core/NavigationService/types';
@@ -10,9 +14,6 @@ import { useTransactionPayWithdraw } from '../../../hooks/pay/useTransactionPayW
 import { useWithdrawTokenFilter } from '../../../hooks/pay/useWithdrawTokenFilter';
 import { strings } from '../../../../../../../locales/i18n';
 import { Asset } from '../../send/asset';
-import BottomSheet, {
-  BottomSheetRef,
-} from '../../../../../../component-library/components/BottomSheets/BottomSheet';
 import {
   AssetType,
   isHighlightedItemInAssetList,
@@ -45,12 +46,12 @@ import { useEnsurePayToken } from '../../../hooks/tokens/useEnsurePayToken';
 export interface PayWithModalParams {
   /**
    * When > 1, PayWithModal owns navigation on close by dispatching
-   * `StackActions.pop(N)` atomically instead of relying on the legacy
-   * `BottomSheet`'s built-in `navigation.goBack()`. Set to 2 by the new Pay
-   * With bottom sheet's "Other assets" launcher so picking a token pops both
-   * this modal AND the bottom sheet underneath in a single navigator
-   * dispatch — avoids the Android view-hierarchy race that crashes with
-   * `IllegalStateException` on two adjacent pops.
+   * `StackActions.pop(N)` atomically instead of relying on BottomSheet's
+   * `goBack` callback. Set to 2 by the new Pay With bottom sheet's "Other
+   * assets" launcher so picking a token pops both this modal AND the bottom
+   * sheet underneath in a single navigator dispatch — avoids the Android
+   * view-hierarchy race that crashes with `IllegalStateException` on two
+   * adjacent pops.
    */
   dismissOnSelectCount?: number;
 }
@@ -297,7 +298,7 @@ export function PayWithModal() {
       isFullscreen
       ref={bottomSheetRef}
       keyboardAvoidingViewEnabled={false}
-      shouldNavigateBack={dismissOnSelectCount <= 1}
+      goBack={dismissOnSelectCount <= 1 ? () => navigation.goBack() : undefined}
       onClose={(hasCallback) => {
         // Swipe/overlay/back-button dismiss: navigate back manually.
         // X button or token selection: postCallback handles it (hasCallback=true).
@@ -306,7 +307,7 @@ export function PayWithModal() {
         }
       }}
     >
-      <HeaderStandard title={modalTitle} onClose={handleClose} />
+      <BottomSheetHeader onClose={handleClose}>{modalTitle}</BottomSheetHeader>
       <Asset
         includeNoBalance
         hideNfts
diff --git a/app/components/Views/confirmations/components/modals/switch-account-type-modal/switch-account-type-modal.styles.ts b/app/components/Views/confirmations/components/modals/switch-account-type-modal/switch-account-type-modal.styles.ts
index 09c6ef3178ee..39a838600344 100644
--- a/app/components/Views/confirmations/components/modals/switch-account-type-modal/switch-account-type-modal.styles.ts
+++ b/app/components/Views/confirmations/components/modals/switch-account-type-modal/switch-account-type-modal.styles.ts
@@ -20,11 +20,6 @@ const styleSheet = () =>
       marginBottom: -8,
       marginTop: 8,
     },
-    backIcon: {
-      left: 28,
-      position: 'absolute',
-      top: 18,
-    },
   });
 
 export default styleSheet;
diff --git a/app/components/Views/confirmations/components/modals/switch-account-type-modal/switch-account-type-modal.tsx b/app/components/Views/confirmations/components/modals/switch-account-type-modal/switch-account-type-modal.tsx
index fe8e8ad6fc57..bd8a8e578164 100644
--- a/app/components/Views/confirmations/components/modals/switch-account-type-modal/switch-account-type-modal.tsx
+++ b/app/components/Views/confirmations/components/modals/switch-account-type-modal/switch-account-type-modal.tsx
@@ -1,15 +1,18 @@
 import React, { useCallback } from 'react';
 import { Hex } from '@metamask/utils';
-import { TouchableOpacity, View } from 'react-native';
+import { View } from 'react-native';
 import { useSelector } from 'react-redux';
 import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
 import type { AppNavigationProp } from '../../../../../../core/NavigationService/types';
+import {
+  BottomSheet,
+  BottomSheetHeader,
+} from '@metamask/design-system-react-native';
 
 import Avatar, {
   AvatarSize,
   AvatarVariant,
 } from '../../../../../../component-library/components/Avatars/Avatar';
-import BottomSheet from '../../../../../../component-library/components/BottomSheets/BottomSheet';
 import Text, {
   TextVariant,
 } from '../../../../../../component-library/components/Texts/Text';
@@ -19,11 +22,6 @@ import { useStyles } from '../../../../../hooks/useStyles';
 import { useEIP7702Networks } from '../../../hooks/7702/useEIP7702Networks';
 import AccountNetworkRow from './account-network-row';
 import styleSheet from './switch-account-type-modal.styles';
-import Icon, {
-  IconColor,
-  IconName,
-  IconSize,
-} from '../../../../../../component-library/components/Icons/Icon';
 import Engine from '../../../../../../core/Engine';
 
 interface SwitchAccountTypeModalRouteParams {
@@ -62,15 +60,11 @@ const SwitchAccountTypeModal = () => {
   // Handle case when no address is available
   if (!address) {
     return (
-      <BottomSheet>
-        <TouchableOpacity onPress={goBack} testID="switch-account-goback">
-          <Icon
-            name={IconName.ArrowLeft}
-            size={IconSize.Sm}
-            color={IconColor.Default}
-            style={styles.backIcon}
-          />
-        </TouchableOpacity>
+      <BottomSheet goBack={goBack}>
+        <BottomSheetHeader
+          onBack={goBack}
+          backButtonProps={{ testID: 'switch-account-goback' }}
+        />
         <View style={styles.wrapper}>
           <View style={styles.spinner} testID="no-address-fallback">
             <Text variant={TextVariant.BodyMD}>No account selected</Text>
@@ -81,15 +75,11 @@ const SwitchAccountTypeModal = () => {
   }
 
   return (
-    <BottomSheet>
-      <TouchableOpacity onPress={goBack} testID="switch-account-goback">
-        <Icon
-          name={IconName.ArrowLeft}
-          size={IconSize.Sm}
-          color={IconColor.Default}
-          style={styles.backIcon}
-        />
-      </TouchableOpacity>
+    <BottomSheet goBack={goBack}>
+      <BottomSheetHeader
+        onBack={goBack}
+        backButtonProps={{ testID: 'switch-account-goback' }}
+      />
       <View style={styles.wrapper}>
         {pending ? (
           <View style={styles.spinner} testID="network-data-loader">
diff --git a/app/components/Views/confirmations/components/predict-confirmations/predict-claim-footer/index.ts b/app/components/Views/confirmations/components/predict-confirmations/predict-claim-footer/index.ts
deleted file mode 100644
index 7fe0c6ab4394..000000000000
--- a/app/components/Views/confirmations/components/predict-confirmations/predict-claim-footer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './predict-claim-footer';
diff --git a/app/components/Views/confirmations/components/predict-confirmations/predict-withdraw-balance/index.ts b/app/components/Views/confirmations/components/predict-confirmations/predict-withdraw-balance/index.ts
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/app/components/Views/confirmations/components/rows/account-picker-row/account-picker-row.test.tsx b/app/components/Views/confirmations/components/rows/account-picker-row/account-picker-row.test.tsx
new file mode 100644
index 000000000000..919ed0d8dab7
--- /dev/null
+++ b/app/components/Views/confirmations/components/rows/account-picker-row/account-picker-row.test.tsx
@@ -0,0 +1,164 @@
+import React from 'react';
+import { fireEvent, render } from '@testing-library/react-native';
+import { mockTheme } from '../../../../../../util/theme';
+import { AccountPickerRowContent } from './account-picker-row';
+
+jest.mock('../../../../../../../locales/i18n', () => ({
+  strings: (key: string) => key,
+}));
+
+jest.mock('../../../../../../component-library/hooks/useStyles', () => ({
+  useStyles: () => ({
+    styles: {
+      rowContainer: {},
+      row: {},
+      valueContainer: {},
+      modalRoot: {},
+      searchContainer: {},
+      searchInput: {},
+      list: {},
+      accountItem: {},
+      accountItemSelected: {},
+      accountItemLeft: {},
+    },
+    theme: mockTheme,
+  }),
+}));
+
+jest.mock(
+  '../../../../../../component-library/components/Avatars/Avatar',
+  () => {
+    const { View } = jest.requireActual('react-native');
+    return {
+      __esModule: true,
+      default: (props: { accountAddress?: string }) => (
+        <View testID={`avatar-${props.accountAddress}`} />
+      ),
+      AvatarVariant: { Account: 'Account' },
+      AvatarSize: { Sm: 'Sm', Md: 'Md' },
+    };
+  },
+);
+
+jest.mock('../../../../../../component-library/components/Icons/Icon', () => {
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ({ name }: { name: string }) => <View testID={`icon-${name}`} />,
+    IconColor: { Alternative: 'Alternative' },
+    IconName: { ArrowDown: 'ArrowDown', Search: 'Search', Close: 'Close' },
+    IconSize: { Sm: 'Sm', Md: 'Md' },
+  };
+});
+
+const TEST_IDS = {
+  ROW: 'account-picker-row',
+  SHEET: 'account-picker-sheet',
+  SEARCH_INPUT: 'account-picker-search',
+  ACCOUNT_ITEM: 'account-picker-item',
+};
+
+const ACCOUNTS = [
+  { id: '0xabc', name: 'Account One' },
+  { id: '0xdef', name: 'Account Two' },
+];
+
+describe('AccountPickerRowContent', () => {
+  const onSelect = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns null when there are no sub-accounts', () => {
+    const { toJSON } = render(
+      <AccountPickerRowContent
+        subAccounts={[]}
+        selectedSubAccount={null}
+        onSelect={onSelect}
+        formatBalance={() => '$0'}
+        title="Select account"
+        searchPlaceholder="Search"
+        testIDs={TEST_IDS}
+      />,
+    );
+
+    expect(toJSON()).toBeNull();
+  });
+
+  it('opens the bottom sheet with BottomSheetHeader title', () => {
+    const { getByTestId, getByText, queryByTestId } = render(
+      <AccountPickerRowContent
+        subAccounts={ACCOUNTS}
+        selectedSubAccount={ACCOUNTS[0]}
+        onSelect={onSelect}
+        formatBalance={(account) => `$${account.name}`}
+        title="Select account"
+        searchPlaceholder="Search"
+        testIDs={TEST_IDS}
+      />,
+    );
+
+    expect(queryByTestId(TEST_IDS.SHEET)).toBeNull();
+
+    fireEvent.press(getByTestId(TEST_IDS.ROW));
+
+    expect(getByTestId(TEST_IDS.SHEET)).toBeOnTheScreen();
+    expect(getByText('Select account')).toBeOnTheScreen();
+  });
+
+  it('filters accounts by search query', () => {
+    const { getByTestId, queryByTestId } = render(
+      <AccountPickerRowContent
+        subAccounts={ACCOUNTS}
+        selectedSubAccount={ACCOUNTS[0]}
+        onSelect={onSelect}
+        formatBalance={() => '$1'}
+        title="Select account"
+        searchPlaceholder="Search"
+        testIDs={TEST_IDS}
+      />,
+    );
+
+    fireEvent.press(getByTestId(TEST_IDS.ROW));
+    fireEvent.changeText(getByTestId(TEST_IDS.SEARCH_INPUT), 'Two');
+
+    expect(queryByTestId(`${TEST_IDS.ACCOUNT_ITEM}-0xabc`)).toBeNull();
+    expect(getByTestId(`${TEST_IDS.ACCOUNT_ITEM}-0xdef`)).toBeOnTheScreen();
+  });
+
+  it('calls onSelect when an account is pressed', () => {
+    const { getByTestId } = render(
+      <AccountPickerRowContent
+        subAccounts={ACCOUNTS}
+        selectedSubAccount={ACCOUNTS[0]}
+        onSelect={onSelect}
+        formatBalance={() => '$1'}
+        title="Select account"
+        searchPlaceholder="Search"
+        testIDs={TEST_IDS}
+      />,
+    );
+
+    fireEvent.press(getByTestId(TEST_IDS.ROW));
+    fireEvent.press(getByTestId(`${TEST_IDS.ACCOUNT_ITEM}-0xdef`));
+
+    expect(onSelect).toHaveBeenCalledWith('0xdef');
+  });
+
+  it('renders fallback label when no account is selected', () => {
+    const { getAllByText } = render(
+      <AccountPickerRowContent
+        subAccounts={ACCOUNTS}
+        selectedSubAccount={null}
+        onSelect={onSelect}
+        formatBalance={() => '$1'}
+        title="Select account"
+        searchPlaceholder="Search"
+        testIDs={TEST_IDS}
+      />,
+    );
+
+    expect(getAllByText('confirm.label.to').length).toBeGreaterThan(0);
+  });
+});
diff --git a/app/components/Views/confirmations/components/rows/account-picker-row/account-picker-row.tsx b/app/components/Views/confirmations/components/rows/account-picker-row/account-picker-row.tsx
index c4dde252c53f..49ce6141a3f0 100644
--- a/app/components/Views/confirmations/components/rows/account-picker-row/account-picker-row.tsx
+++ b/app/components/Views/confirmations/components/rows/account-picker-row/account-picker-row.tsx
@@ -9,8 +9,8 @@ import {
 
 import {
   BottomSheet,
+  BottomSheetHeader,
   BottomSheetRef,
-  HeaderStandard,
   Text,
   TextColor,
   TextVariant,
@@ -26,7 +26,6 @@ import Icon, {
   IconSize,
 } from '../../../../../../component-library/components/Icons/Icon';
 import { useStyles } from '../../../../../../component-library/hooks/useStyles';
-import { useElevatedSurface } from '../../../../../../util/theme/themeUtils';
 import { strings } from '../../../../../../../locales/i18n';
 import stylesheet from './account-picker-row.styles';
 
@@ -63,7 +62,6 @@ export function AccountPickerRowContent<T extends SubAccountBase>({
 }: AccountPickerRowContentProps<T>) {
   const { styles } = useStyles(stylesheet, {});
   const bottomSheetRef = useRef<BottomSheetRef>(null);
-  const surfaceClass = useElevatedSurface();
   const [isPickerVisible, setIsPickerVisible] = useState(false);
   const [searchQuery, setSearchQuery] = useState('');
 
@@ -177,9 +175,10 @@ export function AccountPickerRowContent<T extends SubAccountBase>({
               isFullscreen
               keyboardAvoidingViewEnabled={false}
               onClose={handleSheetClosed}
-              twClassName={surfaceClass}
             >
-              <HeaderStandard title={title} onClose={handleModalRequestClose} />
+              <BottomSheetHeader onClose={handleModalRequestClose}>
+                {title}
+              </BottomSheetHeader>
               <View style={styles.searchContainer}>
                 <Icon
                   name={IconName.Search}
diff --git a/app/components/Views/confirmations/components/rows/perps-account-picker-row/perps-account-picker-row.test.tsx b/app/components/Views/confirmations/components/rows/perps-account-picker-row/perps-account-picker-row.test.tsx
index 7daf532c088d..494c6484536b 100644
--- a/app/components/Views/confirmations/components/rows/perps-account-picker-row/perps-account-picker-row.test.tsx
+++ b/app/components/Views/confirmations/components/rows/perps-account-picker-row/perps-account-picker-row.test.tsx
@@ -55,10 +55,6 @@ jest.mock('../../../../../../component-library/hooks/useStyles', () => ({
   }),
 }));
 
-jest.mock('../../../../../../util/theme/themeUtils', () => ({
-  useElevatedSurface: () => 'surface-elevated',
-}));
-
 jest.mock('../../../../../../component-library/components/Icons/Icon', () => {
   const RN = jest.requireActual('react-native');
   // eslint-disable-next-line @typescript-eslint/no-require-imports
diff --git a/app/components/Views/confirmations/components/rows/predict-account-picker-row/predict-account-picker-row.test.tsx b/app/components/Views/confirmations/components/rows/predict-account-picker-row/predict-account-picker-row.test.tsx
index 9808d44910cc..961f6bd2e929 100644
--- a/app/components/Views/confirmations/components/rows/predict-account-picker-row/predict-account-picker-row.test.tsx
+++ b/app/components/Views/confirmations/components/rows/predict-account-picker-row/predict-account-picker-row.test.tsx
@@ -59,10 +59,6 @@ jest.mock('../../../../../../component-library/hooks/useStyles', () => ({
   }),
 }));
 
-jest.mock('../../../../../../util/theme/themeUtils', () => ({
-  useElevatedSurface: () => 'surface-elevated',
-}));
-
 jest.mock('../../../../../../component-library/components/Icons/Icon', () => {
   const RN = jest.requireActual('react-native');
   // eslint-disable-next-line @typescript-eslint/no-require-imports
diff --git a/app/components/Views/confirmations/components/send/amount/amount-alerts.test.tsx b/app/components/Views/confirmations/components/send/amount/amount-alerts.test.tsx
index 38d3bfaa95da..75eca619361b 100644
--- a/app/components/Views/confirmations/components/send/amount/amount-alerts.test.tsx
+++ b/app/components/Views/confirmations/components/send/amount/amount-alerts.test.tsx
@@ -27,62 +27,6 @@ jest.mock('../../../../../../../locales/i18n', () => ({
   },
 }));
 
-jest.mock(
-  '../../../../../../component-library/components/BottomSheets/BottomSheet',
-  () => {
-    const mockReact = jest.requireActual('react');
-    const { View } = jest.requireActual('react-native');
-    const MockBottomSheet = mockReact.forwardRef(
-      (
-        { children, onClose }: { children: unknown; onClose?: () => void },
-        _ref: unknown,
-      ) =>
-        mockReact.createElement(
-          View,
-          { testID: 'bottom-sheet', onTouchEnd: onClose },
-          children,
-        ),
-    );
-    MockBottomSheet.displayName = 'MockBottomSheet';
-    return {
-      __esModule: true,
-      default: MockBottomSheet,
-    };
-  },
-);
-
-jest.mock(
-  '../../../../../../component-library/components/BottomSheets/BottomSheetFooter',
-  () => {
-    const mockReact = jest.requireActual('react');
-    const { View, Pressable, Text } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({
-        buttonPropsArray,
-      }: {
-        buttonPropsArray: {
-          label: string;
-          onPress: () => void;
-          testID?: string;
-        }[];
-      }) =>
-        mockReact.createElement(
-          View,
-          { testID: 'bottom-sheet-footer' },
-          buttonPropsArray.map(
-            (btn: { label: string; onPress: () => void; testID?: string }) =>
-              mockReact.createElement(
-                Pressable,
-                { key: btn.label, testID: btn.testID, onPress: btn.onPress },
-                mockReact.createElement(Text, null, btn.label),
-              ),
-          ),
-        ),
-    };
-  },
-);
-
 const ALERT = {
   key: 'unreliableNetwork',
   title: 'Unavailable network connection',
diff --git a/app/components/Views/confirmations/components/send/diff-highlighted-address/diff-highlighted-address.test.tsx b/app/components/Views/confirmations/components/send/diff-highlighted-address/diff-highlighted-address.test.tsx
index 4fd195cfb8c3..76f404514575 100644
--- a/app/components/Views/confirmations/components/send/diff-highlighted-address/diff-highlighted-address.test.tsx
+++ b/app/components/Views/confirmations/components/send/diff-highlighted-address/diff-highlighted-address.test.tsx
@@ -1,39 +1,8 @@
 import React from 'react';
 import { render } from '@testing-library/react-native';
-import { FontWeight, TextColor } from '@metamask/design-system-react-native';
+import { TextColor } from '@metamask/design-system-react-native';
 import { DiffHighlightedAddress } from './diff-highlighted-address';
 
-jest.mock('@metamask/design-system-react-native', () => {
-  const { Text: RNText, View: RNView } = jest.requireActual('react-native');
-
-  return {
-    Box: ({
-      children,
-      ...props
-    }: React.PropsWithChildren<Record<string, unknown>>) => (
-      <RNView {...props}>{children}</RNView>
-    ),
-    Text: ({
-      children,
-      ...props
-    }: React.PropsWithChildren<Record<string, unknown>>) => (
-      <RNText {...props}>{children}</RNText>
-    ),
-    FontWeight: {
-      Bold: 'bold',
-      Medium: 'medium',
-    },
-    TextColor: {
-      ErrorDefault: 'error-default',
-      SuccessDefault: 'success-default',
-      TextAlternative: 'text-alternative',
-    },
-    TextVariant: {
-      BodySm: 'body-sm',
-    },
-  };
-});
-
 describe('DiffHighlightedAddress', () => {
   it('renders consecutive address differences with default warning styles', () => {
     const { getByText } = render(
@@ -45,16 +14,11 @@ describe('DiffHighlightedAddress', () => {
       />,
     );
 
-    const firstDiffSegment = getByText('23');
-    const secondDiffSegment = getByText('6');
-
     expect(getByText('Entered address')).toBeOnTheScreen();
     expect(getByText('0x1')).toBeOnTheScreen();
+    expect(getByText('23')).toBeOnTheScreen();
     expect(getByText('45')).toBeOnTheScreen();
-    expect(firstDiffSegment.props.color).toBe(TextColor.ErrorDefault);
-    expect(firstDiffSegment.props.fontWeight).toBe(FontWeight.Bold);
-    expect(firstDiffSegment.props.twClassName).toBe('bg-error-muted');
-    expect(secondDiffSegment.props.color).toBe(TextColor.ErrorDefault);
+    expect(getByText('6')).toBeOnTheScreen();
   });
 
   it('renders custom styles for address differences', () => {
@@ -69,11 +33,9 @@ describe('DiffHighlightedAddress', () => {
       />,
     );
 
-    const diffSegment = getByText('ab');
-
     expect(getByText('Known address')).toBeOnTheScreen();
-    expect(diffSegment.props.color).toBe(TextColor.SuccessDefault);
-    expect(diffSegment.props.fontWeight).toBe(FontWeight.Bold);
-    expect(diffSegment.props.twClassName).toBe('bg-success-muted');
+    expect(getByText('0x')).toBeOnTheScreen();
+    expect(getByText('ab')).toBeOnTheScreen();
+    expect(getByText('cdef')).toBeOnTheScreen();
   });
 });
diff --git a/app/components/Views/confirmations/components/send/recipient/recipient.tsx b/app/components/Views/confirmations/components/send/recipient/recipient.tsx
index 929e3a984a00..09fd3c8602a7 100644
--- a/app/components/Views/confirmations/components/send/recipient/recipient.tsx
+++ b/app/components/Views/confirmations/components/send/recipient/recipient.tsx
@@ -1,4 +1,6 @@
 import {
+  BannerAlert,
+  BannerAlertSeverity,
   Box,
   Button,
   ButtonBaseSize,
@@ -9,10 +11,6 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { KeyboardAvoidingView, Platform, ScrollView } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { strings } from '../../../../../../../locales/i18n';
-import Banner, {
-  BannerAlertSeverity,
-  BannerVariant,
-} from '../../../../../../component-library/components/Banners/Banner';
 import { useSendContext } from '../../../context/send-context/send-context';
 import { RecipientInputMethod } from '../../../context/send-context/send-metrics-context';
 import { useSendAlerts } from '../../../hooks/send/alerts/useSendAlerts';
@@ -251,10 +249,9 @@ export const Recipient = () => {
           {(to || '').length > 0 && !isRecipientSelectedFromList && (
             <Box twClassName="px-4 py-4">
               {poisoningMatch && recipientCandidateAddress && (
-                <Banner
+                <BannerAlert
                   testID="address-poisoning-warning-banner"
-                  variant={BannerVariant.Alert}
-                  severity={BannerAlertSeverity.Error}
+                  severity={BannerAlertSeverity.Danger}
                   style={styles.banner}
                   title={strings('alert_system.address_poisoning.title')}
                   description={strings(
@@ -266,17 +263,16 @@ export const Recipient = () => {
                     knownAddress={poisoningMatch.knownAddress}
                     diffIndices={poisoningMatch.diffIndices}
                   />
-                </Banner>
+                </BannerAlert>
               )}
               {toAddressWarning && (
-                <Banner
+                <BannerAlert
                   testID="to-address-warning-banner"
-                  variant={BannerVariant.Alert}
                   severity={
                     // Confusable character validation is send both error and warning for invisible characters
                     // hence we are showing error for invisible characters
                     toAddressError && toAddressWarning
-                      ? BannerAlertSeverity.Error
+                      ? BannerAlertSeverity.Danger
                       : BannerAlertSeverity.Warning
                   }
                   style={styles.banner}
diff --git a/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.test.tsx b/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.test.tsx
index e01f8ab64b0e..5eba5c9c7969 100644
--- a/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.test.tsx
+++ b/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.test.tsx
@@ -17,62 +17,6 @@ jest.mock('../../../../../../../locales/i18n', () => ({
   }),
 }));
 
-jest.mock(
-  '../../../../../../component-library/components/BottomSheets/BottomSheet',
-  () => {
-    const mockReact = jest.requireActual('react');
-    const { View } = jest.requireActual('react-native');
-    const MockBottomSheet = mockReact.forwardRef(
-      (
-        { children, onClose }: { children: unknown; onClose?: () => void },
-        _ref: unknown,
-      ) =>
-        mockReact.createElement(
-          View,
-          { testID: 'bottom-sheet', onTouchEnd: onClose },
-          children,
-        ),
-    );
-    MockBottomSheet.displayName = 'MockBottomSheet';
-    return {
-      __esModule: true,
-      default: MockBottomSheet,
-    };
-  },
-);
-
-jest.mock(
-  '../../../../../../component-library/components/BottomSheets/BottomSheetFooter',
-  () => {
-    const mockReact = jest.requireActual('react');
-    const { View, Pressable, Text } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({
-        buttonPropsArray,
-      }: {
-        buttonPropsArray: {
-          label: string;
-          onPress: () => void;
-          testID?: string;
-        }[];
-      }) =>
-        mockReact.createElement(
-          View,
-          { testID: 'bottom-sheet-footer' },
-          buttonPropsArray.map(
-            (btn: { label: string; onPress: () => void; testID?: string }) =>
-              mockReact.createElement(
-                Pressable,
-                { key: btn.label, testID: btn.testID, onPress: btn.onPress },
-                mockReact.createElement(Text, null, btn.label),
-              ),
-          ),
-        ),
-    };
-  },
-);
-
 const singleAlert: SendAlert[] = [
   {
     key: 'tokenContract',
diff --git a/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.tsx b/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.tsx
index f962e02eb2b5..41479e230afd 100644
--- a/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.tsx
+++ b/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.tsx
@@ -2,12 +2,15 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { Modal } from 'react-native';
 import {
   BottomSheet,
+  BottomSheetFooter,
   BottomSheetRef,
   Box,
   BoxAlignItems,
   BoxFlexDirection,
   BoxJustifyContent,
   ButtonIcon,
+  ButtonSize,
+  ButtonsAlignment,
   Icon,
   IconColor,
   IconName,
@@ -16,15 +19,8 @@ import {
   TextVariant,
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../../../../locales/i18n';
-import BottomSheetFooter from '../../../../../../component-library/components/BottomSheets/BottomSheetFooter';
-import { ButtonsAlignment } from '../../../../../../component-library/components/BottomSheets/BottomSheetFooter/BottomSheetFooter.types';
-import {
-  ButtonSize,
-  ButtonVariants,
-} from '../../../../../../component-library/components/Buttons/Button';
 import type { SendAlert } from '../../../hooks/send/alerts/types';
 import { SendAlertModalProps } from './send-alert-modal.types';
-import { useElevatedSurface } from '../../../../../../util/theme/themeUtils';
 
 function PageNavigation({
   alerts,
@@ -83,7 +79,6 @@ export const SendAlertModal = ({
   onClose,
 }: SendAlertModalProps) => {
   const bottomSheetRef = useRef<BottomSheetRef>(null);
-  const surfaceClass = useElevatedSurface();
   const [currentIndex, setCurrentIndex] = useState(0);
 
   const alertKeys = alerts.map((a) => a.key).join('|');
@@ -126,11 +121,7 @@ export const SendAlertModal = ({
 
   return (
     <Modal visible transparent animationType="none">
-      <BottomSheet
-        ref={bottomSheetRef}
-        onClose={onClose}
-        twClassName={surfaceClass}
-      >
+      <BottomSheet ref={bottomSheetRef} onClose={onClose}>
         <PageNavigation
           alerts={alerts}
           selectedIndex={safeIndex}
@@ -164,22 +155,18 @@ export const SendAlertModal = ({
         </Box>
         <BottomSheetFooter
           buttonsAlignment={ButtonsAlignment.Horizontal}
-          buttonPropsArray={[
-            {
-              variant: ButtonVariants.Secondary,
-              size: ButtonSize.Lg,
-              label: strings('send.cancel'),
-              onPress: onClose,
-              testID: 'send-alert-modal-cancel-button',
-            },
-            {
-              variant: ButtonVariants.Primary,
-              size: ButtonSize.Lg,
-              label: acknowledgeLabel,
-              onPress: handleAcknowledgeStep,
-              testID: 'send-alert-modal-acknowledge-button',
-            },
-          ]}
+          secondaryButtonProps={{
+            children: strings('send.cancel'),
+            size: ButtonSize.Lg,
+            onPress: onClose,
+            testID: 'send-alert-modal-cancel-button',
+          }}
+          primaryButtonProps={{
+            children: acknowledgeLabel,
+            size: ButtonSize.Lg,
+            onPress: handleAcknowledgeStep,
+            testID: 'send-alert-modal-acknowledge-button',
+          }}
         />
       </BottomSheet>
     </Modal>
diff --git a/app/components/Views/confirmations/components/signature-blockaid-banner/index.ts b/app/components/Views/confirmations/components/signature-blockaid-banner/index.ts
deleted file mode 100644
index 64195fcad1ab..000000000000
--- a/app/components/Views/confirmations/components/signature-blockaid-banner/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './signature-blockaid-banner';
diff --git a/app/components/Views/confirmations/components/signature-blockaid-banner/signature-blockaid-banner.styles.ts b/app/components/Views/confirmations/components/signature-blockaid-banner/signature-blockaid-banner.styles.ts
deleted file mode 100644
index 8da510a7b78e..000000000000
--- a/app/components/Views/confirmations/components/signature-blockaid-banner/signature-blockaid-banner.styles.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const styleSheet = () =>
-  StyleSheet.create({
-    blockaidBanner: {
-      marginBottom: 8,
-    },
-  });
-
-export default styleSheet;
diff --git a/app/components/Views/confirmations/components/signature-blockaid-banner/signature-blockaid-banner.test.tsx b/app/components/Views/confirmations/components/signature-blockaid-banner/signature-blockaid-banner.test.tsx
deleted file mode 100644
index 7ebdb69e50af..000000000000
--- a/app/components/Views/confirmations/components/signature-blockaid-banner/signature-blockaid-banner.test.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React from 'react';
-import { fireEvent } from '@testing-library/react-native';
-
-import renderWithProvider from '../../../../../util/test/renderWithProvider';
-import {
-  securityAlertResponse,
-  typedSignV1ConfirmationState,
-  typedSignV1SignatureRequest,
-} from '../../../../../util/test/confirm-data-helpers';
-import SignatureBlockaidBanner from './signature-blockaid-banner';
-
-jest.mock('react-native-gzip', () => ({
-  deflate: (str: string) => str,
-}));
-
-const mockTrackEvent = jest.fn();
-const mockCreateEventBuilderAddProperties = jest.fn();
-
-jest.mock('../../../../hooks/useAnalytics/useAnalytics', () => ({
-  useAnalytics: () => ({
-    trackEvent: mockTrackEvent,
-    createEventBuilder: () => ({
-      addProperties: mockCreateEventBuilderAddProperties.mockReturnValue({
-        build: () => ({}),
-      }),
-    }),
-  }),
-}));
-
-jest.mock('../../../../../util/confirmation/signatureUtils', () => ({
-  getAnalyticsParams: () => ({}),
-}));
-
-// The key must match messageParams.requestId since useSecurityAlertResponse
-// looks up by requestId first (this matches how ppom-util stores alerts)
-const SECURITY_ALERT_KEY =
-  typedSignV1SignatureRequest.messageParams.requestId?.toString() as string;
-
-const typedSignV1ConfirmationStateWithBlockaidResponse = {
-  ...typedSignV1ConfirmationState,
-  securityAlerts: {
-    alerts: {
-      [SECURITY_ALERT_KEY]: securityAlertResponse,
-    },
-  },
-};
-
-describe('Confirm', () => {
-  it('should return null if request does not have securityAlertResponse', async () => {
-    const { queryByText } = renderWithProvider(<SignatureBlockaidBanner />, {
-      state: typedSignV1ConfirmationState,
-    });
-    expect(queryByText('This is a deceptive request')).toBeNull();
-  });
-
-  it('should render blockaid banner alert if blockaid returns error', async () => {
-    const { getByText } = renderWithProvider(<SignatureBlockaidBanner />, {
-      state: typedSignV1ConfirmationStateWithBlockaidResponse,
-    });
-    expect(getByText('This is a deceptive request')).toBeDefined();
-  });
-
-  it('should call trackMetrics method when report issue link is clicked', async () => {
-    const { getByText, getByTestId } = renderWithProvider(
-      <SignatureBlockaidBanner />,
-      {
-        state: typedSignV1ConfirmationStateWithBlockaidResponse,
-      },
-    );
-
-    fireEvent.press(getByTestId('accordionheader'));
-    fireEvent.press(getByText('Report an issue'));
-
-    expect(mockTrackEvent).toHaveBeenCalledTimes(1);
-    expect(mockCreateEventBuilderAddProperties).toHaveBeenCalledWith(
-      expect.objectContaining({
-        external_link_clicked: 'security_alert_support_link',
-      }),
-    );
-  });
-});
diff --git a/app/components/Views/confirmations/components/signature-blockaid-banner/signature-blockaid-banner.tsx b/app/components/Views/confirmations/components/signature-blockaid-banner/signature-blockaid-banner.tsx
deleted file mode 100644
index 0acab5f8ccc4..000000000000
--- a/app/components/Views/confirmations/components/signature-blockaid-banner/signature-blockaid-banner.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, { useCallback } from 'react';
-
-import { MetaMetricsEvents } from '../../../../../core/Analytics';
-import { getAnalyticsParams } from '../../../../../util/confirmation/signatureUtils';
-import { useStyles } from '../../../../../component-library/hooks';
-import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
-import BlockaidBanner from '../../components/blockaid-banner/BlockaidBanner';
-import { SecurityAlertResponse } from '../../components/blockaid-banner/BlockaidBanner.types';
-import { useSecurityAlertResponse } from '../../hooks/alerts/useSecurityAlertResponse';
-import { useSignatureRequest } from '../../hooks/signatures/useSignatureRequest';
-import styleSheet from './signature-blockaid-banner.styles';
-
-const SignatureBlockaidBanner = () => {
-  const signatureRequest = useSignatureRequest();
-  const { securityAlertResponse } = useSecurityAlertResponse();
-  const { trackEvent, createEventBuilder } = useAnalytics();
-  const { styles } = useStyles(styleSheet, {});
-
-  const {
-    type,
-    messageParams: { from: fromAddress },
-  } = signatureRequest ?? {
-    messageParams: {},
-  };
-
-  const onContactUsClicked = useCallback(() => {
-    const analyticsParams = {
-      ...getAnalyticsParams(
-        {
-          from: fromAddress,
-        },
-        type,
-      ),
-      external_link_clicked: 'security_alert_support_link',
-    };
-    trackEvent(
-      createEventBuilder(MetaMetricsEvents.SIGNATURE_REQUESTED)
-        .addProperties(analyticsParams)
-        .build(),
-    );
-  }, [trackEvent, createEventBuilder, type, fromAddress]);
-
-  if (!securityAlertResponse) {
-    return null;
-  }
-
-  return (
-    <BlockaidBanner
-      onContactUsClicked={onContactUsClicked}
-      securityAlertResponse={securityAlertResponse as SecurityAlertResponse}
-      style={styles.blockaidBanner}
-    />
-  );
-};
-
-export default SignatureBlockaidBanner;
diff --git a/app/components/Views/confirmations/context/send-context/utils.test.tsx b/app/components/Views/confirmations/context/send-context/utils.test.tsx
deleted file mode 100644
index 84a93c84af02..000000000000
--- a/app/components/Views/confirmations/context/send-context/utils.test.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { AssetType } from '../../types/token';
-import { prepareEVMTransaction } from './utils';
-
-describe('prepareEVMTransaction', () => {
-  it('prepares transaction for native token', () => {
-    expect(
-      prepareEVMTransaction(
-        {
-          name: 'Ethereum',
-          address: '0x123',
-          isNative: true,
-          chainId: '0x1',
-        } as AssetType,
-        { from: '0x123', to: '0x456', value: '100' },
-      ),
-    ).toStrictEqual({
-      data: '0x',
-      from: '0x123',
-      to: '0x456',
-      value: '0x56bc75e2d63100000',
-    });
-  });
-
-  it('prepares transaction for ERC20 token', () => {
-    expect(
-      prepareEVMTransaction(
-        {
-          name: 'MyToken',
-          address: '0x123',
-          chainId: '0x1',
-        } as AssetType,
-        { from: '0x123', to: '0x456', value: '100' },
-      ),
-    ).toStrictEqual({
-      data: '0xa9059cbb00000000000000000000000000000000000000000000000000000000000004560000000000000000000000000000000000000000000000000000000000000064',
-      from: '0x123',
-      to: '0x123',
-      value: '0x0',
-    });
-  });
-
-  it('prepares transaction for NFT token', () => {
-    expect(
-      prepareEVMTransaction(
-        {
-          name: 'MyNFT',
-          address: '0x123',
-          chainId: '0x1',
-          tokenId: '0x1',
-        } as AssetType,
-        { from: '0x123', to: '0x456', value: '100' },
-      ),
-    ).toStrictEqual({
-      data: '0x23b872dd000000000000000000000000000000000000000000000000000000000000012300000000000000000000000000000000000000000000000000000000000004560000000000000000000000000000000000000000000000000000000000000001',
-      from: '0x123',
-      to: '0x123',
-      value: '0x0',
-    });
-  });
-});
diff --git a/app/components/Views/confirmations/context/send-context/utils.ts b/app/components/Views/confirmations/context/send-context/utils.ts
deleted file mode 100644
index 3b14cbc8a0b6..000000000000
--- a/app/components/Views/confirmations/context/send-context/utils.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import BN from 'bnjs5';
-import { BNToHex, toHex } from '@metamask/controller-utils';
-import { TransactionParams } from '@metamask/transaction-controller';
-
-import { generateTransferData } from '../../../../../util/transactions';
-import { toTokenMinimalUnit, toWei } from '../../../../../util/number';
-import { AssetType } from '../../types/token';
-import { isNativeToken } from '../../utils/generic';
-
-export const prepareEVMTransaction = (
-  asset: AssetType,
-  transactionParams: TransactionParams,
-) => {
-  const { from, to, value } = transactionParams;
-  const trxnParams: TransactionParams = { from };
-  if (isNativeToken(asset)) {
-    trxnParams.data = '0x';
-    trxnParams.to = to;
-    trxnParams.value = BNToHex(toWei(value ?? '0') as unknown as BN);
-  } else if (asset.tokenId) {
-    trxnParams.data = generateTransferData('transferFrom', {
-      fromAddress: from,
-      toAddress: to,
-      tokenId: toHex(asset.tokenId),
-    });
-    trxnParams.to = asset.address;
-    trxnParams.value = '0x0';
-  } else {
-    const tokenAmount = toTokenMinimalUnit(value ?? '0', asset.decimals ?? 0);
-    trxnParams.data = generateTransferData('transfer', {
-      toAddress: to,
-      amount: BNToHex(tokenAmount),
-    });
-    trxnParams.to = asset.address;
-    trxnParams.value = '0x0';
-  }
-  return trxnParams;
-};
diff --git a/app/components/Views/confirmations/external/staking/components/staking-contract-interaction-details/index.ts b/app/components/Views/confirmations/external/staking/components/staking-contract-interaction-details/index.ts
deleted file mode 100644
index 4bf99545e702..000000000000
--- a/app/components/Views/confirmations/external/staking/components/staking-contract-interaction-details/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './staking-contract-interaction-details';
diff --git a/app/components/Views/confirmations/external/staking/components/staking-contract-interaction-details/staking-contract-interaction-details.tsx b/app/components/Views/confirmations/external/staking/components/staking-contract-interaction-details/staking-contract-interaction-details.tsx
index d56383694748..0ec699d4336c 100644
--- a/app/components/Views/confirmations/external/staking/components/staking-contract-interaction-details/staking-contract-interaction-details.tsx
+++ b/app/components/Views/confirmations/external/staking/components/staking-contract-interaction-details/staking-contract-interaction-details.tsx
@@ -11,7 +11,7 @@ import { AvatarSize } from '../../../../../../../component-library/components/Av
 import Badge, {
   BadgeVariant,
 } from '../../../../../../../component-library/components/Badges/Badge';
-import Text from '../../../../../../../component-library/components/Texts/Text';
+import { Text } from '@metamask/design-system-react-native';
 import { useStyles } from '../../../../../../../component-library/hooks';
 import images from '../../../../../../../images/image-icons';
 import { selectSelectedInternalAccountByScope } from '../../../../../../../selectors/multichainAccounts/accounts';
diff --git a/app/components/Views/confirmations/external/staking/components/staking-details/index.ts b/app/components/Views/confirmations/external/staking/components/staking-details/index.ts
deleted file mode 100644
index 4b83eb49e97f..000000000000
--- a/app/components/Views/confirmations/external/staking/components/staking-details/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './staking-details';
diff --git a/app/components/Views/confirmations/external/staking/components/staking-details/staking-details.tsx b/app/components/Views/confirmations/external/staking/components/staking-details/staking-details.tsx
index 89a56c3c1d1a..ab29135f93af 100644
--- a/app/components/Views/confirmations/external/staking/components/staking-details/staking-details.tsx
+++ b/app/components/Views/confirmations/external/staking/components/staking-details/staking-details.tsx
@@ -3,7 +3,7 @@ import { View } from 'react-native';
 import { ConfirmationRowComponentIDs } from '../../../../ConfirmationView.testIds';
 import { strings } from '../../../../../../../../locales/i18n';
 import { TOOLTIP_TYPES } from '../../../../../../../core/Analytics/events/confirmations';
-import Text from '../../../../../../../component-library/components/Texts/Text';
+import { Text } from '@metamask/design-system-react-native';
 import { useStyles } from '../../../../../../../component-library/hooks';
 import { useStakingDetails } from '../../hooks/useStakingDetails';
 import { useConfirmationMetricEvents } from '../../../../hooks/metrics/useConfirmationMetricEvents';
diff --git a/app/components/Views/confirmations/hooks/alerts/useGasSponsorshipWarningAlert.ts b/app/components/Views/confirmations/hooks/alerts/useGasSponsorshipWarningAlert.ts
index 724580a93c13..66658dcbcf2e 100644
--- a/app/components/Views/confirmations/hooks/alerts/useGasSponsorshipWarningAlert.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useGasSponsorshipWarningAlert.ts
@@ -13,6 +13,7 @@ import { Alert, Severity } from '../../types/alerts';
 import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
 import { NETWORKS_CHAIN_ID } from '../../../../../constants/network';
 import { useRampNavigation } from '../../../../UI/Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../../../UI/Ramp/constants/rampsBuyCufTags';
 import { useConfirmActions } from '../useConfirmActions';
 import { useIsGasSponsored } from '../gas/useIsGasSponsored';
 
@@ -145,7 +146,7 @@ export const useGasSponsorshipWarningAlert = (): Alert[] => {
             nativeCurrency,
           }),
           callback: () => {
-            goToBuy();
+            goToBuy(undefined, { surface: RAMPS_BUY_CUF_SURFACE.CONFIRMATION });
             onReject(undefined, true);
           },
         },
diff --git a/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.ts b/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.ts
index bc65d12e606e..a8da469bf219 100644
--- a/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.ts
@@ -2,6 +2,7 @@ import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { strings } from '../../../../../../locales/i18n';
 import { useRampNavigation } from '../../../../UI/Ramp/hooks/useRampNavigation';
+import { RAMPS_BUY_CUF_SURFACE } from '../../../../UI/Ramp/constants/rampsBuyCufTags';
 import { RowAlertKey } from '../../components/UI/info-row/alert-row/constants';
 import { AlertKeys } from '../../constants/alerts';
 import { Alert, Severity } from '../../types/alerts';
@@ -113,7 +114,7 @@ export const useInsufficientBalanceAlert = ({
             nativeCurrency,
           }),
           callback: () => {
-            goToBuy();
+            goToBuy(undefined, { surface: RAMPS_BUY_CUF_SURFACE.CONFIRMATION });
             onReject(undefined, true);
           },
         },
diff --git a/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.test.ts b/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.test.ts
index 10f6d8794209..5d5d7f0fae03 100644
--- a/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.test.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.test.ts
@@ -14,7 +14,6 @@ import {
   useTransactionPayTotals,
 } from '../pay/useTransactionPayData';
 import {
-  PaymentOverride,
   TransactionPayQuote,
   TransactionPayTotals,
 } from '@metamask/transaction-pay-controller';
@@ -27,25 +26,13 @@ jest.mock('../pay/useTransactionPayData');
 
 const TRANSACTION_ID_MOCK = 'test-tx-1';
 
-const mockPerpsState = (
-  withdrawableBalance: string | null = '45.31',
-  isMoneyAccountWithdraw = false,
-) => ({
+const mockPerpsState = (withdrawableBalance: string | null = '45.31') => ({
   engine: {
     backgroundState: {
       PerpsController: {
         accountState:
           withdrawableBalance !== null ? { withdrawableBalance } : null,
       },
-      ...(isMoneyAccountWithdraw && {
-        TransactionPayController: {
-          transactionData: {
-            [TRANSACTION_ID_MOCK]: {
-              paymentOverride: PaymentOverride.MoneyAccount,
-            },
-          },
-        },
-      }),
     },
   },
 });
@@ -53,15 +40,13 @@ const mockPerpsState = (
 function runHook({
   pendingAmount,
   withdrawableBalance = '45.31',
-  isMoneyAccountWithdraw = false,
 }: {
   pendingAmount?: string;
   withdrawableBalance?: string | null;
-  isMoneyAccountWithdraw?: boolean;
 } = {}) {
   return renderHookWithProvider(
     () => useInsufficientPerpsBalanceAlert({ pendingAmount }),
-    { state: mockPerpsState(withdrawableBalance, isMoneyAccountWithdraw) },
+    { state: mockPerpsState(withdrawableBalance) },
   );
 }
 
@@ -241,30 +226,6 @@ describe('useInsufficientPerpsBalanceAlert', () => {
     expect(result.current).toStrictEqual([]);
   });
 
-  it('returns alert when amount + fees exceed withdrawable balance for money account withdrawal', () => {
-    useTokenAmountMock.mockReturnValue({
-      amountPrecise: '40',
-    } as ReturnType<typeof useTokenAmount>);
-
-    jest
-      .mocked(useTransactionPayQuotes)
-      .mockReturnValue([{} as TransactionPayQuote<Json>]);
-
-    useTransactionPayTotalsMock.mockReturnValue({
-      fees: {
-        provider: { usd: '5' },
-        sourceNetwork: { estimate: { usd: '1' } },
-        targetNetwork: { usd: '0' },
-        metaMask: { usd: '0' },
-      },
-    } as unknown as TransactionPayTotals);
-
-    const { result } = runHook({ isMoneyAccountWithdraw: true });
-
-    expect(result.current).toHaveLength(1);
-    expect(result.current[0].key).toBe(AlertKeys.InsufficientPerpsBalance);
-  });
-
   it('does not alert for standard withdrawal when amount + fees exceed balance', () => {
     useTokenAmountMock.mockReturnValue({
       amountPrecise: '40',
diff --git a/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.ts b/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.ts
index ca5c0c5d68a9..ed8e3f69cb00 100644
--- a/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.ts
@@ -16,8 +16,7 @@ import {
   useTransactionPayQuotes,
   useTransactionPayTotals,
 } from '../pay/useTransactionPayData';
-import { PaymentOverride } from '@metamask/transaction-pay-controller';
-import { selectPaymentOverrideByTransactionId } from '../../../../../selectors/transactionPayController';
+import { getTotalPayFeesUsd } from '../../utils/transaction-pay';
 import type { RootState } from '../../../../../reducers';
 
 export function useInsufficientPerpsBalanceAlert({
@@ -40,12 +39,6 @@ export function useInsufficientPerpsBalanceAlert({
         ?.withdrawableBalance,
   );
 
-  const paymentOverride = useSelector((state: RootState) =>
-    selectPaymentOverrideByTransactionId(state, transactionMeta?.id ?? ''),
-  );
-  const isMoneyAccountWithdraw =
-    paymentOverride === PaymentOverride.MoneyAccount;
-
   const isPerpsWithdraw = hasTransactionType(transactionMeta, [
     TransactionType.perpsWithdraw,
   ]);
@@ -70,25 +63,7 @@ export function useInsufficientPerpsBalanceAlert({
       totals?.fees &&
       new BigNumber(amountHuman).isGreaterThan(0)
     ) {
-      const totalFees = new BigNumber(totals.fees.provider?.usd ?? 0)
-        .plus(totals.fees.sourceNetwork?.estimate?.usd ?? 0)
-        .plus(totals.fees.targetNetwork?.usd ?? 0)
-        .plus(totals.fees.metaMask?.usd ?? 0);
-
-      if (totalFees.isGreaterThanOrEqualTo(amountHuman)) {
-        return true;
-      }
-
-      // Standard withdrawals deduct fees from the receive amount, so only
-      // money-account withdrawals need balance to cover amount + fees.
-      if (
-        isMoneyAccountWithdraw &&
-        withdrawableBalance !== undefined &&
-        withdrawableBalance !== null &&
-        new BigNumber(amountHuman)
-          .plus(totalFees)
-          .isGreaterThan(withdrawableBalance)
-      ) {
+      if (getTotalPayFeesUsd(totals.fees).isGreaterThanOrEqualTo(amountHuman)) {
         return true;
       }
     }
@@ -97,7 +72,6 @@ export function useInsufficientPerpsBalanceAlert({
   }, [
     amountHuman,
     hasQuotes,
-    isMoneyAccountWithdraw,
     isPendingInput,
     isPerpsWithdraw,
     withdrawableBalance,
diff --git a/app/components/Views/confirmations/hooks/alerts/useInsufficientPredictBalanceAlert.test.ts b/app/components/Views/confirmations/hooks/alerts/useInsufficientPredictBalanceAlert.test.ts
index 17799c12c002..8f3afce7fe7b 100644
--- a/app/components/Views/confirmations/hooks/alerts/useInsufficientPredictBalanceAlert.test.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useInsufficientPredictBalanceAlert.test.ts
@@ -128,7 +128,7 @@ describe('useInsufficientPredictBalanceAlert', () => {
     expect(result.current).toStrictEqual([]);
   });
 
-  it('returns alert when amount + fees exceed predict balance', () => {
+  it('returns alert when fees consume the entire withdraw amount', () => {
     usePredictBalanceMock.mockReturnValue({ data: 0.04 } as never);
     useTokenAmountMock.mockReturnValue({
       amountPrecise: '0.04',
@@ -153,6 +153,30 @@ describe('useInsufficientPredictBalanceAlert', () => {
     expect(result.current[0].key).toBe(AlertKeys.InsufficientPredictBalance);
   });
 
+  it('does not alert when amount + fees exceed balance but fees are below amount', () => {
+    usePredictBalanceMock.mockReturnValue({ data: 40 } as never);
+    useTokenAmountMock.mockReturnValue({
+      amountPrecise: '40',
+    } as ReturnType<typeof useTokenAmount>);
+
+    jest
+      .mocked(useTransactionPayQuotes)
+      .mockReturnValue([{} as TransactionPayQuote<Json>]);
+
+    useTransactionPayTotalsMock.mockReturnValue({
+      fees: {
+        provider: { usd: '5' },
+        sourceNetwork: { estimate: { usd: '1' } },
+        targetNetwork: { usd: '0' },
+        metaMask: { usd: '0' },
+      },
+    } as unknown as TransactionPayTotals);
+
+    const { result } = runHook();
+
+    expect(result.current).toStrictEqual([]);
+  });
+
   it('does not trigger fee check during pending input', () => {
     usePredictBalanceMock.mockReturnValue({ data: 0.04 } as never);
 
diff --git a/app/components/Views/confirmations/hooks/alerts/useInsufficientPredictBalanceAlert.ts b/app/components/Views/confirmations/hooks/alerts/useInsufficientPredictBalanceAlert.ts
index 8ee7363cd8b0..426dacbcc42c 100644
--- a/app/components/Views/confirmations/hooks/alerts/useInsufficientPredictBalanceAlert.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useInsufficientPredictBalanceAlert.ts
@@ -16,6 +16,7 @@ import {
   useTransactionPayQuotes,
   useTransactionPayTotals,
 } from '../pay/useTransactionPayData';
+import { getTotalPayFeesUsd } from '../../utils/transaction-pay';
 
 export function useInsufficientPredictBalanceAlert({
   pendingAmount,
@@ -44,23 +45,16 @@ export function useInsufficientPredictBalanceAlert({
       return true;
     }
 
-    // Skip during input — totals may be stale.
+    // Predict withdraws are EXACT_INPUT: fees are deducted from the receive
+    // amount, never added on top of the entered amount. Only guard against
+    // fees consuming the entire withdrawal.
     if (
       !isPendingInput &&
       hasQuotes &&
       totals?.fees &&
       new BigNumber(amountHuman).isGreaterThan(0)
     ) {
-      const totalFees = new BigNumber(totals.fees.provider?.usd ?? 0)
-        .plus(totals.fees.sourceNetwork?.estimate?.usd ?? 0)
-        .plus(totals.fees.targetNetwork?.usd ?? 0)
-        .plus(totals.fees.metaMask?.usd ?? 0);
-
-      if (
-        new BigNumber(amountHuman)
-          .plus(totalFees)
-          .isGreaterThan(predictBalanceHuman ?? '0')
-      ) {
+      if (getTotalPayFeesUsd(totals.fees).isGreaterThanOrEqualTo(amountHuman)) {
         return true;
       }
     }
diff --git a/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.test.ts b/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.test.ts
index 5ef89ad56339..133f634d4994 100644
--- a/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.test.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.test.ts
@@ -2,7 +2,7 @@ import { cloneDeep, merge } from 'lodash';
 import { renderHookWithProvider } from '../../../../../util/test/renderWithProvider';
 import { transactionApprovalControllerMock } from '../../__mocks__/controllers/approval-controller-mock';
 import { simpleSendTransactionControllerMock } from '../../__mocks__/controllers/transaction-controller-mock';
-import { Severity } from '../../types/alerts';
+import { Alert, Severity } from '../../types/alerts';
 import { useNoPayTokenQuotesAlert } from './useNoPayTokenQuotesAlert';
 import { RootState } from '../../../../../reducers';
 import { useTransactionPayToken } from '../pay/useTransactionPayToken';
@@ -15,6 +15,7 @@ import {
   useTransactionPayFiatPayment,
   useTransactionPayIsMaxAmount,
   useTransactionPayIsPostQuote,
+  useTransactionPayQuoteError,
   useTransactionPayQuotesRaw,
   useTransactionPayRequiredTokens,
 } from '../pay/useTransactionPayData';
@@ -91,6 +92,7 @@ describe('useNoPayTokenQuotesAlert', () => {
     });
     jest.mocked(useTransactionPayFiatPayment).mockReturnValue(undefined);
     jest.mocked(useTransactionPayIsMaxAmount).mockReturnValue(false);
+    jest.mocked(useTransactionPayQuoteError).mockReturnValue(undefined);
   });
 
   it('returns alert if pay token selected and no quotes available', () => {
@@ -108,6 +110,29 @@ describe('useNoPayTokenQuotesAlert', () => {
     ]);
   });
 
+  it('uses quoteError message and detail when present', () => {
+    const quoteError = {
+      message: 'Insufficient balance',
+      reason: 'insufficient-source-balance' as const,
+      detail: ['Required: 1.5 USDC', 'Current: 1 USDC', 'Missing: 0.5 USDC'],
+    };
+    jest.mocked(useTransactionPayQuoteError).mockReturnValue(quoteError);
+
+    const { result } = runHook();
+
+    expect(result.current).toHaveLength(1);
+    const resultAlert = result.current[0] as Alert;
+    expect(resultAlert.key).toBe(AlertKeys.NoPayTokenQuotes);
+    expect(resultAlert.field).toBe(RowAlertKey.PayWith);
+    expect(resultAlert.content).toBeDefined();
+    expect(resultAlert.message).toBe('Insufficient balance');
+    expect(resultAlert.title).toBe(
+      strings('alert_system.no_pay_token_quotes.title'),
+    );
+    expect(resultAlert.severity).toBe(Severity.Danger);
+    expect(resultAlert.isBlocking).toBe(true);
+  });
+
   it('returns no alerts if quotes available', () => {
     useTransactionPayQuotesRawMock.mockReturnValue([
       {} as TransactionPayQuote<Json>,
diff --git a/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.ts b/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.tsx
similarity index 86%
rename from app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.ts
rename to app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.tsx
index 555253c77971..6b5ad4788cdb 100644
--- a/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.tsx
@@ -1,7 +1,8 @@
+import React, { useMemo } from 'react';
 import { hasTransactionType } from '@metamask/transaction-controller';
 
 import { useTransactionPayToken } from '../pay/useTransactionPayToken';
-import { useMemo } from 'react';
+import { NoQuoteAlert } from '../../components/alerts/no-quote-alert';
 import { AlertKeys } from '../../constants/alerts';
 import { RowAlertKey } from '../../components/UI/info-row/alert-row/constants';
 import { Severity } from '../../types/alerts';
@@ -11,6 +12,7 @@ import {
   useTransactionPayFiatPayment,
   useTransactionPayIsMaxAmount,
   useTransactionPayIsPostQuote,
+  useTransactionPayQuoteError,
   useTransactionPayQuotesRaw,
   useTransactionPayRequiredTokens,
 } from '../pay/useTransactionPayData';
@@ -31,6 +33,7 @@ export function useNoPayTokenQuotesAlert() {
   const isMaxAmount = useTransactionPayIsMaxAmount();
   const transactionMeta = useTransactionMetadataRequest();
   const { canSelectWithdrawToken } = useTransactionPayWithdraw();
+  const quoteError = useTransactionPayQuoteError();
 
   const fiatAmount = Number(fiatPayment?.amountFiat);
   const hasValidFiatAmount = Number.isFinite(fiatAmount) && fiatAmount > 0;
@@ -110,13 +113,19 @@ export function useNoPayTokenQuotesAlert() {
     !payToken &&
     !hasSelectedFiatPaymentMethod;
 
+  // A quote may be returned but fail validation (e.g. insufficient balance).
+  // The quote still renders prices/fees, but the alert blocks confirmation and
+  // surfaces the structured reason and detail rows provided by core.
+  const shouldShowQuoteErrorAlert = Boolean(quoteError);
+
   const showAlert =
     shouldShowNonFiatNoQuotesAlert ||
     shouldShowFiatNoQuotesAlert ||
     shouldShowPostQuoteNoQuotesAlert ||
     shouldShowQuoteRequiredNoQuotesAlert ||
     shouldShowWithdrawNotInitialisedAlert ||
-    shouldShowPayTokenNotSelectedAlert;
+    shouldShowPayTokenNotSelectedAlert ||
+    shouldShowQuoteErrorAlert;
 
   return useMemo(() => {
     if (!showAlert) {
@@ -127,11 +136,16 @@ export function useNoPayTokenQuotesAlert() {
       {
         key: AlertKeys.NoPayTokenQuotes,
         field: RowAlertKey.PayWith,
-        message: strings('alert_system.no_pay_token_quotes.message'),
+        ...(quoteError
+          ? {
+              content: <NoQuoteAlert error={quoteError} />,
+              message: quoteError.message,
+            }
+          : { message: strings('alert_system.no_pay_token_quotes.message') }),
         title: strings('alert_system.no_pay_token_quotes.title'),
         severity: Severity.Danger,
         isBlocking: true,
       },
     ];
-  }, [showAlert]);
+  }, [showAlert, quoteError]);
 }
diff --git a/app/components/Views/confirmations/hooks/custom-amount/useCustomAmountStage.test.ts b/app/components/Views/confirmations/hooks/custom-amount/useCustomAmountStage.test.ts
index 5c3c822f463f..87b1bf366cbe 100644
--- a/app/components/Views/confirmations/hooks/custom-amount/useCustomAmountStage.test.ts
+++ b/app/components/Views/confirmations/hooks/custom-amount/useCustomAmountStage.test.ts
@@ -142,6 +142,18 @@ describe('useCustomAmountStage', () => {
       expect(result.current.stage).toBe(CustomAmountStage.ShowTotals);
     });
 
+    it('keeps showing prefetched totals during a background quote refresh', () => {
+      setupState({
+        isQuotesLoading: true,
+        quotes: [{}],
+        quotesLastUpdated: 1,
+      });
+
+      const { result } = runDerived({ hasPrefetchedQuote: true });
+
+      expect(result.current.stage).toBe(CustomAmountStage.ShowTotals);
+    });
+
     it('derives NoQuote when the fetch settled with no quotes', () => {
       setupState({ isQuotesLoading: false, quotes: [] });
 
@@ -224,6 +236,22 @@ describe('useCustomAmountStage', () => {
       expect(result.current.stage).toBe(CustomAmountStage.Loading);
     });
 
+    it('clears a Loading commit immediately when the current amount was prefetched', () => {
+      setupState({
+        isQuotesLoading: true,
+        quotes: [{}],
+        quotesLastUpdated: 1,
+      });
+
+      const { result } = runHook({ hasPrefetchedQuote: true });
+
+      act(() => {
+        result.current.setStage(CustomAmountStage.Loading);
+      });
+
+      expect(result.current.stage).toBe(CustomAmountStage.ShowTotals);
+    });
+
     it('clears a no-op Loading re-commit immediately (amount unchanged)', () => {
       // Fetch has settled with quotes present, so once the override clears the
       // derived stage is ShowTotals.
diff --git a/app/components/Views/confirmations/hooks/custom-amount/useCustomAmountStage.ts b/app/components/Views/confirmations/hooks/custom-amount/useCustomAmountStage.ts
index 1da3ea95ee1e..b2b33c15e4b0 100644
--- a/app/components/Views/confirmations/hooks/custom-amount/useCustomAmountStage.ts
+++ b/app/components/Views/confirmations/hooks/custom-amount/useCustomAmountStage.ts
@@ -27,6 +27,7 @@ export enum CustomAmountStage {
  * @param options.amountFiat - Current fiat amount; detects a no-op re-commit
  * (unchanged amount → skip the loading window, no fetch will follow).
  * @param options.hasAccountNoFunds - Whether the account-no-funds alert is active.
+ * @param options.hasPrefetchedQuote - Whether the current amount already has a quote.
  * @param options.isAddMusdIntent - Whether this is an add-mUSD deposit.
  * @param options.isDepositPrefillEnabled - Whether deposit prefill is enabled.
  * @param options.isDepositPrefillLoading - Whether a deposit prefill is loading.
@@ -37,6 +38,7 @@ export function useCustomAmountStage({
   amountFiat,
   disablePay,
   hasAccountNoFunds,
+  hasPrefetchedQuote = false,
   isAddMusdIntent,
   isDepositPrefillEnabled,
   isDepositPrefillLoading,
@@ -45,6 +47,7 @@ export function useCustomAmountStage({
   amountFiat: string;
   disablePay: boolean | undefined;
   hasAccountNoFunds: boolean;
+  hasPrefetchedQuote?: boolean;
   isAddMusdIntent: boolean;
   isDepositPrefillEnabled: boolean;
   isDepositPrefillLoading: boolean;
@@ -108,7 +111,7 @@ export function useCustomAmountStage({
       // required-token amount may never resolve. There is nothing to await once
       // the amount is committed, so settle on the arm frame itself — the settle
       // branch below is never re-entered when no reactive input changes.
-      if (isNoOpRecommit || disablePay) {
+      if (isNoOpRecommit || disablePay || hasPrefetchedQuote) {
         setStage(null);
       }
       return;
@@ -130,6 +133,7 @@ export function useCustomAmountStage({
     amountFiat,
     disablePay,
     hasAmount,
+    hasPrefetchedQuote,
     hasQuotes,
     isQuotesLoading,
     quotesLastUpdated,
@@ -163,7 +167,7 @@ export function useCustomAmountStage({
   // Derive from reactive inputs. Stay in Loading while quotes fetch or a
   // prefill preload resolves; otherwise show totals when quotes exist, or fall
   // through to NoQuote when a settled fetch produced none.
-  if (isQuotesLoading || isAwaitingPrefillResult) {
+  if ((isQuotesLoading && !hasPrefetchedQuote) || isAwaitingPrefillResult) {
     return { setStage, stage: CustomAmountStage.Loading };
   }
 
diff --git a/app/components/Views/confirmations/hooks/earn/useCustomAmount.test.ts b/app/components/Views/confirmations/hooks/earn/useCustomAmount.test.ts
deleted file mode 100644
index f407f6d95e48..000000000000
--- a/app/components/Views/confirmations/hooks/earn/useCustomAmount.test.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import { renderHook } from '@testing-library/react-native';
-import { TransactionType } from '@metamask/transaction-controller';
-import { useSelector } from 'react-redux';
-import { useCustomAmount } from './useCustomAmount';
-import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
-import { selectIsMusdConversionFlowEnabledFlag } from '../../../../UI/Earn/selectors/featureFlags';
-import { useMusdConversionEligibility } from '../../../../UI/Earn/hooks/useMusdConversionEligibility';
-
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'),
-  useSelector: jest.fn(),
-}));
-jest.mock('../transactions/useTransactionMetadataRequest');
-jest.mock('../../../../UI/Earn/selectors/featureFlags');
-jest.mock('../../../../UI/Earn/hooks/useMusdConversionEligibility');
-
-const mockUseMusdConversionEligibility = jest.mocked(
-  useMusdConversionEligibility,
-);
-
-const mockUseSelector = jest.mocked(useSelector);
-const mockUseTransactionMetadataRequest = jest.mocked(
-  useTransactionMetadataRequest,
-);
-
-describe('useCustomAmount', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockUseSelector.mockImplementation((selector) => {
-      if (selector === selectIsMusdConversionFlowEnabledFlag) {
-        return true;
-      }
-      return undefined;
-    });
-    mockUseMusdConversionEligibility.mockReturnValue({
-      isEligible: true,
-      isLoading: false,
-      geolocation: 'US',
-      blockedCountries: [],
-    });
-  });
-
-  describe('non-mUSD transactions', () => {
-    it('returns shouldShowOutputAmountTag false for non-mUSD transaction types', () => {
-      mockUseTransactionMetadataRequest.mockReturnValue({
-        type: TransactionType.perpsDeposit,
-      } as ReturnType<typeof useTransactionMetadataRequest>);
-
-      const { result } = renderHook(() =>
-        useCustomAmount({ amountHuman: '100' }),
-      );
-
-      expect(result.current.shouldShowOutputAmountTag).toBe(false);
-      expect(result.current.outputAmount).toBeNull();
-      expect(result.current.outputSymbol).toBeNull();
-    });
-
-    it('returns shouldShowOutputAmountTag false for predictDeposit transaction', () => {
-      mockUseTransactionMetadataRequest.mockReturnValue({
-        type: TransactionType.predictDeposit,
-      } as ReturnType<typeof useTransactionMetadataRequest>);
-
-      const { result } = renderHook(() =>
-        useCustomAmount({ amountHuman: '500' }),
-      );
-
-      expect(result.current.shouldShowOutputAmountTag).toBe(false);
-      expect(result.current.outputAmount).toBeNull();
-      expect(result.current.outputSymbol).toBeNull();
-    });
-
-    it('returns shouldShowOutputAmountTag false when transaction is undefined', () => {
-      mockUseTransactionMetadataRequest.mockReturnValue(undefined);
-
-      const { result } = renderHook(() =>
-        useCustomAmount({ amountHuman: '100' }),
-      );
-
-      expect(result.current.shouldShowOutputAmountTag).toBe(false);
-      expect(result.current.outputAmount).toBeNull();
-      expect(result.current.outputSymbol).toBeNull();
-    });
-
-    it('returns shouldShowOutputAmountTag false when mUSD feature flag is disabled', () => {
-      mockUseSelector.mockImplementation((selector) => {
-        if (selector === selectIsMusdConversionFlowEnabledFlag) {
-          return false;
-        }
-        return undefined;
-      });
-      mockUseTransactionMetadataRequest.mockReturnValue({
-        type: TransactionType.musdConversion,
-      } as ReturnType<typeof useTransactionMetadataRequest>);
-
-      const { result } = renderHook(() =>
-        useCustomAmount({ amountHuman: '100' }),
-      );
-
-      expect(result.current.shouldShowOutputAmountTag).toBe(false);
-    });
-
-    it('returns shouldShowOutputAmountTag false when user is geo-blocked', () => {
-      mockUseMusdConversionEligibility.mockReturnValue({
-        isEligible: false,
-        isLoading: false,
-        geolocation: 'GB',
-        blockedCountries: ['GB'],
-      });
-      mockUseTransactionMetadataRequest.mockReturnValue({
-        type: TransactionType.musdConversion,
-      } as ReturnType<typeof useTransactionMetadataRequest>);
-
-      const { result } = renderHook(() =>
-        useCustomAmount({ amountHuman: '100' }),
-      );
-
-      expect(result.current.shouldShowOutputAmountTag).toBe(false);
-      expect(result.current.outputAmount).toBeNull();
-      expect(result.current.outputSymbol).toBeNull();
-    });
-  });
-
-  describe('output amount tag', () => {
-    describe('mUSD conversion transactions', () => {
-      beforeEach(() => {
-        mockUseTransactionMetadataRequest.mockReturnValue({
-          type: TransactionType.musdConversion,
-        } as ReturnType<typeof useTransactionMetadataRequest>);
-      });
-
-      it('returns shouldShowOutputAmountTag true for mUSD conversion', () => {
-        const { result } = renderHook(() =>
-          useCustomAmount({ amountHuman: '100' }),
-        );
-
-        expect(result.current.shouldShowOutputAmountTag).toBe(true);
-      });
-
-      it('returns formatted outputAmount with 2 decimal places', () => {
-        const { result } = renderHook(() =>
-          useCustomAmount({ amountHuman: '100.5678' }),
-        );
-
-        expect(result.current.outputAmount).toBe('100.57');
-      });
-
-      it('returns outputAmount for whole numbers', () => {
-        const { result } = renderHook(() =>
-          useCustomAmount({ amountHuman: '250' }),
-        );
-
-        expect(result.current.outputAmount).toBe('250');
-      });
-
-      it('returns 0 outputAmount for empty string', () => {
-        const { result } = renderHook(() =>
-          useCustomAmount({ amountHuman: '' }),
-        );
-
-        expect(result.current.outputAmount).toBe('0');
-      });
-
-      it('returns mUSD as outputSymbol for mUSD conversion', () => {
-        const { result } = renderHook(() =>
-          useCustomAmount({ amountHuman: '100' }),
-        );
-
-        expect(result.current.outputSymbol).toBe('mUSD');
-      });
-    });
-  });
-});
diff --git a/app/components/Views/confirmations/hooks/earn/useCustomAmount.tsx b/app/components/Views/confirmations/hooks/earn/useCustomAmount.tsx
deleted file mode 100644
index b282b136304a..000000000000
--- a/app/components/Views/confirmations/hooks/earn/useCustomAmount.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import {
-  TransactionType,
-  hasTransactionType,
-} from '@metamask/transaction-controller';
-import { useMemo } from 'react';
-import { useSelector } from 'react-redux';
-import { limitToMaximumDecimalPlaces } from '../../../../../util/number';
-import { selectIsMusdConversionFlowEnabledFlag } from '../../../../UI/Earn/selectors/featureFlags';
-import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
-import { useMusdConversionEligibility } from '../../../../UI/Earn/hooks/useMusdConversionEligibility';
-
-export interface UseCustomAmountParams {
-  /**
-   * The human-readable amount (e.g., "100.50")
-   * Used to calculate output amount display
-   */
-  amountHuman: string;
-}
-
-export interface UseCustomAmountResult {
-  /** Whether to show an output amount tag instead of PayTokenAmount */
-  shouldShowOutputAmountTag: boolean;
-  /** Output amount for the tag (formatted, null when not applicable) */
-  outputAmount: string | null;
-  /** Symbol for the output amount (null when not applicable) */
-  outputSymbol: string | null;
-}
-
-/**
- * Hook for managing custom amount logic in custom amount flows.
- * Encapsulates transaction type detection, points calculation, and tooltip state.
- *
- * @param params - Hook parameters including the amount for points calculation
- * @returns Custom amount state and callbacks for UI integration
- */
-export const useCustomAmount = ({
-  amountHuman,
-}: UseCustomAmountParams): UseCustomAmountResult => {
-  const isMusdConversionFlowEnabled = useSelector(
-    selectIsMusdConversionFlowEnabledFlag,
-  );
-  const { isEligible: isGeoEligible } = useMusdConversionEligibility();
-  const transactionMeta = useTransactionMetadataRequest();
-  const isMusdConversion =
-    isMusdConversionFlowEnabled &&
-    isGeoEligible &&
-    hasTransactionType(transactionMeta, [TransactionType.musdConversion]);
-
-  // Output amount tag logic - currently for mUSD conversion only
-  const shouldShowOutputAmountTag = isMusdConversion;
-
-  const outputAmount = useMemo(() => {
-    if (!shouldShowOutputAmountTag) {
-      return null;
-    }
-    return limitToMaximumDecimalPlaces(parseFloat(amountHuman) || 0, 2);
-  }, [shouldShowOutputAmountTag, amountHuman]);
-
-  const outputSymbol = useMemo(() => {
-    if (!shouldShowOutputAmountTag) {
-      return null;
-    }
-    // For mUSD conversion, the output symbol is always mUSD
-    return 'mUSD';
-  }, [shouldShowOutputAmountTag]);
-
-  return {
-    shouldShowOutputAmountTag,
-    outputAmount,
-    outputSymbol,
-  };
-};
diff --git a/app/components/Views/confirmations/hooks/gas/useTransactionMaxGasCost.test.ts b/app/components/Views/confirmations/hooks/gas/useTransactionMaxGasCost.test.ts
deleted file mode 100644
index 1b0f6703b0bb..000000000000
--- a/app/components/Views/confirmations/hooks/gas/useTransactionMaxGasCost.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import {
-  TransactionMeta,
-  TransactionParams,
-} from '@metamask/transaction-controller';
-import { renderHookWithProvider } from '../../../../../util/test/renderWithProvider';
-import { useTransactionMaxGasCost } from './useTransactionMaxGasCost';
-import { simpleSendTransactionControllerMock } from '../../__mocks__/controllers/transaction-controller-mock';
-import { transactionApprovalControllerMock } from '../../__mocks__/controllers/approval-controller-mock';
-import { cloneDeep, merge } from 'lodash';
-
-function runHook({
-  noTransaction,
-  txParams,
-}: { noTransaction?: boolean; txParams?: Partial<TransactionParams> } = {}) {
-  const state = cloneDeep(
-    merge(
-      simpleSendTransactionControllerMock,
-      transactionApprovalControllerMock,
-    ),
-  );
-
-  if (txParams) {
-    const transactionMeta = state.engine.backgroundState.TransactionController
-      .transactions[0] as TransactionMeta;
-
-    transactionMeta.txParams = {
-      ...transactionMeta.txParams,
-      ...txParams,
-    };
-  }
-
-  if (noTransaction) {
-    state.engine.backgroundState.TransactionController.transactions = [];
-  }
-
-  return renderHookWithProvider(useTransactionMaxGasCost, { state }).result
-    .current;
-}
-
-describe('useTransactionMaxGasCost', () => {
-  it('returns undefined if no transaction', () => {
-    const result = runHook({ noTransaction: true });
-    expect(result).toBeUndefined();
-  });
-
-  it('returns total cost if EIP-1559', () => {
-    const result = runHook({ txParams: { maxFeePerGas: '0x3', gas: '0x4' } });
-    expect(result).toBe('0xc');
-  });
-
-  it('returns total cost if legacy', () => {
-    const result = runHook({
-      txParams: { gasPrice: '0x2', gas: '0x4', maxFeePerGas: undefined },
-    });
-    expect(result).toBe('0x8');
-  });
-});
diff --git a/app/components/Views/confirmations/hooks/gas/useTransactionMaxGasCost.ts b/app/components/Views/confirmations/hooks/gas/useTransactionMaxGasCost.ts
deleted file mode 100644
index 0274fc50590a..000000000000
--- a/app/components/Views/confirmations/hooks/gas/useTransactionMaxGasCost.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Hex, add0x } from '@metamask/utils';
-import { decimalToHex, multiplyHexes } from '../../../../../util/conversions';
-import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
-
-export const useTransactionMaxGasCost = () => {
-  const transactionMetadata = useTransactionMetadataRequest();
-
-  if (!transactionMetadata) {
-    return undefined;
-  }
-
-  const { txParams } = transactionMetadata;
-  const { maxFeePerGas, gas, gasPrice } = txParams;
-
-  return add0x(
-    multiplyHexes(
-      maxFeePerGas ? (decimalToHex(maxFeePerGas) as Hex) : (gasPrice as Hex),
-      gas as Hex,
-    ),
-  );
-};
diff --git a/app/components/Views/confirmations/hooks/pay/sections/useClearPaymentOverride.test.ts b/app/components/Views/confirmations/hooks/pay/sections/useClearPaymentOverride.test.ts
index 6ef8066c7d2d..2220093c1e52 100644
--- a/app/components/Views/confirmations/hooks/pay/sections/useClearPaymentOverride.test.ts
+++ b/app/components/Views/confirmations/hooks/pay/sections/useClearPaymentOverride.test.ts
@@ -1,10 +1,11 @@
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useSelector } from 'react-redux';
 import { PaymentOverride } from '@metamask/transaction-pay-controller';
+import { TransactionType } from '@metamask/transaction-controller';
 import Engine from '../../../../../../core/Engine';
-import { selectPaymentOverrideByTransactionId } from '../../../../../../selectors/transactionPayController';
 import { useTransactionMetadataRequest } from '../../transactions/useTransactionMetadataRequest';
 import { useClearPaymentOverride } from './useClearPaymentOverride';
+import type { RootState } from '../../../../../../reducers';
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -30,6 +31,33 @@ describe('useClearPaymentOverride', () => {
     Engine.context.TransactionPayController.setTransactionConfig,
   );
 
+  function mockSelectors({
+    paymentOverride,
+    isMaxAmount = false,
+  }: {
+    paymentOverride?: PaymentOverride;
+    isMaxAmount?: boolean;
+  }) {
+    const state = {
+      engine: {
+        backgroundState: {
+          TransactionPayController: {
+            transactionData: {
+              [TRANSACTION_ID]: {
+                paymentOverride,
+                isMaxAmount,
+              },
+            },
+          },
+        },
+      },
+    } as unknown as RootState;
+
+    useSelectorMock.mockImplementation((selector) =>
+      (selector as (s: RootState) => unknown)(state),
+    );
+  }
+
   beforeEach(() => {
     jest.clearAllMocks();
     useTransactionMetadataRequestMock.mockReturnValue({
@@ -37,8 +65,8 @@ describe('useClearPaymentOverride', () => {
     } as never);
   });
 
-  it('clears paymentOverride and refundTo when override is active', () => {
-    useSelectorMock.mockReturnValue(PaymentOverride.MoneyAccount);
+  it('clears paymentOverride, refundTo, and atomic when override is active', () => {
+    mockSelectors({ paymentOverride: PaymentOverride.MoneyAccount });
 
     const { result } = renderHook(() => useClearPaymentOverride());
 
@@ -52,16 +80,91 @@ describe('useClearPaymentOverride', () => {
     );
 
     const config = {
+      paymentOverride: PaymentOverride.MoneyAccount,
+      refundTo: '0xsomeaddress',
+      atomic: false,
+    } as Record<string, unknown>;
+    setTransactionConfigMock.mock.calls[0][1](config as never);
+
+    expect(config.paymentOverride).toBeUndefined();
+    expect(config.refundTo).toBeUndefined();
+    expect(config.atomic).toBeUndefined();
+  });
+
+  it('keeps atomic false for a max-amount money account deposit', () => {
+    useTransactionMetadataRequestMock.mockReturnValue({
+      id: TRANSACTION_ID,
+      type: TransactionType.moneyAccountDeposit,
+    } as never);
+    mockSelectors({
+      paymentOverride: PaymentOverride.MoneyAccount,
+      isMaxAmount: true,
+    });
+
+    const { result } = renderHook(() => useClearPaymentOverride());
+
+    act(() => {
+      result.current();
+    });
+
+    const config = {
+      paymentOverride: PaymentOverride.MoneyAccount,
       refundTo: '0xsomeaddress',
+      atomic: false,
     } as Record<string, unknown>;
     setTransactionConfigMock.mock.calls[0][1](config as never);
 
     expect(config.paymentOverride).toBeUndefined();
     expect(config.refundTo).toBeUndefined();
+    expect(config.atomic).toBe(false);
+  });
+
+  it('clears atomic for a non-max money account deposit', () => {
+    useTransactionMetadataRequestMock.mockReturnValue({
+      id: TRANSACTION_ID,
+      type: TransactionType.moneyAccountDeposit,
+    } as never);
+    mockSelectors({
+      paymentOverride: PaymentOverride.MoneyAccount,
+      isMaxAmount: false,
+    });
+
+    const { result } = renderHook(() => useClearPaymentOverride());
+
+    act(() => {
+      result.current();
+    });
+
+    const config = { atomic: false } as Record<string, unknown>;
+    setTransactionConfigMock.mock.calls[0][1](config as never);
+
+    expect(config.atomic).toBeUndefined();
+  });
+
+  it('clears atomic for a max-amount non-deposit transaction', () => {
+    useTransactionMetadataRequestMock.mockReturnValue({
+      id: TRANSACTION_ID,
+      type: TransactionType.perpsWithdraw,
+    } as never);
+    mockSelectors({
+      paymentOverride: PaymentOverride.MoneyAccount,
+      isMaxAmount: true,
+    });
+
+    const { result } = renderHook(() => useClearPaymentOverride());
+
+    act(() => {
+      result.current();
+    });
+
+    const config = { atomic: false } as Record<string, unknown>;
+    setTransactionConfigMock.mock.calls[0][1](config as never);
+
+    expect(config.atomic).toBeUndefined();
   });
 
   it('does not call setTransactionConfig when no override is active', () => {
-    useSelectorMock.mockReturnValue(undefined);
+    mockSelectors({ paymentOverride: undefined });
 
     const { result } = renderHook(() => useClearPaymentOverride());
 
@@ -74,7 +177,7 @@ describe('useClearPaymentOverride', () => {
 
   it('does not call setTransactionConfig when transactionId is empty', () => {
     useTransactionMetadataRequestMock.mockReturnValue(undefined);
-    useSelectorMock.mockReturnValue(PaymentOverride.MoneyAccount);
+    mockSelectors({ paymentOverride: PaymentOverride.MoneyAccount });
 
     const { result } = renderHook(() => useClearPaymentOverride());
 
diff --git a/app/components/Views/confirmations/hooks/pay/sections/useClearPaymentOverride.ts b/app/components/Views/confirmations/hooks/pay/sections/useClearPaymentOverride.ts
index df266aa2daad..21e6ace8912f 100644
--- a/app/components/Views/confirmations/hooks/pay/sections/useClearPaymentOverride.ts
+++ b/app/components/Views/confirmations/hooks/pay/sections/useClearPaymentOverride.ts
@@ -1,31 +1,52 @@
 import { useCallback } from 'react';
 import { useSelector } from 'react-redux';
+import {
+  TransactionType,
+  hasTransactionType,
+} from '@metamask/transaction-controller';
 
 import Engine from '../../../../../../core/Engine';
 import { RootState } from '../../../../../../reducers';
-import { selectPaymentOverrideByTransactionId } from '../../../../../../selectors/transactionPayController';
+import {
+  selectPaymentOverrideByTransactionId,
+  selectTransactionPayIsMaxAmountByTransactionId,
+} from '../../../../../../selectors/transactionPayController';
 import { useTransactionMetadataRequest } from '../../transactions/useTransactionMetadataRequest';
 
 /**
  * Clears any active `paymentOverride` on the current transaction.
  * Call from every non-money-account section's press handler so that
  * switching away from money account correctly resets the override.
+ *
+ * `atomic` is re-derived rather than blindly cleared: a max-amount Money
+ * Account deposit sets `atomic: false` independently of the pay-with
+ * selection (via `setMoneyAccountDepositMaxAtomic`), so it must survive a
+ * payment-method switch while `isMaxAmount` remains on.
  */
 export function useClearPaymentOverride() {
-  const transactionId = useTransactionMetadataRequest()?.id ?? '';
+  const transactionMeta = useTransactionMetadataRequest();
+  const transactionId = transactionMeta?.id ?? '';
   const paymentOverride = useSelector((state: RootState) =>
     selectPaymentOverrideByTransactionId(state, transactionId),
   );
+  const isMaxAmount = useSelector((state: RootState) =>
+    selectTransactionPayIsMaxAmountByTransactionId(state, transactionId),
+  );
+  const isMoneyAccountDeposit = hasTransactionType(transactionMeta, [
+    TransactionType.moneyAccountDeposit,
+  ]);
 
   return useCallback(() => {
     if (transactionId && paymentOverride) {
       Engine.context.TransactionPayController.setTransactionConfig(
         transactionId,
         (config) => {
-          (config as Record<string, unknown>).paymentOverride = undefined;
+          config.paymentOverride = undefined;
           config.refundTo = undefined;
+          config.atomic =
+            isMoneyAccountDeposit && isMaxAmount ? false : undefined;
         },
       );
     }
-  }, [paymentOverride, transactionId]);
+  }, [isMaxAmount, isMoneyAccountDeposit, paymentOverride, transactionId]);
 }
diff --git a/app/components/Views/confirmations/hooks/pay/sections/usePayWithMoneyAccountSection.test.tsx b/app/components/Views/confirmations/hooks/pay/sections/usePayWithMoneyAccountSection.test.tsx
index 27bcf4b776c4..7c68ac4cb4cd 100644
--- a/app/components/Views/confirmations/hooks/pay/sections/usePayWithMoneyAccountSection.test.tsx
+++ b/app/components/Views/confirmations/hooks/pay/sections/usePayWithMoneyAccountSection.test.tsx
@@ -285,7 +285,7 @@ describe('usePayWithMoneyAccountSection', () => {
   });
 
   describe('handlePress', () => {
-    it('sets paymentOverride and refundTo on press', () => {
+    it('sets paymentOverride via applyMoneyAccountOverride on press', () => {
       const setConfigMock = jest.mocked(
         Engine.context.TransactionPayController.setTransactionConfig,
       );
@@ -300,8 +300,64 @@ describe('usePayWithMoneyAccountSection', () => {
       const config = {} as Record<string, unknown>;
       setConfigMock.mock.calls[0][1](config as never);
 
+      expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+    });
+
+    it('sets atomic:false for perpsWithdraw', () => {
+      useTransactionMetadataRequestMock.mockReturnValue({
+        id: 'tx-1',
+        type: TransactionType.perpsWithdraw,
+      } as never);
+      const setConfigMock = jest.mocked(
+        Engine.context.TransactionPayController.setTransactionConfig,
+      );
+      const { result } = renderHook(() => usePayWithMoneyAccountSection());
+
+      act(() => {
+        result.current?.rows[0].onPress?.();
+      });
+
+      const config = {} as Record<string, unknown>;
+      setConfigMock.mock.calls[0][1](config as never);
+
+      expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+      expect(config.atomic).toBe(false);
+      expect(config.refundTo).toBeUndefined();
+    });
+
+    it('sets refundTo for moneyAccountDeposit', () => {
+      useTransactionMetadataRequestMock.mockReturnValue({
+        id: 'tx-1',
+        type: TransactionType.moneyAccountDeposit,
+      } as never);
+      useSelectorMock.mockImplementation((selector) => {
+        if (selector === selectPrimaryMoneyAccount) {
+          return moneyAccountMock;
+        }
+        if (selector === selectMetaMaskPayFlags) {
+          return {
+            enableMoneyAccountTransactions: {
+              moneyAccountDeposit: true,
+            },
+          };
+        }
+        return undefined;
+      });
+      const setConfigMock = jest.mocked(
+        Engine.context.TransactionPayController.setTransactionConfig,
+      );
+      const { result } = renderHook(() => usePayWithMoneyAccountSection());
+
+      act(() => {
+        result.current?.rows[0].onPress?.();
+      });
+
+      const config = {} as Record<string, unknown>;
+      setConfigMock.mock.calls[0][1](config as never);
+
       expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
       expect(config.refundTo).toBe(MONEY_ACCOUNT_ADDRESS);
+      expect(config.atomic).toBeUndefined();
     });
 
     it('navigates back on press', () => {
diff --git a/app/components/Views/confirmations/hooks/pay/sections/usePayWithMoneyAccountSection.tsx b/app/components/Views/confirmations/hooks/pay/sections/usePayWithMoneyAccountSection.tsx
index 009fb02f5552..9103691f13dc 100644
--- a/app/components/Views/confirmations/hooks/pay/sections/usePayWithMoneyAccountSection.tsx
+++ b/app/components/Views/confirmations/hooks/pay/sections/usePayWithMoneyAccountSection.tsx
@@ -12,10 +12,7 @@ import { selectMetaMaskPayFlags } from '../../../../../../selectors/featureFlagC
 import { selectPaymentOverrideByTransactionId } from '../../../../../../selectors/transactionPayController';
 import useMoneyAccountBalance from '../../../../../UI/Money/hooks/useMoneyAccountBalance';
 import { useTransactionMetadataRequest } from '../../transactions/useTransactionMetadataRequest';
-import {
-  getTransactionType,
-  isTransactionPayWithdraw,
-} from '../../../utils/transaction';
+import { getTransactionType } from '../../../utils/transaction';
 import { applyMoneyAccountOverride } from '../../../utils/transaction-pay';
 import {
   PayWithRowConfig,
@@ -51,18 +48,16 @@ export function usePayWithMoneyAccountSection(): PayWithSectionConfig | null {
     transactionType && enableMoneyAccountTransactions[transactionType],
   );
 
-  const isWithdraw = isTransactionPayWithdraw(transactionMeta);
-
   const handlePress = useCallback(() => {
     if (transactionId) {
       applyMoneyAccountOverride(
         transactionId,
         moneyAccount?.address,
-        isWithdraw,
+        transactionMeta,
       );
     }
     navigation.goBack();
-  }, [isWithdraw, moneyAccount?.address, navigation, transactionId]);
+  }, [moneyAccount?.address, navigation, transactionId, transactionMeta]);
 
   return useMemo(() => {
     if (!isEnabled || !moneyAccount) {
diff --git a/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.ts b/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.ts
index 828e8b6bd302..df979f8f504f 100644
--- a/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.ts
+++ b/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.ts
@@ -183,6 +183,13 @@ export function useAutomaticTransactionPayToken({
     }
 
     if (autoSelectFiatPayment || tokens.length === 0) {
+      // Do NOT set isUpdated.current here. This return is intentionally
+      // unlatch-able: if isFiatEnabled is false because an incompatible provider
+      // is selected (e.g. Coinbase left over from UB2), useEnsureCompatibleProvider
+      // will dispatch a switch and trigger a re-render. The effect must be free to
+      // re-run on that render and complete fiat selection. Setting the latch here
+      // would silently prevent that re-run and leave the "Pay with..." row as a
+      // permanent skeleton.
       if (!isFiatEnabled || paymentMethods.length === 0) {
         return;
       }
diff --git a/app/components/Views/confirmations/hooks/pay/useDefaultPaySelectedSection.test.ts b/app/components/Views/confirmations/hooks/pay/useDefaultPaySelectedSection.test.ts
index 6d6f9b25db6e..89f2e67841d6 100644
--- a/app/components/Views/confirmations/hooks/pay/useDefaultPaySelectedSection.test.ts
+++ b/app/components/Views/confirmations/hooks/pay/useDefaultPaySelectedSection.test.ts
@@ -82,13 +82,13 @@ describe('useDefaultPaySelectedSection', () => {
     expect(setTransactionConfigMock).not.toHaveBeenCalled();
   });
 
-  it('sets PaymentOverride.MoneyAccount and refundTo for deposit transactions', () => {
+  it('sets PaymentOverride.MoneyAccount and refundTo for moneyAccountDeposit', () => {
     (useParams as jest.Mock).mockReturnValue({
       payWithOption: PayWithOption.MoneyAccount,
     });
     (useTransactionMetadataRequest as jest.Mock).mockReturnValue({
       id: TRANSACTION_ID,
-      type: TransactionType.perpsDeposit,
+      type: TransactionType.moneyAccountDeposit,
     });
 
     render();
@@ -104,15 +104,16 @@ describe('useDefaultPaySelectedSection', () => {
 
     expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
     expect(config.refundTo).toBe(MONEY_ACCOUNT_ADDRESS);
+    expect(config.atomic).toBeUndefined();
   });
 
-  it('clears selectedPaymentMethodId via updateFiatPayment for deposit transactions', () => {
+  it('clears selectedPaymentMethodId via updateFiatPayment', () => {
     (useParams as jest.Mock).mockReturnValue({
       payWithOption: PayWithOption.MoneyAccount,
     });
     (useTransactionMetadataRequest as jest.Mock).mockReturnValue({
       id: TRANSACTION_ID,
-      type: TransactionType.perpsDeposit,
+      type: TransactionType.moneyAccountDeposit,
     });
 
     render();
@@ -131,7 +132,7 @@ describe('useDefaultPaySelectedSection', () => {
     expect(fiatPayment.selectedPaymentMethodId).toBeUndefined();
   });
 
-  it('sets PaymentOverride.MoneyAccount but omits refundTo for withdraw transactions', () => {
+  it('sets atomic:false for perpsWithdraw', () => {
     (useParams as jest.Mock).mockReturnValue({
       payWithOption: PayWithOption.MoneyAccount,
     });
@@ -147,6 +148,47 @@ describe('useDefaultPaySelectedSection', () => {
     callback(config as never);
 
     expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+    expect(config.atomic).toBe(false);
+    expect(config.refundTo).toBeUndefined();
+  });
+
+  it('sets atomic:false for predictWithdraw', () => {
+    (useParams as jest.Mock).mockReturnValue({
+      payWithOption: PayWithOption.MoneyAccount,
+    });
+    (useTransactionMetadataRequest as jest.Mock).mockReturnValue({
+      id: TRANSACTION_ID,
+      type: TransactionType.predictWithdraw,
+    });
+
+    render();
+
+    const callback = setTransactionConfigMock.mock.calls[0][1];
+    const config: Record<string, unknown> = {};
+    callback(config as never);
+
+    expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+    expect(config.atomic).toBe(false);
+    expect(config.refundTo).toBeUndefined();
+  });
+
+  it('sets only paymentOverride for moneyAccountWithdraw (no atomic, refundTo)', () => {
+    (useParams as jest.Mock).mockReturnValue({
+      payWithOption: PayWithOption.MoneyAccount,
+    });
+    (useTransactionMetadataRequest as jest.Mock).mockReturnValue({
+      id: TRANSACTION_ID,
+      type: TransactionType.moneyAccountWithdraw,
+    });
+
+    render();
+
+    const callback = setTransactionConfigMock.mock.calls[0][1];
+    const config: Record<string, unknown> = {};
+    callback(config as never);
+
+    expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+    expect(config.atomic).toBeUndefined();
     expect(config.refundTo).toBeUndefined();
   });
 
@@ -164,7 +206,7 @@ describe('useDefaultPaySelectedSection', () => {
     expect(setTransactionConfigMock).toHaveBeenCalledTimes(1);
   });
 
-  it('omits refundTo when money account has no address', () => {
+  it('omits refundTo when money account has no address for moneyAccountDeposit', () => {
     (selectPrimaryMoneyAccount as unknown as jest.Mock).mockReturnValue(
       undefined,
     );
@@ -173,6 +215,7 @@ describe('useDefaultPaySelectedSection', () => {
     });
     (useTransactionMetadataRequest as jest.Mock).mockReturnValue({
       id: TRANSACTION_ID,
+      type: TransactionType.moneyAccountDeposit,
     });
 
     render();
@@ -186,11 +229,11 @@ describe('useDefaultPaySelectedSection', () => {
   });
 
   describe('defaultPaySelectedSection flag', () => {
-    it('sets PaymentOverride.MoneyAccount with refundTo for deposit when flag is active', () => {
+    it('sets refundTo for moneyAccountDeposit when flag is active', () => {
       (useIsMoneyAccountFlagDefault as jest.Mock).mockReturnValue(true);
       (useTransactionMetadataRequest as jest.Mock).mockReturnValue({
         id: TRANSACTION_ID,
-        type: TransactionType.perpsDeposit,
+        type: TransactionType.moneyAccountDeposit,
       });
 
       render();
@@ -208,7 +251,7 @@ describe('useDefaultPaySelectedSection', () => {
       expect(config.refundTo).toBe(MONEY_ACCOUNT_ADDRESS);
     });
 
-    it('sets PaymentOverride.MoneyAccount without refundTo for withdraw when flag is active', () => {
+    it('sets atomic:false for predictWithdraw when flag is active', () => {
       (useIsMoneyAccountFlagDefault as jest.Mock).mockReturnValue(true);
       (useTransactionMetadataRequest as jest.Mock).mockReturnValue({
         id: TRANSACTION_ID,
@@ -222,6 +265,7 @@ describe('useDefaultPaySelectedSection', () => {
       callback(config as never);
 
       expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+      expect(config.atomic).toBe(false);
       expect(config.refundTo).toBeUndefined();
     });
 
diff --git a/app/components/Views/confirmations/hooks/pay/useDefaultPaySelectedSection.ts b/app/components/Views/confirmations/hooks/pay/useDefaultPaySelectedSection.ts
index be410ed61ee4..e75f2d3b7a65 100644
--- a/app/components/Views/confirmations/hooks/pay/useDefaultPaySelectedSection.ts
+++ b/app/components/Views/confirmations/hooks/pay/useDefaultPaySelectedSection.ts
@@ -8,7 +8,6 @@ import {
   PayWithOption,
 } from '../../components/confirm/confirm-component';
 import { useIsMoneyAccountFlagDefault } from './useIsMoneyAccountFlagDefault';
-import { isTransactionPayWithdraw } from '../../utils/transaction';
 import { applyMoneyAccountOverride } from '../../utils/transaction-pay';
 
 export function useDefaultPaySelectedSection() {
@@ -16,7 +15,6 @@ export function useDefaultPaySelectedSection() {
   const transactionMeta = useTransactionMetadataRequest();
   const moneyAccount = useSelector(selectPrimaryMoneyAccount);
   const isDefaultMoneyAccount = useIsMoneyAccountFlagDefault();
-  const isWithdraw = isTransactionPayWithdraw(transactionMeta);
   const appliedRef = useRef<string | undefined>(undefined);
 
   const isMoneyAccount =
@@ -34,6 +32,10 @@ export function useDefaultPaySelectedSection() {
 
     appliedRef.current = transactionId;
 
-    applyMoneyAccountOverride(transactionId, moneyAccount?.address, isWithdraw);
-  }, [isMoneyAccount, isWithdraw, transactionId, moneyAccount?.address]);
+    applyMoneyAccountOverride(
+      transactionId,
+      moneyAccount?.address,
+      transactionMeta,
+    );
+  }, [isMoneyAccount, transactionId, transactionMeta, moneyAccount?.address]);
 }
diff --git a/app/components/Views/confirmations/hooks/pay/useIsTransactionPayAmountStale.test.ts b/app/components/Views/confirmations/hooks/pay/useIsTransactionPayAmountStale.test.ts
new file mode 100644
index 000000000000..2a41da6ad3c9
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/pay/useIsTransactionPayAmountStale.test.ts
@@ -0,0 +1,142 @@
+import { TransactionPayRequiredToken } from '@metamask/transaction-pay-controller';
+import { Hex } from '@metamask/utils';
+import { merge } from 'lodash';
+import { renderHookWithProvider } from '../../../../../util/test/renderWithProvider';
+import {
+  simpleSendTransactionControllerMock,
+  transactionIdMock,
+} from '../../__mocks__/controllers/transaction-controller-mock';
+import { transactionApprovalControllerMock } from '../../__mocks__/controllers/approval-controller-mock';
+import { useIsTransactionPayAmountStale } from './useIsTransactionPayAmountStale';
+
+const TOKEN_ADDRESS_MOCK = '0x123' as Hex;
+
+function createRequiredToken({
+  amountRaw = '1000000',
+  skipIfBalance = false,
+}: {
+  amountRaw?: string;
+  skipIfBalance?: boolean;
+} = {}): TransactionPayRequiredToken {
+  return {
+    address: TOKEN_ADDRESS_MOCK,
+    amountRaw,
+    skipIfBalance,
+  } as TransactionPayRequiredToken;
+}
+
+function runHook({
+  isMaxAmount = false,
+  isPostQuote = false,
+  tokens,
+}: {
+  isMaxAmount?: boolean;
+  isPostQuote?: boolean;
+  tokens?: TransactionPayRequiredToken[];
+} = {}) {
+  const state = merge(
+    {},
+    simpleSendTransactionControllerMock,
+    transactionApprovalControllerMock,
+    {
+      engine: {
+        backgroundState: {
+          TransactionPayController: {
+            transactionData: {
+              [transactionIdMock]: {
+                isLoading: false,
+                isMaxAmount,
+                isPostQuote,
+                tokens,
+              },
+            },
+          },
+        },
+      },
+    },
+  );
+
+  return renderHookWithProvider(useIsTransactionPayAmountStale, { state });
+}
+
+describe('useIsTransactionPayAmountStale', () => {
+  it('returns false when required tokens are missing', () => {
+    const { result } = runHook({ tokens: undefined });
+
+    expect(result.current).toBe(false);
+  });
+
+  it('returns false when required tokens are empty', () => {
+    const { result } = runHook({ tokens: [] });
+
+    expect(result.current).toBe(false);
+  });
+
+  it('returns true when a required token has amountRaw zero', () => {
+    const { result } = runHook({
+      tokens: [createRequiredToken({ amountRaw: '0' })],
+    });
+
+    expect(result.current).toBe(true);
+  });
+
+  it('returns false when required tokens have a non-zero amount', () => {
+    const { result } = runHook({
+      tokens: [createRequiredToken({ amountRaw: '1000000' })],
+    });
+
+    expect(result.current).toBe(false);
+  });
+
+  it('returns false when only a skipIfBalance token has amountRaw zero', () => {
+    const { result } = runHook({
+      tokens: [
+        createRequiredToken({ amountRaw: '0', skipIfBalance: true }),
+        createRequiredToken({ amountRaw: '1000000' }),
+      ],
+    });
+
+    expect(result.current).toBe(false);
+  });
+
+  it('returns true when any non-skipIfBalance token has amountRaw zero', () => {
+    const { result } = runHook({
+      tokens: [
+        createRequiredToken({ amountRaw: '1000000' }),
+        createRequiredToken({ amountRaw: '0' }),
+      ],
+    });
+
+    expect(result.current).toBe(true);
+  });
+
+  it('returns false for post-quote max when amountRaw is zero', () => {
+    const { result } = runHook({
+      isMaxAmount: true,
+      isPostQuote: true,
+      tokens: [createRequiredToken({ amountRaw: '0' })],
+    });
+
+    expect(result.current).toBe(false);
+  });
+
+  it('returns true for post-quote non-max when amountRaw is zero', () => {
+    const { result } = runHook({
+      isMaxAmount: false,
+      isPostQuote: true,
+      tokens: [createRequiredToken({ amountRaw: '0' })],
+    });
+
+    expect(result.current).toBe(true);
+  });
+
+  it('returns true for pre-quote max when amountRaw is zero', () => {
+    const { result } = runHook({
+      isMaxAmount: true,
+      isPostQuote: false,
+      tokens: [createRequiredToken({ amountRaw: '0' })],
+    });
+
+    expect(result.current).toBe(true);
+  });
+});
diff --git a/app/components/Views/confirmations/hooks/pay/useIsTransactionPayAmountStale.ts b/app/components/Views/confirmations/hooks/pay/useIsTransactionPayAmountStale.ts
new file mode 100644
index 000000000000..0606d90d1589
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/pay/useIsTransactionPayAmountStale.ts
@@ -0,0 +1,37 @@
+import { useMemo } from 'react';
+import {
+  useTransactionPayIsMaxAmount,
+  useTransactionPayIsPostQuote,
+  useTransactionPayRequiredTokens,
+} from './useTransactionPayData';
+
+/**
+ * Whether a required amount has not reached the pay controller yet.
+ *
+ * The amount arrives through a chain of effects, so for a moment after the
+ * amount or the pay token changes the controller still holds a zero amount. It
+ * skips zero amount tokens when building source amounts, so no quote is
+ * requested and nothing reports the pay system as loading. Use this to keep a
+ * CTA disabled until the real amount lands.
+ *
+ * An empty token list is not stale: flows such as claims never fund through
+ * MetaMask Pay and would otherwise never be able to confirm.
+ */
+export function useIsTransactionPayAmountStale() {
+  const requiredTokens = useTransactionPayRequiredTokens();
+  const isMaxAmount = useTransactionPayIsMaxAmount();
+  const isPostQuote = useTransactionPayIsPostQuote();
+
+  // Post-quote max flows source from the token balance, so a zero amount is
+  // expected there and quotes are still requested.
+  const usesBalanceAsAmount = Boolean(isPostQuote && isMaxAmount);
+
+  return useMemo(
+    () =>
+      !usesBalanceAsAmount &&
+      (requiredTokens ?? []).some(
+        (token) => !token.skipIfBalance && token.amountRaw === '0',
+      ),
+    [requiredTokens, usesBalanceAsAmount],
+  );
+}
diff --git a/app/components/Views/confirmations/hooks/pay/useTransactionPayData.ts b/app/components/Views/confirmations/hooks/pay/useTransactionPayData.ts
index f95651647b10..e3de37ee501f 100644
--- a/app/components/Views/confirmations/hooks/pay/useTransactionPayData.ts
+++ b/app/components/Views/confirmations/hooks/pay/useTransactionPayData.ts
@@ -5,6 +5,7 @@ import {
   selectTransactionPayFiatPaymentByTransactionId,
   selectTransactionPayIsMaxAmountByTransactionId,
   selectTransactionPayIsPostQuoteByTransactionId,
+  selectTransactionPayQuoteErrorByTransactionId,
   selectTransactionPayQuotesByTransactionId,
   selectTransactionPayQuotesLastUpdatedByTransactionId,
   selectTransactionPayRawQuotesByTransactionId,
@@ -70,6 +71,10 @@ export function useTransactionPayFiatPayment() {
   return useTransactionPayData(selectTransactionPayFiatPaymentByTransactionId);
 }
 
+export function useTransactionPayQuoteError() {
+  return useTransactionPayData(selectTransactionPayQuoteErrorByTransactionId);
+}
+
 function useTransactionPayData<T>(
   selector: (state: RootState, transactionId: string) => T,
 ) {
diff --git a/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.test.ts b/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.test.ts
index 34fa8f06d4b1..3ffac9c5ba5c 100644
--- a/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.test.ts
+++ b/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.test.ts
@@ -22,7 +22,10 @@ import {
 } from '@metamask/transaction-pay-controller';
 import { Json } from '@metamask/utils';
 import {
+  useIsTransactionPayQuoteLoading,
+  useTransactionPayQuoteError,
   useTransactionPayQuotes,
+  useTransactionPayQuotesRaw,
   useTransactionPayRequiredTokens,
   useTransactionPayFiatPayment,
 } from './useTransactionPayData';
@@ -77,6 +80,10 @@ const QUOTE_MOCK = {
   strategy: TransactionPayStrategy.Relay,
 } as TransactionPayQuote<Json>;
 
+const NOOP_QUOTE_MOCK = {
+  strategy: TransactionPayStrategy.None,
+} as TransactionPayQuote<Json>;
+
 function runHook({ type }: { type?: TransactionType } = {}) {
   const state = merge(
     {},
@@ -97,6 +104,9 @@ describe('useTransactionPayMetrics', () => {
   const useTransactionPayTokenMock = jest.mocked(useTransactionPayToken);
   const updateConfirmationMetricMock = jest.mocked(updateConfirmationMetric);
   const useTransactionPayQuotesMock = jest.mocked(useTransactionPayQuotes);
+  const useTransactionPayQuotesRawMock = jest.mocked(
+    useTransactionPayQuotesRaw,
+  );
 
   const useTransactionPayRequiredTokensMock = jest.mocked(
     useTransactionPayRequiredTokens,
@@ -129,6 +139,16 @@ describe('useTransactionPayMetrics', () => {
   const useTransactionAccountOverrideMock = jest.mocked(
     useTransactionAccountOverride,
   );
+  const useIsTransactionPayQuoteLoadingMock = jest.mocked(
+    useIsTransactionPayQuoteLoading,
+  );
+  const useTransactionPayQuoteErrorMock = jest.mocked(
+    useTransactionPayQuoteError,
+  );
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -149,6 +169,7 @@ describe('useTransactionPayMetrics', () => {
     } as never);
 
     useTransactionPayQuotesMock.mockReturnValue([]);
+    useTransactionPayQuotesRawMock.mockReturnValue([]);
     useAccountTokensMock.mockReturnValue([]);
     mockSelectConfirmationMetricsById.mockReturnValue(undefined);
 
@@ -168,6 +189,8 @@ describe('useTransactionPayMetrics', () => {
     useFiatPaymentHighlightedActionsMock.mockReturnValue([]);
     useTransactionPaySelectedFiatPaymentMethodMock.mockReturnValue(undefined);
     useTransactionAccountOverrideMock.mockReturnValue(undefined);
+    useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+    useTransactionPayQuoteErrorMock.mockReturnValue(undefined);
   });
 
   it('includes available crypto method even before a pay token is selected', async () => {
@@ -1512,4 +1535,333 @@ describe('useTransactionPayMetrics', () => {
       expect(timingDispatches('mm_pay_time_to_load_quote_ms')).toHaveLength(0);
     });
   });
+
+  describe('mm_pay_quote_errors', () => {
+    const lastProps = () =>
+      (
+        updateConfirmationMetricMock.mock.calls.at(-1)?.[0] as {
+          params: { properties: Record<string, unknown> };
+        }
+      )?.params?.properties;
+
+    it('is omitted when no quote errors have occurred', async () => {
+      runHook();
+
+      await act(async () => noop());
+
+      expect(lastProps()).not.toHaveProperty('mm_pay_quote_errors');
+    });
+
+    it('appends one entry when a loading cycle ends with no quotes', async () => {
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: PAY_TOKEN_MOCK,
+        setPayToken: noop,
+      } as ReturnType<typeof useTransactionPayToken>);
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+      useTransactionPayQuotesMock.mockReturnValue([]);
+
+      const { rerender } = runHook();
+
+      await act(async () => noop());
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+
+      rerender({});
+
+      await act(async () => noop());
+
+      expect(lastProps()?.mm_pay_quote_errors).toEqual([
+        {
+          pay_token: {
+            symbol: PAY_TOKEN_MOCK.symbol,
+            chainId: PAY_TOKEN_MOCK.chainId,
+            address: PAY_TOKEN_MOCK.address,
+          },
+          amount: Number(TOKEN_AMOUNT_MOCK),
+          amount_input_type: null,
+          error_message: 'unknown',
+          error_reason: null,
+          error_detail: null,
+        },
+      ]);
+    });
+
+    it('does NOT append when a cycle ends WITH quotes', async () => {
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: PAY_TOKEN_MOCK,
+        setPayToken: noop,
+      } as ReturnType<typeof useTransactionPayToken>);
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+      useTransactionPayQuotesMock.mockReturnValue([]);
+
+      const { rerender } = runHook();
+
+      await act(async () => noop());
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+      useTransactionPayQuotesMock.mockReturnValue([QUOTE_MOCK]);
+      useTransactionPayQuotesRawMock.mockReturnValue([QUOTE_MOCK]);
+
+      rerender({});
+
+      await act(async () => noop());
+
+      expect(lastProps()).not.toHaveProperty('mm_pay_quote_errors');
+    });
+
+    it('does NOT append when a cycle ends with only a no-op quote', async () => {
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: PAY_TOKEN_MOCK,
+        setPayToken: noop,
+      } as ReturnType<typeof useTransactionPayToken>);
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+      useTransactionPayQuotesMock.mockReturnValue([]);
+      useTransactionPayQuotesRawMock.mockReturnValue([]);
+
+      const { rerender } = runHook();
+
+      await act(async () => noop());
+
+      // A completed same-token / no-conversion route: the raw quotes list
+      // holds a single no-op quote while the filtered list is empty. This is
+      // a success, not a quote error.
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+      useTransactionPayQuotesMock.mockReturnValue([]);
+      useTransactionPayQuotesRawMock.mockReturnValue([NOOP_QUOTE_MOCK]);
+
+      rerender({});
+
+      await act(async () => noop());
+
+      expect(lastProps()).not.toHaveProperty('mm_pay_quote_errors');
+    });
+
+    it('records amount_input_type from stored metric', async () => {
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: PAY_TOKEN_MOCK,
+        setPayToken: noop,
+      } as ReturnType<typeof useTransactionPayToken>);
+
+      mockSelectConfirmationMetricsById.mockReturnValue({
+        properties: { mm_pay_amount_input_type: '50%' },
+      });
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+      useTransactionPayQuotesMock.mockReturnValue([]);
+
+      const { rerender } = runHook();
+
+      await act(async () => noop());
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+
+      rerender({});
+
+      await act(async () => noop());
+
+      const errors = lastProps()?.mm_pay_quote_errors as Record<
+        string,
+        unknown
+      >[];
+      expect(errors?.[0]).toMatchObject({
+        amount_input_type: '50%',
+      });
+    });
+
+    it('records amount_input_type as null when no amount input has been made', async () => {
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: PAY_TOKEN_MOCK,
+        setPayToken: noop,
+      } as ReturnType<typeof useTransactionPayToken>);
+
+      mockSelectConfirmationMetricsById.mockReturnValue({});
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+      useTransactionPayQuotesMock.mockReturnValue([]);
+
+      const { rerender } = runHook();
+
+      await act(async () => noop());
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+
+      rerender({});
+
+      await act(async () => noop());
+
+      const errors = lastProps()?.mm_pay_quote_errors as Record<
+        string,
+        unknown
+      >[];
+      expect(errors?.[0]).toMatchObject({
+        amount_input_type: null,
+      });
+    });
+
+    it('accumulates multiple failed cycles oldest-first', async () => {
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: PAY_TOKEN_MOCK,
+        setPayToken: noop,
+      } as ReturnType<typeof useTransactionPayToken>);
+
+      useTransactionPayQuotesMock.mockReturnValue([]);
+
+      const { rerender } = runHook();
+
+      await act(async () => noop());
+
+      // Cycle 1: loading true
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+      rerender({});
+      await act(async () => noop());
+
+      // Cycle 1: loading false (no quotes)
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+      rerender({});
+      await act(async () => noop());
+
+      // Cycle 2: loading true
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+      rerender({});
+      await act(async () => noop());
+
+      // Cycle 2: loading false (no quotes)
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+      rerender({});
+      await act(async () => noop());
+
+      const errors = lastProps()?.mm_pay_quote_errors as unknown[];
+      expect(errors).toHaveLength(2);
+    });
+
+    it('does not duplicate entries on subsequent non-loading re-renders', async () => {
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: PAY_TOKEN_MOCK,
+        setPayToken: noop,
+      } as ReturnType<typeof useTransactionPayToken>);
+
+      useTransactionPayQuotesMock.mockReturnValue([]);
+
+      const { rerender } = runHook();
+
+      await act(async () => noop());
+
+      // Drive a single failed cycle: loading true → false
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+      rerender({});
+      await act(async () => noop());
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+      rerender({});
+      await act(async () => noop());
+
+      // Re-render 3 more times while still non-loading (quotes still [])
+      rerender({});
+      await act(async () => noop());
+      rerender({});
+      await act(async () => noop());
+      rerender({});
+      await act(async () => noop());
+
+      const errors = lastProps()?.mm_pay_quote_errors as unknown[];
+      expect(errors).toHaveLength(1);
+    });
+
+    it('records null pay_token fields when no payToken is selected', async () => {
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: undefined,
+        setPayToken: noop as never,
+      });
+
+      useTransactionPayQuotesMock.mockReturnValue([]);
+
+      const { rerender } = runHook();
+
+      await act(async () => noop());
+
+      // Drive a failed cycle: loading true → false with no quotes
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+      rerender({});
+      await act(async () => noop());
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+      rerender({});
+      await act(async () => noop());
+
+      const errors = lastProps()?.mm_pay_quote_errors as Record<
+        string,
+        unknown
+      >[];
+      expect(errors).toHaveLength(1);
+      expect(errors?.[0]).toMatchObject({
+        pay_token: {
+          symbol: null,
+          chainId: null,
+          address: null,
+        },
+      });
+    });
+
+    it('records quoteError message, reason and joined detail when available', async () => {
+      useTransactionPayQuoteErrorMock.mockReturnValue({
+        message: 'Insufficient balance',
+        reason: 'insufficient-source-balance',
+        detail: ['Required: 1.5 USDC', 'Current: 1 USDC'],
+      });
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+      useTransactionPayQuotesMock.mockReturnValue([]);
+
+      const { rerender } = runHook();
+      await act(async () => noop());
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+      rerender({});
+      await act(async () => noop());
+
+      const errors = lastProps()?.mm_pay_quote_errors as
+        | {
+            error_message: string;
+            error_reason: string | null;
+            error_detail: string | null;
+          }[]
+        | undefined;
+      expect(errors).toHaveLength(1);
+      expect(errors?.[0].error_message).toBe('Insufficient balance');
+      expect(errors?.[0].error_reason).toBe('insufficient-source-balance');
+      expect(errors?.[0].error_detail).toBe(
+        'Required: 1.5 USDC | Current: 1 USDC',
+      );
+    });
+
+    it('does not append an entry when the amount is zero', async () => {
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: PAY_TOKEN_MOCK,
+        setPayToken: noop,
+      } as ReturnType<typeof useTransactionPayToken>);
+
+      useTransactionPayRequiredTokensMock.mockReturnValue([
+        {
+          amountHuman: '0',
+        } as TransactionPayRequiredToken,
+      ]);
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+      useTransactionPayQuotesMock.mockReturnValue([]);
+
+      const { rerender } = runHook();
+
+      await act(async () => noop());
+
+      useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+
+      rerender({});
+
+      await act(async () => noop());
+
+      expect(lastProps()).not.toHaveProperty('mm_pay_quote_errors');
+    });
+  });
 });
diff --git a/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.ts b/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.ts
index 66f5f8552bc8..99f5f8d7d069 100644
--- a/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.ts
+++ b/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.ts
@@ -16,7 +16,10 @@ import {
 import { useTransactionPayToken } from './useTransactionPayToken';
 import { BridgeToken } from '../../../../UI/Bridge/types';
 import {
+  useIsTransactionPayQuoteLoading,
+  useTransactionPayQuoteError,
   useTransactionPayQuotes,
+  useTransactionPayQuotesRaw,
   useTransactionPayRequiredTokens,
 } from './useTransactionPayData';
 import { useTransactionPayAvailableTokens } from './useTransactionPayAvailableTokens';
@@ -45,7 +48,12 @@ export function useTransactionPayMetrics() {
   const highestBalanceChainId = useHighestBalanceCaipChainId();
   const automaticPayToken = useRef<BridgeToken | undefined>(undefined);
   const hasLoadedQuoteRef = useRef(false);
+  const quoteErrorsRef = useRef<Json[]>([]);
+  const wasQuoteLoadingRef = useRef(false);
   const quotes = useTransactionPayQuotes();
+  const rawQuotes = useTransactionPayQuotesRaw();
+  const isQuoteLoading = useIsTransactionPayQuoteLoading();
+  const quoteError = useTransactionPayQuoteError();
   const { availableTokens: tokens, hasTokens } =
     useTransactionPayAvailableTokens();
 
@@ -76,6 +84,12 @@ export function useTransactionPayMetrics() {
 
   const hasQuotes = (quotes?.length ?? 0) > 0;
 
+  // Includes no-op (TransactionPayStrategy.None) quotes, which the filtered
+  // `quotes` list drops. A completed same-token / no-conversion route stores
+  // only a no-op quote, so it must count as a successful cycle here — not a
+  // quote error. Mirrors useNoPayTokenQuotesAlert, which uses raw quotes too.
+  const hasRawQuotes = (rawQuotes?.length ?? 0) > 0;
+
   if (hasQuotes && !hasLoadedQuoteRef.current) {
     hasLoadedQuoteRef.current = true;
   }
@@ -119,6 +133,36 @@ export function useTransactionPayMetrics() {
   );
   const sendingValue = Number(primaryRequiredToken?.amountHuman ?? '0');
 
+  // Detect a failed quote-loading cycle: isLoading transitioned true -> false
+  // AND ended with no quotes. One entry appended per failed cycle, oldest-first.
+  // Ignore cycles where the amount is zero (nothing to quote for).
+  if (
+    wasQuoteLoadingRef.current &&
+    !isQuoteLoading &&
+    !hasRawQuotes &&
+    sendingValue > 0
+  ) {
+    const inputType = storedMetrics?.properties?.mm_pay_amount_input_type as
+      | string
+      | undefined;
+    quoteErrorsRef.current = [
+      ...quoteErrorsRef.current,
+      {
+        pay_token: {
+          symbol: payToken?.symbol ?? null,
+          chainId: payToken?.chainId ?? null,
+          address: payToken?.address ?? null,
+        },
+        amount: sendingValue,
+        amount_input_type: inputType ?? null,
+        error_message: quoteError?.message ?? 'unknown',
+        error_reason: quoteError?.reason ?? null,
+        error_detail: quoteError?.detail?.join(' | ') ?? null,
+      },
+    ];
+  }
+  wasQuoteLoadingRef.current = isQuoteLoading;
+
   if (!automaticPayToken.current && payToken) {
     automaticPayToken.current = payToken;
   }
@@ -237,6 +281,10 @@ export function useTransactionPayMetrics() {
       presentedPaymentMethodRef.current;
   }
 
+  if (quoteErrorsRef.current.length > 0) {
+    properties.mm_pay_quote_errors = quoteErrorsRef.current;
+  }
+
   if (
     payToken &&
     (hasTransactionType(transactionMeta, [TransactionType.perpsDeposit]) ||
diff --git a/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.test.ts b/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.test.ts
index 4b9cb2b00944..7c34a1c9826f 100644
--- a/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.test.ts
+++ b/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.test.ts
@@ -185,6 +185,70 @@ describe('useUpdateTransactionPayAmount', () => {
     expect(updateMoneyAccountWithdrawTokenAmountMock).not.toHaveBeenCalled();
     expect(updateAtomicBatchDataMock).not.toHaveBeenCalled();
     expect(updateTokenAmountMock).not.toHaveBeenCalled();
+    expect(result.current.isAmountUpdateQuotePipelineEnabled).toBe(true);
+  });
+
+  it('reuses a completed optimized amount update for the same amount', async () => {
+    const { result } = runHook({
+      transactionMeta: moneyAccountDepositMeta,
+      quotePipelineEnabled: true,
+    });
+
+    await result.current.updateTransactionPayAmount('1.23');
+    await result.current.updateTransactionPayAmount('1.23');
+
+    expect(updateMoneyAccountDepositAmountMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('retries an optimized amount update after the previous request rejects', async () => {
+    const error = new Error('quote failed');
+    updateMoneyAccountDepositAmountMock
+      .mockRejectedValueOnce(error)
+      .mockResolvedValueOnce(true);
+    const { result } = runHook({
+      transactionMeta: moneyAccountDepositMeta,
+      quotePipelineEnabled: true,
+    });
+
+    await expect(
+      result.current.updateTransactionPayAmount('1.23'),
+    ).rejects.toThrow('quote failed');
+    await result.current.updateTransactionPayAmount('1.23');
+
+    expect(updateMoneyAccountDepositAmountMock).toHaveBeenCalledTimes(2);
+  });
+
+  it('retries an optimized amount update when the quote is not published', async () => {
+    updateMoneyAccountDepositAmountMock
+      .mockResolvedValueOnce(false)
+      .mockResolvedValueOnce(true);
+    const { result } = runHook({
+      transactionMeta: moneyAccountDepositMeta,
+      quotePipelineEnabled: true,
+    });
+
+    const unpublishedResult =
+      await result.current.updateTransactionPayAmount('1.23');
+    await result.current.updateTransactionPayAmount('1.23');
+
+    expect(unpublishedResult).toBe(false);
+    expect(updateMoneyAccountDepositAmountMock).toHaveBeenCalledTimes(2);
+  });
+
+  it('starts a new optimized amount update when the amount changes', async () => {
+    const { result } = runHook({
+      transactionMeta: moneyAccountDepositMeta,
+      quotePipelineEnabled: true,
+    });
+
+    await result.current.updateTransactionPayAmount('1.23');
+    await result.current.updateTransactionPayAmount('4.56');
+
+    expect(updateMoneyAccountDepositAmountMock).toHaveBeenCalledTimes(2);
+    expect(updateMoneyAccountDepositAmountMock).toHaveBeenLastCalledWith(
+      expect.objectContaining({ id: transactionIdMock }),
+      '4.56',
+    );
   });
 
   it.each(['addMusd', 'card'] as const)(
@@ -201,6 +265,7 @@ describe('useUpdateTransactionPayAmount', () => {
 
       expect(updateMoneyAccountDepositAmountMock).not.toHaveBeenCalled();
       expect(updateMoneyAccountDepositTokenAmountMock).toHaveBeenCalledTimes(1);
+      expect(result.current.isAmountUpdateQuotePipelineEnabled).toBe(false);
     },
   );
 
@@ -218,6 +283,7 @@ describe('useUpdateTransactionPayAmount', () => {
 
     expect(updateMoneyAccountDepositAmountMock).not.toHaveBeenCalled();
     expect(updateMoneyAccountDepositTokenAmountMock).toHaveBeenCalledTimes(1);
+    expect(result.current.isAmountUpdateQuotePipelineEnabled).toBe(false);
   });
 
   it('uses the atomic update for an explicit convert intent', async () => {
diff --git a/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.ts b/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.ts
index 9d226d7d96da..575e3f81bbef 100644
--- a/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.ts
+++ b/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.ts
@@ -1,4 +1,4 @@
-import { useCallback } from 'react';
+import { useCallback, useRef } from 'react';
 import { useSelector } from 'react-redux';
 import { BigNumber } from 'bignumber.js';
 import { toHex } from '@metamask/controller-utils';
@@ -8,6 +8,7 @@ import {
   hasTransactionType,
 } from '@metamask/transaction-controller';
 import { Hex } from '@metamask/utils';
+import { updateMoneyAccountDepositAmount } from '../../../../../core/Engine/controllers/transaction-pay-controller/money-account-amount-update';
 import { selectMoneyAccountDepositQuotePipelineEnabled } from '../../../../../selectors/featureFlagController/moneyAccount';
 import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
 import { useTransactionAccountOverride } from '../transactions/useTransactionAccountOverride';
@@ -23,7 +24,6 @@ import {
 } from '../../../../UI/Money/utils/moneyAccountTransactions';
 import { UpdateTransactionPayAmountCall } from '../../types/transactions';
 import { prefixError } from '../../../../../util/transactions/error-prefix';
-import { updateMoneyAccountDepositAmount } from '../../../../../core/Engine/controllers/transaction-pay-controller/money-account-amount-update';
 import {
   useTransactionPayFiatPayment,
   useTransactionPayRequiredTokens,
@@ -38,6 +38,12 @@ type MoneyAccountAmountUpdater = (
   recipientOverride?: Hex,
 ) => Promise<UpdateTransactionPayAmountCall[]>;
 
+interface OptimizedAmountUpdate {
+  amountHuman: string;
+  promise: Promise<boolean>;
+  transactionId: string;
+}
+
 export function useUpdateTransactionPayAmount() {
   const transactionMeta = useTransactionMetadataRequest();
   const { updateTokenAmount } = useUpdateTokenAmount();
@@ -47,6 +53,28 @@ export function useUpdateTransactionPayAmount() {
   const isMoneyAccountDepositQuotePipelineEnabled = useSelector(
     selectMoneyAccountDepositQuotePipelineEnabled,
   );
+  const optimizedAmountUpdateRef = useRef<OptimizedAmountUpdate | undefined>(
+    undefined,
+  );
+  const isMoneyAccountDeposit = Boolean(
+    transactionMeta &&
+      hasTransactionType(transactionMeta, [
+        TransactionType.moneyAccountDeposit,
+      ]),
+  );
+  const depositIntent =
+    isMoneyAccountDeposit && transactionMeta
+      ? getMoneyAccountDepositIntent(transactionMeta.batchId)
+      : undefined;
+  // Initially optimize only generic/convert crypto deposits. addMusd uses the
+  // Relay max/gas-station path and card uses the multi-stage fiat path, so both
+  // retain the existing pipeline until validated separately.
+  const isAmountUpdateQuotePipelineEnabled = Boolean(
+    isMoneyAccountDepositQuotePipelineEnabled &&
+      isMoneyAccountDeposit &&
+      (depositIntent === undefined || depositIntent === 'convert') &&
+      !fiatPayment?.selectedPaymentMethodId,
+  );
 
   const applyMoneyAccountAmountUpdates = useCallback(
     async (
@@ -87,33 +115,56 @@ export function useUpdateTransactionPayAmount() {
     [transactionMeta],
   );
 
+  const updateOptimizedAmount = useCallback(
+    (amountHuman: string, transaction: TransactionMeta) => {
+      // The coordinator deduplicates only in-flight intents. Retain a
+      // successful prefetch so Continue can reuse it instead of launching the
+      // pipeline again.
+      const existingUpdate = optimizedAmountUpdateRef.current;
+      if (
+        existingUpdate?.amountHuman === amountHuman &&
+        existingUpdate.transactionId === transaction.id
+      ) {
+        return existingUpdate.promise;
+      }
+
+      const promise = updateMoneyAccountDepositAmount(transaction, amountHuman);
+      optimizedAmountUpdateRef.current = {
+        amountHuman,
+        promise,
+        transactionId: transaction.id,
+      };
+
+      promise.then(
+        (isPublished) => {
+          if (
+            !isPublished &&
+            optimizedAmountUpdateRef.current?.promise === promise
+          ) {
+            optimizedAmountUpdateRef.current = undefined;
+          }
+        },
+        () => {
+          if (optimizedAmountUpdateRef.current?.promise === promise) {
+            optimizedAmountUpdateRef.current = undefined;
+          }
+        },
+      );
+
+      return promise;
+    },
+    [],
+  );
+
   const updateTransactionPayAmount = useCallback(
     async (amountHuman: string) => {
       if (!transactionMeta) {
         return;
       }
 
-      if (
-        hasTransactionType(transactionMeta, [
-          TransactionType.moneyAccountDeposit,
-        ])
-      ) {
-        const depositIntent = getMoneyAccountDepositIntent(
-          transactionMeta.batchId,
-        );
-        // Initially optimize only generic/convert crypto deposits. addMusd uses
-        // the Relay max/gas-station path and card uses the multi-stage fiat path,
-        // so both retain the existing pipeline until validated separately.
-        const isOptimizedDepositIntent =
-          (depositIntent === undefined || depositIntent === 'convert') &&
-          !fiatPayment?.selectedPaymentMethodId;
-
-        if (
-          isMoneyAccountDepositQuotePipelineEnabled &&
-          isOptimizedDepositIntent
-        ) {
-          await updateMoneyAccountDepositAmount(transactionMeta, amountHuman);
-          return;
+      if (isMoneyAccountDeposit) {
+        if (isAmountUpdateQuotePipelineEnabled) {
+          return updateOptimizedAmount(amountHuman, transactionMeta);
         }
 
         syncMoneyAccountDepositRequiredAssets(
@@ -150,13 +201,17 @@ export function useUpdateTransactionPayAmount() {
       applyMoneyAccountAmountUpdates,
       updateTokenAmount,
       requiredTokens,
-      fiatPayment?.selectedPaymentMethodId,
       accountOverride,
-      isMoneyAccountDepositQuotePipelineEnabled,
+      isMoneyAccountDeposit,
+      isAmountUpdateQuotePipelineEnabled,
+      updateOptimizedAmount,
     ],
   );
 
-  return { updateTransactionPayAmount };
+  return {
+    isAmountUpdateQuotePipelineEnabled,
+    updateTransactionPayAmount,
+  };
 }
 
 function syncMoneyAccountDepositRequiredAssets(
diff --git a/app/components/Views/confirmations/hooks/send/useSendNavbar.test.tsx b/app/components/Views/confirmations/hooks/send/useSendNavbar.test.tsx
index fbc3d0067811..45cd39925835 100644
--- a/app/components/Views/confirmations/hooks/send/useSendNavbar.test.tsx
+++ b/app/components/Views/confirmations/hooks/send/useSendNavbar.test.tsx
@@ -15,13 +15,6 @@ jest.mock('@react-navigation/native', () => ({
   createNavigatorFactory: jest.fn(),
 }));
 
-jest.mock('@react-navigation/native-stack', () => ({
-  createNativeStackNavigator: jest.fn(() => ({
-    Navigator: ({ children }: { children: React.ReactNode }) => children,
-    Screen: ({ children }: { children: React.ReactNode }) => children,
-  })),
-}));
-
 jest.mock('./useSendActions', () => ({
   useSendActions: () => ({
     handleCancelPress: mockHandleCancelPress,
@@ -32,33 +25,6 @@ jest.mock('../../../../../../locales/i18n', () => ({
   strings: (key: string) => key,
 }));
 
-jest.mock('@metamask/design-system-twrnc-preset', () => ({
-  useTailwind: () => ({
-    style: () => ({}),
-  }),
-}));
-
-jest.mock('@metamask/design-system-react-native', () => {
-  const { View, Text, TouchableOpacity } = jest.requireActual('react-native');
-  return {
-    Box: (props: { testID?: string; children?: React.ReactNode }) => (
-      <View testID={props.testID}>{props.children}</View>
-    ),
-    Text: (props: { testID?: string; children?: React.ReactNode }) => (
-      <Text testID={props.testID}>{props.children}</Text>
-    ),
-    ButtonIcon: (props: { testID?: string; onPress?: () => void }) => (
-      <TouchableOpacity testID={props.testID} onPress={props.onPress} />
-    ),
-    ButtonIconSize: { Md: 'md' },
-    IconName: { Close: 'Close', ArrowLeft: 'ArrowLeft' },
-    TextVariant: { BodyMd: 'body-md', BodySm: 'body-sm' },
-    TextColor: { TextAlternative: 'text-alternative' },
-    FontWeight: { Bold: 'bold' },
-    BoxAlignItems: { Center: 'center' },
-  };
-});
-
 describe('useSendNavbar', () => {
   const mockParentNavigate = jest.fn();
   const mockNavigation = {
diff --git a/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.test.ts b/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.test.ts
index fcaf67ba4cbf..a2393cc7a51b 100644
--- a/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.test.ts
+++ b/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.test.ts
@@ -428,6 +428,7 @@ describe('useTransactionConfirm', () => {
 
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
         screen: Routes.PERPS.PERPS_HOME,
+        params: {},
       });
     });
 
diff --git a/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts b/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts
index 405ca956042c..631ea778809d 100644
--- a/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts
+++ b/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts
@@ -12,10 +12,8 @@ import {
 } from '@metamask/transaction-controller';
 import { useNetworkEnablement } from '../../../../hooks/useNetworkEnablement/useNetworkEnablement';
 import { isHardwareAccount } from '../../../../../util/address';
-import {
-  navigateWithDetails,
-  useParams,
-} from '../../../../../util/navigation/navUtils';
+import { useParams } from '../../../../../util/navigation/navUtils';
+import { useNavigateToPerpsHome } from '../../../../UI/Perps/utils/perpsModeSwitch';
 import {
   ConfirmationParams,
   PayWithOption,
@@ -56,6 +54,7 @@ export function useTransactionConfirm() {
   const { onFiatConfirm, isFiatPaymentSelected, orderId } = useFiatConfirm();
   const { navigateOnConfirm: musdConversionNavigateOnConfirm } =
     useMusdConfirmNavigation();
+  const navigateToPerpsHome = useNavigateToPerpsHome();
 
   const { tryEnableEvmNetwork } = useNetworkEnablement();
   const { payWithOption } = useParams<ConfirmationParams>({});
@@ -175,12 +174,7 @@ export function useTransactionConfirm() {
             params: { screen: Routes.MONEY.HOME },
           });
         } else {
-          // Cross-navigator jump into the Perps stack; PerpsHome's param list
-          // is owned/typed by the Perps feature.
-          navigateWithDetails(navigation, [
-            Routes.PERPS.ROOT,
-            { screen: Routes.PERPS.PERPS_HOME },
-          ]);
+          navigateToPerpsHome();
         }
       } else if (type === TransactionType.predictDeposit) {
         if (payWithOption === PayWithOption.MoneyAccount) {
@@ -224,6 +218,7 @@ export function useTransactionConfirm() {
       isGaslessSupported,
       isGaslessSupportedSTX,
       navigation,
+      navigateToPerpsHome,
       musdConversionNavigateOnConfirm,
       onFiatConfirm,
       onRequestConfirm,
diff --git a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.test.ts b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.test.ts
index de1704fe2199..7956705a7e11 100644
--- a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.test.ts
+++ b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.test.ts
@@ -25,10 +25,12 @@ import {
   MUSD_TOKEN_ADDRESS,
 } from '../../../../UI/Earn/constants/musd';
 import {
+  useIsTransactionPayQuoteLoading,
   useTransactionPayTotals,
   useTransactionPayIsMaxAmount,
   useTransactionPayIsPostQuote,
   useTransactionPayFiatPayment,
+  useTransactionPayQuotesLastUpdated,
 } from '../pay/useTransactionPayData';
 import { useMMPayFiatConfig } from '../pay/useMMPayFiatConfig';
 import { useRampsBuyLimits } from '../../../../UI/Ramp/hooks/useRampsBuyLimits';
@@ -154,6 +156,12 @@ describe('useTransactionCustomAmount', () => {
   const useTransactionPayIsPostQuoteMock = jest.mocked(
     useTransactionPayIsPostQuote,
   );
+  const useIsTransactionPayQuoteLoadingMock = jest.mocked(
+    useIsTransactionPayQuoteLoading,
+  );
+  const useTransactionPayQuotesLastUpdatedMock = jest.mocked(
+    useTransactionPayQuotesLastUpdated,
+  );
   const useTransactionPayHasSourceAmountMock = jest.mocked(
     useTransactionPayHasSourceAmount,
   );
@@ -169,18 +177,21 @@ describe('useTransactionCustomAmount', () => {
   const useMMPayFiatConfigMock = jest.mocked(useMMPayFiatConfig);
   const useRampsBuyLimitsMock = jest.mocked(useRampsBuyLimits);
 
-  const updateTransactionPayAmountMock: ReturnType<
-    typeof useUpdateTransactionPayAmount
-  >['updateTransactionPayAmount'] = jest.fn();
+  const updateTransactionPayAmountMock = jest.fn(
+    (_amountHuman: string): Promise<boolean | undefined> =>
+      Promise.resolve(true),
+  );
 
   const setConfirmationMetricMock = jest.fn();
 
   beforeEach(() => {
     jest.resetAllMocks();
 
+    updateTransactionPayAmountMock.mockResolvedValue(true);
     useTokenFiatRateMock.mockReturnValue(2);
 
     useUpdateTransactionPayAmountMock.mockReturnValue({
+      isAmountUpdateQuotePipelineEnabled: false,
       updateTransactionPayAmount: updateTransactionPayAmountMock,
     } as ReturnType<typeof useUpdateTransactionPayAmountMock>);
 
@@ -204,6 +215,8 @@ describe('useTransactionCustomAmount', () => {
     useTransactionPayTotalsMock.mockReturnValue(undefined);
     useTransactionPayIsMaxAmountMock.mockReturnValue(false);
     useTransactionPayIsPostQuoteMock.mockReturnValue(false);
+    useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+    useTransactionPayQuotesLastUpdatedMock.mockReturnValue(undefined);
     useTransactionPayHasSourceAmountMock.mockReturnValue(true);
     useTransactionPayFiatPaymentMock.mockReturnValue(undefined);
     useMMPayFiatConfigMock.mockReturnValue({
@@ -224,6 +237,10 @@ describe('useTransactionCustomAmount', () => {
     (isRouteToken as unknown as jest.Mock).mockReturnValue(false);
   });
 
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
   it('returns pending amount provided by updatePendingAmount', async () => {
     const { result } = runHook();
 
@@ -390,6 +407,175 @@ describe('useTransactionCustomAmount', () => {
     expect(updateTransactionPayAmountMock).toHaveBeenCalledWith('61.725');
   });
 
+  it('prefetches an optimized amount update after the typing debounce', async () => {
+    useUpdateTransactionPayAmountMock.mockReturnValue({
+      isAmountUpdateQuotePipelineEnabled: true,
+      updateTransactionPayAmount: updateTransactionPayAmountMock,
+    } as ReturnType<typeof useUpdateTransactionPayAmountMock>);
+    const { result } = runHook({
+      transactionMeta: { type: TransactionType.moneyAccountDeposit },
+    });
+
+    await act(async () => {
+      result.current.updatePendingAmount('12');
+    });
+    await act(async () => {
+      jest.advanceTimersByTime(200);
+      result.current.updatePendingAmount('123.45');
+    });
+    await act(async () => {
+      jest.advanceTimersByTime(299);
+    });
+
+    expect(updateTransactionPayAmountMock).not.toHaveBeenCalled();
+
+    await act(async () => {
+      jest.advanceTimersByTime(1);
+    });
+
+    expect(updateTransactionPayAmountMock).toHaveBeenCalledTimes(1);
+    expect(updateTransactionPayAmountMock).toHaveBeenCalledWith('61.725');
+  });
+
+  it('marks the current amount as prefetched once its quote settles', async () => {
+    useUpdateTransactionPayAmountMock.mockReturnValue({
+      isAmountUpdateQuotePipelineEnabled: true,
+      updateTransactionPayAmount: updateTransactionPayAmountMock,
+    } as ReturnType<typeof useUpdateTransactionPayAmountMock>);
+    useTransactionPayQuotesLastUpdatedMock.mockReturnValue(10);
+    const { result, rerender } = runHook({
+      transactionMeta: { type: TransactionType.moneyAccountDeposit },
+    });
+
+    await act(async () => {
+      result.current.updatePendingAmount('123.45');
+    });
+    await act(async () => {
+      jest.runAllTimers();
+    });
+
+    expect(result.current.hasPrefetchedQuote).toBe(false);
+
+    useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+    rerender(undefined);
+    useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+    useTransactionPayQuotesLastUpdatedMock.mockReturnValue(11);
+    rerender(undefined);
+
+    expect(result.current.hasPrefetchedQuote).toBe(true);
+
+    await act(async () => {
+      result.current.updatePendingAmount('456.78');
+    });
+
+    expect(result.current.hasPrefetchedQuote).toBe(false);
+  });
+
+  it('invalidates a prefetched quote when the pay token changes', async () => {
+    useUpdateTransactionPayAmountMock.mockReturnValue({
+      isAmountUpdateQuotePipelineEnabled: true,
+      updateTransactionPayAmount: updateTransactionPayAmountMock,
+    } as ReturnType<typeof useUpdateTransactionPayAmountMock>);
+    useTransactionPayQuotesLastUpdatedMock.mockReturnValue(10);
+    const { result, rerender } = runHook({
+      transactionMeta: { type: TransactionType.moneyAccountDeposit },
+    });
+
+    await act(async () => {
+      result.current.updatePendingAmount('123.45');
+    });
+    await act(async () => {
+      jest.runAllTimers();
+    });
+    useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+    rerender(undefined);
+    useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+    useTransactionPayQuotesLastUpdatedMock.mockReturnValue(11);
+    rerender(undefined);
+
+    expect(result.current.hasPrefetchedQuote).toBe(true);
+
+    useTransactionPayTokenMock.mockReturnValue({
+      payToken: {
+        address: '0x9876543210987654321098765432109876543210' as Hex,
+        balanceUsd: '1234.56',
+        chainId: '0x1' as Hex,
+      } as TransactionPaymentToken,
+    } as ReturnType<typeof useTransactionPayToken>);
+    await act(async () => {
+      rerender(undefined);
+    });
+
+    expect(result.current.hasPrefetchedQuote).toBe(false);
+
+    useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+    rerender(undefined);
+    useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+    useTransactionPayQuotesLastUpdatedMock.mockReturnValue(12);
+    rerender(undefined);
+
+    expect(result.current.hasPrefetchedQuote).toBe(true);
+  });
+
+  it('does not mark an unpublished optimized amount update as prefetched', async () => {
+    updateTransactionPayAmountMock.mockResolvedValue(false);
+    useUpdateTransactionPayAmountMock.mockReturnValue({
+      isAmountUpdateQuotePipelineEnabled: true,
+      updateTransactionPayAmount: updateTransactionPayAmountMock,
+    } as ReturnType<typeof useUpdateTransactionPayAmountMock>);
+    useTransactionPayQuotesLastUpdatedMock.mockReturnValue(10);
+    const { result, rerender } = runHook({
+      transactionMeta: { type: TransactionType.moneyAccountDeposit },
+    });
+
+    await act(async () => {
+      result.current.updatePendingAmount('123.45');
+    });
+    await act(async () => {
+      jest.runAllTimers();
+    });
+    useIsTransactionPayQuoteLoadingMock.mockReturnValue(true);
+    rerender(undefined);
+    useIsTransactionPayQuoteLoadingMock.mockReturnValue(false);
+    useTransactionPayQuotesLastUpdatedMock.mockReturnValue(11);
+    rerender(undefined);
+
+    expect(result.current.hasPrefetchedQuote).toBe(false);
+  });
+
+  it('does not prefetch an amount update when the optimized pipeline is disabled', async () => {
+    const { result } = runHook({
+      transactionMeta: { type: TransactionType.moneyAccountDeposit },
+    });
+
+    await act(async () => {
+      result.current.updatePendingAmount('123.45');
+    });
+
+    await act(async () => {
+      jest.runAllTimers();
+    });
+
+    expect(updateTransactionPayAmountMock).not.toHaveBeenCalled();
+  });
+
+  it('does not prefetch a zero amount', async () => {
+    useUpdateTransactionPayAmountMock.mockReturnValue({
+      isAmountUpdateQuotePipelineEnabled: true,
+      updateTransactionPayAmount: updateTransactionPayAmountMock,
+    } as ReturnType<typeof useUpdateTransactionPayAmountMock>);
+
+    runHook({
+      transactionMeta: { type: TransactionType.moneyAccountDeposit },
+    });
+
+    await act(async () => {
+      jest.runAllTimers();
+    });
+
+    expect(updateTransactionPayAmountMock).not.toHaveBeenCalled();
+  });
+
   it('sets mm_pay_quote_requested metric only when hasSourceAmount becomes true after updateTokenAmount was called', async () => {
     useTransactionPayHasSourceAmountMock.mockReturnValue(false);
 
@@ -449,7 +635,7 @@ describe('useTransactionCustomAmount', () => {
 
     const { result, rerender } = runHook();
 
-    jest.spyOn(Date, 'now').mockReturnValue(1746696741000);
+    const dateNowSpy = jest.spyOn(Date, 'now').mockReturnValue(1746696741000);
 
     await act(async () => {
       result.current.updatePendingAmount('100');
@@ -461,7 +647,7 @@ describe('useTransactionCustomAmount', () => {
       result.current.updateTokenAmount();
     });
 
-    jest.spyOn(Date, 'now').mockReturnValue(1746696741250);
+    dateNowSpy.mockReturnValue(1746696741250);
     useTransactionPayHasSourceAmountMock.mockReturnValue(true);
 
     await act(async () => {
@@ -660,6 +846,46 @@ describe('useTransactionCustomAmount', () => {
   });
 
   describe('updatePendingAmountPercentage updates amount fiat', () => {
+    it('returns false when there is no balance', async () => {
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: {
+          address: TOKEN_ADDRESS_MOCK,
+          balanceUsd: '0',
+          chainId: '0x1' as Hex,
+        } as TransactionPaymentToken,
+      } as ReturnType<typeof useTransactionPayToken>);
+
+      const { result } = runHook();
+      let didApply = true;
+
+      await act(async () => {
+        didApply = result.current.updatePendingAmountPercentage(100);
+      });
+
+      expect(didApply).toBe(false);
+      expect(result.current.amountFiat).toBe('0');
+    });
+
+    it('returns false when balance rounds down to dust ($0.00)', async () => {
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: {
+          address: TOKEN_ADDRESS_MOCK,
+          balanceUsd: '0.004',
+          chainId: '0x1' as Hex,
+        } as TransactionPaymentToken,
+      } as ReturnType<typeof useTransactionPayToken>);
+
+      const { result } = runHook();
+      let didApply = true;
+
+      await act(async () => {
+        didApply = result.current.updatePendingAmountPercentage(100);
+      });
+
+      expect(didApply).toBe(false);
+      expect(result.current.amountFiat).toBe('0');
+    });
+
     it('to percentage of token balance', async () => {
       const { result } = runHook();
 
@@ -1201,6 +1427,35 @@ describe('useTransactionCustomAmount', () => {
       jest.mocked(getMoneyAccountDepositIntent).mockReturnValue('convert');
     });
 
+    it('prefetches the full-precision balance amount for a 100% deposit', async () => {
+      useUpdateTransactionPayAmountMock.mockReturnValue({
+        isAmountUpdateQuotePipelineEnabled: true,
+        updateTransactionPayAmount: updateTransactionPayAmountMock,
+      } as ReturnType<typeof useUpdateTransactionPayAmountMock>);
+      useTransactionPayTokenMock.mockReturnValue({
+        payToken: {
+          address: TOKEN_ADDRESS_MOCK,
+          balanceUsd: '2.246912',
+          balanceRaw: '1123456',
+          decimals: 6,
+          chainId: '0x1' as Hex,
+        } as TransactionPaymentToken,
+      } as ReturnType<typeof useTransactionPayToken>);
+      const { result } = runHook({
+        transactionMeta: depositTransactionMeta,
+      });
+
+      await act(async () => {
+        result.current.updatePendingAmountPercentage(100);
+      });
+      await act(async () => {
+        jest.runAllTimers();
+      });
+
+      expect(updateTransactionPayAmountMock).toHaveBeenCalledTimes(1);
+      expect(updateTransactionPayAmountMock).toHaveBeenCalledWith('1.123456');
+    });
+
     it('updateTokenAmount uses full-precision amount from balanceRaw for 100% deposit', async () => {
       useTransactionPayTokenMock.mockReturnValue({
         payToken: {
@@ -1383,6 +1638,86 @@ describe('useTransactionCustomAmount', () => {
     });
   });
 
+  describe('money account deposit atomic toggle', () => {
+    const depositTransactionMeta = {
+      type: TransactionType.moneyAccountDeposit,
+      batchId: '0xtestbatchid' as Hex,
+    };
+
+    it('sets atomic to false when Max is pressed on moneyAccountDeposit', async () => {
+      const { result } = runHook({
+        transactionMeta: depositTransactionMeta,
+      });
+
+      await act(async () => {
+        result.current.updatePendingAmountPercentage(100);
+      });
+
+      const atomicCall = setTransactionConfigMock.mock.calls.find((call) => {
+        const cfg: Record<string, unknown> = {};
+        call[1](cfg);
+        return Object.hasOwn(cfg, 'atomic');
+      });
+      expect(atomicCall).toBeDefined();
+      const config: Record<string, unknown> = {};
+      atomicCall?.[1](config);
+      expect(config.atomic).toBe(false);
+    });
+
+    it('clears atomic when Max is unset via non-100% selection', async () => {
+      useTransactionPayIsMaxAmountMock.mockReturnValue(true);
+
+      const { result } = runHook({
+        transactionMeta: depositTransactionMeta,
+      });
+
+      await act(async () => {
+        result.current.updatePendingAmountPercentage(50);
+      });
+
+      const atomicCall = setTransactionConfigMock.mock.calls.find((call) => {
+        const cfg: Record<string, unknown> = { atomic: false };
+        call[1](cfg);
+        return cfg.atomic === undefined;
+      });
+      expect(atomicCall).toBeDefined();
+    });
+
+    it('clears atomic when Max is unset via manual amount input', async () => {
+      useTransactionPayIsMaxAmountMock.mockReturnValue(true);
+
+      const { result } = runHook({
+        transactionMeta: depositTransactionMeta,
+      });
+
+      await act(async () => {
+        result.current.updatePendingAmount('5');
+      });
+
+      const atomicCall = setTransactionConfigMock.mock.calls.find((call) => {
+        const cfg: Record<string, unknown> = { atomic: false };
+        call[1](cfg);
+        return cfg.atomic === undefined;
+      });
+      expect(atomicCall).toBeDefined();
+    });
+
+    it('does not flip atomic when Max is pressed on non-deposit types', async () => {
+      const { result } = runHook();
+
+      await act(async () => {
+        result.current.updatePendingAmountPercentage(100);
+      });
+
+      const atomicCall = setTransactionConfigMock.mock.calls.find((call) => {
+        const cfg: Record<string, unknown> = {};
+        call[1](cfg);
+        return Object.hasOwn(cfg, 'atomic');
+      });
+      expect(atomicCall).toBeUndefined();
+    });
+  });
+
   it('resets isMax to false when updating amount while isMaxAmount is true', async () => {
     useTransactionPayIsMaxAmountMock.mockReturnValue(true);
 
@@ -1513,13 +1848,12 @@ describe('useTransactionCustomAmount', () => {
 
       // 100% prefill must set isMaxAmount like pressing Max, so the
       // insufficient-funds alert can skip a Max money account deposit.
-      // comenting out the condition below as it is incorrect in context of the release branch
-      // const isMaxCall = setTransactionConfigMock.mock.calls.find((call) => {
-      //   const cfg: Record<string, unknown> = {};
-      //   call[1](cfg);
-      //   return cfg.isMaxAmount === true;
-      // });
-      // expect(isMaxCall).toBeDefined();
+      const isMaxCall = setTransactionConfigMock.mock.calls.find((call) => {
+        const cfg: Record<string, unknown> = {};
+        call[1](cfg);
+        return cfg.isMaxAmount === true;
+      });
+      expect(isMaxCall).toBeDefined();
 
       expect(setConfirmationMetricMock).toHaveBeenCalledWith({
         properties: {
diff --git a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.ts b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.ts
index 83eba7d126f5..302c61e25643 100644
--- a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.ts
+++ b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.ts
@@ -10,7 +10,10 @@ import {
 import { PaymentOverride } from '@metamask/transaction-pay-controller';
 import { useTransactionPayToken } from '../pay/useTransactionPayToken';
 import { useUpdateTransactionPayAmount } from '../pay/useUpdateTransactionPayAmount';
-import { getTokenAddress } from '../../utils/transaction-pay';
+import {
+  getTokenAddress,
+  setMoneyAccountDepositMaxAtomic,
+} from '../../utils/transaction-pay';
 import { useParams } from '../../../../../util/navigation/navUtils';
 import { debounce } from 'lodash';
 import { isTransactionPayWithdraw } from '../../utils/transaction';
@@ -22,9 +25,11 @@ import {
 } from '../../../../UI/Earn/constants/musd';
 import Engine from '../../../../../core/Engine';
 import {
+  useIsTransactionPayQuoteLoading,
   useTransactionPayFiatPayment,
   useTransactionPayIsMaxAmount,
   useTransactionPayIsPostQuote,
+  useTransactionPayQuotesLastUpdated,
   useTransactionPayTotals,
 } from '../pay/useTransactionPayData';
 import { useMMPayFiatConfig } from '../pay/useMMPayFiatConfig';
@@ -37,11 +42,18 @@ import { useTransactionPayHasSourceAmount } from '../pay/useTransactionPayHasSou
 import { useConfirmationMetricEvents } from '../metrics/useConfirmationMetricEvents';
 import { getMoneyAccountDepositIntent } from '../../../../UI/Money/hooks/useMoneyAccount';
 import { useDepositPrefillAmount } from './useDepositPrefillAmount';
-import { useConfirmationContext } from '../../context/confirmation-context';
 
 export const MAX_LENGTH = 28;
 const DEBOUNCE_DELAY = 300;
 
+interface DepositPrefetchQuoteRequest {
+  amountHuman: string;
+  payTokenKey: string;
+  isAmountPrepared: boolean;
+  quoteBaseline: number | undefined;
+  sawQuoteLoading: boolean;
+}
+
 function formatFiatAmount(value: BigNumber): string {
   return value.isInteger() ? value.toString(10) : value.toFixed(2);
 }
@@ -70,6 +82,8 @@ export function useTransactionCustomAmount({
   const totals = useTransactionPayTotals();
   const hasSourceAmount = useTransactionPayHasSourceAmount();
   const isPostQuote = useTransactionPayIsPostQuote();
+  const isQuoteLoading = useIsTransactionPayQuoteLoading();
+  const quotesLastUpdated = useTransactionPayQuotesLastUpdated();
   const { setConfirmationMetric } = useConfirmationMetricEvents();
   const [isTokenAmountUpdated, setIsTokenAmountUpdated] = useState(false);
   const [isPrefillPending, setIsPrefillPending] = useState(isAddMusdFlow);
@@ -80,6 +94,19 @@ export function useTransactionCustomAmount({
   // only dispatch when the input type actually changes.
   const lastAmountInputTypeRef = useRef<string | null>(null);
   const amountChangeTimeRef = useRef<number>(0);
+  const prefetchQuoteRequestRef = useRef<
+    DepositPrefetchQuoteRequest | undefined
+  >(undefined);
+  const prefetchedQuoteAmountHumanRef = useRef<string | undefined>(undefined);
+  const prefetchedQuotePayTokenKeyRef = useRef<string | undefined>(undefined);
+  const [prefetchedQuoteAmountHuman, setPrefetchedQuoteAmountHuman] =
+    useState<string>();
+  const [prefetchedQuotePayTokenKey, setPrefetchedQuotePayTokenKey] =
+    useState<string>();
+  const isQuoteLoadingRef = useRef(isQuoteLoading);
+  const quotesLastUpdatedRef = useRef(quotesLastUpdated);
+  isQuoteLoadingRef.current = isQuoteLoading;
+  quotesLastUpdatedRef.current = quotesLastUpdated;
 
   const debounceSetAmountDelayed = useMemo(
     () =>
@@ -95,6 +122,9 @@ export function useTransactionCustomAmount({
   const isPerpsWithdraw = hasTransactionType(transactionMeta, [
     TransactionType.perpsWithdraw,
   ]);
+  const isPredictWithdraw = hasTransactionType(transactionMeta, [
+    TransactionType.predictWithdraw,
+  ]);
   const isMoneyAccountWithdraw = hasTransactionType(transactionMeta, [
     TransactionType.moneyAccountWithdraw,
   ]);
@@ -111,18 +141,62 @@ export function useTransactionCustomAmount({
     : payTokenFiatRate;
   const balanceUsd = useTokenBalance(tokenFiatRate);
   const { payToken } = useTransactionPayToken();
-  const { setIsMaxDeposit } = useConfirmationContext();
+  const payTokenKey = `${payToken?.chainId ?? ''}:${
+    payToken?.address.toLowerCase() ?? ''
+  }`;
 
   useEffect(() => {
     depositMaxHumanRef.current = null;
     userHasEditedRef.current = false;
-    setIsMaxDeposit(false);
-  }, [payToken?.address, payToken?.chainId, setIsMaxDeposit]);
+    prefetchQuoteRequestRef.current = undefined;
+    prefetchedQuoteAmountHumanRef.current = undefined;
+    prefetchedQuotePayTokenKeyRef.current = undefined;
+    setPrefetchedQuoteAmountHuman(undefined);
+    setPrefetchedQuotePayTokenKey(undefined);
+  }, [payToken?.address, payToken?.chainId]);
 
-  const { updateTransactionPayAmount } = useUpdateTransactionPayAmount();
+  const { isAmountUpdateQuotePipelineEnabled, updateTransactionPayAmount } =
+    useUpdateTransactionPayAmount();
 
   const depositPrefill = useDepositPrefillAmount();
 
+  useEffect(() => {
+    if (!isMoneyAccountDeposit || !isAmountUpdateQuotePipelineEnabled) {
+      return;
+    }
+
+    const prefetchRequest = prefetchQuoteRequestRef.current;
+    if (!prefetchRequest?.isAmountPrepared) {
+      return;
+    }
+
+    if (isQuoteLoading) {
+      prefetchRequest.sawQuoteLoading = true;
+      return;
+    }
+
+    const hasNewerQuote =
+      prefetchRequest.sawQuoteLoading &&
+      quotesLastUpdated !== undefined &&
+      (prefetchRequest.quoteBaseline === undefined ||
+        quotesLastUpdated > prefetchRequest.quoteBaseline);
+    if (
+      hasNewerQuote &&
+      (prefetchedQuoteAmountHumanRef.current !== prefetchRequest.amountHuman ||
+        prefetchedQuotePayTokenKeyRef.current !== prefetchRequest.payTokenKey)
+    ) {
+      prefetchedQuoteAmountHumanRef.current = prefetchRequest.amountHuman;
+      prefetchedQuotePayTokenKeyRef.current = prefetchRequest.payTokenKey;
+      setPrefetchedQuoteAmountHuman(prefetchRequest.amountHuman);
+      setPrefetchedQuotePayTokenKey(prefetchRequest.payTokenKey);
+    }
+  }, [
+    isAmountUpdateQuotePipelineEnabled,
+    isMoneyAccountDeposit,
+    isQuoteLoading,
+    quotesLastUpdated,
+  ]);
+
   // Gating mirrors useFiatBuyLimitAlert so the keypad cap and the limit alert agree.
   const { enabledTransactionTypes } = useMMPayFiatConfig();
   const fiatPaymentMethodId =
@@ -175,6 +249,8 @@ export function useTransactionCustomAmount({
     if (amountFiat === '0' || amountFiat === '') {
       debounceSetAmountDelayed.flush();
     }
+
+    return () => debounceSetAmountDelayed.cancel();
   }, [amountHuman, amountFiat, debounceSetAmountDelayed]);
 
   useEffect(() => {
@@ -187,6 +263,63 @@ export function useTransactionCustomAmount({
     );
   }, [amountHumanDebounced]);
 
+  useEffect(() => {
+    if (!isAmountUpdateQuotePipelineEnabled || amountHumanDebounced === '0') {
+      return;
+    }
+
+    const depositMaxHuman = depositMaxHumanRef.current;
+    const effectiveHuman = depositMaxHuman ?? amountHumanDebounced;
+    const isNewPrefetch =
+      prefetchQuoteRequestRef.current?.amountHuman !== effectiveHuman ||
+      prefetchQuoteRequestRef.current?.payTokenKey !== payTokenKey;
+    if (isNewPrefetch) {
+      prefetchQuoteRequestRef.current = {
+        amountHuman: effectiveHuman,
+        payTokenKey,
+        isAmountPrepared: false,
+        quoteBaseline: quotesLastUpdatedRef.current,
+        sawQuoteLoading: false,
+      };
+      prefetchedQuoteAmountHumanRef.current = undefined;
+      setPrefetchedQuoteAmountHuman(undefined);
+    }
+
+    // Prefetch failures stay speculative. Continue retries the cleared request
+    // and uses the existing toast path if the committed update also fails.
+    updateTransactionPayAmount(effectiveHuman).then(
+      (isPublished) => {
+        if (!isPublished) {
+          return;
+        }
+
+        const prefetchRequest = prefetchQuoteRequestRef.current;
+        if (
+          isNewPrefetch &&
+          prefetchRequest?.amountHuman === effectiveHuman &&
+          prefetchRequest.payTokenKey === payTokenKey
+        ) {
+          prefetchRequest.isAmountPrepared = true;
+          prefetchRequest.quoteBaseline = quotesLastUpdatedRef.current;
+          prefetchRequest.sawQuoteLoading = isQuoteLoadingRef.current;
+        }
+      },
+      () => {
+        if (
+          prefetchQuoteRequestRef.current?.amountHuman === effectiveHuman &&
+          prefetchQuoteRequestRef.current.payTokenKey === payTokenKey
+        ) {
+          prefetchQuoteRequestRef.current = undefined;
+        }
+      },
+    );
+  }, [
+    amountHumanDebounced,
+    isAmountUpdateQuotePipelineEnabled,
+    payTokenKey,
+    updateTransactionPayAmount,
+  ]);
+
   const setIsMax = useCallback(
     (value: boolean) => {
       const { TransactionPayController } = Engine.context;
@@ -194,8 +327,12 @@ export function useTransactionCustomAmount({
       TransactionPayController.setTransactionConfig(transactionId, (config) => {
         config.isMaxAmount = value;
       });
+
+      if (isMoneyAccountDeposit) {
+        setMoneyAccountDepositMaxAtomic(transactionId, value);
+      }
     },
-    [transactionId],
+    [isMoneyAccountDeposit, transactionId],
   );
 
   const updatePendingAmount = useCallback(
@@ -225,7 +362,6 @@ export function useTransactionCustomAmount({
       depositMaxHumanRef.current = null;
       userHasEditedRef.current = true;
       amountChangeTimeRef.current = Date.now();
-      setIsMaxDeposit(false);
 
       if (lastAmountInputTypeRef.current !== 'manual') {
         lastAmountInputTypeRef.current = 'manual';
@@ -244,7 +380,6 @@ export function useTransactionCustomAmount({
       fiatMaxAmount,
       isMaxAmount,
       setIsMax,
-      setIsMaxDeposit,
       setConfirmationMetric,
     ],
   );
@@ -264,6 +399,12 @@ export function useTransactionCustomAmount({
           .decimalPlaces(2, BigNumber.ROUND_DOWN),
       );
 
+      // Sub-cent / dust balances ROUND_DOWN to $0. Treat that like no balance
+      // so Max does not arm auto-submit and strand the page on Loading.
+      if (new BigNumber(newAmount).lte(0)) {
+        return false;
+      }
+
       lastAmountInputTypeRef.current = `${percentage}%`;
       amountChangeTimeRef.current = Date.now();
 
@@ -273,17 +414,18 @@ export function useTransactionCustomAmount({
         },
       });
 
-      // Do NOT set isMaxAmount=true for perps or money-account withdraw. TPC's
-      // calculatePostQuoteSourceAmounts substitutes `token.balanceRaw` when
-      // isMaxAmount is true: wrong for HyperLiquid (wallet USDC vs typed HL
-      // balance) and wrong for money account (on-chain mUSD only vs mUSD +
-      // vmUSD fiat total). Keeping isMaxAmount false routes the typed
-      // amount through as token.amountRaw.
+      // Do NOT set isMaxAmount=true for perps, predict, or money-account
+      // withdraw. TPC's calculatePostQuoteSourceAmounts substitutes
+      // `token.balanceRaw` when isMaxAmount is true: wrong for perps/predict
+      // (wallet USDC vs typed HyperLiquid/Polymarket balance) and wrong for
+      // money account (on-chain mUSD only vs mUSD + vmUSD fiat total).
+      // Keeping isMaxAmount false routes the typed amount through as
+      // token.amountRaw.
       const shouldSetMax =
         percentage === 100 &&
         !isPerpsWithdraw &&
-        !isMoneyAccountWithdraw &&
-        !isMoneyAccountDeposit;
+        !isPredictWithdraw &&
+        !isMoneyAccountWithdraw;
 
       if (shouldSetMax) {
         setIsMax(true);
@@ -306,11 +448,6 @@ export function useTransactionCustomAmount({
         depositMaxHumanRef.current = null;
       }
 
-      // Flag a Max money account deposit so the insufficient-funds alert can
-      // skip it — the submitted token amount is clamped to the raw balance, so
-      // it can never truly exceed the balance despite fiat-rounding drift.
-      setIsMaxDeposit(isMaxMoneyAccountDeposit);
-
       setAmountFiat(newAmount);
       return true;
     },
@@ -318,12 +455,12 @@ export function useTransactionCustomAmount({
       balanceUsd,
       isMaxAmount,
       isPerpsWithdraw,
+      isPredictWithdraw,
       isMoneyAccountWithdraw,
       isMoneyAccountDeposit,
       payToken?.balanceRaw,
       payToken?.decimals,
       setIsMax,
-      setIsMaxDeposit,
       setConfirmationMetric,
     ],
   );
@@ -340,9 +477,9 @@ export function useTransactionCustomAmount({
     if (depositPrefill.hasPrefilled) {
       amountChangeTimeRef.current = Date.now();
       // Uncapped percentage prefills go through the same Max/percentage path
-      // as the keypad buttons so money-account Max gets isMaxAmount,
-      // isMaxDeposit, and depositMaxHumanRef — matching other Max deposits.
-      // Limit-capped amounts are not a true Max and must use the literal value.
+      // as the keypad buttons so money-account Max gets isMaxAmount and
+      // depositMaxHumanRef — matching other Max deposits. Limit-capped
+      // amounts are not a true Max and must use the literal value.
       if (
         depositPrefill.percentage !== undefined &&
         !depositPrefill.isLimitCapped
@@ -354,7 +491,6 @@ export function useTransactionCustomAmount({
     } else if (prevHasPrefilled.current) {
       setAmountFiat('0');
       depositMaxHumanRef.current = null;
-      setIsMaxDeposit(false);
       if (isMaxAmount) {
         setIsMax(false);
       }
@@ -404,12 +540,19 @@ export function useTransactionCustomAmount({
     setConfirmationMetric,
   ]);
 
+  const effectiveCurrentAmountHuman = depositMaxHumanRef.current ?? amountHuman;
+  const hasPrefetchedQuote =
+    isAmountUpdateQuotePipelineEnabled &&
+    prefetchedQuoteAmountHuman === effectiveCurrentAmountHuman &&
+    prefetchedQuotePayTokenKey === payTokenKey;
+
   return {
     amountFiat,
     amountFiatDebounced,
     amountHuman,
     amountHumanDebounced,
     hasInput,
+    hasPrefetchedQuote,
     isDepositPrefillEnabled: depositPrefill.enabled,
     isDepositPrefilled: depositPrefill.hasPrefilled,
     isDepositPrefillLoading: depositPrefill.isLoading,
diff --git a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmountAlerts.test.ts b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmountAlerts.test.ts
index b9c648807940..1311ea847f18 100644
--- a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmountAlerts.test.ts
+++ b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmountAlerts.test.ts
@@ -101,6 +101,20 @@ describe('useTransactionCustomAmountAlerts', () => {
     expect(result.current.alertMessage).toBe(MESSAGE_MOCK);
   });
 
+  it('returns content from the first alert', () => {
+    const content = {
+      type: 'View',
+      props: {},
+    } as unknown as import('react').ReactElement;
+    useAlertsMock.mockReturnValue({
+      alerts: [{ ...ALERT_MOCK, content }],
+    } as AlertsContextParams);
+
+    const { result } = runHook();
+
+    expect(result.current.alertContent).toBe(content);
+  });
+
   it('returns no alert message if no title', () => {
     useAlertsMock.mockReturnValue({
       alerts: [
diff --git a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmountAlerts.ts b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmountAlerts.ts
index ba623c22ec0e..7ec2afef3c39 100644
--- a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmountAlerts.ts
+++ b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmountAlerts.ts
@@ -1,4 +1,4 @@
-import { useMemo } from 'react';
+import { ReactElement, useMemo } from 'react';
 import { AlertKeys } from '../../constants/alerts';
 import { useAlerts } from '../../context/alert-system-context';
 import { usePendingAmountAlerts } from '../alerts/usePendingAmountAlerts';
@@ -43,6 +43,7 @@ export function useTransactionCustomAmountAlerts({
   pendingTokenAmount: string;
   pendingFiatAmount?: string;
 }): {
+  alertContent?: ReactElement;
   alertMessage?: string;
   alertTitle?: string;
 } {
@@ -97,7 +98,10 @@ export function useTransactionCustomAmountAlerts({
     ? (firstAlert.message as string | undefined)
     : undefined;
 
+  const alertContent = firstAlert.content as ReactElement | undefined;
+
   return {
+    alertContent,
     alertMessage,
     alertTitle,
   };
diff --git a/app/components/Views/confirmations/hooks/useMaxValueRefresher.test.ts b/app/components/Views/confirmations/hooks/useMaxValueRefresher.test.ts
index bb499d3c8655..9254d7a8f2e5 100644
--- a/app/components/Views/confirmations/hooks/useMaxValueRefresher.test.ts
+++ b/app/components/Views/confirmations/hooks/useMaxValueRefresher.test.ts
@@ -127,5 +127,43 @@ describe('useMaxValueRefresher', () => {
 
       expect(mockUpdateEditableParams).not.toHaveBeenCalled();
     });
+
+    it('gas estimation has failed', () => {
+      mockUseMaxValueMode.mockReturnValue({
+        maxValueMode: true,
+      });
+
+      const transferConfirmationStateWithSimulationFails = merge(
+        {},
+        transferConfirmationState,
+        {
+          engine: {
+            backgroundState: {
+              TransactionController: {
+                transactions: [
+                  {
+                    simulationFails: {
+                      reason: 'execution reverted',
+                      debug: {},
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        },
+      );
+
+      mockUseSelector.mockImplementation(
+        (fn: (state: DeepPartial<RootState>) => unknown) =>
+          fn(transferConfirmationStateWithSimulationFails),
+      );
+
+      renderHookWithProvider(() => useMaxValueRefresher(), {
+        state: transferConfirmationStateWithSimulationFails,
+      });
+
+      expect(mockUpdateEditableParams).not.toHaveBeenCalled();
+    });
   });
 });
diff --git a/app/components/Views/confirmations/hooks/useMaxValueRefresher.ts b/app/components/Views/confirmations/hooks/useMaxValueRefresher.ts
index 130bb3d0a591..0d142634b6d6 100644
--- a/app/components/Views/confirmations/hooks/useMaxValueRefresher.ts
+++ b/app/components/Views/confirmations/hooks/useMaxValueRefresher.ts
@@ -20,7 +20,7 @@ export function useMaxValueRefresher() {
   const [valueJustUpdated, setValueJustUpdated] = useState(false);
   const { setIsTransactionValueUpdating } = useConfirmationContext();
   const transactionMetadata = useTransactionMetadataRequest();
-  const { chainId, id, txParams, type } =
+  const { chainId, id, simulationFails, txParams, type } =
     transactionMetadata as TransactionMeta;
   const { maxFeeNativeHex } = useFeeCalculations(
     transactionMetadata as TransactionMeta,
@@ -28,7 +28,11 @@ export function useMaxValueRefresher() {
   const { balanceWeiInHex } = useAccountNativeBalance(chainId, txParams.from);
 
   useEffect(() => {
-    if (!maxValueMode || type !== TransactionType.simpleSend) {
+    if (
+      !maxValueMode ||
+      type !== TransactionType.simpleSend ||
+      simulationFails
+    ) {
       // Not compatible with transaction value refresh logic
       return;
     }
@@ -55,6 +59,7 @@ export function useMaxValueRefresher() {
     maxValueMode,
     maxFeeNativeHex,
     setIsTransactionValueUpdating,
+    simulationFails,
     txParams,
     type,
   ]);
diff --git a/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/TemplateConfirmation.test.tsx b/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/TemplateConfirmation.test.tsx
index 3187380226a7..d850b640e71e 100644
--- a/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/TemplateConfirmation.test.tsx
+++ b/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/TemplateConfirmation.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react-native';
+import { fireEvent, render } from '@testing-library/react-native';
 import TemplateConfirmation, {
   TemplateConfirmationProps,
 } from './TemplateConfirmation';
@@ -15,6 +15,9 @@ const CANCEL_TEXT_MOCK = 'CANCEL_TEXT_MOCK';
 const CONFIRM_TEXT_MOCK = 'CONFIRM_TEXT_MOCK';
 
 describe('TemplateConfirmation', () => {
+  const mockOnConfirm = jest.fn();
+  const mockOnCancel = jest.fn();
+
   const mockProps: TemplateConfirmationProps = {
     approvalRequest: {
       id: 'mocked',
@@ -22,16 +25,19 @@ describe('TemplateConfirmation', () => {
       requestData: {
         data: '123',
       },
-      // Add props here in order to satisfy the type
       type: ApprovalTypes.RESULT_SUCCESS,
       expectsResult: false,
       requestState: null,
       time: 123456,
     },
-    onConfirm: jest.fn(),
-    onCancel: jest.fn(),
+    onConfirm: mockOnConfirm,
+    onCancel: mockOnCancel,
   };
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('renders content and actions', () => {
     (getTemplateValues as jest.Mock).mockReturnValue({
       content: [CONTENT_MOCK],
@@ -59,4 +65,95 @@ describe('TemplateConfirmation', () => {
     expect(wrapper.queryByText(CANCEL_TEXT_MOCK)).toBeNull();
     expect(wrapper.queryByText(CONFIRM_TEXT_MOCK)).toBeNull();
   });
+
+  it('calls onConfirm when the primary button is pressed', () => {
+    (getTemplateValues as jest.Mock).mockReturnValue({
+      content: [CONTENT_MOCK],
+      cancelText: CANCEL_TEXT_MOCK,
+      confirmText: CONFIRM_TEXT_MOCK,
+    });
+    const wrapper = render(<TemplateConfirmation {...mockProps} />);
+
+    fireEvent.press(wrapper.getByRole('button', { name: CONFIRM_TEXT_MOCK }));
+
+    expect(mockOnConfirm).toHaveBeenCalledTimes(1);
+    expect(mockOnCancel).not.toHaveBeenCalled();
+  });
+
+  it('calls onCancel when the secondary button is pressed', () => {
+    (getTemplateValues as jest.Mock).mockReturnValue({
+      content: [CONTENT_MOCK],
+      cancelText: CANCEL_TEXT_MOCK,
+      confirmText: CONFIRM_TEXT_MOCK,
+    });
+    const wrapper = render(<TemplateConfirmation {...mockProps} />);
+
+    fireEvent.press(wrapper.getByRole('button', { name: CANCEL_TEXT_MOCK }));
+
+    expect(mockOnCancel).toHaveBeenCalledTimes(1);
+    expect(mockOnConfirm).not.toHaveBeenCalled();
+  });
+
+  it('calls template onConfirm/onCancel handlers when provided', () => {
+    const templateOnConfirm = jest.fn();
+    const templateOnCancel = jest.fn();
+    (getTemplateValues as jest.Mock).mockReturnValue({
+      content: [CONTENT_MOCK],
+      cancelText: CANCEL_TEXT_MOCK,
+      confirmText: CONFIRM_TEXT_MOCK,
+      onConfirm: templateOnConfirm,
+      onCancel: templateOnCancel,
+    });
+    const wrapper = render(<TemplateConfirmation {...mockProps} />);
+
+    fireEvent.press(wrapper.getByRole('button', { name: CONFIRM_TEXT_MOCK }));
+    fireEvent.press(wrapper.getByRole('button', { name: CANCEL_TEXT_MOCK }));
+
+    expect(templateOnConfirm).toHaveBeenCalledTimes(1);
+    expect(templateOnCancel).toHaveBeenCalledTimes(1);
+    expect(mockOnConfirm).not.toHaveBeenCalled();
+    expect(mockOnCancel).not.toHaveBeenCalled();
+  });
+
+  it('renders only the primary button when cancel is hidden', () => {
+    (getTemplateValues as jest.Mock).mockReturnValue({
+      content: [CONTENT_MOCK],
+      confirmText: CONFIRM_TEXT_MOCK,
+      hideCancelButton: true,
+    });
+    const wrapper = render(<TemplateConfirmation {...mockProps} />);
+
+    expect(
+      wrapper.getByRole('button', { name: CONFIRM_TEXT_MOCK }),
+    ).toBeOnTheScreen();
+    expect(
+      wrapper.queryByRole('button', { name: CANCEL_TEXT_MOCK }),
+    ).toBeNull();
+  });
+
+  it('renders only the secondary button when submit is hidden', () => {
+    (getTemplateValues as jest.Mock).mockReturnValue({
+      content: [CONTENT_MOCK],
+      cancelText: CANCEL_TEXT_MOCK,
+      hideSubmitButton: true,
+    });
+    const wrapper = render(<TemplateConfirmation {...mockProps} />);
+
+    expect(
+      wrapper.getByRole('button', { name: CANCEL_TEXT_MOCK }),
+    ).toBeOnTheScreen();
+    expect(
+      wrapper.queryByRole('button', { name: CONFIRM_TEXT_MOCK }),
+    ).toBeNull();
+  });
+
+  it('falls back to default confirm and cancel labels', () => {
+    (getTemplateValues as jest.Mock).mockReturnValue({
+      content: [CONTENT_MOCK],
+    });
+    const wrapper = render(<TemplateConfirmation {...mockProps} />);
+
+    expect(wrapper.getByRole('button', { name: 'OK' })).toBeOnTheScreen();
+    expect(wrapper.getByRole('button', { name: 'Cancel' })).toBeOnTheScreen();
+  });
 });
diff --git a/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/TemplateConfirmation.tsx b/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/TemplateConfirmation.tsx
index 0eb1993b4665..042ac842c1e4 100644
--- a/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/TemplateConfirmation.tsx
+++ b/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/TemplateConfirmation.tsx
@@ -5,13 +5,11 @@ import { ConfirmationTemplateValues, getTemplateValues } from './Templates';
 import { useStyles } from '../../../../../../hooks/useStyles';
 import stylesheet from './TemplateConfirmation.styles';
 import { View } from 'react-native-animatable';
-import BottomSheetFooter, {
-  ButtonsAlignment,
-} from '../../../../../../../component-library/components/BottomSheets/BottomSheetFooter';
 import {
+  BottomSheetFooter,
   ButtonSize,
-  ButtonVariants,
-} from '../../../../../../../component-library/components/Buttons/Button';
+  ButtonsAlignment,
+} from '@metamask/design-system-react-native';
 import { useAppThemeFromContext } from '../../../../../../../util/theme';
 import { AcceptOptions, ApprovalRequest } from '@metamask/approval-controller';
 
@@ -63,38 +61,51 @@ const TemplateConfirmation = ({
     };
   }, [templatedValues.onCancel, onCancel, templatedValues]);
 
-  const buttons = [];
-
-  if (!templatedValues.hideSubmitButton) {
-    buttons.push({
-      variant: ButtonVariants.Primary,
-      label: templatedValues.confirmText ?? strings('template_confirmation.ok'),
-      size: ButtonSize.Lg,
-      onPress: templatedValues.onConfirm ?? onConfirm,
-    });
-  }
+  const showPrimary = !templatedValues.hideSubmitButton;
+  const showSecondary = !templatedValues.hideCancelButton;
 
-  if (!templatedValues.hideCancelButton) {
-    buttons.push({
-      variant: ButtonVariants.Secondary,
-      label:
-        templatedValues.cancelText ?? strings('template_confirmation.cancel'),
-      size: ButtonSize.Lg,
-      onPress: templatedValues.onCancel ?? onCancel,
-    });
+  if (!showPrimary && !showSecondary) {
+    return (
+      <View style={styles.root}>
+        <TemplateRenderer sections={templatedValues.content} />
+      </View>
+    );
   }
 
   return (
     <View style={styles.root}>
       <TemplateRenderer sections={templatedValues.content} />
-      {buttons.length > 0 && (
-        <View style={styles.actionContainer}>
-          <BottomSheetFooter
-            buttonsAlignment={ButtonsAlignment.Horizontal}
-            buttonPropsArray={buttons}
-          />
-        </View>
-      )}
+      <View style={styles.actionContainer}>
+        <BottomSheetFooter
+          buttonsAlignment={ButtonsAlignment.Horizontal}
+          primaryButtonProps={
+            showPrimary
+              ? {
+                  children:
+                    templatedValues.confirmText ??
+                    strings('template_confirmation.ok'),
+                  size: ButtonSize.Lg,
+                  onPress: () => {
+                    (templatedValues.onConfirm ?? onConfirm)();
+                  },
+                }
+              : undefined
+          }
+          secondaryButtonProps={
+            showSecondary
+              ? {
+                  children:
+                    templatedValues.cancelText ??
+                    strings('template_confirmation.cancel'),
+                  size: ButtonSize.Lg,
+                  onPress: () => {
+                    (templatedValues.onCancel ?? onCancel)();
+                  },
+                }
+              : undefined
+          }
+        />
+      </View>
     </View>
   );
 };
diff --git a/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/Templates/ApprovalResult.test.tsx b/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/Templates/ApprovalResult.test.tsx
index 1b87e1b08125..e05e094ac234 100644
--- a/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/Templates/ApprovalResult.test.tsx
+++ b/app/components/Views/confirmations/legacy/components/Approval/TemplateConfirmation/Templates/ApprovalResult.test.tsx
@@ -26,7 +26,7 @@ describe('ApprovalResult', () => {
     const wrapper = render(<TemplateConfirmation {...mockProps} />);
 
     expect(wrapper.getByText('Success message')).toBeOnTheScreen();
-    expect(wrapper.getByTestId('bottomsheetfooter-button')).toBeOnTheScreen();
+    expect(wrapper.getByRole('button', { name: 'OK' })).toBeOnTheScreen();
   });
 
   it('renders approval result with error type', () => {
@@ -45,6 +45,6 @@ describe('ApprovalResult', () => {
     const wrapper = render(<TemplateConfirmation {...errorMockProps} />);
 
     expect(wrapper.getByText('Error message')).toBeOnTheScreen();
-    expect(wrapper.getByTestId('bottomsheetfooter-button')).toBeOnTheScreen();
+    expect(wrapper.getByRole('button', { name: 'OK' })).toBeOnTheScreen();
   });
 });
diff --git a/app/components/Views/confirmations/legacy/components/WarningMessage/index.tsx b/app/components/Views/confirmations/legacy/components/WarningMessage/index.tsx
deleted file mode 100644
index 97535bf853df..000000000000
--- a/app/components/Views/confirmations/legacy/components/WarningMessage/index.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React, { ReactNode } from 'react';
-import { StyleProp, StyleSheet, ViewStyle } from 'react-native';
-import FontAwesome from 'react-native-vector-icons/FontAwesome';
-import Alert, { AlertType } from '../../../../../Base/Alert';
-import { useTheme } from '../../../../../../util/theme';
-
-interface Props {
-  /**
-   * Warning message to display (Plain text or JSX)
-   */
-  warningMessage: ReactNode;
-  style?: StyleProp<ViewStyle>;
-  onDismiss?: () => void;
-}
-
-const styles = StyleSheet.create({
-  icon: {
-    paddingTop: 4,
-    paddingRight: 8,
-  },
-});
-
-const WarningMessage = ({ warningMessage, style, onDismiss }: Props) => {
-  const { colors } = useTheme();
-
-  return (
-    <Alert
-      type={AlertType.Warning}
-      style={style}
-      onDismiss={onDismiss}
-      renderIcon={() => (
-        <FontAwesome
-          style={styles.icon}
-          name={'exclamation-circle'}
-          color={colors.warning.default}
-          size={18}
-        />
-      )}
-    >
-      {warningMessage}
-    </Alert>
-  );
-};
-
-export default WarningMessage;
diff --git a/app/components/Views/confirmations/utils/alert-system.test.ts b/app/components/Views/confirmations/utils/alert-system.test.ts
index f8a7e6ca8b2a..9b9362283244 100644
--- a/app/components/Views/confirmations/utils/alert-system.test.ts
+++ b/app/components/Views/confirmations/utils/alert-system.test.ts
@@ -1,6 +1,6 @@
+import { BannerAlertSeverity } from '@metamask/design-system-react-native';
 import { ThemeColors } from '@metamask/design-tokens';
 import { Severity } from '../types/alerts';
-import { BannerAlertSeverity } from '../../../../component-library/components/Banners/Banner';
 import { getSeverityStyle, getBannerAlertSeverity } from './alert-system';
 
 describe('getSeverityStyle', () => {
@@ -50,7 +50,7 @@ describe('getSeverityStyle', () => {
 describe('getBannerAlertSeverity', () => {
   it('returns the correct BannerAlertSeverity for Danger severity', () => {
     const result = getBannerAlertSeverity(Severity.Danger);
-    expect(result).toBe(BannerAlertSeverity.Error);
+    expect(result).toBe(BannerAlertSeverity.Danger);
   });
 
   it('returns the correct BannerAlertSeverity for Warning severity', () => {
diff --git a/app/components/Views/confirmations/utils/alert-system.ts b/app/components/Views/confirmations/utils/alert-system.ts
index c2e30f1b891a..db91e17d19c8 100644
--- a/app/components/Views/confirmations/utils/alert-system.ts
+++ b/app/components/Views/confirmations/utils/alert-system.ts
@@ -1,6 +1,6 @@
+import { BannerAlertSeverity } from '@metamask/design-system-react-native';
 import { ThemeColors } from '@metamask/design-tokens';
 import { Severity } from '../types/alerts';
-import { BannerAlertSeverity } from '../../../../component-library/components/Banners/Banner';
 
 /**
  * Returns the style object based on the severity level.
@@ -40,7 +40,7 @@ export function getBannerAlertSeverity(
 ): BannerAlertSeverity {
   switch (severity) {
     case Severity.Danger:
-      return BannerAlertSeverity.Error;
+      return BannerAlertSeverity.Danger;
     case Severity.Warning:
       return BannerAlertSeverity.Warning;
     default:
diff --git a/app/components/Views/confirmations/utils/transaction-pay.test.ts b/app/components/Views/confirmations/utils/transaction-pay.test.ts
index 1af6b035f05f..0e655ba42163 100644
--- a/app/components/Views/confirmations/utils/transaction-pay.test.ts
+++ b/app/components/Views/confirmations/utils/transaction-pay.test.ts
@@ -14,6 +14,7 @@ import {
   isTokenBlocked,
   replaceAccountInNestedTransactions,
   resolvePreferredPayToken,
+  setMoneyAccountDepositMaxAtomic,
 } from './transaction-pay';
 import { updateAtomicBatchData } from '../../../../util/transaction-controller';
 import Logger from '../../../../util/Logger';
@@ -886,43 +887,142 @@ describe('Transaction Pay Utils', () => {
       Engine.context.TransactionPayController.updateFiatPayment,
     );
 
-    it('sets PaymentOverride.MoneyAccount with refundTo for deposit', () => {
-      applyMoneyAccountOverride(TRANSACTION_ID, MONEY_ADDRESS, false);
+    function buildTransactionMeta(
+      type: TransactionType,
+      overrides: Partial<TransactionMeta> = {},
+    ): TransactionMeta {
+      return {
+        id: TRANSACTION_ID,
+        type,
+        ...overrides,
+      } as TransactionMeta;
+    }
 
-      expect(setTransactionConfigMock).toHaveBeenCalledWith(
+    function runConfigCallback(): Record<string, unknown> {
+      const config: Record<string, unknown> = {};
+      setTransactionConfigMock.mock.calls[0][1](config as never);
+      return config;
+    }
+
+    it('sets paymentOverride and atomic:false for perpsWithdraw', () => {
+      applyMoneyAccountOverride(
         TRANSACTION_ID,
-        expect.any(Function),
+        MONEY_ADDRESS,
+        buildTransactionMeta(TransactionType.perpsWithdraw),
       );
 
-      const config: Record<string, unknown> = {};
-      setTransactionConfigMock.mock.calls[0][1](config as never);
+      const config = runConfigCallback();
+
+      expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+      expect(config.atomic).toBe(false);
+      expect(config.refundTo).toBeUndefined();
+    });
+
+    it('sets paymentOverride and atomic:false for predictWithdraw', () => {
+      applyMoneyAccountOverride(
+        TRANSACTION_ID,
+        MONEY_ADDRESS,
+        buildTransactionMeta(TransactionType.predictWithdraw),
+      );
+
+      const config = runConfigCallback();
 
       expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+      expect(config.atomic).toBe(false);
+      expect(config.refundTo).toBeUndefined();
+    });
+
+    it('sets paymentOverride and refundTo but leaves atomic unset for moneyAccountDeposit', () => {
+      applyMoneyAccountOverride(
+        TRANSACTION_ID,
+        MONEY_ADDRESS,
+        buildTransactionMeta(TransactionType.moneyAccountDeposit),
+      );
+
+      const config = runConfigCallback();
+
+      expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+      expect(config.atomic).toBeUndefined();
       expect(config.refundTo).toBe(MONEY_ADDRESS);
     });
 
-    it('sets PaymentOverride.MoneyAccount without refundTo for withdraw', () => {
-      applyMoneyAccountOverride(TRANSACTION_ID, MONEY_ADDRESS, true);
+    it.each([
+      TransactionType.perpsDeposit,
+      TransactionType.predictDeposit,
+    ] as const)(
+      'sets refundTo but leaves atomic unset for %s',
+      (transactionType) => {
+        applyMoneyAccountOverride(
+          TRANSACTION_ID,
+          MONEY_ADDRESS,
+          buildTransactionMeta(transactionType),
+        );
 
-      const config: Record<string, unknown> = {};
-      setTransactionConfigMock.mock.calls[0][1](config as never);
+        const config = runConfigCallback();
+
+        expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+        expect(config.atomic).toBeUndefined();
+        expect(config.refundTo).toBe(MONEY_ADDRESS);
+      },
+    );
+
+    it('sets only paymentOverride for moneyAccountWithdraw (no atomic or refundTo)', () => {
+      applyMoneyAccountOverride(
+        TRANSACTION_ID,
+        MONEY_ADDRESS,
+        buildTransactionMeta(TransactionType.moneyAccountWithdraw),
+      );
+
+      const config = runConfigCallback();
 
       expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+      expect(config.atomic).toBeUndefined();
       expect(config.refundTo).toBeUndefined();
     });
 
-    it('omits refundTo when moneyAccountAddress is undefined', () => {
-      applyMoneyAccountOverride(TRANSACTION_ID, undefined, false);
+    it('sets atomic:false when moneyAccountAddress is undefined for perps/predict withdraws', () => {
+      applyMoneyAccountOverride(
+        TRANSACTION_ID,
+        undefined,
+        buildTransactionMeta(TransactionType.perpsWithdraw),
+      );
 
-      const config: Record<string, unknown> = {};
-      setTransactionConfigMock.mock.calls[0][1](config as never);
+      const config = runConfigCallback();
+
+      expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+      expect(config.atomic).toBe(false);
+      expect(config.refundTo).toBeUndefined();
+    });
+
+    it('omits refundTo when moneyAccountAddress is undefined for moneyAccountDeposit', () => {
+      applyMoneyAccountOverride(
+        TRANSACTION_ID,
+        undefined,
+        buildTransactionMeta(TransactionType.moneyAccountDeposit),
+      );
+
+      const config = runConfigCallback();
 
       expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
       expect(config.refundTo).toBeUndefined();
     });
 
+    it('sets paymentOverride and refundTo when transactionMeta is undefined', () => {
+      applyMoneyAccountOverride(TRANSACTION_ID, MONEY_ADDRESS, undefined);
+
+      const config = runConfigCallback();
+
+      expect(config.paymentOverride).toBe(PaymentOverride.MoneyAccount);
+      expect(config.atomic).toBeUndefined();
+      expect(config.refundTo).toBe(MONEY_ADDRESS);
+    });
+
     it('clears selectedPaymentMethodId via updateFiatPayment', () => {
-      applyMoneyAccountOverride(TRANSACTION_ID, MONEY_ADDRESS, false);
+      applyMoneyAccountOverride(
+        TRANSACTION_ID,
+        MONEY_ADDRESS,
+        buildTransactionMeta(TransactionType.moneyAccountDeposit),
+      );
 
       expect(updateFiatPaymentMock).toHaveBeenCalledWith({
         transactionId: TRANSACTION_ID,
@@ -938,4 +1038,30 @@ describe('Transaction Pay Utils', () => {
       expect(fp.selectedPaymentMethodId).toBeUndefined();
     });
   });
+
+  describe('setMoneyAccountDepositMaxAtomic', () => {
+    const TRANSACTION_ID = 'tx-max-atomic';
+
+    const setTransactionConfigMock = jest.mocked(
+      Engine.context.TransactionPayController.setTransactionConfig,
+    );
+
+    it('sets atomic to false when isMax is true', () => {
+      setMoneyAccountDepositMaxAtomic(TRANSACTION_ID, true);
+
+      const config: Record<string, unknown> = {};
+      setTransactionConfigMock.mock.calls[0][1](config as never);
+
+      expect(config.atomic).toBe(false);
+    });
+
+    it('clears atomic (to undefined) when isMax is false', () => {
+      setMoneyAccountDepositMaxAtomic(TRANSACTION_ID, false);
+
+      const config: Record<string, unknown> = { atomic: false };
+      setTransactionConfigMock.mock.calls[0][1](config as never);
+
+      expect(config.atomic).toBeUndefined();
+    });
+  });
 });
diff --git a/app/components/Views/confirmations/utils/transaction-pay.ts b/app/components/Views/confirmations/utils/transaction-pay.ts
index 1ebe6e4c57a4..4e52c613bff6 100644
--- a/app/components/Views/confirmations/utils/transaction-pay.ts
+++ b/app/components/Views/confirmations/utils/transaction-pay.ts
@@ -9,6 +9,7 @@ import {
   PaymentOverride,
   TransactionFiatPayment,
   TransactionPayRequiredToken,
+  TransactionPayTotals,
   TransactionPaymentToken,
 } from '@metamask/transaction-pay-controller';
 import { PREDICT_MINIMUM_DEPOSIT } from '../constants/predict';
@@ -26,6 +27,7 @@ import Logger from '../../../../util/Logger';
 import Engine from '../../../../core/Engine';
 import { updateAtomicBatchData } from '../../../../util/transaction-controller';
 import { MUSD_TOKEN_ADDRESS } from '../../../UI/Earn/constants/musd';
+import { isTransactionPayWithdraw } from './transaction';
 
 interface ResolvedPayTokenRequest {
   address: Hex;
@@ -311,21 +313,44 @@ export function resolvePreferredPayToken({
 }
 
 /**
- * Sets the money account payment override on a transaction and clears any
- * previously selected fiat payment method. For deposit flows the money
- * account address is stored as the refund destination.
+ * Sets the Money Account payment override on a transaction and clears any
+ * previously selected fiat payment method.
+ *
+ * `paymentOverride` is set unconditionally; the additional flow-specific
+ * fields are set only for the flows that need them.
+ *
+ * Perps/Predict withdraw → MA sets `atomic: false` so the post-Relay transfer
+ * to the Money Account runs in `submitPostNonAtomic`. The quote recipient is
+ * derived by the pay controller via the `getPaymentOverrideData` callback.
+ * Deposit-direction flows funded by the Money Account (Money Account, Perps,
+ * and Predict deposits) set `refundTo: MA` so failed Relay bridges refund to
+ * the MA rather than the funding EOA. Money Account deposits additionally
+ * flip `atomic: false` later via `setMoneyAccountDepositMaxAtomic` when the
+ * user toggles max amount.
+ *
+ * Money Account withdraw (`moneyAccountWithdraw`) keeps the default atomic
+ * path with no recipient override: `processTransactions` overwrites the quote
+ * recipient with the actual token-transfer target from the nested batch.
  */
 export function applyMoneyAccountOverride(
   transactionId: string,
   moneyAccountAddress: string | undefined,
-  isWithdraw: boolean,
+  transactionMeta: TransactionMeta | undefined,
 ): void {
+  const isPerpsOrPredictWithdraw = hasTransactionType(transactionMeta, [
+    TransactionType.perpsWithdraw,
+    TransactionType.predictWithdraw,
+  ]);
+  const isWithdraw = isTransactionPayWithdraw(transactionMeta);
+
   Engine.context.TransactionPayController.setTransactionConfig(
     transactionId,
     (config) => {
-      (config as Record<string, unknown>).paymentOverride =
-        PaymentOverride.MoneyAccount;
-      if (moneyAccountAddress && !isWithdraw) {
+      config.paymentOverride = PaymentOverride.MoneyAccount;
+      if (isPerpsOrPredictWithdraw) {
+        config.atomic = false;
+      }
+      if (!isWithdraw && moneyAccountAddress) {
         config.refundTo = moneyAccountAddress as Hex;
       }
     },
@@ -338,3 +363,30 @@ export function applyMoneyAccountOverride(
     },
   });
 }
+
+/**
+ * Toggle non-atomic mode on a Money Account deposit based on whether the user
+ * has selected the max-amount option. Only max-amount deposits need the
+ * post-Relay vault-deposit path; regular deposits stay atomic (EXPECTED_OUTPUT
+ * with the vault deposit embedded in the Relay bundle).
+ */
+export function getTotalPayFeesUsd(
+  fees: TransactionPayTotals['fees'],
+): BigNumber {
+  return new BigNumber(fees.provider?.usd ?? 0)
+    .plus(fees.sourceNetwork?.estimate?.usd ?? 0)
+    .plus(fees.targetNetwork?.usd ?? 0)
+    .plus(fees.metaMask?.usd ?? 0);
+}
+
+export function setMoneyAccountDepositMaxAtomic(
+  transactionId: string,
+  isMax: boolean,
+): void {
+  Engine.context.TransactionPayController.setTransactionConfig(
+    transactionId,
+    (config) => {
+      config.atomic = isMax ? false : undefined;
+    },
+  );
+}
diff --git a/app/components/hooks/useOriginSource.test.ts b/app/components/hooks/useOriginSource.test.ts
index a5e2e85551fa..4730f669266a 100644
--- a/app/components/hooks/useOriginSource.test.ts
+++ b/app/components/hooks/useOriginSource.test.ts
@@ -30,7 +30,8 @@ jest.mock('../../core/SDKConnect/SDKConnect', () => ({
           protocolVersion: '1.0',
           originatorInfo: { name: 'test-originator' },
           initialConnection: true,
-          validUntil: Date.now() + 10000,
+          // Pinned instead of Date.now() so the mock stays deterministic.
+          validUntil: 1735689600000,
         };
       }
       return undefined;
@@ -145,7 +146,7 @@ describe('useOriginSource', () => {
     });
   });
 
-  it('should return WALLET_CONNECT source when WC metadata is present', () => {
+  it('returns WALLET_CONNECT source when WC metadata origin matches', () => {
     const wcState = {
       ...mockState,
       sdk: {
@@ -163,7 +164,7 @@ describe('useOriginSource', () => {
       );
 
     const { result } = renderHook(() =>
-      useOriginSource({ origin: 'some-non-uuid-origin' }),
+      useOriginSource({ origin: 'some-wc-id' }),
     );
     expect(result.current).toEqual({
       source: SourceType.WALLET_CONNECT,
@@ -171,6 +172,33 @@ describe('useOriginSource', () => {
     });
   });
 
+  it('returns IN_APP_BROWSER source when stale WC metadata does not match origin', () => {
+    const wcState = {
+      ...mockState,
+      sdk: {
+        ...mockState.sdk,
+        wc2Metadata: {
+          id: 'stale-pairing-topic',
+          url: 'https://chikn.farm',
+        },
+      },
+    } as RootState;
+
+    jest
+      .requireMock('react-redux')
+      .useSelector.mockImplementation(
+        (selector: (state: RootState) => unknown) => selector(wcState),
+      );
+
+    const { result } = renderHook(() =>
+      useOriginSource({ origin: 'app.uniswap.org' }),
+    );
+    expect(result.current).toEqual({
+      source: SourceType.IN_APP_BROWSER,
+      requestSource: AppConstants.REQUEST_SOURCES.IN_APP_BROWSER,
+    });
+  });
+
   it('should return IN_APP_BROWSER source as default', () => {
     mockSelector.mockImplementation((selector: (state: RootState) => unknown) =>
       selector(mockState),
diff --git a/app/components/hooks/useOriginSource.ts b/app/components/hooks/useOriginSource.ts
index 5687734f4484..b20fe25d6b25 100644
--- a/app/components/hooks/useOriginSource.ts
+++ b/app/components/hooks/useOriginSource.ts
@@ -3,6 +3,7 @@ import { useSelector } from 'react-redux';
 import SDKConnect from '../../core/SDKConnect/SDKConnect';
 import { RootState } from '../../reducers';
 import { isUUID } from '../../core/SDKConnect/utils/isUUID';
+import { isWalletConnectPermissionOrigin } from '../../core/WalletConnect/wc-utils';
 import { SourceType } from './useAnalytics/useAnalytics.types';
 import AppConstants from '../../core/AppConstants';
 
@@ -85,13 +86,11 @@ export const useOriginSource = ({
     ) {
       // --- SDK v1 (bare UUID) ---
       source = SourceType.SDK;
-    } else if (wc2Metadata?.id && wc2Metadata.id.length > 0) {
+    } else if (isWalletConnectPermissionOrigin(origin, wc2Metadata)) {
       // --- WalletConnect ---
-      // wc2Metadata is a single Redux slot holding the *most recent* WC proposal
-      // metadata (set on session_proposal, cleared after approval/rejection).
-      // It is not keyed by origin — we rely on the WC proposal flow being
-      // serialized (via proposalLock in WalletConnectV2) so that during the
-      // approval window, a non-empty id implies *this* origin is from WC.
+      // wc2Metadata.id is the pairing topic (permission origin). Only classify
+      // as WC when the request origin matches, so stale metadata cannot bleed
+      // into unrelated in-app browser connection prompts.
       source = SourceType.WALLET_CONNECT;
     }
 
diff --git a/app/components/hooks/useTokenLogo/useTokenLogo.test.ts b/app/components/hooks/useTokenLogo/useTokenLogo.test.ts
index 98be6afe580b..9a34d506a435 100644
--- a/app/components/hooks/useTokenLogo/useTokenLogo.test.ts
+++ b/app/components/hooks/useTokenLogo/useTokenLogo.test.ts
@@ -101,6 +101,25 @@ describe('useTokenLogo', () => {
     });
   });
 
+  describe('referential stability', () => {
+    it('returns stable styles and handlers across re-renders when bg sets are omitted', () => {
+      const { result, rerender } = renderHook(
+        ({ symbol }) => useTokenLogo({ symbol, size: 44 }),
+        { initialProps: { symbol: 'USDC' } },
+      );
+
+      const first = result.current;
+
+      rerender({ symbol: 'USDC' });
+
+      expect(result.current.containerStyle).toBe(first.containerStyle);
+      expect(result.current.imageStyle).toBe(first.imageStyle);
+      expect(result.current.handleLoadStart).toBe(first.handleLoadStart);
+      expect(result.current.handleLoadEnd).toBe(first.handleLoadEnd);
+      expect(result.current.handleError).toBe(first.handleError);
+    });
+  });
+
   describe('State reset on symbol change', () => {
     it('should reset loading and error states when symbol changes', () => {
       const { result, rerender } = renderHook(
diff --git a/app/components/hooks/useTokenLogo/useTokenLogo.ts b/app/components/hooks/useTokenLogo/useTokenLogo.ts
index fdcc76f58caa..b15ade7b27da 100644
--- a/app/components/hooks/useTokenLogo/useTokenLogo.ts
+++ b/app/components/hooks/useTokenLogo/useTokenLogo.ts
@@ -1,12 +1,14 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { ImageStyle, ViewStyle } from 'react-native';
 import { useTheme } from '../../../util/theme';
 
+const EMPTY_SET: ReadonlySet<string> = new Set();
+
 export interface UseTokenLogoConfig {
   symbol: string;
   size?: number;
-  assetsRequiringLightBg?: Set<string>;
-  assetsRequiringDarkBg?: Set<string>;
+  assetsRequiringLightBg?: ReadonlySet<string>;
+  assetsRequiringDarkBg?: ReadonlySet<string>;
 }
 
 export interface UseTokenLogoReturn {
@@ -35,8 +37,8 @@ export interface UseTokenLogoReturn {
 export const useTokenLogo = ({
   symbol,
   size = 44,
-  assetsRequiringLightBg = new Set<string>(),
-  assetsRequiringDarkBg = new Set<string>(),
+  assetsRequiringLightBg = EMPTY_SET,
+  assetsRequiringDarkBg = EMPTY_SET,
 }: UseTokenLogoConfig): UseTokenLogoReturn => {
   const { colors, themeAppearance } = useTheme();
   const [isLoading, setIsLoading] = useState(false);
@@ -108,19 +110,19 @@ export const useTokenLogo = ({
     [size, colors.text.default],
   );
 
-  const handleLoadStart = () => {
+  const handleLoadStart = useCallback(() => {
     setIsLoading(true);
     setHasError(false);
-  };
+  }, []);
 
-  const handleLoadEnd = () => {
+  const handleLoadEnd = useCallback(() => {
     setIsLoading(false);
-  };
+  }, []);
 
-  const handleError = () => {
+  const handleError = useCallback(() => {
     setIsLoading(false);
     setHasError(true);
-  };
+  }, []);
 
   return {
     isLoading,
diff --git a/app/components/product-safety/scam-questionnaire/scam-questionnaire.constants.test.ts b/app/components/product-safety/scam-questionnaire/scam-questionnaire.constants.test.ts
index 436f13eb4ce2..3f8099696c19 100644
--- a/app/components/product-safety/scam-questionnaire/scam-questionnaire.constants.test.ts
+++ b/app/components/product-safety/scam-questionnaire/scam-questionnaire.constants.test.ts
@@ -3,8 +3,10 @@ import {
   Q1_OPTIONS,
   Q2_OPTIONS,
   Q3_OPTIONS,
+  getAnswerRecord,
   getRedFlagCount,
   getRedFlagQuestions,
+  stepLabelFromIndex,
 } from './scam-questionnaire.constants';
 
 describe('scam-questionnaire.constants', () => {
@@ -95,4 +97,45 @@ describe('scam-questionnaire.constants', () => {
       expect(getRedFlagQuestions({})).toEqual([]);
     });
   });
+
+  describe('stepLabelFromIndex', () => {
+    it('maps each step index to its label', () => {
+      expect(stepLabelFromIndex(0)).toBe('q1');
+      expect(stepLabelFromIndex(1)).toBe('q2');
+      expect(stepLabelFromIndex(2)).toBe('q3');
+      expect(stepLabelFromIndex(3)).toBe('warning');
+    });
+  });
+
+  describe('getAnswerRecord', () => {
+    const redFlag = Q1_OPTIONS.find((o) => o.key === 'q1_yes');
+    const noFlag = Q1_OPTIONS.find((o) => o.key === 'q1_no');
+    const q2Clean = Q2_OPTIONS.find((o) => o.key === 'q2_goods');
+    const q3Flag = Q3_OPTIONS.find((o) => o.key === 'q3_yes');
+
+    it('returns the answer key for each question answered', () => {
+      const answers: Answers = { q1: redFlag, q2: q2Clean, q3: q3Flag };
+      expect(getAnswerRecord(answers)).toStrictEqual({
+        q1_answer: 'q1_yes',
+        q2_answer: 'q2_goods',
+        q3_answer: 'q3_yes',
+      });
+    });
+
+    it('returns null for questions that were not answered', () => {
+      expect(getAnswerRecord({ q1: noFlag })).toStrictEqual({
+        q1_answer: 'q1_no',
+        q2_answer: null,
+        q3_answer: null,
+      });
+    });
+
+    it('returns null for every question when nothing is answered', () => {
+      expect(getAnswerRecord({})).toStrictEqual({
+        q1_answer: null,
+        q2_answer: null,
+        q3_answer: null,
+      });
+    });
+  });
 });
diff --git a/app/components/product-safety/scam-questionnaire/scam-questionnaire.constants.ts b/app/components/product-safety/scam-questionnaire/scam-questionnaire.constants.ts
index 05a70fdba616..a2d561b5a0c6 100644
--- a/app/components/product-safety/scam-questionnaire/scam-questionnaire.constants.ts
+++ b/app/components/product-safety/scam-questionnaire/scam-questionnaire.constants.ts
@@ -1,5 +1,34 @@
+export const SCAM_QUESTIONNAIRE_FLAG_KEY =
+  'productSafetyScamQuestionnaireEnabled';
+
+export const SCAM_QUESTIONNAIRE_VARIANTS = {
+  control: { showQuestionnaire: false },
+  treatment: { showQuestionnaire: true },
+} as const;
+
 export const TOTAL_QUESTIONS = 3;
 
+// Bump when the questions, answer options, or red-flag verdicts change.
+export const QUESTIONNAIRE_VERSION = '1';
+
+// Steps 0-2 are the questions; the final index is the warning screen.
+export type Step = 0 | 1 | 2 | 3;
+
+export type StepLabel = 'q1' | 'q2' | 'q3' | 'warning';
+
+export function stepLabelFromIndex(step: Step): StepLabel {
+  if (step === 0) {
+    return 'q1';
+  }
+  if (step === 1) {
+    return 'q2';
+  }
+  if (step === 2) {
+    return 'q3';
+  }
+  return 'warning';
+}
+
 // Seconds the bypass ("continue anyway") link stays disabled on the scam
 // warning screen, forcing the user to pause and read the warning before they
 // can dismiss it.
@@ -87,6 +116,25 @@ export function getRedFlagCount(answers: Answers): number {
   ).length;
 }
 
+// eslint-disable-next-line @typescript-eslint/naming-convention -- These keys are sent
+// verbatim as analytics properties, which segment-schema requires in snake_case.
+export interface AnswerRecord {
+  q1_answer: string | null;
+  q2_answer: string | null;
+  q3_answer: string | null;
+}
+
+// Unanswered questions report `null` rather than being omitted, so events
+// distinguish "not reached" from "answered".
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export function getAnswerRecord(answers: Answers): AnswerRecord {
+  return {
+    q1_answer: answers.q1?.key ?? null,
+    q2_answer: answers.q2?.key ?? null,
+    q3_answer: answers.q3?.key ?? null,
+  };
+}
+
 export function getRedFlagQuestions(answers: Answers): QuestionId[] {
   return (Object.entries(answers) as [QuestionId, QuestionOption][])
     .filter(([, a]) => a?.isRedFlag)
diff --git a/app/components/product-safety/scam-questionnaire/scam-questionnaire.test.tsx b/app/components/product-safety/scam-questionnaire/scam-questionnaire.test.tsx
index 4184bf8e501d..47fa0a9060bb 100644
--- a/app/components/product-safety/scam-questionnaire/scam-questionnaire.test.tsx
+++ b/app/components/product-safety/scam-questionnaire/scam-questionnaire.test.tsx
@@ -4,30 +4,17 @@ import { fireEvent, render } from '@testing-library/react-native';
 
 import { ScamQuestionnaire } from './scam-questionnaire';
 import { METAMASK_SUPPORT_URL } from '../../../constants/urls';
-import {
-  confirmSupportConsent,
-  rejectSupportConsent,
-} from '../../../util/support';
-
-const mockTrackStarted = jest.fn();
-const mockTrackQuestionAnswered = jest.fn();
-const mockTrackCompletedClean = jest.fn();
-const mockTrackDismissed = jest.fn();
-const mockTrackWarningShown = jest.fn();
-const mockTrackWarningStopped = jest.fn();
-const mockTrackWarningContactSupport = jest.fn();
-const mockTrackWarningProceeded = jest.fn();
+import { confirmSupportConsent } from '../../../util/support';
+
+const mockTrackViewed = jest.fn();
+const mockTrackContactSupport = jest.fn();
+const mockTrackCompleted = jest.fn();
 
 jest.mock('./useScamQuestionnaireMetrics', () => ({
   useScamQuestionnaireMetrics: () => ({
-    trackStarted: mockTrackStarted,
-    trackQuestionAnswered: mockTrackQuestionAnswered,
-    trackCompletedClean: mockTrackCompletedClean,
-    trackDismissed: mockTrackDismissed,
-    trackWarningShown: mockTrackWarningShown,
-    trackWarningStopped: mockTrackWarningStopped,
-    trackWarningContactSupport: mockTrackWarningContactSupport,
-    trackWarningProceeded: mockTrackWarningProceeded,
+    trackViewed: mockTrackViewed,
+    trackContactSupport: mockTrackContactSupport,
+    trackCompleted: mockTrackCompleted,
   }),
 }));
 
@@ -85,9 +72,9 @@ describe('ScamQuestionnaire', () => {
     jest.restoreAllMocks();
   });
 
-  it('fires the "started" analytics event on first render', () => {
+  it('fires the "viewed" event for the first step on render', () => {
     setup();
-    expect(mockTrackStarted).toHaveBeenCalledTimes(1);
+    expect(mockTrackViewed).toHaveBeenCalledWith(0);
   });
 
   it('starts on Q1', () => {
@@ -109,38 +96,16 @@ describe('ScamQuestionnaire', () => {
     ).toBe(false);
   });
 
-  it('fires the question-answered event for each step', () => {
-    const { getByTestId } = setup();
-    answerAllClean(getByTestId);
-
-    expect(mockTrackQuestionAnswered).toHaveBeenCalledTimes(3);
-    expect(mockTrackQuestionAnswered).toHaveBeenNthCalledWith(
-      1,
-      'q1',
-      'q1_no',
-      false,
-    );
-    expect(mockTrackQuestionAnswered).toHaveBeenNthCalledWith(
-      2,
-      'q2',
-      'q2_goods',
-      false,
-    );
-    expect(mockTrackQuestionAnswered).toHaveBeenNthCalledWith(
-      3,
-      'q3',
-      'q3_no',
-      false,
-    );
-  });
-
   it('calls onCleanPass and fires the clean-completion event when all 3 answers are clean', () => {
     const { getByTestId, onCleanPass } = setup();
     answerAllClean(getByTestId);
 
     expect(onCleanPass).toHaveBeenCalledTimes(1);
-    expect(mockTrackCompletedClean).toHaveBeenCalledTimes(1);
-    expect(mockTrackWarningShown).not.toHaveBeenCalled();
+    expect(mockTrackCompleted).toHaveBeenCalledTimes(1);
+    expect(mockTrackCompleted).toHaveBeenCalledWith(
+      expect.objectContaining({ status: 'clean' }),
+    );
+    expect(mockTrackViewed).not.toHaveBeenCalledWith(3);
   });
 
   it('navigates to the scam warning when any answer is a red flag', () => {
@@ -148,7 +113,7 @@ describe('ScamQuestionnaire', () => {
     answerOneRedFlag(getByTestId);
 
     expect(getByTestId('scam-warning-stop')).toBeDefined();
-    expect(mockTrackWarningShown).toHaveBeenCalledTimes(1);
+    expect(mockTrackViewed).toHaveBeenCalledWith(3);
     expect(onCleanPass).not.toHaveBeenCalled();
   });
 
@@ -159,7 +124,10 @@ describe('ScamQuestionnaire', () => {
     fireEvent.press(getByTestId('scam-warning-stop'));
 
     expect(onReject).toHaveBeenCalledTimes(1);
-    expect(mockTrackWarningStopped).toHaveBeenCalledTimes(1);
+    expect(mockTrackCompleted).toHaveBeenCalledTimes(1);
+    expect(mockTrackCompleted).toHaveBeenCalledWith(
+      expect.objectContaining({ status: 'payment_stopped' }),
+    );
   });
 
   it('shows the standalone consent modal when "Contact support" is tapped, tracking only when support actually opens', () => {
@@ -174,7 +142,7 @@ describe('ScamQuestionnaire', () => {
       true,
     );
     expect(confirmSupportConsent).not.toHaveBeenCalled();
-    expect(mockTrackWarningContactSupport).not.toHaveBeenCalled();
+    expect(mockTrackContactSupport).not.toHaveBeenCalled();
 
     fireEvent.press(getByTestId('standalone-support-consent-confirm-button'));
 
@@ -185,17 +153,17 @@ describe('ScamQuestionnaire', () => {
     );
     // Tracking is deferred to the callback the call site hands the consent
     // flow (fired once support actually opens).
-    expect(mockTrackWarningContactSupport).not.toHaveBeenCalled();
+    expect(mockTrackContactSupport).not.toHaveBeenCalled();
 
     const onOpenSupport = jest.mocked(confirmSupportConsent).mock.calls[0][2];
     onOpenSupport?.();
-    expect(mockTrackWarningContactSupport).toHaveBeenCalledTimes(1);
+    expect(mockTrackContactSupport).toHaveBeenCalledTimes(1);
   });
 
-  it('navigates to the scam warning and tracks the proceeded event when the bypass link is used', () => {
+  it('shows the warning screen when the bypass link is tapped after answering with a red flag', () => {
     // Full bypass behaviour (including the countdown gate) is covered in
     // scam-warning.test.tsx; here we only assert the questionnaire wires the
-    // warning screen up and fires the proceeded analytics event.
+    // warning screen up correctly.
     const { getByTestId, onBypass } = setup();
     answerOneRedFlag(getByTestId);
 
@@ -203,11 +171,13 @@ describe('ScamQuestionnaire', () => {
     expect(onBypass).not.toHaveBeenCalled();
   });
 
-  it('calls onDismiss and tracks dismissal when back is tapped on Q1', () => {
+  it('calls onDismiss when back is tapped on Q1 without firing a tracking event', () => {
     const { getByTestId, onDismiss } = setup();
+    const viewedCallsBefore = mockTrackViewed.mock.calls.length;
     fireEvent.press(getByTestId('scam-questionnaire-back'));
     expect(onDismiss).toHaveBeenCalledTimes(1);
-    expect(mockTrackDismissed).toHaveBeenCalledTimes(1);
+    expect(mockTrackViewed.mock.calls.length).toBe(viewedCallsBefore);
+    expect(mockTrackCompleted).not.toHaveBeenCalled();
   });
 
   it('walks back to the previous question instead of dismissing when not on Q1', () => {
@@ -223,9 +193,12 @@ describe('ScamQuestionnaire', () => {
     expect(onDismiss).not.toHaveBeenCalled();
   });
 
-  it('does not re-fire the warning-shown event on re-render', () => {
+  it('does not re-fire the viewed event for a step already seen', () => {
     const { getByTestId, rerender } = setup();
     answerOneRedFlag(getByTestId);
+    const warningViewedCount = mockTrackViewed.mock.calls.filter(
+      (args) => args[0] === 3,
+    ).length;
     rerender(
       <ScamQuestionnaire
         onCleanPass={jest.fn()}
@@ -234,6 +207,8 @@ describe('ScamQuestionnaire', () => {
         onDismiss={jest.fn()}
       />,
     );
-    expect(mockTrackWarningShown).toHaveBeenCalledTimes(1);
+    expect(
+      mockTrackViewed.mock.calls.filter((args) => args[0] === 3).length,
+    ).toBe(warningViewedCount);
   });
 });
diff --git a/app/components/product-safety/scam-questionnaire/scam-questionnaire.tsx b/app/components/product-safety/scam-questionnaire/scam-questionnaire.tsx
index 47611db7cdf9..feadd52ae37f 100644
--- a/app/components/product-safety/scam-questionnaire/scam-questionnaire.tsx
+++ b/app/components/product-safety/scam-questionnaire/scam-questionnaire.tsx
@@ -15,6 +15,7 @@ import {
   Q3_OPTIONS,
   QuestionId,
   QuestionOption,
+  type Step,
   TOTAL_QUESTIONS,
   getRedFlagCount,
 } from './scam-questionnaire.constants';
@@ -35,8 +36,6 @@ export interface ScamQuestionnaireProps {
   onDismiss: () => void;
 }
 
-// Steps 0-2 are the questions; the final index is the warning screen.
-type Step = 0 | 1 | 2 | 3;
 const WARNING_STEP = TOTAL_QUESTIONS;
 
 const QUESTION_DEFS: Record<
@@ -89,21 +88,13 @@ export const ScamQuestionnaire: React.FC<ScamQuestionnaireProps> = ({
     QuestionOption | undefined
   >();
 
-  const startedRef = useRef(false);
+  const viewedStepsRef = useRef<Set<Step>>(new Set());
   useEffect(() => {
-    if (!startedRef.current) {
-      startedRef.current = true;
-      metrics.trackStarted();
+    if (!viewedStepsRef.current.has(step)) {
+      viewedStepsRef.current.add(step);
+      metrics.trackViewed(step);
     }
-  }, [metrics]);
-
-  const warningShownRef = useRef(false);
-  useEffect(() => {
-    if (step === WARNING_STEP && !warningShownRef.current) {
-      warningShownRef.current = true;
-      metrics.trackWarningShown(answers);
-    }
-  }, [step, answers, metrics]);
+  }, [step, metrics]);
 
   const handleBack = useCallback(() => {
     if (step === WARNING_STEP) {
@@ -111,14 +102,13 @@ export const ScamQuestionnaire: React.FC<ScamQuestionnaireProps> = ({
       return;
     }
     if (step === 0) {
-      metrics.trackDismissed(0, answers);
       onDismiss();
       return;
     }
     const prevStep = (step - 1) as 0 | 1;
     setPendingSelection(answers[QUESTION_DEFS[prevStep].id]);
     setStep(prevStep);
-  }, [step, answers, metrics, onDismiss]);
+  }, [step, answers, onDismiss]);
 
   const handleSelect = useCallback((option: QuestionOption) => {
     setPendingSelection(option);
@@ -134,11 +124,6 @@ export const ScamQuestionnaire: React.FC<ScamQuestionnaireProps> = ({
       [def.id]: pendingSelection,
     };
     setAnswers(nextAnswers);
-    metrics.trackQuestionAnswered(
-      def.id,
-      pendingSelection.key,
-      pendingSelection.isRedFlag,
-    );
 
     if (step < TOTAL_QUESTIONS - 1) {
       const nextStep = (step + 1) as 0 | 1 | 2;
@@ -151,30 +136,34 @@ export const ScamQuestionnaire: React.FC<ScamQuestionnaireProps> = ({
     if (getRedFlagCount(nextAnswers) > 0) {
       setStep(WARNING_STEP);
     } else {
-      metrics.trackCompletedClean();
+      metrics.trackCompleted({
+        status: 'clean',
+        answers: nextAnswers,
+      });
       onCleanPass();
     }
   }, [step, pendingSelection, answers, metrics, onCleanPass]);
 
   const handleStop = useCallback(() => {
-    metrics.trackWarningStopped(answers);
+    metrics.trackCompleted({
+      status: 'payment_stopped',
+      answers,
+    });
     onReject();
   }, [answers, metrics, onReject]);
 
   const handleContactSupport = useCallback(() => {
-    metrics.trackWarningContactSupport(answers);
+    metrics.trackContactSupport(answers);
   }, [answers, metrics]);
 
   const handleProceed = useCallback(() => {
-    metrics.trackWarningProceeded(answers);
+    metrics.trackCompleted({
+      status: 'proceeded',
+      answers,
+    });
     onBypass();
   }, [answers, metrics, onBypass]);
 
-  const handleRequestClose = useCallback(() => {
-    metrics.trackDismissed(step, answers);
-    onDismiss();
-  }, [step, answers, metrics, onDismiss]);
-
   const questionDef = step === WARNING_STEP ? null : QUESTION_DEFS[step];
 
   return (
@@ -182,7 +171,7 @@ export const ScamQuestionnaire: React.FC<ScamQuestionnaireProps> = ({
       visible
       animationType="slide"
       presentationStyle="fullScreen"
-      onRequestClose={handleRequestClose}
+      onRequestClose={onDismiss}
       testID="scam-questionnaire-modal"
     >
       <SafeAreaProvider>
diff --git a/app/components/product-safety/scam-questionnaire/useScamQuestionnaireMetrics.test.ts b/app/components/product-safety/scam-questionnaire/useScamQuestionnaireMetrics.test.ts
new file mode 100644
index 000000000000..5497371538ed
--- /dev/null
+++ b/app/components/product-safety/scam-questionnaire/useScamQuestionnaireMetrics.test.ts
@@ -0,0 +1,150 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import { renderHook } from '@testing-library/react-hooks';
+import { useSelector } from 'react-redux';
+import {
+  TransactionStatus,
+  TransactionType,
+  type TransactionMeta,
+} from '@metamask/transaction-controller';
+
+import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
+import { AnalyticsEventBuilder } from '../../../util/analytics/AnalyticsEventBuilder';
+import { createMockUseAnalyticsHook } from '../../../util/test/analyticsMock';
+import { useTransactionMetadataRequest } from '../../Views/confirmations/hooks/transactions/useTransactionMetadataRequest';
+import { Q1_OPTIONS } from './scam-questionnaire.constants';
+import { useScamQuestionnaireMetrics } from './useScamQuestionnaireMetrics';
+
+jest.mock('react-redux', () => ({ useSelector: jest.fn() }));
+jest.mock('../../hooks/useAnalytics/useAnalytics');
+jest.mock(
+  '../../Views/confirmations/hooks/transactions/useTransactionMetadataRequest',
+);
+
+const useAnalyticsMock = jest.mocked(useAnalytics);
+const useSelectorMock = jest.mocked(useSelector);
+const useTransactionMetadataRequestMock = jest.mocked(
+  useTransactionMetadataRequest,
+);
+
+const ANSWERS = { q1: Q1_OPTIONS[0] };
+
+const TRANSACTION_META = {
+  id: 'test-transaction',
+  chainId: '0x1',
+  networkClientId: 'mainnet',
+  status: TransactionStatus.unapproved,
+  time: 0,
+  txParams: { from: '0x0000000000000000000000000000000000000000' },
+  type: TransactionType.simpleSend,
+} as unknown as TransactionMeta;
+
+function setup(simulationSendingValue?: number) {
+  const trackEvent = jest.fn();
+
+  useAnalyticsMock.mockReturnValue(
+    createMockUseAnalyticsHook({
+      trackEvent,
+      createEventBuilder: AnalyticsEventBuilder.createEventBuilder,
+    }),
+  );
+  useSelectorMock.mockReturnValue(
+    simulationSendingValue !== undefined
+      ? {
+          properties: {
+            simulation_sending_assets_total_value: simulationSendingValue,
+          },
+        }
+      : undefined,
+  );
+  useTransactionMetadataRequestMock.mockReturnValue(TRANSACTION_META);
+
+  const { result } = renderHook(() => useScamQuestionnaireMetrics());
+  return { metrics: result.current, trackEvent };
+}
+
+function firedEvent(trackEvent: jest.Mock) {
+  expect(trackEvent).toHaveBeenCalledTimes(1);
+  return trackEvent.mock.calls[0][0];
+}
+
+describe('useScamQuestionnaireMetrics', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('trackViewed', () => {
+    it('reports the step label', () => {
+      const { metrics, trackEvent } = setup();
+
+      metrics.trackViewed(3);
+
+      expect(firedEvent(trackEvent)).toMatchObject({
+        name: 'Scam Questionnaire Viewed',
+        properties: { step: 'warning', questionnaire_version: '1' },
+      });
+    });
+  });
+
+  describe('trackContactSupport', () => {
+    it('reports the answers, red flag count and outgoing USD total', () => {
+      const { metrics, trackEvent } = setup(99);
+
+      metrics.trackContactSupport(ANSWERS);
+
+      expect(firedEvent(trackEvent)).toMatchObject({
+        name: 'Scam Questionnaire Contact Support',
+        properties: {
+          q1_answer: 'q1_yes',
+          q2_answer: null,
+          q3_answer: null,
+          red_flag_count: 1,
+          simulation_sending_assets_total_value: 99,
+          questionnaire_version: '1',
+        },
+      });
+    });
+  });
+
+  describe('trackCompleted', () => {
+    it('reports the status, answers and outgoing USD total', () => {
+      const { metrics, trackEvent } = setup(25.25);
+
+      metrics.trackCompleted({
+        status: 'payment_stopped',
+        answers: ANSWERS,
+      });
+
+      expect(firedEvent(trackEvent)).toMatchObject({
+        name: 'Scam Questionnaire Completed',
+        properties: {
+          status: 'payment_stopped',
+          q1_answer: 'q1_yes',
+          q2_answer: null,
+          q3_answer: null,
+          red_flag_count: 1,
+          simulation_sending_assets_total_value: 25.25,
+        },
+      });
+    });
+
+    it('omits the total when value is $0', () => {
+      const { metrics, trackEvent } = setup(0);
+
+      metrics.trackCompleted({ status: 'clean', answers: ANSWERS });
+
+      expect(firedEvent(trackEvent).properties).not.toHaveProperty(
+        'simulation_sending_assets_total_value',
+      );
+    });
+
+    it('omits the total when no simulation value is available', () => {
+      const { metrics, trackEvent } = setup();
+
+      metrics.trackCompleted({ status: 'clean', answers: ANSWERS });
+
+      expect(firedEvent(trackEvent).properties).not.toHaveProperty(
+        'simulation_sending_assets_total_value',
+      );
+    });
+  });
+});
diff --git a/app/components/product-safety/scam-questionnaire/useScamQuestionnaireMetrics.ts b/app/components/product-safety/scam-questionnaire/useScamQuestionnaireMetrics.ts
index 6c892a450c56..d14cabdfb12b 100644
--- a/app/components/product-safety/scam-questionnaire/useScamQuestionnaireMetrics.ts
+++ b/app/components/product-safety/scam-questionnaire/useScamQuestionnaireMetrics.ts
@@ -1,72 +1,82 @@
 import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
 
 import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import { PRODUCT_SAFETY_EVENTS } from '../../../core/Analytics/events/product-safety';
 import { IMetaMetricsEvent } from '../../../core/Analytics/MetaMetrics.types';
+import { selectConfirmationMetricsById } from '../../../core/redux/slices/confirmationMetrics';
+import { useTransactionMetadataRequest } from '../../Views/confirmations/hooks/transactions/useTransactionMetadataRequest';
+import type { RootState } from '../../../reducers';
 import {
   Answers,
-  QuestionId,
+  QUESTIONNAIRE_VERSION,
+  type Step,
+  getAnswerRecord,
   getRedFlagCount,
-  getRedFlagQuestions,
+  stepLabelFromIndex,
 } from './scam-questionnaire.constants';
 
+export type CompletionStatus = 'clean' | 'payment_stopped' | 'proceeded';
+
+// Reads the value that useSimulationMetrics has already computed and stored
+// in the confirmationMetrics slice — no need to re-run useBalanceChanges here.
+// We omit the property when the value is 0, matching extension behavior
+// (plain-number falsy check), since $0 at risk is equivalent to no data.
+function useValueAtRisk(): number | undefined {
+  const transactionMeta = useTransactionMetadataRequest();
+  const confirmationMetrics = useSelector((state: RootState) =>
+    selectConfirmationMetricsById(state, transactionMeta?.id ?? ''),
+  );
+  const value =
+    confirmationMetrics?.properties?.simulation_sending_assets_total_value;
+  return typeof value === 'number' && value !== 0 ? value : undefined;
+}
+
 export function useScamQuestionnaireMetrics() {
   const { createEventBuilder, trackEvent } = useAnalytics();
+  const valueAtRisk = useValueAtRisk();
 
   return useMemo(() => {
     const fire = (
       event: IMetaMetricsEvent,
       properties: Record<string, unknown> = {},
     ) => {
-      trackEvent(createEventBuilder(event).addProperties(properties).build());
+      trackEvent(
+        createEventBuilder(event)
+          .addProperties({
+            ...properties,
+            questionnaire_version: QUESTIONNAIRE_VERSION,
+          })
+          .build(),
+      );
     };
 
     return {
-      trackStarted: () => fire(PRODUCT_SAFETY_EVENTS.SECURITY_CHECK_STARTED),
-
-      trackQuestionAnswered: (
-        question: QuestionId,
-        answerKey: string,
-        isRedFlag: boolean,
-      ) =>
-        fire(PRODUCT_SAFETY_EVENTS.SECURITY_CHECK_QUESTION_ANSWERED, {
-          question,
-          answer_key: answerKey,
-          is_red_flag: isRedFlag,
-        }),
-
-      trackCompletedClean: () =>
-        fire(PRODUCT_SAFETY_EVENTS.SECURITY_CHECK_COMPLETED_CLEAN, {
-          red_flag_count: 0,
-        }),
-
-      trackDismissed: (lastStep: number, answers: Answers) =>
-        fire(PRODUCT_SAFETY_EVENTS.SECURITY_CHECK_DISMISSED, {
-          last_step: lastStep,
-          red_flag_count_so_far: getRedFlagCount(answers),
-        }),
-
-      trackWarningShown: (answers: Answers) =>
-        fire(PRODUCT_SAFETY_EVENTS.SCAM_WARNING_SHOWN, {
-          red_flag_count: getRedFlagCount(answers),
-          red_flag_questions: getRedFlagQuestions(answers),
-        }),
-
-      trackWarningStopped: (answers: Answers) =>
-        fire(PRODUCT_SAFETY_EVENTS.SCAM_WARNING_STOPPED, {
-          red_flag_count: getRedFlagCount(answers),
+      trackViewed: (step: Step) =>
+        fire(PRODUCT_SAFETY_EVENTS.SCAM_QUESTIONNAIRE_VIEWED, {
+          step: stepLabelFromIndex(step),
         }),
 
-      trackWarningContactSupport: (answers: Answers) =>
-        fire(PRODUCT_SAFETY_EVENTS.SCAM_WARNING_CONTACT_SUPPORT, {
+      trackContactSupport: (answers: Answers) =>
+        fire(PRODUCT_SAFETY_EVENTS.SCAM_QUESTIONNAIRE_CONTACT_SUPPORT, {
+          ...getAnswerRecord(answers),
           red_flag_count: getRedFlagCount(answers),
+          simulation_sending_assets_total_value: valueAtRisk,
         }),
 
-      trackWarningProceeded: (answers: Answers) =>
-        fire(PRODUCT_SAFETY_EVENTS.SCAM_WARNING_PROCEEDED, {
+      trackCompleted: ({
+        status,
+        answers,
+      }: {
+        status: CompletionStatus;
+        answers: Answers;
+      }) =>
+        fire(PRODUCT_SAFETY_EVENTS.SCAM_QUESTIONNAIRE_COMPLETED, {
+          status,
+          ...getAnswerRecord(answers),
           red_flag_count: getRedFlagCount(answers),
-          red_flag_questions: getRedFlagQuestions(answers),
+          simulation_sending_assets_total_value: valueAtRisk,
         }),
     };
-  }, [createEventBuilder, trackEvent]);
+  }, [createEventBuilder, trackEvent, valueAtRisk]);
 }
diff --git a/app/components/product-safety/scam-questionnaire/useSendScamQuestionnaire.test.ts b/app/components/product-safety/scam-questionnaire/useSendScamQuestionnaire.test.ts
index 82c9d46cfd22..03f141b0b4c3 100644
--- a/app/components/product-safety/scam-questionnaire/useSendScamQuestionnaire.test.ts
+++ b/app/components/product-safety/scam-questionnaire/useSendScamQuestionnaire.test.ts
@@ -12,13 +12,20 @@ import { MMM_ORIGIN } from '../../Views/confirmations/constants/confirmations';
 import { useAlerts } from '../../Views/confirmations/context/alert-system-context';
 import { useSecurityAlertResponse } from '../../Views/confirmations/hooks/alerts/useSecurityAlertResponse';
 import { useTransactionMetadataRequest } from '../../Views/confirmations/hooks/transactions/useTransactionMetadataRequest';
+import { useSelector } from 'react-redux';
+import { SCAM_QUESTIONNAIRE_FLAG_KEY } from './scam-questionnaire.constants';
 
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(),
+}));
 jest.mock('../../Views/confirmations/context/alert-system-context');
 jest.mock('../../Views/confirmations/hooks/alerts/useSecurityAlertResponse');
 jest.mock(
   '../../Views/confirmations/hooks/transactions/useTransactionMetadataRequest',
 );
 
+const mockUseSelector = jest.mocked(useSelector);
 const mockUseAlerts = jest.mocked(useAlerts);
 const mockUseSecurityAlertResponse = jest.mocked(useSecurityAlertResponse);
 const mockUseTransactionMetadataRequest = jest.mocked(
@@ -31,11 +38,16 @@ function setup({
   transactionType = TransactionType.simpleSend,
   origin = MMM_ORIGIN,
   resultType = ResultType.Malicious,
+  flagEnabled = true,
 }: {
   transactionType?: TransactionType;
   origin?: string;
   resultType?: ResultType;
+  flagEnabled?: boolean;
 } = {}) {
+  mockUseSelector.mockReturnValue(
+    flagEnabled ? { [SCAM_QUESTIONNAIRE_FLAG_KEY]: { name: 'treatment' } } : {},
+  );
   mockUseAlerts.mockReturnValue({ setAlertConfirmed } as never);
   mockUseSecurityAlertResponse.mockReturnValue({
     securityAlertResponse: { result_type: resultType } as never,
@@ -77,6 +89,21 @@ describe('useSendScamQuestionnaire', () => {
       });
       expect(result.current.isScamQuestionnaireRequired).toBe(false);
     });
+
+    it('is false when the LaunchDarkly flag resolves to control', () => {
+      const { result } = setup({ flagEnabled: false });
+      expect(result.current.isScamQuestionnaireRequired).toBe(false);
+    });
+
+    it('is false when the flag is off, even for a malicious MetaMask send', () => {
+      const { result } = setup({
+        flagEnabled: false,
+        origin: MMM_ORIGIN,
+        transactionType: TransactionType.simpleSend,
+        resultType: ResultType.Malicious,
+      });
+      expect(result.current.isScamQuestionnaireRequired).toBe(false);
+    });
   });
 
   it('showScamQuestionnaire opens the modal', () => {
diff --git a/app/components/product-safety/scam-questionnaire/useSendScamQuestionnaire.ts b/app/components/product-safety/scam-questionnaire/useSendScamQuestionnaire.ts
index df9c036835c4..7c65e79c4227 100644
--- a/app/components/product-safety/scam-questionnaire/useSendScamQuestionnaire.ts
+++ b/app/components/product-safety/scam-questionnaire/useSendScamQuestionnaire.ts
@@ -1,4 +1,5 @@
 import { useCallback, useState } from 'react';
+import { useSelector } from 'react-redux';
 import { providerErrors } from '@metamask/rpc-errors';
 import { TransactionType } from '@metamask/transaction-controller';
 
@@ -11,6 +12,12 @@ import {
 import { useAlerts } from '../../Views/confirmations/context/alert-system-context';
 import { useSecurityAlertResponse } from '../../Views/confirmations/hooks/alerts/useSecurityAlertResponse';
 import { useTransactionMetadataRequest } from '../../Views/confirmations/hooks/transactions/useTransactionMetadataRequest';
+import { selectRemoteFeatureFlags } from '../../../selectors/featureFlagController';
+import { resolveABTestAssignment } from '../../../util/abTest';
+import {
+  SCAM_QUESTIONNAIRE_FLAG_KEY,
+  SCAM_QUESTIONNAIRE_VARIANTS,
+} from './scam-questionnaire.constants';
 import { ScamQuestionnaireProps } from './scam-questionnaire';
 
 interface UseSendScamQuestionnaireOptions {
@@ -47,6 +54,17 @@ interface UseSendScamQuestionnaireResult {
 export function useSendScamQuestionnaire({
   onReject,
 }: UseSendScamQuestionnaireOptions): UseSendScamQuestionnaireResult {
+  const flags = useSelector(selectRemoteFeatureFlags);
+  const { variantName } = resolveABTestAssignment(
+    flags,
+    SCAM_QUESTIONNAIRE_FLAG_KEY,
+    Object.keys(SCAM_QUESTIONNAIRE_VARIANTS),
+  );
+  const showQuestionnaire =
+    SCAM_QUESTIONNAIRE_VARIANTS[
+      variantName as keyof typeof SCAM_QUESTIONNAIRE_VARIANTS
+    ].showQuestionnaire;
+
   const { setAlertConfirmed } = useAlerts();
   const { securityAlertResponse } = useSecurityAlertResponse();
   const transactionMetadata = useTransactionMetadataRequest();
@@ -65,6 +83,7 @@ export function useSendScamQuestionnaire({
 
   const isScamQuestionnaireRequired =
     !isScamQuestionnaireCompleted &&
+    showQuestionnaire &&
     isMMSendReq &&
     securityAlertResponse?.result_type === ResultType.Malicious;
 
diff --git a/app/constants/bridge.ts b/app/constants/bridge.ts
index 85a0c6f31df1..4c7ae521fe4b 100644
--- a/app/constants/bridge.ts
+++ b/app/constants/bridge.ts
@@ -1,4 +1,4 @@
-import { SolScope, BtcScope, TrxScope } from '@metamask/keyring-api';
+import { SolScope, BtcScope, TrxScope, XlmScope } from '@metamask/keyring-api';
 import { CaipChainId, Hex } from '@metamask/utils';
 import {
   BRIDGE_DEV_API_BASE_URL,
@@ -38,6 +38,7 @@ export const NETWORK_TO_SHORT_NETWORK_NAME_MAP: Record<
   [SolScope.Mainnet]: 'Solana',
   [BtcScope.Mainnet]: 'BTC',
   [TrxScope.Mainnet]: 'Tron',
+  [XlmScope.Pubnet]: 'Stellar',
 };
 
 /**
diff --git a/app/constants/featureFlags.ts b/app/constants/featureFlags.ts
index 28d3f73c25c1..4d39484a2b50 100644
--- a/app/constants/featureFlags.ts
+++ b/app/constants/featureFlags.ts
@@ -9,6 +9,7 @@ export enum FeatureFlagNames {
   otaUpdatesEnabled = 'otaUpdatesEnabled',
   fullPageAccountList = 'fullPageAccountList',
   assetsDefiPositionsEnabled = 'assetsDefiPositionsEnabled',
+  defiControllerV2 = 'defiControllerV2',
   tokenDetailsV2Buttons = 'tokenDetailsV2Buttons',
   tokenDetailsV2ButtonLayout = 'tokenDetailsV2ButtonLayout',
   complianceEnabled = 'complianceEnabled',
@@ -31,6 +32,7 @@ export const DEFAULT_FEATURE_FLAG_VALUES: Partial<
   Record<FeatureFlagNames, Json>
 > = {
   [FeatureFlagNames.assetsDefiPositionsEnabled]: true,
+  [FeatureFlagNames.defiControllerV2]: { enabled: false },
   [FeatureFlagNames.tokenDetailsV2Buttons]: false,
   [FeatureFlagNames.tokenDetailsV2ButtonLayout]: false,
   [FeatureFlagNames.tronClaimUnstakedTrxButtonEnabled]: false,
diff --git a/app/constants/navigation/Routes.ts b/app/constants/navigation/Routes.ts
index 570f5f4ed33e..96c887eec0e7 100644
--- a/app/constants/navigation/Routes.ts
+++ b/app/constants/navigation/Routes.ts
@@ -398,6 +398,7 @@ const Routes = {
       TOOLTIP: 'PerpsTooltip',
       CROSS_MARGIN_WARNING: 'PerpsCrossMarginWarning',
       SELECT_PROVIDER: 'PerpsSelectProvider',
+      MODE_SELECTION: 'PerpsModeSelection',
     },
     POSITION_TRANSACTION: 'PerpsPositionTransaction',
     ORDER_TRANSACTION: 'PerpsOrderTransaction',
@@ -421,7 +422,6 @@ const Routes = {
     MARKET_DETAILS: 'PredictMarketDetails',
     POSITIONS: 'PredictPositions',
     ACTIVITY_DETAIL: 'PredictActivityDetail',
-    WORLD_CUP: 'PredictWorldCup',
     FEED: 'PredictFeed',
     MODALS: {
       ROOT: 'PredictModals',
diff --git a/app/constants/navigation/clearStackNavigatorOptions.ts b/app/constants/navigation/clearStackNavigatorOptions.ts
index 235a2afcf367..191ced449c3f 100644
--- a/app/constants/navigation/clearStackNavigatorOptions.ts
+++ b/app/constants/navigation/clearStackNavigatorOptions.ts
@@ -37,7 +37,7 @@ export const addDeviceVerificationCodeScreenOptions: NativeStackNavigationOption
   };
 
 export const slideFromRightNativeOptions: NativeStackNavigationOptions = {
-  animation: 'slide_from_right',
+  animation: 'ios_from_right',
 };
 
 export const fadeNativeOptions: NativeStackNavigationOptions = {
diff --git a/app/constants/snaps.ts b/app/constants/snaps.ts
index 0ab5e07bf5bd..534ca2b2614d 100644
--- a/app/constants/snaps.ts
+++ b/app/constants/snaps.ts
@@ -65,6 +65,11 @@ export const SNAPS_DERIVATION_PATHS: SnapsDerivationPath[] = [
     curve: 'secp256k1',
     name: 'Tron',
   },
+  {
+    path: ['m', `44'`, `148'`],
+    curve: 'ed25519',
+    name: 'Stellar',
+  },
   {
     path: ['m', `44'`, `2'`],
     curve: 'secp256k1',
diff --git a/app/constants/storage.ts b/app/constants/storage.ts
index a8e4e957318b..7343ef66cdff 100644
--- a/app/constants/storage.ts
+++ b/app/constants/storage.ts
@@ -82,8 +82,12 @@ export const BITCOIN_DISCOVERY_PENDING = `${prefix}bitcoinDiscoveryPending`;
 
 export const TRON_DISCOVERY_PENDING = `${prefix}tronDiscoveryPending`;
 
+export const STELLAR_DISCOVERY_PENDING = `${prefix}stellarDiscoveryPending`;
+
 export const PERPS_GTM_MODAL_SHOWN = `${prefix}perpsGTMModalShown`;
 
+export const PERPS_MODE_SELECTION_COMPLETED = `${prefix}perpsModeSelectionCompleted`;
+
 export const PERPS_COMPETITION_BANNER_DISMISSED = `${prefix}perpsCompetitionBannerDismissed`;
 
 export const ROBINHOOD_SWAPS_BANNER_DISMISSED = `${prefix}robinhoodSwapsBannerDismissed`;
diff --git a/app/core/AgenticCli/AgenticCliMwpConnectionService.test.ts b/app/core/AgenticCli/AgenticCliMwpConnectionService.test.ts
index 79432cdf1c56..cc76840ebe57 100644
--- a/app/core/AgenticCli/AgenticCliMwpConnectionService.test.ts
+++ b/app/core/AgenticCli/AgenticCliMwpConnectionService.test.ts
@@ -292,7 +292,12 @@ describe('AgenticCliMwpConnectionService', () => {
 
     expect(mockHostApp.showConnectionLoading).toHaveBeenCalledTimes(1);
     expect(mockHostApp.showConnectionLoading).toHaveBeenCalledWith(
-      expect.objectContaining({ id: mockConnectionInfo.id }),
+      expect.objectContaining({
+        id: mockConnectionInfo.id,
+        metadata: expect.objectContaining({
+          dapp: expect.objectContaining({ name: 'Agent CLI' }),
+        }),
+      }),
       { autodismissMs: AGENTIC_CLI_CONNECTION_LOADING_AUTODISMISS_MS },
     );
     expect(mockHostApp.hideConnectionLoading).toHaveBeenCalledTimes(1);
diff --git a/app/core/AgenticCli/AgenticCliMwpConnectionService.ts b/app/core/AgenticCli/AgenticCliMwpConnectionService.ts
index 1d88a7f3eee9..ea6c4f688f4a 100644
--- a/app/core/AgenticCli/AgenticCliMwpConnectionService.ts
+++ b/app/core/AgenticCli/AgenticCliMwpConnectionService.ts
@@ -27,6 +27,8 @@ import {
   waitForKeyringUnlock,
 } from './AgenticCliQrLoginService';
 
+const AGENTIC_CLI_DISPLAY_NAME = 'Agent CLI';
+
 export interface AgenticCliMwpConnectionDeps {
   relayURL: string;
   keymanager: IKeyManager;
@@ -123,7 +125,15 @@ export async function handleAgenticCliConnectDeeplink(
 
     connInfo = {
       id: connReq.sessionRequest.id,
-      metadata: connReq.metadata,
+      metadata: {
+        ...connReq.metadata,
+        dapp: {
+          ...connReq.metadata.dapp,
+          // The Agent CLI is a known first-party flow, so do not surface the
+          // self-reported "MM CLI" name in product UI.
+          name: AGENTIC_CLI_DISPLAY_NAME,
+        },
+      },
       expiresAt: Date.now() + DEFAULT_SESSION_TTL,
     };
 
diff --git a/app/core/AgenticCli/AgenticCliQrLoginService.test.ts b/app/core/AgenticCli/AgenticCliQrLoginService.test.ts
index 95291822e388..07f0b4b3c9ba 100644
--- a/app/core/AgenticCli/AgenticCliQrLoginService.test.ts
+++ b/app/core/AgenticCli/AgenticCliQrLoginService.test.ts
@@ -107,7 +107,7 @@ const mockConnectionRequest = (
     publicKeyB64: 'AoBDLWxRbJNe8yUv5bmmoVnNo8DCilzbFz/nWD+RKC2V',
     channel: 'handshake:aabbccdd-1122-3344-5566-778899aabbcc',
     mode: 'trusted',
-    expiresAt: Date.now() + 600_000,
+    expiresAt: 1_722_470_400_000 + 600_000,
   },
   metadata: {
     dapp: {
@@ -230,12 +230,15 @@ describe('AgenticCliQrLoginService', () => {
       type: 'auth-token',
       token: 'cli-token',
     });
+    expect(conn.client.sendResponse).not.toHaveBeenCalledWith(
+      expect.objectContaining({ type: 'pairing-cancelled' }),
+    );
     expect(showSimpleNotification).toHaveBeenCalledWith({
       id: '11111111-2222-3333-4444-555555555555-cli-link-success',
       autodismiss: 3000,
       title: 'sdk_connect_v2.show_cli_link_success.title',
+      description: '',
       status: 'success',
-      description: 'sdk_connect_v2.show_cli_link_success.description',
     });
     expect(store.dispatch).toHaveBeenCalledTimes(1);
     expect(mockMaybePromptPushPermissionAfterCliLogin).toHaveBeenCalledTimes(1);
@@ -243,6 +246,57 @@ describe('AgenticCliQrLoginService', () => {
     expect(setStage).toHaveBeenCalledWith('send-auth-token-to-cli');
   });
 
+  it('sends pairing-cancelled to CLI before cleanup when dashboard WebView is cancelled', async () => {
+    const { handleAgenticCliQrLogin } = loadAgenticCliQrLogin('main_prod');
+    const conn = createMockConnection();
+    const cleanupConnection = jest.fn().mockResolvedValue(undefined);
+    (AgenticCliDashboardWebviewService.open as jest.Mock).mockRejectedValue(
+      new Error('WebView closed'),
+    );
+
+    await expect(
+      handleAgenticCliQrLogin({
+        connReq: mockConnectionRequest({ name: 'agentic-cli' }),
+        conn,
+        setStage: jest.fn(),
+        cleanupConnection,
+      }),
+    ).rejects.toThrow('WebView closed');
+
+    expect(conn.client.sendResponse).toHaveBeenCalledWith({
+      type: 'pairing-cancelled',
+    });
+    expect(conn.client.sendResponse).not.toHaveBeenCalledWith(
+      expect.objectContaining({ type: 'auth-token' }),
+    );
+    expect(cleanupConnection).toHaveBeenCalledWith(conn);
+    expect(showSimpleNotification).not.toHaveBeenCalled();
+    expect(mockMaybePromptPushPermissionAfterCliLogin).not.toHaveBeenCalled();
+  });
+
+  it('still cleans up when sending pairing-cancelled fails', async () => {
+    const { handleAgenticCliQrLogin } = loadAgenticCliQrLogin('main_prod');
+    const conn = createMockConnection();
+    const cleanupConnection = jest.fn().mockResolvedValue(undefined);
+    (AgenticCliDashboardWebviewService.open as jest.Mock).mockRejectedValue(
+      new Error('Request rejected'),
+    );
+    (conn.client.sendResponse as jest.Mock).mockRejectedValue(
+      new Error('relay down'),
+    );
+
+    await expect(
+      handleAgenticCliQrLogin({
+        connReq: mockConnectionRequest({ name: 'agentic-cli' }),
+        conn,
+        setStage: jest.fn(),
+        cleanupConnection,
+      }),
+    ).rejects.toThrow('Request rejected');
+
+    expect(cleanupConnection).toHaveBeenCalledWith(conn);
+  });
+
   it('uses dev auth API and develop dashboard for main_dev builds', async () => {
     const { handleAgenticCliQrLogin } = loadAgenticCliQrLogin('main_dev');
     const conn = createMockConnection();
diff --git a/app/core/AgenticCli/AgenticCliQrLoginService.ts b/app/core/AgenticCli/AgenticCliQrLoginService.ts
index 7095e4664daa..628ffec140c3 100644
--- a/app/core/AgenticCli/AgenticCliQrLoginService.ts
+++ b/app/core/AgenticCli/AgenticCliQrLoginService.ts
@@ -8,6 +8,7 @@ import { maybePromptPushPermissionAfterCliLogin } from './promptPushNotification
 import { AgenticCliDashboardWebviewService } from '../../components/Views/AgenticCliDashboardWebview/AgenticCliDashboardWebviewService';
 import { Connection } from '../SDKConnectV2/services/connection';
 import type { AgenticCliConnectionRequest } from './agenticCliConnectionRequest';
+import { sendPairingCancelledToClient } from './sendPairingCancelled';
 import { sendAuthTokenToClient } from './sendAuthToken';
 import {
   ENGINE_READY_POLL_MS,
@@ -96,6 +97,8 @@ export async function handleAgenticCliQrLogin({
   setStage,
   cleanupConnection,
 }: HandleAgenticCliQrLoginParams): Promise<void> {
+  let authTokenSent = false;
+
   try {
     // --- Hydra bearer token ---
     setStage('get-hydra-token');
@@ -137,21 +140,36 @@ export async function handleAgenticCliQrLogin({
     // --- Send token to CLI ---
     setStage('send-auth-token-to-cli');
     await sendAuthTokenToClient(conn.client, conn.id, authToken);
+    authTokenSent = true;
     store.dispatch(
       showSimpleNotification({
         id: `${conn.id}-cli-link-success`,
         autodismiss: 3000,
         title: strings('sdk_connect_v2.show_cli_link_success.title'),
+        description: '',
         status: 'success',
-        description: strings(
-          'sdk_connect_v2.show_cli_link_success.description',
-        ),
       }),
     );
 
     // Nudge push permission so post-login transaction notifications reach the
     // user (MMAI-925). Fire-and-forget: never rejects, never blocks login.
     void maybePromptPushPermissionAfterCliLogin();
+  } catch (error) {
+    // Mobile Cancel / WebView close / other failures never send auth-token.
+    // Notify CLI before disconnect so it can abort instead of hanging (MMAI-979).
+    // Payload matches CLI PAIRING_CANCELLED_TYPE from the browser cancel path.
+    if (!authTokenSent) {
+      try {
+        await sendPairingCancelledToClient(conn.client, conn.id);
+      } catch (cancelError) {
+        logger.error(
+          'Failed to send pairing-cancelled to CLI:',
+          conn.id,
+          cancelError,
+        );
+      }
+    }
+    throw error;
   } finally {
     try {
       await cleanupConnection(conn);
diff --git a/app/core/AgenticCli/sendPairingCancelled.test.ts b/app/core/AgenticCli/sendPairingCancelled.test.ts
new file mode 100644
index 000000000000..45822b687bb4
--- /dev/null
+++ b/app/core/AgenticCli/sendPairingCancelled.test.ts
@@ -0,0 +1,39 @@
+import type { WalletClient } from '@metamask/mobile-wallet-protocol-wallet-client';
+import {
+  PAIRING_CANCELLED_TYPE,
+  sendPairingCancelledToClient,
+} from './sendPairingCancelled';
+
+const mockSendResponse = jest.fn().mockResolvedValue(undefined);
+const mockDebug = jest.fn();
+
+jest.mock('../SDKConnectV2/services/logger', () => ({
+  __esModule: true,
+  default: {
+    debug: (...args: unknown[]) => mockDebug(...args),
+    error: jest.fn(),
+    warn: jest.fn(),
+  },
+}));
+
+describe('sendPairingCancelledToClient', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('sends pairing-cancelled payload over MWP', async () => {
+    const client = {
+      sendResponse: mockSendResponse,
+    } as unknown as WalletClient;
+
+    await sendPairingCancelledToClient(client, 'connection-id');
+
+    expect(mockSendResponse).toHaveBeenCalledWith({
+      type: PAIRING_CANCELLED_TYPE,
+    });
+    expect(mockDebug).toHaveBeenCalledWith(
+      'Sending pairing-cancelled message:',
+      'connection-id',
+    );
+  });
+});
diff --git a/app/core/AgenticCli/sendPairingCancelled.ts b/app/core/AgenticCli/sendPairingCancelled.ts
new file mode 100644
index 000000000000..5f5529aef511
--- /dev/null
+++ b/app/core/AgenticCli/sendPairingCancelled.ts
@@ -0,0 +1,28 @@
+import { WalletClient } from '@metamask/mobile-wallet-protocol-wallet-client';
+import logger from '../SDKConnectV2/services/logger';
+
+/**
+ * Matches `@metamask/agentic-sdk` `PAIRING_CANCELLED_TYPE` so CLI
+ * `receiveCliTokenOverMwp` rejects with PAIRING_CANCELLED / MWP_CANCELLED.
+ */
+export const PAIRING_CANCELLED_TYPE = 'pairing-cancelled' as const;
+
+export interface PairingCancelledMessagePayload {
+  type: typeof PAIRING_CANCELLED_TYPE;
+}
+
+/**
+ * Notifies the waiting CLI that Mobile authorization will not complete, so it
+ * can abort its auth-token wait (MMAI-979) instead of hanging until timeout.
+ */
+export const sendPairingCancelledToClient = async (
+  client: WalletClient,
+  connectionId: string,
+): Promise<void> => {
+  const payload: PairingCancelledMessagePayload = {
+    type: PAIRING_CANCELLED_TYPE,
+  };
+
+  logger.debug('Sending pairing-cancelled message:', connectionId);
+  await client.sendResponse(payload);
+};
diff --git a/app/core/Analytics/MetaMetrics.events.ts b/app/core/Analytics/MetaMetrics.events.ts
index 668ced1abdd0..853d9cb28612 100644
--- a/app/core/Analytics/MetaMetrics.events.ts
+++ b/app/core/Analytics/MetaMetrics.events.ts
@@ -703,6 +703,8 @@ enum EVENT_NAME {
 
   // Predict
   PREDICT_TRADE_TRANSACTION = 'Predict Trade Transaction',
+  TRADE_CONSIDERED = 'Trade Considered',
+  TRADE_COMPLETED = 'Trade Completed',
   PREDICT_BETSLIP_DISMISSED = 'Predict Betslip Dismissed',
   PREDICT_MARKET_DETAILS_OPENED = 'Predict Market Details Opened',
   PREDICT_EMPTY_STATE_VIEWED = 'Empty State Viewed',
@@ -777,6 +779,10 @@ enum EVENT_NAME {
   MONEY_SURFACE_VIEWED = 'Money Surface Viewed',
   MONEY_ONBOARDING_EVENT = 'Money Onboarding Event',
   MONEY_TOOLTIP_CLICKED = 'Money Tooltip Clicked',
+
+  // Balance Breakdown
+  BALANCE_BREAKDOWN_SLICE_TAPPED = 'Balance Breakdown Slice Tapped',
+
   // Assets
   ASSETS_FIRST_INIT_FETCH_COMPLETED = 'Assets First Init Fetch Completed',
 
@@ -1989,6 +1995,8 @@ const events = {
   ),
   // Predict
   PREDICT_TRADE_TRANSACTION: generateOpt(EVENT_NAME.PREDICT_TRADE_TRANSACTION),
+  TRADE_CONSIDERED: generateOpt(EVENT_NAME.TRADE_CONSIDERED),
+  TRADE_COMPLETED: generateOpt(EVENT_NAME.TRADE_COMPLETED),
   PREDICT_BETSLIP_DISMISSED: generateOpt(EVENT_NAME.PREDICT_BETSLIP_DISMISSED),
   PREDICT_MARKET_DETAILS_OPENED: generateOpt(
     EVENT_NAME.PREDICT_MARKET_DETAILS_OPENED,
@@ -2151,6 +2159,11 @@ const events = {
   SOCIAL_FOLLOW_TRADING_NOTIFICATION_CLICKED: generateOpt(
     EVENT_NAME.SOCIAL_FOLLOW_TRADING_NOTIFICATION_CLICKED,
   ),
+
+  // Balance Breakdown
+  BALANCE_BREAKDOWN_SLICE_TAPPED: generateOpt(
+    EVENT_NAME.BALANCE_BREAKDOWN_SLICE_TAPPED,
+  ),
   SOCIAL_TRADER_LEADERBOARD_VISIBILITY_TOGGLED: generateOpt(
     EVENT_NAME.SOCIAL_TRADER_LEADERBOARD_VISIBILITY_TOGGLED,
   ),
diff --git a/app/core/Analytics/events/product-safety/events.ts b/app/core/Analytics/events/product-safety/events.ts
index dd9bb791252f..1c627b8fa2e3 100644
--- a/app/core/Analytics/events/product-safety/events.ts
+++ b/app/core/Analytics/events/product-safety/events.ts
@@ -4,14 +4,9 @@ import {
 } from '../../MetaMetrics.events';
 
 enum EVENT_NAME {
-  SECURITY_CHECK_STARTED = 'Security Check Started',
-  SECURITY_CHECK_QUESTION_ANSWERED = 'Security Check Question Answered',
-  SECURITY_CHECK_COMPLETED_CLEAN = 'Security Check Completed Clean',
-  SECURITY_CHECK_DISMISSED = 'Security Check Dismissed',
-  SCAM_WARNING_SHOWN = 'Scam Warning Shown',
-  SCAM_WARNING_STOPPED = 'Scam Warning Stopped',
-  SCAM_WARNING_CONTACT_SUPPORT = 'Scam Warning Contact Support',
-  SCAM_WARNING_PROCEEDED = 'Scam Warning Proceeded',
+  SCAM_QUESTIONNAIRE_VIEWED = 'Scam Questionnaire Viewed',
+  SCAM_QUESTIONNAIRE_COMPLETED = 'Scam Questionnaire Completed',
+  SCAM_QUESTIONNAIRE_CONTACT_SUPPORT = 'Scam Questionnaire Contact Support',
 }
 
 // This function helps prevent repeat of type conversions
@@ -19,18 +14,11 @@ const createEvent = (name: EVENT_NAME) =>
   generateOpt(name as unknown as METRICS_EVENT_NAME);
 
 export const PRODUCT_SAFETY_EVENTS = {
-  SECURITY_CHECK_STARTED: createEvent(EVENT_NAME.SECURITY_CHECK_STARTED),
-  SECURITY_CHECK_QUESTION_ANSWERED: createEvent(
-    EVENT_NAME.SECURITY_CHECK_QUESTION_ANSWERED,
+  SCAM_QUESTIONNAIRE_VIEWED: createEvent(EVENT_NAME.SCAM_QUESTIONNAIRE_VIEWED),
+  SCAM_QUESTIONNAIRE_COMPLETED: createEvent(
+    EVENT_NAME.SCAM_QUESTIONNAIRE_COMPLETED,
   ),
-  SECURITY_CHECK_COMPLETED_CLEAN: createEvent(
-    EVENT_NAME.SECURITY_CHECK_COMPLETED_CLEAN,
+  SCAM_QUESTIONNAIRE_CONTACT_SUPPORT: createEvent(
+    EVENT_NAME.SCAM_QUESTIONNAIRE_CONTACT_SUPPORT,
   ),
-  SECURITY_CHECK_DISMISSED: createEvent(EVENT_NAME.SECURITY_CHECK_DISMISSED),
-  SCAM_WARNING_SHOWN: createEvent(EVENT_NAME.SCAM_WARNING_SHOWN),
-  SCAM_WARNING_STOPPED: createEvent(EVENT_NAME.SCAM_WARNING_STOPPED),
-  SCAM_WARNING_CONTACT_SUPPORT: createEvent(
-    EVENT_NAME.SCAM_WARNING_CONTACT_SUPPORT,
-  ),
-  SCAM_WARNING_PROCEEDED: createEvent(EVENT_NAME.SCAM_WARNING_PROCEEDED),
 };
diff --git a/app/core/AppConstants.ts b/app/core/AppConstants.ts
index 5061a2922d70..151502866590 100644
--- a/app/core/AppConstants.ts
+++ b/app/core/AppConstants.ts
@@ -262,6 +262,13 @@ export default {
     UAT: 'https://dev.api.baanx.com',
     PRD: 'https://api.baanx.com',
   },
+  // MetaMask Card API (CX) — proxies provider endpoints (e.g. Immersve supported-regions).
+  // GH Actions use builds.yml (env set per build). Fallback mapping for local when env not set.
+  CARD_API_URL: {
+    DEV: 'https://card.dev-api.cx.metamask.io',
+    UAT: 'https://card.uat-api.cx.metamask.io',
+    PRD: 'https://card.api.cx.metamask.io',
+  },
   IMMERSVE_API_URL: {
     DEV: 'https://test.immersve.com',
     PRD: 'https://api.immersve.com',
diff --git a/app/core/AppStateEventListener.test.ts b/app/core/AppStateEventListener.test.ts
index d7b6d374f398..3f39508a54be 100644
--- a/app/core/AppStateEventListener.test.ts
+++ b/app/core/AppStateEventListener.test.ts
@@ -2,6 +2,7 @@ import { AppState, AppStateStatus } from 'react-native';
 import Logger from '../util/Logger';
 import { MetaMetricsEvents } from './Analytics';
 import {
+  AppOpenedPushProvider,
   AppStateEventListener,
   trackAppInstallOnce,
 } from './AppStateEventListener';
@@ -114,6 +115,13 @@ describe('AppStateEventListener', () => {
     );
     appStateManager = new AppStateEventListener();
     appStateManager.start();
+    // Flush the cold-start APP_OPENED scheduled by start() so each test
+    // only observes its own events.
+    jest.advanceTimersByTime(2000);
+    mockAnalytics.trackEvent.mockClear();
+    (AnalyticsEventBuilder.createEventBuilder as jest.Mock).mockClear();
+    mockEventBuilder.addProperties.mockClear();
+    (Logger.error as jest.Mock).mockClear();
   });
 
   afterEach(() => {
@@ -160,6 +168,10 @@ describe('AppStateEventListener', () => {
     expect(AnalyticsEventBuilder.createEventBuilder).toHaveBeenCalledWith(
       MetaMetricsEvents.APP_OPENED,
     );
+    expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+      type: 'warm_start',
+      source: 'deeplink',
+    });
     expect(mockEventBuilder.addProperties).toHaveBeenCalledWith(
       mockAttribution,
     );
@@ -215,6 +227,10 @@ describe('AppStateEventListener', () => {
     expect(AnalyticsEventBuilder.createEventBuilder).toHaveBeenCalledWith(
       MetaMetricsEvents.APP_OPENED,
     );
+    expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+      type: 'warm_start',
+      source: 'direct',
+    });
     expect(mockAnalytics.trackEvent).toHaveBeenCalledWith(
       mockEventBuilder.build(),
     );
@@ -362,6 +378,481 @@ describe('AppStateEventListener', () => {
     );
   });
 
+  describe('cold start', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+      (AnalyticsEventBuilder.createEventBuilder as jest.Mock).mockReturnValue(
+        mockEventBuilder,
+      );
+      jest
+        .spyOn(ReduxService, 'store', 'get')
+        .mockReturnValue(createMockReduxStore());
+      (processAttribution as jest.Mock).mockReturnValue(undefined);
+    });
+
+    it('fires APP_OPENED with type cold_start after start()', () => {
+      const coldStartManager = new AppStateEventListener();
+      coldStartManager.start();
+      jest.advanceTimersByTime(2000);
+
+      expect(AnalyticsEventBuilder.createEventBuilder).toHaveBeenCalledWith(
+        MetaMetricsEvents.APP_OPENED,
+      );
+      expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+        type: 'cold_start',
+        source: 'direct',
+      });
+      expect(mockAnalytics.trackEvent).toHaveBeenCalledTimes(1);
+    });
+
+    it('waits for the deeplink-settling delay before firing', () => {
+      const coldStartManager = new AppStateEventListener();
+      coldStartManager.start();
+
+      jest.advanceTimersByTime(1999);
+      expect(mockAnalytics.trackEvent).not.toHaveBeenCalled();
+
+      jest.advanceTimersByTime(1);
+      expect(mockAnalytics.trackEvent).toHaveBeenCalledTimes(1);
+    });
+
+    it('fires cold start only once when start() is called twice', () => {
+      const coldStartManager = new AppStateEventListener();
+      coldStartManager.start();
+      coldStartManager.start();
+      jest.advanceTimersByTime(2000);
+
+      expect(mockAnalytics.trackEvent).toHaveBeenCalledTimes(1);
+    });
+
+    it('includes attribution properties when opened via deeplink', () => {
+      const mockStore = createMockReduxStore();
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue(mockStore);
+      const mockAttribution = {
+        attributionId: 'cold123',
+        utm_source: 'source',
+      };
+      (processAttribution as jest.Mock).mockReturnValue(mockAttribution);
+
+      const coldStartManager = new AppStateEventListener();
+      coldStartManager.start();
+      coldStartManager.setCurrentDeeplink(
+        'metamask://connect?attributionId=cold123',
+      );
+      jest.advanceTimersByTime(2000);
+
+      expect(mockStore.dispatch).toHaveBeenCalledWith(
+        saveAttribution({
+          attribution_id: 'cold123',
+          utm_source: 'source',
+        }),
+      );
+      expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+        type: 'cold_start',
+        source: 'deeplink',
+      });
+      expect(mockEventBuilder.addProperties).toHaveBeenCalledWith(
+        mockAttribution,
+      );
+      expect(mockAnalytics.trackEvent).toHaveBeenCalledTimes(1);
+    });
+
+    it('still fires a warm start APP_OPENED after the cold start one', () => {
+      let coldStartListener: (state: AppStateStatus) => void = () => undefined;
+      (AppState.addEventListener as jest.Mock).mockImplementation(
+        (_, listener) => {
+          coldStartListener = listener;
+          return { remove: jest.fn() };
+        },
+      );
+
+      const coldStartManager = new AppStateEventListener();
+      coldStartManager.start();
+      jest.advanceTimersByTime(2000);
+      expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+        type: 'cold_start',
+        source: 'direct',
+      });
+
+      coldStartListener('background');
+      coldStartListener('active');
+      jest.advanceTimersByTime(2000);
+
+      expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+        type: 'warm_start',
+        source: 'direct',
+      });
+      expect(mockAnalytics.trackEvent).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  describe('App Opened source', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+      (AnalyticsEventBuilder.createEventBuilder as jest.Mock).mockReturnValue(
+        mockEventBuilder,
+      );
+      jest
+        .spyOn(ReduxService, 'store', 'get')
+        .mockReturnValue(createMockReduxStore());
+      (processAttribution as jest.Mock).mockReturnValue(undefined);
+    });
+
+    const warmOpen = () => {
+      mockAppStateListener('background');
+      mockAppStateListener('active');
+      jest.advanceTimersByTime(2000);
+    };
+
+    it('reports push_notification when opened from an FCM push deeplink', () => {
+      appStateManager.setCurrentDeeplink(
+        'metamask://notification',
+        'push-notification',
+      );
+      warmOpen();
+
+      expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+        type: 'warm_start',
+        source: 'push_notification',
+      });
+    });
+
+    it('reports push_notification when opened from a Braze push deeplink', () => {
+      appStateManager.setCurrentDeeplink('metamask://promo', 'braze');
+      warmOpen();
+
+      expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+        type: 'warm_start',
+        source: 'push_notification',
+      });
+    });
+
+    it('reports deeplink when opened from an external link without a source', () => {
+      appStateManager.setCurrentDeeplink('https://link.metamask.io/swap');
+      warmOpen();
+
+      expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+        type: 'warm_start',
+        source: 'deeplink',
+      });
+    });
+
+    it('reverts to direct on the next open after a deeplink open', () => {
+      appStateManager.setCurrentDeeplink(
+        'metamask://notification',
+        'push-notification',
+      );
+      warmOpen();
+      mockEventBuilder.addProperties.mockClear();
+
+      warmOpen();
+
+      expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+        type: 'warm_start',
+        source: 'direct',
+      });
+    });
+
+    // A single push tap reaches handleDeeplink twice, and the second delivery
+    // carries no source. Both orderings occur in the wild: on iOS the Branch
+    // re-delivery of a Braze universal link lands after the tagged JS event
+    // (it needs a network round trip), while on Android the Braze auto-opened
+    // intent and the tagged Braze event race.
+    describe('duplicate push delivery', () => {
+      it('keeps the braze origin when Branch re-delivers the rewritten URI untagged', () => {
+        appStateManager.setCurrentDeeplink(
+          'https://link.metamask.io/AbCd1234',
+          'braze',
+        );
+        appStateManager.setCurrentDeeplink('https://link.metamask.io/swap');
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'push_notification',
+        });
+      });
+
+      it('keeps the FCM origin when the same URI is re-delivered untagged', () => {
+        appStateManager.setCurrentDeeplink(
+          'metamask://notification',
+          'push-notification',
+        );
+        appStateManager.setCurrentDeeplink('metamask://notification');
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'push_notification',
+        });
+      });
+
+      it('applies the braze origin when the untagged delivery arrives first', () => {
+        appStateManager.setCurrentDeeplink('metamask://promo');
+        appStateManager.setCurrentDeeplink('metamask://promo', 'braze');
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'push_notification',
+        });
+      });
+
+      // Same-URI duplicates never reach setCurrentDeeplink — handleDeeplink
+      // suppresses them — so the tagged delivery arrives via promotion instead.
+      it('promotes the origin when the tagged delivery was suppressed as a duplicate', () => {
+        appStateManager.setCurrentDeeplink('metamask://promo');
+        appStateManager.promoteCurrentDeeplinkSource(
+          'metamask://promo',
+          'braze',
+        );
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'push_notification',
+        });
+      });
+
+      it('does not promote the origin of a different deeplink', () => {
+        appStateManager.setCurrentDeeplink('metamask://swap');
+        appStateManager.promoteCurrentDeeplinkSource(
+          'metamask://promo',
+          'braze',
+        );
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'deeplink',
+        });
+      });
+
+      it('does not promote when the suppressed duplicate carries no push source', () => {
+        appStateManager.setCurrentDeeplink('metamask://promo');
+        appStateManager.promoteCurrentDeeplinkSource('metamask://promo');
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'deeplink',
+        });
+      });
+
+      it('does not invent an origin when there is no current deeplink', () => {
+        appStateManager.promoteCurrentDeeplinkSource(
+          'metamask://promo',
+          'braze',
+        );
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'direct',
+        });
+      });
+
+      it('does not make a non-push origin sticky', () => {
+        appStateManager.setCurrentDeeplink(
+          'https://link.metamask.io/swap',
+          'deeplink',
+        );
+        appStateManager.setCurrentDeeplink('https://link.metamask.io/send');
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'deeplink',
+        });
+      });
+
+      it('does not carry the push origin past the event it was captured for', () => {
+        appStateManager.setCurrentDeeplink('metamask://promo', 'braze');
+        appStateManager.setCurrentDeeplink('metamask://promo');
+        warmOpen();
+        mockEventBuilder.addProperties.mockClear();
+
+        appStateManager.setCurrentDeeplink('https://link.metamask.io/swap');
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'deeplink',
+        });
+      });
+
+      it('still clears pendingDeeplinkSource on the untagged delivery', () => {
+        appStateManager.setCurrentDeeplink('metamask://promo', 'braze');
+        appStateManager.setCurrentDeeplink('metamask://promo');
+
+        expect(appStateManager.pendingDeeplinkSource).toBeNull();
+      });
+    });
+
+    // Many push payloads carry no deeplink — on-chain activity notifications
+    // commonly have no CTA link — so the tap itself is reported directly.
+    describe('push tap without a deeplink', () => {
+      it('reports push_notification with no deeplink recorded', () => {
+        appStateManager.markOpenedFromPush({
+          provider: AppOpenedPushProvider.Wallet,
+        });
+
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'push_notification',
+          push_provider: 'wallet',
+        });
+      });
+
+      it('outranks an unrelated deeplink left over from in-app navigation', () => {
+        appStateManager.setCurrentDeeplink('metamask://card-home');
+        appStateManager.markOpenedFromPush({
+          provider: AppOpenedPushProvider.Braze,
+        });
+
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'push_notification',
+          push_provider: 'braze',
+        });
+      });
+
+      it('does not describe the next open after the event consumes it', () => {
+        appStateManager.markOpenedFromPush({
+          provider: AppOpenedPushProvider.Wallet,
+        });
+        warmOpen();
+        mockEventBuilder.addProperties.mockClear();
+
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'direct',
+        });
+      });
+
+      it('reports direct when the tap predates the attribution window', () => {
+        appStateManager.markOpenedFromPush({
+          provider: AppOpenedPushProvider.Wallet,
+        });
+        jest.advanceTimersByTime(6000);
+
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'direct',
+        });
+      });
+    });
+
+    describe('push provider and notification classification', () => {
+      it('includes the notification type and subtype for wallet pushes', () => {
+        appStateManager.markOpenedFromPush({
+          provider: AppOpenedPushProvider.Wallet,
+          notificationType: 'platform',
+          notificationSubtype: 'eth_received',
+        });
+
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'push_notification',
+          push_provider: 'wallet',
+          notification_type: 'platform',
+          notification_subtype: 'eth_received',
+        });
+      });
+
+      // Braze payloads carry no equivalent, so the props are omitted rather
+      // than sent empty.
+      it('omits type and subtype for Braze pushes', () => {
+        appStateManager.markOpenedFromPush({
+          provider: AppOpenedPushProvider.Braze,
+        });
+
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'push_notification',
+          push_provider: 'braze',
+        });
+      });
+
+      it('omits the provider for a push-tagged deeplink with no reported tap', () => {
+        appStateManager.setCurrentDeeplink('metamask://promo', 'braze');
+
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'push_notification',
+        });
+      });
+    });
+
+    // In-app navigation (Rewards CTAs) also reaches setCurrentDeeplink, and the
+    // value survives until an App Opened event consumes it. A leftover must not
+    // describe a later resume the user reached from the icon.
+    describe('stale deeplink', () => {
+      it('reports direct when the deeplink predates the attribution window', () => {
+        appStateManager.setCurrentDeeplink('metamask://card-home');
+        jest.advanceTimersByTime(6000);
+
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'direct',
+        });
+      });
+
+      it('reports deeplink when it arrived within the attribution window', () => {
+        appStateManager.setCurrentDeeplink('https://link.metamask.io/swap');
+        jest.advanceTimersByTime(1000);
+
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'deeplink',
+        });
+      });
+
+      it('honors a deeplink recorded exactly at the window boundary', () => {
+        appStateManager.setCurrentDeeplink('https://link.metamask.io/swap');
+        // warmOpen() advances a further 2000ms, landing on exactly 5000ms.
+        jest.advanceTimersByTime(3000);
+
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'deeplink',
+        });
+      });
+
+      it('applies the window to push origins too', () => {
+        appStateManager.setCurrentDeeplink('metamask://promo', 'braze');
+        jest.advanceTimersByTime(6000);
+
+        warmOpen();
+
+        expect(mockEventBuilder.addProperties).toHaveBeenCalledWith({
+          type: 'warm_start',
+          source: 'direct',
+        });
+      });
+    });
+  });
+
   describe('trackAppInstallOnce', () => {
     let mockStore: ReturnType<typeof createMockReduxStore>;
 
diff --git a/app/core/AppStateEventListener.ts b/app/core/AppStateEventListener.ts
index ec7d1f4513d3..ff0f22785fab 100644
--- a/app/core/AppStateEventListener.ts
+++ b/app/core/AppStateEventListener.ts
@@ -17,10 +17,63 @@ import {
   selectAppInstallEventFired,
 } from '../reducers/user/selectors';
 import { setAppInstallEventFired } from '../actions/user';
+import AppConstants from './AppConstants';
 
 /** Prevents parallel start() calls from double-firing before Redux persists. */
 let trackAppInstallInFlight = false;
 
+/** Delay so an incoming deeplink can land before App Opened fires. */
+const APP_OPENED_DEEPLINK_DELAY_MS = 2000;
+
+/**
+ * How recently a deeplink must have arrived to explain the current open.
+ *
+ * `setCurrentDeeplink` is also reached by in-app navigation — Rewards CTAs call
+ * `handleDeeplink` directly — and those values live until the next App Opened
+ * event consumes them. Without a recency check, tapping an in-app CTA and later
+ * resuming from the icon reports `source: deeplink` for a plainly direct open.
+ *
+ * Comfortably above APP_OPENED_DEEPLINK_DELAY_MS so every externally-delivered
+ * deeplink still classifies, including the slowest Branch resolutions.
+ */
+const DEEPLINK_ATTRIBUTION_TTL_MS = 5000;
+
+export enum AppOpenedType {
+  ColdStart = 'cold_start',
+  WarmStart = 'warm_start',
+}
+
+export enum AppOpenedSource {
+  PushNotification = 'push_notification',
+  Deeplink = 'deeplink',
+  Direct = 'direct',
+}
+
+/**
+ * Which system delivered the push. Both travel over FCM on Android, so this
+ * names the producer rather than the transport: Braze is marketing, wallet is
+ * the notification backend that sends on-chain activity.
+ */
+export enum AppOpenedPushProvider {
+  Braze = 'braze',
+  Wallet = 'wallet',
+}
+
+export interface PushOpenDetails {
+  provider: AppOpenedPushProvider;
+  /** Wallet notifications only; Braze payloads do not carry these. */
+  notificationType?: string;
+  notificationSubtype?: string;
+}
+
+/** Source-related properties attached to App Opened. */
+interface AppOpenedSourceProperties {
+  source: AppOpenedSource;
+  push_provider?: AppOpenedPushProvider;
+  notification_type?: string;
+  notification_subtype?: string;
+}
+
 /**
  * Fire the App Installed analytics event exactly once on first install.
  * Mirrors the extension's addAppInstalledEvent / onInstall logic:
@@ -96,6 +149,11 @@ export class AppStateEventListener {
   public currentDeeplink: string | null = null;
   public pendingDeeplink: string | null = null;
   public pendingDeeplinkSource: string | null = null;
+  private currentDeeplinkSource: string | null = null;
+  // When currentDeeplink was recorded, for DEEPLINK_ATTRIBUTION_TTL_MS.
+  private currentDeeplinkSetAt = 0;
+  private openedFromPushAt = 0;
+  private openedFromPush: PushOpenDetails | null = null;
   private lastAppState: AppStateStatus = AppState.currentState;
 
   constructor() {
@@ -118,14 +176,52 @@ export class AppStateEventListener {
 
     // Fire App Installed event once on first install
     this.trackAppInstallOnce();
+
+    setTimeout(() => {
+      this.processAppStateChange(AppOpenedType.ColdStart);
+    }, APP_OPENED_DEEPLINK_DELAY_MS);
   }
 
   public setCurrentDeeplink(deeplink: string | null, source?: string) {
     this.currentDeeplink = deeplink;
+    if (source || !this.isPushSource(this.currentDeeplinkSource)) {
+      this.currentDeeplinkSource = source ?? null;
+    }
+    this.currentDeeplinkSetAt = Date.now();
     this.pendingDeeplink = deeplink;
     this.pendingDeeplinkSource = source ?? null;
   }
 
+  private isPushSource = (source: string | null): boolean =>
+    source === AppConstants.DEEPLINKS.ORIGIN_PUSH_NOTIFICATION ||
+    source === AppConstants.DEEPLINKS.ORIGIN_BRAZE;
+
+  /**
+   * Record that the app was opened by a push notification tap.
+   *
+   * Push origin is otherwise only detectable via a deeplink on the payload, and
+   * many notifications carry none — on-chain activity notifications commonly
+   * have no CTA link. Reporting the tap directly means those opens are still
+   * attributed to push rather than falling through to `direct`.
+   *
+   * Callers must only invoke this for genuine user taps, never for pushes that
+   * were merely received.
+   */
+  public markOpenedFromPush(details: PushOpenDetails) {
+    this.openedFromPushAt = Date.now();
+    this.openedFromPush = details;
+  }
+
+  public promoteCurrentDeeplinkSource(uri: string, source?: string) {
+    if (
+      this.currentDeeplink === uri &&
+      this.isPushSource(source ?? null) &&
+      !this.isPushSource(this.currentDeeplinkSource)
+    ) {
+      this.currentDeeplinkSource = source ?? null;
+    }
+  }
+
   public clearPendingDeeplink() {
     this.pendingDeeplink = null;
     this.pendingDeeplinkSource = null;
@@ -138,8 +234,8 @@ export class AppStateEventListener {
     if (nextAppState === 'active' && this.lastAppState === 'background') {
       // delay to allow time for the deeplink to be set
       setTimeout(() => {
-        this.processAppStateChange();
-      }, 2000);
+        this.processAppStateChange(AppOpenedType.WarmStart);
+      }, APP_OPENED_DEEPLINK_DELAY_MS);
     }
     // On iOS, returning from background passes through an intermediate 'inactive'
     // state before reaching 'active'. Don't overwrite 'background' with 'inactive'
@@ -168,7 +264,45 @@ export class AppStateEventListener {
 
   private trackAppInstallOnce = trackAppInstallOnce;
 
-  private processAppStateChange = () => {
+  // Push opens are only detectable via the deeplink on the push payload, so a
+  // push without a deeplink is reported as direct.
+  //
+  // A deeplink older than DEEPLINK_ATTRIBUTION_TTL_MS did not cause this open —
+  // it is a leftover from in-app navigation — so it also reports direct. This
+  // deliberately does not gate processAttribution, which keeps its existing
+  // behavior; only the reported source honors recency.
+  private getAppOpenedSourceProperties = (): AppOpenedSourceProperties => {
+    // A reported tap outranks the deeplink, which may be absent on the payload.
+    const openedFromPush =
+      this.openedFromPush !== null &&
+      Date.now() - this.openedFromPushAt <= DEEPLINK_ATTRIBUTION_TTL_MS;
+    if (openedFromPush && this.openedFromPush) {
+      const { provider, notificationType, notificationSubtype } =
+        this.openedFromPush;
+      return {
+        source: AppOpenedSource.PushNotification,
+        push_provider: provider,
+        ...(notificationType ? { notification_type: notificationType } : {}),
+        ...(notificationSubtype
+          ? { notification_subtype: notificationSubtype }
+          : {}),
+      };
+    }
+    const isStaleDeeplink =
+      Date.now() - this.currentDeeplinkSetAt > DEEPLINK_ATTRIBUTION_TTL_MS;
+    if (!this.currentDeeplink || isStaleDeeplink) {
+      return { source: AppOpenedSource.Direct };
+    }
+    // A push-tagged deeplink with no reported tap still classifies as push, but
+    // the provider is unknown here, so no push_provider is attached.
+    return {
+      source: this.isPushSource(this.currentDeeplinkSource)
+        ? AppOpenedSource.PushNotification
+        : AppOpenedSource.Deeplink,
+    };
+  };
+
+  private processAppStateChange = (appOpenedType: AppOpenedType) => {
     try {
       const attribution = processAttribution({
         currentDeeplink: this.currentDeeplink,
@@ -181,11 +315,12 @@ export class AppStateEventListener {
           ReduxService.store.dispatch(saveAttribution(persistedPayload));
         }
       }
-      // Note: User identification is handled when settings change individually
-      // We only track the APP_OPENED event on app state transitions
       const appOpenedEventBuilder = AnalyticsEventBuilder.createEventBuilder(
         MetaMetricsEvents.APP_OPENED,
-      );
+      ).addProperties({
+        type: appOpenedType,
+        ...this.getAppOpenedSourceProperties(),
+      });
       if (attribution) {
         const { attributionId, ...utmParams } = attribution;
         DevLogger.log(
@@ -198,6 +333,10 @@ export class AppStateEventListener {
       // One-shot use for attribution: keeping currentDeeplink causes every
       // background→active cycle to re-save and reset capturedAt (TTL).
       this.currentDeeplink = null;
+      this.currentDeeplinkSource = null;
+      this.currentDeeplinkSetAt = 0;
+      this.openedFromPushAt = 0;
+      this.openedFromPush = null;
     } catch (error) {
       Logger.error(
         error as Error,
diff --git a/app/core/Authentication/Authentication.test.ts b/app/core/Authentication/Authentication.test.ts
index c8e1db2a3ca8..0cf97b6bc319 100644
--- a/app/core/Authentication/Authentication.test.ts
+++ b/app/core/Authentication/Authentication.test.ts
@@ -1380,6 +1380,20 @@ describe('Authentication', () => {
         expect(fallbackMockDispatch).toHaveBeenCalledWith(logIn());
       });
 
+      it('clears stored Transak provider token when creating a new wallet', async () => {
+        const createWalletDispatch = jest.fn();
+        jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+          dispatch: createWalletDispatch,
+          getState: () => ({ security: { allowLoginWithRememberMe: true } }),
+        } as unknown as ReduxStore);
+
+        await Authentication.newWalletAndKeychain('password', {
+          currentAuthType: AUTHENTICATION_TYPE.PASSWORD,
+        });
+
+        expect(depositResetProviderToken).toHaveBeenCalledTimes(1);
+      });
+
       it('falls back to PASSWORD when biometric storePassword fails in newWalletAndRestore', async () => {
         const restoreMockDispatch = jest.fn();
         jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
@@ -1421,9 +1435,29 @@ describe('Authentication', () => {
         expect(restoreMockDispatch).toHaveBeenCalledWith(logIn());
       });
 
+      it('clears stored Transak provider token when restoring a wallet', async () => {
+        const restoreWalletDispatch = jest.fn();
+        jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+          dispatch: restoreWalletDispatch,
+          getState: () => ({ security: { allowLoginWithRememberMe: true } }),
+        } as unknown as ReduxStore);
+
+        await Authentication.newWalletAndRestore(
+          'password',
+          { currentAuthType: AUTHENTICATION_TYPE.PASSWORD },
+          'test seed phrase',
+          true,
+        );
+
+        expect(depositResetProviderToken).toHaveBeenCalledTimes(1);
+      });
+
       it('imports remaining QR sync secrets after primary vault restore', async () => {
         const Engine = jest.requireMock('../Engine');
         const PRIMARY_ENTROPY_SOURCE = 'primary-entropy-source';
+        Engine.context.KeyringController.createNewVaultAndRestore.mockResolvedValueOnce(
+          PRIMARY_ENTROPY_SOURCE,
+        );
 
         await Authentication.newWalletAndRestore(
           'password',
diff --git a/app/core/Authentication/Authentication.ts b/app/core/Authentication/Authentication.ts
index f86376d70dda..e3572fafd9e3 100644
--- a/app/core/Authentication/Authentication.ts
+++ b/app/core/Authentication/Authentication.ts
@@ -169,6 +169,17 @@ class AuthenticationService {
     }
   };
 
+  private clearSessionScopedProviderTokens = async (): Promise<void> => {
+    try {
+      await depositResetProviderToken();
+    } catch (error) {
+      Logger.error(
+        error as Error,
+        'Failed to clear deposit provider token during wallet setup',
+      );
+    }
+  };
+
   private dispatchLogout(): void {
     ReduxService.store.dispatch(logOut());
   }
@@ -570,6 +581,7 @@ class AuthenticationService {
         await this.createWalletVaultAndKeychain(password);
       }
 
+      await this.clearSessionScopedProviderTokens();
       await this.storePassword(password, authData.currentAuthType, true);
       ReduxService.store.dispatch(setExistingUser(true));
       await StorageWrapper.removeItem(SEED_PHRASE_HINTS);
@@ -612,6 +624,8 @@ class AuthenticationService {
         clearEngine,
       );
 
+      await this.clearSessionScopedProviderTokens();
+
       if (isQrSync) {
         Engine.context.QrSyncController.enrichPrimaryProvisioningEntry(
           primaryEntropySource,
diff --git a/app/core/Braze/BrazeDeeplinks.test.ts b/app/core/Braze/BrazeDeeplinks.test.ts
index 4352f1bffd61..7cd5acdf7d78 100644
--- a/app/core/Braze/BrazeDeeplinks.test.ts
+++ b/app/core/Braze/BrazeDeeplinks.test.ts
@@ -1,7 +1,7 @@
 import Braze from '@braze/react-native-sdk';
 import {
-  getBrazeInitialDeeplink,
-  subscribeToBrazePushDeeplinks,
+  getBrazeInitialPush,
+  subscribeToBrazePushOpens,
 } from './BrazeDeeplinks';
 
 const mockRemove = jest.fn();
@@ -25,7 +25,7 @@ describe('BrazeDeeplinks', () => {
     jest.clearAllMocks();
   });
 
-  describe('getBrazeInitialDeeplink', () => {
+  describe('getBrazeInitialPush', () => {
     it('returns the URL when payload contains a deep link', async () => {
       (Braze.getInitialPushPayload as jest.Mock).mockImplementation(
         (callback) => {
@@ -33,44 +33,49 @@ describe('BrazeDeeplinks', () => {
         },
       );
 
-      const result = await getBrazeInitialDeeplink();
+      const result = await getBrazeInitialPush();
 
-      expect(result).toBe('https://link.metamask.io/swap?token=ETH');
+      expect(result).toEqual({
+        opened: true,
+        deeplink: 'https://link.metamask.io/swap?token=ETH',
+      });
       expect(Braze.getInitialPushPayload).toHaveBeenCalledTimes(1);
     });
 
-    it('returns null when payload is null', async () => {
+    it('reports no open when payload is null', async () => {
       (Braze.getInitialPushPayload as jest.Mock).mockImplementation(
         (callback) => {
           callback(null);
         },
       );
 
-      const result = await getBrazeInitialDeeplink();
+      const result = await getBrazeInitialPush();
 
-      expect(result).toBeNull();
+      expect(result).toEqual({ opened: false, deeplink: null });
     });
 
-    it('returns null when payload has no URL', async () => {
+    // On-chain activity notifications commonly carry no CTA link, so a payload
+    // without a URL is still a tap that opened the app.
+    it('reports an open with no deeplink when payload has no URL', async () => {
       (Braze.getInitialPushPayload as jest.Mock).mockImplementation(
         (callback) => {
           callback({ url: '', title: 'Test notification' });
         },
       );
 
-      const result = await getBrazeInitialDeeplink();
+      const result = await getBrazeInitialPush();
 
-      expect(result).toBeNull();
+      expect(result).toEqual({ opened: true, deeplink: null });
     });
 
-    it('returns null when getInitialPushPayload throws', async () => {
+    it('reports no open when getInitialPushPayload throws', async () => {
       (Braze.getInitialPushPayload as jest.Mock).mockImplementation(() => {
         throw new Error('Native module error');
       });
 
-      const result = await getBrazeInitialDeeplink();
+      const result = await getBrazeInitialPush();
 
-      expect(result).toBeNull();
+      expect(result).toEqual({ opened: false, deeplink: null });
     });
 
     it('handles metamask:// scheme URLs', async () => {
@@ -80,17 +85,20 @@ describe('BrazeDeeplinks', () => {
         },
       );
 
-      const result = await getBrazeInitialDeeplink();
+      const result = await getBrazeInitialPush();
 
-      expect(result).toBe('metamask://buy-crypto');
+      expect(result).toEqual({
+        opened: true,
+        deeplink: 'metamask://buy-crypto',
+      });
     });
   });
 
-  describe('subscribeToBrazePushDeeplinks', () => {
+  describe('subscribeToBrazePushOpens', () => {
     it('subscribes to push events and invokes callback with URL', () => {
       const callback = jest.fn();
 
-      subscribeToBrazePushDeeplinks(callback);
+      subscribeToBrazePushOpens(callback);
 
       expect(Braze.addListener).toHaveBeenCalledWith(
         'pushNotificationEvent',
@@ -111,7 +119,7 @@ describe('BrazeDeeplinks', () => {
     it('ignores push_received events (foreground notifications)', () => {
       const callback = jest.fn();
 
-      subscribeToBrazePushDeeplinks(callback);
+      subscribeToBrazePushOpens(callback);
 
       const handler = (Braze.addListener as jest.Mock).mock.calls[0][1];
       handler({
@@ -127,7 +135,7 @@ describe('BrazeDeeplinks', () => {
     it('ignores silent push notifications', () => {
       const callback = jest.fn();
 
-      subscribeToBrazePushDeeplinks(callback);
+      subscribeToBrazePushOpens(callback);
 
       const handler = (Braze.addListener as jest.Mock).mock.calls[0][1];
       handler({
@@ -143,7 +151,7 @@ describe('BrazeDeeplinks', () => {
     it('ignores Braze internal push notifications', () => {
       const callback = jest.fn();
 
-      subscribeToBrazePushDeeplinks(callback);
+      subscribeToBrazePushOpens(callback);
 
       const handler = (Braze.addListener as jest.Mock).mock.calls[0][1];
       handler({
@@ -156,10 +164,10 @@ describe('BrazeDeeplinks', () => {
       expect(callback).not.toHaveBeenCalled();
     });
 
-    it('does not invoke callback when push event has no URL', () => {
+    it('invokes callback with null when push event has no URL', () => {
       const callback = jest.fn();
 
-      subscribeToBrazePushDeeplinks(callback);
+      subscribeToBrazePushOpens(callback);
 
       const handler = (Braze.addListener as jest.Mock).mock.calls[0][1];
       handler({
@@ -169,13 +177,13 @@ describe('BrazeDeeplinks', () => {
         is_silent: false,
       });
 
-      expect(callback).not.toHaveBeenCalled();
+      expect(callback).toHaveBeenCalledWith(null);
     });
 
     it('returns the EmitterSubscription', () => {
       const callback = jest.fn();
 
-      const result = subscribeToBrazePushDeeplinks(callback);
+      const result = subscribeToBrazePushOpens(callback);
 
       expect(result).toEqual({ remove: mockRemove });
     });
@@ -186,7 +194,7 @@ describe('BrazeDeeplinks', () => {
       });
       const callback = jest.fn();
 
-      const result = subscribeToBrazePushDeeplinks(callback);
+      const result = subscribeToBrazePushOpens(callback);
 
       expect(result).toBeNull();
     });
diff --git a/app/core/Braze/BrazeDeeplinks.ts b/app/core/Braze/BrazeDeeplinks.ts
index 1fdf9f24782a..7f08304cd2aa 100644
--- a/app/core/Braze/BrazeDeeplinks.ts
+++ b/app/core/Braze/BrazeDeeplinks.ts
@@ -3,38 +3,50 @@ import { type EmitterSubscription } from 'react-native';
 import Logger from '../../util/Logger';
 
 /**
- * Retrieve the deep link URL from a Braze push notification that launched the
- * app from a terminated (cold) state.
+ * Report whether a Braze push notification launched the app from a terminated
+ * (cold) state, along with its deep link URL when the payload carries one.
  *
  * Requires native setup:
  * - iOS:     `[[BrazeReactUtils sharedInstance] populateInitialPayloadFromLaunchOptions:launchOptions]`
  * - Android: `BrazeReactUtils.populateInitialPushPayloadFromIntent(intent)`
  */
-export function getBrazeInitialDeeplink(): Promise<string | null> {
+export function getBrazeInitialPush(): Promise<{
+  opened: boolean;
+  deeplink: string | null;
+}> {
   return new Promise((resolve) => {
     try {
       Braze.getInitialPushPayload((payload: PushNotificationEvent | null) => {
-        const url = payload?.url;
-        if (url && typeof url === 'string' && url.length > 0) {
-          Logger.log('[Braze] Initial push deep link:', url);
-          resolve(url);
-        } else {
-          resolve(null);
+        if (!payload) {
+          resolve({ opened: false, deeplink: null });
+          return;
+        }
+        if (payload.is_braze_internal || payload.is_silent) {
+          resolve({ opened: false, deeplink: null });
+          return;
+        }
+        const url = payload.url;
+        const deeplink = typeof url === 'string' && url.length > 0 ? url : null;
+        if (deeplink) {
+          Logger.log('[Braze] Initial push deep link:', deeplink);
         }
+        // A payload without a URL is still a tap that launched the app.
+        resolve({ opened: true, deeplink });
       });
     } catch (error) {
       Logger.error(
         error as Error,
         '[Braze] Failed to get initial push payload',
       );
-      resolve(null);
+      resolve({ opened: false, deeplink: null });
     }
   });
 }
 
 /**
- * Subscribe to Braze push notification tap events and invoke `callback` with
- * the deep link URL when one is present.
+ * Subscribe to Braze push notification tap events. `callback` fires for every
+ * genuine tap, receiving the deep link URL when the payload carries one and
+ * `null` when it does not.
  *
  * On iOS, the native `BrazeDelegate.shouldOpenURL` routes universal links
  * (Branch domains) through Branch for proper resolution, and suppresses all
@@ -45,8 +57,8 @@ export function getBrazeInitialDeeplink(): Promise<string | null> {
  *
  * @returns An EmitterSubscription, or null on error.
  */
-export function subscribeToBrazePushDeeplinks(
-  callback: (deeplink: string) => void,
+export function subscribeToBrazePushOpens(
+  callback: (deeplink: string | null) => void,
 ): EmitterSubscription | null {
   try {
     return Braze.addListener(
@@ -56,15 +68,20 @@ export function subscribeToBrazePushDeeplinks(
           return;
         }
 
+        // Silent and Braze-internal pushes are not user taps, so they must not
+        // reach the callback — an open they did not cause would be attributed
+        // to push.
         if (event.is_braze_internal || event.is_silent) {
           return;
         }
 
         const url = event.url;
-        if (url && typeof url === 'string' && url.length > 0) {
-          Logger.log('[Braze] Push notification deep link:', url);
-          callback(url);
+        const deeplink = typeof url === 'string' && url.length > 0 ? url : null;
+        if (deeplink) {
+          Logger.log('[Braze] Push notification deep link:', deeplink);
         }
+        // Fires for every genuine tap, with or without a deeplink.
+        callback(deeplink);
       },
     );
   } catch (error) {
diff --git a/app/core/DeeplinkManager/DeeplinkManager.test.ts b/app/core/DeeplinkManager/DeeplinkManager.test.ts
index 3f0e73fc68e3..3067934b1879 100644
--- a/app/core/DeeplinkManager/DeeplinkManager.test.ts
+++ b/app/core/DeeplinkManager/DeeplinkManager.test.ts
@@ -1,6 +1,13 @@
 import { NavigationProp, ParamListBase } from '@react-navigation/native';
 import { waitFor } from '@testing-library/react-native';
-import FCMService from '../../util/notifications/services/FCMService';
+import {
+  EventType,
+  type Notification as NotifeeNotification,
+} from '@notifee/react-native';
+import FCMService, {
+  toPushTapResult,
+} from '../../util/notifications/services/FCMService';
+import NotificationsService from '../../util/notifications/services/NotificationService';
 import NavigationService from '../NavigationService';
 import SharedDeeplinkManager, {
   DeeplinkManager,
@@ -16,9 +23,10 @@ import { RootState } from '../../reducers';
 import branch from 'react-native-branch';
 import AppConstants from '../AppConstants';
 import {
-  getBrazeInitialDeeplink,
-  subscribeToBrazePushDeeplinks,
+  getBrazeInitialPush,
+  subscribeToBrazePushOpens,
 } from '../Braze/BrazeDeeplinks';
+import { AppStateEventProcessor } from '../AppStateEventListener';
 
 jest.mock('./handlers/legacy/handleApproveUrl');
 jest.mock('./handlers/legacy/handleEthereumUrl');
@@ -33,7 +41,12 @@ jest.mock('./handlers/legacy/handleRewardsUrl');
 jest.mock('./handlers/legacy/handleDeeplink');
 jest.mock('./handlers/legacy/handleFastOnboarding');
 jest.mock('../../util/notifications/services/FCMService');
+jest.mock('../../util/notifications/services/NotificationService');
 jest.mock('../Braze/BrazeDeeplinks');
+jest.mock('../AppStateEventListener', () => ({
+  AppOpenedPushProvider: { Braze: 'braze', Wallet: 'wallet' },
+  AppStateEventProcessor: { markOpenedFromPush: jest.fn() },
+}));
 jest.mock('../../store', () => ({
   store: {
     getState: jest.fn(),
@@ -152,19 +165,38 @@ describe('DeeplinkManager.start() - FCM Push Notification Integration', () => {
       FCMService.onClickPushNotificationWhenAppSuspended,
     );
     const mockHandleDeeplink = jest.mocked(handleDeeplink);
-    const mockGetBrazeInitialDeeplink = jest.mocked(getBrazeInitialDeeplink);
-    const mockSubscribeToBrazePushDeeplinks = jest.mocked(
-      subscribeToBrazePushDeeplinks,
+    const mockToPushTapResult = jest.mocked(toPushTapResult);
+    const mockOnForegroundEvent = jest.mocked(
+      NotificationsService.onForegroundEvent,
+    );
+    const mockHandleNotificationEvent = jest.mocked(
+      NotificationsService.handleNotificationEvent,
+    );
+    const mockGetBrazeInitialPush = jest.mocked(getBrazeInitialPush);
+    const mockSubscribeToBrazePushOpens = jest.mocked(
+      subscribeToBrazePushOpens,
     );
 
+    mockOnClickPushNotificationWhenAppClosed.mockResolvedValue({
+      opened: false,
+      deeplink: null,
+    });
+    mockOnClickPushNotificationWhenAppSuspended.mockImplementation(() => null);
+
     // Mock Braze to prevent errors during DeeplinkManager.start()
-    mockGetBrazeInitialDeeplink.mockResolvedValue(null);
-    mockSubscribeToBrazePushDeeplinks.mockReturnValue(null);
+    mockGetBrazeInitialPush.mockResolvedValue({
+      opened: false,
+      deeplink: null,
+    });
+    mockSubscribeToBrazePushOpens.mockReturnValue(null);
 
     return {
       mockOnClickPushNotificationWhenAppClosed,
       mockOnClickPushNotificationWhenAppSuspended,
       mockHandleDeeplink,
+      mockToPushTapResult,
+      mockOnForegroundEvent,
+      mockHandleNotificationEvent,
     };
   };
 
@@ -175,9 +207,10 @@ describe('DeeplinkManager.start() - FCM Push Notification Integration', () => {
   describe('Push Notification - App Closed', () => {
     const arrangeAct = async (deeplink: string | null) => {
       const mocks = arrangeMocks();
-      mocks.mockOnClickPushNotificationWhenAppClosed.mockResolvedValue(
+      mocks.mockOnClickPushNotificationWhenAppClosed.mockResolvedValue({
+        opened: deeplink !== null,
         deeplink,
-      );
+      });
 
       DeeplinkManager.start();
 
@@ -213,7 +246,7 @@ describe('DeeplinkManager.start() - FCM Push Notification Integration', () => {
   });
 
   describe('Push Notification - App Suspended', () => {
-    const arrangeAct = (deeplink?: string) => {
+    const arrangeAct = (deeplink: string | null) => {
       const mocks = arrangeMocks();
 
       DeeplinkManager.start();
@@ -223,7 +256,7 @@ describe('DeeplinkManager.start() - FCM Push Notification Integration', () => {
         mocks.mockOnClickPushNotificationWhenAppSuspended.mock.calls[0][0];
 
       // Simulate the callback being called
-      suspendedCallback(deeplink);
+      suspendedCallback({ opened: true, deeplink });
 
       return mocks;
     };
@@ -243,7 +276,7 @@ describe('DeeplinkManager.start() - FCM Push Notification Integration', () => {
     });
 
     it('does not handle deeplink when no deeplink provided from suspended app', () => {
-      const mocks = arrangeAct(undefined);
+      const mocks = arrangeAct(null);
 
       expect(
         mocks.mockOnClickPushNotificationWhenAppSuspended,
@@ -251,13 +284,86 @@ describe('DeeplinkManager.start() - FCM Push Notification Integration', () => {
       expect(mocks.mockHandleDeeplink).not.toHaveBeenCalled();
     });
   });
+
+  describe('Notifee Push Notification', () => {
+    const triggerNotifeePress = async (
+      mocks: ReturnType<typeof arrangeMocks>,
+      notification: NotifeeNotification,
+    ) => {
+      DeeplinkManager.start();
+      const foregroundEventHandler =
+        mocks.mockOnForegroundEvent.mock.calls[0][0];
+      await foregroundEventHandler({
+        type: EventType.PRESS,
+        detail: { notification },
+      });
+      const notificationCallback =
+        mocks.mockHandleNotificationEvent.mock.calls[0][0].callback;
+      notificationCallback?.(notification);
+    };
+
+    it('routes a Notifee press through wallet push attribution', async () => {
+      const deeplink = 'https://link.metamask.io/rewards';
+      const notification = {
+        data: {
+          dataStr: JSON.stringify({
+            deeplink,
+            notification_type: 'platform',
+            notification_subtype: 'take_profit_executed',
+          }),
+        },
+      } as NotifeeNotification;
+      const tapResult = {
+        opened: true,
+        deeplink,
+        notificationType: 'platform',
+        notificationSubtype: 'take_profit_executed',
+      };
+      const mocks = arrangeMocks();
+      mocks.mockToPushTapResult.mockReturnValue(tapResult);
+
+      await triggerNotifeePress(mocks, notification);
+
+      expect(mocks.mockToPushTapResult).toHaveBeenCalledWith(
+        notification.data,
+        true,
+      );
+      expect(AppStateEventProcessor.markOpenedFromPush).toHaveBeenCalledWith({
+        provider: 'wallet',
+        notificationType: 'platform',
+        notificationSubtype: 'take_profit_executed',
+      });
+      expect(mocks.mockHandleDeeplink).toHaveBeenCalledWith({
+        uri: deeplink,
+        source: AppConstants.DEEPLINKS.ORIGIN_PUSH_NOTIFICATION,
+      });
+    });
+
+    it('ignores a Notifee press without wallet push fields', async () => {
+      const notification = {
+        data: {
+          dataStr: JSON.stringify({ action: 'tx' }),
+        },
+      } as NotifeeNotification;
+      const mocks = arrangeMocks();
+      mocks.mockToPushTapResult.mockReturnValue({
+        opened: true,
+        deeplink: null,
+      });
+
+      await triggerNotifeePress(mocks, notification);
+
+      expect(AppStateEventProcessor.markOpenedFromPush).not.toHaveBeenCalled();
+      expect(mocks.mockHandleDeeplink).not.toHaveBeenCalled();
+    });
+  });
 });
 
 describe('DeeplinkManager.start() - Braze Push Notification Integration', () => {
   const arrangeMocks = () => {
-    const mockGetBrazeInitialDeeplink = jest.mocked(getBrazeInitialDeeplink);
-    const mockSubscribeToBrazePushDeeplinks = jest.mocked(
-      subscribeToBrazePushDeeplinks,
+    const mockGetBrazeInitialPush = jest.mocked(getBrazeInitialPush);
+    const mockSubscribeToBrazePushOpens = jest.mocked(
+      subscribeToBrazePushOpens,
     );
     const mockHandleDeeplink = jest.mocked(handleDeeplink);
     const mockOnClickPushNotificationWhenAppClosed = jest.mocked(
@@ -268,12 +374,15 @@ describe('DeeplinkManager.start() - Braze Push Notification Integration', () =>
     );
 
     // Mock FCM to prevent errors during DeeplinkManager.start()
-    mockOnClickPushNotificationWhenAppClosed.mockResolvedValue(null);
+    mockOnClickPushNotificationWhenAppClosed.mockResolvedValue({
+      opened: false,
+      deeplink: null,
+    });
     mockOnClickPushNotificationWhenAppSuspended.mockImplementation(() => null);
 
     return {
-      mockGetBrazeInitialDeeplink,
-      mockSubscribeToBrazePushDeeplinks,
+      mockGetBrazeInitialPush,
+      mockSubscribeToBrazePushOpens,
       mockHandleDeeplink,
     };
   };
@@ -285,7 +394,10 @@ describe('DeeplinkManager.start() - Braze Push Notification Integration', () =>
   describe('Braze Push Notification - App Cold Start', () => {
     const arrangeAct = async (deeplink: string | null) => {
       const mocks = arrangeMocks();
-      mocks.mockGetBrazeInitialDeeplink.mockResolvedValue(deeplink);
+      mocks.mockGetBrazeInitialPush.mockResolvedValue({
+        opened: deeplink !== null,
+        deeplink,
+      });
 
       DeeplinkManager.start();
 
@@ -298,7 +410,7 @@ describe('DeeplinkManager.start() - Braze Push Notification Integration', () =>
       const mocks = await arrangeAct(testDeeplink);
 
       await waitFor(() => {
-        expect(mocks.mockGetBrazeInitialDeeplink).toHaveBeenCalled();
+        expect(mocks.mockGetBrazeInitialPush).toHaveBeenCalled();
         expect(mocks.mockHandleDeeplink).toHaveBeenCalledWith({
           uri: testDeeplink,
           source: AppConstants.DEEPLINKS.ORIGIN_BRAZE,
@@ -310,7 +422,7 @@ describe('DeeplinkManager.start() - Braze Push Notification Integration', () =>
       const mocks = await arrangeAct(null);
 
       await waitFor(() => {
-        expect(mocks.mockGetBrazeInitialDeeplink).toHaveBeenCalled();
+        expect(mocks.mockGetBrazeInitialPush).toHaveBeenCalled();
         expect(mocks.mockHandleDeeplink).not.toHaveBeenCalled();
       });
     });
@@ -322,9 +434,9 @@ describe('DeeplinkManager.start() - Braze Push Notification Integration', () =>
 
       DeeplinkManager.start();
 
-      // Get the callback that was passed to subscribeToBrazePushDeeplinks
+      // Get the callback that was passed to subscribeToBrazePushOpens
       const suspendedCallback =
-        mocks.mockSubscribeToBrazePushDeeplinks.mock.calls[0][0];
+        mocks.mockSubscribeToBrazePushOpens.mock.calls[0][0];
 
       // Simulate the callback being called
       if (deeplink) {
@@ -339,7 +451,7 @@ describe('DeeplinkManager.start() - Braze Push Notification Integration', () =>
 
       const mocks = arrangeAct(testDeeplink);
 
-      expect(mocks.mockSubscribeToBrazePushDeeplinks).toHaveBeenCalledWith(
+      expect(mocks.mockSubscribeToBrazePushOpens).toHaveBeenCalledWith(
         expect.any(Function),
       );
       expect(mocks.mockHandleDeeplink).toHaveBeenCalledWith({
@@ -351,7 +463,7 @@ describe('DeeplinkManager.start() - Braze Push Notification Integration', () =>
     it('subscribes to Braze push deeplinks even when no immediate deeplink is provided', () => {
       const mocks = arrangeAct(undefined);
 
-      expect(mocks.mockSubscribeToBrazePushDeeplinks).toHaveBeenCalledWith(
+      expect(mocks.mockSubscribeToBrazePushOpens).toHaveBeenCalledWith(
         expect.any(Function),
       );
       expect(mocks.mockHandleDeeplink).not.toHaveBeenCalled();
@@ -359,6 +471,145 @@ describe('DeeplinkManager.start() - Braze Push Notification Integration', () =>
   });
 });
 
+// Push origin used to ride on the deeplink, so a notification without a CTA
+// link — common for on-chain activity notifications — was indistinguishable
+// from a direct open. Every tap is now reported regardless of the payload.
+describe('DeeplinkManager.start() - push taps without a deeplink', () => {
+  const mockMarkOpenedFromPush = jest.mocked(
+    AppStateEventProcessor.markOpenedFromPush,
+  );
+
+  const arrangeMocks = () => {
+    const mockOnClickPushNotificationWhenAppClosed = jest.mocked(
+      FCMService.onClickPushNotificationWhenAppClosed,
+    );
+    const mockOnClickPushNotificationWhenAppSuspended = jest.mocked(
+      FCMService.onClickPushNotificationWhenAppSuspended,
+    );
+    const mockGetBrazeInitialPush = jest.mocked(getBrazeInitialPush);
+    const mockSubscribeToBrazePushOpens = jest.mocked(
+      subscribeToBrazePushOpens,
+    );
+    const mockHandleDeeplink = jest.mocked(handleDeeplink);
+
+    mockOnClickPushNotificationWhenAppClosed.mockResolvedValue({
+      opened: false,
+      deeplink: null,
+    });
+    mockOnClickPushNotificationWhenAppSuspended.mockImplementation(() => null);
+    mockGetBrazeInitialPush.mockResolvedValue({
+      opened: false,
+      deeplink: null,
+    });
+    mockSubscribeToBrazePushOpens.mockReturnValue(null);
+
+    return {
+      mockOnClickPushNotificationWhenAppClosed,
+      mockOnClickPushNotificationWhenAppSuspended,
+      mockGetBrazeInitialPush,
+      mockSubscribeToBrazePushOpens,
+      mockHandleDeeplink,
+    };
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('reports an FCM cold-start tap that carries no deeplink', async () => {
+    const mocks = arrangeMocks();
+    mocks.mockOnClickPushNotificationWhenAppClosed.mockResolvedValue({
+      opened: true,
+      deeplink: null,
+    });
+
+    DeeplinkManager.start();
+
+    await waitFor(() => {
+      expect(mockMarkOpenedFromPush).toHaveBeenCalled();
+    });
+    expect(mocks.mockHandleDeeplink).not.toHaveBeenCalled();
+  });
+
+  it('ignores a warm callback that reports no open', () => {
+    const mocks = arrangeMocks();
+
+    DeeplinkManager.start();
+    const suspendedCallback =
+      mocks.mockOnClickPushNotificationWhenAppSuspended.mock.calls[0][0];
+    suspendedCallback({ opened: false, deeplink: null });
+
+    expect(mockMarkOpenedFromPush).not.toHaveBeenCalled();
+  });
+
+  it('reports an FCM warm tap that carries no deeplink', () => {
+    const mocks = arrangeMocks();
+
+    DeeplinkManager.start();
+    const suspendedCallback =
+      mocks.mockOnClickPushNotificationWhenAppSuspended.mock.calls[0][0];
+    suspendedCallback({ opened: true, deeplink: null });
+
+    expect(mockMarkOpenedFromPush).toHaveBeenCalled();
+    expect(mocks.mockHandleDeeplink).not.toHaveBeenCalled();
+  });
+
+  it('reports a Braze cold-start tap that carries no deeplink', async () => {
+    const mocks = arrangeMocks();
+    mocks.mockGetBrazeInitialPush.mockResolvedValue({
+      opened: true,
+      deeplink: null,
+    });
+
+    DeeplinkManager.start();
+
+    await waitFor(() => {
+      expect(mockMarkOpenedFromPush).toHaveBeenCalled();
+    });
+    expect(mocks.mockHandleDeeplink).not.toHaveBeenCalled();
+  });
+
+  it('reports a Braze warm tap that carries no deeplink', () => {
+    const mocks = arrangeMocks();
+
+    DeeplinkManager.start();
+    const brazeCallback = mocks.mockSubscribeToBrazePushOpens.mock.calls[0][0];
+    brazeCallback(null);
+
+    expect(mockMarkOpenedFromPush).toHaveBeenCalled();
+    expect(mocks.mockHandleDeeplink).not.toHaveBeenCalled();
+  });
+
+  it('still navigates and reports when the tap does carry a deeplink', async () => {
+    const mocks = arrangeMocks();
+    mocks.mockOnClickPushNotificationWhenAppClosed.mockResolvedValue({
+      opened: true,
+      deeplink: 'metamask://home',
+    });
+
+    DeeplinkManager.start();
+
+    await waitFor(() => {
+      expect(mocks.mockHandleDeeplink).toHaveBeenCalledWith({
+        uri: 'metamask://home',
+        source: AppConstants.DEEPLINKS.ORIGIN_PUSH_NOTIFICATION,
+      });
+    });
+    expect(mockMarkOpenedFromPush).toHaveBeenCalled();
+  });
+
+  it('does not report an open when no notification launched the app', async () => {
+    const mocks = arrangeMocks();
+
+    DeeplinkManager.start();
+
+    await waitFor(() => {
+      expect(mocks.mockOnClickPushNotificationWhenAppClosed).toHaveBeenCalled();
+    });
+    expect(mockMarkOpenedFromPush).not.toHaveBeenCalled();
+  });
+});
+
 describe('SharedDeeplinkManager', () => {
   beforeEach(() => {
     const mockedState = {
diff --git a/app/core/DeeplinkManager/DeeplinkManager.ts b/app/core/DeeplinkManager/DeeplinkManager.ts
index c4d841fc5288..dd742c195b05 100644
--- a/app/core/DeeplinkManager/DeeplinkManager.ts
+++ b/app/core/DeeplinkManager/DeeplinkManager.ts
@@ -3,16 +3,24 @@
 import parseDeeplink from './utils/parseDeeplink';
 import branch from 'react-native-branch';
 import { Linking } from 'react-native';
+import type { Notification as NotifeeNotification } from '@notifee/react-native';
 import Logger from '../../util/Logger';
 import { handleDeeplink } from './handlers/legacy/handleDeeplink';
-import FCMService from '../../util/notifications/services/FCMService';
+import FCMService, {
+  toPushTapResult,
+} from '../../util/notifications/services/FCMService';
 import AppConstants from '../AppConstants';
 import { BranchParams } from './types/deepLinkAnalytics.types';
 import {
-  getBrazeInitialDeeplink,
-  subscribeToBrazePushDeeplinks,
+  getBrazeInitialPush,
+  subscribeToBrazePushOpens,
 } from '../Braze/BrazeDeeplinks';
+import {
+  AppOpenedPushProvider,
+  AppStateEventProcessor,
+} from '../AppStateEventListener';
 import type { DeeplinkIntent } from './types/DeeplinkIntent';
+import NotificationsService from '../../util/notifications/services/NotificationService';
 
 // `false` means the deeplink was handled but intentionally rejected, for
 // example when the user dismisses the interstitial during startup resolution.
@@ -146,40 +154,81 @@ export class DeeplinkManager {
       }
     };
 
-    FCMService.onClickPushNotificationWhenAppClosed().then((deeplink) => {
-      if (deeplink) {
+    // Every push tap is reported to AppStateEventProcessor regardless of the
+    // payload, so App Opened can attribute the open to push even when there is
+    // no deeplink to carry the origin. handleDeeplink still only runs when
+    // there is somewhere to navigate.
+    const PROVIDER_ORIGIN = {
+      [AppOpenedPushProvider.Braze]: AppConstants.DEEPLINKS.ORIGIN_BRAZE,
+      [AppOpenedPushProvider.Wallet]:
+        AppConstants.DEEPLINKS.ORIGIN_PUSH_NOTIFICATION,
+    };
+
+    const onPushTap = (
+      provider: AppOpenedPushProvider,
+      tap: {
+        deeplink: string | null;
+        notificationType?: string;
+        notificationSubtype?: string;
+      },
+    ) => {
+      AppStateEventProcessor.markOpenedFromPush({
+        provider,
+        notificationType: tap.notificationType,
+        notificationSubtype: tap.notificationSubtype,
+      });
+      if (tap.deeplink) {
         handleDeeplink({
-          uri: deeplink,
-          source: AppConstants.DEEPLINKS.ORIGIN_PUSH_NOTIFICATION,
+          uri: tap.deeplink,
+          source: PROVIDER_ORIGIN[provider],
         });
       }
-    });
+    };
 
-    FCMService.onClickPushNotificationWhenAppSuspended((deeplink) => {
-      if (deeplink) {
-        handleDeeplink({
-          uri: deeplink,
-          source: AppConstants.DEEPLINKS.ORIGIN_PUSH_NOTIFICATION,
-        });
+    FCMService.onClickPushNotificationWhenAppClosed().then((tap) => {
+      if (tap.opened) {
+        onPushTap(AppOpenedPushProvider.Wallet, tap);
       }
     });
 
-    getBrazeInitialDeeplink().then((deeplink) => {
-      if (deeplink) {
-        handleDeeplink({
-          uri: deeplink,
-          source: AppConstants.DEEPLINKS.ORIGIN_BRAZE,
-        });
+    FCMService.onClickPushNotificationWhenAppSuspended((tap) => {
+      if (tap.opened) {
+        onPushTap(AppOpenedPushProvider.Wallet, tap);
       }
     });
 
-    subscribeToBrazePushDeeplinks((deeplink) => {
-      handleDeeplink({
-        uri: deeplink,
-        source: AppConstants.DEEPLINKS.ORIGIN_BRAZE,
+    const handleNotifeeNotification = (
+      notification: NotifeeNotification | undefined,
+    ) => {
+      if (!notification) {
+        return;
+      }
+
+      const tap = toPushTapResult(notification.data, true);
+      if (!tap.deeplink && !tap.notificationType && !tap.notificationSubtype) {
+        return;
+      }
+
+      onPushTap(AppOpenedPushProvider.Wallet, tap);
+    };
+
+    NotificationsService.onForegroundEvent(async (event) => {
+      await NotificationsService.handleNotificationEvent({
+        ...event,
+        callback: handleNotifeeNotification,
       });
     });
 
+    getBrazeInitialPush().then(({ opened, deeplink }) => {
+      if (opened) {
+        onPushTap(AppOpenedPushProvider.Braze, { deeplink });
+      }
+    });
+
+    subscribeToBrazePushOpens((deeplink) => {
+      onPushTap(AppOpenedPushProvider.Braze, { deeplink });
+    });
+
     Linking.getInitialURL().then((url) => {
       if (!url) {
         return;
diff --git a/app/core/DeeplinkManager/handlers/legacy/__tests__/handleDeeplink.test.ts b/app/core/DeeplinkManager/handlers/legacy/__tests__/handleDeeplink.test.ts
index 8fef29070219..4da15b0cb076 100644
--- a/app/core/DeeplinkManager/handlers/legacy/__tests__/handleDeeplink.test.ts
+++ b/app/core/DeeplinkManager/handlers/legacy/__tests__/handleDeeplink.test.ts
@@ -38,6 +38,7 @@ jest.mock('../../../../../util/Logger', () => ({
 jest.mock('../../../../AppStateEventListener', () => ({
   AppStateEventProcessor: {
     setCurrentDeeplink: jest.fn(),
+    promoteCurrentDeeplinkSource: jest.fn(),
   },
 }));
 
@@ -77,6 +78,8 @@ describe('handleDeeplink', () => {
   const mockLoggerError = Logger.error as jest.Mock;
   const mockSetCurrentDeeplink =
     AppStateEventProcessor.setCurrentDeeplink as jest.Mock;
+  const mockPromoteCurrentDeeplinkSource =
+    AppStateEventProcessor.promoteCurrentDeeplinkSource as jest.Mock;
   const mockIsMwpDeeplink = SDKConnectV2.isMwpDeeplink as unknown as jest.Mock;
   const mockHandleMwpDeeplink = SDKConnectV2.handleMwpDeeplink as jest.Mock;
   const mockTrackEvent = analytics.trackEvent as jest.Mock;
@@ -269,6 +272,37 @@ describe('handleDeeplink', () => {
       expect(mockSetCurrentDeeplink).not.toHaveBeenCalled();
       expect(mockDispatch).not.toHaveBeenCalled();
     });
+
+    // On Android, Braze opens push deeplinks itself, so RN Linking reports the
+    // same URI with no source and races the ORIGIN_BRAZE delivery. Whichever
+    // loses is suppressed here, so the origin has to survive suppression or the
+    // open is misattributed to `deeplink`.
+    it('records the push origin of a suppressed duplicate', () => {
+      const testUri = 'https://link.metamask.io/swap';
+
+      handleDeeplink({ uri: testUri });
+      handleDeeplink({ uri: testUri, source: 'braze' });
+
+      expect(mockPromoteCurrentDeeplinkSource).toHaveBeenCalledWith(
+        testUri,
+        'braze',
+      );
+      // Still suppressed for navigation.
+      expect(mockCheckForDeeplink).toHaveBeenCalledTimes(1);
+    });
+
+    it('passes the missing source through when the suppressed duplicate is untagged', () => {
+      const testUri = 'https://link.metamask.io/swap';
+
+      handleDeeplink({ uri: testUri, source: 'braze' });
+      handleDeeplink({ uri: testUri });
+
+      expect(mockPromoteCurrentDeeplinkSource).toHaveBeenCalledWith(
+        testUri,
+        undefined,
+      );
+      expect(mockCheckForDeeplink).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe('MWP deeplink handling', () => {
diff --git a/app/core/DeeplinkManager/handlers/legacy/__tests__/handlePredictUrl.test.ts b/app/core/DeeplinkManager/handlers/legacy/__tests__/handlePredictUrl.test.ts
index 395fd790356d..6315927c7363 100644
--- a/app/core/DeeplinkManager/handlers/legacy/__tests__/handlePredictUrl.test.ts
+++ b/app/core/DeeplinkManager/handlers/legacy/__tests__/handlePredictUrl.test.ts
@@ -2,11 +2,7 @@ import { handlePredictUrl } from '../handlePredictUrl';
 import NavigationService from '../../../../NavigationService';
 import Routes from '../../../../../constants/navigation/Routes';
 import DevLogger from '../../../../SDKConnect/utils/DevLogger';
-import { DEFAULT_PREDICT_WORLD_CUP_FLAG } from '../../../../../components/UI/Predict/constants/flags';
-import {
-  selectPredictHomeRedesignEnabledFlag,
-  selectPredictWorldCupConfig,
-} from '../../../../../components/UI/Predict/selectors/featureFlags';
+import { selectPredictHomeRedesignEnabledFlag } from '../../../../../components/UI/Predict/selectors/featureFlags';
 
 // Mock dependencies
 jest.mock('../../../../NavigationService');
@@ -22,7 +18,6 @@ jest.mock('../../../../redux', () => ({
 jest.mock(
   '../../../../../components/UI/Predict/selectors/featureFlags',
   () => ({
-    selectPredictWorldCupConfig: jest.fn(),
     selectPredictHomeRedesignEnabledFlag: jest.fn(),
   }),
 );
@@ -41,9 +36,6 @@ describe('handlePredictUrl', () => {
 
     // Mock DevLogger
     (DevLogger.log as jest.Mock) = jest.fn();
-    jest
-      .mocked(selectPredictWorldCupConfig)
-      .mockReturnValue(DEFAULT_PREDICT_WORLD_CUP_FLAG);
     // Generic feed routing is gated by the home redesign flag; default it on so
     // generic-feed tests exercise the FEED path. Flag-off behavior is covered
     // by a dedicated test below.
@@ -268,134 +260,6 @@ describe('handlePredictUrl', () => {
     });
   });
 
-  describe('with World Cup feed parameter', () => {
-    it('navigates to the World Cup screen when feed is world-cup and screen is enabled', async () => {
-      jest.mocked(selectPredictWorldCupConfig).mockReturnValue({
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        showWorldCupScreen: true,
-      });
-
-      await handlePredictUrl({ predictPath: '?feed=world-cup' });
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
-        screen: Routes.PREDICT.WORLD_CUP,
-        params: {
-          entryPoint: 'deeplink',
-          initialTab: 'all',
-        },
-      });
-    });
-
-    it('passes a valid fixed World Cup tab to the World Cup screen', async () => {
-      jest.mocked(selectPredictWorldCupConfig).mockReturnValue({
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        showWorldCupScreen: true,
-      });
-
-      await handlePredictUrl({ predictPath: '?feed=world-cup&tab=live' });
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
-        screen: Routes.PREDICT.WORLD_CUP,
-        params: {
-          entryPoint: 'deeplink',
-          initialTab: 'live',
-        },
-      });
-    });
-
-    it('preserves utm_source attribution for World Cup feed links', async () => {
-      jest.mocked(selectPredictWorldCupConfig).mockReturnValue({
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        showWorldCupScreen: true,
-      });
-
-      await handlePredictUrl({
-        predictPath: '?feed=world-cup&utm_source=twitter&tab=live',
-      });
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
-        screen: Routes.PREDICT.WORLD_CUP,
-        params: {
-          entryPoint: 'deeplink_twitter',
-          initialTab: 'live',
-        },
-      });
-    });
-
-    it('passes a valid configured stage tab to the World Cup screen', async () => {
-      jest.mocked(selectPredictWorldCupConfig).mockReturnValue({
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        showWorldCupScreen: true,
-        stages: [{ key: 'group-stage', eventIds: ['1'] }],
-      });
-
-      await handlePredictUrl({
-        predictPath: '?feed=world-cup&tab=group-stage',
-      });
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
-        screen: Routes.PREDICT.WORLD_CUP,
-        params: {
-          entryPoint: 'deeplink',
-          initialTab: 'group-stage',
-        },
-      });
-    });
-
-    it('falls back to All when World Cup tab is invalid', async () => {
-      jest.mocked(selectPredictWorldCupConfig).mockReturnValue({
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        showWorldCupScreen: true,
-      });
-
-      await handlePredictUrl({ predictPath: '?feed=world-cup&tab=invalid' });
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
-        screen: Routes.PREDICT.WORLD_CUP,
-        params: {
-          entryPoint: 'deeplink',
-          initialTab: 'all',
-        },
-      });
-    });
-
-    it('falls back to Predict market list when World Cup screen is disabled', async () => {
-      await handlePredictUrl({ predictPath: '?feed=world-cup&tab=live' });
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
-        screen: Routes.PREDICT.MARKET_LIST,
-        params: {
-          entryPoint: 'deeplink',
-        },
-      });
-    });
-
-    it('prioritizes market parameter over feed=world-cup', async () => {
-      jest.mocked(selectPredictWorldCupConfig).mockReturnValue({
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        showWorldCupScreen: true,
-      });
-
-      await handlePredictUrl({
-        predictPath: '?feed=world-cup&market=123&tab=live',
-      });
-
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
-        screen: Routes.PREDICT.MARKET_DETAILS,
-        params: {
-          marketId: '123',
-          entryPoint: 'deeplink',
-        },
-      });
-    });
-  });
-
   describe('with generic feed parameter', () => {
     it('navigates to the generic feed for a known feed id', async () => {
       await handlePredictUrl({ predictPath: '?feed=sports' });
@@ -533,20 +397,40 @@ describe('handlePredictUrl', () => {
       });
     });
 
-    it('routes feed=world-cup to the World Cup flow, not the generic feed', async () => {
-      jest.mocked(selectPredictWorldCupConfig).mockReturnValue({
-        ...DEFAULT_PREDICT_WORLD_CUP_FLAG,
-        enabled: true,
-        showWorldCupScreen: true,
+    it('falls back to the market list for removed world-cup feed links', async () => {
+      await handlePredictUrl({ predictPath: '?feed=world-cup&tab=live' });
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
+        screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: 'deeplink',
+        },
       });
+    });
 
-      await handlePredictUrl({ predictPath: '?feed=world-cup&tab=live' });
+    it('preserves attribution when removed world-cup feed links fall back', async () => {
+      await handlePredictUrl({
+        predictPath: '?feed=world-cup&utm_source=twitter&tab=live',
+      });
 
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
-        screen: Routes.PREDICT.WORLD_CUP,
+        screen: Routes.PREDICT.MARKET_LIST,
         params: {
+          entryPoint: 'deeplink_twitter',
+        },
+      });
+    });
+
+    it('prioritizes market parameter over removed world-cup feed links', async () => {
+      await handlePredictUrl({
+        predictPath: '?feed=world-cup&market=123&tab=live',
+      });
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
+        screen: Routes.PREDICT.MARKET_DETAILS,
+        params: {
+          marketId: '123',
           entryPoint: 'deeplink',
-          initialTab: 'live',
         },
       });
     });
@@ -721,7 +605,7 @@ describe('handlePredictUrl', () => {
           market: '23246',
           utmSource: undefined,
           tab: undefined,
-          worldCupTab: undefined,
+          initialTabId: undefined,
           feed: undefined,
           filter: undefined,
           query: undefined,
@@ -1015,7 +899,7 @@ describe('handlePredictUrl', () => {
           market: '23246',
           utmSource: 'test',
           tab: undefined,
-          worldCupTab: undefined,
+          initialTabId: undefined,
           feed: undefined,
           filter: undefined,
           query: undefined,
diff --git a/app/core/DeeplinkManager/handlers/legacy/handleDeeplink.ts b/app/core/DeeplinkManager/handlers/legacy/handleDeeplink.ts
index c53c6cc190c5..6c58c8fd3ed6 100644
--- a/app/core/DeeplinkManager/handlers/legacy/handleDeeplink.ts
+++ b/app/core/DeeplinkManager/handlers/legacy/handleDeeplink.ts
@@ -65,6 +65,7 @@ export function handleDeeplink(opts: { uri?: string; source?: string }) {
         now - lastHandledDeeplinkAt < DUPLICATE_DEEPLINK_WINDOW_MS
       ) {
         Logger.log(`Deeplink: Ignoring duplicate deeplink: ${uri}`);
+        AppStateEventProcessor.promoteCurrentDeeplinkSource(uri, source);
         return;
       }
       lastHandledDeeplinkUri = uri;
diff --git a/app/core/DeeplinkManager/handlers/legacy/handlePredictUrl.ts b/app/core/DeeplinkManager/handlers/legacy/handlePredictUrl.ts
index 64ec5673ed3c..d51765be5ccd 100644
--- a/app/core/DeeplinkManager/handlers/legacy/handlePredictUrl.ts
+++ b/app/core/DeeplinkManager/handlers/legacy/handlePredictUrl.ts
@@ -6,17 +6,7 @@ import {
   isPredictTabKey,
   type PredictTabKey,
 } from '../../../../components/UI/Predict/constants/feedTabs';
-import {
-  PREDICT_WORLD_CUP_FEED_PARAM,
-  resolvePredictWorldCupInitialTab,
-  type PredictWorldCupTabKey,
-} from '../../../../components/UI/Predict/constants/worldCupTabs';
-import { DEFAULT_PREDICT_WORLD_CUP_FLAG } from '../../../../components/UI/Predict/constants/flags';
-import {
-  selectPredictHomeRedesignEnabledFlag,
-  selectPredictWorldCupConfig,
-} from '../../../../components/UI/Predict/selectors/featureFlags';
-import type { PredictWorldCupConfig } from '../../../../components/UI/Predict/types/flags';
+import { selectPredictHomeRedesignEnabledFlag } from '../../../../components/UI/Predict/selectors/featureFlags';
 import type { DeeplinkIntent } from '../../types/DeeplinkIntent';
 import { executeDeeplinkIntent } from '../../utils/executeDeeplinkIntent';
 import {
@@ -36,10 +26,7 @@ interface PredictNavigationParams {
   market?: string; // Market ID
   utmSource?: string; // UTM source for analytics tracking
   tab?: PredictTabKey; // Feed tab (when no market param)
-  // TODO: `worldCupTab` holds the raw (unvalidated) tab value and is also reused
-  // by the generic feed. Remove/rename to a neutral field once the World Cup
-  // feature is sunset.
-  worldCupTab?: PredictWorldCupTabKey; // World Cup feed initial tab (raw tab value)
+  initialTabId?: string; // Generic feed initial tab id (raw tab value)
   feed?: string; // Dedicated feed key
   filter?: string; // Generic feed filter chip id (parsed separately from tab)
   query?: string; // Search query (when no market param)
@@ -69,25 +56,13 @@ const parsePredictNavigationParams = (
     market: marketId || undefined,
     utmSource: utmSource || undefined,
     tab,
-    worldCupTab: tabParam,
+    initialTabId: tabParam,
     feed: feed || undefined,
     filter: filter || undefined,
     query,
   };
 };
 
-const getPredictWorldCupConfig = (): PredictWorldCupConfig => {
-  try {
-    return selectPredictWorldCupConfig(ReduxService.store.getState());
-  } catch (error) {
-    DevLogger.log(
-      '[handlePredictUrl] Unable to read World Cup config, using default:',
-      error,
-    );
-    return DEFAULT_PREDICT_WORLD_CUP_FLAG;
-  }
-};
-
 const getPredictHomeRedesignEnabled = (): boolean => {
   try {
     return selectPredictHomeRedesignEnabledFlag(ReduxService.store.getState());
@@ -140,28 +115,6 @@ const marketListTarget = ({
     getMarketListParams({ entryPoint, tab, query }),
   );
 
-const worldCupTarget = ({
-  requestedTab,
-  entryPoint,
-}: {
-  requestedTab?: PredictWorldCupTabKey;
-  entryPoint: string;
-}): DeeplinkIntent['target'] => {
-  const config = getPredictWorldCupConfig();
-
-  if (config.enabled && config.showWorldCupScreen) {
-    return predictTarget(Routes.PREDICT.WORLD_CUP, {
-      entryPoint,
-      initialTab: resolvePredictWorldCupInitialTab(requestedTab, config),
-    });
-  }
-
-  DevLogger.log(
-    '[handlePredictUrl] World Cup screen disabled, fallback to market list',
-  );
-  return marketListTarget({ entryPoint });
-};
-
 /**
  * Build the target for a generic, config-driven Predict feed (`PredictFeedView`).
  * @param params Resolved generic feed params
@@ -232,8 +185,6 @@ const marketTarget = (
  * - https://link.metamask.io/predict?tab=crypto
  * - https://link.metamask.io/predict?q=bitcoin
  * - https://link.metamask.io/predict?query=bitcoin
- * - https://link.metamask.io/predict?feed=world-cup
- * - https://link.metamask.io/predict?feed=world-cup&tab=live
  * - https://link.metamask.io/predict?feed=sports
  * - https://link.metamask.io/predict?feed=sports&tab=all&filter=live
  * - https://link.metamask.io/predict?feed=popular-today&filter=elections (redirects to Trending)
@@ -247,7 +198,6 @@ const marketTarget = (
  * Navigation behavior:
  * - No market param: Navigate to market list
  * - market=X or marketId=X: Navigate directly to market details for market X
- * - feed=world-cup: Navigate to the dedicated World Cup feed when enabled
  * - feed=<known generic id> (sports/politics/crypto/live/trending): Navigate to the generic PredictFeedView when the predictHomeRedesign flag is enabled (tab -> initialTabId, filter -> initialFilterId)
  * - feed=popular-today: Redirect to the Trending feed while preserving its filter
  * - Unknown feed (or flag disabled): Fall back to the Predict market list
@@ -279,17 +229,12 @@ const resolvePredictTarget = ({
 
   if (navParams.market) {
     return marketTarget(navParams.market, entryPoint);
-  } else if (navParams.feed === PREDICT_WORLD_CUP_FEED_PARAM) {
-    return worldCupTarget({
-      requestedTab: navParams.worldCupTab,
-      entryPoint,
-    });
   } else if (isPredictFeedId(genericFeed) && getPredictHomeRedesignEnabled()) {
     return genericFeedTarget({
       feedId: genericFeed,
-      // worldCupTab holds the raw (unvalidated) tab value; the generic feed's
-      // sub-tab ids (e.g. basketball/all/live) are resolved by the view.
-      initialTabId: navParams.worldCupTab,
+      // The generic feed's sub-tab ids (e.g. basketball/all/live) are resolved
+      // by the view.
+      initialTabId: navParams.initialTabId,
       initialFilterId: navParams.filter,
       query: navParams.query,
       entryPoint,
diff --git a/app/core/Engine/Engine.test.ts b/app/core/Engine/Engine.test.ts
index 0578b7a82cde..ee4069434121 100644
--- a/app/core/Engine/Engine.test.ts
+++ b/app/core/Engine/Engine.test.ts
@@ -169,6 +169,7 @@ describe('Engine', () => {
     expect(engine.context).toHaveProperty('EarnController');
     expect(engine.context).toHaveProperty('MultichainTransactionsController');
     expect(engine.context).toHaveProperty('DeFiPositionsController');
+    expect(engine.context).toHaveProperty('DeFiPositionsControllerV2');
     expect(engine.context).toHaveProperty('NetworkEnablementController');
     expect(engine.context).toHaveProperty('PerpsController');
     expect(engine.context).toHaveProperty('GatorPermissionsController');
diff --git a/app/core/Engine/Engine.ts b/app/core/Engine/Engine.ts
index 57568bb61862..107c5a174d4b 100644
--- a/app/core/Engine/Engine.ts
+++ b/app/core/Engine/Engine.ts
@@ -124,6 +124,7 @@ import { bridgeStatusControllerInit } from './controllers/bridge-status-controll
 import { multichainNetworkControllerInit } from './controllers/multichain-network-controller/multichain-network-controller-init';
 import { currencyRateControllerInit } from './controllers/currency-rate-controller/currency-rate-controller-init';
 import { defiPositionsControllerInit } from './controllers/defi-positions-controller/defi-positions-controller-init';
+import { defiPositionsControllerV2Init } from './controllers/defi-positions-controller-v2/defi-positions-controller-v2-init';
 import { SignatureControllerInit } from './controllers/signature-controller';
 import { appMetadataControllerInit } from './controllers/app-metadata-controller';
 import { InternalAccount } from '@metamask/keyring-internal-api';
@@ -340,6 +341,7 @@ export class Engine {
         TokenSearchDiscoveryDataController:
           tokenSearchDiscoveryDataControllerInit,
         DeFiPositionsController: defiPositionsControllerInit,
+        DeFiPositionsControllerV2: defiPositionsControllerV2Init,
         BridgeController: bridgeControllerInit,
         BridgeStatusController: bridgeStatusControllerInit,
         NftController: nftControllerInit,
@@ -640,6 +642,8 @@ export class Engine {
         messengerClientsByName.MoneyAccountApiDataService,
       GeolocationController: geolocationController,
       DeFiPositionsController: messengerClientsByName.DeFiPositionsController,
+      DeFiPositionsControllerV2:
+        messengerClientsByName.DeFiPositionsControllerV2,
       SeedlessOnboardingController: seedlessOnboardingController,
       ///: BEGIN:ONLY_INCLUDE_IF(sample-feature)
       SamplePetnamesController: messengerClientsByName.SamplePetnamesController,
@@ -1470,6 +1474,7 @@ export default {
       ConnectivityController,
       CurrencyRateController,
       DeFiPositionsController,
+      DeFiPositionsControllerV2,
       DelegationController,
       EarnController,
       GasFeeController,
@@ -1544,6 +1549,7 @@ export default {
       ConnectivityController: ConnectivityController.state,
       CurrencyRateController: CurrencyRateController.state,
       DeFiPositionsController: DeFiPositionsController.state,
+      DeFiPositionsControllerV2: DeFiPositionsControllerV2.state,
       DelegationController: DelegationController.state,
       EarnController: EarnController.state,
       GasFeeController: GasFeeController.state,
diff --git a/app/core/Engine/constants.ts b/app/core/Engine/constants.ts
index 6a5c076aad13..59ab461ea700 100644
--- a/app/core/Engine/constants.ts
+++ b/app/core/Engine/constants.ts
@@ -92,6 +92,7 @@ export const BACKGROUND_STATE_CHANGE_EVENT_NAMES = [
   'PerpsController:stateChange',
   'RewardsController:stateChange',
   'DeFiPositionsController:stateChange',
+  'DeFiPositionsControllerV2:stateChanged',
   'SeedlessOnboardingController:stateChange',
   ///: BEGIN:ONLY_INCLUDE_IF(sample-feature)
   'SamplePetnamesController:stateChange',
diff --git a/app/core/Engine/controllers/card-controller/CardController.test.ts b/app/core/Engine/controllers/card-controller/CardController.test.ts
index 0867a235fd22..ca1648f85a0c 100644
--- a/app/core/Engine/controllers/card-controller/CardController.test.ts
+++ b/app/core/Engine/controllers/card-controller/CardController.test.ts
@@ -1,6 +1,8 @@
 import { Messenger } from '@metamask/messenger';
 import type { Json } from '@metamask/utils';
 import { CardController, defaultCardControllerState } from './CardController';
+import type { CardService } from './services/CardService';
+import { CardApiError } from './services/BaanxService';
 import {
   type CardControllerActions,
   type CardControllerEvents,
@@ -10,6 +12,7 @@ import {
   CardLinkageInProgressError,
   CardProviderError,
   CardProviderErrorCode,
+  CardProviderIds,
   CardStatus,
   CardType,
   FundingAssetStatus,
@@ -67,6 +70,20 @@ jest.mock(
   }),
 );
 
+// Default (undefined) means "no primary Money Account" — the cross-device
+// conflict guardrail is skipped, keeping unrelated tests unaffected.
+const mockSelectPrimaryMoneyAccount = jest.fn();
+jest.mock('../../../../selectors/moneyAccountController', () => ({
+  selectPrimaryMoneyAccount: (state: unknown) =>
+    mockSelectPrimaryMoneyAccount(state),
+}));
+
+const mockReadErc20AllowanceAndBalance = jest.fn();
+jest.mock('../../../../components/UI/Card/util/onChainAllowance', () => ({
+  readErc20AllowanceAndBalance: (...args: unknown[]) =>
+    mockReadErc20AllowanceAndBalance(...args),
+}));
+
 const mockTokenStore = CardTokenStore as jest.Mocked<typeof CardTokenStore>;
 const mockOnboardingStore = CardOnboardingStore as jest.Mocked<
   typeof CardOnboardingStore
@@ -115,6 +132,15 @@ function buildMockMessenger(
   } as unknown as jest.Mocked<CardControllerMessenger>;
 }
 
+function buildMockCardService(
+  overrides: Partial<{ getSupportedRegions: jest.Mock }> = {},
+): CardService {
+  return {
+    getSupportedRegions: jest.fn(),
+    ...overrides,
+  } as unknown as CardService;
+}
+
 function buildMockProvider(
   overrides: Partial<ICardProvider> = {},
 ): jest.Mocked<ICardProvider> {
@@ -140,10 +166,12 @@ function buildMockProvider(
 function buildController(
   provider: ICardProvider,
   stateOverrides: Partial<typeof defaultCardControllerState> = {},
+  cardService: CardService = buildMockCardService(),
 ) {
   return new CardController({
     messenger: buildMessenger(),
     providers: { baanx: provider },
+    cardService,
     state: {
       activeProviderId: 'baanx',
       ...stateOverrides,
@@ -176,11 +204,13 @@ function buildControllerWithMockMessenger(
   provider: ICardProvider,
   stateOverrides: Partial<typeof defaultCardControllerState> = {},
   evmAddress = '0xabc',
+  cardService: CardService = buildMockCardService(),
 ) {
   const messenger = buildMessengerWithEvmAccount(evmAddress);
   const controller = new CardController({
     messenger,
     providers: { baanx: provider },
+    cardService,
     state: { activeProviderId: 'baanx', ...stateOverrides },
   });
   return { controller, messenger };
@@ -253,6 +283,7 @@ const mockRefreshRejectedError = new CardProviderError(
 describe('CardController', () => {
   it('initializes with default state when no state is provided', () => {
     const controller = new CardController({
+      cardService: buildMockCardService(),
       messenger: buildMessenger(),
       providers: {},
     });
@@ -264,6 +295,7 @@ describe('CardController', () => {
 
   it('initializes with provided state merged over defaults', () => {
     const controller = new CardController({
+      cardService: buildMockCardService(),
       messenger: buildMessenger(),
       providers: {},
       state: {
@@ -275,7 +307,6 @@ describe('CardController', () => {
 
     expect(controller.state).toStrictEqual({
       selectedCountry: 'US',
-      selectedCardProgramId: null,
       activeProviderId: 'baanx',
       isAuthenticated: true,
       lastUnauthenticatedReason: null,
@@ -289,6 +320,7 @@ describe('CardController', () => {
 
   it('preserves default values for fields not in partial state', () => {
     const controller = new CardController({
+      cardService: buildMockCardService(),
       messenger: buildMessenger(),
       providers: {},
       state: {
@@ -305,6 +337,7 @@ describe('CardController', () => {
 
   it('initializes with full persisted state including providerData', () => {
     const controller = new CardController({
+      cardService: buildMockCardService(),
       messenger: buildMessenger(),
       providers: {},
       state: {
@@ -340,6 +373,7 @@ describe('CardController — setSelectedCountry', () => {
       return undefined;
     });
     return new CardController({
+      cardService: buildMockCardService(),
       messenger,
       providers: {
         baanx: buildMockProvider({ id: 'baanx' }),
@@ -391,27 +425,6 @@ describe('CardController — setSelectedCountry', () => {
   });
 });
 
-describe('CardController — setSelectedCardProgramId', () => {
-  it('updates selectedCardProgramId in state', () => {
-    const messenger = buildMockMessenger();
-    const controller = new CardController({
-      messenger,
-      providers: {
-        baanx: buildMockProvider({ id: 'baanx' }),
-        immersve: buildMockProvider({ id: 'immersve' }),
-      },
-    });
-
-    expect(controller.state.selectedCardProgramId).toBeNull();
-
-    controller.setSelectedCardProgramId('program-alpha');
-    expect(controller.state.selectedCardProgramId).toBe('program-alpha');
-
-    controller.setSelectedCardProgramId(null);
-    expect(controller.state.selectedCardProgramId).toBeNull();
-  });
-});
-
 describe('CardController — auth methods', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -437,6 +450,7 @@ describe('CardController — auth methods', () => {
 
     it('throws CardProviderError when there is no active provider', async () => {
       const controller = new CardController({
+        cardService: buildMockCardService(),
         messenger: buildMessenger(),
         providers: {},
         state: { activeProviderId: null },
@@ -618,6 +632,53 @@ describe('CardController — auth methods', () => {
       expect(result.onboardingRequired?.phase).toBe('kyc');
       expect(controller.getCurrentAuthStep()).toBeNull();
     });
+
+    describe('Money Account cross-device conflict (login is never blocked)', () => {
+      // Product decision: a Money Account delegated to a different card only
+      // blocks LINKING (see the linkMoneyAccountCard guardrail tests), never
+      // logging in.
+      const MONEY_ACCOUNT_ADDRESS =
+        '0x000000000000000000000000000000000000dEaD';
+
+      afterEach(() => {
+        mockSelectPrimaryMoneyAccount.mockReset();
+        mockReadErc20AllowanceAndBalance.mockReset();
+      });
+
+      it('completes login without running the conflict check even when the Money Account is delegated to a different card', async () => {
+        mockSelectPrimaryMoneyAccount.mockReturnValue({
+          address: MONEY_ACCOUNT_ADDRESS,
+        });
+        // A non-zero allowance would have signalled a conflict — login must
+        // still complete and never read the chain.
+        mockReadErc20AllowanceAndBalance.mockResolvedValue({
+          balance: '0',
+          allowance: '100',
+          spendableBalance: '0',
+        });
+        const provider = buildMockProvider();
+        provider.initiateAuth.mockResolvedValue(mockSession);
+        provider.submitCredentials.mockResolvedValue({
+          done: true,
+          tokenSet: mockTokenSet,
+        });
+        mockTokenStore.set.mockResolvedValue(true);
+        const controller = buildController(provider);
+
+        await controller.initiateAuth('US');
+        const result = await controller.submitCredentials({
+          type: 'email_password',
+          email: 'a@b.com',
+          password: 'pass',
+        });
+
+        expect(result.done).toBe(true);
+        expect(controller.state.isAuthenticated).toBe(true);
+        expect(mockTokenStore.set).toHaveBeenCalledWith('baanx', mockTokenSet);
+        expect(mockReadErc20AllowanceAndBalance).not.toHaveBeenCalled();
+        expect(provider.logout).not.toHaveBeenCalled();
+      });
+    });
   });
 
   describe('executeStepAction', () => {
@@ -748,10 +809,11 @@ describe('CardController — auth methods', () => {
       stateOverrides: Partial<typeof defaultCardControllerState> = {},
     ) {
       const baanx = buildMockProvider();
-      const other = buildMockProvider({ id: 'other' });
+      const other = buildMockProvider({ id: CardProviderIds.Immersve });
       const controller = new CardController({
+        cardService: buildMockCardService(),
         messenger: buildMessenger(),
-        providers: { baanx, other },
+        providers: { baanx, [CardProviderIds.Immersve]: other },
         state: { activeProviderId: 'baanx', ...stateOverrides },
       });
       return { controller, baanx, other };
@@ -770,9 +832,13 @@ describe('CardController — auth methods', () => {
       expect(baanx.logout).toHaveBeenCalledWith(mockTokenSet);
       expect(other.logout).toHaveBeenCalledWith(mockTokenSet);
       expect(mockTokenStore.remove).toHaveBeenCalledWith('baanx');
-      expect(mockTokenStore.remove).toHaveBeenCalledWith('other');
+      expect(mockTokenStore.remove).toHaveBeenCalledWith(
+        CardProviderIds.Immersve,
+      );
       expect(mockOnboardingStore.remove).toHaveBeenCalledWith('baanx');
-      expect(mockOnboardingStore.remove).toHaveBeenCalledWith('other');
+      expect(mockOnboardingStore.remove).toHaveBeenCalledWith(
+        CardProviderIds.Immersve,
+      );
     });
 
     it('continues cleanup when provider.logout throws', async () => {
@@ -862,7 +928,9 @@ describe('CardController — auth methods', () => {
       await controller.resetAll();
 
       expect(other.logout).toHaveBeenCalledWith(mockTokenSet);
-      expect(mockTokenStore.remove).toHaveBeenCalledWith('other');
+      expect(mockTokenStore.remove).toHaveBeenCalledWith(
+        CardProviderIds.Immersve,
+      );
       expect(controller.state).toStrictEqual(defaultCardControllerState);
     });
   });
@@ -905,6 +973,7 @@ describe('CardController — auth methods', () => {
       provider.validateTokens.mockReturnValue('valid');
       const messenger = buildMessengerWithEvmAccount('0xotheraccount');
       const controller = new CardController({
+        cardService: buildMockCardService(),
         messenger,
         providers: { immersve: provider },
         state: { activeProviderId: 'immersve', isAuthenticated: true },
@@ -1027,7 +1096,7 @@ describe('CardController — auth methods', () => {
       });
     });
 
-    it('calls fetchCardHomeData even when no tokens exist', async () => {
+    it('does not fetch card home data when no tokens exist', async () => {
       const provider = buildMockProvider();
       mockTokenStore.get.mockResolvedValue(null);
       const controller = buildController(provider);
@@ -1037,10 +1106,10 @@ describe('CardController — auth methods', () => {
 
       await controller.validateAndRefreshSession();
 
-      expect(fetchSpy).toHaveBeenCalledTimes(1);
+      expect(fetchSpy).not.toHaveBeenCalled();
     });
 
-    it('calls fetchCardHomeData when tokens are valid', async () => {
+    it('does not fetch card home data when tokens are valid', async () => {
       const provider = buildMockProvider();
       mockTokenStore.get.mockResolvedValue(mockTokenSet);
       provider.validateTokens.mockReturnValue('valid');
@@ -1051,7 +1120,7 @@ describe('CardController — auth methods', () => {
 
       await controller.validateAndRefreshSession();
 
-      expect(fetchSpy).toHaveBeenCalledTimes(1);
+      expect(fetchSpy).not.toHaveBeenCalled();
     });
   });
 });
@@ -1358,6 +1427,7 @@ describe('CardController — event subscriptions', () => {
   it('subscribes to KeyringController:unlock on construction', () => {
     const mockMessenger = buildMockMessenger();
     new CardController({
+      cardService: buildMockCardService(),
       messenger: mockMessenger,
       providers: {},
     });
@@ -1371,6 +1441,7 @@ describe('CardController — event subscriptions', () => {
   it('subscribes to AccountTreeController:stateChange on construction', () => {
     const mockMessenger = buildMockMessenger();
     new CardController({
+      cardService: buildMockCardService(),
       messenger: mockMessenger,
       providers: {},
     });
@@ -1385,6 +1456,7 @@ describe('CardController — event subscriptions', () => {
   it('subscribes to RemoteFeatureFlagController:stateChange on construction', () => {
     const mockMessenger = buildMockMessenger();
     new CardController({
+      cardService: buildMockCardService(),
       messenger: mockMessenger,
       providers: {},
     });
@@ -1396,7 +1468,7 @@ describe('CardController — event subscriptions', () => {
     );
   });
 
-  it('clears and refetches card home data when the card feature flag changes', () => {
+  it('clears card home data without fetching when the card feature flag changes', () => {
     const provider = buildMockProvider();
     const { controller, messenger } = buildControllerWithMockMessenger(
       provider,
@@ -1419,7 +1491,7 @@ describe('CardController — event subscriptions', () => {
 
     expect(controller.state.cardHomeData).toBeNull();
     expect(controller.state.cardHomeDataStatus).toBe('idle');
-    expect(fetchSpy).toHaveBeenCalledTimes(1);
+    expect(fetchSpy).not.toHaveBeenCalled();
   });
 
   it('calls validateAndRefreshSession on KeyringController:unlock', async () => {
@@ -1438,6 +1510,7 @@ describe('CardController — event subscriptions', () => {
     });
 
     const controller = new CardController({
+      cardService: buildMockCardService(),
       messenger: mockMessenger,
       providers: { baanx: provider },
       state: { activeProviderId: 'baanx' },
@@ -1481,6 +1554,7 @@ describe('CardController — event subscriptions', () => {
     mockTokenStore.get.mockResolvedValue(null);
     const mockMessenger = buildMessengerForUnlock();
     const controller = new CardController({
+      cardService: buildMockCardService(),
       messenger: mockMessenger,
       providers: { baanx: provider },
       state: { activeProviderId: 'baanx' },
@@ -1534,6 +1608,7 @@ describe('CardController — event subscriptions', () => {
     mockTokenStore.get.mockResolvedValue(null);
     const mockMessenger = buildMessengerForUnlock();
     const controller = new CardController({
+      cardService: buildMockCardService(),
       messenger: mockMessenger,
       providers: { baanx: provider },
       state: { activeProviderId: 'baanx' },
@@ -1749,7 +1824,7 @@ describe('CardController — fetchCardHomeData', () => {
     expect(controller.state.cardHomeDataStatus).toBe('idle');
   });
 
-  it('returns early without changing status when no EVM address is selected', async () => {
+  it('sets cardHomeDataStatus to error when no EVM address is selected', async () => {
     const provider = buildMockProvider();
     const messenger = buildMockMessenger();
     (messenger.call as jest.Mock).mockImplementation((action: string) => {
@@ -1759,6 +1834,7 @@ describe('CardController — fetchCardHomeData', () => {
       return undefined;
     });
     const controller = new CardController({
+      cardService: buildMockCardService(),
       messenger,
       providers: { baanx: provider },
       state: { activeProviderId: 'baanx' },
@@ -1766,8 +1842,52 @@ describe('CardController — fetchCardHomeData', () => {
 
     await controller.fetchCardHomeData();
 
-    expect(controller.state.cardHomeDataStatus).toBe('idle');
+    expect(controller.state.cardHomeDataStatus).toBe('error');
+    expect(provider.getCardHomeData).not.toHaveBeenCalled();
+  });
+
+  it('skips a second fetch within the freshness window', async () => {
+    const provider = buildMockProvider();
+    mockTokenStore.get.mockResolvedValue(mockTokenSet);
+    provider.validateTokens.mockReturnValue('valid');
+    provider.getCardHomeData.mockResolvedValue(mockCardHomeData);
+    const { controller } = buildControllerWithMockMessenger(provider);
+
+    await controller.fetchCardHomeData();
+    await controller.fetchCardHomeData();
+
+    expect(provider.getCardHomeData).toHaveBeenCalledTimes(1);
+  });
+
+  it('bypasses the freshness window when force is true', async () => {
+    const provider = buildMockProvider();
+    mockTokenStore.get.mockResolvedValue(mockTokenSet);
+    provider.validateTokens.mockReturnValue('valid');
+    provider.getCardHomeData.mockResolvedValue(mockCardHomeData);
+    const { controller } = buildControllerWithMockMessenger(provider);
+
+    await controller.fetchCardHomeData();
+    await controller.fetchCardHomeData({ force: true });
+
+    expect(provider.getCardHomeData).toHaveBeenCalledTimes(2);
+  });
+
+  it('stamps freshness on error so automatic retries back off', async () => {
+    const provider = buildMockProvider();
+    mockTokenStore.get.mockResolvedValue(mockTokenSet);
+    provider.validateTokens.mockReturnValue('valid');
+    provider.getCardHomeData.mockRejectedValue(new Error('API error'));
+    const { controller } = buildControllerWithMockMessenger(provider);
+
+    await controller.fetchCardHomeData();
+    expect(controller.state.cardHomeDataStatus).toBe('error');
+
+    provider.getCardHomeData.mockClear();
+    provider.getCardHomeData.mockResolvedValue(mockCardHomeData);
+    await controller.fetchCardHomeData();
+
     expect(provider.getCardHomeData).not.toHaveBeenCalled();
+    expect(controller.state.cardHomeDataStatus).toBe('error');
   });
 });
 
@@ -2255,7 +2375,7 @@ describe('CardController — account switch (#handleAccountSwitch)', () => {
     )?.[1] as ((key: string) => void) | undefined;
   }
 
-  it('clears cardHomeData and calls fetchCardHomeData when account changes (authenticated)', async () => {
+  it('clears cardHomeData without fetching when account changes (authenticated)', async () => {
     const provider = buildMockProvider();
     const { controller, messenger } = buildControllerWithMockMessenger(
       provider,
@@ -2302,10 +2422,10 @@ describe('CardController — account switch (#handleAccountSwitch)', () => {
 
     expect(controller.state.cardHomeData).toBeNull();
     expect(controller.state.cardHomeDataStatus).toBe('idle');
-    expect(fetchSpy).toHaveBeenCalledTimes(1);
+    expect(fetchSpy).not.toHaveBeenCalled();
   });
 
-  it('clears cardHomeData and calls fetchCardHomeData when account changes (unauthenticated)', async () => {
+  it('clears cardHomeData without fetching when account changes (unauthenticated)', async () => {
     const provider = buildMockProvider();
     const { controller, messenger } = buildControllerWithMockMessenger(
       provider,
@@ -2350,7 +2470,9 @@ describe('CardController — account switch (#handleAccountSwitch)', () => {
 
     await handler?.('');
 
-    expect(fetchSpy).toHaveBeenCalledTimes(1);
+    expect(controller.state.cardHomeData).toBeNull();
+    expect(controller.state.cardHomeDataStatus).toBe('idle');
+    expect(fetchSpy).not.toHaveBeenCalled();
   });
 
   it('does not clear state or refetch when address is unchanged', async () => {
@@ -2410,7 +2532,7 @@ describe('CardController — setUserLocation', () => {
 
   it('is a no-op when activeProviderId is falsy', () => {
     const provider = buildMockProvider();
-    const controller = buildController(provider, { activeProviderId: '' });
+    const controller = buildController(provider, { activeProviderId: null });
     const before = { ...controller.state.providerData };
 
     controller.setUserLocation('us');
@@ -2802,6 +2924,7 @@ describe('CardController — data pass-throughs', () => {
       mockTokenStore.get.mockResolvedValue(mockTokenSet);
       provider.validateTokens.mockReturnValue('valid');
       return new CardController({
+        cardService: buildMockCardService(),
         messenger,
         providers: { baanx: provider },
         state: {
@@ -3114,6 +3237,314 @@ describe('CardController — data pass-throughs', () => {
       ).rejects.toThrow('Delegation amount is required');
     });
 
+    describe('cross-device conflict guardrail', () => {
+      const vedaAssetForMoneyAccount: CardFundingAsset = {
+        address: TOKEN_ADDRESS,
+        name: 'veda',
+        symbol: 'veda',
+        decimals: 6,
+        walletAddress: MONEY_ACCOUNT_ADDRESS,
+        chainId: 'eip155:143',
+        spendableBalance: '10',
+        spendingCap: '10',
+        priority: 1,
+        status: FundingAssetStatus.Active,
+      };
+
+      afterEach(() => {
+        mockSelectPrimaryMoneyAccount.mockReset();
+        mockReadErc20AllowanceAndBalance.mockReset();
+      });
+
+      function extendMessengerWithNetworkClient(handle: LinkMessengerHandle) {
+        const base = (
+          handle.messenger.call as jest.Mock
+        ).getMockImplementation();
+        (handle.messenger.call as jest.Mock).mockImplementation(
+          (action: string, ...args: unknown[]) => {
+            if (action === 'NetworkController:getNetworkClientById') {
+              return { provider: { request: jest.fn() } };
+            }
+            return base?.(action, ...args);
+          },
+        );
+      }
+
+      it('blocks linking when the Money Account is delegated on-chain to a different card', async () => {
+        mockSelectPrimaryMoneyAccount.mockReturnValue({
+          address: MONEY_ACCOUNT_ADDRESS,
+        });
+        const mockChallenge = jest.fn();
+        const mockApproveFunding = jest.fn();
+        const provider = buildMockProvider({
+          fetchDelegationChallenge: mockChallenge,
+          approveFunding: mockApproveFunding,
+          generateCardDelegationSignatureMessage: mockGenerateSiwe,
+        });
+        provider.getCardHomeData.mockResolvedValue({
+          ...(cardHomeDataWithMonadUsdc as unknown as CardHomeData),
+          fundingAssets: [],
+        });
+        mockReadErc20AllowanceAndBalance.mockResolvedValue({
+          balance: '0',
+          allowance: '50',
+          spendableBalance: '0',
+        });
+
+        const handle = buildLinkMessenger();
+        extendMessengerWithNetworkClient(handle);
+        const controller = buildLinkController({
+          provider,
+          messenger: handle.messenger,
+        });
+
+        await expect(
+          controller.linkMoneyAccountCard({
+            moneyAccountAddress: MONEY_ACCOUNT_ADDRESS,
+            delegationAmountHuman: '2199023255551',
+          }),
+        ).rejects.toMatchObject({
+          code: CardProviderErrorCode.MoneyAccountLinkedToDifferentCard,
+        });
+
+        expect(handle.addTransactionBatchCalls).toHaveLength(0);
+        expect(mockChallenge).not.toHaveBeenCalled();
+        expect(mockApproveFunding).not.toHaveBeenCalled();
+        expect(controller.isLinkageInProgress()).toBe(false);
+      });
+
+      it('allows the same card to retry when approval confirmed but provider registration failed', async () => {
+        mockSelectPrimaryMoneyAccount.mockReturnValue({
+          address: MONEY_ACCOUNT_ADDRESS,
+        });
+        const mockChallenge = jest.fn().mockResolvedValue({
+          delegationToken: 'jwt-retry',
+          nonce: 'nonce-retry',
+          expiresAt: '2099-01-01',
+        });
+        const mockApproveFunding = jest
+          .fn()
+          .mockRejectedValueOnce(new Error('post-approval failed'))
+          .mockResolvedValueOnce(undefined);
+        const provider = buildMockProvider({
+          fetchDelegationChallenge: mockChallenge,
+          approveFunding: mockApproveFunding,
+          generateCardDelegationSignatureMessage: mockGenerateSiwe,
+        });
+        provider.getCardHomeData.mockResolvedValue({
+          ...(cardHomeDataWithMonadUsdc as unknown as CardHomeData),
+          card: {
+            ...mockCard,
+            id: 'card-a',
+          },
+          fundingAssets: [],
+        });
+        mockReadErc20AllowanceAndBalance
+          .mockResolvedValueOnce({
+            balance: '0',
+            allowance: '0',
+            spendableBalance: '0',
+          })
+          .mockResolvedValueOnce({
+            balance: '0',
+            allowance: '50',
+            spendableBalance: '0',
+          });
+
+        const handle = buildLinkMessenger();
+        extendMessengerWithNetworkClient(handle);
+        const controller = buildLinkController({
+          provider,
+          messenger: handle.messenger,
+        });
+        jest
+          .spyOn(controller, 'fetchCardHomeData')
+          .mockResolvedValue(undefined);
+
+        const firstAttempt = controller.linkMoneyAccountCard({
+          moneyAccountAddress: MONEY_ACCOUNT_ADDRESS,
+          delegationAmountHuman: '2199023255551',
+        });
+        await waitFor(() => handle.addTransactionBatchCalls.length === 1);
+        handle.emitConfirmed();
+        await expect(firstAttempt).rejects.toThrow('post-approval failed');
+
+        const retry = controller.linkMoneyAccountCard({
+          moneyAccountAddress: MONEY_ACCOUNT_ADDRESS,
+          delegationAmountHuman: '2199023255551',
+        });
+        await waitFor(() => handle.addTransactionBatchCalls.length === 2);
+        handle.emitConfirmed();
+
+        await expect(retry).resolves.toBeUndefined();
+        expect(mockApproveFunding).toHaveBeenCalledTimes(2);
+        expect(mockReadErc20AllowanceAndBalance).toHaveBeenCalledTimes(1);
+      });
+
+      it('does not let a different card use another card retry marker', async () => {
+        mockSelectPrimaryMoneyAccount.mockReturnValue({
+          address: MONEY_ACCOUNT_ADDRESS,
+        });
+        const mockChallenge = jest.fn().mockResolvedValue({
+          delegationToken: 'jwt-card-bound',
+          nonce: 'nonce-card-bound',
+          expiresAt: '2099-01-01',
+        });
+        const mockApproveFunding = jest
+          .fn()
+          .mockRejectedValueOnce(new Error('post-approval failed'));
+        const provider = buildMockProvider({
+          fetchDelegationChallenge: mockChallenge,
+          approveFunding: mockApproveFunding,
+          generateCardDelegationSignatureMessage: mockGenerateSiwe,
+        });
+        provider.getCardHomeData
+          .mockResolvedValueOnce({
+            ...(cardHomeDataWithMonadUsdc as unknown as CardHomeData),
+            card: { ...mockCard, id: 'card-a' },
+            fundingAssets: [],
+          })
+          .mockResolvedValueOnce({
+            ...(cardHomeDataWithMonadUsdc as unknown as CardHomeData),
+            card: { ...mockCard, id: 'card-b' },
+            fundingAssets: [],
+          });
+        mockReadErc20AllowanceAndBalance
+          .mockResolvedValueOnce({
+            balance: '0',
+            allowance: '0',
+            spendableBalance: '0',
+          })
+          .mockResolvedValueOnce({
+            balance: '0',
+            allowance: '50',
+            spendableBalance: '0',
+          });
+
+        const handle = buildLinkMessenger();
+        extendMessengerWithNetworkClient(handle);
+        const controller = buildLinkController({
+          provider,
+          messenger: handle.messenger,
+        });
+
+        const cardAAttempt = controller.linkMoneyAccountCard({
+          moneyAccountAddress: MONEY_ACCOUNT_ADDRESS,
+          delegationAmountHuman: '2199023255551',
+        });
+        await waitFor(() => handle.addTransactionBatchCalls.length === 1);
+        handle.emitConfirmed();
+        await expect(cardAAttempt).rejects.toThrow('post-approval failed');
+
+        await expect(
+          controller.linkMoneyAccountCard({
+            moneyAccountAddress: MONEY_ACCOUNT_ADDRESS,
+            delegationAmountHuman: '2199023255551',
+          }),
+        ).rejects.toMatchObject({
+          code: CardProviderErrorCode.MoneyAccountLinkedToDifferentCard,
+        });
+        expect(handle.addTransactionBatchCalls).toHaveLength(1);
+        expect(mockApproveFunding).toHaveBeenCalledTimes(1);
+      });
+
+      it('proceeds when the Money Account is delegated to this card session (spending cap update)', async () => {
+        mockSelectPrimaryMoneyAccount.mockReturnValue({
+          address: MONEY_ACCOUNT_ADDRESS,
+        });
+        const mockChallenge = jest.fn().mockResolvedValue({
+          delegationToken: 'jwt-update',
+          nonce: 'nonce-update',
+          expiresAt: '2099-01-01',
+        });
+        const mockApproveFunding = jest.fn().mockResolvedValue(undefined);
+        const provider = buildMockProvider({
+          fetchDelegationChallenge: mockChallenge,
+          approveFunding: mockApproveFunding,
+          generateCardDelegationSignatureMessage: mockGenerateSiwe,
+        });
+        provider.getCardHomeData.mockResolvedValue({
+          ...(cardHomeDataWithMonadUsdc as unknown as CardHomeData),
+          fundingAssets: [vedaAssetForMoneyAccount],
+        });
+
+        const handle = buildLinkMessenger();
+        extendMessengerWithNetworkClient(handle);
+        const controller = buildLinkController({
+          provider,
+          messenger: handle.messenger,
+        });
+        jest
+          .spyOn(controller, 'fetchCardHomeData')
+          .mockResolvedValue(undefined);
+
+        const linkPromise = controller.linkMoneyAccountCard({
+          moneyAccountAddress: MONEY_ACCOUNT_ADDRESS,
+          delegationAmountHuman: '500',
+        });
+
+        await waitFor(() => handle.addTransactionBatchCalls.length > 0);
+        handle.emitConfirmed();
+
+        await expect(linkPromise).resolves.toBeUndefined();
+        expect(mockReadErc20AllowanceAndBalance).not.toHaveBeenCalled();
+        expect(mockApproveFunding).toHaveBeenCalledTimes(1);
+      });
+
+      it('never blocks unlink (amount "0") even when a conflict would be detected', async () => {
+        mockSelectPrimaryMoneyAccount.mockReturnValue({
+          address: MONEY_ACCOUNT_ADDRESS,
+        });
+        const mockChallenge = jest.fn().mockResolvedValue({
+          delegationToken: 'jwt-revoke',
+          nonce: 'nonce-revoke',
+          expiresAt: '2099-01-01',
+        });
+        const mockApproveFunding = jest.fn().mockResolvedValue(undefined);
+        const provider = buildMockProvider({
+          fetchDelegationChallenge: mockChallenge,
+          approveFunding: mockApproveFunding,
+          generateCardDelegationSignatureMessage: mockGenerateSiwe,
+        });
+        provider.getCardHomeData.mockResolvedValue({
+          ...(cardHomeDataWithMonadUsdc as unknown as CardHomeData),
+          fundingAssets: [],
+        });
+        mockReadErc20AllowanceAndBalance.mockResolvedValue({
+          balance: '0',
+          allowance: '50',
+          spendableBalance: '0',
+        });
+
+        const handle = buildLinkMessenger();
+        extendMessengerWithNetworkClient(handle);
+        const controller = buildLinkController({
+          provider,
+          messenger: handle.messenger,
+        });
+        jest
+          .spyOn(controller, 'fetchCardHomeData')
+          .mockResolvedValue(undefined);
+
+        const revokePromise = controller.linkMoneyAccountCard({
+          moneyAccountAddress: MONEY_ACCOUNT_ADDRESS,
+          delegationAmountHuman: '0',
+        });
+
+        await waitFor(() => handle.addTransactionBatchCalls.length > 0);
+        handle.emitConfirmed();
+
+        await expect(revokePromise).resolves.toBeUndefined();
+        // The guardrail is skipped entirely for revokes.
+        expect(provider.getCardHomeData).not.toHaveBeenCalled();
+        expect(mockReadErc20AllowanceAndBalance).not.toHaveBeenCalled();
+        expect(mockApproveFunding).toHaveBeenCalledWith(
+          expect.objectContaining({ amount: '0' }),
+          mockTokenSet,
+        );
+      });
+    });
+
     describe('sponsorship pre-flight', () => {
       it('throws CardProviderError without submitting when Monad sponsorship is disabled', async () => {
         const mockApproveFunding = jest.fn().mockResolvedValue(undefined);
@@ -3669,6 +4100,7 @@ describe('CardController — data pass-throughs', () => {
 
       const messenger = buildMessengerWithEvmAccount();
       const controller = new CardController({
+        cardService: buildMockCardService(),
         messenger,
         providers: { immersve, baanx },
         state: {
@@ -3742,6 +4174,7 @@ describe('CardController — Immersve onboarding pass-throughs', () => {
     baanx.validateTokens.mockReturnValue('valid');
     mockTokenStore.get.mockResolvedValue(mockTokenSet);
     const controller = new CardController({
+      cardService: buildMockCardService(),
       messenger: buildMessenger(),
       providers: { baanx, immersve },
       state: { activeProviderId: 'baanx' },
@@ -3806,4 +4239,80 @@ describe('CardController — Immersve onboarding pass-throughs', () => {
       controller.getSpendingPrerequisites('fs-1', {}),
     ).rejects.toBeInstanceOf(CardProviderError);
   });
+
+  describe('getSupportedRegions', () => {
+    const supportedRegionsResponse = {
+      provider: 'immersve' as const,
+      regions: [],
+    };
+
+    it('delegates to CardService with the given provider id', async () => {
+      const getSupportedRegions = jest
+        .fn()
+        .mockResolvedValue(supportedRegionsResponse);
+      const controller = buildController(
+        buildMockProvider(),
+        {},
+        buildMockCardService({ getSupportedRegions }),
+      );
+
+      const result = await controller.getSupportedRegions(
+        CardProviderIds.Immersve,
+      );
+
+      expect(getSupportedRegions).toHaveBeenCalledWith(
+        CardProviderIds.Immersve,
+      );
+      expect(result).toStrictEqual(supportedRegionsResponse);
+    });
+
+    it('maps 502 CardApiError to ServerError', async () => {
+      const getSupportedRegions = jest
+        .fn()
+        .mockRejectedValue(
+          new CardApiError(
+            502,
+            '/v1/providers/immersve/supported-regions',
+            'Upstream unavailable',
+          ),
+        );
+      const controller = buildController(
+        buildMockProvider(),
+        {},
+        buildMockCardService({ getSupportedRegions }),
+      );
+
+      await expect(
+        controller.getSupportedRegions(CardProviderIds.Immersve),
+      ).rejects.toMatchObject({
+        code: CardProviderErrorCode.ServerError,
+        statusCode: 502,
+        message: 'Supported regions are temporarily unavailable',
+      });
+    });
+
+    it('maps missing base URL CardApiError to Network', async () => {
+      const getSupportedRegions = jest
+        .fn()
+        .mockRejectedValue(
+          new CardApiError(
+            0,
+            '/v1/providers/immersve/supported-regions',
+            'Card API base URL is not configured',
+          ),
+        );
+      const controller = buildController(
+        buildMockProvider(),
+        {},
+        buildMockCardService({ getSupportedRegions }),
+      );
+
+      await expect(
+        controller.getSupportedRegions(CardProviderIds.Immersve),
+      ).rejects.toMatchObject({
+        code: CardProviderErrorCode.Network,
+        statusCode: 0,
+      });
+    });
+  });
 });
diff --git a/app/core/Engine/controllers/card-controller/CardController.ts b/app/core/Engine/controllers/card-controller/CardController.ts
index 75a0949f3796..18933b64bfff 100644
--- a/app/core/Engine/controllers/card-controller/CardController.ts
+++ b/app/core/Engine/controllers/card-controller/CardController.ts
@@ -1,4 +1,5 @@
 import { BaseController, type StateMetadata } from '@metamask/base-controller';
+import { ethers } from 'ethers';
 import { numberToHex, type Hex, type Json } from '@metamask/utils';
 import {
   TransactionType,
@@ -14,6 +15,7 @@ import {
   type CardUnauthenticatedReason,
   type CardControllerMessenger,
   type CardControllerState,
+  type FetchCardHomeDataOptions,
 } from './types';
 import type { CardLocation } from '../../../../components/UI/Card/types';
 import {
@@ -51,6 +53,8 @@ import {
   type FundingApprovalParams,
   type ICardProvider,
   isCardAuthTokenError,
+  CardProviderIds,
+  type CardProviderId,
 } from './provider-types';
 import { CardTokenStore } from './CardTokenStore';
 import { CardOnboardingStore } from './CardOnboardingStore';
@@ -62,11 +66,19 @@ import {
   awaitTransactionConfirmed,
   type AwaitTransactionConfirmedMessenger,
 } from './utils/awaitTransactionConfirmed';
-import { resolveMoneyAccountCardToken } from './utils/moneyAccountCardToken';
 import {
+  isMoneyAccountDelegatedForCard,
+  resolveMoneyAccountCardToken,
+} from './utils/moneyAccountCardToken';
+import {
+  getVedaTokenConfig,
   MONEY_ACCOUNT_DELEGATION_NETWORK,
   MONEY_ACCOUNT_DELEGATION_TOKEN_KEY,
 } from '../../../../components/UI/Card/util/vedaToken';
+import { cardNetworkInfos } from '../../../../components/UI/Card/constants';
+import { readErc20AllowanceAndBalance } from '../../../../components/UI/Card/util/onChainAllowance';
+import { toCardFundingToken } from '../../../../components/UI/Card/util/toCardTokenAllowance';
+import { selectPrimaryMoneyAccount } from '../../../../selectors/moneyAccountController';
 import { safeToChecksumAddress } from '../../../../util/address';
 import { toTokenMinimalUnit } from '../../../../util/number/bigint';
 import TransactionTypes from '../../../../core/TransactionTypes';
@@ -82,9 +94,20 @@ import {
   ImmersveProvider,
   type CardResumeInfo,
 } from './providers/ImmersveProvider';
+import { CardService } from './services/CardService';
+import { CardApiError } from './services/BaanxService';
+import type { CardApiSupportedRegionsResponse } from './services/card-supported-regions.types';
 
 const CARDHOLDER_BATCH_SIZE = 50;
 const CARDHOLDER_MAX_BATCHES = 3;
+const CARD_HOME_DATA_FRESH_MS = 1000 * 60;
+const PENDING_MONEY_ACCOUNT_CARD_REGISTRATION_KEY =
+  'pendingMoneyAccountCardRegistration';
+
+interface PendingMoneyAccountCardRegistration {
+  cardId: string;
+  moneyAccountAddress: string;
+}
 
 const metadata: StateMetadata<CardControllerState> = {
   selectedCountry: {
@@ -93,13 +116,6 @@ const metadata: StateMetadata<CardControllerState> = {
     includeInStateLogs: true,
     usedInUi: true,
   },
-  // Temporary: internal-testing override for Immersve cardProgramId.
-  selectedCardProgramId: {
-    persist: true,
-    includeInDebugSnapshot: true,
-    includeInStateLogs: true,
-    usedInUi: true,
-  },
   activeProviderId: {
     persist: true,
     includeInDebugSnapshot: true,
@@ -152,7 +168,6 @@ const metadata: StateMetadata<CardControllerState> = {
 
 export const defaultCardControllerState: CardControllerState = {
   selectedCountry: null,
-  selectedCardProgramId: null,
   activeProviderId: DEFAULT_CARD_PROVIDER_ID,
   isAuthenticated: false,
   lastUnauthenticatedReason: null,
@@ -176,7 +191,8 @@ export class CardController extends BaseController<
   CardControllerState,
   CardControllerMessenger
 > {
-  private readonly providers: Record<string, ICardProvider>;
+  private readonly providers: Partial<Record<CardProviderId, ICardProvider>>;
+  private readonly cardService: CardService;
   private currentSession: CardAuthSession | null = null;
   private refreshPromise: Promise<CardAuthTokens | null> | null = null;
   #cardholderCheckTimer: ReturnType<typeof setTimeout> | undefined;
@@ -184,15 +200,18 @@ export class CardController extends BaseController<
   private fetchGeneration = 0;
   private previousEvmAddress: string | null = null;
   private resetInProgress = false;
+  #lastFetchedAt = 0;
 
   constructor({
     messenger,
     state,
     providers,
+    cardService,
   }: {
     messenger: CardControllerMessenger;
     state?: Partial<CardControllerState>;
-    providers: Record<string, ICardProvider>;
+    providers: Partial<Record<CardProviderId, ICardProvider>>;
+    cardService: CardService;
   }) {
     super({
       name: CARD_CONTROLLER_NAME,
@@ -204,6 +223,12 @@ export class CardController extends BaseController<
       },
     });
     this.providers = providers;
+    this.cardService = cardService;
+    try {
+      this.previousEvmAddress = this.#getSelectedEvmAddress();
+    } catch {
+      this.previousEvmAddress = null;
+    }
     this.#subscribeToEvents();
   }
 
@@ -250,8 +275,11 @@ export class CardController extends BaseController<
     );
   }
 
-  #fetchCardHomeDataWithLogging(method: string): void {
-    this.fetchCardHomeData().catch((error) =>
+  #fetchCardHomeDataWithLogging(
+    method: string,
+    options: FetchCardHomeDataOptions = {},
+  ): void {
+    this.fetchCardHomeData(options).catch((error) =>
       Logger.error(error as Error, {
         tags: { feature: 'card' },
         context: {
@@ -262,17 +290,20 @@ export class CardController extends BaseController<
     );
   }
 
+  #invalidateAndClear(): void {
+    this.invalidateFetch();
+    this.update((s) => {
+      s.cardHomeData = null;
+      s.cardHomeDataStatus = 'idle';
+    });
+  }
+
   #handleAccountSwitch(): void {
     const currentAddress = this.#getSelectedEvmAddress();
 
     if (currentAddress !== this.previousEvmAddress) {
       this.previousEvmAddress = currentAddress;
-      this.invalidateFetch();
-      this.update((s) => {
-        s.cardHomeData = null;
-        s.cardHomeDataStatus = 'idle';
-      });
-      this.#fetchCardHomeDataWithLogging('#handleAccountSwitch');
+      this.#invalidateAndClear();
     }
   }
 
@@ -280,12 +311,7 @@ export class CardController extends BaseController<
     const currentAddress = this.#getSelectedEvmAddress();
     if (!currentAddress) return;
 
-    this.invalidateFetch();
-    this.update((s) => {
-      s.cardHomeData = null;
-      s.cardHomeDataStatus = 'idle';
-    });
-    this.#fetchCardHomeDataWithLogging('#handleCardFeatureFlagChange');
+    this.#invalidateAndClear();
   }
 
   #triggerCardholderCheck(): void {
@@ -366,29 +392,14 @@ export class CardController extends BaseController<
       if (providerId) {
         s.activeProviderId = providerId;
       }
-      if (providerChanged) {
-        s.cardHomeData = null;
-        s.cardHomeDataStatus = 'idle';
-      }
     });
 
     if (providerChanged) {
-      this.invalidateFetch();
+      this.#invalidateAndClear();
     }
   }
 
-  /**
-   * Temporary: persist the Immersve cardProgramId chosen on SignUp for
-   * internal multi-program testing. Overlayed onto the feature flag in
-   * card-controller/index.ts. Easy to remove.
-   */
-  setSelectedCardProgramId(id: string | null): void {
-    this.update((s) => {
-      s.selectedCardProgramId = id;
-    });
-  }
-
-  #resolveProviderForCountry(country: string): string {
+  #resolveProviderForCountry(country: string): CardProviderId {
     const featureState = this.messenger.call(
       'RemoteFeatureFlagController:getState',
     );
@@ -405,7 +416,7 @@ export class CardController extends BaseController<
         Object.fromEntries(
           immersveCountries.map((c) => [c, true] as [string, boolean]),
         ),
-        'immersve',
+        CardProviderIds.Immersve,
       );
       const provider = getProviderForCountry(country, map);
       if (provider) {
@@ -526,7 +537,17 @@ export class CardController extends BaseController<
    * request (same ??= pattern as refreshPromise). A generation counter
    * ensures stale responses (from a previous account or session) are dropped.
    */
-  async fetchCardHomeData(): Promise<void> {
+  async fetchCardHomeData(
+    options: FetchCardHomeDataOptions = {},
+  ): Promise<void> {
+    const { force = false } = options;
+    if (
+      !force &&
+      this.#lastFetchedAt > 0 &&
+      Date.now() - this.#lastFetchedAt < CARD_HOME_DATA_FRESH_MS
+    ) {
+      return;
+    }
     this.fetchCardHomeDataPromise ??= this.#doFetchCardHomeData(
       this.fetchGeneration,
     ).finally(() => {
@@ -537,7 +558,13 @@ export class CardController extends BaseController<
 
   async #doFetchCardHomeData(generation: number): Promise<void> {
     const address = this.#getSelectedEvmAddress();
-    if (!address) return;
+    if (!address) {
+      this.update((s) => {
+        s.cardHomeDataStatus = 'error';
+      });
+      this.#lastFetchedAt = Date.now();
+      return;
+    }
 
     this.update((s) => {
       s.cardHomeDataStatus = 'loading';
@@ -550,6 +577,7 @@ export class CardController extends BaseController<
             data as unknown as Record<string, Json>;
           s.cardHomeDataStatus = 'success';
         });
+        this.#lastFetchedAt = Date.now();
       }
     } catch (error) {
       if (generation === this.fetchGeneration) {
@@ -563,6 +591,7 @@ export class CardController extends BaseController<
         this.update((s) => {
           s.cardHomeDataStatus = 'error';
         });
+        this.#lastFetchedAt = Date.now();
       }
     }
   }
@@ -575,6 +604,7 @@ export class CardController extends BaseController<
   private invalidateFetch(): void {
     this.fetchGeneration++;
     this.fetchCardHomeDataPromise = null;
+    this.#lastFetchedAt = 0;
   }
 
   #getSelectedEvmAddress(): string | null {
@@ -616,7 +646,13 @@ export class CardController extends BaseController<
     }
 
     const provider = this.getActiveProvider();
-    const pid = this.state.activeProviderId as string;
+    const pid = this.state.activeProviderId;
+    if (!pid) {
+      throw new CardProviderError(
+        CardProviderErrorCode.Unknown,
+        'submitCredentials: no active provider',
+      );
+    }
     const result = await provider.submitCredentials(
       this.currentSession,
       credentials,
@@ -633,6 +669,7 @@ export class CardController extends BaseController<
 
     if (result.done && result.tokenSet) {
       const { tokenSet } = result;
+
       const stored = await CardTokenStore.set(pid, tokenSet);
       if (!stored) {
         Logger.error(new Error('Token store write failed after auth'), {
@@ -740,12 +777,13 @@ export class CardController extends BaseController<
    */
   async resetAll(): Promise<void> {
     try {
-      for (const pid of Object.keys(this.providers)) {
+      const providerIds = Object.keys(this.providers) as CardProviderId[];
+      for (const pid of providerIds) {
         try {
           const tokens = await CardTokenStore.get(pid);
           if (tokens) {
             try {
-              await this.providers[pid].logout(tokens);
+              await this.providers[pid]?.logout(tokens);
             } catch (error) {
               Logger.error(error as Error, {
                 tags: { feature: 'card', provider: pid },
@@ -793,12 +831,6 @@ export class CardController extends BaseController<
   }> {
     const tokens = await this.getValidTokens();
 
-    // Always fetch card home data regardless of auth state: authenticated users
-    // get full card data, unauthenticated users get on-chain asset state.
-    this.#fetchCardHomeDataWithLogging(
-      'validateAndRefreshSession/fetchCardHomeData',
-    );
-
     if (!tokens) return { isAuthenticated: false };
     return { isAuthenticated: true, location: tokens.location };
   }
@@ -1142,13 +1174,43 @@ export class CardController extends BaseController<
   }
 
   async getResumeCardInfo(): Promise<CardResumeInfo | null> {
-    const provider = this.providers.immersve;
+    const provider = this.providers[CardProviderIds.Immersve];
     if (!(provider instanceof ImmersveProvider)) {
       return null;
     }
     return this.#withAuthRetry((tokens) => provider.getResumeCardInfo(tokens));
   }
 
+  /**
+   * Fetches supported regions + legal documents via MetaMask Card API.
+   * Unauthenticated; usable during SignUp before provider SIWE/login.
+   */
+  async getSupportedRegions(
+    providerId: CardProviderId,
+  ): Promise<CardApiSupportedRegionsResponse> {
+    try {
+      return await this.cardService.getSupportedRegions(providerId);
+    } catch (error) {
+      if (error instanceof CardApiError && error.statusCode === 502) {
+        throw new CardProviderError(
+          CardProviderErrorCode.ServerError,
+          'Supported regions are temporarily unavailable',
+          502,
+        );
+      }
+      if (error instanceof CardApiError) {
+        throw new CardProviderError(
+          error.statusCode === 0
+            ? CardProviderErrorCode.Network
+            : CardProviderErrorCode.Unknown,
+          error.message,
+          error.statusCode,
+        );
+      }
+      throw error;
+    }
+  }
+
   async getSpendingPrerequisites(
     fundingSourceId: string,
     params: CardSpendingPrerequisitesParams,
@@ -1335,6 +1397,281 @@ export class CardController extends BaseController<
     return this.state.moneyAccountCardLinkInProgress;
   }
 
+  /**
+   * Cross-device guardrail: detects whether the primary Money Account is
+   * already linked to a DIFFERENT card account than the one the given tokens
+   * authenticate.
+   *
+   * The server-side registration (`GET /v1/wallet/external`) is scoped to the
+   * authenticated card user, so a link created on another device under a
+   * different card login is invisible to this session. The on-chain Monad
+   * allowance from the Money Account to the delegation contract, however, is
+   * globally observable. A non-zero allowance combined with the Money Account
+   * being absent from this session's funding wallets means the Money Account
+   * is delegated to another card account, unless this controller recorded
+   * that the same card confirmed the approval but failed to complete provider
+   * registration. That card-bound marker allows a safe retry without letting
+   * a different card bypass the guardrail.
+   *
+   * Fail-open by design: any error in the check (RPC unreachable, wallet
+   * fetch failure) resolves to `false` so a degraded network never blocks
+   * linking. Returns `false` immediately when there is no primary Money
+   * Account or the provider exposes no Monad delegation config (e.g.
+   * Immersve), since the guardrail is then irrelevant.
+   *
+   * Only the LINK flow enforces this check (product decision): logging in
+   * to a second card is allowed; creating a second link is not.
+   *
+   * @param tokens - Auth tokens for the card session being checked.
+   */
+  async #detectMoneyAccountCardConflict(
+    tokens: CardAuthTokens,
+  ): Promise<{ hasConflict: boolean; cardId?: string }> {
+    let stage = 'select_money_account';
+    try {
+      const moneyAccountAddress = selectPrimaryMoneyAccount(
+        ReduxService.store.getState() as RootState,
+      )?.address;
+      if (!moneyAccountAddress) {
+        Logger.log(
+          'CardController: Money Account card conflict check skipped — no primary Money Account',
+        );
+        return { hasConflict: false };
+      }
+
+      stage = 'fetch_card_home_data';
+      const provider = this.getActiveProvider();
+      const homeData = await provider.getCardHomeData(
+        moneyAccountAddress,
+        tokens,
+      );
+      const cardId = homeData.card?.id;
+
+      stage = 'resolve_veda_config';
+      const vedaConfig = getVedaTokenConfig(homeData.delegationSettings);
+      if (!vedaConfig?.delegationContract) {
+        Logger.log(
+          'CardController: Money Account card conflict check skipped — no Monad delegation config',
+          { hasDelegationSettings: Boolean(homeData.delegationSettings) },
+        );
+        return { hasConflict: false, cardId };
+      }
+
+      // Money Account registered on THIS card session — same card owns the
+      // link (re-login on the original card, or a spending-cap update).
+      const fundingTokens = homeData.fundingAssets.map((asset) =>
+        toCardFundingToken(asset),
+      );
+      if (
+        isMoneyAccountDelegatedForCard({
+          fundingTokens,
+          moneyAccountAddress,
+          vedaConfig,
+        })
+      ) {
+        Logger.log(
+          'CardController: Money Account card conflict check — delegated to this card session, no conflict',
+        );
+        return { hasConflict: false, cardId };
+      }
+
+      if (
+        cardId &&
+        this.#isPendingRegistrationForCurrentCard(cardId, moneyAccountAddress)
+      ) {
+        Logger.log(
+          'CardController: Money Account card conflict check — retrying pending registration for this card, no conflict',
+        );
+        return { hasConflict: false, cardId };
+      }
+
+      stage = 'read_on_chain_allowance';
+      const allowance = await this.#readMoneyAccountDelegationAllowance({
+        caipChainId: vedaConfig.caipChainId,
+        tokenAddress: vedaConfig.address,
+        owner: moneyAccountAddress,
+        spender: vedaConfig.delegationContract,
+        decimals: vedaConfig.decimals,
+      });
+      const allowanceFloat = parseFloat(allowance);
+      const hasConflict = Number.isFinite(allowanceFloat) && allowanceFloat > 0;
+      Logger.log(
+        'CardController: Money Account card conflict check — on-chain allowance read',
+        {
+          allowance,
+          hasConflict,
+          caipChainId: vedaConfig.caipChainId,
+          token: vedaConfig.address,
+          owner: moneyAccountAddress,
+          spender: vedaConfig.delegationContract,
+        },
+      );
+      return { hasConflict, cardId };
+    } catch (error) {
+      Logger.error(error as Error, {
+        tags: { feature: 'card' },
+        context: {
+          name: 'CardController',
+          data: { method: 'detectMoneyAccountCardConflict', stage },
+        },
+      });
+      return { hasConflict: false };
+    }
+  }
+
+  #isPendingRegistrationForCurrentCard(
+    cardId: string,
+    moneyAccountAddress: string,
+  ): boolean {
+    const providerId = this.state.activeProviderId;
+    if (!providerId) return false;
+
+    const pendingValue =
+      this.state.providerData[providerId]?.[
+        PENDING_MONEY_ACCOUNT_CARD_REGISTRATION_KEY
+      ];
+    if (
+      !pendingValue ||
+      typeof pendingValue !== 'object' ||
+      Array.isArray(pendingValue)
+    ) {
+      return false;
+    }
+    const pending =
+      pendingValue as unknown as PendingMoneyAccountCardRegistration;
+    return (
+      typeof pending.cardId === 'string' &&
+      typeof pending.moneyAccountAddress === 'string' &&
+      pending.cardId === cardId &&
+      pending.moneyAccountAddress.toLowerCase() ===
+        moneyAccountAddress.toLowerCase()
+    );
+  }
+
+  #setPendingRegistrationForCurrentCard(
+    cardId: string,
+    moneyAccountAddress: string,
+  ): void {
+    const providerId = this.state.activeProviderId;
+    if (!providerId) return;
+
+    const providerData = this.state.providerData[providerId] ?? {};
+    const nextProviderData: CardControllerState['providerData'] = {
+      ...this.state.providerData,
+      [providerId]: {
+        ...providerData,
+        [PENDING_MONEY_ACCOUNT_CARD_REGISTRATION_KEY]: {
+          cardId,
+          moneyAccountAddress,
+        },
+      },
+    };
+    this.update(() => ({
+      ...this.state,
+      providerData: nextProviderData,
+    }));
+  }
+
+  #clearPendingRegistrationForCurrentCard(): void {
+    const providerId = this.state.activeProviderId;
+    if (!providerId) return;
+
+    const providerData = this.state.providerData[providerId];
+    if (!providerData) return;
+
+    const {
+      [PENDING_MONEY_ACCOUNT_CARD_REGISTRATION_KEY]: _pendingRegistration,
+      ...remainingProviderData
+    } = providerData;
+    const nextProviderData: CardControllerState['providerData'] = {
+      ...this.state.providerData,
+      [providerId]: remainingProviderData,
+    };
+    this.update(() => ({
+      ...this.state,
+      providerData: nextProviderData,
+    }));
+  }
+
+  /**
+   * Reads the Money Account's ERC-20 allowance to the delegation contract.
+   *
+   * Tries the dedicated Monad RPC first (the pattern every other Card
+   * on-chain read uses — `StaticJsonRpcProvider` with `skipFetchSetup`,
+   * required in React Native), then falls back to the app's own network
+   * client. Throws only when every provider fails, so the caller's
+   * fail-open handling still applies.
+   */
+  async #readMoneyAccountDelegationAllowance(params: {
+    caipChainId: string;
+    tokenAddress: string;
+    owner: string;
+    spender: string;
+    decimals: number;
+  }): Promise<string> {
+    const { caipChainId, tokenAddress, owner, spender, decimals } = params;
+    const chainNumber = Number.parseInt(caipChainId.split(':')[1] ?? '', 10);
+
+    const providers: ethers.providers.Provider[] = [];
+    const rpcUrl = cardNetworkInfos[MONEY_ACCOUNT_DELEGATION_NETWORK]?.rpcUrl;
+    // An Infura URL without a project ID ends in `/v3/` — unusable.
+    if (rpcUrl && !rpcUrl.endsWith('/v3/') && Number.isFinite(chainNumber)) {
+      providers.push(
+        new ethers.providers.StaticJsonRpcProvider(
+          { url: rpcUrl, skipFetchSetup: true },
+          { name: MONEY_ACCOUNT_DELEGATION_NETWORK, chainId: chainNumber },
+        ),
+      );
+    }
+    try {
+      providers.push(this.#getEthersProviderForCaipChainId(caipChainId));
+    } catch {
+      // Monad not configured in NetworkController — static RPC remains.
+    }
+
+    let lastError: unknown;
+    for (const provider of providers) {
+      try {
+        const { allowance } = await readErc20AllowanceAndBalance(
+          provider,
+          tokenAddress,
+          owner,
+          spender,
+          decimals,
+        );
+        return allowance;
+      } catch (error) {
+        lastError = error;
+        Logger.log(
+          'CardController: delegation allowance read failed, trying next provider',
+          { message: (error as Error)?.message },
+        );
+      }
+    }
+    throw (
+      (lastError as Error) ??
+      new Error('No RPC provider available for the delegation allowance read')
+    );
+  }
+
+  #getEthersProviderForCaipChainId(
+    caipChainId: string,
+  ): ethers.providers.Web3Provider {
+    const chainNumber = parseInt(caipChainId.split(':')[1] ?? '143', 10);
+    const hexChainId = numberToHex(chainNumber) as Hex;
+    const networkClientId = this.messenger.call(
+      'NetworkController:findNetworkClientIdByChainId',
+      hexChainId,
+    );
+    const networkClient = this.messenger.call(
+      'NetworkController:getNetworkClientById',
+      networkClientId,
+    );
+    return new ethers.providers.Web3Provider(
+      networkClient.provider as unknown as ethers.providers.ExternalProvider,
+    );
+  }
+
   async #linkMoneyAccountCardUnsafe(params: {
     moneyAccountAddress: string;
     delegationAmountHuman: string;
@@ -1361,7 +1698,7 @@ export class CardController extends BaseController<
     }
 
     // Fail fast before any transaction work when there is no usable session.
-    await this.requireValidTokens();
+    const tokens = await this.requireValidTokens();
     const provider = this.getActiveProvider();
     if (
       !provider.fetchDelegationChallenge ||
@@ -1374,6 +1711,30 @@ export class CardController extends BaseController<
       );
     }
 
+    // Pre-flight: refuse to link when the Money Account is already delegated
+    // on-chain to a different card account (linked from another device under
+    // another card login). Never blocks unlink/revoke (amount "0") so users
+    // can always take an allowance down.
+    const delegationAmountFloat = parseFloat(delegationAmountHuman);
+    let currentCardId: string | undefined;
+    if (Number.isFinite(delegationAmountFloat) && delegationAmountFloat > 0) {
+      Logger.log(
+        'CardController: running Money Account card conflict check (link)',
+      );
+      const conflictResult = await this.#detectMoneyAccountCardConflict(tokens);
+      currentCardId = conflictResult.cardId;
+      Logger.log(
+        'CardController: Money Account card conflict check (link) result',
+        { hasConflict: conflictResult.hasConflict },
+      );
+      if (conflictResult.hasConflict) {
+        throw new CardProviderError(
+          CardProviderErrorCode.MoneyAccountLinkedToDifferentCard,
+          'Money Account is already linked to a different card account',
+        );
+      }
+    }
+
     const cardToken = await this.#resolveMoneyAccountCardTokenOrRefetch();
     if (!cardToken) {
       throw new CardProviderError(
@@ -1489,6 +1850,17 @@ export class CardController extends BaseController<
 
     const txHash = confirmedMeta.hash ?? '';
 
+    // The approval is now globally visible on-chain, but the provider has not
+    // registered it yet. Persist which card initiated it so a failed
+    // post-approval can be retried by this card without being mistaken for a
+    // cross-device conflict. A different card ID cannot use this exception.
+    if (currentCardId) {
+      this.#setPendingRegistrationForCurrentCard(
+        currentCardId,
+        moneyAccountAddress,
+      );
+    }
+
     await this.approveFunding({
       address: fromAddress,
       network: MONEY_ACCOUNT_DELEGATION_NETWORK,
@@ -1499,9 +1871,10 @@ export class CardController extends BaseController<
       sigMessage: signatureMessage,
       token: delegationToken,
     });
+    this.#clearPendingRegistrationForCurrentCard();
 
     try {
-      await this.fetchCardHomeData();
+      await this.fetchCardHomeData({ force: true });
     } catch (error) {
       Logger.error(
         error instanceof Error ? error : new Error(String(error)),
@@ -1518,7 +1891,7 @@ export class CardController extends BaseController<
     const existing = fromState();
     if (existing) return existing;
 
-    await this.fetchCardHomeData();
+    await this.fetchCardHomeData({ force: true });
     return fromState();
   }
 
diff --git a/app/core/Engine/controllers/card-controller/index.test.ts b/app/core/Engine/controllers/card-controller/index.test.ts
index 6b53a9d54207..6e5d3178349d 100644
--- a/app/core/Engine/controllers/card-controller/index.test.ts
+++ b/app/core/Engine/controllers/card-controller/index.test.ts
@@ -112,53 +112,25 @@ describe('cardControllerInit', () => {
     expect(constructorArgs.state).toStrictEqual(persistedState);
   });
 
-  describe('getCardFeatureFlag cardProgramId overlay', () => {
-    it('overlays selectedCardProgramId onto immersve.cardProgramId', () => {
-      getRemoteFeatureFlags.mockReturnValue({
-        remoteFeatureFlags: {
-          cardFeature: {
-            ...defaultCardFeatureFlag,
-            immersve: {
-              ...defaultCardFeatureFlag.immersve,
-              cardProgramId: 'default-program',
-            },
+  it('returns immersve.cardProgramId from the remote feature flag', () => {
+    getRemoteFeatureFlags.mockReturnValue({
+      remoteFeatureFlags: {
+        cardFeature: {
+          ...defaultCardFeatureFlag,
+          immersve: {
+            ...defaultCardFeatureFlag.immersve,
+            cardProgramId: 'default-program',
           },
         },
-      });
-
-      const { controller } = cardControllerInit(initRequestMock);
-
-      expect(immersveProviderClassMock).toHaveBeenCalled();
-      expect(capturedGetCardFeatureFlag).toBeDefined();
-      expect(capturedGetCardFeatureFlag?.()?.immersve?.cardProgramId).toBe(
-        'default-program',
-      );
-
-      controller.setSelectedCardProgramId('override-program');
-
-      expect(capturedGetCardFeatureFlag?.()?.immersve?.cardProgramId).toBe(
-        'override-program',
-      );
+      },
     });
 
-    it('does not overlay when selectedCardProgramId is null', () => {
-      getRemoteFeatureFlags.mockReturnValue({
-        remoteFeatureFlags: {
-          cardFeature: {
-            ...defaultCardFeatureFlag,
-            immersve: {
-              ...defaultCardFeatureFlag.immersve,
-              cardProgramId: 'default-program',
-            },
-          },
-        },
-      });
-
-      cardControllerInit(initRequestMock);
+    cardControllerInit(initRequestMock);
 
-      expect(capturedGetCardFeatureFlag?.()?.immersve?.cardProgramId).toBe(
-        'default-program',
-      );
-    });
+    expect(immersveProviderClassMock).toHaveBeenCalled();
+    expect(capturedGetCardFeatureFlag).toBeDefined();
+    expect(capturedGetCardFeatureFlag?.()?.immersve?.cardProgramId).toBe(
+      'default-program',
+    );
   });
 });
diff --git a/app/core/Engine/controllers/card-controller/index.ts b/app/core/Engine/controllers/card-controller/index.ts
index df5b6d117a79..6c9f19cb2028 100644
--- a/app/core/Engine/controllers/card-controller/index.ts
+++ b/app/core/Engine/controllers/card-controller/index.ts
@@ -7,6 +7,9 @@ import { resolveBaanxConfig } from './services/baanx-config';
 import { ImmersveService } from './services/ImmersveService';
 import { ImmersveProvider } from './providers/ImmersveProvider';
 import { resolveImmersveConfig } from './services/immersve-config';
+import { CardService } from './services/CardService';
+import { CardProviderIds } from './provider-types';
+import { getDefaultCardApiBaseUrlForMetaMaskEnv } from '../../../../components/UI/Card/util/mapCardApiUrl';
 import {
   resolveCardFeatureFlag,
   type CardFeatureFlag,
@@ -24,37 +27,12 @@ export const cardControllerInit: MessengerClientInitFunction<
 > = (request) => {
   const { controllerMessenger, persistedState } = request;
 
-  // Temporary: lets getCardFeatureFlag overlay selectedCardProgramId after
-  // the controller exists. Easy to remove with the multi-program test UI.
-  const controllerRef: { current?: CardController } = {};
-
-  const getCardFeatureFlag = (): CardFeatureFlag => {
-    const featureState = controllerMessenger.call(
-      'RemoteFeatureFlagController:getState',
-    );
-    const flag = resolveCardFeatureFlag(
-      featureState.remoteFeatureFlags?.cardFeature as
-        | CardFeatureFlag
-        | undefined,
+  const getCardFeatureFlag = (): CardFeatureFlag =>
+    resolveCardFeatureFlag(
+      controllerMessenger.call('RemoteFeatureFlagController:getState')
+        .remoteFeatureFlags?.cardFeature as CardFeatureFlag | undefined,
     );
 
-    // Temporary: overlay the SignUp-selected Immersve cardProgramId so the
-    // provider keeps reading from the feature flag as usual.
-    const selectedCardProgramId =
-      controllerRef.current?.state?.selectedCardProgramId;
-    if (selectedCardProgramId && flag.immersve) {
-      return {
-        ...flag,
-        immersve: {
-          ...flag.immersve,
-          cardProgramId: selectedCardProgramId,
-        },
-      };
-    }
-
-    return flag;
-  };
-
   const baanxConfig = resolveBaanxConfig();
   const baanxProvider = new BaanxProvider({
     service: new BaanxService(baanxConfig),
@@ -71,14 +49,22 @@ export const cardControllerInit: MessengerClientInitFunction<
     getCardFeatureFlag,
   });
 
+  const cardService = new CardService({
+    getBaseUrl: () =>
+      getDefaultCardApiBaseUrlForMetaMaskEnv(process.env.METAMASK_ENVIRONMENT),
+  });
+
   const controller = new CardController({
     messenger: controllerMessenger,
     state: {
       ...(persistedState.CardController ?? defaultCardControllerState),
     },
-    providers: { baanx: baanxProvider, immersve: immersveProvider },
+    providers: {
+      [CardProviderIds.Baanx]: baanxProvider,
+      [CardProviderIds.Immersve]: immersveProvider,
+    },
+    cardService,
   });
-  controllerRef.current = controller;
 
   return { controller };
 };
diff --git a/app/core/Engine/controllers/card-controller/provider-map.test.ts b/app/core/Engine/controllers/card-controller/provider-map.test.ts
index 2d993d5ab0d6..b04972721e4f 100644
--- a/app/core/Engine/controllers/card-controller/provider-map.test.ts
+++ b/app/core/Engine/controllers/card-controller/provider-map.test.ts
@@ -4,21 +4,26 @@ import {
   deriveCountryProviderMap,
   type CountryProviderMap,
 } from './provider-map';
+import { CardProviderIds } from './provider-types';
 
 const SAMPLE_MAP: CountryProviderMap = {
-  US: 'providerA',
-  GB: 'providerA',
-  DE: 'providerB',
+  US: CardProviderIds.Baanx,
+  GB: CardProviderIds.Baanx,
+  DE: CardProviderIds.Immersve,
 };
 
 describe('provider-map', () => {
   describe('getProviderForCountry', () => {
     it('returns the mapped provider for a known country', () => {
-      expect(getProviderForCountry('US', SAMPLE_MAP)).toBe('providerA');
+      expect(getProviderForCountry('US', SAMPLE_MAP)).toBe(
+        CardProviderIds.Baanx,
+      );
     });
 
     it('returns a different provider when mapped', () => {
-      expect(getProviderForCountry('DE', SAMPLE_MAP)).toBe('providerB');
+      expect(getProviderForCountry('DE', SAMPLE_MAP)).toBe(
+        CardProviderIds.Immersve,
+      );
     });
 
     it('returns null for an unmapped country', () => {
@@ -49,15 +54,18 @@ describe('provider-map', () => {
     it('maps enabled countries to the given provider', () => {
       const featureFlag = { US: true, GB: true, FR: false };
 
-      const map = deriveCountryProviderMap(featureFlag, 'providerA');
+      const map = deriveCountryProviderMap(featureFlag, CardProviderIds.Baanx);
 
-      expect(map).toStrictEqual({ US: 'providerA', GB: 'providerA' });
+      expect(map).toStrictEqual({
+        US: CardProviderIds.Baanx,
+        GB: CardProviderIds.Baanx,
+      });
     });
 
     it('excludes disabled countries', () => {
       const featureFlag = { US: true, JP: false };
 
-      const map = deriveCountryProviderMap(featureFlag, 'providerA');
+      const map = deriveCountryProviderMap(featureFlag, CardProviderIds.Baanx);
 
       expect(map.JP).toBeUndefined();
     });
@@ -65,17 +73,22 @@ describe('provider-map', () => {
     it('maps all enabled countries to the given provider', () => {
       const featureFlag = { US: true, GB: true, JP: true };
 
-      const map = deriveCountryProviderMap(featureFlag, 'providerX');
+      const map = deriveCountryProviderMap(
+        featureFlag,
+        CardProviderIds.Immersve,
+      );
 
       expect(map).toStrictEqual({
-        US: 'providerX',
-        GB: 'providerX',
-        JP: 'providerX',
+        US: CardProviderIds.Immersve,
+        GB: CardProviderIds.Immersve,
+        JP: CardProviderIds.Immersve,
       });
     });
 
     it('returns empty map when no countries are enabled', () => {
-      expect(deriveCountryProviderMap({}, 'providerA')).toStrictEqual({});
+      expect(deriveCountryProviderMap({}, CardProviderIds.Baanx)).toStrictEqual(
+        {},
+      );
     });
   });
 });
diff --git a/app/core/Engine/controllers/card-controller/provider-types.ts b/app/core/Engine/controllers/card-controller/provider-types.ts
index 74b629cf159e..5ea182f539ea 100644
--- a/app/core/Engine/controllers/card-controller/provider-types.ts
+++ b/app/core/Engine/controllers/card-controller/provider-types.ts
@@ -21,6 +21,7 @@ export enum CardProviderErrorCode {
   ServerError = 'server_error',
   Timeout = 'timeout',
   Network = 'network',
+  MoneyAccountLinkedToDifferentCard = 'money_account_linked_to_different_card',
   Unknown = 'unknown',
 }
 
@@ -59,7 +60,13 @@ export class CardLinkageInProgressError extends Error {
 
 // -- Provider Identity --
 
-export type CardProviderId = string;
+export const CardProviderIds = {
+  Baanx: 'baanx',
+  Immersve: 'immersve',
+} as const;
+
+export type CardProviderId =
+  (typeof CardProviderIds)[keyof typeof CardProviderIds];
 
 export type CardAuthMethod = 'email_password' | 'siwe';
 
@@ -169,6 +176,8 @@ export interface CardDetails {
   lastFour: string;
   holderName?: string;
   isFreezable?: boolean;
+  /** ISO region code from Immersve LIST/detail (e.g. "GB"). */
+  regionCode?: string;
 }
 
 export interface CardSecureViewParams {
diff --git a/app/core/Engine/controllers/card-controller/providers/BaanxProvider.test.ts b/app/core/Engine/controllers/card-controller/providers/BaanxProvider.test.ts
index 504c7db679cf..2b8767b40331 100644
--- a/app/core/Engine/controllers/card-controller/providers/BaanxProvider.test.ts
+++ b/app/core/Engine/controllers/card-controller/providers/BaanxProvider.test.ts
@@ -674,6 +674,21 @@ describe('BaanxProvider', () => {
       );
     });
 
+    it('rejects on a 429 from a sub-request instead of degrading to null card', async () => {
+      const get = jest.fn().mockImplementation((path: string) => {
+        if (path === '/v1/card/status') {
+          return Promise.reject(new CardApiError(429, path, ''));
+        }
+        return Promise.resolve(null);
+      });
+
+      await expect(
+        buildProvider(get).getCardHomeData('0xabc', tokens),
+      ).rejects.toMatchObject({
+        statusCode: 429,
+      });
+    });
+
     it('degrades to a partial payload when a sub-request fails transiently', async () => {
       const get = jest.fn().mockImplementation((path: string) => {
         if (path === '/v1/user') {
diff --git a/app/core/Engine/controllers/card-controller/providers/BaanxProvider.ts b/app/core/Engine/controllers/card-controller/providers/BaanxProvider.ts
index cbf0f0ec6647..c6c2ac70edcb 100644
--- a/app/core/Engine/controllers/card-controller/providers/BaanxProvider.ts
+++ b/app/core/Engine/controllers/card-controller/providers/BaanxProvider.ts
@@ -70,6 +70,7 @@ import {
   type DelegationChallengeResponse,
   emptyCardHomeData,
   isCardAuthTokenError,
+  CardProviderIds,
 } from '../provider-types';
 import AppConstants from '../../../../AppConstants';
 
@@ -204,6 +205,13 @@ function mapApiError(error: unknown, operation: string): CardProviderError {
         408,
       );
     }
+    if (error.statusCode === 429) {
+      return new CardProviderError(
+        CardProviderErrorCode.Unknown,
+        `Rate limited on ${operation}`,
+        429,
+      );
+    }
     if (error.statusCode === 0) {
       return new CardProviderError(
         CardProviderErrorCode.Network,
@@ -227,7 +235,7 @@ function mapAllowanceToFundingStatus(
 }
 
 export class BaanxProvider implements ICardProvider {
-  readonly id = 'baanx' as const;
+  readonly id = CardProviderIds.Baanx;
 
   readonly capabilities: CardProviderCapabilities = {
     authMethod: 'email_password',
@@ -415,6 +423,9 @@ export class BaanxProvider implements ICardProvider {
         if (isCardAuthTokenError(err)) {
           throw mapApiError(err, logContext);
         }
+        if (err instanceof CardApiError && err.statusCode === 429) {
+          throw mapApiError(err, logContext);
+        }
         Logger.error(err as Error, getErrorContext(logContext));
         return null;
       };
@@ -511,6 +522,14 @@ export class BaanxProvider implements ICardProvider {
       if (isCardAuthTokenError(error)) {
         throw error;
       }
+      if (
+        (error instanceof CardApiError || error instanceof CardProviderError) &&
+        error.statusCode === 429
+      ) {
+        throw error instanceof CardApiError
+          ? mapApiError(error, 'getCardHomeData')
+          : error;
+      }
       Logger.error(error as Error, getErrorContext('getCardHomeData'));
       return emptyCardHomeData();
     }
diff --git a/app/core/Engine/controllers/card-controller/providers/ImmersveProvider.test.ts b/app/core/Engine/controllers/card-controller/providers/ImmersveProvider.test.ts
index 55f89cd97bad..527fb8eae881 100644
--- a/app/core/Engine/controllers/card-controller/providers/ImmersveProvider.test.ts
+++ b/app/core/Engine/controllers/card-controller/providers/ImmersveProvider.test.ts
@@ -956,6 +956,7 @@ describe('ImmersveProvider', () => {
         lastFour: '1234',
         holderName: 'John Doe',
         isFreezable: true,
+        regionCode: undefined,
       });
       expect(data.primaryFundingAsset).toStrictEqual({
         symbol: 'USDC',
@@ -975,6 +976,36 @@ describe('ImmersveProvider', () => {
       ]);
     });
 
+    it('maps regionCode from Immersve card detail onto CardHomeData.card', async () => {
+      const { provider, service } = createProvider();
+      service.get.mockImplementation(
+        routeGet({
+          cards: { items: [{ ...activeCard, regionCode: 'GB' }] },
+          cardDetail: { ...activeCardDetail, regionCode: 'GB' },
+          fundingSource: fundingSourceDetail,
+        }),
+      );
+
+      const data = await provider.getCardHomeData('0xabc', TOKENS);
+
+      expect(data.card?.regionCode).toBe('GB');
+    });
+
+    it('falls back to LIST regionCode when card detail omits it', async () => {
+      const { provider, service } = createProvider();
+      service.get.mockImplementation(
+        routeGet({
+          cards: { items: [{ ...activeCard, regionCode: 'AU' }] },
+          cardDetail: activeCardDetail,
+          fundingSource: fundingSourceDetail,
+        }),
+      );
+
+      const data = await provider.getCardHomeData('0xabc', TOKENS);
+
+      expect(data.card?.regionCode).toBe('AU');
+    });
+
     it('swallows non-auth errors and returns empty data', async () => {
       const { provider, service } = createProvider();
       service.get.mockRejectedValue(
diff --git a/app/core/Engine/controllers/card-controller/providers/ImmersveProvider.ts b/app/core/Engine/controllers/card-controller/providers/ImmersveProvider.ts
index 912a862c8a2d..153b1dcd477a 100644
--- a/app/core/Engine/controllers/card-controller/providers/ImmersveProvider.ts
+++ b/app/core/Engine/controllers/card-controller/providers/ImmersveProvider.ts
@@ -31,6 +31,7 @@ import {
   CardProviderCapabilities,
   CardProviderError,
   CardProviderErrorCode,
+  CardProviderIds,
   CardSensitiveDetails,
   CardSpendingPrerequisitesParams,
   CardSpendingPrerequisitesResult,
@@ -215,6 +216,7 @@ interface ImmersveCardListItem {
   cardProgramId?: string;
   panLast4?: string;
   network?: string;
+  regionCode?: string;
 }
 
 interface ImmersveCardListResponse {
@@ -252,7 +254,7 @@ export interface CardResumeInfo {
 }
 
 export class ImmersveProvider implements ICardProvider {
-  readonly id = 'immersve' as const;
+  readonly id = CardProviderIds.Immersve;
 
   readonly capabilities: CardProviderCapabilities = {
     authMethod: 'siwe',
@@ -694,7 +696,11 @@ export class ImmersveProvider implements ICardProvider {
         `/api/cards/${card.id}`,
         tokens,
       );
-      const cardDetails = this.mapImmersveCard(detail);
+      const cardDetails = this.mapImmersveCard({
+        ...detail,
+        // LIST is the AC source for regionCode; detail may omit it.
+        regionCode: detail.regionCode ?? card.regionCode,
+      });
       const fundingAssets = await this.fetchFundingAssets(
         detail.fundingSourceIds ?? [],
         tokens,
@@ -737,7 +743,10 @@ export class ImmersveProvider implements ICardProvider {
         `/api/cards/${card.id}`,
         tokens,
       );
-      return this.mapImmersveCard(detail);
+      return this.mapImmersveCard({
+        ...detail,
+        regionCode: detail.regionCode ?? card.regionCode,
+      });
     } catch (error) {
       throw mapApiError(error, 'getCardDetails');
     }
@@ -792,6 +801,7 @@ export class ImmersveProvider implements ICardProvider {
       lastFour: detail.panLast4 ?? '',
       holderName: detail.cardholderName,
       isFreezable: status === CardStatus.ACTIVE || status === CardStatus.FROZEN,
+      regionCode: detail.regionCode,
     };
   }
 
diff --git a/app/core/Engine/controllers/card-controller/services/CardService.test.ts b/app/core/Engine/controllers/card-controller/services/CardService.test.ts
new file mode 100644
index 000000000000..49439d7bd9be
--- /dev/null
+++ b/app/core/Engine/controllers/card-controller/services/CardService.test.ts
@@ -0,0 +1,110 @@
+import { create, isAxiosError } from 'axios';
+import { CardService } from './CardService';
+import { CardProviderIds } from '../provider-types';
+
+jest.mock('axios');
+jest.mock('../../../../../util/Logger');
+
+const mockCreate = create as jest.Mock;
+const mockRequest = jest.fn();
+
+beforeEach(() => {
+  jest.clearAllMocks();
+  mockCreate.mockReturnValue({ request: mockRequest });
+  mockRequest.mockResolvedValue({ data: { result: 'ok' }, status: 200 });
+});
+
+const createService = ({
+  baseUrl = 'https://card.test-api.cx.metamask.io',
+}: {
+  baseUrl?: string;
+} = {}) =>
+  new CardService({
+    getBaseUrl: () => baseUrl,
+  });
+
+const supportedRegionsResponse = {
+  provider: 'immersve' as const,
+  regions: [
+    {
+      code: 'GB',
+      name: 'United Kingdom',
+      isAvailable: true,
+      unstructuredAddressAllowed: false,
+      documents: {
+        generalTermsOfUse: {
+          title: 'Terms',
+          url: 'https://example.com/terms',
+        },
+        privacyPolicy: {
+          title: 'Privacy',
+          url: 'https://example.com/privacy',
+        },
+        disclosures: [],
+        marketCompliance: [],
+      },
+    },
+  ],
+};
+
+describe('CardService', () => {
+  describe('getSupportedRegions', () => {
+    it('GETs supported-regions from Card API base URL without client key', async () => {
+      mockRequest.mockResolvedValue({
+        data: supportedRegionsResponse,
+        status: 200,
+      });
+      const service = createService();
+
+      const result = await service.getSupportedRegions(
+        CardProviderIds.Immersve,
+      );
+
+      expect(result).toStrictEqual(supportedRegionsResponse);
+      expect(mockRequest).toHaveBeenCalledWith(
+        expect.objectContaining({
+          baseURL: 'https://card.test-api.cx.metamask.io',
+          url: '/v1/providers/immersve/supported-regions',
+          method: 'GET',
+        }),
+      );
+      const call = mockRequest.mock.calls[0][0];
+      expect(call.headers?.['x-client-key']).toBeUndefined();
+      expect(call.headers?.Authorization).toBeUndefined();
+    });
+
+    it('throws CardApiError when Card API base URL is missing', async () => {
+      const service = createService({ baseUrl: '' });
+
+      await expect(
+        service.getSupportedRegions(CardProviderIds.Immersve),
+      ).rejects.toMatchObject({
+        statusCode: 0,
+        path: '/v1/providers/immersve/supported-regions',
+        responseBody: 'Card API base URL is not configured',
+      });
+      expect(mockRequest).not.toHaveBeenCalled();
+    });
+
+    it('throws CardApiError with 502 when Card API returns bad gateway', async () => {
+      const axiosError = new Error('Bad Gateway') as Error & {
+        isAxiosError: boolean;
+        response: { status: number; data: string };
+      };
+      axiosError.isAxiosError = true;
+      axiosError.response = { status: 502, data: 'Upstream unavailable' };
+
+      mockRequest.mockRejectedValue(axiosError);
+      (isAxiosError as unknown as jest.Mock).mockReturnValue(true);
+      const service = createService();
+
+      await expect(
+        service.getSupportedRegions(CardProviderIds.Immersve),
+      ).rejects.toMatchObject({
+        statusCode: 502,
+        path: '/v1/providers/immersve/supported-regions',
+        responseBody: 'Upstream unavailable',
+      });
+    });
+  });
+});
diff --git a/app/core/Engine/controllers/card-controller/services/CardService.ts b/app/core/Engine/controllers/card-controller/services/CardService.ts
new file mode 100644
index 000000000000..9799b0f4578a
--- /dev/null
+++ b/app/core/Engine/controllers/card-controller/services/CardService.ts
@@ -0,0 +1,86 @@
+import { create, isAxiosError, type AxiosInstance } from 'axios';
+import Logger from '../../../../../util/Logger';
+import type { CardProviderId } from '../provider-types';
+import { CardApiError } from './BaanxService';
+import type { CardApiSupportedRegionsResponse } from './card-supported-regions.types';
+
+const DEFAULT_TIMEOUT_MS = 15_000;
+
+/**
+ * HTTP client for the MetaMask Card API (provider-agnostic).
+ * Provider-specific Immersve/Baanx APIs live in their own services.
+ */
+export class CardService {
+  private readonly client: AxiosInstance;
+  private readonly getBaseUrl: () => string;
+
+  constructor({ getBaseUrl }: { getBaseUrl: () => string }) {
+    this.getBaseUrl = getBaseUrl;
+    this.client = create({
+      timeout: DEFAULT_TIMEOUT_MS,
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+      },
+    });
+  }
+
+  private supportedRegionsPath(providerId: CardProviderId): string {
+    return `/v1/providers/${encodeURIComponent(providerId)}/supported-regions`;
+  }
+
+  /**
+   * Fetches supported regions (incl. legal documents) for a card provider.
+   * Public endpoint — no client key or bearer required.
+   */
+  async getSupportedRegions(
+    providerId: CardProviderId,
+  ): Promise<CardApiSupportedRegionsResponse> {
+    const baseURL = this.getBaseUrl();
+    const path = this.supportedRegionsPath(providerId);
+
+    if (!baseURL) {
+      throw new CardApiError(0, path, 'Card API base URL is not configured');
+    }
+
+    if (__DEV__) {
+      Logger.log('[CardService]', 'request', path, {
+        method: 'GET',
+        baseURL,
+      });
+    }
+
+    try {
+      const response =
+        await this.client.request<CardApiSupportedRegionsResponse>({
+          baseURL,
+          url: path,
+          method: 'GET',
+          timeout: DEFAULT_TIMEOUT_MS,
+        });
+
+      if (__DEV__) {
+        Logger.log('[CardService]', 'response', path, {
+          status: response.status,
+          data: response.data,
+        });
+      }
+
+      return response.data;
+    } catch (error) {
+      if (isAxiosError(error)) {
+        const status =
+          error.response?.status ?? (error.code === 'ECONNABORTED' ? 408 : 0);
+        const rawData = error.response?.data;
+        const body =
+          typeof rawData === 'string'
+            ? rawData
+            : rawData != null
+              ? JSON.stringify(rawData)
+              : '';
+        throw new CardApiError(status, path, body);
+      }
+      throw error;
+    }
+  }
+}
diff --git a/app/core/Engine/controllers/card-controller/services/ImmersveService.test.ts b/app/core/Engine/controllers/card-controller/services/ImmersveService.test.ts
index 41c382b50865..ec8b9abd903b 100644
--- a/app/core/Engine/controllers/card-controller/services/ImmersveService.test.ts
+++ b/app/core/Engine/controllers/card-controller/services/ImmersveService.test.ts
@@ -14,8 +14,14 @@ beforeEach(() => {
   mockRequest.mockResolvedValue({ data: { result: 'ok' }, status: 200 });
 });
 
-const createService = (baseUrl = 'https://api.test.immersve.com') =>
-  new ImmersveService({ getBaseUrl: () => baseUrl });
+const createService = ({
+  baseUrl = 'https://api.test.immersve.com',
+}: {
+  baseUrl?: string;
+} = {}) =>
+  new ImmersveService({
+    getBaseUrl: () => baseUrl,
+  });
 
 const TOKEN_SET = {
   accessToken: 'access-token',
@@ -26,7 +32,7 @@ const TOKEN_SET = {
 describe('ImmersveService', () => {
   describe('constructor', () => {
     it('does not bake a baseURL into the axios instance', () => {
-      createService('https://a.example');
+      createService({ baseUrl: 'https://a.example' });
 
       expect(mockCreate).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -46,7 +52,9 @@ describe('ImmersveService', () => {
   describe('get', () => {
     it('resolves baseURL from the thunk on each request', async () => {
       let base = 'https://first.example';
-      const service = new ImmersveService({ getBaseUrl: () => base });
+      const service = new ImmersveService({
+        getBaseUrl: () => base,
+      });
 
       await service.get('/v1/test');
       expect(mockRequest).toHaveBeenLastCalledWith(
diff --git a/app/core/Engine/controllers/card-controller/services/ImmersveService.ts b/app/core/Engine/controllers/card-controller/services/ImmersveService.ts
index abd55e63aff0..419f32d4ed14 100644
--- a/app/core/Engine/controllers/card-controller/services/ImmersveService.ts
+++ b/app/core/Engine/controllers/card-controller/services/ImmersveService.ts
@@ -11,6 +11,7 @@ interface RequestOptions {
   tokenSet?: CardAuthTokens;
   timeout?: number;
   headers?: Record<string, string>;
+  baseURL?: string;
 }
 
 export class ImmersveService {
@@ -45,7 +46,7 @@ export class ImmersveService {
 
     try {
       const response = await this.client.request<T>({
-        baseURL: this.getBaseUrl(),
+        baseURL: opts.baseURL ?? this.getBaseUrl(),
         url: path,
         method: opts.method ?? 'GET',
         headers,
diff --git a/app/core/Engine/controllers/card-controller/services/card-supported-regions.types.ts b/app/core/Engine/controllers/card-controller/services/card-supported-regions.types.ts
new file mode 100644
index 000000000000..d1707a0aea2a
--- /dev/null
+++ b/app/core/Engine/controllers/card-controller/services/card-supported-regions.types.ts
@@ -0,0 +1,30 @@
+import type { CardProviderId } from '../provider-types';
+
+/**
+ * Card API DTO for GET /v1/providers/{providerId}/supported-regions.
+ * Mapped by va-mmcx-card-api — not raw provider OpenAPI.
+ */
+export interface CardApiLegalDocument {
+  title: string;
+  url: string;
+}
+
+export interface CardApiRegionDocuments {
+  generalTermsOfUse?: CardApiLegalDocument;
+  privacyPolicy?: CardApiLegalDocument;
+  disclosures: CardApiLegalDocument[];
+  marketCompliance: CardApiLegalDocument[];
+}
+
+export interface CardApiSupportedRegion {
+  code: string;
+  name: string;
+  isAvailable: boolean;
+  unstructuredAddressAllowed: boolean;
+  documents?: CardApiRegionDocuments;
+}
+
+export interface CardApiSupportedRegionsResponse {
+  provider: CardProviderId;
+  regions: CardApiSupportedRegion[];
+}
diff --git a/app/core/Engine/controllers/card-controller/types.ts b/app/core/Engine/controllers/card-controller/types.ts
index b30971e00f47..00cda2c605dd 100644
--- a/app/core/Engine/controllers/card-controller/types.ts
+++ b/app/core/Engine/controllers/card-controller/types.ts
@@ -17,7 +17,10 @@ import type {
   RemoteFeatureFlagControllerGetStateAction,
   RemoteFeatureFlagControllerStateChangeEvent,
 } from '@metamask/remote-feature-flag-controller';
-import type { NetworkControllerFindNetworkClientIdByChainIdAction } from '@metamask/network-controller';
+import type {
+  NetworkControllerFindNetworkClientIdByChainIdAction,
+  NetworkControllerGetNetworkClientByIdAction,
+} from '@metamask/network-controller';
 import type {
   TransactionControllerAddTransactionAction,
   TransactionControllerAddTransactionBatchAction,
@@ -25,27 +28,26 @@ import type {
   TransactionControllerTransactionConfirmedEvent,
   TransactionControllerTransactionFailedEvent,
 } from '@metamask/transaction-controller';
+import { CardProviderIds, type CardProviderId } from './provider-types';
 
 export const CARD_CONTROLLER_NAME = 'CardController';
 
 /** The provider ID used when no other provider has been selected. */
-export const DEFAULT_CARD_PROVIDER_ID = 'baanx';
+export const DEFAULT_CARD_PROVIDER_ID = CardProviderIds.Baanx;
 
 export type CardHomeDataStatus = 'idle' | 'loading' | 'error' | 'success';
 export type CardUnauthenticatedReason = 'onboarding_token_revoked';
 
+export interface FetchCardHomeDataOptions {
+  force?: boolean;
+}
+
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type CardControllerState = {
   /** ISO 3166-1 alpha-2 country code selected by the user. */
   selectedCountry: string | null;
-  /**
-   * Temporary internal-testing override for Immersve cardProgramId.
-   * Selected on SignUp when cardFeature.immersve.cardProgramIds has multiple options.
-   * Easy to remove once multi-program testing is no longer needed.
-   */
-  selectedCardProgramId: string | null;
   /** Active provider ID, derived from selectedCountry. */
-  activeProviderId: string | null;
+  activeProviderId: CardProviderId | null;
   /** Whether the user is authenticated with the active provider. */
   isAuthenticated: boolean;
   /** Last reason the active provider session became unauthenticated. */
@@ -56,7 +58,7 @@ export type CardControllerState = {
    * Per-provider persistent data keyed by provider ID.
    * Values are JSON-serializable objects (e.g. `{ location: 'us' }`).
    */
-  providerData: Record<string, Record<string, Json>>;
+  providerData: Partial<Record<CardProviderId, Record<string, Json>>>;
   /**
    * Cached card home data fetched from the active provider.
    * Not persisted to disk — re-fetched after each session validation.
@@ -86,6 +88,7 @@ type CardControllerAllowedActions =
   | RemoteFeatureFlagControllerGetStateAction
   | KeyringControllerSignPersonalMessageAction
   | NetworkControllerFindNetworkClientIdByChainIdAction
+  | NetworkControllerGetNetworkClientByIdAction
   | TransactionControllerAddTransactionAction
   | TransactionControllerAddTransactionBatchAction
   | TransactionControllerGetStateAction;
diff --git a/app/core/Engine/controllers/defi-positions-controller-v2/defi-positions-controller-v2-init.test.ts b/app/core/Engine/controllers/defi-positions-controller-v2/defi-positions-controller-v2-init.test.ts
new file mode 100644
index 000000000000..0e5f9536a04e
--- /dev/null
+++ b/app/core/Engine/controllers/defi-positions-controller-v2/defi-positions-controller-v2-init.test.ts
@@ -0,0 +1,160 @@
+import { MessengerClientInitRequest } from '../../types';
+import { buildMessengerClientInitRequestMock } from '../../utils/test-utils';
+import { ExtendedMessenger } from '../../../ExtendedMessenger';
+import {
+  DeFiPositionsControllerV2InitMessenger,
+  getDeFiPositionsControllerV2Messenger,
+} from '../../messengers/defi-positions-controller-v2-messenger/defi-positions-controller-v2-messenger';
+import {
+  DeFiPositionsControllerV2,
+  DeFiPositionsControllerV2Messenger,
+} from '@metamask/assets-controllers';
+import { defiPositionsControllerV2Init } from './defi-positions-controller-v2-init';
+import { MOCK_ANY_NAMESPACE, MockAnyNamespace } from '@metamask/messenger';
+import { store } from '../../../../store';
+import { selectBasicFunctionalityEnabled } from '../../../../selectors/settings';
+import { selectCompletedOnboarding } from '../../../../selectors/onboarding';
+import { selectDefiControllerV2Enabled } from '../../../../selectors/featureFlagController/defiControllerV2';
+
+jest.mock('@metamask/assets-controllers');
+jest.mock('@metamask/core-backend', () => ({
+  createApiPlatformClient: jest.fn().mockReturnValue({
+    accounts: {
+      fetchV6MultiAccountBalances: jest.fn(),
+    },
+  }),
+}));
+jest.mock('react-native-device-info', () => ({
+  getVersion: jest.fn().mockReturnValue('1.0.0'),
+}));
+jest.mock('../../../../store', () => ({
+  store: {
+    getState: jest.fn(),
+  },
+}));
+jest.mock('../../../../selectors/settings', () => ({
+  selectBasicFunctionalityEnabled: jest.fn(),
+}));
+jest.mock('../../../../selectors/onboarding', () => ({
+  selectCompletedOnboarding: jest.fn(),
+}));
+jest.mock(
+  '../../../../selectors/featureFlagController/defiControllerV2',
+  () => ({
+    selectDefiControllerV2Enabled: jest.fn(),
+  }),
+);
+
+function getInitRequestMock(
+  baseMessenger = new ExtendedMessenger<MockAnyNamespace>({
+    namespace: MOCK_ANY_NAMESPACE,
+  }),
+): jest.Mocked<
+  MessengerClientInitRequest<
+    DeFiPositionsControllerV2Messenger,
+    DeFiPositionsControllerV2InitMessenger
+  >
+> {
+  const mockInitMessenger = {
+    call: jest.fn().mockReturnValue({ selectedCurrency: 'usd' }),
+  } as unknown as DeFiPositionsControllerV2InitMessenger;
+
+  const requestMock = {
+    ...buildMessengerClientInitRequestMock(baseMessenger),
+    controllerMessenger: getDeFiPositionsControllerV2Messenger(baseMessenger),
+    initMessenger: mockInitMessenger,
+  };
+
+  return requestMock;
+}
+
+describe('DeFiPositionsControllerV2Init', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (store.getState as jest.Mock).mockReturnValue({});
+    (selectBasicFunctionalityEnabled as unknown as jest.Mock).mockReturnValue(
+      true,
+    );
+    (selectCompletedOnboarding as unknown as jest.Mock).mockReturnValue(true);
+    (selectDefiControllerV2Enabled as unknown as jest.Mock).mockReturnValue(
+      true,
+    );
+  });
+
+  it('returns controller instance with expected constructor args', () => {
+    const { controller } = defiPositionsControllerV2Init(getInitRequestMock());
+    expect(controller).toBeInstanceOf(DeFiPositionsControllerV2);
+
+    const controllerMock = jest.mocked(DeFiPositionsControllerV2);
+    expect(controllerMock).toHaveBeenCalledWith({
+      messenger: expect.any(Object),
+      apiClient: expect.any(Object),
+      isEnabled: expect.any(Function),
+      getVsCurrency: expect.any(Function),
+    });
+  });
+
+  describe('isEnabled', () => {
+    it.each([
+      {
+        basicFunctionality: true,
+        completedOnboarding: true,
+        flag: true,
+        expected: true,
+      },
+      {
+        basicFunctionality: false,
+        completedOnboarding: true,
+        flag: true,
+        expected: false,
+      },
+      {
+        basicFunctionality: true,
+        completedOnboarding: false,
+        flag: true,
+        expected: false,
+      },
+      {
+        basicFunctionality: true,
+        completedOnboarding: true,
+        flag: false,
+        expected: false,
+      },
+    ])(
+      'returns $expected when basicFunctionality=$basicFunctionality, completedOnboarding=$completedOnboarding, flag=$flag',
+      ({ basicFunctionality, completedOnboarding, flag, expected }) => {
+        (
+          selectBasicFunctionalityEnabled as unknown as jest.Mock
+        ).mockReturnValue(basicFunctionality);
+        (selectCompletedOnboarding as unknown as jest.Mock).mockReturnValue(
+          completedOnboarding,
+        );
+        (selectDefiControllerV2Enabled as unknown as jest.Mock).mockReturnValue(
+          flag,
+        );
+
+        defiPositionsControllerV2Init(getInitRequestMock());
+
+        const controllerMock = jest.mocked(DeFiPositionsControllerV2);
+        const isEnabled = controllerMock.mock.calls[0][0].isEnabled;
+
+        expect(isEnabled()).toBe(expected);
+      },
+    );
+  });
+
+  describe('getVsCurrency', () => {
+    it('returns selectedCurrency from AssetsController', () => {
+      const requestMock = getInitRequestMock();
+      defiPositionsControllerV2Init(requestMock);
+
+      const controllerMock = jest.mocked(DeFiPositionsControllerV2);
+      const getVsCurrency = controllerMock.mock.calls[0][0].getVsCurrency;
+
+      expect(getVsCurrency()).toBe('usd');
+      expect(requestMock.initMessenger.call).toHaveBeenCalledWith(
+        'AssetsController:getState',
+      );
+    });
+  });
+});
diff --git a/app/core/Engine/controllers/defi-positions-controller-v2/defi-positions-controller-v2-init.ts b/app/core/Engine/controllers/defi-positions-controller-v2/defi-positions-controller-v2-init.ts
new file mode 100644
index 000000000000..ffc6b0faf4a9
--- /dev/null
+++ b/app/core/Engine/controllers/defi-positions-controller-v2/defi-positions-controller-v2-init.ts
@@ -0,0 +1,82 @@
+import {
+  DeFiPositionsControllerV2,
+  DeFiPositionsControllerV2Messenger,
+} from '@metamask/assets-controllers';
+import {
+  createApiPlatformClient,
+  type ApiPlatformClient,
+} from '@metamask/core-backend';
+import { getVersion } from 'react-native-device-info';
+import type { MessengerClientInitFunction } from '../../types';
+import { DeFiPositionsControllerV2InitMessenger } from '../../messengers/defi-positions-controller-v2-messenger/defi-positions-controller-v2-messenger';
+import { store } from '../../../../store';
+import { selectBasicFunctionalityEnabled } from '../../../../selectors/settings';
+import { selectCompletedOnboarding } from '../../../../selectors/onboarding';
+import { selectDefiControllerV2Enabled } from '../../../../selectors/featureFlagController/defiControllerV2';
+
+/**
+ * Cached API client instance shared across init calls (matches AssetsController).
+ */
+let apiClient: ApiPlatformClient | null = null;
+
+/**
+ * Safely retrieves the bearer token for API authentication.
+ *
+ * @param initMessenger - The initialization messenger.
+ * @returns The bearer token or undefined if retrieval fails.
+ */
+async function safeGetBearerToken(
+  initMessenger: DeFiPositionsControllerV2InitMessenger,
+): Promise<string | undefined> {
+  try {
+    return await initMessenger.call('AuthenticationController:getBearerToken');
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * Gets or creates the API platform client used to fetch DeFi positions.
+ *
+ * @param initMessenger - The initialization messenger.
+ * @returns The API platform client.
+ */
+function getApiClient(
+  initMessenger: DeFiPositionsControllerV2InitMessenger,
+): ApiPlatformClient {
+  if (!apiClient) {
+    apiClient = createApiPlatformClient({
+      clientProduct: 'metamask-mobile',
+      clientVersion: getVersion(),
+      getBearerToken: () => safeGetBearerToken(initMessenger),
+    });
+  }
+  return apiClient;
+}
+
+/**
+ * Initialize the DeFiPositionsControllerV2.
+ *
+ * @param request - The request object.
+ * @returns The DeFiPositionsControllerV2.
+ */
+export const defiPositionsControllerV2Init: MessengerClientInitFunction<
+  DeFiPositionsControllerV2,
+  DeFiPositionsControllerV2Messenger,
+  DeFiPositionsControllerV2InitMessenger
+> = (request) => {
+  const { initMessenger, controllerMessenger } = request;
+
+  const controller = new DeFiPositionsControllerV2({
+    messenger: controllerMessenger,
+    apiClient: getApiClient(initMessenger),
+    isEnabled: () =>
+      selectBasicFunctionalityEnabled(store.getState()) &&
+      selectCompletedOnboarding(store.getState()) &&
+      selectDefiControllerV2Enabled(store.getState()),
+    getVsCurrency: () =>
+      initMessenger.call('AssetsController:getState').selectedCurrency,
+  });
+
+  return { controller };
+};
diff --git a/app/core/Engine/controllers/defi-positions-controller/defi-positions-controller-init.test.ts b/app/core/Engine/controllers/defi-positions-controller/defi-positions-controller-init.test.ts
index 1bd5f4611dfa..5e7b1fcd2cb6 100644
--- a/app/core/Engine/controllers/defi-positions-controller/defi-positions-controller-init.test.ts
+++ b/app/core/Engine/controllers/defi-positions-controller/defi-positions-controller-init.test.ts
@@ -12,15 +12,27 @@ import {
 import { defiPositionsControllerInit } from './defi-positions-controller-init';
 import { AnalyticsEventBuilder } from '../../../../util/analytics/AnalyticsEventBuilder';
 import { MOCK_ANY_NAMESPACE, MockAnyNamespace } from '@metamask/messenger';
+import { store } from '../../../../store';
+import { selectBasicFunctionalityEnabled } from '../../../../selectors/settings';
+import { selectDefiControllerV2Enabled } from '../../../../selectors/featureFlagController/defiControllerV2';
 
 jest.mock('@metamask/assets-controllers');
 jest.mock('../../../../util/analytics/AnalyticsEventBuilder');
 
-jest.mock('.../../../../store', () => ({
+jest.mock('../../../../store', () => ({
   store: {
     getState: jest.fn(),
   },
 }));
+jest.mock('../../../../selectors/settings', () => ({
+  selectBasicFunctionalityEnabled: jest.fn(),
+}));
+jest.mock(
+  '../../../../selectors/featureFlagController/defiControllerV2',
+  () => ({
+    selectDefiControllerV2Enabled: jest.fn(),
+  }),
+);
 
 function getInitRequestMock(
   baseMessenger = new ExtendedMessenger<MockAnyNamespace>({
@@ -48,6 +60,13 @@ function getInitRequestMock(
 describe('DeFiPositionsControllerInit', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    (store.getState as jest.Mock).mockReturnValue({});
+    (selectBasicFunctionalityEnabled as unknown as jest.Mock).mockReturnValue(
+      true,
+    );
+    (selectDefiControllerV2Enabled as unknown as jest.Mock).mockReturnValue(
+      false,
+    );
     (AnalyticsEventBuilder.createEventBuilder as jest.Mock).mockReturnValue({
       addProperties: jest.fn().mockReturnThis(),
       build: jest.fn().mockReturnValue({
@@ -73,6 +92,48 @@ describe('DeFiPositionsControllerInit', () => {
     });
   });
 
+  describe('isEnabled', () => {
+    it.each([
+      {
+        basicFunctionality: true,
+        v2Enabled: false,
+        expected: true,
+      },
+      {
+        basicFunctionality: true,
+        v2Enabled: true,
+        expected: false,
+      },
+      {
+        basicFunctionality: false,
+        v2Enabled: false,
+        expected: false,
+      },
+      {
+        basicFunctionality: false,
+        v2Enabled: true,
+        expected: false,
+      },
+    ])(
+      'returns $expected when basicFunctionality=$basicFunctionality, v2Enabled=$v2Enabled',
+      ({ basicFunctionality, v2Enabled, expected }) => {
+        (
+          selectBasicFunctionalityEnabled as unknown as jest.Mock
+        ).mockReturnValue(basicFunctionality);
+        (selectDefiControllerV2Enabled as unknown as jest.Mock).mockReturnValue(
+          v2Enabled,
+        );
+
+        defiPositionsControllerInit(getInitRequestMock());
+
+        const controllerMock = jest.mocked(DeFiPositionsController);
+        const isEnabled = controllerMock.mock.calls[0][0].isEnabled;
+
+        expect(isEnabled?.()).toBe(expected);
+      },
+    );
+  });
+
   describe('trackEvent', () => {
     it('calls AnalyticsController:trackEvent via initMessenger', () => {
       const requestMock = getInitRequestMock();
diff --git a/app/core/Engine/controllers/defi-positions-controller/defi-positions-controller-init.ts b/app/core/Engine/controllers/defi-positions-controller/defi-positions-controller-init.ts
index 7c3cf873f4a6..6ba3b9202ffe 100644
--- a/app/core/Engine/controllers/defi-positions-controller/defi-positions-controller-init.ts
+++ b/app/core/Engine/controllers/defi-positions-controller/defi-positions-controller-init.ts
@@ -6,6 +6,7 @@ import type { MessengerClientInitFunction } from '../../types';
 import { DeFiPositionsControllerInitMessenger } from '../../messengers/defi-positions-controller-messenger/defi-positions-controller-messenger';
 import { store } from '../../../../store';
 import { selectBasicFunctionalityEnabled } from '../../../../selectors/settings';
+import { selectDefiControllerV2Enabled } from '../../../../selectors/featureFlagController/defiControllerV2';
 import { AnalyticsEventBuilder } from '../../../../util/analytics/AnalyticsEventBuilder';
 import type { AnalyticsTrackingEvent as PackageAnalyticsTrackingEvent } from '@metamask/analytics-controller';
 import {
@@ -14,7 +15,10 @@ import {
 } from '../../../../constants/featureFlags';
 
 /**
- * Initialize the DeFiPositionsController.
+ * Initialize the DeFiPositionsController (V1).
+ *
+ * Enabled only when V2 is off: the two controllers are mutually exclusive via
+ * {@link selectDefiControllerV2Enabled}.
  *
  * @param request - The request object.
  * @returns The DeFiPositionsController.
@@ -41,7 +45,13 @@ export const defiPositionsControllerInit: MessengerClientInitFunction<
           ],
       );
 
-      return isBasicFunctionalityToggleEnabled && assetsDefiPositionsEnabled;
+      const isV2Enabled = selectDefiControllerV2Enabled(store.getState());
+
+      return (
+        isBasicFunctionalityToggleEnabled &&
+        assetsDefiPositionsEnabled &&
+        !isV2Enabled
+      );
     },
     trackEvent: (params: {
       event: string;
diff --git a/app/core/Engine/controllers/network-controller/utils.test.ts b/app/core/Engine/controllers/network-controller/utils.test.ts
index d23dff900837..3c98272f68cd 100644
--- a/app/core/Engine/controllers/network-controller/utils.test.ts
+++ b/app/core/Engine/controllers/network-controller/utils.test.ts
@@ -424,6 +424,8 @@ function setQuicknodeEnvironmentVariables() {
   process.env.QUICKNODE_ARC_URL = 'https://example.quicknode.com/arc';
   process.env.QUICKNODE_ROBINHOOD_URL =
     'https://example.quicknode.com/robinhood';
+  process.env.QUICKNODE_ZKSYNC_URL = 'https://example.quicknode.com/zksync';
+  process.env.QUICKNODE_MEGAETH_URL = 'https://example.quicknode.com/megaeth';
 }
 
 /**
diff --git a/app/core/Engine/controllers/notifications/push-utils.test.ts b/app/core/Engine/controllers/notifications/push-utils.test.ts
index 0fc4158a1172..8a1ac03ffb76 100644
--- a/app/core/Engine/controllers/notifications/push-utils.test.ts
+++ b/app/core/Engine/controllers/notifications/push-utils.test.ts
@@ -1,3 +1,4 @@
+import { AppState, type AppStateStatus } from 'react-native';
 import { type FirebaseMessagingTypes } from '@react-native-firebase/messaging';
 import FCMService from '../../../../util/notifications/services/FCMService';
 import NotificationsService from '../../../../util/notifications/services/NotificationService';
@@ -43,35 +44,53 @@ const createRemoteMessage = (
     data: overrides.data,
   }) as FirebaseMessagingTypes.RemoteMessage;
 
+const setAppState = (state: AppStateStatus) => {
+  Object.defineProperty(AppState, 'currentState', {
+    value: state,
+    writable: true,
+    configurable: true,
+  });
+};
+
 describe('shouldDisplayForegroundPushNotification', () => {
-  it('returns false for wallet_activity notifications', () => {
-    const data = { notification_type: WALLET_ACTIVITY_NOTIFICATION_TYPE };
+  afterEach(() => {
+    setAppState('active');
+  });
 
-    const result = shouldDisplayForegroundPushNotification(data);
+  it('returns false for wallet_activity when the app is in the foreground', () => {
+    setAppState('active');
+    const data = { notification_type: WALLET_ACTIVITY_NOTIFICATION_TYPE };
 
-    expect(result).toBe(false);
+    expect(shouldDisplayForegroundPushNotification(data)).toBe(false);
   });
 
-  it('returns true for non-wallet_activity notification types', () => {
-    const data = { notification_type: 'perps' };
+  it.each(['background', 'inactive'] as const)(
+    'returns true for wallet_activity when the app is %s',
+    (state) => {
+      setAppState(state);
+      const data = { notification_type: WALLET_ACTIVITY_NOTIFICATION_TYPE };
 
-    const result = shouldDisplayForegroundPushNotification(data);
+      expect(shouldDisplayForegroundPushNotification(data)).toBe(true);
+    },
+  );
+
+  it('returns true for non-wallet_activity types in the foreground', () => {
+    setAppState('active');
+    const data = { notification_type: 'perps' };
 
-    expect(result).toBe(true);
+    expect(shouldDisplayForegroundPushNotification(data)).toBe(true);
   });
 
   it('returns true when notification_type is missing', () => {
-    const data = { notification_id: 'abc' };
-
-    const result = shouldDisplayForegroundPushNotification(data);
-
-    expect(result).toBe(true);
+    setAppState('active');
+    expect(
+      shouldDisplayForegroundPushNotification({ notification_id: 'a' }),
+    ).toBe(true);
   });
 
   it('returns true when data is undefined', () => {
-    const result = shouldDisplayForegroundPushNotification(undefined);
-
-    expect(result).toBe(true);
+    setAppState('active');
+    expect(shouldDisplayForegroundPushNotification(undefined)).toBe(true);
   });
 });
 
@@ -83,6 +102,7 @@ describe('createSubscribeToPushNotifications', () => {
     jest.clearAllMocks();
     mockListen.mockResolvedValue(jest.fn());
     mockDisplay.mockResolvedValue(undefined);
+    setAppState('active');
   });
 
   const getForegroundHandler = async () => {
diff --git a/app/core/Engine/controllers/notifications/push-utils.ts b/app/core/Engine/controllers/notifications/push-utils.ts
index 013bf953107d..2923cfefae91 100644
--- a/app/core/Engine/controllers/notifications/push-utils.ts
+++ b/app/core/Engine/controllers/notifications/push-utils.ts
@@ -1,3 +1,4 @@
+import { AppState } from 'react-native';
 import FCMService from '../../../../util/notifications/services/FCMService';
 import NotificationsService from '../../../../util/notifications/services/NotificationService';
 import { PressActionId } from '../../../../util/notifications';
@@ -8,18 +9,25 @@ export const deleteRegToken = FCMService.deleteRegToken;
 
 /**
  * FCM `notification_type` for on-chain wallet activity (send/receive/etc).
- * Suppressed in the foreground so transaction toasts remain the primary
- * in-app surface; background/closed push still delivers via the OS.
+ * Kept in sync with the iOS foreground-suppression key in
+ * `ios/MetaMask/AppDelegate.swift` (`willPresent`).
  */
 export const WALLET_ACTIVITY_NOTIFICATION_TYPE = 'wallet_activity';
 
 /**
  * Whether a foreground FCM payload should show a system banner.
- * Background/killed delivery never reaches this path.
+ * `wallet_activity` is suppressed because in-app transaction toasts already
+ * surface it. Only suppresses when the app is actually in the foreground —
+ * background/killed delivery is handled natively by the OS (Android
+ * auto-displays the `notification` payload; iOS delivers via APNs) and must
+ * not be filtered here.
  */
 export function shouldDisplayForegroundPushNotification(
   data: Record<string, string> | undefined,
 ): boolean {
+  if (AppState.currentState !== 'active') {
+    return true;
+  }
   return data?.notification_type !== WALLET_ACTIVITY_NOTIFICATION_TYPE;
 }
 
diff --git a/app/core/Engine/controllers/ramps-controller/ramps-controller-init.ts b/app/core/Engine/controllers/ramps-controller/ramps-controller-init.ts
index 41093ef4be23..a3d9230bbd59 100644
--- a/app/core/Engine/controllers/ramps-controller/ramps-controller-init.ts
+++ b/app/core/Engine/controllers/ramps-controller/ramps-controller-init.ts
@@ -5,7 +5,6 @@ import {
   getDefaultRampsControllerState,
 } from '@metamask/ramps-controller';
 import type { RampsControllerInitMessenger } from '../../messengers/ramps-controller-messenger';
-import { getRampCallbackBaseUrl } from '../../../../components/UI/Ramp/utils/getRampCallbackBaseUrl';
 import { handleOrderStatusChangedForNotifications } from './event-handlers/notification';
 import { handleOrderStatusChangedForMetrics } from './event-handlers/analytics';
 
@@ -40,14 +39,9 @@ export const rampsControllerInit: MessengerClientInitFunction<
     // The all-providers widening is driven by the `moneyHeadlessAllProviders`
     // remote feature flag, which the controller reads itself through the
     // `RemoteFeatureFlagController:getState` messenger action per quote call.
-    // Default redirect URL for the widened quote fetch. MM Pay's quote
-    // request omits `redirectUrl`, so aggregator quotes would come back without
-    // the buy-widget URL the headless Checkout WebView needs; supply the same
-    // callback base the UB2 flow uses so the widened path can open the WebView.
-    // TODO(TRAM-3757): Derive this default redirect URL inside RampsController
-    // from its RampsEnvironment (RampsService.getBaseUrl) instead of injecting
-    // it from the client here; this callback duplicates a value core already has.
-    getDefaultRedirectUrl: () => getRampCallbackBaseUrl(),
+    // The widened-path default redirect URL is now derived inside core via
+    // `RampsService:getDefaultRedirectCallbackUrl` (same environment as the
+    // service). Keep that action delegated in the controller messenger.
   });
 
   let orderSubscriptionsRegistered = false;
diff --git a/app/core/Engine/controllers/transaction-controller/data-helpers.ts b/app/core/Engine/controllers/transaction-controller/data-helpers.ts
deleted file mode 100644
index 4731c8bdd015..000000000000
--- a/app/core/Engine/controllers/transaction-controller/data-helpers.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { merge } from 'lodash';
-
-export const enabledSmartTransactionsState = {
-  engine: {
-    backgroundState: {
-      SmartTransactionsController: {
-        enabled: true,
-        smartTransactionsState: {
-          liveness: true,
-        },
-      },
-      AccountsController: {
-        internalAccounts: {
-          selectedAccount: 'account1',
-          accounts: {
-            account1: {
-              address: '0x123',
-            },
-          },
-        },
-      },
-      NetworkController: {
-        selectedNetworkClientId: 'mainnet',
-        networkConfigurationsByChainId: {
-          '0x1': {
-            chainId: '0x1',
-            rpcEndpoints: [
-              {
-                networkClientId: 'mainnet',
-                type: 'infura',
-                url: 'https://mainnet.infura.io/v3/{infuraProjectId}',
-              },
-            ],
-            defaultRpcEndpointIndex: 0,
-            nativeCurrency: 'ETH',
-          },
-        },
-      },
-      PreferencesController: {
-        smartTransactionsOptInStatus: true,
-      },
-    },
-  },
-  swaps: {
-    featureFlags: {
-      smart_transactions: {
-        mobile_active: true,
-      },
-      smartTransactions: {
-        mobileActive: true,
-      },
-    },
-  },
-  selectedAccount: {
-    address: '0x1234567890123456789012345678901234567890',
-  },
-};
-
-export const disabledSmartTransactionsState = merge(
-  {},
-  enabledSmartTransactionsState,
-  {
-    engine: {
-      backgroundState: {
-        PreferencesController: {
-          smartTransactionsOptInStatus: false,
-        },
-      },
-    },
-  },
-);
diff --git a/app/core/Engine/controllers/transaction-controller/event-handlers/metrics.test.ts b/app/core/Engine/controllers/transaction-controller/event-handlers/metrics.test.ts
index 76233d1d6c75..bd9ebd277527 100644
--- a/app/core/Engine/controllers/transaction-controller/event-handlers/metrics.test.ts
+++ b/app/core/Engine/controllers/transaction-controller/event-handlers/metrics.test.ts
@@ -14,10 +14,65 @@ import {
   handleTransactionSubmittedEventForMetrics,
 } from './metrics';
 import { TransactionEventHandlerRequest } from '../types';
-import { enabledSmartTransactionsState } from '../data-helpers';
 import { selectIsPna25Acknowledged } from '../../../../../selectors/legalNotices';
 import { registerPendingTransactionActiveAbTestsForTransactionIds } from '../../../../../util/transactions/transaction-active-ab-test-attribution-registry';
 
+const enabledSmartTransactionsState = {
+  engine: {
+    backgroundState: {
+      SmartTransactionsController: {
+        enabled: true,
+        smartTransactionsState: {
+          liveness: true,
+        },
+      },
+      AccountsController: {
+        internalAccounts: {
+          selectedAccount: 'account1',
+          accounts: {
+            account1: {
+              address: '0x123',
+            },
+          },
+        },
+      },
+      NetworkController: {
+        selectedNetworkClientId: 'mainnet',
+        networkConfigurationsByChainId: {
+          '0x1': {
+            chainId: '0x1',
+            rpcEndpoints: [
+              {
+                networkClientId: 'mainnet',
+                type: 'infura',
+                url: 'https://mainnet.infura.io/v3/{infuraProjectId}',
+              },
+            ],
+            defaultRpcEndpointIndex: 0,
+            nativeCurrency: 'ETH',
+          },
+        },
+      },
+      PreferencesController: {
+        smartTransactionsOptInStatus: true,
+      },
+    },
+  },
+  swaps: {
+    featureFlags: {
+      smart_transactions: {
+        mobile_active: true,
+      },
+      smartTransactions: {
+        mobileActive: true,
+      },
+    },
+  },
+  selectedAccount: {
+    address: '0x1234567890123456789012345678901234567890',
+  },
+};
+
 jest.mock('../../../../../util/smart-transactions', () => {
   const actual = jest.requireActual('../../../../../util/smart-transactions');
   return {
diff --git a/app/core/Engine/controllers/transaction-pay-controller/paymentoverride-callback.test.ts b/app/core/Engine/controllers/transaction-pay-controller/paymentoverride-callback.test.ts
index 43a196b3a974..aa4c52211ffe 100644
--- a/app/core/Engine/controllers/transaction-pay-controller/paymentoverride-callback.test.ts
+++ b/app/core/Engine/controllers/transaction-pay-controller/paymentoverride-callback.test.ts
@@ -282,6 +282,40 @@ describe('getPaymentOverrideData', () => {
     });
   });
 
+  describe('non-atomic withdraw path', () => {
+    function buildNonAtomicRequest(
+      overrides?: Partial<GetPaymentOverrideDataRequest>,
+    ): GetPaymentOverrideDataRequest {
+      return buildRequest({
+        transactionData: {
+          ...VALID_TX_DATA,
+          atomic: false,
+        } as GetPaymentOverrideDataRequest['transactionData'],
+        ...overrides,
+      });
+    }
+
+    it('returns raw withdraw and transfer calls without delegation wrap', async () => {
+      const result = await getPaymentOverrideData(
+        buildNonAtomicRequest(),
+        mockMessenger,
+      );
+
+      expect(result).toStrictEqual({
+        calls: [
+          { to: '0xTeller', data: '0xwithdraw', value: '0x0' },
+          { to: '0xMusd', data: '0xtransfer', value: '0x0' },
+        ],
+      });
+    });
+
+    it('does not call getDelegationTransaction on non-atomic path', async () => {
+      await getPaymentOverrideData(buildNonAtomicRequest(), mockMessenger);
+
+      expect(getDelegationTransactionMock).not.toHaveBeenCalled();
+    });
+  });
+
   describe('isPostQuote deposit path', () => {
     function buildPostQuoteRequest(
       overrides?: Partial<GetPaymentOverrideDataRequest>,
@@ -345,5 +379,44 @@ describe('getPaymentOverrideData', () => {
 
       expect(result).toStrictEqual({ calls: [] });
     });
+
+    describe('non-atomic deposit path', () => {
+      function buildNonAtomicPostQuoteRequest(
+        overrides?: Partial<GetPaymentOverrideDataRequest>,
+      ): GetPaymentOverrideDataRequest {
+        return buildRequest({
+          transactionData: {
+            ...VALID_TX_DATA,
+            isPostQuote: true,
+            atomic: false,
+          } as GetPaymentOverrideDataRequest['transactionData'],
+          ...overrides,
+        });
+      }
+
+      it('returns raw approve and deposit calls with recipient but without delegation wrap', async () => {
+        const result = await getPaymentOverrideData(
+          buildNonAtomicPostQuoteRequest(),
+          mockMessenger,
+        );
+
+        expect(result).toStrictEqual({
+          recipient: MONEY_ACCOUNT_ADDRESS,
+          calls: [
+            { to: '0xMusd', data: '0xapprove', value: '0x0' },
+            { to: '0xTeller', data: '0xdeposit', value: '0x0' },
+          ],
+        });
+      });
+
+      it('does not call getDelegationTransaction on non-atomic path', async () => {
+        await getPaymentOverrideData(
+          buildNonAtomicPostQuoteRequest(),
+          mockMessenger,
+        );
+
+        expect(getDelegationTransactionMock).not.toHaveBeenCalled();
+      });
+    });
   });
 });
diff --git a/app/core/Engine/controllers/transaction-pay-controller/paymentoverride-callback.ts b/app/core/Engine/controllers/transaction-pay-controller/paymentoverride-callback.ts
index 509d16c63061..7e299dca2826 100644
--- a/app/core/Engine/controllers/transaction-pay-controller/paymentoverride-callback.ts
+++ b/app/core/Engine/controllers/transaction-pay-controller/paymentoverride-callback.ts
@@ -35,6 +35,7 @@ async function getMoneyAccountWithdrawPaymentOverrideData<
   messenger: T,
   recipient: Hex,
   amountHuman: string,
+  atomic: boolean,
 ): Promise<BatchTransactionParams[]> {
   const state = ReduxService.store.getState() as RootState;
   const primaryMoneyAccount = selectPrimaryMoneyAccount(state);
@@ -65,6 +66,26 @@ async function getMoneyAccountWithdrawPaymentOverrideData<
     provider,
   });
 
+  const rawCalls: BatchTransactionParams[] = [
+    {
+      to: withdrawTx.params.to,
+      data: withdrawTx.params.data,
+      value: withdrawTx.params.value,
+    },
+    {
+      to: transferTx.params.to,
+      data: transferTx.params.data,
+      value: transferTx.params.value,
+    },
+  ];
+
+  // Non-atomic flows submit the raw calls directly as a sponsored batch after
+  // Relay completion; the Money Account is already 7702-delegated so no fresh
+  // delegation wrap is needed.
+  if (!atomic) {
+    return rawCalls;
+  }
+
   const { NetworkController } = Engine.context;
   const networkClientId =
     NetworkController.findNetworkClientIdByChainId(chainId);
@@ -78,18 +99,7 @@ async function getMoneyAccountWithdrawPaymentOverrideData<
     txParams: {
       from: moneyAccountAddress,
     },
-    nestedTransactions: [
-      {
-        to: withdrawTx.params.to,
-        data: withdrawTx.params.data,
-        value: withdrawTx.params.value,
-      },
-      {
-        to: transferTx.params.to,
-        data: transferTx.params.data,
-        value: transferTx.params.value,
-      },
-    ],
+    nestedTransactions: rawCalls,
   } as TransactionMeta;
 
   const delegation = await getDelegationTransaction(messenger, transactionMeta);
@@ -108,6 +118,7 @@ async function getMoneyAccountDepositPaymentOverrideData<
 >(
   messenger: T,
   amountHuman: string,
+  atomic: boolean,
 ): Promise<{
   calls: BatchTransactionParams[];
   recipient?: Hex;
@@ -142,6 +153,26 @@ async function getMoneyAccountDepositPaymentOverrideData<
     provider,
   });
 
+  const rawCalls: BatchTransactionParams[] = [
+    {
+      to: approveTx.params.to,
+      data: approveTx.params.data,
+      value: approveTx.params.value,
+    },
+    {
+      to: depositTx.params.to,
+      data: depositTx.params.data,
+      value: depositTx.params.value,
+    },
+  ];
+
+  // Non-atomic flows submit the raw calls directly as a sponsored batch after
+  // Relay completion; the Money Account is already 7702-delegated so no fresh
+  // delegation wrap is needed.
+  if (!atomic) {
+    return { calls: rawCalls, recipient: moneyAccountAddress };
+  }
+
   const { NetworkController } = Engine.context;
   const networkClientId =
     NetworkController.findNetworkClientIdByChainId(chainId);
@@ -155,18 +186,7 @@ async function getMoneyAccountDepositPaymentOverrideData<
     txParams: {
       from: moneyAccountAddress,
     },
-    nestedTransactions: [
-      {
-        to: approveTx.params.to,
-        data: approveTx.params.data,
-        value: approveTx.params.value,
-      },
-      {
-        to: depositTx.params.to,
-        data: depositTx.params.data,
-        value: depositTx.params.value,
-      },
-    ],
+    nestedTransactions: rawCalls,
   } as TransactionMeta;
 
   const delegation = await getDelegationTransaction(messenger, transactionMeta);
@@ -191,8 +211,14 @@ export async function getPaymentOverrideData<T extends SignMessenger>(
   const { amount, transaction, transactionData } = request;
 
   if (transactionData?.paymentOverride === PaymentOverride.MoneyAccount) {
+    const atomic = transactionData.atomic !== false;
+
     if (transactionData?.isPostQuote) {
-      return await getMoneyAccountDepositPaymentOverrideData(messenger, amount);
+      return await getMoneyAccountDepositPaymentOverrideData(
+        messenger,
+        amount,
+        atomic,
+      );
     }
 
     if (!transaction.txParams?.from) return { calls: [] };
@@ -201,6 +227,7 @@ export async function getPaymentOverrideData<T extends SignMessenger>(
       messenger,
       transaction.txParams.from as Hex,
       amount,
+      atomic,
     );
     return { calls };
   }
diff --git a/app/core/Engine/messengers/card-controller-messenger/index.ts b/app/core/Engine/messengers/card-controller-messenger/index.ts
index 2ab547a82355..30b3026f2b81 100644
--- a/app/core/Engine/messengers/card-controller-messenger/index.ts
+++ b/app/core/Engine/messengers/card-controller-messenger/index.ts
@@ -33,6 +33,7 @@ export function getCardControllerMessenger(
       'RemoteFeatureFlagController:getState',
       'KeyringController:signPersonalMessage',
       'NetworkController:findNetworkClientIdByChainId',
+      'NetworkController:getNetworkClientById',
       'TransactionController:addTransaction',
       'TransactionController:addTransactionBatch',
       'TransactionController:getState',
diff --git a/app/core/Engine/messengers/defi-positions-controller-v2-messenger/defi-positions-controller-v2-messenger.test.ts b/app/core/Engine/messengers/defi-positions-controller-v2-messenger/defi-positions-controller-v2-messenger.test.ts
new file mode 100644
index 000000000000..014ec8de1ff0
--- /dev/null
+++ b/app/core/Engine/messengers/defi-positions-controller-v2-messenger/defi-positions-controller-v2-messenger.test.ts
@@ -0,0 +1,62 @@
+import {
+  Messenger,
+  type MessengerActions,
+  type MessengerEvents,
+  type MockAnyNamespace,
+  MOCK_ANY_NAMESPACE,
+} from '@metamask/messenger';
+import { DeFiPositionsControllerV2Messenger } from '@metamask/assets-controllers';
+import {
+  getDeFiPositionsControllerV2InitMessenger,
+  getDeFiPositionsControllerV2Messenger,
+  DeFiPositionsControllerV2InitMessenger,
+} from './defi-positions-controller-v2-messenger';
+
+type RootMessenger = Messenger<
+  MockAnyNamespace,
+  | MessengerActions<DeFiPositionsControllerV2Messenger>
+  | MessengerActions<DeFiPositionsControllerV2InitMessenger>,
+  | MessengerEvents<DeFiPositionsControllerV2Messenger>
+  | MessengerEvents<DeFiPositionsControllerV2InitMessenger>
+>;
+
+const getRootMessenger = (): RootMessenger =>
+  new Messenger<MockAnyNamespace, never, never>({
+    namespace: MOCK_ANY_NAMESPACE,
+  });
+
+describe('getDeFiPositionsControllerV2Messenger', () => {
+  it('returns a messenger', () => {
+    const rootMessenger = getRootMessenger();
+    const defiPositionsControllerV2Messenger =
+      getDeFiPositionsControllerV2Messenger(rootMessenger);
+
+    expect(defiPositionsControllerV2Messenger).toBeInstanceOf(Messenger);
+  });
+
+  it('delegates external actions required by the controller', () => {
+    const rootMessenger = getRootMessenger();
+    const delegateSpy = jest.spyOn(rootMessenger, 'delegate');
+
+    getDeFiPositionsControllerV2Messenger(rootMessenger);
+
+    expect(delegateSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        actions: [
+          'AccountTreeController:getAccountsFromSelectedAccountGroup',
+          'RemoteFeatureFlagController:getState',
+        ],
+      }),
+    );
+  });
+});
+
+describe('getDeFiPositionsControllerV2InitMessenger', () => {
+  it('returns a messenger', () => {
+    const rootMessenger = getRootMessenger();
+    const defiPositionsControllerV2InitMessenger =
+      getDeFiPositionsControllerV2InitMessenger(rootMessenger);
+
+    expect(defiPositionsControllerV2InitMessenger).toBeInstanceOf(Messenger);
+  });
+});
diff --git a/app/core/Engine/messengers/defi-positions-controller-v2-messenger/defi-positions-controller-v2-messenger.ts b/app/core/Engine/messengers/defi-positions-controller-v2-messenger/defi-positions-controller-v2-messenger.ts
new file mode 100644
index 000000000000..73e98a6372cd
--- /dev/null
+++ b/app/core/Engine/messengers/defi-positions-controller-v2-messenger/defi-positions-controller-v2-messenger.ts
@@ -0,0 +1,76 @@
+import { DeFiPositionsControllerV2Messenger } from '@metamask/assets-controllers';
+import {
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
+import { AuthenticationController } from '@metamask/profile-sync-controller';
+import { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
+import { RootMessenger } from '../../types';
+import { AssetsControllerGetStateAction } from '@metamask/assets-controller';
+
+/**
+ * Get a restricted messenger for the DeFiPositionsControllerV2.
+ *
+ * @param rootMessenger - The messenger to restrict.
+ * @returns The restricted messenger.
+ */
+export function getDeFiPositionsControllerV2Messenger(
+  rootMessenger: RootMessenger,
+): DeFiPositionsControllerV2Messenger {
+  const messenger = new Messenger<
+    'DeFiPositionsControllerV2',
+    MessengerActions<DeFiPositionsControllerV2Messenger>,
+    MessengerEvents<DeFiPositionsControllerV2Messenger>,
+    RootMessenger
+  >({
+    namespace: 'DeFiPositionsControllerV2',
+    parent: rootMessenger,
+  });
+  rootMessenger.delegate({
+    actions: [
+      'AccountTreeController:getAccountsFromSelectedAccountGroup',
+      'RemoteFeatureFlagController:getState',
+    ],
+    messenger,
+  });
+  return messenger;
+}
+
+type DeFiPositionsControllerV2InitMessengerActions =
+  | RemoteFeatureFlagControllerGetStateAction
+  | AssetsControllerGetStateAction
+  | AuthenticationController.AuthenticationControllerGetBearerTokenAction;
+
+export type DeFiPositionsControllerV2InitMessenger = ReturnType<
+  typeof getDeFiPositionsControllerV2InitMessenger
+>;
+
+/**
+ * Get a restricted messenger for DeFiPositionsControllerV2 initialization.
+ *
+ * @param rootMessenger - The messenger to restrict.
+ * @returns The restricted init messenger.
+ */
+export function getDeFiPositionsControllerV2InitMessenger(
+  rootMessenger: RootMessenger,
+) {
+  const messenger = new Messenger<
+    'DeFiPositionsControllerV2Init',
+    DeFiPositionsControllerV2InitMessengerActions,
+    never,
+    RootMessenger
+  >({
+    namespace: 'DeFiPositionsControllerV2Init',
+    parent: rootMessenger,
+  });
+  rootMessenger.delegate({
+    actions: [
+      'RemoteFeatureFlagController:getState',
+      'AssetsController:getState',
+      'AuthenticationController:getBearerToken',
+    ],
+    messenger,
+  });
+  return messenger;
+}
diff --git a/app/core/Engine/messengers/identity/authentication-controller-messenger.test.ts b/app/core/Engine/messengers/identity/authentication-controller-messenger.test.ts
index 5e4fe5608ae7..d8aa5b586387 100644
--- a/app/core/Engine/messengers/identity/authentication-controller-messenger.test.ts
+++ b/app/core/Engine/messengers/identity/authentication-controller-messenger.test.ts
@@ -27,4 +27,19 @@ describe('getAuthenticationControllerMessenger', () => {
 
     expect(authenticationControllerMessenger).toBeInstanceOf(Messenger);
   });
+
+  it('delegates SeedlessOnboardingController:getState for social identifier_type', () => {
+    const rootMessenger = getRootMessenger();
+    const delegateSpy = jest.spyOn(rootMessenger, 'delegate');
+
+    getAuthenticationControllerMessenger(rootMessenger);
+
+    expect(delegateSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        actions: expect.arrayContaining([
+          'SeedlessOnboardingController:getState',
+        ]),
+      }),
+    );
+  });
 });
diff --git a/app/core/Engine/messengers/identity/authentication-controller-messenger.ts b/app/core/Engine/messengers/identity/authentication-controller-messenger.ts
index c9427bb3a0f3..7002fe13e62b 100644
--- a/app/core/Engine/messengers/identity/authentication-controller-messenger.ts
+++ b/app/core/Engine/messengers/identity/authentication-controller-messenger.ts
@@ -26,7 +26,11 @@ export function getAuthenticationControllerMessenger(
     parent: rootMessenger,
   });
   rootMessenger.delegate({
-    actions: ['KeyringController:getState', 'SnapController:handleRequest'],
+    actions: [
+      'KeyringController:getState',
+      'SeedlessOnboardingController:getState',
+      'SnapController:handleRequest',
+    ],
     events: ['KeyringController:lock', 'KeyringController:unlock'],
     messenger,
   });
diff --git a/app/core/Engine/messengers/index.ts b/app/core/Engine/messengers/index.ts
index 39c52fb39453..5390614afaaf 100644
--- a/app/core/Engine/messengers/index.ts
+++ b/app/core/Engine/messengers/index.ts
@@ -11,6 +11,10 @@ import {
   getDeFiPositionsControllerInitMessenger,
   getDeFiPositionsControllerMessenger,
 } from './defi-positions-controller-messenger/defi-positions-controller-messenger';
+import {
+  getDeFiPositionsControllerV2InitMessenger,
+  getDeFiPositionsControllerV2Messenger,
+} from './defi-positions-controller-v2-messenger/defi-positions-controller-v2-messenger';
 import {
   getBackendWebSocketServiceMessenger,
   getBackendWebSocketServiceInitMessenger,
@@ -239,6 +243,10 @@ export const MESSENGER_FACTORIES = {
     getMessenger: getDeFiPositionsControllerMessenger,
     getInitMessenger: getDeFiPositionsControllerInitMessenger,
   },
+  DeFiPositionsControllerV2: {
+    getMessenger: getDeFiPositionsControllerV2Messenger,
+    getInitMessenger: getDeFiPositionsControllerV2InitMessenger,
+  },
   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   AuthenticationController: {
     getMessenger: getAuthenticationControllerMessenger,
diff --git a/app/core/Engine/messengers/money-account-balance-service-messenger.test.ts b/app/core/Engine/messengers/money-account-balance-service-messenger.test.ts
index 53fd35536f4b..07c8c5789d2b 100644
--- a/app/core/Engine/messengers/money-account-balance-service-messenger.test.ts
+++ b/app/core/Engine/messengers/money-account-balance-service-messenger.test.ts
@@ -30,7 +30,7 @@ describe('getMoneyAccountBalanceServiceMessenger', () => {
     expect(serviceMessenger).toBeInstanceOf(Messenger);
   });
 
-  it('delegates NetworkController, RemoteFeatureFlagController, and MoneyAccountApiDataService actions to the scoped messenger', () => {
+  it('delegates balance dependencies to the scoped messenger', () => {
     const rootMessenger = getRootMessenger();
     const delegateSpy = jest.spyOn(rootMessenger, 'delegate');
 
@@ -44,6 +44,9 @@ describe('getMoneyAccountBalanceServiceMessenger', () => {
           'RemoteFeatureFlagController:getState',
           'MoneyAccountApiDataService:fetchPositions',
         ]),
+        events: expect.arrayContaining([
+          'RemoteFeatureFlagController:stateChange',
+        ]),
       }),
     );
   });
diff --git a/app/core/Engine/messengers/ramps-controller-messenger/ramps-controller-messenger.ts b/app/core/Engine/messengers/ramps-controller-messenger/ramps-controller-messenger.ts
index 6741ca82738a..3c40d4ff7317 100644
--- a/app/core/Engine/messengers/ramps-controller-messenger/ramps-controller-messenger.ts
+++ b/app/core/Engine/messengers/ramps-controller-messenger/ramps-controller-messenger.ts
@@ -1,4 +1,5 @@
 import {
+  RAMPS_CONTROLLER_REQUIRED_SERVICE_ACTIONS,
   RampsControllerMessenger,
   type RampsControllerOrderStatusChangedEvent,
 } from '@metamask/ramps-controller';
@@ -42,40 +43,9 @@ export function getRampsControllerMessenger(
       // The controller reads the `moneyHeadlessAllProviders` feature flag
       // itself for quote widening.
       'RemoteFeatureFlagController:getState',
-      'RampsService:getGeolocation',
-      'RampsService:getCountries',
-      'RampsService:getTokens',
-      'RampsService:getProviders',
-      'RampsService:getPaymentMethods',
-      'RampsService:getQuotes',
-      'RampsService:getBuyWidgetUrl',
-      'RampsService:getOrder',
-      'RampsService:getOrderFromCallback',
-      'TransakService:setApiKey',
-      'TransakService:setAccessToken',
-      'TransakService:clearAccessToken',
-      'TransakService:sendUserOtp',
-      'TransakService:verifyUserOtp',
-      'TransakService:logout',
-      'TransakService:getUserDetails',
-      'TransakService:getBuyQuote',
-      'TransakService:getKycRequirement',
-      'TransakService:getAdditionalRequirements',
-      'TransakService:createOrder',
-      'TransakService:getOrder',
-      'TransakService:getUserLimits',
-      'TransakService:requestOtt',
-      'TransakService:generatePaymentWidgetUrl',
-      'TransakService:createWidgetUrl',
-      'TransakService:submitPurposeOfUsageForm',
-      'TransakService:patchUser',
-      'TransakService:submitSsnDetails',
-      'TransakService:confirmPayment',
-      'TransakService:getTranslation',
-      'TransakService:getIdProofStatus',
-      'TransakService:cancelOrder',
-      'TransakService:cancelAllActiveOrders',
-      'TransakService:getActiveOrders',
+      // Spread the package-owned required list so new service actions
+      // (e.g. getDefaultRedirectCallbackUrl) cannot be forgotten at upgrade.
+      ...RAMPS_CONTROLLER_REQUIRED_SERVICE_ACTIONS,
     ],
     events: [],
   });
diff --git a/app/core/Engine/types.ts b/app/core/Engine/types.ts
index 60208fccf94a..98410adbf1fc 100644
--- a/app/core/Engine/types.ts
+++ b/app/core/Engine/types.ts
@@ -42,6 +42,10 @@ import {
   DeFiPositionsControllerState,
   DeFiPositionsControllerEvents,
   DeFiPositionsControllerActions,
+  DeFiPositionsControllerV2,
+  DeFiPositionsControllerV2State,
+  DeFiPositionsControllerV2Events,
+  DeFiPositionsControllerV2Actions,
 
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   MultichainBalancesControllerState,
@@ -632,6 +636,7 @@ export type GlobalActions =
   | AppMetadataControllerActions
   | MultichainRoutingServiceActions
   | DeFiPositionsControllerActions
+  | DeFiPositionsControllerV2Actions
   | StorageServiceActions
   | DelegationControllerActions
   | SeedlessOnboardingControllerActions
@@ -729,6 +734,7 @@ export type GlobalEvents =
   | AppMetadataControllerEvents
   | SeedlessOnboardingControllerEvents
   | DeFiPositionsControllerEvents
+  | DeFiPositionsControllerV2Events
   | AccountTreeControllerEvents
   | DelegationControllerEvents
   | NftDetectionControllerEvents
@@ -824,6 +830,7 @@ export type MessengerClients = {
   TokenRatesController: TokenRatesController;
   TokensController: TokensController;
   DeFiPositionsController: DeFiPositionsController;
+  DeFiPositionsControllerV2: DeFiPositionsControllerV2;
   TransactionController: TransactionController;
   TransactionPayController: TransactionPayController;
   SmartTransactionsController: SmartTransactionsController;
@@ -925,6 +932,7 @@ export type EngineState = {
   GasFeeController: GasFeeState;
   TokensController: TokensControllerState;
   DeFiPositionsController: DeFiPositionsControllerState;
+  DeFiPositionsControllerV2: DeFiPositionsControllerV2State;
   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   SnapController: PersistedSnapControllerState;
   SnapRegistryController: SnapRegistryControllerState;
@@ -1045,6 +1053,7 @@ export type MessengerClientsToInitialize =
   | 'AccountTreeController'
   | 'CurrencyRateController'
   | 'DeFiPositionsController'
+  | 'DeFiPositionsControllerV2'
   | 'GeolocationController'
   | 'GeolocationApiService'
   | 'MultichainNetworkController'
diff --git a/app/core/Engine/wallet-init/instance-options/network-controller.ts b/app/core/Engine/wallet-init/instance-options/network-controller.ts
index b317d4fc01c2..af730e2d3f39 100644
--- a/app/core/Engine/wallet-init/instance-options/network-controller.ts
+++ b/app/core/Engine/wallet-init/instance-options/network-controller.ts
@@ -28,6 +28,10 @@ export function getNetworkControllerInstanceOptions(): WalletOptions['instanceOp
       [ChainId['base-mainnet']]:
         getFailoverUrlsForInfuraNetwork('base-mainnet'),
       [ChainId['bsc-mainnet']]: getFailoverUrlsForInfuraNetwork('bsc-mainnet'),
+      [ChainId['zksync-mainnet']]:
+        getFailoverUrlsForInfuraNetwork('zksync-mainnet'),
+      [ChainId['megaeth-mainnet']]:
+        getFailoverUrlsForInfuraNetwork('megaeth-mainnet'),
       [ChainId['sei-mainnet']]: getFailoverUrlsForInfuraNetwork('sei-mainnet'),
       [ChainId['monad-mainnet']]:
         getFailoverUrlsForInfuraNetwork('monad-mainnet'),
diff --git a/app/core/HardwareWallet/errors/mappings.test.ts b/app/core/HardwareWallet/errors/mappings.test.ts
index b7338200dd75..5c5a4ce2a6f6 100644
--- a/app/core/HardwareWallet/errors/mappings.test.ts
+++ b/app/core/HardwareWallet/errors/mappings.test.ts
@@ -26,6 +26,7 @@ describe('MOBILE_ERROR_EXTENSIONS', () => {
       ErrorCode.DeviceNotReady,
       ErrorCode.DeviceMissingCapability,
       ErrorCode.DeviceStateBlindSignNotSupported,
+      ErrorCode.DeviceStateOnlyV4Supported,
       ErrorCode.DeviceUnresponsive,
       ErrorCode.ConnectionClosed,
       ErrorCode.ConnectionTimeout,
@@ -138,6 +139,12 @@ describe('MOBILE_ERROR_EXTENSIONS', () => {
       expect(title).toBe('hardware_wallet.error.blind_signing_disabled');
     });
 
+    it('returns localized title for DeviceStateOnlyV4Supported', () => {
+      const ext = MOBILE_ERROR_EXTENSIONS[ErrorCode.DeviceStateOnlyV4Supported];
+      const title = ext?.getLocalizedTitle();
+      expect(title).toBe('hardware_wallet.error.unsupported_signature');
+    });
+
     it('returns localized title for DeviceUnresponsive', () => {
       const ext = MOBILE_ERROR_EXTENSIONS[ErrorCode.DeviceUnresponsive];
       const title = ext?.getLocalizedTitle();
@@ -284,6 +291,13 @@ describe('MOBILE_ERROR_EXTENSIONS', () => {
       expect(message).toBe('hardware_wallet.errors.blind_signing');
     });
 
+    it('returns localized message for DeviceStateOnlyV4Supported', () => {
+      const ext = MOBILE_ERROR_EXTENSIONS[ErrorCode.DeviceStateOnlyV4Supported];
+      const message = ext?.getLocalizedMessage(HardwareWalletType.Ledger);
+      expect(message).toContain('hardware_wallet.errors.only_v4_supported');
+      expect(message).toContain('device:');
+    });
+
     it('returns localized message for DeviceUnresponsive', () => {
       const ext = MOBILE_ERROR_EXTENSIONS[ErrorCode.DeviceUnresponsive];
       const message = ext?.getLocalizedMessage();
@@ -397,6 +411,10 @@ describe('MOBILE_ERROR_EXTENSIONS', () => {
       expect(
         MOBILE_ERROR_EXTENSIONS[ErrorCode.MobileNotSupported]?.recoveryAction,
       ).toBe(RecoveryAction.ACKNOWLEDGE);
+      expect(
+        MOBILE_ERROR_EXTENSIONS[ErrorCode.DeviceStateOnlyV4Supported]
+          ?.recoveryAction,
+      ).toBe(RecoveryAction.ACKNOWLEDGE);
     });
 
     it('RETRY is used for unknown errors (user can retry)', () => {
diff --git a/app/core/HardwareWallet/errors/mappings.ts b/app/core/HardwareWallet/errors/mappings.ts
index 0c2364f96088..7becabb62821 100644
--- a/app/core/HardwareWallet/errors/mappings.ts
+++ b/app/core/HardwareWallet/errors/mappings.ts
@@ -108,6 +108,19 @@ export const MOBILE_ERROR_EXTENSIONS: Partial<
       strings('hardware_wallet.error.blind_signing_disabled'),
     getLocalizedMessage: () => strings('hardware_wallet.errors.blind_signing'),
   },
+  [ErrorCode.DeviceStateOnlyV4Supported]: {
+    // Retrying cannot succeed: the dApp requested an unsupported signature
+    // type, so the user should just acknowledge the message.
+    recoveryAction: RecoveryAction.ACKNOWLEDGE,
+    icon: IconName.Danger,
+    iconColor: IconColor.Default,
+    getLocalizedTitle: () =>
+      strings('hardware_wallet.error.unsupported_signature'),
+    getLocalizedMessage: (walletType) =>
+      strings('hardware_wallet.errors.only_v4_supported', {
+        device: getHardwareWalletTypeName(walletType),
+      }),
+  },
   [ErrorCode.DeviceUnresponsive]: {
     recoveryAction: RecoveryAction.RETRY,
     icon: IconName.Clock,
diff --git a/app/core/HardwareWallet/errors/parser.test.ts b/app/core/HardwareWallet/errors/parser.test.ts
index 85c3b36a94c6..1d945c717b49 100644
--- a/app/core/HardwareWallet/errors/parser.test.ts
+++ b/app/core/HardwareWallet/errors/parser.test.ts
@@ -340,6 +340,16 @@ describe('parseErrorByType', () => {
       expect(result.code).toBe(ErrorCode.DeviceStateBlindSignNotSupported);
     });
 
+    it('parses "Only version 4 of typed data signing is supported" message', () => {
+      const error = new Error(
+        'Ledger: Only version 4 of typed data signing is supported',
+      );
+
+      const result = parseErrorByType(error, walletType);
+
+      expect(result.code).toBe(ErrorCode.DeviceStateOnlyV4Supported);
+    });
+
     it('parses "eth app" with "open" message', () => {
       const error = new Error('Please open the Ethereum app on your device');
 
diff --git a/app/core/HardwareWallet/errors/parser.ts b/app/core/HardwareWallet/errors/parser.ts
index c9b3762cc4ea..1ca9aaab4b8f 100644
--- a/app/core/HardwareWallet/errors/parser.ts
+++ b/app/core/HardwareWallet/errors/parser.ts
@@ -234,6 +234,13 @@ function parseErrorByMessage(
     code: ErrorCode;
     condition?: (msg: string) => boolean;
   }[] = [
+    {
+      // Ledger devices can only sign EIP-712 typed data with version V4.
+      // The keyring throws "Ledger: Only version 4 of typed data signing is
+      // supported" for V1/V3 requests.
+      patterns: ['version 4 of typed data', 'only version 4'],
+      code: ErrorCode.DeviceStateOnlyV4Supported,
+    },
     {
       patterns: ['disconnected', 'disconnect', 'connection lost'],
       code: ErrorCode.DeviceDisconnected,
diff --git a/app/core/NavigationService/types.ts b/app/core/NavigationService/types.ts
index c8b37245bf15..3e43ffaa079f 100644
--- a/app/core/NavigationService/types.ts
+++ b/app/core/NavigationService/types.ts
@@ -976,7 +976,6 @@ export type RootStackParamList = {
   PredictFeed: PredictNavigationParamList['PredictFeed'];
   PredictMarketDetails: PredictNavigationParamList['PredictMarketDetails'];
   PredictPositions: PredictNavigationParamList['PredictPositions'];
-  PredictWorldCup: PredictNavigationParamList['PredictWorldCup'];
   PredictActivityDetail: PredictModalsNavigationParamList['PredictActivityDetail'];
   PredictModals:
     | NavigatorScreenParams<PredictModalsNavigationParamList>
diff --git a/app/core/SnapKeyring/utils/sendMultichainTransaction.ts b/app/core/SnapKeyring/utils/sendMultichainTransaction.ts
deleted file mode 100644
index aa4c2f484bc6..000000000000
--- a/app/core/SnapKeyring/utils/sendMultichainTransaction.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { HandlerType } from '@metamask/snaps-utils';
-import { handleSnapRequest } from '../../Snaps/utils';
-import Engine from '../../Engine';
-import { SnapId, CaipAssetType } from '@metamask/snaps-sdk';
-
-const controllerMessenger = Engine.controllerMessenger;
-
-export async function sendMultichainTransaction(
-  snapId: SnapId,
-  {
-    account,
-    scope,
-    assetId,
-  }: {
-    account: string;
-    scope: string;
-    assetId?: CaipAssetType;
-  },
-) {
-  await handleSnapRequest(controllerMessenger, {
-    snapId,
-    origin: 'metamask',
-    handler: HandlerType.OnRpcRequest,
-    request: {
-      method: 'startSendTransactionFlow',
-      params: {
-        account,
-        scope,
-        ...(assetId !== undefined ? { assetId } : {}),
-      },
-    },
-  });
-}
diff --git a/app/core/WalletConnect/WalletConnect2Session.ts b/app/core/WalletConnect/WalletConnect2Session.ts
index 48920b1d6973..0dfbca7db808 100644
--- a/app/core/WalletConnect/WalletConnect2Session.ts
+++ b/app/core/WalletConnect/WalletConnect2Session.ts
@@ -662,6 +662,10 @@ class WalletConnect2Session {
       }
 
       return this.handleAdapterRequest({
+        // The channel id is the unspoofable per-session identifier and is
+        // what Snaps must receive as the request origin, never the dapp's
+        // self-reported metadata URL.
+        origin: this.channelId,
         requestEvent,
         scope: normalizedRequestChainId,
       });
@@ -790,9 +794,11 @@ class WalletConnect2Session {
    * the request namespace.
    */
   private handleAdapterRequest = async ({
+    origin,
     requestEvent,
     scope,
   }: {
+    origin: string;
     requestEvent: WalletKitTypes.SessionRequest;
     scope: CaipChainId;
   }) => {
@@ -803,6 +809,7 @@ class WalletConnect2Session {
 
     try {
       const result = await handleMultichainRequestByAdapter({
+        origin,
         connectedAddresses,
         scope,
         requestId: requestEvent.id,
diff --git a/app/core/WalletConnect/WalletConnectV2.test.ts b/app/core/WalletConnect/WalletConnectV2.test.ts
index 0595a0211865..09aee9c0ca45 100644
--- a/app/core/WalletConnect/WalletConnectV2.test.ts
+++ b/app/core/WalletConnect/WalletConnectV2.test.ts
@@ -279,6 +279,9 @@ describe('WC2Manager', () => {
 
   afterEach(() => {
     jest.clearAllMocks();
+    // Spies on real modules (StorageWrapper, wcUtils, store, ...) would
+    // otherwise leak into later tests in this single-describe file.
+    jest.restoreAllMocks();
     // Reset WC2Manager singleton state
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (WC2Manager as any).instance = undefined;
@@ -2091,6 +2094,7 @@ describe('WC2Manager', () => {
       expect(wc2MetadataCalls.length).toBeGreaterThan(0);
 
       const metadata = wc2MetadataCalls[0][0].metadata;
+      expect(metadata.id).toBe('verify-test-pairing');
       expect(metadata.verifyContext).toEqual({
         isScam: true,
         validation: 'INVALID',
@@ -2098,6 +2102,28 @@ describe('WC2Manager', () => {
       });
     });
 
+    it('stores pairing topic as wc2Metadata id for permission-origin matching', async () => {
+      mockApproveSession.mockResolvedValue({
+        topic: 'pairing-id-topic',
+        pairingTopic: 'verify-test-pairing',
+        peer: {
+          metadata: {
+            url: 'https://example.com',
+            name: 'Verify Test App',
+            icons: [],
+          },
+        },
+      });
+
+      await manager.onSessionProposal(createProposal());
+
+      const metadataCall = dispatchSpy.mock.calls.find(
+        (call: any) => call[0]?.type === ActionType.WC2_METADATA,
+      );
+
+      expect(metadataCall?.[0]?.metadata?.id).toBe('verify-test-pairing');
+    });
+
     it('dispatches verifyContext with isScam false for verified dapps', async () => {
       mockApproveSession.mockResolvedValue({
         topic: 'verify-test-topic-2',
diff --git a/app/core/WalletConnect/WalletConnectV2.ts b/app/core/WalletConnect/WalletConnectV2.ts
index a85cf3e6a208..1c8785016a7f 100644
--- a/app/core/WalletConnect/WalletConnectV2.ts
+++ b/app/core/WalletConnect/WalletConnectV2.ts
@@ -620,7 +620,13 @@ export class WC2Manager {
 
     // Save connection info to redux store for the approval UI.
     store.dispatch(
-      updateWC2Metadata({ url, name, icon, id: `${id}`, verifyContext }),
+      updateWC2Metadata({
+        url,
+        name,
+        icon,
+        id: channelId,
+        verifyContext,
+      }),
     );
 
     const doesProposalIncludeEip155 = doesProposalOrSessionIncludeNamespace({
diff --git a/app/core/WalletConnect/multichain/helpers.test.ts b/app/core/WalletConnect/multichain/helpers.test.ts
index ff2ab4555ec9..87474b44dbcc 100644
--- a/app/core/WalletConnect/multichain/helpers.test.ts
+++ b/app/core/WalletConnect/multichain/helpers.test.ts
@@ -332,6 +332,7 @@ describe('handleRequestByAdapter', () => {
     mockedGetAdapter.mockReturnValue(fakeAdapter);
 
     const args = {
+      origin: 'channelId',
       connectedAddresses: ['tron:0x2b6653dc:TAddr' as CaipAccountId],
       scope: 'tron:0x2b6653dc' as CaipChainId,
       requestId: 1,
@@ -351,6 +352,7 @@ describe('handleRequestByAdapter', () => {
 
     await expect(
       handleRequestByAdapter({
+        origin: 'channelId',
         connectedAddresses: [],
         scope: 'tron:0x2b6653dc',
         requestId: 1,
diff --git a/app/core/WalletConnect/multichain/router.test.ts b/app/core/WalletConnect/multichain/router.test.ts
new file mode 100644
index 000000000000..a00ce2fcf619
--- /dev/null
+++ b/app/core/WalletConnect/multichain/router.test.ts
@@ -0,0 +1,111 @@
+jest.mock('../../Engine', () => ({
+  __esModule: true,
+  default: {
+    controllerMessenger: {
+      call: jest.fn(),
+    },
+  },
+}));
+
+import type { CaipAccountId, CaipChainId } from '@metamask/utils';
+import Engine from '../../Engine';
+import { createSnapCaller } from './router';
+
+const mockedCall = Engine.controllerMessenger.call as jest.Mock;
+
+interface TestSpec {
+  test_method: {
+    params: { foo: string };
+    response: { signature: string };
+  };
+  test_method_no_params: {
+    params: undefined;
+    response: { signature: string };
+  };
+}
+
+describe('createSnapCaller', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('forwards the per-session origin to the MultichainRoutingService', async () => {
+    // Security invariant: the Snap-visible origin must be the unspoofable
+    // per-session channel id, so each WalletConnect session remains a
+    // distinct principal. It must never be replaced by a shared constant or
+    // the dapp's self-reported URL.
+    mockedCall.mockResolvedValue({ signature: '0xsig' });
+    const callSnap = createSnapCaller<TestSpec>();
+
+    const result = await callSnap({
+      origin: 'channel-id-1',
+      connectedAddresses: ['tron:728126428:TAddr' as CaipAccountId],
+      scope: 'tron:728126428' as CaipChainId,
+      requestId: 42,
+      request: { method: 'test_method', params: { foo: 'bar' } },
+    });
+
+    expect(mockedCall).toHaveBeenCalledWith(
+      'MultichainRoutingService:handleRequest',
+      {
+        connectedAddresses: ['tron:728126428:TAddr'],
+        origin: 'channel-id-1',
+        scope: 'tron:728126428',
+        request: {
+          jsonrpc: '2.0',
+          id: 42,
+          method: 'test_method',
+          params: { foo: 'bar' },
+        },
+      },
+    );
+    expect(result).toStrictEqual({ signature: '0xsig' });
+  });
+
+  it('keeps distinct sessions as distinct Snap origins', async () => {
+    mockedCall.mockResolvedValue({ signature: '0xsig' });
+    const callSnap = createSnapCaller<TestSpec>();
+
+    await callSnap({
+      origin: 'channel-id-1',
+      connectedAddresses: ['tron:728126428:TAddr' as CaipAccountId],
+      scope: 'tron:728126428' as CaipChainId,
+      requestId: 1,
+      request: { method: 'test_method', params: { foo: 'bar' } },
+    });
+    await callSnap({
+      origin: 'channel-id-2',
+      connectedAddresses: ['tron:728126428:TAddr' as CaipAccountId],
+      scope: 'tron:728126428' as CaipChainId,
+      requestId: 1,
+      request: { method: 'test_method', params: { foo: 'bar' } },
+    });
+
+    const origins = mockedCall.mock.calls.map(([, args]) => args.origin);
+    expect(origins).toStrictEqual(['channel-id-1', 'channel-id-2']);
+  });
+
+  it('omits params when the request has none', async () => {
+    mockedCall.mockResolvedValue({ signature: '0xsig' });
+    const callSnap = createSnapCaller<TestSpec>();
+
+    await callSnap({
+      origin: 'channel-id-1',
+      connectedAddresses: [],
+      scope: 'tron:728126428' as CaipChainId,
+      requestId: 7,
+      request: { method: 'test_method_no_params', params: undefined },
+    });
+
+    expect(mockedCall).toHaveBeenCalledWith(
+      'MultichainRoutingService:handleRequest',
+      expect.objectContaining({
+        request: {
+          jsonrpc: '2.0',
+          id: 7,
+          method: 'test_method_no_params',
+        },
+      }),
+    );
+  });
+});
diff --git a/app/core/WalletConnect/multichain/router.ts b/app/core/WalletConnect/multichain/router.ts
index a7923e3a6261..308dad62f2b3 100644
--- a/app/core/WalletConnect/multichain/router.ts
+++ b/app/core/WalletConnect/multichain/router.ts
@@ -2,25 +2,25 @@ import type { CaipAccountId, CaipChainId, Json } from '@metamask/utils';
 import Engine from '../../Engine';
 import type { RpcMethod, RpcResponse, RpcSpec } from './types';
 
-/**
- * Stable origin reported to non-EVM Snaps for every WalletConnect request.
- * Replaces the per-session channelId, which must never be treated as a dapp
- * origin. MUST stay in sync with the Snaps' known-origin label map key
- * ('wallet-connect' -> 'WalletConnect').
- */
-export const WALLET_CONNECT_ORIGIN = 'wallet-connect';
-
 /**
  * Build a Snap caller bound to one Snap RPC spec, routing each request
  * through the MultichainRoutingService.
  */
 export function createSnapCaller<Spec extends RpcSpec<Spec>>() {
   return async <Method extends RpcMethod<Spec>>({
+    origin,
     connectedAddresses,
     scope,
     requestId,
     request,
   }: {
+    /**
+     * Unspoofable identifier of the requesting WalletConnect session (the
+     * wallet-generated channel id). Forwarded to the Snap as the request
+     * origin so each session remains a distinct principal. Never pass the
+     * dapp's self-reported URL or a shared transport-wide constant here.
+     */
+    origin: string;
     connectedAddresses: CaipAccountId[];
     scope: CaipChainId;
     requestId: number;
@@ -28,7 +28,7 @@ export function createSnapCaller<Spec extends RpcSpec<Spec>>() {
   }): Promise<RpcResponse<Spec, Method>> =>
     Engine.controllerMessenger.call('MultichainRoutingService:handleRequest', {
       connectedAddresses,
-      origin: WALLET_CONNECT_ORIGIN,
+      origin,
       scope,
       request: {
         jsonrpc: '2.0' as const,
diff --git a/app/core/WalletConnect/multichain/tron/adapter.test.ts b/app/core/WalletConnect/multichain/tron/adapter.test.ts
index 16747cfedba2..385b52bbea15 100644
--- a/app/core/WalletConnect/multichain/tron/adapter.test.ts
+++ b/app/core/WalletConnect/multichain/tron/adapter.test.ts
@@ -252,6 +252,7 @@ describe('multichain/tron', () => {
       });
 
       const result = await tronAdapter.handleRequest({
+        origin: 'channelId',
         connectedAddresses: ['tron:0x2b6653dc:TTestAddress' as CaipAccountId],
         scope: 'tron:728126428' as CaipChainId,
         requestId: 1,
@@ -268,6 +269,7 @@ describe('multichain/tron', () => {
       });
 
       expect(mockedCallTronSnap).toHaveBeenCalledWith({
+        origin: 'channelId',
         connectedAddresses: ['tron:728126428:TTestAddress'],
         scope: 'tron:728126428',
         requestId: 1,
@@ -288,12 +290,13 @@ describe('multichain/tron', () => {
       });
     });
 
-    it('does not forward any dapp origin to the Snap routing service', async () => {
+    it('forwards the per-session channel id as the Snap origin', async () => {
       mockedCallTronSnap.mockResolvedValue({
         signature: '0xsig',
       });
 
       await tronAdapter.handleRequest({
+        origin: 'channelId',
         connectedAddresses: ['tron:0x2b6653dc:TTestAddress' as CaipAccountId],
         scope: 'tron:728126428' as CaipChainId,
         requestId: 1,
@@ -306,18 +309,17 @@ describe('multichain/tron', () => {
 
       expect(mockedCallTronSnap).toHaveBeenCalledWith(
         expect.objectContaining({
+          origin: 'channelId',
           connectedAddresses: ['tron:728126428:TTestAddress'],
           scope: 'tron:728126428',
           requestId: 1,
         }),
       );
-      expect(mockedCallTronSnap).toHaveBeenCalledWith(
-        expect.not.objectContaining({ origin: expect.anything() }),
-      );
     });
 
     it('rejects unsupported WalletConnect methods', async () => {
       const args = {
+        origin: 'channelId',
         connectedAddresses: [] as CaipAccountId[],
         scope: 'tron:728126428' as CaipChainId,
         requestId: 1,
diff --git a/app/core/WalletConnect/multichain/tron/adapter.ts b/app/core/WalletConnect/multichain/tron/adapter.ts
index 317b2592d971..3c1900a34c94 100644
--- a/app/core/WalletConnect/multichain/tron/adapter.ts
+++ b/app/core/WalletConnect/multichain/tron/adapter.ts
@@ -176,6 +176,7 @@ export function enrichCaveatValue({
  * WalletConnect format for the dapp.
  */
 export async function handleRequest({
+  origin,
   connectedAddresses,
   scope,
   requestId,
@@ -190,6 +191,7 @@ export async function handleRequest({
 
   if (method === 'tron_signMessage') {
     const result = await callTronSnap({
+      origin,
       connectedAddresses: normalizedConnectedAddresses,
       scope,
       requestId,
@@ -201,6 +203,7 @@ export async function handleRequest({
 
   if (method === 'tron_signTransaction') {
     const result = await callTronSnap({
+      origin,
       connectedAddresses: normalizedConnectedAddresses,
       scope,
       requestId,
diff --git a/app/core/WalletConnect/multichain/types.ts b/app/core/WalletConnect/multichain/types.ts
index b3cbf2a76c7e..36fe4e080276 100644
--- a/app/core/WalletConnect/multichain/types.ts
+++ b/app/core/WalletConnect/multichain/types.ts
@@ -71,6 +71,20 @@ export type RpcResponse<
  * Fixed context fields every adapter receives alongside the request.
  */
 interface AdapterRequestContext {
+  /**
+   * Unspoofable identifier of the requesting WalletConnect session: the
+   * wallet-generated channel id, mirroring how EVM permissions are keyed.
+   * Threaded through to Snaps as the request origin so every session stays
+   * a distinct principal.
+   *
+   * This is intentionally NOT the dapp's self-reported URL (unverifiable on
+   * remote transports, must never influence Snap display or security logic
+   * as if verified) and NOT a shared transport-wide constant (would collapse
+   * all WalletConnect dapps into one principal). The self-reported URL will
+   * travel separately with explicit unverified framing once the Snaps
+   * platform supports origin metadata (WPC-1194 / WPC-1195).
+   */
+  origin: string;
   connectedAddresses: CaipAccountId[];
   scope: CaipChainId;
   requestId: number;
diff --git a/app/core/WalletConnect/wc-utils.test.ts b/app/core/WalletConnect/wc-utils.test.ts
index ced2ecaf3785..6bf0dd6768dc 100644
--- a/app/core/WalletConnect/wc-utils.test.ts
+++ b/app/core/WalletConnect/wc-utils.test.ts
@@ -12,6 +12,7 @@ import {
   isValidUrl,
   getUnverifiedRequestOrigin,
   isEIP155RedirectMethodForChain,
+  isWalletConnectPermissionOrigin,
 } from './wc-utils';
 import type { Caip25CaveatValue } from '@metamask/chain-agnostic-permission';
 import {
@@ -634,4 +635,31 @@ describe('WalletConnect Utils', () => {
       ).toBe(defaultOrigin);
     });
   });
+
+  describe('isWalletConnectPermissionOrigin', () => {
+    it('returns true when origin matches wc2Metadata pairing topic', () => {
+      const result = isWalletConnectPermissionOrigin('pairing-topic-1', {
+        id: 'pairing-topic-1',
+      });
+
+      expect(result).toBe(true);
+    });
+
+    it('returns false when stale wc2Metadata does not match in-app browser origin', () => {
+      const result = isWalletConnectPermissionOrigin('app.uniswap.org', {
+        id: 'stale-pairing-topic',
+        url: 'https://chikn.farm',
+      });
+
+      expect(result).toBe(false);
+    });
+
+    it('returns false when wc2Metadata id is empty', () => {
+      const result = isWalletConnectPermissionOrigin('pairing-topic-1', {
+        id: '',
+      });
+
+      expect(result).toBe(false);
+    });
+  });
 });
diff --git a/app/core/WalletConnect/wc-utils.ts b/app/core/WalletConnect/wc-utils.ts
index 799b1c05f674..bcd6b0d63c6d 100644
--- a/app/core/WalletConnect/wc-utils.ts
+++ b/app/core/WalletConnect/wc-utils.ts
@@ -16,6 +16,7 @@ import { parseRelayParams } from '@walletconnect/utils';
 import qs from 'qs';
 import Routes from '../../../app/constants/navigation/Routes';
 import { store } from '../../../app/store';
+import type { WC2Metadata } from '../../actions/sdk/state';
 import {
   selectEvmChainId,
   selectEvmNetworkConfigurationsByChainId,
@@ -468,3 +469,18 @@ export const isEIP155Scope = (scope: CaipChainId): boolean => {
   const { namespace } = parseCaipChainId(scope);
   return isEIP155NameSpace(namespace);
 };
+
+/**
+ * Whether a permission-request origin belongs to the active WalletConnect flow.
+ *
+ * `wc2Metadata.id` stores the WC pairing topic (permission origin), not the
+ * dapp URL. Stale metadata must not classify unrelated in-app browser requests
+ * as WalletConnect.
+ */
+export const isWalletConnectPermissionOrigin = (
+  origin: string,
+  wc2Metadata?: Partial<WC2Metadata>,
+): boolean =>
+  Boolean(
+    wc2Metadata?.id && wc2Metadata.id.length > 0 && origin === wc2Metadata.id,
+  );
diff --git a/app/hooks/performance/onboardingPerformanceHooks.test.ts b/app/hooks/performance/onboardingPerformanceHooks.test.ts
index 328595cdb8f0..c5e68d20e868 100644
--- a/app/hooks/performance/onboardingPerformanceHooks.test.ts
+++ b/app/hooks/performance/onboardingPerformanceHooks.test.ts
@@ -235,7 +235,7 @@ describe('onboarding performance hooks', () => {
     [Routes.ONBOARDING.CHOOSE_PASSWORD, 'ChoosePassword/index.tsx'],
     [
       Routes.ONBOARDING.IMPORT_FROM_SECRET_RECOVERY_PHRASE,
-      'ImportFromSecretRecoveryPhrase/index.js',
+      'ImportFromSecretRecoveryPhrase/index.tsx',
     ],
     [
       Routes.ONBOARDING.ONBOARDING_OAUTH_REHYDRATE,
diff --git a/app/images/image-icons.js b/app/images/image-icons.js
index 5ef0236e008a..aecd5e200ef6 100644
--- a/app/images/image-icons.js
+++ b/app/images/image-icons.js
@@ -66,6 +66,7 @@ import TEMPO_NATIVE from './tempo-native.png';
 import ARC_NATIVE from './arc-native-token-logo.png';
 import ROBINHOOD from './robinhood.png';
 import GNOSIS_NATIVE from './gnosis-native-token-logo.png';
+import SOMNIA_NATIVE from './somnia.png';
 /// BEGIN:ONLY_INCLUDE_IF(tron)
 import TRON from './tron-logo.png';
 /// END:ONLY_INCLUDE_IF
@@ -152,4 +153,5 @@ export default {
   USDC: ARC_NATIVE,
   ROBINHOOD,
   XDAI: GNOSIS_NATIVE,
+  SOMI: SOMNIA_NATIVE,
 };
diff --git a/app/images/somnia.png b/app/images/somnia.png
new file mode 100644
index 000000000000..b2a80d82f217
Binary files /dev/null and b/app/images/somnia.png differ
diff --git a/app/multichain-stellar/remote-feature-flag.test.ts b/app/multichain-stellar/remote-feature-flag.test.ts
new file mode 100644
index 000000000000..690e16d3046c
--- /dev/null
+++ b/app/multichain-stellar/remote-feature-flag.test.ts
@@ -0,0 +1,64 @@
+import packageJson from '../../package.json';
+import {
+  isStellarAccountsFeatureEnabled,
+  type StellarAccountsFeatureFlag,
+} from './remote-feature-flag';
+
+describe('isStellarAccountsFeatureEnabled', () => {
+  it('returns true when flag is enabled and version meets minimum', () => {
+    const flag: StellarAccountsFeatureFlag = {
+      enabled: true,
+      minimumVersion: '1.0.0',
+    };
+
+    expect(isStellarAccountsFeatureEnabled(flag)).toBe(true);
+  });
+
+  it('returns false when flag is disabled', () => {
+    const flag: StellarAccountsFeatureFlag = {
+      enabled: false,
+      minimumVersion: '1.0.0',
+    };
+
+    expect(isStellarAccountsFeatureEnabled(flag)).toBe(false);
+  });
+
+  it('returns false when flag is undefined', () => {
+    expect(isStellarAccountsFeatureEnabled(undefined)).toBe(false);
+  });
+
+  it('returns false when flag is null', () => {
+    expect(isStellarAccountsFeatureEnabled(null)).toBe(false);
+  });
+
+  it('returns false when app version is below minimum version', () => {
+    const flag: StellarAccountsFeatureFlag = {
+      enabled: true,
+      minimumVersion: '999.999.999',
+    };
+
+    expect(isStellarAccountsFeatureEnabled(flag)).toBe(false);
+  });
+
+  it('returns true when app version equals minimum version', () => {
+    const flag: StellarAccountsFeatureFlag = {
+      enabled: true,
+      minimumVersion: packageJson.version,
+    };
+
+    expect(isStellarAccountsFeatureEnabled(flag)).toBe(true);
+  });
+
+  it('returns false when flag structure is invalid', () => {
+    expect(
+      isStellarAccountsFeatureEnabled({
+        enabled: true,
+      }),
+    ).toBe(false);
+  });
+
+  it('returns true for simple boolean flag', () => {
+    expect(isStellarAccountsFeatureEnabled(true)).toBe(true);
+    expect(isStellarAccountsFeatureEnabled(false)).toBe(false);
+  });
+});
diff --git a/app/multichain-stellar/remote-feature-flag.ts b/app/multichain-stellar/remote-feature-flag.ts
new file mode 100644
index 000000000000..98392d871f8b
--- /dev/null
+++ b/app/multichain-stellar/remote-feature-flag.ts
@@ -0,0 +1,54 @@
+import compareVersions from 'compare-versions';
+import packageJson from '../../package.json';
+
+const APP_VERSION = packageJson.version;
+
+/**
+ * Stellar accounts feature flag interface - matches extension pattern
+ */
+export interface StellarAccountsFeatureFlag {
+  enabled: boolean;
+  minimumVersion: string | null;
+}
+
+/**
+ * Shared helper to check whether Stellar accounts feature is enabled
+ * for a given application version. Keeps background and UI logic in sync.
+ * Accepts unknown type to handle JSON parsing from selectors.
+ *
+ * @param flagValue - The feature flag value from remote config
+ * @returns boolean - True if the feature is enabled, false otherwise.
+ */
+export const isStellarAccountsFeatureEnabled = (flagValue: unknown) => {
+  if (!flagValue || !APP_VERSION) {
+    return false;
+  }
+
+  // Simple boolean flag
+  if (typeof flagValue === 'boolean') {
+    return flagValue;
+  }
+
+  // Object with enabled and minimumVersion properties
+  if (typeof flagValue === 'object' && flagValue !== null) {
+    const flag = flagValue as StellarAccountsFeatureFlag;
+    const { enabled, minimumVersion } = flag;
+
+    if (!enabled) {
+      return false;
+    }
+
+    // Require version for safety (following multichain-accounts pattern)
+    if (!minimumVersion) {
+      return false;
+    }
+
+    try {
+      return compareVersions.compare(minimumVersion, APP_VERSION, '<=');
+    } catch {
+      return false;
+    }
+  }
+
+  return false;
+};
diff --git a/app/reducers/onboarding/index.test.ts b/app/reducers/onboarding/index.test.ts
index 764bf1211431..8293ee63319b 100644
--- a/app/reducers/onboarding/index.test.ts
+++ b/app/reducers/onboarding/index.test.ts
@@ -13,6 +13,7 @@ import {
   RESET_WALLET_HOME_ONBOARDING_STEPS,
   SET_WALLET_HOME_ONBOARDING_STEPS_STEP,
   SUPPRESS_WALLET_HOME_ONBOARDING_STEPS,
+  MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED,
 } from '../../actions/onboarding';
 import { ITrackingEvent } from '../../core/Analytics/MetaMetrics.types';
 import { AccountType } from '../../constants/onboarding';
@@ -30,6 +31,7 @@ describe('onboardingReducer', () => {
       suppressedReason: null,
       stepIndex: 0,
     },
+    pushNotificationOsPromptRequested: false,
   };
 
   it('returns the initial state when no action is provided', () => {
@@ -242,4 +244,32 @@ describe('onboardingReducer', () => {
     expect(state.walletHomeOnboardingStepsEligible).toBe(true);
     expect(state.walletHomeOnboardingSkipInitialBalanceWait).toBe(false);
   });
+
+  describe('MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED', () => {
+    it('records that the OS push permission request happened', () => {
+      const state = onboardingReducer(initialState, {
+        type: MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED,
+      });
+
+      expect(state.pushNotificationOsPromptRequested).toBe(true);
+    });
+
+    it('stays true when dispatched again', () => {
+      const state = onboardingReducer(
+        { ...initialState, pushNotificationOsPromptRequested: true },
+        { type: MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED },
+      );
+
+      expect(state.pushNotificationOsPromptRequested).toBe(true);
+    });
+
+    it('is cleared by CLEAR_ONBOARDING so a fresh wallet sees the notifications step again', () => {
+      const state = onboardingReducer(
+        { ...initialState, pushNotificationOsPromptRequested: true },
+        { type: CLEAR_ONBOARDING },
+      );
+
+      expect(state.pushNotificationOsPromptRequested).toBe(false);
+    });
+  });
 });
diff --git a/app/reducers/onboarding/index.ts b/app/reducers/onboarding/index.ts
index 7f79f6e9a71e..65e068ed20f9 100644
--- a/app/reducers/onboarding/index.ts
+++ b/app/reducers/onboarding/index.ts
@@ -16,6 +16,7 @@ import {
   RESET_WALLET_HOME_ONBOARDING_STEPS,
   SET_WALLET_HOME_ONBOARDING_STEPS_STEP,
   SUPPRESS_WALLET_HOME_ONBOARDING_STEPS,
+  MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED,
 } from '../../actions/onboarding';
 import { ITrackingEvent } from '../../core/Analytics/MetaMetrics.types';
 import { AccountType } from '../../constants/onboarding';
@@ -56,6 +57,13 @@ export interface OnboardingState {
 
   /** Present after migration 135; absent only on partially rehydrated legacy state. */
   walletHomeOnboardingSteps?: WalletHomeOnboardingStepsState;
+
+  /**
+   * True once the OS push notification permission request has been asked for. Users who got
+   * that far already answered the notifications question, so the wallet home checklist drops
+   * its notifications step instead of asking a second time.
+   */
+  pushNotificationOsPromptRequested: boolean;
 }
 
 export const initialOnboardingState: OnboardingState = {
@@ -66,6 +74,7 @@ export const initialOnboardingState: OnboardingState = {
   walletHomeOnboardingStepsEligible: false,
   walletHomeOnboardingSkipInitialBalanceWait: false,
   walletHomeOnboardingSteps: { ...WALLET_HOME_ONBOARDING_STEPS_INITIAL },
+  pushNotificationOsPromptRequested: false,
 };
 
 /**
@@ -171,6 +180,11 @@ const onboardingReducer = (
           : {}),
       };
     }
+    case MARK_PUSH_NOTIFICATION_OS_PROMPT_REQUESTED:
+      return {
+        ...state,
+        pushNotificationOsPromptRequested: true,
+      };
     default:
       return state;
   }
diff --git a/app/selectors/accountsController.test.ts b/app/selectors/accountsController.test.ts
index e80d5c0bfc76..fb454d9f5608 100644
--- a/app/selectors/accountsController.test.ts
+++ b/app/selectors/accountsController.test.ts
@@ -137,6 +137,24 @@ describe('Accounts Controller Selectors', () => {
         errorMessage,
       );
     });
+
+    it('does not throw an error if the selected account ID is empty', () => {
+      const result = selectSelectedInternalAccount({
+        engine: {
+          backgroundState: {
+            AccountsController: {
+              ...MOCK_ACCOUNTS_CONTROLLER_STATE,
+              internalAccounts: {
+                ...MOCK_ACCOUNTS_CONTROLLER_STATE.internalAccounts,
+                selectedAccount: '',
+              },
+            },
+          },
+        },
+      } as RootState);
+      expect(result).toBeUndefined();
+      expect(mockedCaptureException).not.toHaveBeenCalled();
+    });
   });
   describe('selectInternalAccounts', () => {
     it(`returns internal accounts of the accounts controller sorted by the keyring controller's accounts`, () => {
diff --git a/app/selectors/accountsController.ts b/app/selectors/accountsController.ts
index 78ab5d2e7b02..fdc90c774627 100644
--- a/app/selectors/accountsController.ts
+++ b/app/selectors/accountsController.ts
@@ -118,13 +118,14 @@ export const selectSelectedInternalAccount = createSelector(
     const account = accounts[selectedAccountId];
 
     if (!account) {
-      const err = new Error(
-        `selectSelectedInternalAccount: Account with ID ${selectedAccountId} not found.`,
-      );
-      captureException(err);
-      return undefined;
+      if (selectedAccountId !== '') {
+        const err = new Error(
+          `selectSelectedInternalAccount: Account with ID ${selectedAccountId} not found.`,
+        );
+        captureException(err);
+      }
     }
-    return account;
+    return account ?? undefined;
   },
 );
 
diff --git a/app/selectors/assets/assets-list.ts b/app/selectors/assets/assets-list.ts
index 4c7a756e4591..3fcba8b9e9d5 100644
--- a/app/selectors/assets/assets-list.ts
+++ b/app/selectors/assets/assets-list.ts
@@ -60,6 +60,7 @@ import {
   getTokensControllerAllIgnoredTokens,
   getTokensControllerAllTokens,
 } from './assets-migration';
+import { isAssetSupportActivation } from '../stellar/stellar-assets';
 import { filterExcludedAssets } from '../../enablement/assets/networks-customization';
 
 /**
@@ -343,6 +344,7 @@ export const createSelectSortedAssetsBySelectedAccountGroup = (
         .flatMap(([_, chainAssets]) =>
           chainAssets.filter((asset) => {
             if (isTronSpecialAsset(asset.chainId, asset.symbol)) return false;
+            if (isAssetSupportActivation(asset.assetId)) return true;
             if (
               hideZeroBalance &&
               !asset.isNative &&
@@ -497,6 +499,7 @@ export const selectSortedAssetsBySelectedAccountGroupForChainIdsByBalance =
         .flatMap(([_, chainAssets]) =>
           chainAssets.filter((asset) => {
             if (isTronSpecialAsset(asset.chainId, asset.symbol)) return false;
+            if (isAssetSupportActivation(asset.assetId)) return true;
             if (hideZeroBalance && parseFloat(asset.balance ?? '0') === 0)
               return false;
             return true;
diff --git a/app/selectors/cardController.test.ts b/app/selectors/cardController.test.ts
index 9f92bdddab0e..80a7a33ebefb 100644
--- a/app/selectors/cardController.test.ts
+++ b/app/selectors/cardController.test.ts
@@ -1,7 +1,6 @@
 import { RootState } from '../reducers';
 import {
   selectCardSelectedCountry,
-  selectCardSelectedCardProgramId,
   selectCardActiveProviderId,
   selectIsCardAuthenticated,
   selectCardLastUnauthenticatedReason,
@@ -12,6 +11,7 @@ import {
   selectCardUserLocation,
   selectCardHomeData,
   selectCardHomeDataStatus,
+  selectIsCardStateResolved,
   selectCardVerificationStatus,
   selectIsCardVerified,
   selectHasMetalCard,
@@ -121,7 +121,6 @@ const createMockRootState = (
       backgroundState: {
         CardController: {
           selectedCountry: null,
-          selectedCardProgramId: null,
           activeProviderId: null,
           isAuthenticated: false,
           cardholderAccounts: [],
@@ -185,22 +184,6 @@ describe('CardController selectors', () => {
     });
   });
 
-  describe('selectCardSelectedCardProgramId', () => {
-    it('returns null when no card program is selected', () => {
-      const state = createMockRootState();
-
-      expect(selectCardSelectedCardProgramId(state)).toBeNull();
-    });
-
-    it('returns the selected card program id', () => {
-      const state = createMockRootState({
-        selectedCardProgramId: 'program-alpha',
-      });
-
-      expect(selectCardSelectedCardProgramId(state)).toBe('program-alpha');
-    });
-  });
-
   describe('selectCardActiveProviderId', () => {
     it('returns null when no provider is active', () => {
       const state = createMockRootState();
@@ -534,6 +517,79 @@ describe('selectCardHomeDataStatus', () => {
   });
 });
 
+describe('selectIsCardStateResolved', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockIsEthAccount.mockReturnValue(true);
+    mockSelectSelectedInternalAccountByScope.mockReturnValue(
+      jest.fn().mockReturnValue(undefined),
+    );
+  });
+
+  it('returns true when status is success with a verification status', () => {
+    const state = createMockRootState({
+      cardHomeDataStatus: 'success',
+      isAuthenticated: true,
+      cardHomeData: {
+        account: { verificationStatus: 'PENDING' },
+      } as unknown as CardControllerState['cardHomeData'],
+    });
+    expect(selectIsCardStateResolved(state)).toBe(true);
+  });
+
+  it('returns false when status is success but account is missing', () => {
+    const state = createMockRootState({
+      cardHomeDataStatus: 'success',
+      isAuthenticated: true,
+      cardHomeData: {
+        account: null,
+      } as unknown as CardControllerState['cardHomeData'],
+    });
+    expect(selectIsCardStateResolved(state)).toBe(false);
+  });
+
+  it('returns false when status is error', () => {
+    const state = createMockRootState({
+      cardHomeDataStatus: 'error',
+      isAuthenticated: true,
+    });
+    expect(selectIsCardStateResolved(state)).toBe(false);
+  });
+
+  it('returns true for an unauthenticated non-cardholder even while idle', () => {
+    const state = createMockRootState({
+      cardHomeDataStatus: 'idle',
+      isAuthenticated: false,
+      cardholderAccounts: [],
+    });
+    expect(selectIsCardStateResolved(state)).toBe(true);
+  });
+
+  it('returns false while loading for an authenticated user', () => {
+    const state = createMockRootState({
+      cardHomeDataStatus: 'loading',
+      isAuthenticated: true,
+    });
+    expect(selectIsCardStateResolved(state)).toBe(false);
+  });
+
+  it('returns false while idle for a cardholder', () => {
+    mockSelectSelectedInternalAccountByScope.mockReturnValue(
+      jest.fn().mockReturnValue({
+        address: '0xabc',
+        type: 'eip155:eoa',
+        scopes: ['eip155:0'],
+      } as unknown as InternalAccount),
+    );
+    const state = createMockRootState({
+      cardHomeDataStatus: 'idle',
+      isAuthenticated: false,
+      cardholderAccounts: ['eip155:0:0xabc'],
+    });
+    expect(selectIsCardStateResolved(state)).toBe(false);
+  });
+});
+
 const mockPrimaryAsset = {
   symbol: 'USDC',
   name: 'USD Coin',
diff --git a/app/selectors/cardController.ts b/app/selectors/cardController.ts
index 0d6094c70065..8475391a0441 100644
--- a/app/selectors/cardController.ts
+++ b/app/selectors/cardController.ts
@@ -87,13 +87,6 @@ export const selectCardSelectedCountry = createSelector(
     cardState?.selectedCountry ?? null,
 );
 
-/** Temporary: Immersve cardProgramId chosen on SignUp for internal testing. */
-export const selectCardSelectedCardProgramId = createSelector(
-  selectCardControllerState,
-  (cardState: CardControllerState | undefined) =>
-    cardState?.selectedCardProgramId ?? null,
-);
-
 export const selectCardActiveProviderId = createSelector(
   selectCardControllerState,
   (cardState: CardControllerState | undefined) =>
@@ -184,6 +177,17 @@ export const selectCardHomeDataStatus = createSelector(
     cardState?.cardHomeDataStatus ?? 'idle',
 );
 
+export const selectIsCardStateResolved = createSelector(
+  selectCardHomeDataStatus,
+  selectCardVerificationStatus,
+  selectIsCardAuthenticated,
+  selectIsCardholder,
+  (status, verificationStatus, isAuthenticated, isCardholder) =>
+    (status === 'success' &&
+      (!isAuthenticated || verificationStatus !== null)) ||
+    (!isAuthenticated && !isCardholder),
+);
+
 export const selectMoneyAccountVedaTokenConfig = createSelector(
   selectCardFeatureFlag,
   (cardFeatureFlag): VedaTokenConfig | null =>
diff --git a/app/selectors/deFiPositionsSectionEnabled.test.ts b/app/selectors/deFiPositionsSectionEnabled.test.ts
index e12cd281192e..4a47755d08d6 100644
--- a/app/selectors/deFiPositionsSectionEnabled.test.ts
+++ b/app/selectors/deFiPositionsSectionEnabled.test.ts
@@ -1,16 +1,27 @@
 import { selectDeFiPositionsSectionEnabled } from './deFiPositionsSectionEnabled';
 
 describe('selectDeFiPositionsSectionEnabled', () => {
-  it('returns true only when remote flag and basic functionality are true', () => {
-    expect(selectDeFiPositionsSectionEnabled.resultFunc(true, true)).toBe(true);
-    expect(selectDeFiPositionsSectionEnabled.resultFunc(true, false)).toBe(
-      false,
-    );
-    expect(selectDeFiPositionsSectionEnabled.resultFunc(false, true)).toBe(
-      false,
-    );
-    expect(selectDeFiPositionsSectionEnabled.resultFunc(false, false)).toBe(
+  it('returns true when assets DeFi is enabled, V2 is disabled, and basic functionality is enabled', () => {
+    expect(
+      selectDeFiPositionsSectionEnabled.resultFunc(true, false, true),
+    ).toBe(true);
+  });
+
+  it('returns false when V2 is enabled', () => {
+    expect(selectDeFiPositionsSectionEnabled.resultFunc(true, true, true)).toBe(
       false,
     );
   });
+
+  it('returns false when basic functionality is disabled', () => {
+    expect(
+      selectDeFiPositionsSectionEnabled.resultFunc(true, false, false),
+    ).toBe(false);
+  });
+
+  it('returns false when assets DeFi positions is disabled', () => {
+    expect(
+      selectDeFiPositionsSectionEnabled.resultFunc(false, false, true),
+    ).toBe(false);
+  });
 });
diff --git a/app/selectors/deFiPositionsSectionEnabled.ts b/app/selectors/deFiPositionsSectionEnabled.ts
index 12f3c719160b..0277b44f8025 100644
--- a/app/selectors/deFiPositionsSectionEnabled.ts
+++ b/app/selectors/deFiPositionsSectionEnabled.ts
@@ -1,5 +1,6 @@
 import { createSelector } from 'reselect';
 import { selectAssetsDefiPositionsEnabled } from './featureFlagController/assetsDefiPositions';
+import { selectDefiControllerV2Enabled } from './featureFlagController/defiControllerV2';
 import { selectBasicFunctionalityEnabled } from './settings';
 
 /**
@@ -11,7 +12,14 @@ import { selectBasicFunctionalityEnabled } from './settings';
  */
 export const selectDeFiPositionsSectionEnabled = createSelector(
   selectAssetsDefiPositionsEnabled,
+  selectDefiControllerV2Enabled,
   selectBasicFunctionalityEnabled,
-  (assetsDefiPositionsEnabled, basicFunctionalityEnabled) =>
-    assetsDefiPositionsEnabled && basicFunctionalityEnabled,
+  (
+    assetsDefiPositionsEnabled,
+    defiControllerV2Enabled,
+    basicFunctionalityEnabled,
+  ) =>
+    assetsDefiPositionsEnabled &&
+    basicFunctionalityEnabled &&
+    !defiControllerV2Enabled,
 );
diff --git a/app/selectors/deFiPositionsV2SectionEnabled.test.ts b/app/selectors/deFiPositionsV2SectionEnabled.test.ts
new file mode 100644
index 000000000000..9036c6b19d45
--- /dev/null
+++ b/app/selectors/deFiPositionsV2SectionEnabled.test.ts
@@ -0,0 +1,21 @@
+import { selectDeFiPositionsV2SectionEnabled } from './deFiPositionsV2SectionEnabled';
+
+describe('selectDeFiPositionsV2SectionEnabled', () => {
+  it('returns true when both the V2 flag and basic functionality are enabled', () => {
+    expect(selectDeFiPositionsV2SectionEnabled.resultFunc(true, true)).toBe(
+      true,
+    );
+  });
+
+  it('returns false when the V2 flag is disabled', () => {
+    expect(selectDeFiPositionsV2SectionEnabled.resultFunc(false, true)).toBe(
+      false,
+    );
+  });
+
+  it('returns false when basic functionality is disabled', () => {
+    expect(selectDeFiPositionsV2SectionEnabled.resultFunc(true, false)).toBe(
+      false,
+    );
+  });
+});
diff --git a/app/selectors/deFiPositionsV2SectionEnabled.ts b/app/selectors/deFiPositionsV2SectionEnabled.ts
new file mode 100644
index 000000000000..6b4e7357b618
--- /dev/null
+++ b/app/selectors/deFiPositionsV2SectionEnabled.ts
@@ -0,0 +1,19 @@
+import { createSelector } from 'reselect';
+import { selectDefiControllerV2Enabled } from './featureFlagController/defiControllerV2';
+import { selectBasicFunctionalityEnabled } from './settings';
+
+/**
+ * Whether the homepage / DeFi UI should use DeFi positions V2.
+ * True when V2 is on and basic functionality is enabled (mutually exclusive with
+ * the V1 path via {@link selectDefiControllerV2Enabled}).
+ * Onboarding is checked inside the V2 controller / fetch hook separately.
+ *
+ * Kept out of `featureFlagController/defiControllerV2` to avoid importing
+ * `settings` there (circular init risk, same pattern as V1).
+ */
+export const selectDeFiPositionsV2SectionEnabled = createSelector(
+  selectDefiControllerV2Enabled,
+  selectBasicFunctionalityEnabled,
+  (defiControllerV2Enabled, basicFunctionalityEnabled) =>
+    defiControllerV2Enabled && basicFunctionalityEnabled,
+);
diff --git a/app/selectors/defiPositionsControllerV2.test.ts b/app/selectors/defiPositionsControllerV2.test.ts
new file mode 100644
index 000000000000..1c3e7c7a5e2b
--- /dev/null
+++ b/app/selectors/defiPositionsControllerV2.test.ts
@@ -0,0 +1,44 @@
+import { selectDeFiPositionsV2State } from './defiPositionsControllerV2';
+import { RootState } from '../reducers';
+
+describe('defiPositionsControllerV2 selectors', () => {
+  describe('selectDeFiPositionsV2State', () => {
+    it('returns allDeFiPositionsV2 from controller state', () => {
+      const positions = {
+        'account-id-1': [
+          {
+            protocolId: 'aave',
+            chainId: 'eip155:1',
+            productName: 'Aave',
+            protocolIconUrl: 'https://example.com/aave.png',
+            marketValue: 100,
+            iconGroup: [],
+            sections: [],
+          },
+        ],
+      };
+
+      const result = selectDeFiPositionsV2State({
+        engine: {
+          backgroundState: {
+            DeFiPositionsControllerV2: {
+              allDeFiPositionsV2: positions,
+            },
+          },
+        },
+      } as unknown as RootState);
+
+      expect(result).toEqual(positions);
+    });
+
+    it('returns an empty object when controller state is missing', () => {
+      const result = selectDeFiPositionsV2State({
+        engine: {
+          backgroundState: {},
+        },
+      } as unknown as RootState);
+
+      expect(result).toEqual({});
+    });
+  });
+});
diff --git a/app/selectors/defiPositionsControllerV2.ts b/app/selectors/defiPositionsControllerV2.ts
new file mode 100644
index 000000000000..2cbcab7113bb
--- /dev/null
+++ b/app/selectors/defiPositionsControllerV2.ts
@@ -0,0 +1,15 @@
+import { createSelector } from 'reselect';
+import type { DeFiPositionsByAccount } from '@metamask/assets-controllers';
+import { RootState } from '../reducers';
+
+const selectDeFiPositionsControllerV2State = (state: RootState) =>
+  state?.engine?.backgroundState?.DeFiPositionsControllerV2;
+
+/**
+ * Selects DeFi positions V2 state keyed by internal account ID.
+ */
+export const selectDeFiPositionsV2State = createSelector(
+  selectDeFiPositionsControllerV2State,
+  (controllerState): DeFiPositionsByAccount =>
+    controllerState?.allDeFiPositionsV2 ?? {},
+);
diff --git a/app/selectors/featureFlagController/card/index.ts b/app/selectors/featureFlagController/card/index.ts
index 8881d217a9f2..65e8ad2474a6 100644
--- a/app/selectors/featureFlagController/card/index.ts
+++ b/app/selectors/featureFlagController/card/index.ts
@@ -178,17 +178,10 @@ export interface CardFeatureFlag {
   immersveCountries?: string[];
 }
 
-export interface CardProgramIdOption {
-  name: string;
-  id: string;
-}
-
 export interface ImmersveProgramConfig {
   enabled?: boolean;
   network?: string;
   cardProgramId?: string;
-  /** Temporary: multi-program list for internal testing selectors. Easy to remove. */
-  cardProgramIds?: CardProgramIdOption[];
   clientApplicationId?: string;
   partnerAccountId?: string;
   fundingChannelId?: string;
diff --git a/app/selectors/featureFlagController/defiControllerV2/index.test.ts b/app/selectors/featureFlagController/defiControllerV2/index.test.ts
new file mode 100644
index 000000000000..2297d8f029ea
--- /dev/null
+++ b/app/selectors/featureFlagController/defiControllerV2/index.test.ts
@@ -0,0 +1,43 @@
+import {
+  DEFAULT_FEATURE_FLAG_VALUES,
+  FeatureFlagNames,
+} from '../../../constants/featureFlags';
+import { selectDefiControllerV2Enabled } from '.';
+
+describe('selectDefiControllerV2Enabled', () => {
+  it('returns true when enabled is true', () => {
+    expect(
+      selectDefiControllerV2Enabled.resultFunc({
+        [FeatureFlagNames.defiControllerV2]: { enabled: true },
+      }),
+    ).toBe(true);
+  });
+
+  it('returns false when enabled is false', () => {
+    expect(
+      selectDefiControllerV2Enabled.resultFunc({
+        [FeatureFlagNames.defiControllerV2]: { enabled: false },
+      }),
+    ).toBe(false);
+  });
+
+  it('returns default when remote flag is not set', () => {
+    expect(selectDefiControllerV2Enabled.resultFunc({})).toBe(
+      Boolean(
+        (
+          DEFAULT_FEATURE_FLAG_VALUES[FeatureFlagNames.defiControllerV2] as {
+            enabled?: boolean;
+          }
+        )?.enabled,
+      ),
+    );
+  });
+
+  it('returns false when flag has invalid shape', () => {
+    expect(
+      selectDefiControllerV2Enabled.resultFunc({
+        [FeatureFlagNames.defiControllerV2]: { invalid: 'structure' },
+      }),
+    ).toBe(false);
+  });
+});
diff --git a/app/selectors/featureFlagController/defiControllerV2/index.ts b/app/selectors/featureFlagController/defiControllerV2/index.ts
new file mode 100644
index 000000000000..efeaaf4c6be5
--- /dev/null
+++ b/app/selectors/featureFlagController/defiControllerV2/index.ts
@@ -0,0 +1,31 @@
+import { createSelector } from 'reselect';
+import { selectRemoteFeatureFlags } from '..';
+import {
+  DEFAULT_FEATURE_FLAG_VALUES,
+  FeatureFlagNames,
+} from '../../../constants/featureFlags';
+
+interface DefiControllerV2FeatureFlag {
+  enabled?: boolean;
+}
+
+/**
+ * Whether DeFi Positions Controller V2 is enabled.
+ * When true, V2 is used and the legacy V1 controller is disabled.
+ * When false, V1 is used and V2 is disabled.
+ *
+ * Remote flag key: `defiControllerV2`. Resolved shape is `{ enabled: boolean }`
+ * (version / threshold rollout is handled by RemoteFeatureFlagController).
+ */
+export const selectDefiControllerV2Enabled = createSelector(
+  selectRemoteFeatureFlags,
+  (remoteFeatureFlags) => {
+    const featureFlag = (remoteFeatureFlags[
+      FeatureFlagNames.defiControllerV2
+    ] ?? DEFAULT_FEATURE_FLAG_VALUES[FeatureFlagNames.defiControllerV2]) as
+      | DefiControllerV2FeatureFlag
+      | undefined;
+
+    return Boolean(featureFlag?.enabled);
+  },
+);
diff --git a/app/selectors/featureFlagController/stellarAccountsEnabled/index.test.ts b/app/selectors/featureFlagController/stellarAccountsEnabled/index.test.ts
new file mode 100644
index 000000000000..10888bdc98ce
--- /dev/null
+++ b/app/selectors/featureFlagController/stellarAccountsEnabled/index.test.ts
@@ -0,0 +1,97 @@
+import { selectIsStellarAccountsEnabled } from '.';
+import mockedEngine from '../../../core/__mocks__/MockedEngine';
+import { mockedEmptyFlagsState, mockedUndefinedFlagsState } from '../mocks';
+import packageJson from '../../../../package.json';
+import type { StellarAccountsFeatureFlag } from '../../../multichain-stellar/remote-feature-flag';
+import { FeatureFlags } from '@metamask/remote-feature-flag-controller';
+
+jest.mock('../../../core/Engine', () => ({
+  init: () => mockedEngine.init(),
+}));
+
+const originalEnv = process.env;
+beforeEach(() => {
+  jest.resetModules();
+  process.env = { ...originalEnv };
+});
+
+afterEach(() => {
+  process.env = originalEnv;
+  jest.clearAllMocks();
+});
+
+// Helper function to create mock state with stellarAccounts flag
+function mockStateWith(stellarAccounts: StellarAccountsFeatureFlag) {
+  return {
+    engine: {
+      backgroundState: {
+        RemoteFeatureFlagController: {
+          cacheTimestamp: 0,
+          remoteFeatureFlags: {
+            stellarAccounts,
+            // Not sure why this cannot be inferred properly.
+          } as unknown as FeatureFlags,
+        },
+      },
+    },
+  };
+}
+
+describe('selectIsStellarAccountsEnabled', () => {
+  it('returns true when stellarAccounts flag is enabled and version meets minimum', () => {
+    const mockedState = mockStateWith({
+      enabled: true,
+      minimumVersion: '1.0.0',
+    });
+
+    expect(selectIsStellarAccountsEnabled(mockedState)).toBe(true);
+  });
+
+  it('returns false when stellarAccounts flag is disabled', () => {
+    const mockedState = mockStateWith({
+      enabled: false,
+      minimumVersion: '1.0.0',
+    });
+
+    expect(selectIsStellarAccountsEnabled(mockedState)).toBe(false);
+  });
+
+  it('returns false when stellarAccounts flag is undefined', () => {
+    expect(selectIsStellarAccountsEnabled(mockedUndefinedFlagsState)).toBe(
+      false,
+    );
+  });
+
+  it('returns false when stellarAccounts flag is empty', () => {
+    expect(selectIsStellarAccountsEnabled(mockedEmptyFlagsState)).toBe(false);
+  });
+
+  it('returns false when app version is below minimum version', () => {
+    const mockedState = mockStateWith({
+      enabled: true,
+      minimumVersion: '999.999.999',
+    });
+
+    expect(selectIsStellarAccountsEnabled(mockedState)).toBe(false);
+  });
+
+  it('returns true when app version equals minimum version', () => {
+    const currentVersion = packageJson.version;
+    const mockedState = mockStateWith({
+      enabled: true,
+      minimumVersion: currentVersion,
+    });
+
+    expect(selectIsStellarAccountsEnabled(mockedState)).toBe(true);
+  });
+
+  it('returns false when flag structure is invalid', () => {
+    // @ts-expect-error - Testing error case.
+    const mockedState = mockStateWith({
+      enabled: true,
+      // Missing minimumVersion - should return false for safety
+    });
+
+    expect(selectIsStellarAccountsEnabled(mockedState)).toBe(false);
+  });
+});
diff --git a/app/selectors/featureFlagController/stellarAccountsEnabled/index.ts b/app/selectors/featureFlagController/stellarAccountsEnabled/index.ts
new file mode 100644
index 000000000000..54f864eeb324
--- /dev/null
+++ b/app/selectors/featureFlagController/stellarAccountsEnabled/index.ts
@@ -0,0 +1,15 @@
+import { createSelector } from 'reselect';
+import { selectRemoteFeatureFlags } from '..';
+import { isStellarAccountsFeatureEnabled } from '../../../multichain-stellar/remote-feature-flag';
+
+/**
+ * Selector to check if the stellarAccounts feature flag is enabled.
+ * Uses shared implementation for consistency with extension.
+ */
+export const selectIsStellarAccountsEnabled = createSelector(
+  selectRemoteFeatureFlags,
+  (remoteFeatureFlags): boolean => {
+    const { stellarAccounts } = remoteFeatureFlags;
+    return isStellarAccountsFeatureEnabled(stellarAccounts);
+  },
+);
diff --git a/app/selectors/multichain/evm.test.tsx b/app/selectors/multichain/evm.test.tsx
index e8d3873099ed..0428e4dae5ec 100644
--- a/app/selectors/multichain/evm.test.tsx
+++ b/app/selectors/multichain/evm.test.tsx
@@ -2,14 +2,12 @@ import React from 'react';
 import { Text } from 'react-native';
 import { RootState } from '../../reducers';
 import {
-  selectedAccountNativeTokenCachedBalanceByChainId,
-  selectAccountTokensAcrossChains,
-  selectNativeEvmAsset,
-  selectStakedEvmAsset,
-  selectEvmTokens,
-  selectEvmTokensWithZeroBalanceFilter,
-  makeSelectAssetByAddressAndChainId,
+  selectedAccountNativeTokenCachedBalanceByChainIdForAddress,
+  selectAccountTokensAcrossChainsForAddress,
+  selectNativeTokensAcrossChainsForAddress,
 } from './evm';
+import { selectAllTokens } from '../tokensController';
+import { TokenI } from '../../components/UI/Tokens/types';
 import { SolScope } from '@metamask/keyring-api';
 import { GetByQuery } from '@testing-library/react-native/build/queries/make-queries';
 import {
@@ -148,10 +146,14 @@ describe('Multichain Selectors', () => {
     },
   } as unknown as RootState;
 
-  describe('selectedAccountNativeTokenCachedBalanceByChainId', () => {
-    it('should return native token balances for all chains', () => {
-      const result =
-        selectedAccountNativeTokenCachedBalanceByChainId(mockState);
+  const MOCK_SELECTED_ADDRESS = '0xAddress1';
+
+  describe('selectedAccountNativeTokenCachedBalanceByChainIdForAddress', () => {
+    it('returns native token balances for every chain', () => {
+      const result = selectedAccountNativeTokenCachedBalanceByChainIdForAddress(
+        mockState,
+        MOCK_SELECTED_ADDRESS,
+      );
       expect(result).toEqual({
         '0x1': {
           balance: '0x1',
@@ -168,32 +170,21 @@ describe('Multichain Selectors', () => {
       });
     });
 
-    it('should return empty object when no account is selected', () => {
-      const stateWithoutAccount = {
-        ...mockState,
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            AccountsController: {
-              internalAccounts: {
-                selectedAccount: undefined,
-                accounts: {},
-              },
-            },
-          },
-        },
-      } as unknown as RootState;
-
-      const result =
-        selectedAccountNativeTokenCachedBalanceByChainId(stateWithoutAccount);
+    it('returns an empty object when no address is provided', () => {
+      const result = selectedAccountNativeTokenCachedBalanceByChainIdForAddress(
+        mockState,
+        undefined,
+      );
       expect(result).toEqual({});
     });
   });
 
-  describe('selectAccountTokensAcrossChains', () => {
-    it('should return tokens across all chains for selected account', () => {
-      const result = selectAccountTokensAcrossChains(mockState);
+  describe('selectAccountTokensAcrossChainsForAddress', () => {
+    it('returns tokens across all chains for the given account', () => {
+      const result = selectAccountTokensAcrossChainsForAddress(
+        mockState,
+        MOCK_SELECTED_ADDRESS,
+      );
       expect(result).toHaveProperty('0x1');
 
       const chain1Tokens = result['0x1'] || [];
@@ -218,8 +209,11 @@ describe('Multichain Selectors', () => {
       expect(tk1Token?.isNative).toBe(false);
     });
 
-    it('should handle multiple chains correctly', () => {
-      const result = selectAccountTokensAcrossChains(mockState);
+    it('includes tokens from every configured chain', () => {
+      const result = selectAccountTokensAcrossChainsForAddress(
+        mockState,
+        MOCK_SELECTED_ADDRESS,
+      );
       expect(result).toHaveProperty('0x89');
       const polygonTokens = result['0x89'];
       expect(polygonTokens.length).toBeGreaterThan(0);
@@ -227,484 +221,26 @@ describe('Multichain Selectors', () => {
     });
   });
 
-  describe('selectNativeEvmAsset', () => {
-    const testState: RootState = {
-      engine: {
-        backgroundState: {
-          ...mockState.engine.backgroundState,
-          AccountTrackerController: {
-            accountsByChainId: {},
-          },
-          NetworkController: {
-            ...mockState.engine.backgroundState.NetworkController,
-            selectedNetworkClientId: '0x1',
-          },
-          AccountsController: {
-            internalAccounts: {
-              selectedAccount: '',
-              accounts: {},
-            },
-          },
-        },
-      },
-      settings: {
-        showFiatOnTestnets: true,
-      },
-    } as unknown as RootState;
-    it('should return undefined if accountBalanceByChainId is not provided', () => {
-      const result = selectNativeEvmAsset(testState);
-      expect(result).toBeUndefined();
-    });
-
-    it('should return the correct native EVM asset structure', () => {
-      const result = selectNativeEvmAsset(mockState);
-
-      expect(result).toEqual({
-        decimals: 18,
-        name: 'Ethereum',
-        symbol: 'ETH',
-        isETH: true,
-        balance: '< 0.00001',
-        balanceFiat: '$0',
-        logo: '../images/eth-logo-new.png',
-        address: zeroAddress(),
-      });
-    });
-
-    it('should return asset name as ticker if not ETH', () => {
-      const testStateOverride = {
-        ...testState,
-        engine: {
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            NetworkController: {
-              ...mockState.engine.backgroundState.NetworkController,
-              selectedNetworkClientId: '0x89',
-            },
-          },
-        },
-      } as unknown as RootState;
-      const result = selectNativeEvmAsset(testStateOverride);
-
-      expect(result).toEqual({
-        decimals: 18,
-        name: 'POL',
-        symbol: 'POL',
-        isETH: true,
-        balance: '< 0.00001',
-        balanceFiat: '$0',
-        logo: '../images/eth-logo-new.png',
-        address: zeroAddress(),
-      });
-    });
-  });
-
-  describe('selectStakedEvmAsset', () => {
-    it('should return undefined if accountBalanceByChainId is not provided', () => {
-      const testState: RootState = {
-        engine: {
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            AccountTrackerController: {
-              accountsByChainId: {},
-            },
-            AccountsController: {
-              internalAccounts: {
-                selectedAccount: '',
-                accounts: {},
-              },
-            },
-          },
-        },
-        settings: {
-          showFiatOnTestnets: true,
-        },
-      } as unknown as RootState;
-
-      const result = selectStakedEvmAsset(testState);
-      expect(result).toBeUndefined();
-    });
-
-    it('should return undefined if stakedBalance is missing', () => {
-      const testState: RootState = {
-        ...mockState,
-        engine: {
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            AccountTrackerController: {
-              accountsByChainId: {
-                '0x1': {
-                  balance: '0x1', // 1 ETH
-                },
-              },
-            },
-          },
-        },
-      } as unknown as RootState;
-
-      const result = selectStakedEvmAsset(testState);
-      expect(result).toBeUndefined();
-    });
-
-    it('should return undefined if stakedBalance is zero', () => {
-      const testState: RootState = {
-        ...mockState,
-        engine: {
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            AccountTrackerController: {
-              accountsByChainId: {
-                '0x1': {
-                  balance: '0x1',
-                  stakedBalance: '0x2',
-                },
-              },
-            },
-          },
-        },
-      } as unknown as RootState;
-
-      const result = selectStakedEvmAsset(testState);
-      expect(result).toBeUndefined();
-    });
-
-    it('should return undefined if nativeAsset is missing', () => {
-      const testState: RootState = {
-        ...mockState,
-        engine: {
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            AccountTrackerController: {
-              accountsByChainId: {
-                '0x1': {
-                  balance: '0x1',
-                  stakedBalance: '0x2',
-                },
-              },
-            },
-          },
-        },
-      } as unknown as RootState;
-
-      const result = selectStakedEvmAsset(testState);
-      expect(result).toBeUndefined();
-    });
-
-    it('should return the correct staked EVM asset structure', () => {
-      const result = selectStakedEvmAsset(mockState);
-
-      expect(result).toEqual({
-        decimals: 18,
-        name: 'Staked Ethereum',
-        symbol: 'ETH',
-        isETH: true,
-        isStaked: true,
-        balance: '< 0.00001',
-        balanceFiat: '$0',
-        logo: '../images/eth-logo-new.png',
-        address: zeroAddress(),
-      });
-    });
-  });
-
-  describe('selectEvmTokensWithZeroBalanceFilter', () => {
-    it('should return the same memoized reference, when called with the same state', () => {
-      const result1 = selectEvmTokensWithZeroBalanceFilter(mockState);
-      const result2 = selectEvmTokensWithZeroBalanceFilter(mockState);
-      expect(result1 === result2).toBe(true);
-    });
-
-    it('should return all tokens when hideZeroBalanceTokens is false', () => {
-      const testState = {
-        ...mockState,
-        settings: { ...mockState.settings, hideZeroBalanceTokens: false },
-      } as unknown as RootState;
-
-      const result = selectEvmTokensWithZeroBalanceFilter(testState);
-
-      expect(result).toBeDefined();
-      expect(result.length).toBeGreaterThan(0); // Ensure all tokens are returned
-    });
-
-    it('should filter out zero balance tokens when hideZeroBalanceTokens is true', () => {
-      const testState = {
-        ...mockState,
-        settings: { ...mockState.settings, hideZeroBalanceTokens: true },
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            AccountTrackerController: {
-              accountsByChainId: {
-                '0x1': {
-                  '0xAddress1': {
-                    balance: '0x0',
-                    stakedBalance: '0x0',
-                  },
-                },
-              },
-            },
-            TokenBalancesController: {
-              tokenBalances: {
-                '0xAddress1': {
-                  '0x1': {
-                    '0xToken1': '0x0', // Simulating zero balance token
-                  },
-                },
-              },
-            },
-          },
-        },
-      } as unknown as RootState;
-
-      const result = selectEvmTokensWithZeroBalanceFilter(testState);
-
-      expect(result).toBeDefined();
-      expect(result.length).toBe(0); // Should remove all tokens with zero balance
-    });
-
-    it('should keep native tokens when on current network, even if zero balance', () => {
-      const testState = {
-        ...mockState,
-        settings: { ...mockState.settings, hideZeroBalanceTokens: true },
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            AccountTrackerController: {
-              accountsByChainId: {
-                '0x1': {
-                  '0xAddress1': {
-                    balance: '0x0',
-                    stakedBalance: '0x0', // simulating a staked balance
-                  },
-                },
-              },
-            },
-            TokenBalancesController: {
-              tokenBalances: {
-                '0xAddress1': {
-                  '0x1': {
-                    '0xToken1': '0x0',
-                  },
-                },
-              },
-            },
-            PreferencesController: {
-              tokenNetworkFilter: {
-                '0x1': true, // user is on "current network" filter, since NetworkController has multiple networks, and we are only filtering to one chain here
-              },
-            },
-          },
-        },
-      } as unknown as RootState;
-
-      const result = selectEvmTokensWithZeroBalanceFilter(testState);
-      expect(result).toBeDefined();
-      expect(result.every((token) => token.isNative === true)).toBeTruthy();
-      expect(result.every((token) => token.balance === '0')).toBeTruthy();
-      expect(
-        result.some((token) => token.name === 'Staked Ethereum'),
-      ).toBeTruthy();
-      expect(result.length).toBe(3); // Native tokens should remain and Staked Ethereum
-    });
-  });
-
-  describe('selectEvmTokens', () => {
-    it('should return the same memoized reference, when called with the same state', () => {
-      const result1 = selectEvmTokens(mockState);
-      const result2 = selectEvmTokens(mockState);
-      expect(result1 === result2).toBe(true);
-    });
-
-    it('should return all tokens when hideZeroBalanceTokens is false', () => {
-      const result = selectEvmTokens(mockState);
-      expect(result).toBeDefined();
-      expect(result.length).toBeGreaterThan(0);
-    });
-
-    it('should filter out zero balance tokens when hideZeroBalanceTokens is true', () => {
-      const testState = {
-        ...mockState,
-        settings: { ...mockState.settings, hideZeroBalanceTokens: true },
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            AccountTrackerController: {
-              accountsByChainId: {
-                '0x1': {
-                  '0xAddress1': {
-                    balance: '0x0',
-                    stakedBalance: '0x0',
-                  },
-                },
-              },
-            },
-            TokenBalancesController: {
-              tokenBalances: {
-                '0xAddress1': {
-                  '0x1': {
-                    '0xToken1': '0x0',
-                  },
-                },
-              },
-            },
-          },
-        },
-      } as unknown as RootState;
-
-      const result = selectEvmTokens(testState);
-      expect(result).toBeDefined();
-      expect(result.length).toBe(0); // All tokens have zero balance, so none should be returned
-    });
-
-    it('when filtering to a single network, should filter out all zero balance tokens when hideZeroBalanceTokens is true', () => {
-      const testState = {
-        ...mockState,
-        settings: { ...mockState.settings, hideZeroBalanceTokens: true },
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            NetworkEnablementController: {
-              enabledNetworkMap: {
-                eip155: {
-                  '0x1': true, // user is filtering to only Ethereum Mainnet
-                },
-              },
-            },
-            NetworkController: {
-              networkConfigurationsByChainId: {
-                '0x1': {
-                  chainId: '0x1',
-                  name: 'Ethereum Mainnet',
-                  nativeCurrency: 'ETH',
-                  rpcEndpoints: [{ networkClientId: '0x1' }],
-                },
-              },
-            },
-            AccountTrackerController: {
-              accountsByChainId: {
-                '0x1': {
-                  '0xAddress1': {
-                    balance: '0x0',
-                    stakedBalance: '0x2', // simulating a staked balance
-                  },
-                },
-              },
-            },
-            TokenBalancesController: {
-              tokenBalances: {
-                '0xAddress1': {
-                  '0x1': {
-                    '0xToken1': '0x0',
-                  },
-                },
-              },
-            },
-          },
-        },
-      } as unknown as RootState;
-
-      const result = selectEvmTokens(testState);
-      expect(result).toBeDefined();
-      // After refactor: filtering by enabled networks no longer has special "current network only" mode
-      // that would keep native/staked tokens with zero balance. Now it simply filters by enabled networks.
-      // The old behavior of keeping native/staked tokens depended on selectIsTokenNetworkFilterEqualCurrentNetwork
-      // which uses the deprecated tokenNetworkFilter system.
-      expect(result.length).toBe(1); // Only staked token with non-zero balance should be returned
-      expect(result[0].isStaked).toBe(true);
-    });
-
-    it('should return tokens only for enabled networks', () => {
-      const testState = {
-        ...mockState,
-        settings: { ...mockState.settings, hideZeroBalanceTokens: true },
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            NetworkEnablementController: {
-              enabledNetworkMap: {
-                eip155: {
-                  '0x89': true, // user only wants to see tokens on Polygon
-                },
-              },
-            },
-            NetworkController: {
-              networkConfigurationsByChainId: {
-                '0x1': {
-                  chainId: '0x1',
-                  name: 'Ethereum Mainnet',
-                  nativeCurrency: 'ETH',
-                  rpcEndpoints: [{ networkClientId: '0x1' }],
-                },
-                '0x89': {
-                  chainId: '0x89',
-                  name: 'Polygon',
-                  nativeCurrency: 'POL',
-                  rpcEndpoints: [{ networkClientId: '0x89' }],
-                },
-              },
-              selectedNetworkClientId: '0x89',
-            },
-          },
-        },
-      } as unknown as RootState;
-
-      const result = selectEvmTokens(testState);
-      expect(result).toBeDefined();
-      expect(result.every((token) => token.chainId === '0x89')).toBeTruthy();
-    });
+  describe('selectAccountTokensAcrossChainsForAddress memoization', () => {
+    const POLYGON_NATIVE_TOKEN_ADDRESS =
+      '0x0000000000000000000000000000000000001010';
 
-    it('should return only tokens from popular EVM networks when selected', () => {
-      const testState = {
+    // Produces a new root state object with a slice the selector never reads,
+    // standing in for the unrelated dispatches that happen constantly at runtime.
+    const withUnrelatedSliceChange = (nonce: number) =>
+      ({
         ...mockState,
         engine: {
           ...mockState.engine,
           backgroundState: {
             ...mockState.engine.backgroundState,
-            TokensController: {
-              allTokens: {
-                // chain not in popular networks
-                '0x99': {
-                  '0xAddress1': [
-                    {
-                      address: '0xUnpopularToken',
-                      symbol: 'TKN9',
-                      decimals: 18,
-                    },
-                  ],
-                },
-              },
-            },
+            GasFeeController: { gasFeeEstimates: { nonce } },
           },
         },
-      } as unknown as RootState;
-
-      const result = selectEvmTokens(testState);
-      expect(result).toBeDefined();
-      expect(result.some((token) => token.chainId === '0x99')).toBeFalsy();
-      expect(
-        result.every(
-          (token) => token.chainId === '0x89' || token.chainId === '0x1',
-        ),
-      ).toBeTruthy();
-    });
-
-    it('should categorize native and non-native tokens correctly', () => {
-      const result = selectEvmTokens(mockState);
-
-      const nativeTokens = result.filter((token) => token.isNative);
-      const nonNativeTokens = result.filter((token) => !token.isNative);
-
-      expect(nativeTokens.length).toBeGreaterThan(0);
-      expect(nonNativeTokens.length).toBeGreaterThan(0);
-    });
+      }) as unknown as RootState;
 
-    it('should filter out testnet tokens if the all networks filter is selected', () => {
-      const testState = {
+    const withExtraMainnetToken = () =>
+      ({
         ...mockState,
         engine: {
           ...mockState.engine,
@@ -712,13 +248,15 @@ describe('Multichain Selectors', () => {
             ...mockState.engine.backgroundState,
             TokensController: {
               allTokens: {
-                // sepolia
-                '0xaa36a7': {
+                '0x1': {
                   '0xAddress1': [
+                    ...mockState.engine.backgroundState.TokensController
+                      .allTokens['0x1']['0xAddress1'],
                     {
-                      address: '0xTestnetToken',
-                      symbol: 'TEST1',
+                      address: '0xToken2',
+                      symbol: 'TK2',
                       decimals: 18,
+                      balance: '2000000000000000000',
                     },
                   ],
                 },
@@ -726,407 +264,127 @@ describe('Multichain Selectors', () => {
             },
           },
         },
-      } as unknown as RootState;
-
-      const result = selectEvmTokens(testState);
-      expect(result).toBeDefined();
-      expect(
-        result.find((token) => token.chainId === '0xaa36a7'),
-      ).toBeUndefined();
-    });
-
-    it('should render native and staked assets in state when no erc20 tokens are present', () => {
-      const nativeAndStakedTestState = {
-        ...mockState,
-        engine: {
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            TokensController: {
-              allTokens: {},
-            },
-            AccountTrackerController: {
-              accountsByChainId: {
-                [CHAIN_IDS.MAINNET]: {
-                  '0xAddress1': {
-                    balance: '0x1',
-                    stakedBalance: '0x2',
-                  },
-                },
-              },
-            },
-          },
-        },
-      } as unknown as RootState;
-
-      const result = selectEvmTokens(nativeAndStakedTestState);
-      expect(result).toBeDefined();
-      expect(result.length).toBe(3);
-
-      // Check for Staked Ethereum
-      const stakedEth = result.find(
-        (token) => token.isStaked && token.chainId === CHAIN_IDS.MAINNET,
-      );
-      expect(stakedEth).toBeDefined();
-      expect(stakedEth?.chainId).toBe(CHAIN_IDS.MAINNET);
-      expect(stakedEth?.name).toBe('Staked Ethereum');
-
-      // Check for Native Ethereum
-      const nativeEth = result.find(
-        (token) => !token.isStaked && token.chainId === CHAIN_IDS.MAINNET,
-      );
-      expect(nativeEth).toBeDefined();
-      expect(nativeEth?.chainId).toBe(CHAIN_IDS.MAINNET);
-      expect(nativeEth?.name).toBe('Ethereum');
-
-      // Check for Native Polygon
-      const nativePol = result.find(
-        (token) => !token.isStaked && token.chainId === CHAIN_IDS.POLYGON,
-      );
-      expect(nativePol).toBeDefined();
-      expect(nativePol?.chainId).toBe(CHAIN_IDS.POLYGON);
-      expect(nativePol?.name).toBe('POL');
-    });
-  });
-
-  describe('Network Manager filtering', () => {
-    // Common test configurations
-    const createTestStateWithEnabledNetworks = (
-      enabledNetworks: Record<string, boolean>,
-    ) =>
-      ({
-        ...mockState,
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            NetworkEnablementController: {
-              enabledNetworkMap: {
-                eip155: enabledNetworks,
-              },
-            },
-            // Ensure only enabled networks have tokens
-            TokensController: {
-              ...mockState.engine.backgroundState.TokensController,
-              allTokens: Object.fromEntries(
-                Object.entries(
-                  mockState.engine.backgroundState.TokensController.allTokens,
-                ).filter(
-                  ([chainId]) => enabledNetworks[chainId as `0x${string}`],
-                ),
-              ),
-            },
-            // Ensure only enabled networks have account balances
-            AccountTrackerController: {
-              ...mockState.engine.backgroundState.AccountTrackerController,
-              accountsByChainId: Object.fromEntries(
-                Object.entries(
-                  mockState.engine.backgroundState.AccountTrackerController
-                    .accountsByChainId,
-                ).filter(
-                  ([chainId]) => enabledNetworks[chainId as `0x${string}`],
-                ),
-              ),
-            },
-            // Ensure only enabled networks have network configurations
-            NetworkController: {
-              ...mockState.engine.backgroundState.NetworkController,
-              networkConfigurationsByChainId: Object.fromEntries(
-                Object.entries(
-                  mockState.engine.backgroundState.NetworkController
-                    .networkConfigurationsByChainId,
-                ).filter(
-                  ([chainId]) => enabledNetworks[chainId as `0x${string}`],
-                ),
-              ),
-            },
-          },
-        },
       }) as unknown as RootState;
 
-    it('should filter tokens by enabled networks', () => {
-      const testState = createTestStateWithEnabledNetworks({
-        '0x1': true, // Only Ethereum enabled
-        '0x89': false, // Polygon disabled
-      });
-
-      const result = selectEvmTokens(testState);
-
-      expect(result.every((token) => token.chainId === '0x1')).toBe(true);
-    });
-
-    it('should fall back to default behavior when enabledNetworksByNamespace is undefined', () => {
-      const testState = {
-        ...mockState,
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            NetworkEnablementController: undefined,
-          },
+    const selectTokensForMockAccount = (state: RootState) =>
+      selectAccountTokensAcrossChainsForAddress(state, MOCK_SELECTED_ADDRESS);
+
+    beforeEach(() => {
+      selectAllTokens.clearCache();
+      selectedAccountNativeTokenCachedBalanceByChainIdForAddress.clearCache();
+      selectNativeTokensAcrossChainsForAddress.clearCache();
+      selectAccountTokensAcrossChainsForAddress.clearCache();
+    });
+
+    it('aggregates native, staked and ERC20 tokens per chain', () => {
+      const result = selectTokensForMockAccount(mockState);
+      const summarize = (tokens: TokenI[]) =>
+        tokens.map((token) => ({
+          address: token.address,
+          name: token.name,
+          symbol: token.symbol,
+          balance: token.balance,
+          balanceFiat: token.balanceFiat,
+          isNative: token.isNative,
+          isStaked: token.isStaked,
+        }));
+
+      expect(Object.keys(result)).toStrictEqual(['0x1', '0x89']);
+      expect(summarize(result['0x1'] as TokenI[])).toStrictEqual([
+        {
+          address: zeroAddress(),
+          name: 'Ethereum',
+          symbol: 'Ethereum',
+          balance: '< 0.00001',
+          balanceFiat: '$0',
+          isNative: true,
+          isStaked: false,
         },
-      } as unknown as RootState;
-
-      const result = selectEvmTokens(testState);
-
-      // Should return all tokens as fallback behavior (same as when feature flag is disabled)
-      expect(result.length).toBeGreaterThan(0);
-      expect(result.some((token) => token.chainId === '0x1')).toBe(true);
-      expect(result.some((token) => token.chainId === '0x89')).toBe(true);
-    });
-
-    it('should fall back to default behavior when NetworkEnablementController is missing', () => {
-      const testState = {
-        ...mockState,
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            NetworkEnablementController: {},
-          },
+        {
+          address: zeroAddress(),
+          name: 'Staked Ethereum',
+          symbol: 'Ethereum',
+          balance: '< 0.00001',
+          balanceFiat: '$0',
+          isNative: true,
+          isStaked: true,
+        },
+        {
+          address: '0xToken1',
+          name: undefined,
+          symbol: 'TK1',
+          balance: '1000000000000000000',
+          balanceFiat: '',
+          isNative: false,
+          isStaked: false,
         },
-      } as unknown as RootState;
-
-      const result = selectEvmTokens(testState);
-
-      // Should return all tokens as fallback behavior
-      expect(result.length).toBeGreaterThan(0);
-      expect(result.some((token) => token.chainId === '0x1')).toBe(true);
-      expect(result.some((token) => token.chainId === '0x89')).toBe(true);
-    });
-
-    it('should fall back to default behavior when enabledNetworkMap is undefined', () => {
-      const testState = {
-        ...mockState,
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            NetworkEnablementController: {
-              enabledNetworkMap: undefined,
-            },
-          },
+      ]);
+      expect(summarize(result['0x89'] as TokenI[])).toStrictEqual([
+        {
+          address: POLYGON_NATIVE_TOKEN_ADDRESS,
+          name: 'POL',
+          symbol: 'POL',
+          balance: '< 0.00001',
+          balanceFiat: '$0',
+          isNative: true,
+          isStaked: false,
         },
-      } as unknown as RootState;
-
-      const result = selectEvmTokens(testState);
-
-      // Should return all tokens as fallback behavior
-      expect(result.length).toBeGreaterThan(0);
-      expect(result.some((token) => token.chainId === '0x1')).toBe(true);
-      expect(result.some((token) => token.chainId === '0x89')).toBe(true);
-    });
-
-    it('should fall back to default behavior when EIP-155 entry is missing from enabledNetworkMap', () => {
-      const testState = {
-        ...mockState,
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            NetworkEnablementController: {
-              enabledNetworkMap: {
-                // Missing eip155 key
-                bitcoin: {
-                  'bip122:000000000019d6689c085ae165831e93': true,
-                },
-              },
-            },
-          },
+        {
+          address: POLYGON_NATIVE_TOKEN_ADDRESS,
+          name: 'Staked Ethereum',
+          symbol: 'POL',
+          balance: '0',
+          balanceFiat: '$0',
+          isNative: true,
+          isStaked: true,
         },
-      } as unknown as RootState;
-
-      const result = selectEvmTokens(testState);
-
-      // Should return all tokens as fallback behavior
-      expect(result.length).toBeGreaterThan(0);
-      expect(result.some((token) => token.chainId === '0x1')).toBe(true);
-      expect(result.some((token) => token.chainId === '0x89')).toBe(true);
+      ]);
     });
 
-    it('should fall back to default behavior when EIP-155 entry is null', () => {
-      const testState = {
-        ...mockState,
-        engine: {
-          ...mockState.engine,
-          backgroundState: {
-            ...mockState.engine.backgroundState,
-            NetworkEnablementController: {
-              enabledNetworkMap: {
-                eip155: null,
-              },
-            },
-          },
-        },
-      } as unknown as RootState;
+    it('returns the same reference when an unrelated slice changes', () => {
+      const first = selectTokensForMockAccount(mockState);
+      const second = selectTokensForMockAccount(withUnrelatedSliceChange(1));
 
-      const result = selectEvmTokens(testState);
-
-      // Should return all tokens as fallback behavior
-      expect(result.length).toBeGreaterThan(0);
-      expect(result.some((token) => token.chainId === '0x1')).toBe(true);
-      expect(result.some((token) => token.chainId === '0x89')).toBe(true);
+      expect(second).toBe(first);
     });
-  });
 
-  describe('makeSelectAssetByAddressAndChainId', () => {
-    const mockAccountId = '0xAddress1';
-    const mockAllTokens = {
-      [CHAIN_IDS.MAINNET]: {
-        [mockAccountId]: [
-          {
-            address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-            symbol: 'USDC',
-            decimals: 6,
-            name: 'USDC',
-          },
-          {
-            address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-            symbol: 'DAI',
-            decimals: 18,
-            name: 'Dai Stablecoin',
-          },
-        ],
-      },
-      [CHAIN_IDS.POLYGON]: {
-        [mockAccountId]: [
-          {
-            address: '0x0D1E753a25eBda689453309112904807625bEFBe',
-            symbol: 'CAKE',
-            decimals: 18,
-            image:
-              'https://static.cx.metamask.io/api/v1/tokenIcons/59144/0x0d1e753a25ebda689453309112904807625befbe.png',
-            aggregators: ['CoinGecko', 'Lifi', 'Rubic'],
-          },
-        ],
-      },
-    };
-
-    const testState: RootState = {
-      ...mockState,
-      engine: {
-        ...mockState.engine,
-        backgroundState: {
-          ...mockState.engine.backgroundState,
-          MultichainNetworkController: {
-            ...mockState.engine.backgroundState.MultichainNetworkController,
-            isEvmSelected: true,
-          },
-          TokensController: {
-            allTokens: mockAllTokens,
-          },
-        },
-      },
-    } as unknown as RootState;
-
-    it('should return undefined when EVM network is not selected', () => {
-      const stateWithNonEvmNetwork = {
-        ...testState,
-        engine: {
-          ...testState.engine,
-          backgroundState: {
-            ...testState.engine.backgroundState,
-            MultichainNetworkController: {
-              ...testState.engine.backgroundState.MultichainNetworkController,
-              isEvmSelected: false,
-            },
-          },
-        },
-      } as unknown as RootState;
+    it('does not re-run the token aggregation when an unrelated slice changes', () => {
+      selectTokensForMockAccount(mockState);
+      const recomputationsBefore =
+        selectAccountTokensAcrossChainsForAddress.recomputations();
 
-      const selector = makeSelectAssetByAddressAndChainId();
-      const result = selector(stateWithNonEvmNetwork, {
-        address: '0x123',
-        chainId: '0x1',
-      });
-
-      expect(result).toBeUndefined();
-    });
+      selectTokensForMockAccount(withUnrelatedSliceChange(1));
+      selectTokensForMockAccount(withUnrelatedSliceChange(2));
 
-    it('should return undefined for non-existent token', () => {
-      const selector = makeSelectAssetByAddressAndChainId();
-      const result = selector(testState, {
-        address: '0x999',
-        chainId: '0x1',
-      });
-
-      expect(result).toBeUndefined();
+      expect(selectAccountTokensAcrossChainsForAddress.recomputations()).toBe(
+        recomputationsBefore,
+      );
     });
 
-    it('should return undefined for non-existent chain', () => {
-      const selector = makeSelectAssetByAddressAndChainId();
-      const result = selector(testState, {
-        address: '0x123',
-        chainId: '0x999',
-      });
-
-      expect(result).toBeUndefined();
-    });
+    it('re-runs the token aggregation when the token slice changes', () => {
+      selectTokensForMockAccount(mockState);
+      const recomputationsBefore =
+        selectAccountTokensAcrossChainsForAddress.recomputations();
 
-    it('should return the correct token for valid address and chainId', () => {
-      const selector = makeSelectAssetByAddressAndChainId();
-      const result = selector(testState, {
-        address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-        chainId: '0x1',
-      });
+      selectTokensForMockAccount(withExtraMainnetToken());
 
-      expect(result).toHaveProperty(
-        'address',
-        '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+      expect(selectAccountTokensAcrossChainsForAddress.recomputations()).toBe(
+        recomputationsBefore + 1,
       );
-      expect(result).toHaveProperty('chainId', '0x1');
-      expect(result).toHaveProperty('symbol', 'USDC');
     });
 
-    it('should handle different chain IDs correctly', () => {
-      const selector = makeSelectAssetByAddressAndChainId();
-      const result = selector(testState, {
-        address: '0x0D1E753a25eBda689453309112904807625bEFBe',
-        chainId: CHAIN_IDS.POLYGON,
-      });
+    it('includes the added token once the token slice changes', () => {
+      selectTokensForMockAccount(mockState);
 
-      expect(result).toHaveProperty(
-        'address',
-        '0x0D1E753a25eBda689453309112904807625bEFBe',
-      );
-      expect(result).toHaveProperty('chainId', CHAIN_IDS.POLYGON);
-      expect(result).toHaveProperty('symbol', 'CAKE');
-      expect(result).toHaveProperty('aggregators', [
-        'CoinGecko',
-        'Lifi',
-        'Rubic',
-      ]);
-    });
-
-    it('should handle non-native tokens correctly', () => {
-      const selector = makeSelectAssetByAddressAndChainId();
-      const result = selector(testState, {
-        address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-        chainId: CHAIN_IDS.MAINNET,
-      });
+      const after = selectTokensForMockAccount(withExtraMainnetToken());
 
-      expect(result).toHaveProperty(
-        'address',
-        '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-      );
-      expect(result).toHaveProperty('chainId', CHAIN_IDS.MAINNET);
-      expect(result).toHaveProperty('symbol', 'DAI');
-      expect(result).toHaveProperty('name', 'Dai Stablecoin');
+      expect(after['0x1'].some((token) => token.symbol === 'TK2')).toBe(true);
     });
 
-    it('should handle case-insensitive address matching', () => {
-      const selector = makeSelectAssetByAddressAndChainId();
-      const result = selector(testState, {
-        address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', // Different case
-        chainId: CHAIN_IDS.MAINNET,
-      });
-
-      expect(result).toHaveProperty(
-        'address',
-        '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-      );
-      expect(result).toHaveProperty('chainId', CHAIN_IDS.MAINNET);
-      expect(result).toHaveProperty('symbol', 'USDC');
-      expect(result).toHaveProperty('name', 'USDC');
+    it('returns an empty map when no address is provided', () => {
+      expect(
+        selectAccountTokensAcrossChainsForAddress(mockState, undefined),
+      ).toStrictEqual({});
     });
   });
 });
@@ -1245,10 +503,10 @@ describe('re-renders', () => {
   beforeEach(() => {
     mockRenderCall.mockReset();
     // Clear memoized selectors for each test
-    selectAccountTokensAcrossChains.memoizedResultFunc.clearCache();
+    selectAccountTokensAcrossChainsForAddress.clearCache();
     const MockComponent = () => {
-      const selectedAccountTokensChains = useSelector(
-        selectAccountTokensAcrossChains,
+      const selectedAccountTokensChains = useSelector((state: RootState) =>
+        selectAccountTokensAcrossChainsForAddress(state, mockAccountId),
       );
       mockRenderCall();
       return (
@@ -1304,10 +562,13 @@ describe('re-renders', () => {
     expect(getByText(newToken.name)).toBeDefined();
   });
 
-  it('should return exactly same data if state does not change', async () => {
+  it('returns identical data when state does not change', async () => {
     expect(mockRenderCall).toHaveBeenCalledTimes(1);
     mockRenderCall.mockReset();
-    const result1 = selectAccountTokensAcrossChains(mockState);
+    const result1 = selectAccountTokensAcrossChainsForAddress(
+      mockState,
+      mockAccountId,
+    );
 
     Engine.state.TokensController.allTokens = mockAllTokens;
 
@@ -1320,7 +581,10 @@ describe('re-renders', () => {
       });
     });
 
-    const result2 = selectAccountTokensAcrossChains(mockState);
+    const result2 = selectAccountTokensAcrossChainsForAddress(
+      mockState,
+      mockAccountId,
+    );
 
     expect(result1 === result2).toBe(true);
     // same data should not trigger re-render
diff --git a/app/selectors/multichain/evm.ts b/app/selectors/multichain/evm.ts
index 6e25bf94495b..704cc9679129 100644
--- a/app/selectors/multichain/evm.ts
+++ b/app/selectors/multichain/evm.ts
@@ -1,42 +1,18 @@
 import { createSelector } from 'reselect';
-import { Hex, KnownCaipNamespace } from '@metamask/utils';
+import { Hex } from '@metamask/utils';
 import { Token, getNativeTokenAddress } from '@metamask/assets-controllers';
-import {
-  selectSelectedInternalAccountFormattedAddress,
-  selectSelectedInternalAccount,
-  selectSelectedInternalAccountAddress,
-} from '../accountsController';
 import { selectAllTokens } from '../tokensController';
-import {
-  selectAccountBalanceByChainId,
-  selectAccountsByChainId,
-} from '../accountTrackerController';
-import {
-  selectEvmNetworkConfigurationsByChainId,
-  selectEvmTicker,
-  selectNetworkConfigurations,
-} from '../networkController';
+import { selectAccountsByChainId } from '../accountTrackerController';
+import { selectEvmNetworkConfigurationsByChainId } from '../networkController';
 import { TokenI } from '../../components/UI/Tokens/types';
 import { renderFromWei, weiToFiat } from '../../util/number';
 import { hexToBN, toChecksumHexAddress } from '@metamask/controller-utils';
 import {
-  selectConversionRate,
   selectCurrencyRates,
   selectCurrentCurrency,
 } from '../currencyRateController';
 import { createDeepEqualSelector } from '../util';
-import { getTicker } from '../../util/transactions';
-import { zeroAddress } from 'ethereumjs-util';
-import { selectHideZeroBalanceTokens } from '../settings';
-import { selectTokensBalances } from '../tokenBalancesController';
-import { isZero } from '../../util/lodash';
-import { selectIsTokenNetworkFilterEqualCurrentNetwork } from '../preferencesController';
-import { selectIsEvmNetworkSelected } from '../multichainNetworkController';
-import { selectTokenMarketData } from '../tokenRatesController';
-import { deriveBalanceFromAssetMarketDetails } from '../../components/UI/Tokens/util';
 import { RootState } from '../../reducers';
-import { safeToChecksumAddress, toFormattedAddress } from '../../util/address';
-import { selectEnabledNetworksByNamespace } from '../networkEnablementController';
 
 interface NativeTokenBalance {
   balance: string;
@@ -84,21 +60,6 @@ export const selectedAccountNativeTokenCachedBalanceByChainIdForAddress =
     },
   );
 
-/**
- * Get the cached native token balance for the selected account by chainId.
- *
- * @param {RootState} state - The root state.
- * @returns {ChainBalances} The cached native token balance for the selected account by chainId.
- */
-export const selectedAccountNativeTokenCachedBalanceByChainId = createSelector(
-  [(state: RootState) => state, selectSelectedInternalAccountFormattedAddress],
-  (state, selectedAddress): ChainBalances =>
-    selectedAccountNativeTokenCachedBalanceByChainIdForAddress(
-      state,
-      selectedAddress,
-    ),
-);
-
 /**
  * Selector to get native tokens for the selected account across all chains.
  */
@@ -212,15 +173,6 @@ export const selectNativeTokensAcrossChainsForAddress = createSelector(
   },
 );
 
-/**
- * Selector to get native tokens for the selected account across all chains.
- */
-export const selectNativeTokensAcrossChains = createSelector(
-  [(state: RootState) => state, selectSelectedInternalAccountFormattedAddress],
-  (state, selectedAddress) =>
-    selectNativeTokensAcrossChainsForAddress(state, selectedAddress),
-);
-
 export const selectAccountTokensAcrossChainsForAddress =
   createDeepEqualSelector(
     selectAllTokens,
@@ -270,292 +222,3 @@ export const selectAccountTokensAcrossChainsForAddress =
       return tokensByChain;
     },
   );
-
-/**
- * Get the tokens for the selected account across all chains.
- *
- * @param {RootState} state - The root state.
- * @returns {TokensByChain} The tokens for the selected account across all chains.
- */
-export const selectAccountTokensAcrossChains = createSelector(
-  (state: RootState) => state,
-  selectSelectedInternalAccount,
-  (state, selectedAccount) => {
-    const selectedAddress = selectedAccount?.address;
-    return selectAccountTokensAcrossChainsForAddress(state, selectedAddress);
-  },
-);
-
-export const selectNativeEvmAsset = createDeepEqualSelector(
-  selectAccountBalanceByChainId,
-  selectEvmTicker,
-  selectConversionRate,
-  selectCurrentCurrency,
-  (accountBalanceByChainId, ticker, conversionRate, currentCurrency) => {
-    if (!accountBalanceByChainId) {
-      return;
-    }
-    return {
-      decimals: 18,
-      name: getTicker(ticker) === 'ETH' ? 'Ethereum' : ticker,
-      symbol: getTicker(ticker),
-      isETH: true,
-      balance: renderFromWei(accountBalanceByChainId.balance),
-      balanceFiat: weiToFiat(
-        // TODO: Replace "any" with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        hexToBN(accountBalanceByChainId.balance) as any,
-        conversionRate,
-        currentCurrency,
-      ),
-      logo: '../images/eth-logo-new.png',
-      address: zeroAddress(),
-    };
-  },
-);
-
-export const selectStakedEvmAsset = createDeepEqualSelector(
-  selectAccountBalanceByChainId,
-  selectConversionRate,
-  selectCurrentCurrency,
-  selectNativeEvmAsset,
-  (accountBalanceByChainId, conversionRate, currentCurrency, nativeAsset) => {
-    if (!accountBalanceByChainId) {
-      return;
-    }
-    if (!accountBalanceByChainId.stakedBalance) {
-      return;
-    }
-    if (hexToBN(accountBalanceByChainId.stakedBalance).isZero()) {
-      return;
-    }
-    if (!nativeAsset) {
-      return;
-    }
-    return {
-      ...nativeAsset,
-      name: 'Staked Ethereum',
-      isStaked: true,
-      balance: renderFromWei(accountBalanceByChainId.stakedBalance),
-      balanceFiat: weiToFiat(
-        // TODO: Replace "any" with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        hexToBN(accountBalanceByChainId.stakedBalance) as any,
-        conversionRate,
-        currentCurrency,
-      ),
-    };
-  },
-);
-
-export const selectEvmTokensWithZeroBalanceFilter = createDeepEqualSelector(
-  selectHideZeroBalanceTokens,
-  selectAccountTokensAcrossChains,
-  selectTokensBalances,
-  selectSelectedInternalAccountAddress,
-  selectIsTokenNetworkFilterEqualCurrentNetwork,
-  (
-    hideZeroBalanceTokens,
-    selectedAccountTokensChains,
-    multiChainTokenBalance,
-    selectedInternalAccountAddress,
-    isUserOnCurrentNetwork,
-  ) => {
-    const allTokens = Object.values(
-      selectedAccountTokensChains,
-    ).flat() as TokenI[];
-
-    let tokensToDisplay: TokenI[] = allTokens;
-
-    // Respect zero balance filtering settings
-    if (hideZeroBalanceTokens) {
-      tokensToDisplay = allTokens.filter((token) => {
-        const multiChainTokenBalances =
-          multiChainTokenBalance?.[selectedInternalAccountAddress as Hex]?.[
-            token.chainId as Hex
-          ];
-        const balance =
-          multiChainTokenBalances?.[token.address as Hex] || token.balance;
-
-        return (
-          !isZero(balance) ||
-          (isUserOnCurrentNetwork && (token.isNative || token.isStaked))
-        );
-      });
-    }
-    return tokensToDisplay;
-  },
-);
-
-export const selectEvmTokens = createDeepEqualSelector(
-  selectEvmTokensWithZeroBalanceFilter,
-  selectEnabledNetworksByNamespace,
-  (tokensToDisplay, enabledNetworksByNamespace) => {
-    // Apply network filtering based on enabled networks
-    const enabledEip155Networks =
-      enabledNetworksByNamespace?.[KnownCaipNamespace.Eip155];
-
-    // Filter tokens to only show those on enabled networks
-    const filteredTokens = enabledEip155Networks
-      ? tokensToDisplay.filter((currentToken: TokenI) => {
-          const chainId = currentToken.chainId || '';
-          return enabledEip155Networks[chainId as Hex];
-        })
-      : tokensToDisplay;
-
-    // Categorize tokens as native or non-native
-    const nativeTokens: TokenI[] = [];
-    const nonNativeTokens: TokenI[] = [];
-
-    for (const currToken of filteredTokens) {
-      const token = currToken as TokenI & { chainId: string };
-
-      // Categorize tokens as native or non-native
-      if (token.isNative) {
-        nativeTokens.push(token);
-      } else {
-        nonNativeTokens.push(token);
-      }
-    }
-
-    return [...nativeTokens, ...nonNativeTokens];
-  },
-);
-
-export const selectEvmTokenFiatBalances = createDeepEqualSelector(
-  selectEvmTokens,
-  selectTokenMarketData,
-  selectTokensBalances,
-  selectSelectedInternalAccountAddress,
-  selectNetworkConfigurations,
-  selectCurrencyRates,
-  selectCurrentCurrency,
-  (
-    evmTokens,
-    multiChainMarketData,
-    multiChainTokenBalance,
-    selectedInternalAccountAddress,
-    networkConfigurationsByChainId,
-    multiChainCurrencyRates,
-    currentCurrency,
-  ) =>
-    evmTokens.map((token) => {
-      const chainId = token.chainId as Hex;
-      const multiChainExchangeRates = multiChainMarketData?.[chainId];
-      const multiChainTokenBalances =
-        multiChainTokenBalance?.[selectedInternalAccountAddress as Hex]?.[
-          chainId
-        ];
-      const nativeCurrency =
-        networkConfigurationsByChainId[chainId].nativeCurrency;
-      const multiChainConversionRate =
-        multiChainCurrencyRates?.[nativeCurrency]?.conversionRate || 0;
-
-      return token.isETH || token.isNative
-        ? parseFloat(token.balance) * multiChainConversionRate
-        : deriveBalanceFromAssetMarketDetails(
-            token,
-            multiChainExchangeRates || {},
-            multiChainTokenBalances || {},
-            multiChainConversionRate || 0,
-            currentCurrency || '',
-          ).balanceFiatCalculation;
-    }),
-);
-
-/**
- * Creates a selector that finds a specific asset (token) by its address and chain ID.
- * This selector is particularly important for handling both native and staked assets
- * that may share the same address (e.g., 0x00) on the same chain.
- *
- * The selector uses a three-level nested map structure for efficient lookups:
- * 1. First level: chainId -> Map
- * 2. Second level: address -> Map
- * 3. Third level: isStaked (boolean) -> TokenI
- *
- * This structure allows us to:
- * - Efficiently look up tokens by chainId and address
- * - Properly distinguish between staked and non-staked assets that share the same address
- * - Handle native tokens (address: 0x00) correctly
- *
- * @example
- * // For native asset
- * const nativeAsset = selectAssetByAddressAndChainId(state, {
- *   address: '0x00',
- *   chainId: '0x1',
- *   isStaked: false
- * });
- *
- * // For staked asset
- * const stakedAsset = selectAssetByAddressAndChainId(state, {
- *   address: '0x00',
- *   chainId: '0x1',
- *   isStaked: true
- * });
- *
- * @returns A selector function that returns the matching TokenI or undefined if not found
- */
-export const makeSelectAssetByAddressAndChainId = () =>
-  createSelector(
-    [
-      selectEvmTokens, // TokenI[]
-      selectIsEvmNetworkSelected,
-      (
-        _state: RootState,
-        params: { address: string; chainId: string; isStaked?: boolean },
-      ) => toFormattedAddress(params.address),
-      (
-        _state: RootState,
-        params: { address: string; chainId: string; isStaked?: boolean },
-      ) => params.chainId,
-      (
-        _state: RootState,
-        params: { address: string; chainId: string; isStaked?: boolean },
-      ) => params.isStaked,
-    ],
-    (
-      tokens,
-      isEvmNetworkSelected,
-      address,
-      chainId,
-      isStaked,
-    ): TokenI | undefined => {
-      if (!isEvmNetworkSelected) {
-        return undefined;
-      }
-      // Step 1: build nested map once per call
-      const lookup = new Map<string, Map<string, Map<boolean, TokenI>>>();
-
-      for (const token of tokens) {
-        if (!token.chainId || !token.address) {
-          continue; // skip invalid tokens
-        }
-
-        const tokenChainId = token.chainId;
-        const tokenAddress = toFormattedAddress(token.address) as string;
-        const tokenIsStaked = Boolean(token.isStaked); // this is important in order to differentiate between staked and non-staked tokens on the same chain
-
-        if (!lookup.has(tokenChainId)) {
-          lookup.set(tokenChainId, new Map());
-        }
-        const chainMap = lookup.get(tokenChainId);
-
-        if (chainMap && !chainMap.has(tokenAddress)) {
-          chainMap.set(tokenAddress, new Map());
-        }
-        const addressMap = chainMap?.get(tokenAddress);
-
-        if (addressMap) {
-          addressMap.set(tokenIsStaked, token);
-        }
-      }
-
-      // Step 2: lookup
-      const token = lookup
-        .get(chainId)
-        ?.get(address as string)
-        ?.get(Boolean(isStaked));
-
-      return token;
-    },
-  );
diff --git a/app/selectors/multichain/multichain.ts b/app/selectors/multichain/multichain.ts
index 5252f034227b..824f75d9a363 100644
--- a/app/selectors/multichain/multichain.ts
+++ b/app/selectors/multichain/multichain.ts
@@ -319,14 +319,11 @@ export const selectMultichainTokenListForAccountsAnyChain =
  * active networks (e.g. TRON) from causing `selectSelectedInternalAccount` to
  * resolve to a non-EVM address that has no EVM balance data.
  */
-const selectAccountTokensAcrossChainsForEvmScope = createSelector(
-  (state: RootState) => state,
-  selectSelectedInternalAccountByScope,
-  (state, accountByScope) => {
-    const evmAddress = accountByScope(EVM_SCOPE)?.address;
-    return selectAccountTokensAcrossChainsForAddress(state, evmAddress);
-  },
-);
+const selectAccountTokensAcrossChainsForEvmScope = (state: RootState) =>
+  selectAccountTokensAcrossChainsForAddress(
+    state,
+    selectSelectedInternalAccountByScope(state)(EVM_SCOPE)?.address,
+  );
 
 /**
  * Unified selector: EVM tokens (native + ERC20) for the selected EVM address
diff --git a/app/selectors/onboarding/index.test.ts b/app/selectors/onboarding/index.test.ts
index 82bc115a97dd..f68ebf72615b 100644
--- a/app/selectors/onboarding/index.test.ts
+++ b/app/selectors/onboarding/index.test.ts
@@ -5,6 +5,7 @@ import {
   selectWalletHomeOnboardingSteps,
   selectWalletHomeOnboardingStepsEligible,
   selectShouldShowWalletHomeOnboardingSteps,
+  selectPushNotificationOsPromptRequested,
 } from '.';
 import { RootState } from '../../reducers';
 import { AccountType } from '../../constants/onboarding';
@@ -89,6 +90,28 @@ describe('Onboarding selectors', () => {
       ).toBe(false);
     });
 
+    it('selectPushNotificationOsPromptRequested is false when onboarding slice is missing', () => {
+      const state = {} as RootState;
+      expect(selectPushNotificationOsPromptRequested(state)).toBe(false);
+    });
+
+    it('selectPushNotificationOsPromptRequested is false for legacy state without the field', () => {
+      const state = {
+        onboarding: { completedOnboarding: true },
+      } as RootState;
+      expect(selectPushNotificationOsPromptRequested(state)).toBe(false);
+    });
+
+    it('selectPushNotificationOsPromptRequested is true once the OS push request happened', () => {
+      const state = {
+        onboarding: {
+          completedOnboarding: true,
+          pushNotificationOsPromptRequested: true,
+        },
+      } as RootState;
+      expect(selectPushNotificationOsPromptRequested(state)).toBe(true);
+    });
+
     it('selectShouldShowWalletHomeOnboardingSteps is true when eligible and not suppressed', () => {
       expect(
         selectShouldShowWalletHomeOnboardingSteps.resultFunc(
diff --git a/app/selectors/onboarding/index.ts b/app/selectors/onboarding/index.ts
index 92a43033c499..3d0d41d44801 100644
--- a/app/selectors/onboarding/index.ts
+++ b/app/selectors/onboarding/index.ts
@@ -45,6 +45,12 @@ export const selectWalletHomeOnboardingSteps = createSelector(
     WALLET_HOME_ONBOARDING_STEPS_INITIAL,
 );
 
+export const selectPushNotificationOsPromptRequested = createSelector(
+  selectOnboarding,
+  (onboardingState) =>
+    onboardingState?.pushNotificationOsPromptRequested === true,
+);
+
 export const selectShouldShowWalletHomeOnboardingSteps = createSelector(
   selectWalletHomeOnboardingStepsEligible,
   selectWalletHomeOnboardingSteps,
diff --git a/app/selectors/stellar/stellar-assets.test.ts b/app/selectors/stellar/stellar-assets.test.ts
new file mode 100644
index 000000000000..3d292de2a2d7
--- /dev/null
+++ b/app/selectors/stellar/stellar-assets.test.ts
@@ -0,0 +1,510 @@
+import type { AssetsControllerState } from '@metamask/assets-controller';
+import { AccountGroupType, AccountWalletType } from '@metamask/account-api';
+import type { AccountId } from '@metamask/accounts-controller';
+import { XlmAccountType, XlmScope } from '@metamask/keyring-api';
+import type { InternalAccount } from '@metamask/keyring-internal-api';
+import { KeyringTypes } from '@metamask/keyring-controller';
+import type { CaipAssetType } from '@metamask/utils';
+
+import { createMockInternalAccount } from '../../util/test/accountsControllerTestUtils';
+import {
+  getIsAssetRequireActivate,
+  getSpendableForAccount,
+  getTrustlineAssetInfoForAccount,
+  isAssetSupportActivation,
+  isAssetSupportSpendableBalance,
+} from './stellar-assets';
+
+const ACCOUNT_ID = 'stellar-account-id' as AccountId;
+const WALLET_ID = `${AccountWalletType.Keyring}:wallet1` as const;
+const ACCOUNT_GROUP_ID = `${WALLET_ID}/0` as const;
+const STELLAR_NATIVE_ASSET_ID =
+  `${XlmScope.Pubnet}/slip44:148` as CaipAssetType;
+const ETHER_NATIVE_ASSET_ID = 'eip155:1/slip44:60' as CaipAssetType;
+const TRUSTLINE_USDC =
+  'stellar:pubnet/asset:USDC-GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN' as CaipAssetType;
+const SEP41_ASSET_ID =
+  'stellar:pubnet/sep41:CBIJBDNZNF4X35BJ4FFZWCDBSCKOP5NB4PLG4SNENRMLAPYG4P5FM6VN' as CaipAssetType;
+
+/** 2.5 XLM in stroops (7 decimals). */
+const MINIMUM_RESERVE_BALANCE_STROOPS = '25000000';
+/** 7.5 XLM in stroops (7 decimals). */
+const SPENDABLE_BALANCE_STROOPS = '75000000';
+const STELLAR_DECIMALS = 7;
+
+const mockStellarAccount: InternalAccount = {
+  ...createMockInternalAccount(
+    'GABCDEFGHIJKLMNOPQRSTUVWXYZ234567ABCDEFGHIJKLMNOPQRSTUVWX',
+    'Stellar Account',
+    KeyringTypes.snap,
+    XlmAccountType.Account,
+  ),
+  id: ACCOUNT_ID,
+  scopes: [XlmScope.Pubnet],
+};
+
+interface AssetsState {
+  engine: {
+    backgroundState: {
+      AssetsController: Pick<AssetsControllerState, 'assetsBalance'>;
+      AccountsController?: {
+        internalAccounts: {
+          accounts: Record<string, InternalAccount>;
+        };
+      };
+      AccountTreeController?: {
+        accountTree: {
+          wallets: Record<
+            string,
+            {
+              id: string;
+              metadata: { name: string };
+              groups: Record<
+                string,
+                {
+                  id: string;
+                  type: AccountGroupType;
+                  accounts: AccountId[];
+                  metadata: { name: string };
+                }
+              >;
+            }
+          >;
+        };
+        selectedAccountGroup: string;
+      };
+    };
+  };
+}
+
+function createMockState(
+  assetsBalance: AssetsControllerState['assetsBalance'],
+  options?: { withSelectedStellarAccount?: boolean },
+): AssetsState {
+  const backgroundState: AssetsState['engine']['backgroundState'] = {
+    AssetsController: { assetsBalance },
+  };
+
+  if (options?.withSelectedStellarAccount) {
+    backgroundState.AccountsController = {
+      internalAccounts: {
+        accounts: {
+          [ACCOUNT_ID]: mockStellarAccount,
+        },
+      },
+    };
+    backgroundState.AccountTreeController = {
+      accountTree: {
+        wallets: {
+          [WALLET_ID]: {
+            id: WALLET_ID,
+            metadata: { name: 'Wallet 1' },
+            groups: {
+              [ACCOUNT_GROUP_ID]: {
+                id: ACCOUNT_GROUP_ID,
+                type: AccountGroupType.SingleAccount,
+                accounts: [ACCOUNT_ID],
+                metadata: { name: 'Account 1' },
+              },
+            },
+          },
+        },
+      },
+      selectedAccountGroup: ACCOUNT_GROUP_ID,
+    };
+  }
+
+  return {
+    engine: {
+      backgroundState,
+    },
+  };
+}
+
+const mockState = createMockState({
+  [ACCOUNT_ID]: {
+    [STELLAR_NATIVE_ASSET_ID]: {
+      amount: '10',
+      metadata: {
+        minimumReserveBalance: MINIMUM_RESERVE_BALANCE_STROOPS,
+        spendableBalance: SPENDABLE_BALANCE_STROOPS,
+        decimal: STELLAR_DECIMALS,
+      },
+    },
+    [TRUSTLINE_USDC]: {
+      amount: '0',
+      metadata: {
+        limit: '1000',
+      },
+    },
+  },
+});
+
+const mockStateWithSelectedAccount = createMockState(
+  {
+    [ACCOUNT_ID]: {
+      [STELLAR_NATIVE_ASSET_ID]: {
+        amount: '10',
+        metadata: {
+          minimumReserveBalance: MINIMUM_RESERVE_BALANCE_STROOPS,
+          spendableBalance: SPENDABLE_BALANCE_STROOPS,
+          decimal: STELLAR_DECIMALS,
+        },
+      },
+      [TRUSTLINE_USDC]: {
+        amount: '0',
+        metadata: {
+          limit: '1000',
+        },
+      },
+    },
+  },
+  { withSelectedStellarAccount: true },
+);
+
+describe('stellar-assets selectors', () => {
+  describe('getSpendableForAccount', () => {
+    it('returns spendable and minimum reserve from AssetsController balance metadata', () => {
+      expect(
+        getSpendableForAccount(mockState, {
+          accountId: ACCOUNT_ID,
+          assetId: STELLAR_NATIVE_ASSET_ID,
+        }),
+      ).toStrictEqual({
+        minimumReserveBalance: '2.5',
+        spendableBalance: '7.5',
+      });
+    });
+
+    it('falls back to the selected account when accountId is omitted', () => {
+      expect(
+        getSpendableForAccount(mockStateWithSelectedAccount, {
+          assetId: STELLAR_NATIVE_ASSET_ID,
+        }),
+      ).toStrictEqual({
+        minimumReserveBalance: '2.5',
+        spendableBalance: '7.5',
+      });
+    });
+
+    it('returns undefined when accountId is omitted and no selected account exists', () => {
+      expect(
+        getSpendableForAccount(mockState, {
+          assetId: STELLAR_NATIVE_ASSET_ID,
+        }),
+      ).toBeUndefined();
+    });
+
+    it('returns undefined when assetId is not a CAIP spendable asset', () => {
+      expect(
+        getSpendableForAccount(mockState, {
+          accountId: ACCOUNT_ID,
+          assetId: '0xabc',
+        }),
+      ).toBeUndefined();
+    });
+
+    it('returns undefined when native enrichment is missing', () => {
+      expect(
+        getSpendableForAccount(
+          createMockState({
+            [ACCOUNT_ID]: {
+              [STELLAR_NATIVE_ASSET_ID]: {
+                amount: '10',
+              },
+            },
+          }),
+          {
+            accountId: ACCOUNT_ID,
+            assetId: STELLAR_NATIVE_ASSET_ID,
+          },
+        ),
+      ).toBeUndefined();
+    });
+
+    it('returns undefined when spendableBalance is missing from metadata', () => {
+      expect(
+        getSpendableForAccount(
+          createMockState({
+            [ACCOUNT_ID]: {
+              [STELLAR_NATIVE_ASSET_ID]: {
+                amount: '10',
+                metadata: {
+                  minimumReserveBalance: MINIMUM_RESERVE_BALANCE_STROOPS,
+                  decimal: STELLAR_DECIMALS,
+                },
+              },
+            },
+          }),
+          {
+            accountId: ACCOUNT_ID,
+            assetId: STELLAR_NATIVE_ASSET_ID,
+          },
+        ),
+      ).toBeUndefined();
+    });
+
+    it('returns undefined when decimal is missing from metadata', () => {
+      expect(
+        getSpendableForAccount(
+          createMockState({
+            [ACCOUNT_ID]: {
+              [STELLAR_NATIVE_ASSET_ID]: {
+                amount: '10',
+                metadata: {
+                  minimumReserveBalance: MINIMUM_RESERVE_BALANCE_STROOPS,
+                  spendableBalance: SPENDABLE_BALANCE_STROOPS,
+                },
+              },
+            },
+          }),
+          {
+            accountId: ACCOUNT_ID,
+            assetId: STELLAR_NATIVE_ASSET_ID,
+          },
+        ),
+      ).toBeUndefined();
+    });
+
+    it('returns undefined for unsupported assets', () => {
+      expect(
+        getSpendableForAccount(mockState, {
+          accountId: ACCOUNT_ID,
+          assetId: ETHER_NATIVE_ASSET_ID,
+        }),
+      ).toBeUndefined();
+    });
+  });
+
+  describe('getTrustlineAssetInfoForAccount', () => {
+    it('returns trustline metadata for an account/asset pair', () => {
+      expect(
+        getTrustlineAssetInfoForAccount(mockState, {
+          accountId: ACCOUNT_ID,
+          assetId: TRUSTLINE_USDC,
+        }),
+      ).toStrictEqual({
+        limit: '1000',
+      });
+    });
+
+    it('falls back to the selected account when accountId is omitted', () => {
+      expect(
+        getTrustlineAssetInfoForAccount(mockStateWithSelectedAccount, {
+          assetId: TRUSTLINE_USDC,
+        }),
+      ).toStrictEqual({
+        limit: '1000',
+      });
+    });
+
+    it('returns undefined when accountId is omitted and no selected account exists', () => {
+      expect(
+        getTrustlineAssetInfoForAccount(mockState, {
+          assetId: TRUSTLINE_USDC,
+        }),
+      ).toBeUndefined();
+    });
+
+    it('returns undefined for native asset enrichment', () => {
+      expect(
+        getTrustlineAssetInfoForAccount(mockState, {
+          accountId: ACCOUNT_ID,
+          assetId: STELLAR_NATIVE_ASSET_ID,
+        }),
+      ).toBeUndefined();
+    });
+
+    it('returns undefined when the account has no balance entry', () => {
+      expect(
+        getTrustlineAssetInfoForAccount(createMockState({}), {
+          accountId: ACCOUNT_ID,
+          assetId: TRUSTLINE_USDC,
+        }),
+      ).toBeUndefined();
+    });
+
+    it('returns undefined when the asset is missing for the account', () => {
+      expect(
+        getTrustlineAssetInfoForAccount(mockState, {
+          accountId: ACCOUNT_ID,
+          assetId: SEP41_ASSET_ID,
+        }),
+      ).toBeUndefined();
+    });
+
+    it('returns undefined when balance metadata is missing', () => {
+      expect(
+        getTrustlineAssetInfoForAccount(
+          createMockState({
+            [ACCOUNT_ID]: {
+              [TRUSTLINE_USDC]: {
+                amount: '0',
+              },
+            },
+          }),
+          {
+            accountId: ACCOUNT_ID,
+            assetId: TRUSTLINE_USDC,
+          },
+        ),
+      ).toBeUndefined();
+    });
+  });
+
+  describe('getIsAssetRequireActivate', () => {
+    it('returns false when accountId is missing and no selected account exists', () => {
+      expect(
+        getIsAssetRequireActivate(mockState, { assetId: TRUSTLINE_USDC }),
+      ).toBe(false);
+    });
+
+    it('returns false when assetId is not a CAIP classic asset', () => {
+      expect(
+        getIsAssetRequireActivate(mockState, {
+          accountId: ACCOUNT_ID,
+          assetId: '0xabc',
+        }),
+      ).toBe(false);
+    });
+
+    it('falls back to the selected account when accountId is omitted', () => {
+      expect(
+        getIsAssetRequireActivate(mockStateWithSelectedAccount, {
+          assetId: TRUSTLINE_USDC,
+        }),
+      ).toBe(false);
+
+      expect(
+        getIsAssetRequireActivate(
+          createMockState(
+            {
+              [ACCOUNT_ID]: {
+                [TRUSTLINE_USDC]: {
+                  amount: '0',
+                  metadata: {
+                    limit: '0',
+                  },
+                },
+              },
+            },
+            { withSelectedStellarAccount: true },
+          ),
+          { assetId: TRUSTLINE_USDC },
+        ),
+      ).toBe(true);
+    });
+
+    it('returns false when trustline limit is active', () => {
+      expect(
+        getIsAssetRequireActivate(mockState, {
+          accountId: ACCOUNT_ID,
+          assetId: TRUSTLINE_USDC,
+        }),
+      ).toBe(false);
+    });
+
+    it('returns true when trustline metadata is missing', () => {
+      expect(
+        getIsAssetRequireActivate(
+          createMockState({
+            [ACCOUNT_ID]: {
+              [TRUSTLINE_USDC]: {
+                amount: '0',
+              },
+            },
+          }),
+          {
+            accountId: ACCOUNT_ID,
+            assetId: TRUSTLINE_USDC,
+          },
+        ),
+      ).toBe(true);
+    });
+
+    it('returns true when trustline limit is "0"', () => {
+      expect(
+        getIsAssetRequireActivate(
+          createMockState({
+            [ACCOUNT_ID]: {
+              [TRUSTLINE_USDC]: {
+                amount: '0',
+                metadata: {
+                  limit: '0',
+                },
+              },
+            },
+          }),
+          {
+            accountId: ACCOUNT_ID,
+            assetId: TRUSTLINE_USDC,
+          },
+        ),
+      ).toBe(true);
+    });
+
+    it('returns false for non-trustline assets', () => {
+      expect(
+        getIsAssetRequireActivate(mockState, {
+          accountId: ACCOUNT_ID,
+          assetId: STELLAR_NATIVE_ASSET_ID,
+        }),
+      ).toBe(false);
+    });
+
+    it('returns false for SEP-41 assets even with inactive-looking metadata', () => {
+      expect(
+        getIsAssetRequireActivate(
+          createMockState({
+            [ACCOUNT_ID]: {
+              [SEP41_ASSET_ID]: {
+                amount: '0',
+                metadata: {
+                  limit: '0',
+                },
+              },
+            },
+          }),
+          {
+            accountId: ACCOUNT_ID,
+            assetId: SEP41_ASSET_ID,
+          },
+        ),
+      ).toBe(false);
+    });
+  });
+
+  describe('isAssetSupportActivation', () => {
+    it('returns true for a Stellar classic asset', () => {
+      expect(isAssetSupportActivation(TRUSTLINE_USDC)).toBe(true);
+    });
+
+    it('returns false for a Stellar SEP-41 asset', () => {
+      expect(isAssetSupportActivation(SEP41_ASSET_ID)).toBe(false);
+    });
+
+    it('returns false for a non-Stellar asset', () => {
+      expect(isAssetSupportActivation(ETHER_NATIVE_ASSET_ID)).toBe(false);
+    });
+
+    it('returns false for an empty or undefined assetId', () => {
+      expect(isAssetSupportActivation('')).toBe(false);
+      expect(isAssetSupportActivation(undefined)).toBe(false);
+    });
+  });
+
+  describe('isAssetSupportSpendableBalance', () => {
+    it('returns true for native XLM', () => {
+      expect(isAssetSupportSpendableBalance(STELLAR_NATIVE_ASSET_ID)).toBe(
+        true,
+      );
+    });
+
+    it('returns false for unsupported assets', () => {
+      expect(isAssetSupportSpendableBalance(ETHER_NATIVE_ASSET_ID)).toBe(false);
+      expect(isAssetSupportSpendableBalance(TRUSTLINE_USDC)).toBe(false);
+      expect(isAssetSupportSpendableBalance('')).toBe(false);
+      expect(isAssetSupportSpendableBalance(undefined)).toBe(false);
+    });
+  });
+});
diff --git a/app/selectors/stellar/stellar-assets.ts b/app/selectors/stellar/stellar-assets.ts
new file mode 100644
index 000000000000..eb993bd5c5f8
--- /dev/null
+++ b/app/selectors/stellar/stellar-assets.ts
@@ -0,0 +1,346 @@
+import type { AssetsControllerState } from '@metamask/assets-controller';
+import {
+  type,
+  string,
+  pattern,
+  is,
+  refine,
+  nonempty,
+  number,
+  type Infer,
+} from '@metamask/superstruct';
+import {
+  parseCaipAssetType,
+  isCaipAssetType,
+  type CaipAssetType,
+} from '@metamask/utils';
+import { BigNumber } from 'bignumber.js';
+import { createSelectorCreator, lruMemoize } from 'reselect';
+
+import { getAssetsBalance } from '../assets/assets-controller';
+import { selectSelectedInternalAccountByScope } from '../multichainAccounts/accounts';
+import { RootState } from '../../reducers';
+
+const ACCOUNT_ASSET_LRU_CACHE_SIZE = 50;
+
+const createParameterizedSelector = createSelectorCreator(lruMemoize, {
+  maxSize: ACCOUNT_ASSET_LRU_CACHE_SIZE,
+});
+
+const ValidAmountStruct = refine(
+  nonempty(string()),
+  'valid_amount',
+  (value: string) => {
+    try {
+      const amount = new BigNumber(value);
+      if (
+        // < 0
+        amount.isNegative() ||
+        // NaN or Infinity
+        amount.isNaN() ||
+        !amount.isFinite()
+      ) {
+        return 'Invalid amount';
+      }
+      return true;
+    } catch {
+      return 'Invalid amount';
+    }
+  },
+);
+
+/** Stellar pubnet native XLM CAIP-19 asset id. */
+const StellarNativeAssetIdStruct = pattern(
+  string(),
+  /^stellar:pubnet\/slip44:148$/u,
+);
+
+/** Stellar pubnet classic asset CAIP-19 asset id. */
+const StellarClassicAssetIdStruct = pattern(
+  string(),
+  /^stellar:pubnet\/asset:[A-Za-z0-9]{1,12}-G[A-Z2-7]{55}$/u,
+);
+
+/**
+ * Trustline enrichment on AssetsController `assetsBalance` metadata for
+ * classic Stellar assets.
+ */
+const TrustlineAssetInfoStruct = type({
+  limit: ValidAmountStruct,
+});
+
+/**
+ * Native enrichment on AssetsController `assetsBalance` metadata for Stellar
+ * XLM. Amounts are in base units (stroops); `decimal` is used to convert them
+ * to display units.
+ */
+const NativeAssetInfoStruct = type({
+  minimumReserveBalance: ValidAmountStruct,
+  spendableBalance: ValidAmountStruct,
+  decimal: number(),
+});
+
+export type StellarNativeAssetId = Infer<typeof StellarNativeAssetIdStruct>;
+export type StellarClassicAssetId = Infer<typeof StellarClassicAssetIdStruct>;
+export type NativeAssetInfo = Infer<typeof NativeAssetInfoStruct>;
+export type TrustlineAssetInfo = Infer<typeof TrustlineAssetInfoStruct>;
+
+/**
+ * Spendable balance values in display units (after base-unit conversion).
+ */
+export interface SpendableInfo {
+  minimumReserveBalance: string;
+  spendableBalance: string;
+}
+
+/**
+ * Reuses `getAssetsBalance` from the assets selector. Cast is confined here so
+ * call sites can pass untyped `useSelector` state without annotations.
+ */
+const selectAssetsBalance = getAssetsBalance as (
+  state: unknown,
+) => AssetsControllerState['assetsBalance'];
+
+type AssetBalanceEntry = AssetsControllerState['assetsBalance'][string][string];
+
+/**
+ * Whether the asset supports trustline activation (Stellar classic assets).
+ *
+ * @param assetId - CAIP asset id to check.
+ * @returns `true` when the asset supports trustline activation.
+ */
+export function isAssetSupportActivation(
+  assetId: string | undefined,
+): assetId is StellarClassicAssetId & CaipAssetType {
+  return assetId !== undefined && is(assetId, StellarClassicAssetIdStruct);
+}
+
+/**
+ * Whether the asset supports spendable-balance display (Stellar native XLM).
+ *
+ * @param assetId - CAIP asset id to check.
+ * @returns `true` when the asset supports spendable-balance display.
+ */
+export function isAssetSupportSpendableBalance(
+  assetId: string | undefined,
+): assetId is StellarNativeAssetId & CaipAssetType {
+  return assetId !== undefined && is(assetId, StellarNativeAssetIdStruct);
+}
+
+/**
+ * Validates native-asset enrichment for a spendable-balance-capable asset.
+ *
+ * @param assetId - CAIP-19 asset id.
+ * @param info - Balance metadata candidate.
+ * @returns Validated native enrichment, or `undefined`.
+ */
+function getNativeAssetInfoForAsset(
+  assetId: string,
+  info: unknown,
+): NativeAssetInfo | undefined {
+  if (!isAssetSupportSpendableBalance(assetId)) {
+    return undefined;
+  }
+  return is(info, NativeAssetInfoStruct) ? info : undefined;
+}
+
+/**
+ * Validates trustline enrichment for an activation-capable asset.
+ *
+ * @param assetId - CAIP-19 asset id.
+ * @param info - Balance metadata candidate.
+ * @returns Validated trustline enrichment, or `undefined`.
+ */
+function getTrustlineAssetInfoForAsset(
+  assetId: string,
+  info: unknown,
+): TrustlineAssetInfo | undefined {
+  if (!isAssetSupportActivation(assetId)) {
+    return undefined;
+  }
+  return is(info, TrustlineAssetInfoStruct) ? info : undefined;
+}
+
+/**
+ * Reads optional per-balance metadata from an AssetsController balance entry.
+ *
+ * @param balance - Balance entry for an account/asset pair.
+ * @returns Balance metadata when present.
+ */
+function getAssetBalanceMetadata(
+  balance: AssetBalanceEntry | undefined,
+): unknown {
+  if (
+    balance &&
+    typeof balance === 'object' &&
+    'metadata' in balance &&
+    balance.metadata !== undefined
+  ) {
+    return balance.metadata;
+  }
+  return undefined;
+}
+
+/**
+ * Converts a base-unit amount to display units.
+ *
+ * @param amount - Amount in base units (e.g. stroops).
+ * @param decimalPlaces - Number of decimals for the asset.
+ * @returns Amount in display units.
+ */
+function normalizeAmount(amount: string, decimalPlaces: number): string {
+  return new BigNumber(amount)
+    .dividedBy(new BigNumber(10).pow(decimalPlaces))
+    .toFixed();
+}
+
+/**
+ * Parameters for account/asset Stellar selectors.
+ */
+export interface StellarAccountAssetParams {
+  accountId?: string;
+  assetId: string;
+}
+
+/**
+ * Resolves an account id from an explicit override, or from the selected
+ * account for the asset's CAIP chain scope.
+ *
+ * @param state - Redux state.
+ * @param params - Account/asset lookup params.
+ * @returns Resolved account id, or `undefined`.
+ */
+function selectResolvedAccountIdForAsset(
+  state: unknown,
+  params: StellarAccountAssetParams,
+): string | undefined {
+  const { accountId, assetId } = params;
+  if (accountId) {
+    return accountId;
+  }
+  if (!isCaipAssetType(assetId)) {
+    return undefined;
+  }
+  return selectSelectedInternalAccountByScope(state as RootState)(
+    parseCaipAssetType(assetId).chainId,
+  )?.id;
+}
+
+/**
+ * Spendable balance breakdown for an account/asset pair.
+ * Reads `minimumReserveBalance`, `spendableBalance`, and `decimal` from
+ * `assetsBalance[accountId][assetId].metadata`, then returns both amounts in
+ * display units.
+ * When `accountId` is omitted, falls back to the selected internal account for
+ * the asset's CAIP chain scope.
+ *
+ * Returns `undefined` when:
+ * - `assetId` is not a CAIP asset type that supports spendable balance
+ * - a resolved `accountId` is missing
+ * - native enrichment is missing or fails validation
+ *
+ * @param state - Redux state with AssetsController balances.
+ * @param params - Account/asset lookup params.
+ * @param params.accountId - Optional account id override.
+ * @param params.assetId - Asset id (CAIP when valid).
+ * @returns Display-unit spendable info, or `undefined`.
+ */
+export const getSpendableForAccount = createParameterizedSelector(
+  selectAssetsBalance,
+  selectResolvedAccountIdForAsset,
+  (_state: unknown, params: StellarAccountAssetParams) => params.assetId,
+  (assetsBalance, resolvedAccountId, assetId) => {
+    if (!isAssetSupportSpendableBalance(assetId) || !resolvedAccountId) {
+      return undefined;
+    }
+    const nativeInfo = getNativeAssetInfoForAsset(
+      assetId,
+      getAssetBalanceMetadata(assetsBalance[resolvedAccountId]?.[assetId]),
+    );
+    if (!nativeInfo) {
+      return undefined;
+    }
+    // Align with Accounts API,
+    // it returns `minimumReserveBalance`, `spendableBalance` in smallest unit,
+    // and provide `decimal` for conversion to display units.
+    return {
+      minimumReserveBalance: normalizeAmount(
+        nativeInfo.minimumReserveBalance,
+        nativeInfo.decimal,
+      ),
+      spendableBalance: normalizeAmount(
+        nativeInfo.spendableBalance,
+        nativeInfo.decimal,
+      ),
+    } satisfies SpendableInfo;
+  },
+);
+
+/**
+ * Trustline metadata for an account/asset pair.
+ * Reads `limit` from `assetsBalance[accountId][assetId].metadata`.
+ * When `accountId` is omitted, falls back to the selected internal account for
+ * the asset's CAIP chain scope.
+ *
+ * Returns `undefined` when:
+ * - `assetId` is missing or not a CAIP asset type that supports activation
+ * - a resolved `accountId` is missing
+ * - trustline enrichment is missing or fails validation
+ *
+ * @param state - Redux state with AssetsController balances.
+ * @param params - Account/asset lookup params.
+ * @param params.accountId - Optional account id override.
+ * @param params.assetId - Asset id (CAIP when known).
+ * @returns Trustline info, or `undefined`.
+ */
+export const getTrustlineAssetInfoForAccount = createParameterizedSelector(
+  selectAssetsBalance,
+  selectResolvedAccountIdForAsset,
+  (_state: unknown, params: StellarAccountAssetParams) => params.assetId,
+  (assetsBalance, resolvedAccountId, assetId) => {
+    if (!isAssetSupportActivation(assetId) || !resolvedAccountId) {
+      return undefined;
+    }
+    return getTrustlineAssetInfoForAsset(
+      assetId,
+      getAssetBalanceMetadata(assetsBalance[resolvedAccountId]?.[assetId]),
+    );
+  },
+);
+
+/**
+ * Whether a asset needs trustline activation.
+ * When `accountId` is omitted, falls back to the selected internal account for
+ * the asset's CAIP chain scope.
+ *
+ * Returns `false` when:
+ * - `assetId` is missing or not a CAIP asset type that supports activation
+ * - a resolved `accountId` is missing
+ * - trustline `limit` is present and non-zero (already active)
+ *
+ * Returns `true` when the asset is support activation and either trustline metadata is
+ * missing (e.g. newly imported) or `limit` is `'0'`.
+ *
+ * @param state - Redux state with AssetsController balances.
+ * @param params - Account/asset lookup params.
+ * @param params.accountId - Optional account id override.
+ * @param params.assetId - Asset id (CAIP when known).
+ * @returns `true` when activation is still required.
+ */
+export const getIsAssetRequireActivate = createParameterizedSelector(
+  getTrustlineAssetInfoForAccount,
+  selectResolvedAccountIdForAsset,
+  (_state: unknown, params: StellarAccountAssetParams) => params.assetId,
+  (assetMetadata, resolvedAccountId, assetId) => {
+    if (!isAssetSupportActivation(assetId) || !resolvedAccountId) {
+      return false;
+    }
+    if (assetMetadata) {
+      return assetMetadata.limit === '0';
+    }
+    // Missing metadata is ambiguous (no account vs newly imported).
+    // No account → don’t require activation.
+    // No metadata → require activation (newly imported).
+    return true;
+  },
+);
diff --git a/app/selectors/tokensController.test.ts b/app/selectors/tokensController.test.ts
index 8544d58cdc60..05060bb28741 100644
--- a/app/selectors/tokensController.test.ts
+++ b/app/selectors/tokensController.test.ts
@@ -128,6 +128,120 @@ describe('TokensController Selectors', () => {
 
       expect(selectTokensByAddress(stateWithoutTokens)).toStrictEqual({});
     });
+
+    it('returns a stable reference when called twice with the same state', () => {
+      selectTokens.clearCache();
+      selectTokensByAddress.clearCache();
+
+      const first = selectTokensByAddress(mockRootState);
+      const second = selectTokensByAddress(mockRootState);
+
+      expect(first).toBe(second);
+    });
+
+    it('returns a stable reference across equal-content states', () => {
+      selectTokens.clearCache();
+      selectTokensByAddress.clearCache();
+
+      const equalContentState = {
+        ...mockRootState,
+        engine: {
+          backgroundState: {
+            TokensController: {
+              ...mockTokensControllerState,
+              allTokens: {
+                '0x1': {
+                  '0xAddress1': [mockToken],
+                  '0xAddress2': [mockToken2],
+                },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                selectedAccount: '0xAddress1',
+                accounts: {
+                  '0xAddress1': {
+                    address: '0xAddress1',
+                  },
+                },
+              },
+            },
+          },
+        },
+      } as unknown as RootState;
+
+      const first = selectTokensByAddress(mockRootState);
+      const second = selectTokensByAddress(equalContentState);
+
+      expect(first).toBe(second);
+      expect(first).toStrictEqual({
+        '0xToken1': mockToken,
+      });
+    });
+
+    it('returns a stable empty-object reference for empty tokens', () => {
+      selectTokens.clearCache();
+      selectTokensByAddress.clearCache();
+
+      const emptyStateA = {
+        ...mockRootState,
+        engine: {
+          backgroundState: {
+            TokensController: {
+              ...mockTokensControllerState,
+              allTokens: {
+                '0x1': {
+                  '0xAddress1': [],
+                },
+              },
+              tokens: [],
+            },
+            AccountsController: {
+              internalAccounts: {
+                selectedAccount: '0xAddress1',
+                accounts: {
+                  '0xAddress1': {
+                    address: '0xAddress1',
+                  },
+                },
+              },
+            },
+          },
+        },
+      } as unknown as RootState;
+      const emptyStateB = {
+        ...mockRootState,
+        engine: {
+          backgroundState: {
+            TokensController: {
+              ...mockTokensControllerState,
+              allTokens: {
+                '0x1': {
+                  '0xAddress1': [],
+                },
+              },
+              tokens: [],
+            },
+            AccountsController: {
+              internalAccounts: {
+                selectedAccount: '0xAddress1',
+                accounts: {
+                  '0xAddress1': {
+                    address: '0xAddress1',
+                  },
+                },
+              },
+            },
+          },
+        },
+      } as unknown as RootState;
+
+      const first = selectTokensByAddress(emptyStateA);
+      const second = selectTokensByAddress(emptyStateB);
+
+      expect(first).toBe(second);
+      expect(first).toStrictEqual({});
+    });
   });
 
   describe('selectTokensLength', () => {
diff --git a/app/selectors/tokensController.ts b/app/selectors/tokensController.ts
index b581a7cac851..814591ce5aca 100644
--- a/app/selectors/tokensController.ts
+++ b/app/selectors/tokensController.ts
@@ -74,13 +74,22 @@ export const selectTokensByChainIdAndWalletAddress = createDeepEqualSelector(
         ) ?? {}),
 );
 
-export const selectTokensByAddress = createSelector(
+const EMPTY_TOKENS_BY_ADDRESS: Readonly<Record<string, never>> = Object.freeze(
+  {},
+);
+
+export const selectTokensByAddress = createDeepEqualSelector(
   selectTokens,
-  (tokens: Token[]) =>
-    tokens?.reduce((tokensMap: { [address: string]: Token }, token: Token) => {
+  (tokens: Token[]): { [address: string]: Token } => {
+    if (!tokens?.length) {
+      return EMPTY_TOKENS_BY_ADDRESS;
+    }
+
+    return tokens.reduce<Record<string, Token>>((tokensMap, token) => {
       tokensMap[token.address] = token;
       return tokensMap;
-    }, {}),
+    }, {});
+  },
 );
 
 export const selectTokensLength = createSelector(
diff --git a/app/selectors/transactionController.ts b/app/selectors/transactionController.ts
index 8af86ab6cb50..70b425b0a78f 100644
--- a/app/selectors/transactionController.ts
+++ b/app/selectors/transactionController.ts
@@ -468,6 +468,22 @@ export const makeSelectTransactionMetadataById =
   (id: string) => (state: RootState) =>
     selectTransactionMetadataById(state, id);
 
+/**
+ * Local `TransactionMeta` for an on-chain hash. Needed by callers that only
+ * hold a hash — e.g. provider-backed activity rows (Perps) whose feed entry
+ * carries the tx hash but none of the local metadata.
+ */
+export const selectTransactionMetadataByHash = createSelector(
+  selectTransactionsStrict,
+  (_: RootState, hash: string | undefined) => hash,
+  (transactions, hash) =>
+    hash
+      ? transactions.find(
+          (tx) => tx.hash?.toLowerCase() === hash?.toLowerCase(),
+        )
+      : undefined,
+);
+
 export const selectTransactionBatchMetadataById = createDeepEqualSelector(
   selectTransactionBatchesStrict,
   (_: RootState, id: string) => id,
diff --git a/app/selectors/transactionPayController.ts b/app/selectors/transactionPayController.ts
index 8c12b993429a..01b90cf1b7b9 100644
--- a/app/selectors/transactionPayController.ts
+++ b/app/selectors/transactionPayController.ts
@@ -100,3 +100,8 @@ export const selectPaymentOverrideByTransactionId = createSelector(
     (transactionData as Record<string, unknown> | undefined)
       ?.paymentOverride as string | undefined,
 );
+
+export const selectTransactionPayQuoteErrorByTransactionId = createSelector(
+  selectTransactionDataByTransactionId,
+  (transactionData) => transactionData?.quoteError,
+);
diff --git a/app/util/activity-adapters/adapters/keyring-transaction.test.ts b/app/util/activity-adapters/adapters/keyring-transaction.test.ts
index d52c238aa6c8..26193125f2d8 100644
--- a/app/util/activity-adapters/adapters/keyring-transaction.test.ts
+++ b/app/util/activity-adapters/adapters/keyring-transaction.test.ts
@@ -168,6 +168,31 @@ describe('mapKeyringTransaction', () => {
     );
   });
 
+  it('maps a send transaction missing its chain instead of throwing', () => {
+    const item = mapKeyringTransaction({
+      transaction: {
+        id: 'no-chain-id',
+        chain: undefined,
+        account: '00000000-0000-4000-8000-000000000000',
+        status: TransactionStatus.Confirmed,
+        timestamp: 1716367781,
+        type: TransactionType.Send,
+        from: [{ address: 'from-address', asset: null }],
+        to: [{ address: 'to-address', asset: null }],
+        fees: [],
+        events: [],
+      } as unknown as Transaction,
+    });
+
+    expect(item).toEqual(
+      expect.objectContaining({
+        type: 'send',
+        chainId: undefined,
+        hash: 'no-chain-id',
+      }),
+    );
+  });
+
   it('maps trustline approve transactions to assetActivation activity items', () => {
     const item = mapKeyringTransaction({
       transaction: {
diff --git a/app/util/activity-adapters/adapters/keyring-transaction.ts b/app/util/activity-adapters/adapters/keyring-transaction.ts
index 9aae3c1a2f39..bda68c967ab9 100644
--- a/app/util/activity-adapters/adapters/keyring-transaction.ts
+++ b/app/util/activity-adapters/adapters/keyring-transaction.ts
@@ -245,7 +245,7 @@ export function mapKeyringTransaction({
 
     // Bitcoin transaction.from can be empty, resulting in no token avatar or send amount displayed.
     // Workaround: use the same aggregated to-asset fallback strategy as tx details modal.
-    if (!fromToken && chainId.startsWith('bip122:')) {
+    if (!fromToken && chainId?.startsWith('bip122:')) {
       const aggregatedToAsset = aggregateMovementAmount(transaction.to);
       if (aggregatedToAsset) {
         token = {
diff --git a/app/util/activity-adapters/adapters/local-transaction.test.ts b/app/util/activity-adapters/adapters/local-transaction.test.ts
index d9bf2fe1b174..4e8f44cfb641 100644
--- a/app/util/activity-adapters/adapters/local-transaction.test.ts
+++ b/app/util/activity-adapters/adapters/local-transaction.test.ts
@@ -349,6 +349,108 @@ describe('mapLocalTransaction', () => {
     expect(token?.amount).toBe('1000000');
   });
 
+  it('maps a perps deposit to perpsAddFunds with the collateral token', () => {
+    // Pay puts the source-chain leg in a separate transaction, so the perps
+    // type sits on the transaction itself rather than on a nested call.
+    const usdcArbitrum = '0xaf88d065e77c8cc2239327c5edb3a432268e5831';
+    const bridge = '0x2df1c51e09aecf9cacb7bc98cb1742757f163df7';
+    const transaction = {
+      chainId: '0xa4b1',
+      id: 'perps-deposit-id',
+      hash: '0xperpsdeposit',
+      status: TransactionStatus.confirmed,
+      time: 1716367781000,
+      type: TransactionType.perpsDeposit,
+      txParams: {
+        from,
+        to: usdcArbitrum,
+        data: encodeTransfer(bridge, 100000n),
+      },
+    } as unknown as Partial<TransactionMeta>;
+
+    const result = withoutRaw(mapLocalTransaction(makeGroup(transaction)));
+    expect(result.type).toBe('perpsAddFunds');
+    const token = 'token' in result.data ? result.data.token : undefined;
+    expect(token).toEqual({
+      amount: '100000',
+      assetId: toAssetId(usdcArbitrum, 'eip155:42161'),
+      decimals: 6,
+      direction: 'in',
+      symbol: 'USDC',
+    });
+  });
+
+  it('maps a perps deposit carried as a nested batch call', () => {
+    const usdcArbitrum = '0xaf88d065e77c8cc2239327c5edb3a432268e5831';
+    const transaction = {
+      chainId: '0xa4b1',
+      id: 'perps-deposit-batch-id',
+      hash: '0xperpsdepositbatch',
+      status: TransactionStatus.confirmed,
+      time: 1716367781000,
+      type: TransactionType.batch,
+      txParams: { from, to: from },
+      nestedTransactions: [
+        {
+          type: TransactionType.perpsDepositAndOrder,
+          to: usdcArbitrum,
+          data: encodeTransfer(from, 250000n),
+        },
+      ],
+    } as unknown as Partial<TransactionMeta>;
+
+    const result = withoutRaw(mapLocalTransaction(makeGroup(transaction)));
+    expect(result.type).toBe('perpsAddFunds');
+    expect('token' in result.data ? result.data.token?.amount : undefined).toBe(
+      '250000',
+    );
+  });
+
+  it('maps a perps deposit whose type was rewritten but kept as originalType', () => {
+    const usdcArbitrum = '0xaf88d065e77c8cc2239327c5edb3a432268e5831';
+    const transaction = {
+      chainId: '0xa4b1',
+      id: 'perps-deposit-original-type-id',
+      hash: '0xperpsdepositoriginal',
+      status: TransactionStatus.submitted,
+      time: 1716367781000,
+      type: TransactionType.contractInteraction,
+      originalType: TransactionType.perpsDeposit,
+      txParams: {
+        from,
+        to: usdcArbitrum,
+        data: encodeTransfer(from, 100000n),
+      },
+    } as unknown as Partial<TransactionMeta>;
+
+    expect(withoutRaw(mapLocalTransaction(makeGroup(transaction))).type).toBe(
+      'perpsAddFunds',
+    );
+  });
+
+  it('maps a perps withdraw to perpsWithdraw (out direction)', () => {
+    const usdcArbitrum = '0xaf88d065e77c8cc2239327c5edb3a432268e5831';
+    const transaction = {
+      chainId: '0xa4b1',
+      id: 'perps-withdraw-id',
+      hash: '0xperpswithdraw',
+      status: TransactionStatus.confirmed,
+      time: 1716367781000,
+      type: TransactionType.perpsWithdraw,
+      txParams: {
+        from,
+        to: usdcArbitrum,
+        data: encodeTransfer(from, 500000n),
+      },
+    } as unknown as Partial<TransactionMeta>;
+
+    const result = withoutRaw(mapLocalTransaction(makeGroup(transaction)));
+    expect(result.type).toBe('perpsWithdraw');
+    expect(
+      'token' in result.data ? result.data.token?.direction : undefined,
+    ).toBe('out');
+  });
+
   it('leaves unknown token transfer symbols blank', () => {
     const tokenContractAddress = '0x1111111111111111111111111111111111111111';
     const transaction = {
diff --git a/app/util/activity-adapters/adapters/local-transaction.ts b/app/util/activity-adapters/adapters/local-transaction.ts
index c2ec734d8b4c..43fdc6288e56 100644
--- a/app/util/activity-adapters/adapters/local-transaction.ts
+++ b/app/util/activity-adapters/adapters/local-transaction.ts
@@ -38,6 +38,14 @@ const EVM_NATIVE_DECIMALS = 18;
 
 const PREDICT_COLLATERAL_DECIMALS = 6;
 const PREDICT_COLLATERAL_SYMBOL = 'USDC';
+
+const PERPS_COLLATERAL_DECIMALS = 6;
+const PERPS_COLLATERAL_SYMBOL = 'USDC';
+const PERPS_DEPOSIT_TYPES: TransactionType[] = [
+  TransactionType.perpsDeposit,
+  TransactionType.perpsDepositAndOrder,
+];
+const PERPS_WITHDRAW_TYPES: TransactionType[] = [TransactionType.perpsWithdraw];
 const ERC20_TRANSFER_SELECTOR = '0xa9059cbb';
 
 // Converts local TransactionController groups into activity items
@@ -515,6 +523,98 @@ export function mapLocalTransaction(
     return predictFundsActivity;
   }
 
+  /**
+   * Perps deposits/withdrawals submitted from this device. The Activity list
+   * never shows these — the HyperLiquid feed's copy wins the hash dedup, and
+   * the list drops local perps groups outright. This is for the details screen,
+   * which resolves by `TransactionMeta.id` before the feed catches up (the
+   * funding toast's "Track"), so the row lands on the Perps funding template
+   * rather than a generic contract interaction.
+   *
+   * Checks the transaction and its nested calls, plus `originalType` since the
+   * confirmation flow can rewrite `type` — mirroring
+   * `isPerpsWalletTransactionGroup` in the Activity list.
+   */
+  const getPerpsFundsActivity = (): ActivityListItem | undefined => {
+    const isType = (
+      candidate:
+        | { type?: TransactionType; originalType?: TransactionType }
+        | undefined,
+      types: TransactionType[],
+    ) =>
+      Boolean(
+        candidate &&
+          ((candidate.type && types.includes(candidate.type)) ||
+            (candidate.originalType && types.includes(candidate.originalType))),
+      );
+
+    const metas = [initialTransaction, primaryTransaction];
+    const nested = initialTransaction.nestedTransactions ?? [];
+    const isDeposit =
+      metas.some((meta) => isType(meta, PERPS_DEPOSIT_TYPES)) ||
+      nested.some((call) => isType(call, PERPS_DEPOSIT_TYPES));
+    const isWithdraw =
+      !isDeposit &&
+      (metas.some((meta) => isType(meta, PERPS_WITHDRAW_TYPES)) ||
+        nested.some((call) => isType(call, PERPS_WITHDRAW_TYPES)));
+
+    if (!isDeposit && !isWithdraw) {
+      return undefined;
+    }
+
+    // The collateral moves via ERC-20 transfer(address,uint256) — from the
+    // nested call in a batch, otherwise from the transaction's own params.
+    const fundsCall =
+      nested.find((call) =>
+        isType(call, isDeposit ? PERPS_DEPOSIT_TYPES : PERPS_WITHDRAW_TYPES),
+      ) ?? initialTransaction.txParams;
+    const contractAddress = fundsCall.to;
+    const data = fundsCall.data;
+
+    let amount: string | undefined;
+    if (
+      data &&
+      data.toLowerCase().startsWith(ERC20_TRANSFER_SELECTOR) &&
+      data.length >= 138
+    ) {
+      try {
+        amount = BigInt(`0x${data.slice(74, 138)}`).toString();
+      } catch {
+        amount = undefined;
+      }
+    }
+
+    const tokenMetadata = contractAddress
+      ? getKnownTokenMetadata(chainId, contractAddress, environment)
+      : undefined;
+    const assetId = contractAddress
+      ? environment.toAssetId(contractAddress, chainId)
+      : undefined;
+
+    const token: TokenAmount = {
+      direction: isDeposit ? 'in' : 'out',
+      symbol: tokenMetadata?.symbol ?? PERPS_COLLATERAL_SYMBOL,
+      decimals: tokenMetadata?.decimals ?? PERPS_COLLATERAL_DECIMALS,
+      ...(assetId ? { assetId } : {}),
+      ...(amount ? { amount } : {}),
+    };
+
+    return {
+      type: isDeposit ? 'perpsAddFunds' : 'perpsWithdraw',
+      chainId,
+      status,
+      timestamp,
+      hash,
+      raw: { type: 'localTransaction', data: transactionGroup },
+      data: { token },
+    };
+  };
+
+  const perpsFundsActivity = getPerpsFundsActivity();
+  if (perpsFundsActivity) {
+    return perpsFundsActivity;
+  }
+
   const getSmartAccountUpgradeActivity = (): ActivityListItem | undefined => {
     // EIP-7702: a transaction carrying an authorization list is the one that
     // delegates (upgrades) the EOA to a smart account. This is the canonical
diff --git a/app/util/analytics/abTestAnalyticsRegistry.ts b/app/util/analytics/abTestAnalyticsRegistry.ts
index 92f0a51d0737..96b299ff5d8f 100644
--- a/app/util/analytics/abTestAnalyticsRegistry.ts
+++ b/app/util/analytics/abTestAnalyticsRegistry.ts
@@ -6,6 +6,7 @@ import { TOKEN_SELECTOR_BALANCE_LAYOUT_AB_TEST_ANALYTICS_MAPPING } from '../../c
 import { SWAPS_HAPTICS_AB_TEST_ANALYTICS_MAPPING } from '../../components/UI/Bridge/haptics/abTestConfig';
 import {
   HOMEPAGE_ACTION_BUTTONS_GRID_AB_TEST_ANALYTICS_MAPPING,
+  HOMEPAGE_BALANCE_BREAKDOWN_AB_TEST_ANALYTICS_MAPPING,
   HOMEPAGE_DISCOVERY_PILLS_AB_TEST_ANALYTICS_MAPPING,
   HOMEPAGE_PERPS_PILLS_EMPTY_AB_TEST_HOME_VIEWED_MAPPING,
 } from '../../components/Views/Homepage/abTestConfig';
@@ -29,6 +30,7 @@ export const AB_TEST_ANALYTICS_MAPPINGS: readonly ABTestAnalyticsMapping[] = [
 
   // Homepage
   HOMEPAGE_ACTION_BUTTONS_GRID_AB_TEST_ANALYTICS_MAPPING,
+  HOMEPAGE_BALANCE_BREAKDOWN_AB_TEST_ANALYTICS_MAPPING,
   HOMEPAGE_DISCOVERY_PILLS_AB_TEST_ANALYTICS_MAPPING,
   HOMEPAGE_PERPS_PILLS_EMPTY_AB_TEST_HOME_VIEWED_MAPPING,
 
diff --git a/app/util/analytics/enrichWithABTests.test.ts b/app/util/analytics/enrichWithABTests.test.ts
index ca288a4365ee..a41d84dd433f 100644
--- a/app/util/analytics/enrichWithABTests.test.ts
+++ b/app/util/analytics/enrichWithABTests.test.ts
@@ -1,6 +1,7 @@
 import { AnalyticsEventBuilder } from './AnalyticsEventBuilder';
 import { MetaMetricsEvents } from '../../core/Analytics/MetaMetrics.events';
 import { WHATS_HAPPENING_EXPLORE_AB_KEY } from '../../components/Views/TrendingView/abTestConfig';
+import { HOMEPAGE_BALANCE_BREAKDOWN_AB_KEY } from '../../components/Views/Homepage/abTestConfig';
 import { createActiveABTestAssignment } from './activeABTestAssignments';
 import { enrichWithABTests } from './enrichWithABTests';
 
@@ -44,6 +45,23 @@ describe('enrichWithABTests', () => {
     });
   });
 
+  it('enriches homepage breakdown row events with the experiment assignment', () => {
+    const event = AnalyticsEventBuilder.createEventBuilder(
+      MetaMetricsEvents.BALANCE_BREAKDOWN_SLICE_TAPPED,
+    ).build();
+
+    const result = enrichWithABTests(event, {
+      [HOMEPAGE_BALANCE_BREAKDOWN_AB_KEY]: 'allocation',
+    });
+
+    expect(result.properties.active_ab_tests).toEqual([
+      createActiveABTestAssignment(
+        HOMEPAGE_BALANCE_BREAKDOWN_AB_KEY,
+        'allocation',
+      ),
+    ]);
+  });
+
   it('injects multiple assignments when multiple tests match the same event', () => {
     const event = AnalyticsEventBuilder.createEventBuilder(
       'Unified SwapBridge Page Viewed',
diff --git a/app/util/analytics/walletSetupCompletedAttribution.test.ts b/app/util/analytics/walletSetupCompletedAttribution.test.ts
index 0554a1ddb41d..a440f565ae40 100644
--- a/app/util/analytics/walletSetupCompletedAttribution.test.ts
+++ b/app/util/analytics/walletSetupCompletedAttribution.test.ts
@@ -2,7 +2,11 @@ import {
   ATTRIBUTION_DEFAULT_TTL_MS,
   type AttributionRecord,
 } from '../../core/redux/slices/attribution';
-import { getWalletSetupCompletedAttributionAnalyticsProps } from './walletSetupCompletedAttribution';
+import ReduxService from '../../core/redux';
+import {
+  getWalletSetupAttributionPropsFromStore,
+  getWalletSetupCompletedAttributionAnalyticsProps,
+} from './walletSetupCompletedAttribution';
 
 const baseRecord: AttributionRecord = {
   utm_source: 'email',
@@ -91,3 +95,47 @@ describe('getWalletSetupCompletedAttributionAnalyticsProps', () => {
     });
   });
 });
+
+describe('getWalletSetupAttributionPropsFromStore', () => {
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('returns acquisition fields from Redux when marketing consent is true', () => {
+    jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+      getState: () => ({
+        attribution: {
+          attribution: {
+            ...baseRecord,
+            // Match former seedless Appium attribution E2E fixture fields.
+            utm_source: 'e2e_wsc_utm_source',
+            utm_campaign: 'e2e_wsc_campaign',
+            attribution_id: 'e2e_wsc_attr_id',
+            capturedAt: Date.now(),
+          },
+        },
+      }),
+    } as unknown as typeof ReduxService.store);
+
+    expect(getWalletSetupAttributionPropsFromStore(true)).toEqual({
+      utm_source: 'e2e_wsc_utm_source',
+      utm_campaign: 'e2e_wsc_campaign',
+      attribution_id: 'e2e_wsc_attr_id',
+    });
+  });
+
+  it('returns empty object when marketing consent is false', () => {
+    jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+      getState: () => ({
+        attribution: {
+          attribution: {
+            ...baseRecord,
+            capturedAt: Date.now(),
+          },
+        },
+      }),
+    } as unknown as typeof ReduxService.store);
+
+    expect(getWalletSetupAttributionPropsFromStore(false)).toEqual({});
+  });
+});
diff --git a/app/util/bridge/hooks/useSubmitBridgeTx.test.tsx b/app/util/bridge/hooks/useSubmitBridgeTx.test.tsx
index 4a22a9fe4eed..7822dd3320a3 100644
--- a/app/util/bridge/hooks/useSubmitBridgeTx.test.tsx
+++ b/app/util/bridge/hooks/useSubmitBridgeTx.test.tsx
@@ -13,6 +13,8 @@ import { backgroundState } from '../../test/initial-root-state';
 import { TransactionMeta } from '@metamask/transaction-controller';
 import { selectSourceWalletAddress } from '../../../selectors/bridge';
 import { useABTest } from '../../../hooks';
+import { createActiveABTestAssignment } from '../../analytics/activeABTestAssignments';
+import { SWAPS_CTA_BUTTON_COLOR_AB_KEY } from '../../../components/UI/Bridge/components/SwapsConfirmButton/abTestConfig';
 
 type BridgeQuoteResponse = QuoteResponse & QuoteMetadata;
 interface MockABTestResult {
@@ -102,10 +104,12 @@ describe('useSubmitBridgeTx', () => {
     numpad = inactiveABTestResult,
     tokenSelector = inactiveABTestResult,
     ambientColor = inactiveABTestResult,
+    ctaButtonColor = inactiveABTestResult,
   }: {
     numpad?: MockABTestResult;
     tokenSelector?: MockABTestResult;
     ambientColor?: MockABTestResult;
+    ctaButtonColor?: MockABTestResult;
   } = {}) => {
     jest
       .mocked(useABTest)
@@ -113,7 +117,8 @@ describe('useSubmitBridgeTx', () => {
       .mockReturnValue(inactiveABTestResult)
       .mockReturnValueOnce(numpad)
       .mockReturnValueOnce(tokenSelector)
-      .mockReturnValueOnce(ambientColor);
+      .mockReturnValueOnce(ambientColor)
+      .mockReturnValueOnce(ctaButtonColor);
   };
 
   beforeEach(() => {
@@ -549,6 +554,102 @@ describe('useSubmitBridgeTx', () => {
     expect(txResult).toEqual(mockIntentResult);
   });
 
+  it('forwards caller-supplied active A/B tests via submitTx', async () => {
+    const transactionActiveAbTests = [
+      createActiveABTestAssignment('callerExperiment', 'treatment'),
+    ];
+    const mockQuoteResponse = {
+      ...DummyQuotesNoApproval.OP_0_005_ETH_TO_ARB[0],
+      ...DummyQuoteMetadata,
+    };
+    mockSubmitTx.mockResolvedValueOnce({
+      chainId: '0x1',
+      id: '1',
+      networkClientId: '1',
+      status: 'submitted',
+      time: Date.now(),
+      txParams: {
+        from: '0x1234567890123456789012345678901234567890',
+      },
+    } as TransactionMeta);
+    const { result } = renderHook(() => useSubmitBridgeTx(), {
+      wrapper: createWrapper(),
+    });
+
+    await result.current.submitBridgeTx({
+      quoteResponse: mockQuoteResponse as BridgeQuoteResponse,
+      transactionActiveAbTests,
+    });
+
+    expect(mockSubmitTx).toHaveBeenLastCalledWith(
+      '0x1234567890123456789012345678901234567890',
+      {
+        ...mockQuoteResponse,
+        approval: undefined,
+      },
+      true,
+      undefined,
+      undefined,
+      undefined,
+      transactionActiveAbTests,
+      null,
+      undefined,
+      'token_amount',
+    );
+  });
+
+  it('forwards CTA button color A/B test assignment via submitTx', async () => {
+    mockABTests({
+      ctaButtonColor: {
+        variant: {},
+        variantName: 'treatment',
+        isActive: true,
+      },
+    });
+    const mockQuoteResponse = {
+      ...DummyQuotesNoApproval.OP_0_005_ETH_TO_ARB[0],
+      ...DummyQuoteMetadata,
+    };
+    mockSubmitTx.mockResolvedValueOnce({
+      chainId: '0x1',
+      id: '1',
+      networkClientId: '1',
+      status: 'submitted',
+      time: Date.now(),
+      txParams: {
+        from: '0x1234567890123456789012345678901234567890',
+      },
+    } as TransactionMeta);
+    const { result } = renderHook(() => useSubmitBridgeTx(), {
+      wrapper: createWrapper(),
+    });
+
+    await result.current.submitBridgeTx({
+      quoteResponse: mockQuoteResponse as BridgeQuoteResponse,
+    });
+
+    expect(mockSubmitTx).toHaveBeenLastCalledWith(
+      '0x1234567890123456789012345678901234567890',
+      {
+        ...mockQuoteResponse,
+        approval: undefined,
+      },
+      true,
+      undefined,
+      undefined,
+      undefined,
+      [
+        createActiveABTestAssignment(
+          SWAPS_CTA_BUTTON_COLOR_AB_KEY,
+          'treatment',
+        ),
+      ],
+      null,
+      undefined,
+      'token_amount',
+    );
+  });
+
   it('forwards ambient color AB test assignment via submitTx when active', async () => {
     mockABTests({
       ambientColor: {
diff --git a/app/util/bridge/hooks/useSubmitBridgeTx.ts b/app/util/bridge/hooks/useSubmitBridgeTx.ts
index b411a91f5a54..6532f00f016d 100644
--- a/app/util/bridge/hooks/useSubmitBridgeTx.ts
+++ b/app/util/bridge/hooks/useSubmitBridgeTx.ts
@@ -22,6 +22,11 @@ import {
   TOKEN_SELECTOR_BALANCE_LAYOUT_AB_KEY,
   TOKEN_SELECTOR_BALANCE_LAYOUT_VARIANTS,
 } from '../../../components/UI/Bridge/components/TokenSelectorItem.abTestConfig';
+import {
+  SWAPS_CTA_BUTTON_COLOR_AB_KEY,
+  SWAPS_CTA_BUTTON_COLOR_EXPOSURE_METADATA,
+  SWAPS_CTA_BUTTON_COLOR_VARIANTS,
+} from '../../../components/UI/Bridge/components/SwapsConfirmButton/abTestConfig';
 import {
   AMBIENT_PRICE_COLOR_AB_KEY,
   AMBIENT_PRICE_COLOR_VARIANTS,
@@ -69,6 +74,14 @@ export default function useSubmitBridgeTx() {
     variantName: ambientColorVariantName,
     isActive: isAmbientColorAbActive,
   } = useABTest(AMBIENT_PRICE_COLOR_AB_KEY, AMBIENT_PRICE_COLOR_VARIANTS);
+  const {
+    variantName: ctaButtonColorVariantName,
+    isActive: isCtaButtonColorAbActive,
+  } = useABTest(
+    SWAPS_CTA_BUTTON_COLOR_AB_KEY,
+    SWAPS_CTA_BUTTON_COLOR_VARIANTS,
+    SWAPS_CTA_BUTTON_COLOR_EXPOSURE_METADATA,
+  );
 
   const abTests = abTestContext?.assetsASSETS2493AbtestTokenDetailsLayout
     ? {
@@ -106,6 +119,15 @@ export default function useSubmitBridgeTx() {
       );
     }
 
+    if (isCtaButtonColorAbActive) {
+      tests.push(
+        createActiveABTestAssignment(
+          SWAPS_CTA_BUTTON_COLOR_AB_KEY,
+          ctaButtonColorVariantName,
+        ),
+      );
+    }
+
     return tests.length > 0 ? tests : undefined;
   }, [
     isNumpadAbActive,
@@ -114,6 +136,8 @@ export default function useSubmitBridgeTx() {
     tokenSelectorVariantName,
     isAmbientColorAbActive,
     ambientColorVariantName,
+    isCtaButtonColorAbActive,
+    ctaButtonColorVariantName,
   ]);
 
   const submitBridgeTx = async ({
diff --git a/app/util/logs/index.test.ts b/app/util/logs/index.test.ts
index 6f9c3d5c1198..cacd301e74f9 100644
--- a/app/util/logs/index.test.ts
+++ b/app/util/logs/index.test.ts
@@ -140,6 +140,7 @@ describe('logs :: generateStateLogs', () => {
           PhishingController: { whitelist: [] },
           AssetsContractController: { assets: [] },
           DeFiPositionsController: { positions: [] },
+          DeFiPositionsControllerV2: { positions: [] },
           PredictController: { predictions: [] },
           KeyringController: {
             vault: 'vault mock',
@@ -157,6 +158,7 @@ describe('logs :: generateStateLogs', () => {
     expect(logs.includes('NftDetectionController')).toBe(false);
     expect(logs.includes('PhishingController')).toBe(false);
     expect(logs.includes('DeFiPositionsController')).toBe(false);
+    expect(logs.includes('DeFiPositionsControllerV2')).toBe(false);
     expect(logs.includes('PredictController')).toBe(false);
     expect(logs.includes("vault: 'vault mock'")).toBe(false);
   });
diff --git a/app/util/logs/index.ts b/app/util/logs/index.ts
index b2618e5f1cc7..185e3a7237cc 100644
--- a/app/util/logs/index.ts
+++ b/app/util/logs/index.ts
@@ -88,6 +88,7 @@ export const generateStateLogs = (state: any, loggedIn = true): string => {
   delete fullState.engine.backgroundState.PhishingController;
   delete fullState.engine.backgroundState.AssetsContractController;
   delete fullState.engine.backgroundState.DeFiPositionsController;
+  delete fullState.engine.backgroundState.DeFiPositionsControllerV2;
   delete fullState.engine.backgroundState.PredictController;
 
   // Strip cardHomeData to avoid leaking user PII (wallet addresses, holder names)
diff --git a/app/util/networks/customNetworks.tsx b/app/util/networks/customNetworks.tsx
index 74b76654d68b..71213a9f2009 100644
--- a/app/util/networks/customNetworks.tsx
+++ b/app/util/networks/customNetworks.tsx
@@ -31,6 +31,8 @@ export const QUICKNODE_ENDPOINT_URLS_BY_INFURA_NETWORK_NAME = {
   'hyperevm-mainnet': () => process.env.QUICKNODE_HYPEREVM_URL,
   'arc-mainnet': () => process.env.QUICKNODE_ARC_URL,
   'robinhood-mainnet': () => process.env.QUICKNODE_ROBINHOOD_URL,
+  'zksync-mainnet': () => process.env.QUICKNODE_ZKSYNC_URL,
+  'megaeth-mainnet': () => process.env.QUICKNODE_MEGAETH_URL,
 };
 
 export function getFailoverUrlsForInfuraNetwork(
@@ -135,7 +137,7 @@ export const PopularList = [
     chainId: toHex('324'),
     nickname: 'zkSync Era',
     rpcUrl: `https://zksync-mainnet.infura.io/v3/${infuraProjectId}`,
-    failoverRpcUrls: [],
+    failoverRpcUrls: getFailoverUrlsForInfuraNetwork('zksync-mainnet'),
     ticker: 'ETH',
     warning: true,
     rpcPrefs: {
@@ -174,7 +176,7 @@ export const PopularList = [
     chainId: toHex('4326'),
     nickname: 'MegaETH',
     rpcUrl: `https://megaeth-mainnet.infura.io/v3/${infuraProjectId}`,
-    failoverRpcUrls: [],
+    failoverRpcUrls: getFailoverUrlsForInfuraNetwork('megaeth-mainnet'),
     ticker: 'ETH',
     warning: true,
     rpcPrefs: {
@@ -441,6 +443,7 @@ export const NETWORK_CHAIN_ID: {
   readonly KONET_MAINNET: '0x4341';
   readonly ROBINHOOD_CHAIN: '0x1237';
   readonly GNOSIS: '0x64';
+  readonly SOMNIA: '0x13a7';
 } & typeof CHAIN_IDS = {
   FLARE_MAINNET: '0xe',
   SONGBIRD_TESTNET: '0x13',
@@ -490,6 +493,7 @@ export const NETWORK_CHAIN_ID: {
   ARC: '0x13b2',
   KONET_MAINNET: '0x4341',
   ROBINHOOD_CHAIN: '0x1237',
+  SOMNIA: '0x13a7',
   ...CHAIN_IDS,
 };
 
@@ -547,4 +551,5 @@ export const CustomNetworkImgMapping: Record<Hex, string> = {
   [NETWORK_CHAIN_ID.ARC]: require('../../images/arc-network-logo.png'),
   [NETWORK_CHAIN_ID.KONET_MAINNET]: require('../../images/konet.png'),
   [NETWORK_CHAIN_ID.ROBINHOOD_CHAIN]: require('../../images/robinhood.png'),
+  [NETWORK_CHAIN_ID.SOMNIA]: require('../../images/somnia.png'),
 };
diff --git a/app/util/networks/index.js b/app/util/networks/index.js
index ce1ba3a29cf6..ebe051747c33 100644
--- a/app/util/networks/index.js
+++ b/app/util/networks/index.js
@@ -193,23 +193,6 @@ export const NetworkList = {
 
 const NetworkListKeys = Object.keys(NetworkList);
 
-export const BLOCKAID_SUPPORTED_NETWORK_NAMES = {
-  [NETWORKS_CHAIN_ID.MAINNET]: 'Ethereum Mainnet',
-  [NETWORKS_CHAIN_ID.BSC]: 'Binance Smart Chain',
-  [NETWORKS_CHAIN_ID.BASE]: 'Base',
-  [NETWORKS_CHAIN_ID.OPTIMISM]: 'Optimism',
-  [NETWORKS_CHAIN_ID.POLYGON]: 'Polygon',
-  [NETWORKS_CHAIN_ID.ARBITRUM]: 'Arbitrum',
-  [NETWORKS_CHAIN_ID.LINEA_MAINNET]: 'Linea',
-  [NETWORKS_CHAIN_ID.SEPOLIA]: 'Sepolia',
-  [NETWORKS_CHAIN_ID.OPBNB]: 'opBNB',
-  [NETWORKS_CHAIN_ID.ZKSYNC_ERA]: 'zkSync Era Mainnet',
-  [NETWORKS_CHAIN_ID.SCROLL]: 'Scroll',
-  [NETWORKS_CHAIN_ID.BERACHAIN]: 'Berachain',
-  [NETWORKS_CHAIN_ID.METACHAIN_ONE]: 'Metachain One Mainnet',
-  [NETWORKS_CHAIN_ID.SEI]: 'Sei Mainnet',
-};
-
 export default NetworkList;
 
 export const getAllNetworks = () =>
diff --git a/app/util/notifications/hooks/useNotifications.test.tsx b/app/util/notifications/hooks/useNotifications.test.tsx
index 790d73abc6fc..0d580c4e446d 100644
--- a/app/util/notifications/hooks/useNotifications.test.tsx
+++ b/app/util/notifications/hooks/useNotifications.test.tsx
@@ -200,6 +200,23 @@ describe('useNotifications - useEnableNotifications()', () => {
 
     expect(hook.result.current.error).toBeDefined();
   });
+
+  it('throws helper failures when requested by the caller', async () => {
+    const mocks = arrangeMocks();
+    mocks.mockEnableNotifications.mockRejectedValue(new Error('Test Error'));
+    const hook = renderHookWithProvider(() =>
+      useEnableNotifications({ nudgeEnablePush: true, throwOnError: true }),
+    );
+
+    await expect(
+      act(async () => {
+        await hook.result.current.enableNotifications();
+      }),
+    ).rejects.toThrow('Test Error');
+
+    expect(hook.result.current.error).toBeDefined();
+    expect(mocks.mockTogglePushNotification).not.toHaveBeenCalled();
+  });
 });
 
 describe('useNotifications - useDisableNotifications()', () => {
diff --git a/app/util/notifications/hooks/useNotifications.ts b/app/util/notifications/hooks/useNotifications.ts
index fbfb5b4fbe65..c5fb4017070f 100644
--- a/app/util/notifications/hooks/useNotifications.ts
+++ b/app/util/notifications/hooks/useNotifications.ts
@@ -27,6 +27,13 @@ import type { RootState } from '../../../reducers';
 const selectHasMarketingConsent = (state: RootState) =>
   Boolean(state.security.dataCollectionForMarketing);
 
+interface UseEnableNotificationsProps {
+  nudgeEnablePush?: boolean;
+  throwOnError?: boolean;
+}
+
+const DEFAULT_ENABLE_NOTIFICATIONS_PROPS: UseEnableNotificationsProps = {};
+
 /**
  * Custom hook to fetch and update the list of notifications.
  * Manages loading and error states internally.
@@ -104,9 +111,11 @@ export function useContiguousLoading(
  * - `loading`: A boolean indicating if the enabling process is ongoing.
  * - `error`: A string or null value representing any error that occurred during the process.
  */
-export function useEnableNotifications(props = { nudgeEnablePush: true }) {
+export function useEnableNotifications(props?: UseEnableNotificationsProps) {
+  const { nudgeEnablePush = true, throwOnError = false } =
+    props ?? DEFAULT_ENABLE_NOTIFICATIONS_PROPS;
   const { togglePushNotification, loading: pushLoading } =
-    usePushNotificationsToggle(props);
+    usePushNotificationsToggle({ nudgeEnablePush });
   const isMetamaskNotificationsEnabled = useSelector(
     selectIsMetamaskNotificationsEnabled,
   );
@@ -121,17 +130,25 @@ export function useEnableNotifications(props = { nudgeEnablePush: true }) {
   const enableNotifications = useCallback(async () => {
     assertIsFeatureEnabled();
     setError(null);
-    await enableNotificationsHelper({
-      hasMarketingConsent,
-      productAnnouncementEnabled,
-      registerPushNotifications: Boolean(props.nudgeEnablePush),
-    }).catch((e) => setError(e));
+    try {
+      await enableNotificationsHelper({
+        hasMarketingConsent,
+        productAnnouncementEnabled,
+        registerPushNotifications: nudgeEnablePush,
+      });
+    } catch (enableError) {
+      setError(enableError);
+      if (throwOnError) {
+        throw enableError;
+      }
+    }
     await togglePushNotification(true).catch(() => {
       /* Do Nothing */
     });
     await updateNotificationSubscriptionExpiration();
   }, [
-    props.nudgeEnablePush,
+    nudgeEnablePush,
+    throwOnError,
     hasMarketingConsent,
     productAnnouncementEnabled,
     togglePushNotification,
diff --git a/app/util/notifications/hooks/useStartupNotificationsEffect.ts b/app/util/notifications/hooks/useStartupNotificationsEffect.ts
index b0e9bc137dd3..6ffa6525144d 100644
--- a/app/util/notifications/hooks/useStartupNotificationsEffect.ts
+++ b/app/util/notifications/hooks/useStartupNotificationsEffect.ts
@@ -128,8 +128,6 @@ export function useEnableNotificationsByDefaultEffect() {
         const isWalletHomePostOnboardingChecklistActive =
           shouldShowWalletHomeOnboardingSteps;
 
-        // Wallet home post-onboarding (empty-balance checklist) ends with a dedicated
-        // notifications step — skip startup auto-enable + push nudge to avoid asking twice.
         if (isWalletHomePostOnboardingChecklistActive) {
           return;
         }
diff --git a/app/util/notifications/pushNotificationDeeplink.test.ts b/app/util/notifications/pushNotificationDeeplink.test.ts
new file mode 100644
index 000000000000..880d364f0687
--- /dev/null
+++ b/app/util/notifications/pushNotificationDeeplink.test.ts
@@ -0,0 +1,71 @@
+import {
+  extractPushNotificationData,
+  extractPushNotificationDeeplink,
+} from './pushNotificationDeeplink';
+
+describe('extractPushNotificationData', () => {
+  it('returns flat RNFirebase data unchanged', () => {
+    const data = {
+      deeplink: 'https://link.metamask.io/rewards',
+      notification_id: 'test-notification-id',
+    };
+
+    const result = extractPushNotificationData(data);
+
+    expect(result).toStrictEqual(data);
+  });
+
+  it('extracts serialized Notifee data', () => {
+    const notificationData = {
+      deeplink: 'https://link.metamask.io/rewards',
+      notification_id: 'test-notification-id',
+    };
+
+    const result = extractPushNotificationData({
+      dataStr: JSON.stringify(notificationData),
+    });
+
+    expect(result).toStrictEqual(notificationData);
+  });
+
+  it('returns the wrapper for malformed serialized data', () => {
+    const data = { dataStr: '{not-json' };
+
+    const result = extractPushNotificationData(data);
+
+    expect(result).toStrictEqual(data);
+  });
+});
+
+describe('extractPushNotificationDeeplink', () => {
+  it('extracts a flat RNFirebase deeplink', () => {
+    const data = {
+      deeplink: 'https://link.metamask.io/rewards',
+      metadata: '{}',
+    };
+
+    const result = extractPushNotificationDeeplink(data);
+
+    expect(result).toBe('https://link.metamask.io/rewards');
+  });
+
+  it('extracts a deeplink from serialized Notifee data', () => {
+    const data = {
+      dataStr: JSON.stringify({
+        deeplink: 'https://link.metamask.io/rewards',
+      }),
+    };
+
+    const result = extractPushNotificationDeeplink(data);
+
+    expect(result).toBe('https://link.metamask.io/rewards');
+  });
+
+  it('returns undefined for malformed serialized data', () => {
+    const data = { dataStr: '{not-json' };
+
+    const result = extractPushNotificationDeeplink(data);
+
+    expect(result).toBeUndefined();
+  });
+});
diff --git a/app/util/notifications/pushNotificationDeeplink.ts b/app/util/notifications/pushNotificationDeeplink.ts
new file mode 100644
index 000000000000..3974a9dc4a48
--- /dev/null
+++ b/app/util/notifications/pushNotificationDeeplink.ts
@@ -0,0 +1,54 @@
+type UnknownRecord = Record<string, unknown>;
+type PushNotificationData = Record<string, string | object>;
+
+const isRecord = (value: unknown): value is UnknownRecord =>
+  typeof value === 'object' && value !== null && !Array.isArray(value);
+
+const isPushNotificationData = (
+  value: unknown,
+): value is PushNotificationData =>
+  isRecord(value) &&
+  Object.values(value).every(
+    (entry) =>
+      typeof entry === 'string' ||
+      (typeof entry === 'object' && entry !== null),
+  );
+
+const getDeeplink = (value: unknown): string | undefined =>
+  isRecord(value) && typeof value.deeplink === 'string'
+    ? value.deeplink
+    : undefined;
+
+export const extractPushNotificationData = (
+  value: unknown,
+): PushNotificationData | undefined => {
+  if (!isPushNotificationData(value)) {
+    return undefined;
+  }
+
+  if (typeof value.dataStr !== 'string') {
+    return value;
+  }
+
+  try {
+    const data = JSON.parse(value.dataStr);
+    return isPushNotificationData(data) ? data : value;
+  } catch {
+    return value;
+  }
+};
+
+/**
+ * Normalizes the payload shapes used by RNFirebase and locally displayed
+ * Notifee notifications into one deeplink contract.
+ */
+export const extractPushNotificationDeeplink = (
+  value: unknown,
+): string | undefined => {
+  const deeplink = getDeeplink(value);
+  if (deeplink) {
+    return deeplink;
+  }
+
+  return getDeeplink(extractPushNotificationData(value));
+};
diff --git a/app/util/notifications/services/FCMService.test.ts b/app/util/notifications/services/FCMService.test.ts
index 1130a7ac024e..92e8460a34fe 100644
--- a/app/util/notifications/services/FCMService.test.ts
+++ b/app/util/notifications/services/FCMService.test.ts
@@ -5,7 +5,7 @@ import messaging, {
 import FCMService from './FCMService';
 import { EVENT_NAME } from '../../../core/Analytics';
 import { analytics } from '../../analytics/analytics';
-import { NativeModules, Platform } from 'react-native';
+import { DeviceEventEmitter, NativeModules, Platform } from 'react-native';
 import { getSessionProfileId } from '../utils/get-session-profile-id';
 
 // Firebase Mock
@@ -383,7 +383,12 @@ describe('FCMService - onClickPushNotificationWhenAppClosed', () => {
         });
         const { result, mocks } = await arrangeAct(testData);
 
-        expect(result).toBe('https://test.metamask.io/perps-asset?symbol=ETH');
+        expect(result).toEqual({
+          opened: true,
+          deeplink: 'https://test.metamask.io/perps-asset?symbol=ETH',
+          notificationType: 'platform',
+          notificationSubtype: 'take_profit_executed',
+        });
         assertMockInitialNotificationCalled(mocks);
         assertTrackEventCalledWith(mocks.mockTrackEvent, {
           notification_id: 'test-notification-id',
@@ -393,11 +398,39 @@ describe('FCMService - onClickPushNotificationWhenAppClosed', () => {
         });
       });
 
-      it('tracks click event but does not return deeplink when no deeplink present', async () => {
+      it('returns a classified tap from serialized Notifee data', async () => {
+        const deeplink = 'https://link.metamask.io/rewards';
+        const { result, mocks } = await arrangeAct({
+          dataStr: JSON.stringify(createMockPushAnalyticsFcmData({ deeplink })),
+        });
+
+        expect(result).toEqual({
+          opened: true,
+          deeplink,
+          notificationType: 'platform',
+          notificationSubtype: 'take_profit_executed',
+        });
+        assertMockInitialNotificationCalled(mocks);
+        assertTrackEventCalledWith(mocks.mockTrackEvent, {
+          notification_id: 'test-notification-id',
+          notification_type: 'platform',
+          notification_subtype: 'take_profit_executed',
+          deeplink,
+        });
+      });
+
+      // On-chain activity notifications commonly carry no CTA link, so the tap
+      // must still be reported as an open even with no deeplink to return.
+      it('reports an open with no deeplink when no deeplink present', async () => {
         const testData = createMockPushAnalyticsFcmData();
         const { result, mocks } = await arrangeAct(testData);
 
-        expect(result).toBeFalsy();
+        expect(result).toEqual({
+          opened: true,
+          deeplink: null,
+          notificationType: 'platform',
+          notificationSubtype: 'take_profit_executed',
+        });
         assertMockInitialNotificationCalled(mocks);
         assertTrackEventCalledWith(mocks.mockTrackEvent, {
           notification_id: 'test-notification-id',
@@ -406,10 +439,15 @@ describe('FCMService - onClickPushNotificationWhenAppClosed', () => {
         });
       });
 
-      it('tracks click event with no properties provided', async () => {
+      it('reports no open when there was no initial notification', async () => {
         const { result, mocks } = await arrangeAct(null);
 
-        expect(result).toBeFalsy();
+        expect(result).toEqual({
+          opened: false,
+          deeplink: null,
+          notificationType: undefined,
+          notificationSubtype: undefined,
+        });
         assertMockInitialNotificationCalled(mocks);
         expect(mocks.mockTrackEvent).toHaveBeenCalledWith(
           expect.objectContaining({}), //Called with no additional properties
@@ -420,6 +458,10 @@ describe('FCMService - onClickPushNotificationWhenAppClosed', () => {
 });
 
 describe('FCMService - onClickPushNotificationWhenAppSuspended', () => {
+  beforeEach(() => {
+    Platform.OS = 'ios';
+  });
+
   afterEach(() => {
     jest.clearAllMocks();
     jest.restoreAllMocks();
@@ -485,9 +527,12 @@ describe('FCMService - onClickPushNotificationWhenAppSuspended', () => {
     });
     const { mocks, deeplinkCallback } = await arrangeAct(testData);
 
-    expect(deeplinkCallback).toHaveBeenCalledWith(
-      'https://test.metamask.io/perps-asset?symbol=ETH',
-    );
+    expect(deeplinkCallback).toHaveBeenCalledWith({
+      opened: true,
+      deeplink: 'https://test.metamask.io/perps-asset?symbol=ETH',
+      notificationType: 'platform',
+      notificationSubtype: 'take_profit_executed',
+    });
     assertTrackEventCalledWith(mocks.mockTrackEvent, {
       notification_id: 'test-notification-id',
       notification_type: 'platform',
@@ -496,11 +541,56 @@ describe('FCMService - onClickPushNotificationWhenAppSuspended', () => {
     });
   });
 
-  it('calls deeplink callback with undefined when notification has no deeplink', async () => {
+  it('reports serialized Notifee data from the Android native event', async () => {
+    const deeplink = 'https://link.metamask.io/rewards';
+    const mocks = arrangeMocks();
+    let nativeNotificationHandler:
+      | ((remoteMessage: FirebaseMessagingTypes.RemoteMessage) => Promise<void>)
+      | undefined;
+
+    Platform.OS = 'android';
+    jest
+      .spyOn(DeviceEventEmitter, 'addListener')
+      .mockImplementation((eventType, listener) => {
+        expect(eventType).toBe('metamask.notification_opened');
+        nativeNotificationHandler = listener as (
+          remoteMessage: FirebaseMessagingTypes.RemoteMessage,
+        ) => Promise<void>;
+        return { remove: jest.fn() } as never;
+      });
+
+    FCMService.onClickPushNotificationWhenAppSuspended(mocks.deeplinkCallback);
+    await nativeNotificationHandler?.(
+      createMockRemoteMessage({
+        dataStr: JSON.stringify(createMockPushAnalyticsFcmData({ deeplink })),
+      }),
+    );
+
+    expect(mocks.mockOnNotificationOpenedApp).not.toHaveBeenCalled();
+    expect(mocks.deeplinkCallback).toHaveBeenCalledWith({
+      opened: true,
+      deeplink,
+      notificationType: 'platform',
+      notificationSubtype: 'take_profit_executed',
+    });
+    assertTrackEventCalledWith(mocks.mockTrackEvent, {
+      notification_id: 'test-notification-id',
+      notification_type: 'platform',
+      notification_subtype: 'take_profit_executed',
+      deeplink,
+    });
+  });
+
+  it('reports the tap with a null deeplink when notification has no deeplink', async () => {
     const testData = createMockPushAnalyticsFcmData();
     const { mocks, deeplinkCallback } = await arrangeAct(testData);
 
-    expect(deeplinkCallback).toHaveBeenCalledWith(undefined);
+    expect(deeplinkCallback).toHaveBeenCalledWith({
+      opened: true,
+      deeplink: null,
+      notificationType: 'platform',
+      notificationSubtype: 'take_profit_executed',
+    });
     assertTrackEventCalledWith(mocks.mockTrackEvent, {
       notification_id: 'test-notification-id',
       notification_type: 'platform',
@@ -508,10 +598,15 @@ describe('FCMService - onClickPushNotificationWhenAppSuspended', () => {
     });
   });
 
-  it('calls deeplink callback with undefined when notification has null data', async () => {
+  it('reports the tap with no classification when notification has null data', async () => {
     const { mocks, deeplinkCallback } = await arrangeAct(null);
 
-    expect(deeplinkCallback).toHaveBeenCalledWith(undefined);
+    expect(deeplinkCallback).toHaveBeenCalledWith({
+      opened: false,
+      deeplink: null,
+      notificationType: undefined,
+      notificationSubtype: undefined,
+    });
     expect(mocks.mockTrackEvent).toHaveBeenCalledWith(
       expect.objectContaining({}), //Called with no additional properties
     );
diff --git a/app/util/notifications/services/FCMService.ts b/app/util/notifications/services/FCMService.ts
index 35df46d7697c..589d25ed333b 100644
--- a/app/util/notifications/services/FCMService.ts
+++ b/app/util/notifications/services/FCMService.ts
@@ -2,12 +2,15 @@ import { toPushAnalyticsPayload } from '@metamask/notification-services-controll
 import messaging, {
   type FirebaseMessagingTypes,
 } from '@react-native-firebase/messaging';
-import { NativeModules, Platform } from 'react-native';
-import Logger from '../../../util/Logger';
+import { DeviceEventEmitter, NativeModules, Platform } from 'react-native';
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import { analytics } from '../../analytics/analytics';
 import { AnalyticsEventBuilder } from '../../analytics/AnalyticsEventBuilder';
 import { toFcmDataStringRecord } from '../utils/fcm-data';
+import {
+  extractPushNotificationData,
+  extractPushNotificationDeeplink,
+} from '../pushNotificationDeeplink';
 
 async function getInitialNotification() {
   // Tried many different approaches, but @react-native-firebase setup is unable to hold and track the initial open intent from a push notification
@@ -28,7 +31,9 @@ async function analyticsTrackPushClickEvent(
   remoteMessage?: FirebaseMessagingTypes.RemoteMessage | null,
 ) {
   try {
-    const data = toFcmDataStringRecord(remoteMessage?.data);
+    const data = toFcmDataStringRecord(
+      extractPushNotificationData(remoteMessage?.data),
+    );
     const payload = toPushAnalyticsPayload(data);
 
     const properties = payload
@@ -51,6 +56,33 @@ async function analyticsTrackPushClickEvent(
 
 type UnsubscribeFunc = () => void;
 
+const ANDROID_NOTIFICATION_OPENED_EVENT = 'metamask.notification_opened';
+
+/**
+ * A notification tap, and what the payload carried with it. `opened` is true
+ * even when there is no deeplink — on-chain activity notifications commonly
+ * have no CTA link.
+ */
+export interface PushTapResult {
+  opened: boolean;
+  deeplink: string | null;
+  notificationType?: string;
+  notificationSubtype?: string;
+}
+
+export function toPushTapResult(data: unknown, opened: boolean): PushTapResult {
+  const normalizedData = toFcmDataStringRecord(
+    extractPushNotificationData(data),
+  );
+  const payload = toPushAnalyticsPayload(normalizedData);
+  return {
+    opened,
+    deeplink: extractPushNotificationDeeplink(data) ?? null,
+    notificationType: payload?.notification_type,
+    notificationSubtype: payload?.notification_subtype,
+  };
+}
+
 /**
  * Utility to check if devices have enabled push notifications
  * @returns boolean
@@ -190,30 +222,46 @@ class FCMService {
     this.#hasRegisteredForeground = null;
   };
 
-  onClickPushNotificationWhenAppClosed = async () => {
+  /**
+   * @returns `opened` — whether a notification tap launched the app, which is
+   * true even when the payload carries no deeplink (common for on-chain
+   * activity notifications) — and the deeplink when one is present.
+   */
+  onClickPushNotificationWhenAppClosed = async (): Promise<PushTapResult> => {
     try {
       const remoteMessage = await getInitialNotification();
       await analyticsTrackPushClickEvent(remoteMessage);
-      return toFcmDataStringRecord(remoteMessage?.data)?.deeplink ?? null;
+      return toPushTapResult(remoteMessage?.data, Boolean(remoteMessage));
     } catch {
-      return null;
+      return { opened: false, deeplink: null };
     }
   };
 
   onClickPushNotificationWhenAppSuspended = (
-    deeplinkCallback: (deeplink?: string) => void,
+    tapCallback: (tap: PushTapResult) => void,
   ) => {
     try {
-      messaging().onNotificationOpenedApp(async (remoteMessage) => {
+      const handleOpenedNotification = async (
+        remoteMessage?: FirebaseMessagingTypes.RemoteMessage,
+      ) => {
         try {
           await analyticsTrackPushClickEvent(remoteMessage);
-          deeplinkCallback(
-            toFcmDataStringRecord(remoteMessage?.data)?.deeplink,
+          tapCallback(
+            toPushTapResult(remoteMessage?.data, Boolean(remoteMessage)),
           );
         } catch {
           // Do nothing
         }
-      });
+      };
+
+      if (Platform.OS === 'android') {
+        DeviceEventEmitter.addListener(
+          ANDROID_NOTIFICATION_OPENED_EVENT,
+          handleOpenedNotification,
+        );
+      } else {
+        messaging().onNotificationOpenedApp(handleOpenedNotification);
+      }
     } catch {
       // Do nothing
     }
diff --git a/app/util/notifications/services/NotificationService.test.ts b/app/util/notifications/services/NotificationService.test.ts
index 7c904c976c61..8c8a6c829c50 100644
--- a/app/util/notifications/services/NotificationService.test.ts
+++ b/app/util/notifications/services/NotificationService.test.ts
@@ -15,7 +15,9 @@ import NotificationService, {
   getPushPermissionStatus,
   isPushPermissionGranted,
   isPushPermissionPromptable,
+  requestPushPermissions,
 } from './NotificationService';
+import { markPushNotificationOsPromptRequested } from '../../../actions/onboarding';
 import { store } from '../../../store';
 
 jest.mock('@notifee/react-native', () => ({
@@ -552,3 +554,58 @@ describe('NotificationService - displayNotification', () => {
     expect(displayCall.android).not.toHaveProperty('largeIcon');
   });
 });
+
+describe('requestPushPermissions', () => {
+  const arrangeMocks = (permission: 'authorized' | 'denied') => {
+    const mockGetAllPermissions = jest
+      .spyOn(NotificationService, 'getAllPermissions')
+      .mockResolvedValue({ permission });
+    const mockDispatch = jest.spyOn(store, 'dispatch');
+
+    return { mockGetAllPermissions, mockDispatch };
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('records the OS push prompt request so the onboarding checklist stops nudging', async () => {
+    const mocks = arrangeMocks('authorized');
+
+    const result = await requestPushPermissions();
+
+    expect(result).toBe(true);
+    expect(mocks.mockGetAllPermissions).toHaveBeenCalledWith(true);
+    expect(mocks.mockDispatch).toHaveBeenCalledWith(
+      markPushNotificationOsPromptRequested(),
+    );
+  });
+
+  it('records the request even when the user denies OS permission', async () => {
+    const mocks = arrangeMocks('denied');
+
+    const result = await requestPushPermissions();
+
+    expect(result).toBe(false);
+    expect(mocks.mockDispatch).toHaveBeenCalledWith(
+      markPushNotificationOsPromptRequested(),
+    );
+  });
+
+  it('does not record the request when the permission flow throws before asking the OS', async () => {
+    jest
+      .spyOn(NotificationService, 'getAllPermissions')
+      .mockRejectedValue(new Error('Timeout'));
+    const mockDispatch = jest.spyOn(store, 'dispatch');
+
+    await expect(requestPushPermissions()).rejects.toThrow('Timeout');
+
+    expect(mockDispatch).not.toHaveBeenCalledWith(
+      markPushNotificationOsPromptRequested(),
+    );
+  });
+});
diff --git a/app/util/notifications/services/NotificationService.ts b/app/util/notifications/services/NotificationService.ts
index 569031317a03..7770927682bf 100644
--- a/app/util/notifications/services/NotificationService.ts
+++ b/app/util/notifications/services/NotificationService.ts
@@ -9,6 +9,7 @@ import notifee, {
 import { Linking, Alert as NativeAlert, Platform } from 'react-native';
 import { strings } from '../../../../locales/i18n';
 import { store } from '../../../store';
+import { markPushNotificationOsPromptRequested } from '../../../actions/onboarding';
 import Logger from '../../../util/Logger';
 import {
   ChannelId,
@@ -339,6 +340,7 @@ const getPushPermissionStatusFromAuthorizationStatus = (
 
 export async function requestPushPermissions() {
   const result = await NotificationService.getAllPermissions(true);
+  store.dispatch(markPushNotificationOsPromptRequested());
   return result.permission === 'authorized';
 }
 
diff --git a/app/util/notifications/types/notification/index.ts b/app/util/notifications/types/notification/index.ts
index f35750e36f7e..0230492b254a 100644
--- a/app/util/notifications/types/notification/index.ts
+++ b/app/util/notifications/types/notification/index.ts
@@ -5,7 +5,7 @@ export enum PressActionId {
   OPEN_NOTIFICATIONS_VIEW = 'open-notifications-view-press-action-id',
 }
 
-export const LAUNCH_ACTIVITY = 'com.metamask.ui.MainActivity';
+export const LAUNCH_ACTIVITY = 'default';
 
 export const NotificationTypes = {
   TRANSACTION: 'transaction',
diff --git a/app/util/number/bigint-migration-reference.test.ts b/app/util/number/bigint-migration-reference.test.ts
index eb2a903975f7..f3652b21d17b 100644
--- a/app/util/number/bigint-migration-reference.test.ts
+++ b/app/util/number/bigint-migration-reference.test.ts
@@ -322,8 +322,8 @@ describe('Migration: earnController selectors', () => {
 
 /*
  * --------------------------------------------------------------------------
- * Migration Site 6: send context utils
- * File: app/components/Views/confirmations/context/send-context/utils.ts
+ * Migration Site 6: send utils
+ * File: app/components/Views/confirmations/utils/send.ts
  *
  * BEFORE:
  *   trxnParams.value = BNToHex(toWei(value ?? '0') as unknown as BN);
@@ -342,7 +342,7 @@ describe('Migration: earnController selectors', () => {
  *   });
  * --------------------------------------------------------------------------
  */
-describe('Migration: send-context utils', () => {
+describe('Migration: send utils', () => {
   it('native ETH: bigIntToHex(toWei(value)) matches BNToHex(toWei(value))', () => {
     const values = ['0', '1', '0.5', '0.000000000000001337'];
     for (const value of values) {
diff --git a/app/util/onboarding/finalizeOnboardingCompletion.test.ts b/app/util/onboarding/finalizeOnboardingCompletion.test.ts
index 16475601bfae..25019a4a5fd2 100644
--- a/app/util/onboarding/finalizeOnboardingCompletion.test.ts
+++ b/app/util/onboarding/finalizeOnboardingCompletion.test.ts
@@ -77,6 +77,32 @@ describe('finalizeOnboardingCompletion', () => {
     expect(mockDispatch).toHaveBeenCalledWith(clearAttribution());
   });
 
+  it('merges social Wallet Setup attribution props into ONBOARDING_COMPLETED', () => {
+    finalizeOnboardingCompletion({
+      successFlow: ONBOARDING_SUCCESS_FLOW.NO_BACKED_UP_SRP,
+      accountType: AccountType.MetamaskGoogle,
+      isBasicFunctionalityEnabled: true,
+      walletSetupAttributionProps: {
+        utm_source: 'e2e_wsc_utm_source',
+        utm_campaign: 'e2e_wsc_campaign',
+        attribution_id: 'e2e_wsc_attr_id',
+      },
+      dispatch: mockDispatch,
+      discoverAccountsLogContext: 'TestContext',
+    });
+
+    expect(mockAnalytics.trackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        name: 'Onboarding Completed',
+        properties: expect.objectContaining({
+          utm_source: 'e2e_wsc_utm_source',
+          utm_campaign: 'e2e_wsc_campaign',
+          attribution_id: 'e2e_wsc_attr_id',
+        }),
+      }),
+    );
+  });
+
   it('only clears attribution when successFlow is ineligible', () => {
     finalizeOnboardingCompletion({
       successFlow: ONBOARDING_SUCCESS_FLOW.SETTINGS_BACKUP,
diff --git a/app/util/stellar/stellar-snap-client-requests.test.ts b/app/util/stellar/stellar-snap-client-requests.test.ts
new file mode 100644
index 000000000000..16541ddac52d
--- /dev/null
+++ b/app/util/stellar/stellar-snap-client-requests.test.ts
@@ -0,0 +1,82 @@
+import { HandlerType } from '@metamask/snaps-utils';
+import Engine from '../../core/Engine';
+import { handleSnapRequest } from '../../core/Snaps/utils';
+import { STELLAR_WALLET_SNAP_ID } from '../../core/SnapKeyring/StellarWalletSnap';
+import {
+  requestStellarChangeTrustOptAdd,
+  requestStellarChangeTrustOptDelete,
+} from './stellar-snap-client-requests';
+
+jest.mock('../../core/Engine', () => ({
+  controllerMessenger: {},
+  context: {
+    MultichainBalancesController: {
+      updateBalance: jest.fn(),
+    },
+  },
+}));
+
+jest.mock('../../core/Snaps/utils', () => ({
+  handleSnapRequest: jest.fn(),
+}));
+
+describe('stellar-snap-client-requests', () => {
+  const handleSnapRequestMock = handleSnapRequest as jest.MockedFunction<
+    typeof handleSnapRequest
+  >;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('calls changeTrustOpt add via handleSnapRequest', async () => {
+    handleSnapRequestMock.mockResolvedValueOnce({ status: true });
+
+    const result = await requestStellarChangeTrustOptAdd({
+      accountId: 'account-id',
+      assetId:
+        'stellar:pubnet/asset:USDC-GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN',
+      scope: 'stellar:pubnet',
+    });
+
+    expect(result).toStrictEqual({ status: true });
+    expect(handleSnapRequestMock).toHaveBeenCalledWith(
+      Engine.controllerMessenger,
+      {
+        snapId: STELLAR_WALLET_SNAP_ID,
+        origin: 'metamask',
+        handler: HandlerType.OnClientRequest,
+        request: {
+          method: 'changeTrustOpt',
+          params: {
+            accountId: 'account-id',
+            assetId:
+              'stellar:pubnet/asset:USDC-GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN',
+            scope: 'stellar:pubnet',
+            action: 'add',
+          },
+        },
+      },
+    );
+  });
+
+  it('calls changeTrustOpt delete via handleSnapRequest', async () => {
+    handleSnapRequestMock.mockResolvedValueOnce({ status: true });
+
+    await requestStellarChangeTrustOptDelete({
+      accountId: 'account-id',
+      assetId:
+        'stellar:pubnet/asset:USDC-GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN',
+      scope: 'stellar:pubnet',
+    });
+
+    expect(handleSnapRequestMock).toHaveBeenCalledWith(
+      Engine.controllerMessenger,
+      expect.objectContaining({
+        request: expect.objectContaining({
+          params: expect.objectContaining({ action: 'delete' }),
+        }),
+      }),
+    );
+  });
+});
diff --git a/app/util/stellar/stellar-snap-client-requests.ts b/app/util/stellar/stellar-snap-client-requests.ts
new file mode 100644
index 000000000000..ea8bde4f81d3
--- /dev/null
+++ b/app/util/stellar/stellar-snap-client-requests.ts
@@ -0,0 +1,49 @@
+import { HandlerType } from '@metamask/snaps-utils';
+import type { CaipAssetType, CaipChainId } from '@metamask/utils';
+import Engine from '../../core/Engine';
+import { handleSnapRequest } from '../../core/Snaps/utils';
+import { STELLAR_WALLET_SNAP_ID } from '../../core/SnapKeyring/StellarWalletSnap';
+
+export interface StellarChangeTrustOptResult {
+  status: boolean;
+  transactionId?: string;
+}
+
+export async function requestStellarChangeTrustOptAdd(params: {
+  accountId: string;
+  assetId: CaipAssetType;
+  scope: CaipChainId;
+  limit?: string;
+}): Promise<StellarChangeTrustOptResult> {
+  return (await handleSnapRequest(Engine.controllerMessenger, {
+    snapId: STELLAR_WALLET_SNAP_ID,
+    origin: 'metamask',
+    handler: HandlerType.OnClientRequest,
+    request: {
+      method: 'changeTrustOpt',
+      params: {
+        ...params,
+        action: 'add',
+      },
+    },
+  })) as StellarChangeTrustOptResult;
+}
+
+export async function requestStellarChangeTrustOptDelete(params: {
+  accountId: string;
+  assetId: CaipAssetType;
+  scope: CaipChainId;
+}): Promise<void> {
+  await handleSnapRequest(Engine.controllerMessenger, {
+    snapId: STELLAR_WALLET_SNAP_ID,
+    origin: 'metamask',
+    handler: HandlerType.OnClientRequest,
+    request: {
+      method: 'changeTrustOpt',
+      params: {
+        ...params,
+        action: 'delete',
+      },
+    },
+  });
+}
diff --git a/app/util/test/initial-background-state.json b/app/util/test/initial-background-state.json
index b74cd102b57c..f3948848da69 100644
--- a/app/util/test/initial-background-state.json
+++ b/app/util/test/initial-background-state.json
@@ -723,7 +723,6 @@
   },
   "CardController": {
     "selectedCountry": null,
-    "selectedCardProgramId": null,
     "activeProviderId": "baanx",
     "cardHomeData": null,
     "cardHomeDataStatus": "idle",
@@ -808,6 +807,9 @@
     "allDeFiPositions": {},
     "allDeFiPositionsCount": {}
   },
+  "DeFiPositionsControllerV2": {
+    "allDeFiPositionsV2": {}
+  },
   "SamplePetnamesController": {
     "namesByChainIdAndAddress": {}
   },
diff --git a/app/util/test/mockNativeStackNavigator.tsx b/app/util/test/mockNativeStackNavigator.tsx
new file mode 100644
index 000000000000..7d62d70eb25e
--- /dev/null
+++ b/app/util/test/mockNativeStackNavigator.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+
+interface MockScreenProps {
+  name?: string;
+  component?: React.ComponentType<{
+    navigation?: Record<string, unknown>;
+    route?: { params?: Record<string, unknown> };
+  }>;
+  children?: React.ReactNode;
+  initialParams?: Record<string, unknown>;
+}
+
+interface MockNavigatorProps {
+  children?: React.ReactNode;
+}
+
+/**
+ * Shared stub returned by `createNativeStackNavigator` in unit tests.
+ *
+ * Prefer this over hand-rolled `{ Navigator, Screen }` objects so route tests
+ * share one passthrough mock instead of asserting on library option names.
+ */
+export function createMockNativeStackNavigator() {
+  return {
+    Navigator: ({ children }: MockNavigatorProps) => <>{children}</>,
+    Screen: ({
+      component: Component,
+      children,
+      initialParams,
+    }: MockScreenProps) => {
+      if (Component) {
+        return (
+          <Component navigation={{}} route={{ params: initialParams ?? {} }} />
+        );
+      }
+      return <>{children}</>;
+    },
+  };
+}
+
+/**
+ * Drop-in module shape for:
+ * `jest.mock('@react-navigation/native-stack', () => require('.../mockNativeStackNavigator').createMockNativeStackModule())`
+ */
+export function createMockNativeStackModule() {
+  return {
+    createNativeStackNavigator: () => createMockNativeStackNavigator(),
+  };
+}
diff --git a/app/util/trace.test.ts b/app/util/trace.test.ts
index 366b1cf88f78..93e34cdc960a 100644
--- a/app/util/trace.test.ts
+++ b/app/util/trace.test.ts
@@ -7,6 +7,7 @@ import {
   Scope,
   type Span,
   withIsolationScope,
+  startNewTrace,
   SPAN_STATUS_ERROR,
 } from '@sentry/core';
 import {
@@ -27,6 +28,15 @@ import {
   updateCachedConsent,
 } from './trace';
 import { AGREED, DENIED } from '../constants/storage';
+import performance from 'react-native-performance';
+
+jest.mock('react-native-performance', () => ({
+  __esModule: true,
+  default: {
+    timeOrigin: 0,
+    now: jest.fn(() => 0),
+  },
+}));
 
 jest.mock('@sentry/react-native', () => ({
   startSpan: jest.fn(),
@@ -36,6 +46,8 @@ jest.mock('@sentry/react-native', () => ({
 
 jest.mock('@sentry/core', () => ({
   withIsolationScope: jest.fn(),
+  startNewTrace: jest.fn((fn: () => unknown) => fn()),
+  SPAN_STATUS_ERROR: 2,
 }));
 
 jest.mock('../store/storage-wrapper', () => ({
@@ -87,6 +99,7 @@ describe('Trace', () => {
   const startSpanManualMock = jest.mocked(startSpanManual);
   // mockImplementation doesn't choose the correct overload, so we ignore the types by casting to jest.Mock
   const withIsolationScopeMock = jest.mocked(withIsolationScope) as jest.Mock;
+  const startNewTraceMock = jest.mocked(startNewTrace) as jest.Mock;
   const setMeasurementMock = jest.mocked(setMeasurement);
   const setTagMock = jest.fn();
 
@@ -111,6 +124,7 @@ describe('Trace', () => {
     withIsolationScopeMock.mockImplementation((fn: (arg: Scope) => unknown) =>
       fn({ setTag: setTagMock } as unknown as Scope),
     );
+    startNewTraceMock.mockImplementation((fn: () => unknown) => fn());
 
     flushBufferedTraces();
     updateCachedConsent(false);
@@ -264,6 +278,37 @@ describe('Trace', () => {
       expect(setMeasurementMock).toHaveBeenCalledWith('tag3', 123, 'none');
     });
 
+    it('starts a new trace when forceTransaction is set without parentContext', () => {
+      updateCachedConsent(true);
+
+      trace({ id: ID_MOCK, name: NAME_MOCK, forceTransaction: true });
+      endTrace({ name: NAME_MOCK, id: ID_MOCK });
+
+      expect(startNewTraceMock).toHaveBeenCalledTimes(1);
+      expect(startSpanManualMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: NAME_MOCK,
+          forceTransaction: true,
+          parentSpan: null,
+        }),
+        expect.any(Function),
+      );
+    });
+
+    it('does not start a new trace when forceTransaction has parentContext', () => {
+      updateCachedConsent(true);
+
+      trace({
+        id: ID_MOCK,
+        name: NAME_MOCK,
+        forceTransaction: true,
+        parentContext: PARENT_CONTEXT_MOCK,
+      });
+      endTrace({ name: NAME_MOCK, id: ID_MOCK });
+
+      expect(startNewTraceMock).not.toHaveBeenCalled();
+    });
+
     it('falls back to Date.now when performance.timeOrigin is broken (RN Android)', () => {
       updateCachedConsent(true);
       const dateNowSpy = jest
@@ -1144,6 +1189,80 @@ describe('Trace', () => {
     });
   });
 
+  describe('single clock domain timing', () => {
+    const performanceMock = performance as unknown as {
+      timeOrigin: number;
+      now: jest.Mock;
+    };
+
+    beforeEach(() => {
+      performanceMock.timeOrigin = 1_750_000_000_000;
+      performanceMock.now.mockReset();
+    });
+
+    it('produces a non-negative duration with start <= end for a back-to-back trace', () => {
+      updateCachedConsent(true);
+
+      // Performance clock: start reads now()=10, later reads (span end + log) read now()=20
+      performanceMock.now.mockReturnValueOnce(10).mockReturnValue(20);
+
+      const spanEndMock = jest.fn();
+      const spanMock = {
+        end: spanEndMock,
+        setStatus: jest.fn(),
+        setAttribute: jest.fn(),
+      } as unknown as Span;
+
+      startSpanManualMock.mockImplementationOnce((_, fn) =>
+        fn(spanMock, () => {
+          // Intentionally empty
+        }),
+      );
+
+      trace({ name: NAME_MOCK, id: ID_MOCK });
+      endTrace({ name: NAME_MOCK, id: ID_MOCK });
+
+      // Start time is stamped from the performance clock (timeOrigin + first now())
+      const startTime = 1_750_000_000_000 + 10;
+      const endTime = spanEndMock.mock.calls[0][0] as number;
+
+      expect(typeof endTime).toBe('number');
+      // Both start and end come from the same (performance) clock domain
+      expect(endTime).toBeGreaterThanOrEqual(startTime);
+      expect(endTime - startTime).toBeGreaterThanOrEqual(0);
+    });
+
+    it('defaults the span end time to the performance clock, not the wall clock', () => {
+      updateCachedConsent(true);
+
+      const dateNowSpy = jest.spyOn(Date, 'now');
+      performanceMock.now.mockReturnValue(750);
+
+      const spanEndMock = jest.fn();
+      const spanMock = {
+        end: spanEndMock,
+        setStatus: jest.fn(),
+        setAttribute: jest.fn(),
+      } as unknown as Span;
+
+      startSpanManualMock.mockImplementationOnce((_, fn) =>
+        fn(spanMock, () => {
+          // Intentionally empty
+        }),
+      );
+
+      trace({ name: NAME_MOCK, id: ID_MOCK });
+      // No explicit timestamp -> should default to getPerformanceTimestamp()
+      endTrace({ name: NAME_MOCK, id: ID_MOCK });
+
+      // 1_750_000_000_000 (timeOrigin) + 750 (now) === performance clock, never Date.now
+      expect(spanEndMock).toHaveBeenCalledWith(1_750_000_000_750);
+      expect(dateNowSpy).not.toHaveBeenCalled();
+
+      dateNowSpy.mockRestore();
+    });
+  });
+
   describe('trace timeout cleanup', () => {
     beforeEach(() => {
       jest.useFakeTimers();
@@ -1332,5 +1451,40 @@ describe('Trace', () => {
       expect(startSpanManualMock).toHaveBeenCalledTimes(2);
       expect(withIsolationScopeMock).toHaveBeenCalledTimes(2);
     });
+
+    it('uses getPerformanceTimestamp (not Date.now) for buffered start and end timing', async () => {
+      const performanceMock = performance as unknown as {
+        timeOrigin: number;
+        now: jest.Mock;
+      };
+      performanceMock.timeOrigin = 1_750_000_000_000;
+      performanceMock.now.mockReturnValue(500);
+      const dateNowSpy = jest.spyOn(Date, 'now');
+
+      storageGetItemMock.mockResolvedValue(AGREED);
+      updateCachedConsent(true);
+
+      bufferTraceStartCallLocal({
+        name: TraceName.Middleware,
+        id: 'buffer-clock',
+      });
+      bufferTraceEndCallLocal({
+        name: TraceName.Middleware,
+        id: 'buffer-clock',
+      });
+
+      // Buffered timing must be stamped from the performance clock, never Date.now
+      expect(dateNowSpy).not.toHaveBeenCalled();
+
+      await flushBufferedTraces();
+
+      // Performance-clock start time (timeOrigin 1_750_000_000_000 + now 500) flows into span start options
+      expect(startSpanManualMock).toHaveBeenCalledWith(
+        expect.objectContaining({ startTime: 1_750_000_000_500 }),
+        expect.any(Function),
+      );
+
+      dateNowSpy.mockRestore();
+    });
   });
 });
diff --git a/app/util/trace.ts b/app/util/trace.ts
index c805402b58e9..01f55c098fbc 100644
--- a/app/util/trace.ts
+++ b/app/util/trace.ts
@@ -8,6 +8,7 @@ import {
   type StartSpanOptions,
   type Span,
   withIsolationScope,
+  startNewTrace,
   SPAN_STATUS_ERROR,
 } from '@sentry/core';
 import performance from 'react-native-performance';
@@ -59,6 +60,9 @@ export enum TraceName {
   LoadDepositExperience = 'Load Deposit Experience',
   DepositContinueFlow = 'Deposit Continue Flow',
   DepositInputOtp = 'Deposit Input OTP',
+  RampBuyToOrderDetails = 'Ramp Buy To Order Details',
+  RampBuyContinueToCheckout = 'Ramp Buy Continue To Checkout',
+  RampBuyNativeToOrderCreated = 'Ramp Buy Native To Order Created',
   RevealSrp = 'Reveal SRP',
   RevealPrivateKey = 'Reveal Private Key',
   EvmDiscoverAccounts = 'EVM Discover Accounts',
@@ -329,6 +333,7 @@ export enum TraceOperation {
   // Money Home Performance
   MoneyHomePerformance = 'money.home.performance',
   MoneyAccountDataFetch = 'money.account.data_fetch',
+  RampOperation = 'ramp.operation',
   /** Token overview OHLCV WebView: initial load or asset/currency change */
   TokenOverviewAdvancedChart = 'token_overview.advanced_chart',
   /** Token overview OHLCV WebView: time range change only */
@@ -455,6 +460,9 @@ export interface TraceRequest {
    */
   parentContext?: TraceContext;
 
+  /** Root transaction; without parentContext also starts a fresh Sentry trace ID. */
+  forceTransaction?: boolean;
+
   /**
    * Override the start time of the trace.
    */
@@ -742,7 +750,7 @@ function createBufferedStartTrace(
     request: {
       ...request,
       parentContext: undefined, // Remove original parentContext to avoid invalid references
-      startTime: request.startTime ?? Date.now(),
+      startTime: request.startTime ?? getPerformanceTimestamp(),
     },
     parentTraceName,
   } as BufferedTrace;
@@ -756,7 +764,7 @@ function createBufferedEndTrace(request: EndTraceRequest): BufferedTrace {
     type: 'end',
     request: {
       ...request,
-      timestamp: request.timestamp ?? Date.now(),
+      timestamp: request.timestamp ?? getPerformanceTimestamp(),
     },
   } as BufferedTrace;
 }
@@ -1016,7 +1024,7 @@ function startTrace(request: TraceRequest): TraceContext {
   const callback = (span: Span | undefined) => {
     const end = (timestamp?: number) => {
       if (span?.end !== undefined) {
-        span?.end(timestamp);
+        span?.end(timestamp ?? getPerformanceTimestamp());
       }
     };
 
@@ -1085,7 +1093,7 @@ function startSpan<T>(
   request: TraceRequest,
   callback: (spanOptions: StartSpanOptions) => T,
 ) {
-  const { name, parentContext, startTime, op } = request;
+  const { name, parentContext, startTime, op, forceTransaction } = request;
   const parentSpan = (parentContext ?? null) as Span | null;
 
   const spanOptions: StartSpanOptions = {
@@ -1094,11 +1102,16 @@ function startSpan<T>(
     op: op || OP_DEFAULT,
     parentSpan,
     startTime,
+    forceTransaction,
   };
 
   return withIsolationScope((scope) => {
     setScopeTags(scope, request);
 
+    if (forceTransaction && !parentSpan) {
+      return startNewTrace(() => callback(spanOptions));
+    }
+
     return callback(spanOptions);
   }) as T;
 }
diff --git a/babel.config.js b/babel.config.js
index 99a68d7e7383..5ccd95bc32bb 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -119,7 +119,14 @@ module.exports = {
     [
       'transform-inline-environment-variables',
       {
-        exclude: ['JEST_WORKER_ID', 'EXPO_OS', 'EXPO_SERVER', 'EXPO_BASE_URL'],
+        exclude: [
+          'JEST_WORKER_ID',
+          'EXPO_OS',
+          'EXPO_SERVER',
+          'EXPO_BASE_URL',
+          // Must remain runtime-readable for emergency Appium session-reuse rollback.
+          'APPIUM_SESSION_REUSE',
+        ],
       },
     ],
     dynamicImportToRequire,
diff --git a/babel.config.tests.js b/babel.config.tests.js
index 7ca490a8c2ea..83ec5b20a71f 100644
--- a/babel.config.tests.js
+++ b/babel.config.tests.js
@@ -61,11 +61,15 @@ const newOverrides = [
       'app/util/environment.ts',
       'app/util/environment.test.ts',
       'app/constants/bridge.ts',
+      // LLM workflow session manager reads process.env at runtime (e.g. MM_METRO_PORT)
+      'tests/llm-workflow/metamask-provider.ts',
       'app/core/devApiEnv.ts',
       'app/core/Engine/controllers/rewards-controller/utils/rewards-api-url.ts',
       'app/core/Engine/controllers/rewards-controller/utils/rewards-api-url.test.ts',
       'app/components/UI/Card/util/mapBaanxApiUrl.ts',
       'app/components/UI/Card/util/mapBaanxApiUrl.test.ts',
+      'app/components/UI/Card/util/mapCardApiUrl.ts',
+      'app/components/UI/Card/util/mapCardApiUrl.test.ts',
       'app/core/Engine/controllers/card-controller/services/baanx-config.ts',
       'app/core/Engine/controllers/card-controller/services/baanx-config.test.ts',
       'app/components/UI/Perps/adapters/mobileInfrastructure.ts',
@@ -77,6 +81,8 @@ const newOverrides = [
       'tests/framework/playwrightLogger.ts',
       'tests/framework/PlaywrightUtilities.ts',
       'tests/framework/fixtures/FixtureHelper.ts',
+      'tests/framework/fixtures/playwright/sessionReuse.ts',
+      'tests/framework/fixtures/playwright/sessionReuse.test.ts',
       'tests/framework/services/providers/emulator/reinstallLocalBuildFromPath.ts',
       'tests/framework/services/appium/ScreenRecording.ts',
       'tests/framework/services/appium/AppiumServer.ts',
diff --git a/builds.yml b/builds.yml
index 2e18df4d8177..11e8ad8ff6c4 100644
--- a/builds.yml
+++ b/builds.yml
@@ -34,6 +34,7 @@ _public_envs: &public_envs # Servers (production)
   SOCIAL_API_URL: 'https://social.api.cx.metamask.io'
   REWARDS_API_URL: 'https://rewards.api.cx.metamask.io'
   BAANX_API_URL: 'https://api.baanx.com'
+  CARD_API_URL: 'https://card.api.cx.metamask.io'
   # Build flags (production defaults)
   RAMPS_ENVIRONMENT: 'production'
   RAMP_DEV_BUILD: 'false'
@@ -93,6 +94,8 @@ _secrets: &secrets # Infrastructure
   QUICKNODE_HYPEREVM_URL: 'QUICKNODE_HYPEREVM_URL'
   QUICKNODE_ARC_URL: 'QUICKNODE_ARC_URL'
   QUICKNODE_ROBINHOOD_URL: 'QUICKNODE_ROBINHOOD_URL'
+  QUICKNODE_ZKSYNC_URL: 'QUICKNODE_ZKSYNC_URL'
+  QUICKNODE_MEGAETH_URL: 'QUICKNODE_MEGAETH_URL'
   # OAuth
   IOS_GOOGLE_CLIENT_ID: 'IOS_GOOGLE_CLIENT_ID'
   IOS_GOOGLE_REDIRECT_URI: 'IOS_GOOGLE_REDIRECT_URI'
@@ -321,6 +324,7 @@ builds:
       MM_PREDICT_BUILDER_CODE: '0xd48300a99deac0f23265dad1f59d32920be33b75919201a88ed80f457f97b924'
       REWARDS_API_URL: 'https://rewards.uat-api.cx.metamask.io'
       BAANX_API_URL: 'https://dev.api.baanx.com'
+      CARD_API_URL: 'https://card.uat-api.cx.metamask.io'
       DIGEST_API_URL: 'https://digest.dev-api.cx.metamask.io/api/v1'
       SOCIAL_API_URL: 'https://social.dev-api.cx.metamask.io'
       PRICE_ALERTS_API_URL: 'https://price-alerts.dev-api.cx.metamask.io'
@@ -345,6 +349,7 @@ builds:
       MM_PREDICT_BUILDER_CODE: '0xd48300a99deac0f23265dad1f59d32920be33b75919201a88ed80f457f97b924'
       REWARDS_API_URL: 'https://rewards.uat-api.cx.metamask.io'
       BAANX_API_URL: 'https://dev.api.baanx.com'
+      CARD_API_URL: 'https://card.uat-api.cx.metamask.io'
       DIGEST_API_URL: 'https://digest.dev-api.cx.metamask.io/api/v1'
       SOCIAL_API_URL: 'https://social.dev-api.cx.metamask.io'
       PRICE_ALERTS_API_URL: 'https://price-alerts.dev-api.cx.metamask.io'
@@ -369,6 +374,7 @@ builds:
       MM_PREDICT_BUILDER_CODE: '0xd48300a99deac0f23265dad1f59d32920be33b75919201a88ed80f457f97b924'
       REWARDS_API_URL: 'https://rewards.uat-api.cx.metamask.io'
       BAANX_API_URL: 'https://dev.api.baanx.com'
+      CARD_API_URL: 'https://card.uat-api.cx.metamask.io'
       DIGEST_API_URL: 'https://digest.dev-api.cx.metamask.io/api/v1'
       SOCIAL_API_URL: 'https://social.dev-api.cx.metamask.io'
       PRICE_ALERTS_API_URL: 'https://price-alerts.dev-api.cx.metamask.io'
@@ -429,6 +435,7 @@ builds:
       MM_PREDICT_BUILDER_CODE: '0xd48300a99deac0f23265dad1f59d32920be33b75919201a88ed80f457f97b924'
       REWARDS_API_URL: 'https://rewards.uat-api.cx.metamask.io'
       BAANX_API_URL: 'https://dev.api.baanx.com'
+      CARD_API_URL: 'https://card.uat-api.cx.metamask.io'
       DIGEST_API_URL: 'https://digest.dev-api.cx.metamask.io/api/v1'
       SOCIAL_API_URL: 'https://social.dev-api.cx.metamask.io'
       PRICE_ALERTS_API_URL: 'https://price-alerts.dev-api.cx.metamask.io'
@@ -456,6 +463,7 @@ builds:
       MM_PREDICT_BUILDER_CODE: '0xd48300a99deac0f23265dad1f59d32920be33b75919201a88ed80f457f97b924'
       REWARDS_API_URL: 'https://rewards.uat-api.cx.metamask.io'
       BAANX_API_URL: 'https://dev.api.baanx.com'
+      CARD_API_URL: 'https://card.uat-api.cx.metamask.io'
       DIGEST_API_URL: 'https://digest.dev-api.cx.metamask.io/api/v1'
       SOCIAL_API_URL: 'https://social.dev-api.cx.metamask.io'
       PRICE_ALERTS_API_URL: 'https://price-alerts.dev-api.cx.metamask.io'
@@ -500,6 +508,7 @@ builds:
       MM_PREDICT_BUILDER_CODE: '0xd48300a99deac0f23265dad1f59d32920be33b75919201a88ed80f457f97b924'
       REWARDS_API_URL: 'https://rewards.uat-api.cx.metamask.io'
       BAANX_API_URL: 'https://dev.api.baanx.com'
+      CARD_API_URL: 'https://card.uat-api.cx.metamask.io'
       DIGEST_API_URL: 'https://digest.dev-api.cx.metamask.io/api/v1'
       SOCIAL_API_URL: 'https://social.dev-api.cx.metamask.io'
       PRICE_ALERTS_API_URL: 'https://price-alerts.dev-api.cx.metamask.io'
@@ -524,6 +533,7 @@ builds:
       MM_PREDICT_BUILDER_CODE: '0xd48300a99deac0f23265dad1f59d32920be33b75919201a88ed80f457f97b924'
       REWARDS_API_URL: 'https://rewards.uat-api.cx.metamask.io'
       BAANX_API_URL: 'https://dev.api.baanx.com'
+      CARD_API_URL: 'https://card.uat-api.cx.metamask.io'
       DIGEST_API_URL: 'https://digest.dev-api.cx.metamask.io/api/v1'
       SOCIAL_API_URL: 'https://social.dev-api.cx.metamask.io'
       PRICE_ALERTS_API_URL: 'https://price-alerts.dev-api.cx.metamask.io'
@@ -547,6 +557,7 @@ builds:
       MM_PREDICT_BUILDER_CODE: '0xd48300a99deac0f23265dad1f59d32920be33b75919201a88ed80f457f97b924'
       REWARDS_API_URL: 'https://rewards.uat-api.cx.metamask.io'
       BAANX_API_URL: 'https://dev.api.baanx.com'
+      CARD_API_URL: 'https://card.uat-api.cx.metamask.io'
       DIGEST_API_URL: 'https://digest.dev-api.cx.metamask.io/api/v1'
       SOCIAL_API_URL: 'https://social.dev-api.cx.metamask.io'
       PRICE_ALERTS_API_URL: 'https://price-alerts.dev-api.cx.metamask.io'
diff --git a/docs/perps/perps-feature-flags.md b/docs/perps/perps-feature-flags.md
index f9729bdd470c..4b55a4014a68 100644
--- a/docs/perps/perps-feature-flags.md
+++ b/docs/perps/perps-feature-flags.md
@@ -170,6 +170,7 @@ Follow existing test patterns covering:
 | `perpsPerpTradingServiceInterruptionBannerEnabled` | `perps-perp-trading-service-interruption-banner-enabled` | `MM_PERPS_SERVICE_INTERRUPTION_BANNER_ENABLED` | false   | Service disruption banner                                                                                |
 | `perpsPerpGtmOnboardingModalEnabled`               | `perps-perp-gtm-onboarding-modal-enabled`                | `MM_PERPS_GTM_MODAL_ENABLED`                   | false   | GTM onboarding modal                                                                                     |
 | `perpsOrderBookEnabled`                            | `perps-order-book-enabled`                               | `MM_PERPS_ORDER_BOOK_ENABLED`                  | false   | Order Book feature                                                                                       |
+| `perpsProModeEnabled`                              | `perps-pro-mode-enabled`                                 | —                                              | false   | Lite/Pro mode toggle and Pro-mode entry points (Pro market view)                                         |
 | `perpsAdvancedChartEnabledV2`                      | `perps-advanced-chart-enabled-v2`                        | —                                              | false   | Perps market detail / fullscreen TradingView AdvancedChart (remote only)                                 |
 | `perpsShowFullAssetNames`                          | `perps-show-full-asset-names`                            | —                                              | false   | Show full asset names (e.g. "Bitcoin") instead of tickers (e.g. "BTC") in market row lists (remote only) |
 | `perpsFeedbackEnabled`                             | `perps-feedback-enabled`                                 | `MM_PERPS_FEEDBACK_ENABLED`                    | false   | Feedback button on home                                                                                  |
diff --git a/docs/perps/perps-screens.md b/docs/perps/perps-screens.md
index 339ec82228c6..07c86cc0b2b8 100644
--- a/docs/perps/perps-screens.md
+++ b/docs/perps/perps-screens.md
@@ -288,7 +288,46 @@ User action:
 
 ---
 
-## PerpsPositionsView
+## Pro mode — open order edit (TAT-3642)
+
+**Location:** `app/components/UI/Perps/Views/PerpsProMarketView/` (orders tab within Pro market view)
+
+### Purpose & User Journey
+
+In Perps Pro mode, users can edit the **limit price** or **size** of eligible open limit orders in place (venue `modify`, not cancel+replace). Tapping the price/size row or the Edit button opens a bottom sheet; confirm applies an optimistic patch, calls `editOrder`, and rolls back on failure.
+
+### Key Components Used
+
+| Component | Purpose |
+| --------- | ------- |
+| `PerpsProOrderCard` | Order row with tappable price/size rows and edit affordances |
+| `PerpsProOrderEditSheets` | Renders limit-price or size sheet from shared edit state |
+| `PerpsLimitPriceBottomSheet` | Limit price keypad (also used by `PerpsOrderView`; resting-order margin validation when editing) |
+| `PerpsOrderSizeBottomSheet` | Size keypad with minimum-notional and incremental-margin checks |
+
+### Hooks Consumed
+
+| Hook | Purpose |
+| ---- | ------- |
+| `usePerpsProOrderEdit` | Sheet state, confirm handler, optimistic apply/rollback |
+| `usePerpsProPositionsPanelActions` | Wires panel handlers and portal `renderOrderEditSheets()` |
+
+### testIDs (`Perps.testIds.ts`)
+
+| Constant | testID |
+| -------- | ------ |
+| `PerpsProMarketViewSelectorsIDs.ORDER_EDIT` | `perps-pro-market-order-edit` |
+| `PerpsProMarketViewSelectorsIDs.ORDER_PRICE_EDIT` | `perps-pro-market-order-price-edit` |
+| `PerpsProMarketViewSelectorsIDs.ORDER_SIZE_EDIT` | `perps-pro-market-order-size-edit` |
+| `PerpsOrderSizeBottomSheetSelectorsIDs.SIZE_DISPLAY` | `perps-order-size-display` |
+| `PerpsOrderSizeBottomSheetSelectorsIDs.CONFIRM_BUTTON` | `perps-order-size-confirm-button` |
+| `PerpsLimitPriceBottomSheetSelectorsIDs.CONFIRM_BUTTON` | `perps-limit-price-confirm-button` |
+
+### Eligibility
+
+`isLimitOrderEditable` — open, unfilled, non-trigger limits only. Size edit is additionally blocked when TP/SL children are attached.
+
+---
 
 **Location:** `app/components/UI/Perps/Views/PerpsPositionsView/PerpsPositionsView.tsx`
 
diff --git a/docs/readme/deeplinking.md b/docs/readme/deeplinking.md
index b00349f84a99..618b2096e3a6 100644
--- a/docs/readme/deeplinking.md
+++ b/docs/readme/deeplinking.md
@@ -900,7 +900,7 @@ The `deposit` / `metamask://deposit` deeplink is **deprecated** and no longer op
 | `perps`                | Perpetuals trading          | `handlePerpsUrl`         | Params: `screen` (tabs/markets/asset), `symbol`                                                                                                                                                                  |
 | `perps-markets`        | Perps markets list          | `handlePerpsUrl`         |                                                                                                                                                                                                                  |
 | `perps-asset`          | Perps specific asset        | ⚠️ NOT IMPLEMENTED       | Action defined but missing handler case                                                                                                                                                                          |
-| `predict`              | Prediction markets          | `handlePredictUrl`       | Params: `market`/`marketId`, `feed` (generic ids + `world-cup`), `tab`, `filter`, `q`/`query`, `utm_source`                                                                                                      |
+| `predict`              | Prediction markets          | `handlePredictUrl`       | Params: `market`/`marketId`, `feed` (generic ids), `tab`, `filter`, `q`/`query`, `utm_source`                                                                                                                    |
 | `rewards`              | Rewards program             | `handleRewardsUrl`       | Params: `referral` (referral code)                                                                                                                                                                               |
 | `trending`             | Explore / Trending          | `handleTrendingUrl`      | Params: `tab=now\|macro\|rwas\|crypto\|sports\|sites`, `screen=stocks\|trending-tokens\|sites\|favorite-sites\|search`, `q`/`query` (prefills search when `screen=search`) (unknown values fall back to Explore) |
 | `wc`                   | WalletConnect               | Recursive `parse()` call |                                                                                                                                                                                                                  |
diff --git a/docs/readme/e2e-testing.md b/docs/readme/e2e-testing.md
index 1ea88e77608f..943297abb56c 100644
--- a/docs/readme/e2e-testing.md
+++ b/docs/readme/e2e-testing.md
@@ -395,25 +395,38 @@ yarn test:e2e:android:flask:run
 
 ### API Spec Tests
 
-**Platform**: iOS  
-**Test Location**: `tests/smoke/api-specs/json-rpc-coverage.js`
+**Platform**: iOS Appium only (not Android; not Appium smoke tag suites)  
+**Test Location**: `tests/smoke-appium/api-specs/`  
+**CI**: [`.github/workflows/run-e2e-api-specs.yml`](../../.github/workflows/run-e2e-api-specs.yml) (`api-specs-ios` job; currently `if: false`)
 
-The API Spec tests use the `@open-rpc/test-coverage` tool to generate tests from our [api-specs](https://github.com/MetaMask/api-specs) OpenRPC Document. These tests are currently executed only on iOS and use the same build as the Detox tests for iOS.
+The API Spec tests use `@open-rpc/test-coverage` against the in-app Test Dapp WebView (`window.ethereum`). Coverage is generated from the MetaMask [api-specs](https://github.com/MetaMask/api-specs) OpenRPC document (`0.10.8`). Specs are excluded from `yarn appium-smoke:*` via Playwright `testIgnore` unless `APPIUM_RUN_API_SPECS=1`.
 
-- **Test Coverage Tool**: The `test-coverage` tool uses `Rules` and `Reporters` to generate and report test results. These are passed as parameters in the test coverage tool call located in [tests/smoke/api-specs/json-rpc-coverage.js](../../tests/smoke/api-specs/json-rpc-coverage.js). For more details on `Rules` and `Reporters`, refer to the [OpenRPC test coverage documentation](https://github.com/open-rpc/test-coverage?tab=readme-ov-file#extending-with-a-rule).
+- **Rules**: JsonSchemaFaker + Examples (unsupported / confirmation methods filtered) and ConfirmationsRejectRule (Cancel → error `4001`). See [`tests/smoke-appium/api-specs/json-rpc-coverage.spec.ts`](../../tests/smoke-appium/api-specs/json-rpc-coverage.spec.ts).
+- **Build**: main-e2e release (`HAS_TEST_OVERRIDES=true`), same as Appium smoke — not Metro debug.
+- Prefer **iOS 18.x** locally for WebView JS; iOS 26.x may fail with `'Runtime' domain was not found`.
 
 #### Commands
 
-1. **Build the App**:
+1. **Build / obtain main-e2e iOS app** (see [Appium smoke testing](../testing/appium-smoke-testing.md)), e.g. `build/ci-main-e2e/MetaMask.app`.
+
+2. **Prepare simulator + Appium** (once):
+
+   ```bash
+   set -a && source .e2e.env && set +a
+   IOS_APP_PATH=build/ci-main-e2e/MetaMask.app node scripts/e2e/prepare-ios-appium-runner.mjs
+   ```
+
+3. **Run API Spec Tests**:
 
    ```bash
-   yarn test:e2e:ios:debug:build
+   IOS_APP_PATH=build/ci-main-e2e/MetaMask.app yarn test:api-specs
    ```
 
-2. **Run API Spec Tests**:
+   Equivalent explicit path:
 
    ```bash
-   yarn test:api-specs
+   APPIUM_RUN_API_SPECS=1 IOS_APP_PATH=build/ci-main-e2e/MetaMask.app \
+     yarn appium-smoke:ios -- tests/smoke-appium/api-specs
    ```
 
 #### Running Tests Against BrowserStack Devices
@@ -524,7 +537,7 @@ yarn run-playwright:ios
         166 |   }
         167 |
         168 |   static async checkIfNotVisible(elementId) {
-      at Function.withTimeout (tests/helpers.js:165:8)
+      at Function.withTimeout (tests/framework/Assertions.ts:165:8)
       ...
   ```
 
diff --git a/docs/testing/appium-smoke-testing.md b/docs/testing/appium-smoke-testing.md
index 378616df3882..893bd51865db 100644
--- a/docs/testing/appium-smoke-testing.md
+++ b/docs/testing/appium-smoke-testing.md
@@ -147,6 +147,16 @@ IOS_SIMULATOR_UDID="$IOS_SIMULATOR_UDID" \
 yarn appium-smoke:ios
 ```
 
+### API specs (OpenRPC) — excluded from smoke tags
+
+`tests/smoke-appium/api-specs/` is **iOS-only**, colocated under smoke-appium but **not** part of Appium smoke tag suites (`testIgnore` unless `APPIUM_RUN_API_SPECS=1`). Use the dedicated script / workflow:
+
+```bash
+IOS_APP_PATH=build/ci-main-e2e/MetaMask.app yarn test:api-specs
+```
+
+CI entrypoint: `.github/workflows/run-e2e-api-specs.yml` (`api-specs-ios`, currently `if: false`).
+
 **Single spec or tag:**
 
 ```bash
@@ -171,13 +181,44 @@ Ensure the emulator is running before starting tests.
 
 ## Yarn commands
 
-| Command                     | Description                     |
-| --------------------------- | ------------------------------- |
-| `yarn appium-smoke:ios`     | Full iOS Appium smoke suite     |
-| `yarn appium-smoke:android` | Full Android Appium smoke suite |
+| Command                               | Description                                     |
+| ------------------------------------- | ----------------------------------------------- |
+| `yarn appium-smoke:ios`               | Full iOS Appium smoke suite                     |
+| `yarn appium-smoke:android`           | Full Android Appium smoke suite                 |
+| `yarn appium-smoke:aggregate-timings` | Aggregate phase-timing JSON into a trend report |
 
 Both use `tests/playwright.smoke-appium.config.ts`. Pass standard Playwright flags: `--grep`, file paths, `--debug`, etc.
 
+## Session reuse and soft reload
+
+Local emulator/simulator Appium smoke **reuses one WebDriver session per Playwright worker** by default, and resets the app between tests via soft reload (`clearAppData` → `NATIVE_APP` context → relaunch → wait for `/state.json`).
+
+| Concern                               | Behavior                                                                                     |
+| ------------------------------------- | -------------------------------------------------------------------------------------------- |
+| Session create                        | Once per worker (happy path). Logs `Reusing WebDriver session sessionId=...` on later tests. |
+| Between tests (`restartDevice: true`) | Soft reload — does **not** create a new Appium session.                                      |
+| Unhealthy session                     | Test-scoped `driver` fixture recreates once (`sessionRecreated=true` annotation).            |
+| Device-health failure                 | Shared session is marked for recreate so later tests do not cascade.                         |
+| BrowserStack                          | Session reuse stays **off** (legacy per-test sessions).                                      |
+| Rollback                              | `APPIUM_SESSION_REUSE=false` restores per-test session delete.                               |
+
+Helpers:
+
+- `isAppiumSessionReuseEnabled` — `tests/framework/fixtures/playwright/sessionReuse.ts`
+- `softReloadAppForFixtures` — `tests/framework/services/appium/softReloadApp.ts`
+- Worker fixtures — `deviceProvider` + `sharedSession` in `tests/framework/fixtures/playwright/`
+
+## Phase timing telemetry
+
+Appium smoke records phase ms via `PhaseTimer` (`servers_start`, soft-reload phases, `login`, `modal_dismissal`, `test_body`, `teardown`). Suites write `tests/test-reports/appium-timings/<suite>.json` (CI artifact `appium-timings-<suite>`). Aggregate with:
+
+```bash
+yarn appium-smoke:aggregate-timings
+yarn appium-smoke:aggregate-timings -- --input /path/to/timings --markdown /tmp/trend.md
+```
+
+Report: avg/p95 per phase, slowest shard, retry rate, session-reuse. Compare against timings downloaded from `main` once jobs upload them.
+
 ## Reports and artifacts
 
 | Output                        | Path                                  |
@@ -185,8 +226,9 @@ Both use `tests/playwright.smoke-appium.config.ts`. Pass standard Playwright fla
 | HTML report                   | `test-reports/appium-smoke-report/`   |
 | JUnit                         | `test-reports/appium-smoke-junit.xml` |
 | Failure videos (when enabled) | `test-reports/appium-smoke-videos/`   |
+| Phase timings                 | `test-reports/appium-timings/`        |
 
-CI uploads per-suite artifacts as `appium-smoke-report-<suite>` and `appium-smoke-videos-<suite>`.
+CI uploads per-suite artifacts as `appium-smoke-report-<suite>`, `appium-timings-<suite>`, and `appium-smoke-videos-<suite>`.
 
 ## CI
 
@@ -218,4 +260,4 @@ CI uploads per-suite artifacts as `appium-smoke-report-<suite>` and `appium-smok
 - [E2E testing guidelines](./e2e-testing.md) — POM, cross-framework patterns, Detox vs Appium specs
 - [E2E setup (Detox)](../readme/e2e-testing.md) — Metro, debug builds, smoke
 - [Playwright local emulator](../../tests/docs/PLAYWRIGHT_LOCAL_EMULATOR.md) — `buildPath`, reinstall behavior
-- [Unified E2E architecture](../../tests/docs/UNIFIED_E2E_ARCHITECTURE.md) — `resolve()`, `encapsulated()`
+- [E2E architecture (Appium)](../../tests/docs/UNIFIED_E2E_ARCHITECTURE.md) — layers, `resolve()`, `encapsulated()`
diff --git a/docs/testing/e2e-testing.md b/docs/testing/e2e-testing.md
index 0525293c51e7..95042712a6e1 100644
--- a/docs/testing/e2e-testing.md
+++ b/docs/testing/e2e-testing.md
@@ -25,13 +25,12 @@
 ## Test Organization - MANDATORY
 
 - Organize tests into folders based on features and scenarios
-- Place smoke specs under `tests/smoke/` (Detox) or `tests/smoke-appium/` (Appium), using the matching smoke tag
+- Place smoke specs under `tests/smoke-appium/`, using the matching smoke tag
 - Each feature team should own one or more folders of tests
 - Follow the same organization pattern as the extension team for consistency
 - Place tests in logical feature directories:
   ```
-  tests/smoke/<feature-name>/<e2e-test-name.spec.ts>
-  tests/smoke/tokens/import/import-erc1155.spec.ts
+  tests/smoke-appium/<feature-name>/<e2e-test-name.spec.ts>
   tests/smoke-appium/wallet/browser/browser-navigation.spec.ts
   ```
 
@@ -47,30 +46,27 @@
 ### Key Features
 
 - ✅ **Auto-retry** - Handles flaky network/UI conditions
-- ✅ **Cross-framework** - `Gestures`, `Assertions`, and `Matchers` work in both Detox and Appium
+- ✅ **Appium / Playwright** - `Gestures`, `Assertions`, and `Matchers` are the canonical facades for Appium smoke
 - ✅ **Configurable element state checking** - Control visibility, enabled, and stability checks per interaction
 - ✅ **Performance optimization** - Stability checking disabled by default for better performance
 - ✅ **Better error messages** - Descriptive errors with retry context and timing
 - ✅ **Type safety** - Full TypeScript support with IntelliSense
 
-### Cross-Framework Support
+### Gestures facade (canonical)
 
-`Gestures`, `Assertions`, and the three common `Matchers` methods (`getElementByID`, `getElementByText`, `getElementByLabel`) automatically route to the correct framework at runtime. Page objects that use them work in both Detox and Appium with no changes.
+Use `Gestures`, `Assertions`, and the common `Matchers` methods (`getElementByID`, `getElementByText`, `getElementByLabel`) from `tests/framework`. Do **not** import `UnifiedGestures` in page objects or specs — it is a legacy dual-runner API retained only as an internal implementation detail until Detox removal finishes.
 
 ```
 Page object calls Gestures.waitAndTap(elem)
         │
-        ├── Detox run  → existing Detox implementation (retry, stability checks)
         └── Appium run → AppiumGestureStrategy → PlaywrightGestures
 ```
 
-This means a Detox smoke test and its Appium counterpart share the same page object calls — only the test runner wrapper and login flow differ between them.
-
 ## Writing Page Objects
 
-### Default Pattern — works in both frameworks
+### Default Pattern — Appium smoke
 
-Use `Matchers.getElementByID/Text/Label` for getters and `Gestures`/`Assertions` for actions. No framework-specific imports needed.
+Use `Matchers.getElementByID/Text/Label` for getters and `Gestures`/`Assertions` for actions. No Playwright-specific imports needed for the common case.
 
 ```typescript
 import Matchers from '../framework/Matchers';
@@ -101,49 +97,80 @@ class LoginPage {
 export default new LoginPage();
 ```
 
-### Edge Case: different selector per framework
+### Edge Case: different selector per platform
 
-When the same element has a different testID or selector strategy between Detox and Appium, use `resolve()` from the framework:
+When the same element needs a different testID or selector strategy between iOS and Android Appium, use `resolve()` from the framework. Legacy dual-runner branches (`detoxTestID`, `appiumTestID`) remain for remaining Detox suites; new work should only need Appium / platform variants.
 
 ```typescript
 import { resolve } from '../framework';
+import { encapsulated } from '../framework/EncapsulatedElement';
+import PlaywrightMatchers from '../framework/PlaywrightMatchers';
 
-// Different testID per framework
+// Different testID on iOS vs Android Appium (Appium-only — no Detox branch)
 get actionButton() {
-  return resolve({
-    detoxTestID: TabBarSelectorIDs.TRADE,
-    appiumTestID: TabBarSelectorIDs.ACTIONS,
+  return encapsulated({
+    appium: {
+      android: () =>
+        PlaywrightMatchers.getElementById(TabBarSelectorIDs.TRADE, {
+          exact: true,
+        }),
+      ios: () =>
+        PlaywrightMatchers.getElementByAccessibilityId(
+          TabBarSelectorIDs.ACTIONS,
+        ),
+    },
   });
 }
 
-// Different testID on iOS Appium vs everything else
+// Same testID on Android; iOS Appium differs
 get container() {
   return resolve({
     testID: WalletViewSelectorsIDs.WALLET_CONTAINER,
     iosAppiumTestID: WalletViewSelectorsIDs.EYE_SLASH_ICON,
   });
 }
+
+// Legacy dual-runner: Detox + per-platform Appium testIDs
+get legacyActionButton() {
+  return resolve({
+    detoxTestID: TabBarSelectorIDs.TRADE,
+    androidAppiumTestID: TabBarSelectorIDs.TRADE,
+    iosAppiumTestID: TabBarSelectorIDs.ACTIONS,
+  });
+}
 ```
 
 Available `resolve()` shapes:
 
 | Shape                                                   | When to use                                             |
 | ------------------------------------------------------- | ------------------------------------------------------- |
-| `{ testID }`                                            | Same testID works in all frameworks/platforms           |
-| `{ detoxTestID, appiumTestID }`                         | Different testID between Detox and Appium               |
-| `{ detoxTestID, androidAppiumTestID, iosAppiumTestID }` | All three differ                                        |
-| `{ testID, iosAppiumTestID }`                           | Detox + Android Appium share testID; iOS Appium differs |
+| `{ testID }`                                            | Same testID works on iOS and Android Appium             |
+| `{ testID, iosAppiumTestID }`                           | Android Appium shares testID; iOS Appium differs        |
+| `{ detoxTestID, appiumTestID }`                         | Legacy: different testID between Detox and Appium       |
+| `{ detoxTestID, androidAppiumTestID, iosAppiumTestID }` | Legacy dual-runner: Detox + per-platform Appium testIDs |
 | `{ label }`                                             | Match by accessibility label                            |
 | `{ text }`                                              | Match by visible text                                   |
 
-### Edge Case: different selector type per framework
+For Appium-only iOS vs Android testID differences (no Detox), use `encapsulated({ appium: { android: () => ..., ios: () => ... } })` instead of `resolve()`.
+
+### Edge Case: different selector type per platform
 
-When the selector strategy itself differs (e.g. Detox matches by ID+label, Appium matches by text), use `encapsulated()`:
+When the selector strategy itself differs between iOS and Android Appium (e.g. one platform matches by ID+label, the other by text), use `encapsulated()`:
 
 ```typescript
 import { encapsulated } from '../framework/EncapsulatedElement';
 import PlaywrightMatchers from '../framework/PlaywrightMatchers';
 
+getAccountElementByName(accountName: string) {
+  return encapsulated({
+    appium: () => PlaywrightMatchers.getElementByText(accountName),
+  });
+}
+```
+
+Legacy dual-runner branches remain for remaining Detox suites; new work should only need Appium / platform variants:
+
+```typescript
 getAccountElementByName(accountName: string) {
   return encapsulated({
     detox: () => Matchers.getElementByIDAndLabel(AccountCellIds.ADDRESS, accountName),
@@ -152,13 +179,27 @@ getAccountElementByName(accountName: string) {
 }
 ```
 
-### Edge Case: different action flow per framework
+### Edge Case: different action flow per platform
 
-When the action itself must differ structurally between frameworks (e.g. Appium must scroll before tapping, or must hide the keyboard after typing), use `encapsulatedAction()`:
+When the action itself must differ structurally between iOS and Android Appium (e.g. one platform must scroll before tapping, or must hide the keyboard after typing), use `encapsulatedAction()`:
 
 ```typescript
 import { encapsulatedAction } from '../framework/encapsulatedAction';
+import PlaywrightGestures from '../framework/PlaywrightGestures';
+
+async enterPassword(password: string): Promise<void> {
+  await encapsulatedAction({
+    appium: async () => {
+      await Gestures.typeText(this.passwordInput, password);
+      await PlaywrightGestures.hideKeyboard(); // iOS Appium requires explicit dismiss
+    },
+  });
+}
+```
+
+Legacy dual-runner branches remain for remaining Detox suites; new work should only need Appium / platform variants:
 
+```typescript
 async enterPassword(password: string): Promise<void> {
   await encapsulatedAction({
     detox: async () => {
@@ -172,45 +213,33 @@ async enterPassword(password: string): Promise<void> {
 }
 ```
 
-**Only use `encapsulatedAction` when the flow genuinely differs.** If the same `Gestures.*` or `Assertions.*` call works for both, there is no need to branch.
+**Only use `encapsulatedAction` when the flow genuinely differs.** If the same `Gestures.*` or `Assertions.*` call works on both platforms, there is no need to branch.
 
 ### Selector decision tree
 
 ```
-Does the same Matchers.getElementByID/Text/Label call work for both?
+Does the same Matchers.getElementByID/Text/Label call work on Appium (iOS + Android)?
   YES → use it directly, no branching needed
 
-  NO → Does only the testID value differ per framework?
-    YES → resolve({ detoxTestID, appiumTestID, ... })
+  NO → Does only the testID value differ per platform?
+    YES → resolve({ testID, iosAppiumTestID }) when Android shares testID
+          OR encapsulated({ appium: { android: () => ..., ios: () => ... } }) for Appium-only
+          OR legacy resolve({ detoxTestID, androidAppiumTestID, iosAppiumTestID }) if Detox still runs
 
     NO → Does only the selector type differ (ID vs text vs label)?
-      YES → encapsulated({ detox: ..., appium: ... })
+      YES → encapsulated({ appium: ... }) — or legacy detox/appium branches if migrating
 
       NO → Does the action flow itself differ?
-        YES → encapsulatedAction({ detox: ..., appium: ... })
+        YES → encapsulatedAction({ appium: ... }) — or legacy detox/appium branches if migrating
 ```
 
-## Test Organization — Detox vs Appium Specs
+## Test Organization — Appium Specs
 
-Detox smoke tests live in `tests/smoke/`. Appium equivalents live in `tests/smoke-appium/` with the same folder structure. Because page objects are cross-framework, the test body is nearly identical — only the runner wrapper and login helper differ.
+Appium smoke tests live in `tests/smoke-appium/`. Page objects use the `Gestures`/`Assertions`/`Matchers` facades so specs stay runner-agnostic aside from the Playwright fixture wrapper and login helper.
 
 **Running Appium smoke locally:** see [Appium smoke testing](./appium-smoke-testing.md) for builds (`main-e2e-MetaMask.app`), commands (`yarn appium-smoke:ios`), and CI artifact download.
 
 ```typescript
-// Detox: tests/smoke/accounts/my-feature.spec.ts
-describe(SmokeAccounts('My feature'), () => {
-  it('does the thing', async () => {
-    await withFixtures(
-      { fixture: new FixtureBuilder().build(), restartDevice: true },
-      async () => {
-        await loginToApp();
-        await SomePage.tapSomething();
-        await Assertions.expectElementToBeVisible(SomePage.result);
-      },
-    );
-  });
-});
-
 // Appium: tests/smoke-appium/accounts/my-feature.spec.ts
 appiumTest.describe(SmokeAccounts('My feature'), () => {
   appiumTest(
@@ -224,8 +253,8 @@ appiumTest.describe(SmokeAccounts('My feature'), () => {
         },
         async () => {
           await loginToAppPlaywright({ scenarioType: 'e2e' });
-          await SomePage.tapSomething(); // identical
-          await Assertions.expectElementToBeVisible(SomePage.result); // identical
+          await SomePage.tapSomething();
+          await Assertions.expectElementToBeVisible(SomePage.result);
         },
       );
     },
@@ -233,13 +262,12 @@ appiumTest.describe(SmokeAccounts('My feature'), () => {
 });
 ```
 
-The only required differences are:
+Required Appium spec differences:
 
 - `import { test as appiumTest }` from the Playwright fixture index
 - `{ driver: _driver, currentDeviceDetails }` fixture args
 - `currentDeviceDetails` passed to `withFixtures`
-- `loginToAppPlaywright(...)` instead of `loginToApp()`
-- Drop any `device.*` (Detox-only) calls
+- `loginToAppPlaywright(...)` instead of legacy Detox `loginToApp()`
 
 ## Test Atomicity and Coupling
 
@@ -317,12 +345,12 @@ const MyComponent = () => {
 
 ### Proper Waiting and Assertions
 
-- NEVER use `TestHelpers.delay()` - it creates flaky tests and slows down test execution
+- NEVER use fixed delays (`setTimeout`, bare `sleep`) when waiting for UI — they create flaky tests and slow execution
 - ALWAYS use proper waiting with Assertions from the framework:
 
   ```javascript
   // DON'T:
-  TestHelpers.delay(1000);
+  await sleep(1000);
 
   // DO:
   Assertions.expectElementToBeVisible(element, {
@@ -397,10 +425,10 @@ The following patterns are prohibited in test specs:
    await Assertions.expectElementToBeVisible(element);
    ```
 
-4. **Framework-specific imports in page objects when not needed**
+4. **Playwright-specific imports in page objects when not needed**
 
    ```typescript
-   // DON'T — unnecessary when the same call works cross-framework:
+   // DON'T — unnecessary when Gestures/Assertions handle the flow:
    import PlaywrightAssertions from '../framework/PlaywrightAssertions';
    import { asPlaywrightElement } from '../framework/EncapsulatedElement';
 
@@ -472,7 +500,7 @@ async tapOpenAllTabsButton(): Promise<void> {
 
 Before submitting E2E tests, ensure:
 
-- [ ] No usage of `TestHelpers.delay()` or `setTimeout()`
+- [ ] No fixed delays (`setTimeout` / bare `sleep`) when waiting for UI — use Assertions instead
 - [ ] All assertions have descriptive `description` parameters
 - [ ] All gestures have descriptive `description` parameters
 - [ ] Appropriate timeouts for operations (not magic numbers)
@@ -480,8 +508,9 @@ Before submitting E2E tests, ensure:
 - [ ] Element selectors defined once and reused
 - [ ] Framework configuration used appropriately
 - [ ] Error handling for expected failure scenarios
-- [ ] `Gestures`/`Assertions`/`Matchers` used directly — `PlaywrightAssertions`, `PlaywrightGestures`, `asPlaywrightElement` only imported when the flow genuinely requires framework-specific branching
-- [ ] `encapsulatedAction` only used when Detox and Appium flows structurally differ — not just to call the same method twice
+- [ ] `Gestures` used for interactions — do **not** import or call `UnifiedGestures`
+- [ ] `Gestures`/`Assertions`/`Matchers` used directly — `PlaywrightAssertions`, `PlaywrightGestures`, `asPlaywrightElement` only imported when the flow genuinely requires platform-specific branching
+- [ ] `encapsulatedAction` only used when iOS and Android Appium flows structurally differ — not just to call the same method twice
 
 ## Debugging Failed Tests
 
diff --git a/fingerprint.config.js b/fingerprint.config.js
index 743254bae2b5..ac90f9222d9c 100644
--- a/fingerprint.config.js
+++ b/fingerprint.config.js
@@ -110,16 +110,30 @@ const config = {
 
   /**
    * Paths excluded from the fingerprint entirely (on top of `@expo/fingerprint`'s own
-   * defaults). Every entry below has been verified to only run GitHub metadata automation
-   * (labels/comments/notifications), static lint/compliance checks, branch/release
+   * defaults). Every `.github/**` entry below has been verified to only run GitHub metadata
+   * automation (labels/comments/notifications), static lint/compliance checks, branch/release
    * bookkeeping, or test execution against an already-built app artifact — none of them
-   * can change the compiled native binary or the OTA JS bundle.
+   * can change the compiled native binary or the OTA JS bundle. Entries outside `.github/**`
+   * carry their own inline justification.
    *
    * IMPORTANT: this is a denylist by design (see the comment on `extraSources` above).
    * When adding a new workflow/script, it is tracked by default; only add it here once
    * you've confirmed it can't affect the native binary. When in doubt, leave it tracked.
    */
   ignorePaths: [
+    // The root `.gitignore`, which `@expo/fingerprint` hashes by default (as the
+    // `bareGitIgnore` source). Nothing the native build consumes depends on it. Its only
+    // consumer inside fingerprinting is `resolveProjectWorkflowAsync`, which classifies the
+    // project as bare or managed (`useCNG`) by running `git check-ignore` against the
+    // platform marker files: `android/app/build.gradle`, the Android manifest, and the Xcode
+    // `project.pbxproj`. `git check-ignore` never reports a *tracked* file as ignored, and
+    // all three markers are committed here, so that classification is pinned to `generic`
+    // regardless of this file's contents — verified by adding `ios/MetaMask.xcodeproj/` and
+    // both Android markers to `.gitignore` and observing an unchanged fingerprint. Hashing
+    // the text therefore adds no signal, and only means edits that cannot reach the native
+    // binary (new tooling/log/build-artifact patterns) invalidate every cached native build.
+    '.gitignore',
+
     // .github/scripts own tooling/deps - irrelevant to any workflow's runtime behavior.
     '.github/scripts/node_modules/**',
     '.github/scripts/.yarn/**',
@@ -161,6 +175,14 @@ const config = {
     '.github/scripts/e2e-smart-selection.mjs',
     '.github/scripts/e2e-split-tags-shards.mjs',
 
+    // E2E platform-gating logic. Its outputs (`native_build_needed`,
+    // `ios_e2e_needed`, `android_e2e_needed`, `skip_e2e`, ...) only decide *whether*
+    // build/test jobs run - none of them is a build parameter, so no change here can
+    // alter what gets compiled.
+    '.github/scripts/compute-e2e-platform-flags.cjs',
+    '.github/scripts/compute-e2e-platform-flags.test.ts',
+    '.github/scripts/run-compute-e2e-platform-flags.cjs',
+
     // Note: `.github/scripts/bump-ota-version-constants.sh` is intentionally NOT ignored,
     // since it writes OTA version metadata consumed by the release pipeline.
 
@@ -227,7 +249,6 @@ const config = {
 
     // Notification-only.
     '.github/workflows/prod-build-env-notify.yml',
-    '.github/workflows/publish-slack-release-testing-status.yml',
     '.github/workflows/slack-rc-notification.yml',
 
     // Builds a dev CI container image, not a shipped mobile binary.
@@ -240,16 +261,18 @@ const config = {
     '.github/workflows/run-appium-smoke-tests-android.yml',
     '.github/workflows/run-appium-smoke-tests-ios.yml',
     '.github/workflows/run-e2e-api-specs.yml',
-    '.github/workflows/run-e2e-smoke-tests-android.yml',
-    '.github/workflows/run-e2e-smoke-tests-ios.yml',
     '.github/workflows/run-e2e-workflow.yml',
     '.github/workflows/performance-test-runner.yml',
     '.github/workflows/update-e2e-fixtures.yml',
     '.github/workflows/upload-to-testflight.yml',
     '.github/workflows/runway-ota-resolve-context.yml',
 
-    // Note: `.github/workflows/get-requirements.yml` is intentionally NOT ignored, since
-    // it gates whether native build jobs run at all.
+    // Gating only: every `workflow_call` output it exposes (`native_build_needed`,
+    // `ios_e2e_needed`, `android_e2e_needed`, `skip_e2e`, `run_performance`, ...) is a
+    // boolean or a spec-file list that decides *whether* downstream jobs run. It emits no
+    // build parameter (no `build_type`, no `metamask_environment`), so it cannot change
+    // what gets compiled - only whether a compile is attempted.
+    '.github/workflows/get-requirements.yml',
   ],
 
   /**
diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj
index 375d21c8053b..1bc8c30b3156 100644
--- a/ios/MetaMask.xcodeproj/project.pbxproj
+++ b/ios/MetaMask.xcodeproj/project.pbxproj
@@ -990,7 +990,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6401;
+				CURRENT_PROJECT_VERSION = 6442;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1028,7 +1028,7 @@
 					"${inherited}",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 8.6.0;
+				MARKETING_VERSION = 8.7.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1059,7 +1059,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6401;
+				CURRENT_PROJECT_VERSION = 6442;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1094,7 +1094,7 @@
 					"${inherited}",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 8.6.0;
+				MARKETING_VERSION = 8.7.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1125,7 +1125,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6401;
+				CURRENT_PROJECT_VERSION = 6442;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1163,7 +1163,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 8.6.0;
+				MARKETING_VERSION = 8.7.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1192,7 +1192,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6401;
+				CURRENT_PROJECT_VERSION = 6442;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1227,7 +1227,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 8.6.0;
+				MARKETING_VERSION = 8.7.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
diff --git a/ios/MetaMask/AppDelegate.swift b/ios/MetaMask/AppDelegate.swift
index 7c5a53d148d8..20d559b398f3 100644
--- a/ios/MetaMask/AppDelegate.swift
+++ b/ios/MetaMask/AppDelegate.swift
@@ -27,6 +27,8 @@ class AppDelegate: ExpoAppDelegate {
 
   private var reactNativeDelegate: ExpoReactNativeFactoryDelegate?
   private var reactNativeFactory: RCTReactNativeFactory?
+  private weak var displacedNotificationCenterDelegate: UNUserNotificationCenterDelegate?
+  private var isForwardingNotificationResponse = false
 
   @objc static var braze: Braze?
 
@@ -120,7 +122,7 @@ class AppDelegate: ExpoAppDelegate {
     // Braze (push.automation=true) and Notifee both try to set themselves as delegate
     // during startup; we must win so our willPresent forwards to Firebase and triggers
     // messaging().onMessage() in JS. We reassert on every foreground entry (see below).
-    UNUserNotificationCenter.current().delegate = self
+    claimNotificationCenterDelegate()
 
     return superResult
   }
@@ -131,7 +133,16 @@ class AppDelegate: ExpoAppDelegate {
     // it asynchronously. Notifee tap forwarding is handled explicitly in didReceive
     // (via NotifeeCoreUNUserNotificationCenter.instance()) rather than through Notifee's
     // own delegate chain, so holding this slot does not break Notifee press events.
-    UNUserNotificationCenter.current().delegate = self
+    claimNotificationCenterDelegate()
+  }
+
+  private func claimNotificationCenterDelegate() {
+    let center = UNUserNotificationCenter.current()
+    if let currentDelegate = center.delegate,
+       (currentDelegate as AnyObject) !== self {
+      displacedNotificationCenterDelegate = currentDelegate
+    }
+    center.delegate = self
   }
 
   override func application(
@@ -196,6 +207,13 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
     let userInfo = notification.request.content.userInfo
     // Tell Firebase about the message — this triggers messaging().onMessage() in JS.
     Messaging.messaging().appDidReceiveMessage(userInfo)
+    // Suppress the foreground system banner for wallet_activity: in-app
+    // transaction toasts already cover it. Background/killed delivery is
+    // unaffected (willPresent only runs in the foreground).
+    if (userInfo["notification_type"] as? String) == "wallet_activity" {
+      completionHandler([.badge])
+      return
+    }
     // Show the notification visually in the foreground.
     completionHandler([.sound, .badge, .banner, .list])
   }
@@ -208,6 +226,14 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
   ) {
     let userInfo = response.notification.request.content.userInfo
 
+    // RNFirebase/Notifee may have captured AppDelegate as their original
+    // delegate before we reclaimed the center. Stop that delegate chain when
+    // it returns here, otherwise forwarding would recurse indefinitely.
+    if isForwardingNotificationResponse {
+      completionHandler()
+      return
+    }
+
     // Notifee-created notification: forward to Notifee so onForegroundEvent(PRESS) fires.
     // We own the delegate (see applicationDidBecomeActive), so Notifee never receives this
     // through its own delegate chain — explicit forwarding is required.
@@ -223,6 +249,20 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
       return
     }
 
+    let responseSelector = #selector(
+      UNUserNotificationCenterDelegate.userNotificationCenter(
+        _:didReceive:withCompletionHandler:))
+    if let delegate = displacedNotificationCenterDelegate,
+       delegate.responds(to: responseSelector) {
+      isForwardingNotificationResponse = true
+      delegate.userNotificationCenter?(
+        center,
+        didReceive: response,
+        withCompletionHandler: completionHandler)
+      isForwardingNotificationResponse = false
+      return
+    }
+
     completionHandler()
   }
 }
diff --git a/jest.config.llm-workflow.js b/jest.config.llm-workflow.js
new file mode 100644
index 000000000000..d53dc379c63c
--- /dev/null
+++ b/jest.config.llm-workflow.js
@@ -0,0 +1,21 @@
+/* eslint-disable import-x/no-commonjs */
+
+// Lightweight Jest config for tests/llm-workflow tests.
+//
+// These tests exercise pure Node.js tooling (daemon, prerequisites, capabilities)
+// and do not depend on React Native. Running them under the base react-native
+// preset causes OOM because the coverage collector instruments thousands of app
+// files that are never loaded by these tests.
+
+module.exports = {
+  testEnvironment: 'node',
+  testMatch: ['<rootDir>/tests/llm-workflow/__tests__/**/*.test.ts'],
+  transform: {
+    '^.+\\.[jt]sx?$': ['babel-jest', { configFile: './babel.config.tests.js' }],
+  },
+  transformIgnorePatterns: [
+    'node_modules/(?!(@metamask/client-mcp-core|@metamask/device-mcp)/)',
+  ],
+  collectCoverage: false,
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
+};
diff --git a/locales/languages/de.json b/locales/languages/de.json
index 1e82d933ce80..f3e4bed3d4dc 100644
--- a/locales/languages/de.json
+++ b/locales/languages/de.json
@@ -1527,6 +1527,7 @@
       "size_usd": "Size (USD)",
       "size_percentage": "Ordergröße in Prozent",
       "toggle_size_unit": "Wechsel der Nenngröße",
+      "available_balance": "{{amount}} verfügbar",
       "available_balance_unavailable": "-- verfügbar",
       "est_liquidation": "Gesch. Liquidation",
       "tpsl": "TP / SL",
diff --git a/locales/languages/en.json b/locales/languages/en.json
index 0f09dd486924..33669c87cdd0 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -311,7 +311,7 @@
     "warning_text_2": "removed",
     "warning_text_3": "if you proceed.",
     "warning_text_4": "You can ONLY recover them with your wallet’s Secret Recovery Phrase. MetaMask cannot help you recover it.",
-    "warning_proceed": "Remove wallet & proceed",
+    "warning_proceed": "Remove wallet and proceed",
     "warning_cancel": "Cancel",
     "step1": "Wallet setup",
     "step2": "Create password",
@@ -349,7 +349,7 @@
   "onboarding_success": {
     "title": "Keep your Secret Recovery Phrase safe!",
     "description": "This Secret Recovery Phrase can help you regain access if you ever forget your password or lose access to your login.",
-    "description_bold": "Settings > Security & Privacy.",
+    "description_bold": "Settings > Security and Privacy.",
     "description_continued": "you can keep this phrase safe so you never lose access to your money.",
     "learn_more": "Learn more",
     "learn_how": "Learn how",
@@ -376,7 +376,7 @@
     "remind_later": "We’ll remind you later",
     "remind_later_description": "If you don’t back up your Secret Recovery Phrase, you’ll lose access to your funds if you get locked out of the app or get a new device.",
     "remind_later_description2": "You can back up your wallets or see your Secret Recovery Phrase in",
-    "setting_security_privacy": "Settings > Security & Privacy",
+    "setting_security_privacy": "Settings > Security and Privacy",
     "wallet_ready": "Your wallet is ready!"
   },
   "social_login_ios_user": {
@@ -421,7 +421,7 @@
     "step4": {
       "title": "Main menu",
       "content1": "You can access transaction history, settings, and support from this menu.",
-      "content2": "You can take more actions with your accounts & access MetaMask settings."
+      "content2": "You can take more actions with your accounts and access MetaMask settings."
     },
     "step5": {
       "title": "Explore the browser",
@@ -1310,6 +1310,9 @@
     "mode": {
       "lite": "Lite",
       "pro": "Pro",
+      "selection_title": "Choose how you trade",
+      "lite_description": "One-tap longs or shorts. Simple by design.",
+      "pro_description": "Order book, advanced order types, and leverage.",
       "lite_transition_title": "Lite Mode",
       "pro_transition_title": "Pro Mode",
       "active_pill_accessibility_label": "Currently {{mode}} mode",
@@ -1524,9 +1527,14 @@
     "pro_order_form": {
       "isolated": "Isolated",
       "choose_order_type": "Choose order type",
-      "size_usd": "Size USD",
+      "size_usd": "Size (USD)",
+      "size_unit": "Size ({{unit}})",
+      "size_input_hint": "Enter order size in {{unit}}",
       "size_percentage": "Order size percentage",
+      "size_percentage_unit": "Order size percentage ({{unit}})",
       "toggle_size_unit": "Switch size denomination",
+      "toggle_size_unit_hint": "Switch from {{unit}} to the other size unit",
+      "available_balance": "{{amount}} available",
       "available_balance_unavailable": "-- available",
       "est_liquidation": "Est Liquidation",
       "tpsl": "TP / SL",
@@ -1534,14 +1542,38 @@
       "close_keyboard": "Close keyboard"
     },
     "pro_positions_panel": {
+      "order_history": "Order history",
+      "close_count": "Close ({{count}})",
       "positions": "Positions",
       "positions_with_count": "Positions ({{count}})",
       "orders": "Orders",
       "orders_with_count": "Orders ({{count}})",
       "ticker_only": "{{ticker}} only",
+      "view_market_accessibility": "Switch to the {{symbol}} market",
       "positions_empty": "Your open positions will appear here.",
       "positions_empty_filtered": "No open {{ticker}} positions.",
+      "positions_empty_long": "No long positions.",
+      "positions_empty_short": "No short positions.",
       "orders_empty": "Your open orders will appear here.",
+      "orders_empty_filtered": "No open {{ticker}} orders.",
+      "orders_empty_long": "No long orders.",
+      "orders_empty_short": "No short orders.",
+      "side_filter": {
+        "all_sides": "All sides",
+        "long": "Long",
+        "short": "Short"
+      },
+      "sort": {
+        "position_value": "Position value",
+        "unrealized_pnl": "Unrealized P&L",
+        "funding_rate": "Funding rate",
+        "order_value": "Order value",
+        "size": "Size",
+        "price": "Price",
+        "time": "Time",
+        "settings_accessibility": "Sort positions",
+        "orders_settings_accessibility": "Sort orders"
+      },
       "card": {
         "entry_price": "Entry price",
         "margin": "Margin",
@@ -1562,11 +1594,10 @@
         "reduce_only": "Reduce only",
         "tp_sl": "TP / SL",
         "trigger_condition": "Trigger condition",
-        "take_profit": "Take profit",
-        "stop": "Stop",
-        "open_limit": "Open limit",
-        "close_limit": "Close limit",
-        "cancel": "Cancel"
+        "cancel": "Cancel",
+        "edit": "Edit",
+        "edit_price": "Edit limit price",
+        "edit_size": "Edit size"
       }
     },
     "order": {
@@ -1615,7 +1646,10 @@
         "limit_price_must_be_set_before_configuring_tpsl": "Limit price must be set before configuring TP/SL",
         "only_hyperliquid_usdc": "Only USDC on Hyperliquid is currently supported for payment",
         "limit_price_far_warning": "Limit price is far from current market price",
-        "oi_cap_reached": "Open interest cap reached. New positions cannot be opened at this time."
+        "oi_cap_reached": "Open interest cap reached. New positions cannot be opened at this time.",
+        "reduce_only_no_position": "You need to have an open position in this market to place reduce-only orders",
+        "reduce_only_wrong_side": "Reduce-only orders can only reduce an existing position. Switch to the opposite side.",
+        "reduce_only_too_large": "Reduce only order is larger than your open position"
       },
       "error": {
         "placement_failed": "Order placement failed",
@@ -1642,7 +1676,7 @@
         "short": "Short {{asset}}"
       },
       "tpsl_modal": {
-        "title": "Take profit & stop loss",
+        "title": "Take profit and stop loss",
         "save": "Save",
         "current_price": "Current price: {{price}}",
         "on": "ON",
@@ -1650,6 +1684,11 @@
         "take_profit_helper": "Close position when price reaches this level",
         "stop_loss_helper": "Limit losses by closing position at this price"
       },
+      "size_modal": {
+        "title": "Edit size",
+        "set": "Set",
+        "order_value": "Order value: {{value}}"
+      },
       "limit_price_modal": {
         "title": "Set limit price",
         "set": "Set",
@@ -1730,7 +1769,11 @@
       "order_cancelled_success": "{{detailedOrderType}} order cancelled",
       "pay_with_token_required": "Token selection required",
       "select_token_to_pay_with": "Please select a token to pay with before placing your order",
-      "initializing": "Initializing order..."
+      "initializing": "Initializing order...",
+      "updating_your_order": "Updating your order",
+      "order_updated": "Order updated",
+      "order_update_failed": "Failed to update order",
+      "order_update_failed_subtitle": "Your order is still open at its previous price and size."
     },
     "slippage": {
       "config_title": "Set slippage",
@@ -1849,7 +1892,8 @@
       "margin_available_to_remove": "Margin available to remove",
       "perps_balance": "Perps balance",
       "liquidation_price": "Liquidation price",
-      "liquidation_distance": "Liquidation distance"
+      "liquidation_distance": "Liquidation distance",
+      "exceeds_available": "Amount exceeds available margin"
     },
     "tpsl": {
       "title": "Auto close",
@@ -1897,7 +1941,11 @@
       "order_not_found": "Order not found",
       "clientNotInitialized": "HyperLiquid SDK clients not properly initialized",
       "exchangeClientNotAvailable": "ExchangeClient not available after initialization",
+      "exchangeAccountNotFound": "Add funds to your account before placing an order",
+      "exchangeMultiSigRequired": "This account needs its multi-signature signers to trade",
+      "exchangeInvalidNonce": "Something went wrong. Please try again.",
       "infoClientNotAvailable": "InfoClient not available after initialization",
+      "subscriptionClientNotAvailable": "SubscriptionClient not available after initialization",
       "subscriptionClientNotInitialized": "SubscriptionClient is not initialized",
       "failedToSubscribePosition": "Failed to subscribe to position updates",
       "failedToUnsubscribePosition": "Failed to unsubscribe from position updates",
@@ -1929,7 +1977,18 @@
         "sizePositive": "Size must be a positive number",
         "pricePositive": "Price must be a positive number if provided",
         "unknownCoin": "Unknown coin: {{coin}}",
-        "limitPriceRequired": "Price is required for limit orders"
+        "limitPriceRequired": "Price is required for limit orders",
+        "triggerPriceRequired": "A trigger price is required for stop and take profit orders",
+        "triggerPricePositive": "Trigger price must be a positive number",
+        "triggerPriceNotSupported": "Market and limit orders can't have a trigger price",
+        "triggerTpslUnsupported": "Stop and take profit orders can't carry their own take profit or stop loss",
+        "tpslSizeInvalid": "Take profit and stop loss size must be positive and no larger than the order",
+        "tpslLinkageConflict": "Conflicting take profit and stop loss settings",
+        "tpslLinkageRequired": "Take profit and stop loss must be attached to the order or to the position",
+        "tpslPositionLinkageUnsupported": "Take profit and stop loss can only be attached to a position once the order has filled",
+        "timeInForceNotSupported": "Time in force can only be set on limit orders",
+        "editTriggerUnsupported": "Stop and take profit orders can't be edited. Cancel the order and place a new one.",
+        "editOrderUnverifiable": "This order can no longer be found. Refresh your orders and try again."
       },
       "networkToggleFailed": "Failed to toggle network: {{error}}",
       "accountBalanceFailed": "Failed to get account balance: {{error}}",
@@ -2177,7 +2236,7 @@
         "content": "A flat fee charged by the provider on each withdrawal."
       },
       "tp_sl": {
-        "title": "Take profit & stop loss",
+        "title": "Take profit and stop loss",
         "content": "Take profit (TP) automatically closes your position when you reach your target profit. Stop loss (SL) limits your losses by closing your position if the price moves against you."
       },
       "close_position_you_receive": {
@@ -2339,6 +2398,13 @@
       "error_title": "Failed to cancel orders",
       "error_message": "Failed to cancel {{count}} order(s)"
     },
+    "margin_mode": {
+      "title": "Choose margin mode",
+      "isolated_title": "Isolated",
+      "isolated_description": "Each position uses only its allocated margin. If it's used up, that position liquidates, others are unaffected. You can adjust margin per position.",
+      "cross_title": "Cross",
+      "cross_description": "Your full account balance is shared across all positions. Profits on one can protect another — but a liquidation can draw from your entire balance. Coming soon."
+    },
     "crossMargin": {
       "title": "Cross margin not supported",
       "message": "MetaMask Perps only support trading with isolated margin. You need to first close your cross margin position before you can trade on MetaMask.",
@@ -2364,7 +2430,8 @@
       "past_hour": "Past hour",
       "past_24_hours": "Past 24 hours",
       "time": "Time",
-      "apply": "Apply"
+      "apply": "Apply",
+      "clear": "Clear"
     },
     "provider_selector": {
       "title": "Select Provider"
@@ -2487,6 +2554,7 @@
       "size": "Size",
       "total": "Total",
       "spread": "Spread",
+      "spread_value": "Spread {{value}}",
       "loading": "Loading order book...",
       "no_data": "No order book data available",
       "error": "Failed to load order book",
@@ -2573,9 +2641,14 @@
       "market_list": "Browse markets",
       "perp_pair": "{{ticker}}-{{collateral}} perp",
       "back": "Back",
-      "wallet": "Perps home",
+      "wallet": "Perps balance",
       "add_to_watchlist": "Add to watchlist",
       "remove_from_watchlist": "Remove from watchlist"
+    },
+    "balance_bottom_sheet": {
+      "close_button": "Close",
+      "history_button": "View activity",
+      "available": "Available"
     }
   },
   "market_insights": {
@@ -2629,47 +2702,9 @@
       "events_in_total": "{{count}} events in total",
       "events_in_total_overflow": "{{count}}+ markets in total",
       "props_pill": "Props",
-      "championship_unavailable": "No championship market to show yet.",
-      "mens_world_cup_title": "Men's World Cup",
-      "mens_world_cup_events": "{{count}} men's world cup events",
-      "mens_world_cup_events_overflow": "{{count}}+ men's world cup events",
-      "winner_unavailable": "No World Cup markets to show yet."
+      "championship_unavailable": "No championship market to show yet."
     },
     "world_cup": {
-      "title": "World Cup",
-      "predictions_title": "World Cup predictions",
-      "banner_title": "World Cup 2026",
-      "banner_description": "Trade every match, every moment.",
-      "hub_banner_title": "$75K up for grabs",
-      "hub_banner_description": "Predict World Cup knockout games to win—join now",
-      "tabs": {
-        "all": "All",
-        "props": "Props",
-        "live": "Live",
-        "games": "Games"
-      },
-      "who_will_win": "Who will win the World Cup?",
-      "stages": {
-        "group_stage": "Group Stage",
-        "round_of_32": "Round of 32",
-        "round_of_16": "Round of 16",
-        "quarterfinals": "Quarter-finals",
-        "semifinals": "Semi-finals",
-        "third_place": "Third Place",
-        "final": "Final",
-        "group_a": "Group A",
-        "group_b": "Group B",
-        "group_c": "Group C",
-        "group_d": "Group D",
-        "group_e": "Group E",
-        "group_f": "Group F",
-        "group_g": "Group G",
-        "group_h": "Group H",
-        "group_i": "Group I",
-        "group_j": "Group J",
-        "group_k": "Group K",
-        "group_l": "Group L"
-      },
       "market_info": {
         "regulation_time_winner": {
           "title": "Regulation time winner"
@@ -3258,6 +3293,7 @@
   },
   "wallet": {
     "title": "Wallet",
+    "search_accessibility_label": "Search",
     "tokens": "Tokens",
     "view_all_nfts": "View all NFTs",
     "view_all_tokens": "View all tokens",
@@ -3404,7 +3440,8 @@
       "view_on_portfolio": "View on Portfolio",
       "view_on_block": "View on block explorer",
       "token_details": "Token details",
-      "remove_token": "Remove token"
+      "remove_token": "Remove token",
+      "deactivate_asset": "Deactivate asset"
     }
   },
   "nft_details": {
@@ -3446,8 +3483,8 @@
     "perps_filter": {
       "title": "Perps",
       "trades": "Trades",
-      "order": "Order",
-      "fundings": "Fundings",
+      "order": "Orders",
+      "fundings": "Funding payments",
       "deposits": "Deposits"
     },
     "empty_state": {
@@ -3568,7 +3605,7 @@
     "description_content_1_legacy": "MetaMask would like to gather usage data to better understand how our users interact with MetaMask. This data will be used to provide the service, which includes improving the service based on your use.",
     "description_content_2_legacy": "MetaMask will...",
     "action_description_1_legacy": "Always allow you to opt-out via Settings",
-    "action_description_2_legacy": "Send anonymized click & pageview events",
+    "action_description_2_legacy": "Send anonymized click and pageview events",
     "action_description_3_legacy": "collect information we don’t need to provide the service (such as keys, addresses, transaction hashes, or balances)",
     "action_description_4_legacy": "collect your full IP address*",
     "action_description_5_legacy": "sell data. Ever!",
@@ -3907,9 +3944,9 @@
     "privacy_mode": "Privacy mode",
     "privacy_mode_desc": "Websites must request access to view your account information.",
     "nft_opensea_mode": "Enable OpenSea API",
-    "nft_opensea_desc": "Displaying NFT media & data may expose your IP address to centralized servers. Use OpenSea's API to fetch NFT data. NFT auto-detection relies on OpenSea's API, and will not be available when this is turned off. Enabling NFT auto-detection can expose you to fake NFTs being sent to your wallet by anyone, and can allow an attacker to learn your IP address from your Ethereum address.",
+    "nft_opensea_desc": "Displaying NFT media and data may expose your IP address to centralized servers. Use OpenSea's API to fetch NFT data. NFT auto-detection relies on OpenSea's API, and will not be available when this is turned off. Enabling NFT auto-detection can expose you to fake NFTs being sent to your wallet by anyone, and can allow an attacker to learn your IP address from your Ethereum address.",
     "nft_autodetect_mode": "Autodetect NFTs",
-    "nft_autodetect_desc": "Displaying NFT media & data may expose your IP address to centralized servers. Third-party APIs (like OpenSea) are used to detect NFTs in your wallet. This exposes your account address with those services. Leave this disabled if you don't want the app to pull data from those services.",
+    "nft_autodetect_desc": "Displaying NFT media and data may expose your IP address to centralized servers. Third-party APIs (like OpenSea) are used to detect NFTs in your wallet. This exposes your account address with those services. Leave this disabled if you don't want the app to pull data from those services.",
     "show_fiat_on_testnets": "Show conversion on test networks",
     "show_fiat_on_testnets_desc": "Select this to show fiat conversion on test networks.",
     "show_fiat_on_testnets_modal_title": "Be careful",
@@ -3942,15 +3979,15 @@
       "deselect_all": "Deselect all",
       "select_accounts_title": "Accounts",
       "select_accounts_desc": "Choose which accounts you'd like to get notifications for.",
-      "wallet_activity_title": "Wallet Activity",
-      "wallet_activity_desc": "Buy, sells, transfers, swaps and rewards",
-      "perps_title": "Trading Activity",
+      "wallet_activity_title": "Wallet activity",
+      "wallet_activity_desc": "Buy, sells, transfers, swaps",
+      "perps_title": "Trading activity",
       "perps_desc": "Perps position changes, liquidations, funding rates, and margin updates",
       "agentic_cli_title": "Agentic CLI",
       "agentic_cli_desc": "CLI connection requests, approvals, and session updates for Agentic",
-      "social_ai_title": "Trading Signals",
-      "social_ai_desc": "Updates from traders and assets you follow, plus currated market news",
-      "marketing_title": "Updates and Rewards",
+      "social_ai_title": "Trading signals",
+      "social_ai_desc": "Updates from traders and assets you follow, plus curated market news",
+      "marketing_title": "Updates and rewards",
       "marketing_desc": "Product updates, feature announcements, and new releases",
       "marketing_disclaimer": "By turning this on, you agree to receive product news and marketing updates from MetaMask.",
       "customize_session_title": "Customize your notifications",
@@ -3967,7 +4004,7 @@
       "snaps_desc": "New features and updates",
       "products_announcements_title": "Product announcements",
       "products_announcements_desc": "New products and features",
-      "price_alerts_title": "Price Alerts",
+      "price_alerts_title": "Price alerts",
       "price_alerts_desc": "Get notified based on the alerts you've set for a token's price"
     },
     "contacts_title": "Contacts",
@@ -4125,8 +4162,8 @@
     "manage_sdk_connections_title": "Manage connections",
     "manage_sdk_connections_text": "Remove connections to sites and/or MetaMask SDK.",
     "fiat_on_ramp": {
-      "title": "Buy & sell crypto",
-      "description": "Region & more...",
+      "title": "Buy and sell crypto",
+      "description": "Region and more...",
       "current_region": "Current region",
       "reset_region": "Reset region",
       "change_region": "Change region",
@@ -4200,7 +4237,7 @@
         "quote_tag_most_reliable": "Most reliable",
         "quote_unknown_provider": "Unknown provider",
         "start_headless_buy": "Start headless buy",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "Replace and start headless buy",
         "start_headless_buy_disabled_hint": "Enter a valid amount to enable",
         "start_headless_buy_pending": "Headless session active — open BuildQuote",
         "cancel_headless_buy": "Cancel headless session",
@@ -5615,6 +5652,11 @@
     "enable_device_passcode_ios": "Unlock with device passcode?",
     "enable_device_passcode_android": "Unlock with device PIN?"
   },
+  "balance_breakdown": {
+    "allocation": "Allocation",
+    "hide_balance": "Hide total balance",
+    "show_balance": "Show total balance"
+  },
   "authentication": {
     "auth_prompt_desc": "Please authenticate in order to use MetaMask",
     "labels": {
@@ -6278,7 +6320,7 @@
     "debit_credit_card_required": "Debit or credit cards. Apple Cash is not supported.",
     "select_card_country": "Select the country where your card is registered (not where you are located).",
     "search_country": "Search for a country",
-    "wyre_countries": "55+ countries, fees & limits vary",
+    "wyre_countries": "55+ countries, fees and limits vary",
     "wyre_fees_us": "2.9% + $0.30 + gas fees ($5 minimum fee)",
     "wyre_fees_us_fee": "Fee of 2.9% + $0.30 + gas ($5 minimum)",
     "wyre_fees_outside_us_fee": "Fee of 3.9% + $0.30 + gas ($5 minimum)",
@@ -7172,11 +7214,11 @@
     "bluetooth_off": "Bluetooth is off",
     "bluetooth_off_message": "Please turn on Bluetooth for your device",
     "bluetooth_access_blocked": "Ledger needs Bluetooth access to pair with your mobile device.",
-    "bluetooth_access_blocked_message": "If you want to pair your Ledger device using Bluetooth, enable it in Settings & try again.",
+    "bluetooth_access_blocked_message": "If you want to pair your Ledger device using Bluetooth, enable it in Settings and try again.",
     "location_access_blocked": "MetaMask needs location access permission to pair with your ledger.",
-    "location_access_blocked_message": "If you want to pair your Ledger device using Bluetooth, you’ll need to enable location access in Settings & try again.",
+    "location_access_blocked_message": "If you want to pair your Ledger device using Bluetooth, you’ll need to enable location access in Settings and try again.",
     "nearbyDevices_access_blocked": "MetaMask needs nearby devices permission to pair with your Ledger.",
-    "nearbyDevices_access_blocked_message": "If you want to pair your Ledger device using Bluetooth, you’ll need to enable nearby devices access in Settings & try again.",
+    "nearbyDevices_access_blocked_message": "If you want to pair your Ledger device using Bluetooth, you’ll need to enable nearby devices access in Settings and try again.",
     "bluetooth_scanning_error": "Error while scanning the device",
     "bluetooth_scanning_error_message": "Please make sure your device is unlocked and the Ethereum app is running",
     "bluetooth_connection_failed": "Bluetooth connection failed",
@@ -7593,7 +7635,7 @@
     },
     "asset_overview": {
       "cta": {
-        "earn_apy": "{{apy}}% APY",
+        "earn_apy": "Get {{apy}}% APY",
         "start_earning": "Start earning",
         "current_apy_disclaimer": "Current APY, variable and not guaranteed."
       },
@@ -7656,6 +7698,7 @@
       "link_pending_title": "Linking your card",
       "link_success_title": "Your card is ready to use",
       "link_error": "Something went wrong linking your card",
+      "link_error_different_card": "This wallet is already linked to a different MetaMask Card",
       "unlink_pending_title": "Unlinking your card",
       "unlink_success_title": "Your card was unlinked",
       "unlink_error": "Something went wrong unlinking your card",
@@ -8380,7 +8423,7 @@
     "continue": "Continue",
     "confirm_bridge": "Bridge",
     "confirm_swap": "Swap",
-    "terms_and_conditions": "Terms & Conditions",
+    "terms_and_conditions": "Terms and Conditions",
     "select_token": "Select token",
     "batch_sell_transaction_label": "Batch sell",
     "batch_sell_select_title": "Select up to 5 tokens",
@@ -9000,7 +9043,9 @@
       "sign_up": {
         "title": "Let's get started",
         "description": "Create an account with Crypto Life (CL) to set up your MetaMask Card. MetaMask does not see or store your personal data.",
+        "description_immersve": "We need a few details to set up your card.",
         "i_already_have_an_account": "I already have a MetaMask Card",
+        "i_already_have_an_account_immersve": "I already have an account",
         "email_label": "Email address",
         "password_label": "New password for MetaMask Card",
         "password_description": "Different from your MetaMask app unlock password. Must be at least 15 characters long.",
@@ -9011,9 +9056,14 @@
         "join_waitlist": "Join waitlist",
         "country_not_available": "Card sign-up isn't available in your country yet.",
         "account_label": "Account",
+        "account_label_immersve": "Card account",
         "account_description": "Your MetaMask Card will be associated with this account.",
+        "account_description_immersve": "Card purchases will be charged to this account.",
         "account_exists_toast": "You already have a card account.",
-        "card_program_label": "Card program (testing)"
+        "clickwrap_prefix": "By pressing \"Next\", you accept Immersve's ",
+        "clickwrap_and": " and ",
+        "clickwrap_suffix": ".",
+        "legal_docs_error": "Unable to load legal documents."
       },
       "confirm_email": {
         "title": "Confirm your email",
@@ -9150,7 +9200,7 @@
         "coinme_terms_consent_2": "Coinme Terms of Service",
         "coinme_terms_consent_3": ".",
         "crb_consent_1": "I agree with Cross River Bank ",
-        "crb_consent_2": "Terms & Conditions",
+        "crb_consent_2": "Terms and Conditions",
         "crb_consent_3": ", ",
         "crb_consent_4": "Account Opening Disclosures",
         "crb_consent_5": ", ",
@@ -9316,6 +9366,7 @@
         "travel_title": "MetaMask Travel",
         "travel_description": "Book hotels with up to 70% discounts",
         "card_tos_title": "Terms and conditions",
+        "legal_docs_error": "Unable to load legal documents.",
         "order_metal_card": "Metal Card",
         "order_metal_card_description": "Order your physical Metal Card now",
         "cashback": "{{cashbackPercentage}}% mUSD Back",
@@ -9483,7 +9534,8 @@
         "timeout_error": "Request timed out. Please check your connection and try again.",
         "server_error": "Server error. Please try again later.",
         "configuration_error": "Service is temporarily unavailable. Please try again later.",
-        "forbidden_error": "This action isn't available for your account."
+        "forbidden_error": "This action isn't available for your account.",
+        "money_account_linked_to_different_card": "This wallet is already linked to a different MetaMask Card. Unlink it from that card before linking it here."
       }
     },
     "card_forgot_password": {
@@ -10337,6 +10389,7 @@
     "convert_again": "Convert again",
     "wrap_again": "Wrap again",
     "unwrap_again": "Unwrap again",
+    "lend_again": "Lend again",
     "transaction_pending": "Transaction pending",
     "likely_to_confirm_in": "Likely to confirm in",
     "confirm_time_estimate": "< 30 sec",
@@ -10360,26 +10413,26 @@
       "description": "Return to the app to continue."
     },
     "show_cli_link_success": {
-      "title": "MetaMask Agent CLI link successful",
+      "title": "Agent CLI successfully linked",
       "description": "Return to the CLI to continue."
     },
     "push_nudge": {
-      "title": "Turn on notifications",
-      "description": "Get alerts for transactions from your CLI session.",
-      "turn_on_button": "Turn on",
-      "loading_title": "Turning on notifications",
-      "loading_description": "Give us a moment while we set things up.",
-      "enable_error": "Couldn't turn on notifications. Try again from Settings."
+      "title": "Never miss a transaction",
+      "description": "Get real-time alerts to review and approve transactions from your CLI session.",
+      "turn_on_button": "Enable notifications",
+      "preview_title": "Transaction request",
+      "preview_message": "Your agent needs approval on a new limit.",
+      "preview_timestamp": "now"
     },
     "show_otp": {
       "title": "Enter this code",
       "description": "Enter {{otp}} in {{dappName}} to finish connecting. This code expires in {{seconds}} seconds.",
       "modal_title": "Link MetaMask Agent CLI",
       "modal_description": "Pair MetaMask Mobile with your MetaMask Agent CLI.",
-      "code_label": "ENTER THIS CODE IN THE CLI",
+      "code_label": "ENTER CODE IN TERMINAL",
       "expires_in": "Expires in {{time}}",
       "expired": "Code expired",
-      "security_notice": "Securing the connection first. You'll authorize CLI access in the next step"
+      "security_notice": "Securing the connection"
     },
     "show_not_found": {
       "title": "Connection Not Found",
@@ -10445,7 +10498,7 @@
     "low_to_high": "Low to high",
     "apply": "Apply",
     "search_placeholder": "Search tokens, markets and URLs",
-    "quick_trade": "Quick Buy & Sell",
+    "quick_trade": "Quick Buy and Sell",
     "cancel": "Cancel",
     "perps": "Perps",
     "rwa_perps_section": "Perps",
@@ -10558,6 +10611,7 @@
       "bluetooth_connection_failed": "The connection to your device failed. Please try again",
       "camera_permission_denied": "Camera permission is required to scan QR codes. Please enable it in your device settings",
       "not_supported": "This operation is not supported",
+      "only_v4_supported": "Your {{device}} can only sign version 4 (V4) typed data. This site requested an older signature type that isn't supported",
       "unknown_error": "Make sure your {{device}} is set up with the Secret Recovery Phrase or passphrase for this account"
     },
     "error": {
@@ -10581,6 +10635,7 @@
       "nearby_devices_permission_denied": "Nearby Devices Permission Required",
       "scan_failed": "Scan Failed",
       "camera_permission_denied": "Camera Permission Required",
+      "unsupported_signature": "Signature not supported",
       "something_went_wrong": "Something went wrong"
     },
     "qr_scan_errors": {
@@ -10701,5 +10756,19 @@
     "empty_add_tokens_cta": "Add {{count}} token",
     "empty_add_tokens_cta_plural": "Add {{count}} tokens",
     "search_placeholder": "Search for any asset to add"
+  },
+  "asset_spendable_balance": {
+    "spendable": "Spendable",
+    "base_reserved": "Reserved (locked)",
+    "fiat_value": "Value",
+    "total_balance": "Total balance"
+  },
+  "asset_activation": {
+    "activate": "Activate",
+    "activate_description": "Activate {{symbol}} on {{chainName}} to get started.",
+    "inactive": "Inactive",
+    "activate_error": "Something went wrong while adding this trustline. Try again.",
+    "deactivate_error": "Something went wrong while removing this trustline. Try again.",
+    "deactivate_error_non_zero_balance_stellar": "You still have {{balance}} {{symbol}} in this wallet. You must send or swap it all before deactivating this asset on Stellar."
   }
 }
diff --git a/locales/languages/id.json b/locales/languages/id.json
index 550a71e319d6..85e0d62c05a6 100644
--- a/locales/languages/id.json
+++ b/locales/languages/id.json
@@ -1527,6 +1527,7 @@
       "size_usd": "Size (USD)",
       "size_percentage": "Persentase ukuran order",
       "toggle_size_unit": "Ubah ukuran denominasi",
+      "available_balance": "{{amount}} tersedia",
       "available_balance_unavailable": "-- tersedia",
       "est_liquidation": "Estimasi Likuidasi",
       "tpsl": "TP/SL",
diff --git a/locales/languages/tl.json b/locales/languages/tl.json
index 0b963ed83c29..47f4f18bf6d8 100644
--- a/locales/languages/tl.json
+++ b/locales/languages/tl.json
@@ -1527,6 +1527,7 @@
       "size_usd": "Size (USD)",
       "size_percentage": "Porsiyento ng laki ng order",
       "toggle_size_unit": "Palitan ang laki ng denominasyon",
+      "available_balance": "{{amount}} available",
       "available_balance_unavailable": "-- available",
       "est_liquidation": "Tinatayang Liquidation",
       "tpsl": "TP / SL",
diff --git a/locales/languages/tr.json b/locales/languages/tr.json
index 2d6c491d59f6..5659847cb153 100644
--- a/locales/languages/tr.json
+++ b/locales/languages/tr.json
@@ -1527,6 +1527,7 @@
       "size_usd": "Size (USD)",
       "size_percentage": "Emir büyüklüğü yüzdesi",
       "toggle_size_unit": "Büyüklük birimini değiştir",
+      "available_balance": "{{amount}} kullanılabilir",
       "available_balance_unavailable": "-- kullanılabilir",
       "est_liquidation": "Tahmini Likidasyon",
       "tpsl": "KA / ZD",
diff --git a/locales/languages/zh.json b/locales/languages/zh.json
index 5cae33ad3525..18446f11e543 100644
--- a/locales/languages/zh.json
+++ b/locales/languages/zh.json
@@ -1527,6 +1527,7 @@
       "size_usd": "Size (USD)",
       "size_percentage": "订单规模百分比",
       "toggle_size_unit": "切换规模单位",
+      "available_balance": "{{amount}} 可用",
       "available_balance_unavailable": "-- 可用",
       "est_liquidation": "预估清算",
       "tpsl": "止盈/止损",
diff --git a/metro.config.js b/metro.config.js
index d1e833fdff1c..62f2993a1777 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -57,6 +57,20 @@ const {
   wrapWithReanimatedMetroConfig,
 } = require('react-native-reanimated/metro-config');
 
+// Escapes a filesystem path for safe embedding in a RegExp so the mm CLI
+// daemon-artifact blockList entries below only match paths anchored at the
+// worktree root, not the same substring appearing anywhere in node_modules.
+const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+// mm CLI (visual testing) daemon artifacts, anchored to this worktree root.
+// Anchoring prevents an unrelated dependency whose path merely *contains*
+// `.mm-server` or `test-artifacts/` from being silently dropped from the bundle.
+const mmDaemonArtifactBlockList = [
+  new RegExp(`^${escapeRegExp(path.join(__dirname, '.mm-daemon.log'))}$`),
+  new RegExp(`^${escapeRegExp(path.join(__dirname, '.mm-server'))}`),
+  new RegExp(`^${escapeRegExp(path.join(__dirname, 'test-artifacts'))}/`),
+];
+
 // True when the module being resolved was requested from a file inside
 // @metamask/perps-controller. Normalizes separators first so this works on
 // Windows (`\`) too; the surrounding `/` deliberately require a file *inside*
@@ -112,9 +126,33 @@ module.exports = function (baseConfig) {
             ),
           );
 
+      // Isolate Metro transform cache between with-SRP and without-SRP dual
+      // repacks. Expo export:embed forces resetCache=false in CI, so babel
+      // inlines of PREDEFINED_PASSWORD / ADDITIONAL_SRP_* from the first pack
+      // would otherwise be reused from /tmp/metro-cache by the second pack.
+      // Prefer an explicit METRO_TRANSFORM_PROFILE; fall back to presence-only
+      // detection (never put secret values into cacheVersion).
+      const metroTransformProfile =
+        process.env.METRO_TRANSFORM_PROFILE ||
+        (process.env.PREDEFINED_PASSWORD || process.env.ADDITIONAL_SRP_1
+          ? 'with-srp'
+          : 'without-srp');
+
       return wrapWithReanimatedMetroConfig(
         mergeConfig(defaultConfig, {
+          cacheVersion: `${defaultConfig.cacheVersion || '1.0'}:${metroTransformProfile}`,
           resolver: {
+            // Exclude mm CLI daemon artifacts from the file watcher so that
+            // log writes, state updates and test-artifact captures don't
+            // trigger unnecessary Fast Refresh cycles during visual testing.
+            blockList: [
+              ...(Array.isArray(defaultConfig.resolver.blockList)
+                ? defaultConfig.resolver.blockList
+                : defaultConfig.resolver.blockList
+                  ? [defaultConfig.resolver.blockList]
+                  : []),
+              ...mmDaemonArtifactBlockList,
+            ],
             unstable_enablePackageExports: true,
             assetExts: [...assetExts.filter((ext) => ext !== 'svg'), 'riv'],
             sourceExts: [...sourceExts, 'svg', 'cjs', 'mjs'],
diff --git a/mm-client-cli.config.ts b/mm-client-cli.config.ts
new file mode 100644
index 000000000000..7a9584002263
--- /dev/null
+++ b/mm-client-cli.config.ts
@@ -0,0 +1,6 @@
+const config = {
+  daemon: 'tests/llm-workflow/daemon-entry.cjs',
+  runtime: 'tsx',
+};
+
+export default config;
diff --git a/package.json b/package.json
index 88924cbc1685..503a28a8759d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "private": true,
   "repository": {
     "type": "git",
@@ -97,7 +97,9 @@
     "build:ios:pre-flask": "export METAMASK_BUILD_TYPE='flask' && ./scripts/build.sh ios flask --pre",
     "build:attribution": "./scripts/generate-attributions.sh",
     "test": "yarn test:unit",
-    "test:unit": "jest ./app/ ./locales/ ./tests/**/*.test.ts .github/**/*.test.ts ./scripts/**/*.test.ts --testPathIgnorePatterns='.*/tests/smoke/.*\\.spec\\.(ts|tsx|js)$|.*/e2e/.*\\.spec\\.(ts|tsx|js)$|.*\\.integration\\.test\\.(ts|tsx|js|jsx)$|.*\\.view(\\..*)?\\.test\\.(ts|tsx|js|jsx)$'",
+    "test:unit": "jest ./app/ ./locales/ ./tests/**/*.test.ts .github/**/*.test.ts ./scripts/**/*.test.ts --testPathIgnorePatterns='.*/tests/smoke/.*\\.spec\\.(ts|tsx|js)$|.*/e2e/.*\\.spec\\.(ts|tsx|js)$|.*\\.integration\\.test\\.(ts|tsx|js|jsx)$|.*/tests/llm-workflow/.*\\.test\\.(ts|tsx|js)$|.*\\.view(\\..*)?\\.test\\.(ts|tsx|js|jsx)$'",
+    "test:unit:llm-workflow": "jest -c jest.config.llm-workflow.js",
+    "mm:doctor": "tsx tests/llm-workflow/doctor-entry.ts",
     "test:view:base": "jest -c jest.config.view.js --no-watchman --silent",
     "test:view": "yarn test:view:base --coverage=false --testPathPattern='.*\\.view(\\..*)?\\.test\\.(ts|tsx|js|jsx)$'",
     "test:view:one": "yarn test:view:base --verbose --coverage=false --testTimeout=30000",
@@ -111,7 +113,7 @@
     "test:integration:coverage:folder": "sh -c 'yarn test:integration:base --coverage --testPathPattern=\"$1.*\\\\.integration\\\\.test\\\\.(ts|tsx|js|jsx)$\" --collectCoverageFrom=\"$1/**/*.{ts,tsx,js,jsx}\" --coverageReporters=text-summary --coverageReporters=lcov' --",
     "test:integration:ci": "TEST_OS=ios yarn test:integration:coverage --forceExit --silent --coverageReporters=json",
     "test:unit:update": "time jest -u ./app/",
-    "test:api-specs": "detox reset-lock-file && detox test -c ios.sim.apiSpecs",
+    "test:api-specs": "APPIUM_RUN_API_SPECS=1 yarn playwright test --config tests/playwright.smoke-appium.config.ts tests/smoke-appium/api-specs --project ios-smoke",
     "test:e2e:android:main:ci": "HAS_TEST_OVERRIDES='true' NODE_OPTIONS='--experimental-vm-modules' detox test -c android.emu.main.ci --headless",
     "test:e2e:android:flask:ci": "HAS_TEST_OVERRIDES='true' NODE_OPTIONS='--experimental-vm-modules' detox test -c android.emu.flask.ci --headless",
     "test:e2e:ios:main:ci": "HAS_TEST_OVERRIDES='true' NODE_OPTIONS='--experimental-vm-modules' detox test -c ios.sim.main.ci --headless",
@@ -148,6 +150,7 @@
     "appium-smoke:android": "yarn playwright test --config tests/playwright.smoke-appium.config.ts --project android-smoke",
     "appium-smoke:mmconnect:android": "yarn playwright test --config tests/playwright.smoke-appium.config.ts --project android-smoke --grep SmokeMMConnect",
     "appium-smoke:ios": "yarn playwright test --config tests/playwright.smoke-appium.config.ts --project ios-smoke",
+    "appium-smoke:aggregate-timings": "yarn tsx .github/scripts/aggregate-appium-timings.ts",
     "capture-visual-baselines:android": "CAPTURE_BASELINES=true AI_VISUAL_TESTING_ENABLED=true yarn playwright test --project system-android-login-emu --config tests/playwright.system-emulator.config.ts",
     "capture-visual-baselines:ios": "CAPTURE_BASELINES=true AI_VISUAL_TESTING_ENABLED=true yarn playwright test --project system-ios-login-sim --config tests/playwright.system-emulator.config.ts",
     "test:depcheck": "yarn depcheck",
@@ -183,6 +186,7 @@
   },
   "resolutions": {
     "@metamask/network-controller": "34.0.0",
+    "@metamask/seedless-onboarding-controller": "10.1.1",
     "@react-native-community/viewpager": "patch:@react-native-community/viewpager@npm%3A3.3.0#~/.yarn/patches/@react-native-community-viewpager-npm-3.3.0.patch",
     "@solana-mobile/mobile-wallet-adapter-protocol": "^2.2.5",
     "@appium/schema/json-schema": "^0.4.0",
@@ -256,7 +260,7 @@
     "@metamask/app-metadata-controller": "^2.0.0",
     "@metamask/approval-controller": "^9.0.0",
     "@metamask/assets-controller": "^11.3.0",
-    "@metamask/assets-controllers": "^110.0.1",
+    "@metamask/assets-controllers": "^111.0.0",
     "@metamask/authenticated-user-storage": "^3.0.1",
     "@metamask/base-controller": "^9.0.1",
     "@metamask/bitcoin-wallet-snap": "^1.14.2",
@@ -274,7 +278,7 @@
     "@metamask/core-backend": "^8.0.0",
     "@metamask/delegation-controller": "^3.0.2",
     "@metamask/delegation-deployments": "^1.0.0",
-    "@metamask/design-system-react-native": "^0.38.1",
+    "@metamask/design-system-react-native": "^0.39.0",
     "@metamask/design-system-twrnc-preset": "^0.8.0",
     "@metamask/design-tokens": "^8.7.0",
     "@metamask/earn-controller": "^12.1.0",
@@ -317,6 +321,7 @@
     "@metamask/money-account-balance-service": "^2.4.0",
     "@metamask/money-account-controller": "^0.2.0",
     "@metamask/money-account-upgrade-controller": "^3.0.0",
+    "@metamask/money-account-utils": "^1.0.0",
     "@metamask/multichain-account-service": "^13.0.0",
     "@metamask/multichain-api-client": "^0.11.0",
     "@metamask/multichain-api-middleware": "^4.0.1",
@@ -327,14 +332,14 @@
     "@metamask/network-enablement-controller": "patch:@metamask/network-enablement-controller@npm%3A5.4.1#~/.yarn/patches/@metamask-network-enablement-controller-npm-5.4.1-020a82a308.patch",
     "@metamask/notification-services-controller": "^26.0.0",
     "@metamask/permission-controller": "^13.1.1",
-    "@metamask/perps-controller": "^10.0.0",
-    "@metamask/phishing-controller": "^17.3.0",
+    "@metamask/perps-controller": "^11.0.0",
+    "@metamask/phishing-controller": "^17.3.1",
     "@metamask/post-message-stream": "^10.0.0",
     "@metamask/preferences-controller": "^23.0.0",
     "@metamask/preinstalled-example-snap": "^0.8.1",
-    "@metamask/profile-metrics-controller": "^4.0.1",
-    "@metamask/profile-sync-controller": "^28.3.0",
-    "@metamask/ramps-controller": "^18.0.0",
+    "@metamask/profile-metrics-controller": "^4.0.3",
+    "@metamask/profile-sync-controller": "^29.0.0",
+    "@metamask/ramps-controller": "^19.0.0",
     "@metamask/react-data-query": "^0.2.2",
     "@metamask/react-native-acm": "patch:@metamask/react-native-acm@npm%3A1.2.0#~/.yarn/patches/@metamask-react-native-acm-npm-1.2.0-944bf863eb.patch",
     "@metamask/react-native-actionsheet": "2.4.2",
@@ -347,7 +352,7 @@
     "@metamask/sample-controllers": "^3.0.0",
     "@metamask/scure-bip39": "^2.1.0",
     "@metamask/sdk-communication-layer": "0.33.1",
-    "@metamask/seedless-onboarding-controller": "^10.1.0",
+    "@metamask/seedless-onboarding-controller": "^10.1.1",
     "@metamask/selected-network-controller": "^26.1.4",
     "@metamask/sentinel-api-service": "^1.0.0",
     "@metamask/signature-controller": "^39.2.0",
@@ -595,6 +600,8 @@
     "@metamask/browser-passworder": "^5.0.0",
     "@metamask/browser-playground": "0.8.1",
     "@metamask/build-utils": "^3.0.0",
+    "@metamask/client-mcp-core": "^0.8.0",
+    "@metamask/device-mcp": "^0.3.0",
     "@metamask/eslint-config-typescript": "^13.0.0",
     "@metamask/eslint-plugin-design-tokens": "^1.0.0",
     "@metamask/foundryup": "1.0.0",
@@ -607,7 +614,9 @@
     "@metamask/test-dapp-bitcoin": "^0.2.0",
     "@metamask/test-dapp-multichain": "^0.17.1",
     "@metamask/test-dapp-solana": "^0.3.0",
+    "@metamask/tooling-insight": "^1.0.0",
     "@octokit/rest": "^21.0.0",
+    "@open-rpc/meta-schema": "^1.14.9",
     "@open-rpc/mock-server": "^1.7.5",
     "@open-rpc/schema-utils-js": "^1.16.2",
     "@open-rpc/test-coverage": "^2.2.2",
diff --git a/scripts/create-release-pr.sh b/scripts/create-release-pr.sh
index 3a4f021ba829..d09b6e61fe85 100755
--- a/scripts/create-release-pr.sh
+++ b/scripts/create-release-pr.sh
@@ -6,7 +6,6 @@ set -o pipefail
 
 PREVIOUS_VERSION="${1}"
 NEW_VERSION="${2}"
-NEW_VERSION_NUMBER="${3}"
 RELEASE_BRANCH_PREFIX="release/"
 
 if [[ -z $NEW_VERSION ]]; then
@@ -49,16 +48,15 @@ git checkout "${RELEASE_BRANCH_NAME}"
 echo "Release Branch Checked Out"
 
 echo "Running version update scripts.."
-# Bump versions for the release
+# Bump semver for the release (build numbers are applied at build time)
 ./scripts/set-semvar-version.sh "${NEW_VERSION}"
-./scripts/set-build-version.sh "${NEW_VERSION_NUMBER}"
 
 echo "Adding and committing changes.."
 # Track our changes
 git add package.json android/app/build.gradle ios/MetaMask.xcodeproj/project.pbxproj
 
 # Generate a commit
-git commit -m "bump semvar version to ${NEW_VERSION} && build version to ${NEW_VERSION_NUMBER}"
+git commit -m "bump semvar version to ${NEW_VERSION}"
 
 echo "Pushing changes to the remote.."
 git push --set-upstream origin "${RELEASE_BRANCH_NAME}"
diff --git a/scripts/lib/download-gha-expo-dev-build.sh b/scripts/lib/download-gha-expo-dev-build.sh
index c024061414d0..2e7e62ed06f0 100755
--- a/scripts/lib/download-gha-expo-dev-build.sh
+++ b/scripts/lib/download-gha-expo-dev-build.sh
@@ -8,6 +8,8 @@ readonly IOS_SIMULATOR_ARTIFACT_NAME="ios-app-${EXPO_DEV_BUILD_NAME}"
 readonly ANDROID_APK_ARTIFACT_NAME="android-apk-${EXPO_DEV_BUILD_NAME}"
 readonly IOS_DEVICE_IPA_ARTIFACT_NAME="ios-ipa-${EXPO_DEV_BUILD_NAME}"
 readonly DEFAULT_GITHUB_REPO="MetaMask/metamask-mobile"
+# Upper bound on producing-run verification calls in find_latest_run_with_artifact.
+readonly MAX_CANDIDATE_RUNS=10
 
 export GH_PAGER=cat
 
@@ -48,38 +50,153 @@ validate_numeric_run_id() {
   fi
 }
 
+# On an HTTP error `gh api` exits non-zero AND writes the raw JSON error body to STDOUT
+# (CRLF-terminated), so "empty output" never means "no result" here: a 401 hands the caller
+# a `{` line that a downstream parser happily accepts as data. Every call below must
+# therefore branch on the exit status rather than on the output.
+#
+# Runs `gh api "$@"` and returns 0 on success, 1 on a failed request. Results land in the
+# globals GH_API_OUT (stdout) and GH_API_ERROR (stderr) rather than on this function's own
+# stdout: callers must NOT wrap it in `$(...)`, because a command substitution runs in a
+# subshell and the globals would not survive it. On failure GH_API_OUT is cleared, so no
+# fragment of an error body can leak into a digest, a size, or a run id.
+GH_API_OUT=''
+GH_API_ERROR=''
+gh_api_capture() {
+  local err_file
+  local status=0
+
+  err_file="$(mktemp)"
+  GH_API_OUT="$(gh api "$@" 2>"$err_file")" || status=$?
+  GH_API_ERROR="$(cat "$err_file")"
+  rm -f "$err_file"
+
+  if ((status != 0)); then
+    GH_API_OUT=''
+    return 1
+  fi
+}
+
+report_gh_api_failure() {
+  echo -e "${RED}❌ $1${NC}" >&2
+  if [[ -n "$GH_API_ERROR" ]]; then
+    printf '%s\n' "$GH_API_ERROR" >&2
+  fi
+}
+
+# Exit codes: 0 = artifact present, 1 = verified absent, 2 = could not determine.
 run_has_artifact() {
   local run_id="$1"
   local artifact_name="$2"
-  gh api "repos/${GITHUB_REPO}/actions/runs/${run_id}/artifacts" \
+
+  if ! gh_api_capture "repos/${GITHUB_REPO}/actions/runs/${run_id}/artifacts" \
     --paginate \
-    --jq ".artifacts[] | select(.expired == false and .name == \"${artifact_name}\") | .name" \
-    | grep -q .
+    --jq ".artifacts[] | select(.expired == false and .name == \"${artifact_name}\") | .name"; then
+    report_gh_api_failure "Failed to list artifacts for run ${run_id}"
+    return 2
+  fi
+
+  [[ -n "$GH_API_OUT" ]]
 }
 
+# Artifact metadata carries only `workflow_run.{id,head_branch,head_sha}` — not the
+# producing workflow nor its conclusion — so matching on artifact name and branch alone
+# would also accept artifacts from an in-progress or failed run, or from a direct
+# `build.yml` dispatch that uploaded just one platform of a half-finished matrix. Re-check
+# the producing run so lookups stay restricted to completed, successful expo-dev-build.yml
+# runs (the guarantee the previous `gh run list --status=success` path provided).
+#
+# Exit codes: 0 = verified good, 1 = verified not a match, 2 = could not determine. The
+# caller must not collapse 2 into 1: reading an auth, rate-limit, or network error as "bad
+# run" would walk past a live artifact and then report it as expired.
+run_is_successful_expo_dev_build() {
+  local run_id="$1"
+
+  if ! gh_api_capture "repos/${GITHUB_REPO}/actions/runs/${run_id}" \
+    --jq '"\(.status)|\(.conclusion)|\(.path)"'; then
+    # A deleted run is genuinely not a match; every other failure is indeterminate.
+    if [[ "$GH_API_ERROR" == *"HTTP 404"* ]]; then
+      return 1
+    fi
+    report_gh_api_failure "Failed to verify run ${run_id}"
+    return 2
+  fi
+
+  [[ "$GH_API_OUT" == "completed|success|.github/workflows/${EXPO_DEV_WORKFLOW_FILE}" ]]
+}
+
+# expo-dev-build.yml now only builds when the @expo/fingerprint gate key changed (see
+# resolve-dev-build job), skipping every other push to main. That means the run holding
+# the latest artifact can sit arbitrarily far back in the run history, so walking the N
+# most recent `gh run list` entries (the old approach) would routinely miss it. Query the
+# artifact by its exact name instead — immune to however many runs were skipped in between
+# — and read the producing run id straight off the artifact metadata.
 find_latest_run_with_artifact() {
   local artifact_name="$1"
   local branch="$2"
-  local run_id
-
-  while IFS= read -r run_id; do
-    [[ -z "$run_id" ]] && continue
-    if run_has_artifact "$run_id" "$artifact_name"; then
-      echo "$run_id"
-      return 0
+  local candidate_run_ids
+  local candidate
+  local checked=0
+  local matches
+  local verify_status
+
+  # `--paginate --jq` runs the filter once per page, so a naive sort_by/first would only
+  # reduce within a page rather than across all of them. Emit one "created_at|run_id"
+  # line per matching artifact across every page instead, then reduce afterwards.
+  if ! gh_api_capture "repos/${GITHUB_REPO}/actions/artifacts?name=${artifact_name}&per_page=100" \
+    --paginate \
+    --jq ".artifacts[] | select(.expired == false and .workflow_run.head_branch == \"${branch}\") | \"\(.created_at)|\(.workflow_run.id)\""; then
+    # Distinguish a failed API call (auth, rate limit, network) from "no such artifact",
+    # which would otherwise send the reader chasing the wrong problem entirely.
+    report_gh_api_failure "Failed to query GitHub Actions artifacts for \"${artifact_name}\""
+    return 1
+  fi
+  # Copy out before the verification loop below reuses the globals.
+  matches="$GH_API_OUT"
+
+  # ISO 8601 timestamps are fixed-width, so a plain reverse string sort puts the newest
+  # artifact first. LC_ALL=C keeps that true regardless of the caller's locale.
+  #
+  # `awk` rather than `head`: head exits after its last wanted line, which can leave sort
+  # writing into a closed pipe (exit 141) and, under the callers' `set -o pipefail`, abort
+  # the whole script once the artifact list outgrows the pipe buffer. awk drains the
+  # stream instead.
+  candidate_run_ids="$(printf '%s\n' "$matches" | LC_ALL=C sort -r | awk -F'|' '{ print $2 }')"
+
+  # Newest first, accept the first candidate whose producing run checks out. In practice
+  # that is the first one; the loop only walks further when a build failed or is still
+  # running, and stops at MAX_CANDIDATE_RUNS so a broken streak can't fan out API calls.
+  while IFS= read -r candidate; do
+    [[ -z "$candidate" || "$candidate" == "null" ]] && continue
+    if (( checked >= MAX_CANDIDATE_RUNS )); then
+      echo -e "${YELLOW}Stopped after checking ${MAX_CANDIDATE_RUNS} candidate runs for \"${artifact_name}\"; pass --run <id> to target a specific run.${NC}" >&2
+      break
     fi
-  done < <(
-    gh run list \
-      --repo "$GITHUB_REPO" \
-      --workflow="$EXPO_DEV_WORKFLOW_FILE" \
-      --branch="$branch" \
-      --status=success \
-      --limit=30 \
-      --json databaseId \
-      --jq '.[].databaseId'
-  )
-
-  echo -e "${RED}❌ No successful \"${EXPO_DEV_WORKFLOW_FILE}\" run on branch \"${branch}\" contains \"${artifact_name}\"${NC}" >&2
+    checked=$((checked + 1))
+    verify_status=0
+    run_is_successful_expo_dev_build "$candidate" || verify_status=$?
+    case "$verify_status" in
+      0)
+        echo "$candidate"
+        return 0
+        ;;
+      1)
+        echo -e "${YELLOW}Skipping run ${candidate}: not a completed successful \"${EXPO_DEV_WORKFLOW_FILE}\" run.${NC}" >&2
+        ;;
+      *)
+        # Indeterminate, not "bad run": falling through to an older build (or to the
+        # "artifacts may have expired" message below) would misreport a live artifact.
+        # run_is_successful_expo_dev_build has already printed the underlying API error.
+        echo -e "${YELLOW}Refusing to fall back to an older build for \"${artifact_name}\".${NC}" >&2
+        echo -e "${YELLOW}Check 'gh auth status' and your API rate limit, then retry — or pass --run ${candidate}.${NC}" >&2
+        return 1
+        ;;
+    esac
+  done <<< "$candidate_run_ids"
+
+  echo -e "${RED}❌ No live artifact named \"${artifact_name}\" from a successful \"${EXPO_DEV_WORKFLOW_FILE}\" run found on branch \"${branch}\"${NC}" >&2
+  echo -e "${YELLOW}The Expo Dev Build workflow only builds when native code changes; its artifacts may have expired.${NC}" >&2
+  echo -e "${YELLOW}Re-run it (Actions > Expo Dev Build > Run workflow, with 'force_build' checked) or pass --run <id>.${NC}" >&2
   echo -e "${YELLOW}Browse recent runs: https://github.com/${GITHUB_REPO}/actions/workflows/${EXPO_DEV_WORKFLOW_FILE}${NC}" >&2
   return 1
 }
@@ -89,10 +206,18 @@ resolve_expo_dev_run() {
   local branch="$2"
   local run_id_override="$3"
   local resolved_run_id
+  local artifact_status
 
   if [[ -n "$run_id_override" ]]; then
     validate_numeric_run_id "$run_id_override" || return 1
-    if ! run_has_artifact "$run_id_override" "$artifact_name"; then
+    artifact_status=0
+    run_has_artifact "$run_id_override" "$artifact_name" || artifact_status=$?
+    # Only claim the artifact is absent when the API actually said so; report_gh_api_failure
+    # has already explained an indeterminate result.
+    if ((artifact_status >= 2)); then
+      return 1
+    fi
+    if ((artifact_status != 0)); then
       echo -e "${RED}❌ Run ${run_id_override} does not contain artifact \"${artifact_name}\"${NC}" >&2
       echo -e "${YELLOW}Inspect: https://github.com/${GITHUB_REPO}/actions/runs/${run_id_override}${NC}" >&2
       return 1
@@ -100,7 +225,7 @@ resolve_expo_dev_run() {
     resolved_run_id="$run_id_override"
     echo -e "${GREEN}✓ Using explicit run id: ${resolved_run_id}${NC}" >&2
   else
-    echo -e "${BLUE}Looking up latest successful run on '${branch}' for ${EXPO_DEV_WORKFLOW_FILE}...${NC}" >&2
+    echo -e "${BLUE}Looking up latest '${artifact_name}' artifact on '${branch}'...${NC}" >&2
     resolved_run_id="$(find_latest_run_with_artifact "$artifact_name" "$branch")" || return 1
     echo -e "${GREEN}✓ Latest run with artifact: ${resolved_run_id}${NC}" >&2
   fi
@@ -127,9 +252,16 @@ print_artifact_summary() {
   local artifact_digest
   local artifact_size_mb
 
-  artifact_meta="$(gh api "repos/${GITHUB_REPO}/actions/runs/${run_id}/artifacts" \
+  # Without the exit-status check, a failed request used to reach the parser below as the
+  # `{` first line of the JSON error body, which passed the "not found" guard and printed a
+  # fabricated "✓ Artifact size: 0MB" — a green check for a request that never succeeded.
+  if ! gh_api_capture "repos/${GITHUB_REPO}/actions/runs/${run_id}/artifacts" \
     --paginate \
-    --jq ".artifacts[] | select(.name==\"${artifact_name}\") | \"\(.expired)|\(.size_in_bytes)|\(.digest // \"\")\"" 2>/dev/null | head -1 || true)"
+    --jq ".artifacts[] | select(.name==\"${artifact_name}\") | \"\(.expired)|\(.size_in_bytes)|\(.digest // \"\")\""; then
+    report_gh_api_failure "Failed to list artifacts for run ${run_id}"
+    return 1
+  fi
+  artifact_meta="$(printf '%s\n' "$GH_API_OUT" | awk 'NR == 1')"
 
   if [[ -z "$artifact_meta" ]]; then
     echo -e "${RED}❌ Artifact '${artifact_name}' not found in run ${run_id}${NC}" >&2
@@ -159,13 +291,25 @@ artifact_digest_cache_path() {
   echo "${BUILD_DIR}/gh-expo-dev-build/${artifact_name}.digest"
 }
 
+# Only feeds the download-skip optimisation, so a failed request is not fatal: return
+# nothing and let the caller re-download. Warn rather than swallow, and never return the
+# error body — the caller writes this value to the digest cache, so caching a `{` fragment
+# would corrupt the comparison on subsequent runs.
 fetch_artifact_digest() {
   local run_id="$1"
   local artifact_name="$2"
-  gh api "repos/${GITHUB_REPO}/actions/runs/${run_id}/artifacts" \
+
+  if ! gh_api_capture "repos/${GITHUB_REPO}/actions/runs/${run_id}/artifacts" \
     --paginate \
-    --jq ".artifacts[] | select(.expired == false and .name == \"${artifact_name}\") | .digest // empty" \
-    2>/dev/null | head -1 || true
+    --jq ".artifacts[] | select(.expired == false and .name == \"${artifact_name}\") | .digest // empty"; then
+    echo -e "${YELLOW}⚠️  Could not fetch the digest for '${artifact_name}' (run ${run_id}); re-downloading.${NC}" >&2
+    if [[ -n "$GH_API_ERROR" ]]; then
+      printf '%s\n' "$GH_API_ERROR" >&2
+    fi
+    return 0
+  fi
+
+  printf '%s\n' "$GH_API_OUT" | awk 'NR == 1'
 }
 
 read_cached_artifact_digest() {
diff --git a/scripts/set-secrets-from-config.js b/scripts/set-secrets-from-config.js
index aa479ee132e4..23ec284299fa 100755
--- a/scripts/set-secrets-from-config.js
+++ b/scripts/set-secrets-from-config.js
@@ -15,8 +15,19 @@
 
 const fs = require('fs');
 
+// No fallback: an unresolved toJSON(secrets) expands to an empty string, and
+// defaulting it to {} would skip every secret while still exiting 0 — producing
+// a signed binary with no Infura ID, Sentry DSN, or RPC failover URLs.
+if (!process.env.ALL_SECRETS) {
+  // GitHub Actions annotation so the error surfaces on the run summary.
+  console.error(
+    '::error title=Secret injection failed::ALL_SECRETS is not defined. Expected toJSON(secrets).',
+  );
+  process.exit(1);
+}
+
 const secretsMapping = JSON.parse(process.env.CONFIG_SECRETS || '{}');
-const allSecrets = JSON.parse(process.env.ALL_SECRETS || '{}');
+const allSecrets = JSON.parse(process.env.ALL_SECRETS);
 const githubEnvPath = process.env.GITHUB_ENV;
 
 function appendToGithubEnv(name, value) {
diff --git a/scripts/tooling/README.md b/scripts/tooling/README.md
index b1bc0b861303..c723a01ab9bf 100644
--- a/scripts/tooling/README.md
+++ b/scripts/tooling/README.md
@@ -7,6 +7,8 @@ Automatically records how AI agent tooling (Yarn scripts, Claude Code skills, Cu
 Every collection path appends one CSV row to a project-scoped log file:
 
 - `start` when a skill or Yarn script begins
+- `end` when a Yarn script finishes normally (skills only ever log `start`)
+- `interrupted` when a Yarn script is stopped by a signal (e.g. Ctrl+C) instead of finishing normally
 
 The log accumulates locally. The [dev-tooling-explorer](https://github.com/MetaMask/experimental-dev-tooling-explorer) and a nightly cron job drain the log into SQLite for reporting and summarisation.
 
@@ -43,7 +45,7 @@ skill:pr-create,skill,start,cursor,abc-123,,,2026-05-12T10:00:00Z
 yarn:test:unit,yarn_script,start,,,true,8423,2026-05-12T10:01:00Z
 ```
 
-Appends are done with `printf … >> file` (Yarn plugin) or `fs.appendFileSync` (Yarn Berry plugin), both of which are atomic for single-line writes on macOS/Linux.
+Appends are done with `printf … >> file` (shell hooks) or `fs.appendFileSync` (Yarn Berry plugin), both of which are atomic for single-line writes on macOS/Linux.
 
 ## Architecture
 
@@ -85,6 +87,15 @@ flowchart LR
 
 `.yarn/plugins/plugin-usage-tracking.cjs` wraps every `yarn <script>` via `wrapScriptExecution`. On `start` it appends a CSV row; on `finish` it updates `success` and `duration_ms` in a second row.
 
+Only the outermost, directly user-invoked script is recorded. As soon as the plugin module is first loaded (before Yarn computes the env for any script it's about to run), it checks whether `MM_TOOL_USAGE_PARENT` is already present on `process.env`: if absent, this is the root process the user typed themselves, and the plugin sets it. A nested `yarn <script>` spawned as a dependency (e.g. `yarn build` shelling out to `yarn build:ios`) runs as its own `yarn` CLI process, inherits the marker from its parent's env, and skips logging. The marker check runs once at module-evaluation time rather than inside `factory()` or the script-execution hook, because Yarn calls `factory()` more than once per process while resolving configuration, and computes the env passed to a script's spawned child process before the hook ever runs.
+
+The `preinstall`/`install`/`postinstall` lifecycle scripts are unconditionally excluded regardless of root/nested status: Yarn invokes them automatically as part of `yarn install` through this same hook, but a user never types `yarn postinstall` directly.
+
+An `end` row's `event_type` is `interrupted` (rather than `end`) when either of two signals fires:
+
+- The script's resolved exit code is a common termination-signal code (SIGHUP/SIGINT/SIGQUIT/SIGKILL/SIGTERM, i.e. `128 + signal number`) — reliable for a single directly-spawned command.
+- The plugin directly observes a SIGINT/SIGHUP/SIGTERM delivered to the current process while the script was running — needed for a chained script (`cmd1 && cmd2`) or one shelling out to a nested `yarn <script>`, where the interrupted sub-step's own signal-death can race with, and resolve before, Yarn's own interrupt handling, leaving the whole script to resolve with an ordinary-looking failure code (e.g. `1`) that's indistinguishable from a genuine failure by exit code alone. This listener is additive only (it never calls `process.exit()`), so it doesn't change Yarn's own signal handling.
+
 ### Path 2 — Claude Code skills
 
 `.claude/settings.json` registers a project-level `PreToolUse` hook for the `Skill` tool pointing to `hook-claude-dispatch.sh`. That script sources `hook-common.sh` which extracts the skill name from the `"skill"` field in the tool input, appends one CSV row, and exits.
@@ -116,31 +127,9 @@ sqlite3 ~/.tool-usage-collection/events.db \
 
 ## Using dev-tooling-explorer
 
-[dev-tooling-explorer](https://github.com/MetaMask/experimental-dev-tooling-explorer) is a local web UI for browsing the SQLite database written by the collection hooks. It lets you filter events by repo, tool, agent vendor, or date; view per-session history; explore usage charts; and prune or reset the database.
-
-### Installation
-
-```bash
-git clone https://github.com/MetaMask/experimental-dev-tooling-explorer
-cd experimental-dev-tooling-explorer
-yarn install
-```
-
-### Usage
-
-```bash
-yarn start                    # opens local web UI
-yarn start -- --port 4242    # fixed port
-```
-
-### Demo workflow (no collection setup needed)
-
-```bash
-yarn demo:generate
-yarn start:demo
-```
+[dev-tooling-explorer](https://github.com/MetaMask/experimental-dev-tooling-explorer) is a local web UI for browsing the SQLite database written by the collection hooks. See its repo for installation and usage instructions.
 
-### DB path resolution
+## Daily Anonymizer (MCWP-644)
 
-The explorer reads the database from `TOOL_USAGE_COLLECTION_DB_PATH` if set, otherwise defaults to `~/.tool-usage-collection/events.db`.
+The daily anonymizer runs automatically once per 24h: the first non-CI `yarn` script run after the window opens spawns it detached (non-blocking) via the usage-tracking Yarn plugin. It is published as [`@metamask/tooling-insight`](https://github.com/MetaMask/experimental-tooling-insight) and consumed here as a `devDependency`. See that repo for full documentation, configuration, and ops escape hatches.
 
diff --git a/scripts/tooling/tsconfig.json b/scripts/tooling/tsconfig.json
deleted file mode 100644
index 53e1a5471b3a..000000000000
--- a/scripts/tooling/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "commonjs",
-    "lib": ["ES2022"],
-    "moduleResolution": "node",
-    "strict": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "resolveJsonModule": true,
-    "skipLibCheck": true
-  },
-  "include": ["./**/*.ts"],
-  "exclude": ["node_modules"]
-}
diff --git a/shim.js b/shim.js
index 431545446ad2..8be2323ed3a1 100644
--- a/shim.js
+++ b/shim.js
@@ -1,5 +1,5 @@
 /* eslint-disable import-x/no-nodejs-modules */
-import { BackHandler, Platform } from 'react-native';
+import { BackHandler, Platform, Settings } from 'react-native';
 
 // RN 0.74+ removed `BackHandler.removeEventListener`. Some third-party
 // libraries (notably `@metamask/design-system-react-native`'s `BottomSheet`)
@@ -116,9 +116,14 @@ if (hasTestOverrides) {
 //          See FixtureHelper.ts for the port mapping implementation.
 if (isTestEnvironment) {
   const raw = LaunchArguments.value();
+
+  // Priority: LaunchArgs (Detox) → NSUserDefaults (mm CLI daemon) → hardcoded fallback
+  const nsDefaults =
+    Platform.OS === 'ios' ? Settings.get('fixtureServerPort') : undefined;
   testConfig.fixtureServerPort = raw?.fixtureServerPort
     ? raw.fixtureServerPort
-    : FALLBACK_FIXTURE_SERVER_PORT;
+    : (nsDefaults ?? FALLBACK_FIXTURE_SERVER_PORT);
+
   testConfig.commandQueueServerPort = raw?.commandQueueServerPort
     ? raw.commandQueueServerPort
     : FALLBACK_COMMAND_QUEUE_SERVER_PORT;
diff --git a/tests/AGENTS.md b/tests/AGENTS.md
index 9718e8f5f2b1..45dc49efd905 100644
--- a/tests/AGENTS.md
+++ b/tests/AGENTS.md
@@ -1,13 +1,14 @@
 # tests/ — AGENTS.md
 
-Single agent index for **tests/**, and **wdio/**. Pointers only; details live in the canonical sources below.
+Single agent index for **tests/**. Pointers only; details live in the canonical sources below.
 
 ## Scope
 
-- **tests/smoke** — `tests/smoke/`, `tests/page-objects/`, `tests/selectors/`, config. Specs, Page Objects, selectors. Consumes `tests/framework/` and fixtures.
-- **tests/smoke-appium** — Appium smoke specs (Playwright). Same Page Objects/framework as Detox smoke.
-- **tests/** — `tests/framework/`, `tests/api-mocking/`, `tests/docs/`, `tests/smoke/`, `tests/smoke-appium/`, etc. Framework, fixtures, mocking, smoke specs.
-- **wdio/** — `wdio/helpers/`, `wdio/screen-objects/`, `wdio/utils/`. Legacy WebdriverIO/Appium — **deprecated**. Use Detox + tests/smoke or Playwright for performance.
+- **tests/smoke-appium** — Appium smoke specs (Playwright). Primary E2E path for new coverage.
+- **tests/page-objects**, **tests/selectors** — Shared Page Objects and selectors used by Appium smoke.
+- **tests/** — `tests/framework/`, `tests/api-mocking/`, `tests/docs/`, `tests/smoke-appium/`, etc. Framework, fixtures, mocking, smoke specs.
+- **tests/smoke** — Legacy Detox smoke (do not add new coverage here; treat as gone for new work).
+- **wdio/** — Removed / deprecated legacy WebdriverIO. Do not extend.
 - **component view tests** — `app/**/*.view.test.tsx`. Jest component view tests.
 - **integration tests** — `app/**/*.integration.test.ts?(x)`. Jest controller-app integration tests that use `tests/integration/` harnesses and `jest.config.integration.js`.
 
@@ -19,7 +20,7 @@ Single agent index for **tests/**, and **wdio/**. Pointers only; details live in
 
 - [tests/integration/AGENTS.md](integration/AGENTS.md) — Agent index for integration tests: harnesses, layer boundaries, canonical skill, run commands, enforcement.
 
-### E2E Tests (Detox smoke + Appium smoke)
+### E2E Tests (Appium smoke)
 
 - [docs/testing/e2e-testing.md](../docs/testing/e2e-testing.md) — Canonical guide: patterns, Page Objects, assertions, gestures, prohibited patterns.
 - [docs/testing/appium-smoke-testing.md](../docs/testing/appium-smoke-testing.md) — Appium smoke: main-e2e builds, `yarn appium-smoke:*`, local setup, CI.
@@ -28,9 +29,11 @@ Single agent index for **tests/**, and **wdio/**. Pointers only; details live in
 
 - [docs/testing/e2e-testing.md](../docs/testing/e2e-testing.md) — Patterns, Page Objects, assertions, gestures, prohibited patterns.
 - [docs/testing/appium-smoke-testing.md](../docs/testing/appium-smoke-testing.md) — Appium smoke tests: builds, run commands, local/CI setup.
-- [docs/readme/e2e-testing.md](../docs/readme/e2e-testing.md) — Setup, run commands, build types, Metro, Detox, Flask; Appium smoke quick start.
-- [.github/guidelines/E2E_DECISION_TREE.md](../.github/guidelines/E2E_DECISION_TREE.md) — CI decision flow: when E2E runs, which labels gate it (pr-not-ready-for-e2e, skip-e2e, skip-smart-e2e-selection), AI test selection logic.
+- [docs/readme/e2e-testing.md](../docs/readme/e2e-testing.md) — Setup, run commands, build types, Metro; Appium smoke quick start.
+- [.github/guidelines/E2E_DECISION_TREE.md](../.github/guidelines/E2E_DECISION_TREE.md) — CI decision flow: when E2E runs, which labels gate it, AI test selection logic.
 - [tests/docs/README.md](docs/README.md) — Framework structure, withFixtures, FixtureBuilder, anti-patterns, checklist.
+- [tests/docs/UNIFIED_E2E_ARCHITECTURE.md](docs/UNIFIED_E2E_ARCHITECTURE.md) — Appium layered architecture.
+- [tests/docs/UNIFIED_GESTURES_MIGRATION.md](docs/UNIFIED_GESTURES_MIGRATION.md) — Migrate off UnifiedGestures → Gestures.
 - [tests/docs/PLAYWRIGHT_LOCAL_EMULATOR.md](docs/PLAYWRIGHT_LOCAL_EMULATOR.md) — Local `buildPath` vs pre-installed app, `fullReset` / `noReset` for `EmulatorConfigBuilder`.
 - [tests/docs/MOCKING.md](docs/MOCKING.md) — API mocking, default and test-specific mocks.
 - [tests/docs/analytics-e2e.md](docs/analytics-e2e.md) — MetaMetrics E2E: `analyticsExpectations` on `withFixtures`, presets, `runAnalyticsExpectations`.
@@ -46,8 +49,8 @@ Unit tests under `tests/` (e.g. framework tests): [docs/testing/unit-testing.md]
 
 ## Before working
 
-- **tests/** — Use `withFixtures` + `FixtureBuilder`; Page Object methods only; no `TestHelpers.delay()`; selectors in `tests/selectors/` or page folder; import from `tests/framework/index.ts`. Detox commands: [docs/readme/e2e-testing.md](../docs/readme/e2e-testing.md). Appium smoke: [docs/testing/appium-smoke-testing.md](../docs/testing/appium-smoke-testing.md).
-- **tests/** — Framework/mocking: read tests/docs/README and MOCKING; keep exports in `tests/framework/index.ts`. Smoke: same as e2e (withFixtures, Page Objects, no delay). Yarn only.
+- **E2E (new work)** — Appium smoke only (`tests/smoke-appium/`). Use `withFixtures` + `FixtureBuilder`; Page Object methods only; wait with Assertions (not fixed delays); selectors in `tests/selectors/` or page folder; import `Gestures` / `Assertions` / `Matchers` from `tests/framework/index.ts`. **Do not** import `UnifiedGestures`. Runbook: [docs/testing/appium-smoke-testing.md](../docs/testing/appium-smoke-testing.md).
+- **tests/framework** — Framework/mocking: read tests/docs/README and MOCKING; keep exports in `tests/framework/index.ts`. Yarn only.
 - **component view tests** — No fake timers (`jest.useFakeTimers` / `advanceTimersByTime`); use `waitFor` or real delays. See [docs/testing/component-view-tests.md](../docs/testing/component-view-tests.md).
 - **integration tests** — Use `tests/integration/harnesses/<domain>.ts`; no test-local `jest.mock(...)`; run with `yarn jest -c jest.config.integration.js`. See [tests/integration/AGENTS.md](integration/AGENTS.md).
-- **wdio/** — Do not extend. New work: Detox + tests/smoke or Appwright (`tests/`). If maintaining: legacy section in [docs/readme/e2e-testing.md](../docs/readme/e2e-testing.md).
+- **wdio/** / **tests/smoke (Detox)** — Do not extend. New coverage goes to Appium smoke.
diff --git a/tests/api-mocking/mock-responses/custom-rpc-provider-mocks.ts b/tests/api-mocking/mock-responses/custom-rpc-provider-mocks.ts
index 4ee2deef8f80..11e912bfb236 100644
--- a/tests/api-mocking/mock-responses/custom-rpc-provider-mocks.ts
+++ b/tests/api-mocking/mock-responses/custom-rpc-provider-mocks.ts
@@ -41,6 +41,12 @@ const PROXIED_RPC_CONFIGS: {
     chainId: '0x53a',
     netVersion: '1338',
   },
+  // OpenRPC wallet_addEthereumChain example (api-specs) uses Gnosis RPC.
+  {
+    url: 'https://rpc.gnosischain.com',
+    chainId: '0x64',
+    netVersion: '100',
+  },
 ];
 
 const findRpcConfig = (urlParam: string | null) =>
@@ -48,7 +54,7 @@ const findRpcConfig = (urlParam: string | null) =>
 
 /**
  * TestSpecificMock that intercepts custom-RPC provider calls
- * (eth.llamarpc.com, rpc.atlantischain.network) through the mobile
+ * (eth.llamarpc.com, rpc.atlantischain.network, rpc.gnosischain.com) through the mobile
  * proxy, returning static responses per JSON-RPC method.
  */
 export const CUSTOM_RPC_PROVIDER_MOCKS: TestSpecificMock = async (
diff --git a/tests/api-mocking/mock-responses/feature-flags-mocks.ts b/tests/api-mocking/mock-responses/feature-flags-mocks.ts
index c7e8e0badc04..05e13ca89f93 100644
--- a/tests/api-mocking/mock-responses/feature-flags-mocks.ts
+++ b/tests/api-mocking/mock-responses/feature-flags-mocks.ts
@@ -152,6 +152,13 @@ export const remoteFeatureFlagTronAccounts = (enabled = true) => ({
   },
 });
 
+export const remoteFeatureFlagStellarAccounts = (enabled = true) => ({
+  stellarAccounts: {
+    enabled,
+    minimumVersion: '0.0.0',
+  },
+});
+
 /**
  * Enables the Market Insights (AI social market analysis) feature on asset details.
  * Uses minimumVersion '0.0.0' so debug/test builds always pass the version gate.
diff --git a/tests/api-mocking/mock-responses/musd/musd-mocks.ts b/tests/api-mocking/mock-responses/musd/musd-mocks.ts
index a5765cfe6571..0f26ff303547 100644
--- a/tests/api-mocking/mock-responses/musd/musd-mocks.ts
+++ b/tests/api-mocking/mock-responses/musd/musd-mocks.ts
@@ -132,7 +132,9 @@ export async function setupMusdMocks(
   options: MusdMockOptions = {},
 ): Promise<void> {
   const { hasMusdBalance = false, musdBalance = 100 } = options;
+
   await setupRemoteFeatureFlagsMock(mockServer, {
+    earnMoneyHubEnabled: { enabled: false, minimumVersion: '0.0.0' },
     earnMusdConversionFlowEnabled: { enabled: true, minimumVersion: '0.0.0' },
     earnMusdCtaEnabled: { enabled: true, minimumVersion: '0.0.0' },
     earnMusdConversionTokenListItemCtaEnabled: {
@@ -246,6 +248,14 @@ export async function setupMusdMocks(
     responseCode: 200,
   });
 
+  // Asset Overview can trigger wallet compliance batch scan
+  await setupMockRequest(mockServer, {
+    url: /compliance\.(dev-api|uat-api|api)\.cx\.metamask\.io\/v1\/wallet\/batch/,
+    response: { results: [] },
+    requestMethod: 'POST',
+    responseCode: 200,
+  });
+
   await mockRelayQuoteMainnetMusd(mockServer);
   await mockRelayStatus(mockServer);
 }
diff --git a/tests/api-mocking/mock-responses/simulations.ts b/tests/api-mocking/mock-responses/simulations.ts
index 181979f557a3..85fe1095833d 100644
--- a/tests/api-mocking/mock-responses/simulations.ts
+++ b/tests/api-mocking/mock-responses/simulations.ts
@@ -1,11 +1,13 @@
-import { device } from 'detox';
+import { PlatformDetector } from '../../framework/PlatformLocator';
 
 const SENDER_ADDRESS_MOCK = '0x76cf1cdd1fcc252442b50d6e97207228aa4aefc3';
 const RECIPIENT_ADDRESS_MOCK = '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb';
 
 const SENTINEL_URL = 'https://tx-sentinel-ethereum-mainnet.api.cx.metamask.io';
-const LOCALHOST_SENTINEL_URL =
-  device.getPlatform() === 'android'
+
+/** Resolved at use-time so Appium can import this module without Detox `device`. */
+const getLocalhostSentinelUrl = (): string =>
+  PlatformDetector.isAndroid()
     ? 'https://tx-sentinel-127.0.0.1.api.cx.metamask.io'
     : 'https://tx-sentinel-localhost.api.cx.metamask.io';
 
@@ -34,7 +36,9 @@ export const SEND_ETH_SIMULATION_MOCK = {
     'params.0.transactions',
     'params.0.suggestFees',
   ],
-  urlEndpoint: LOCALHOST_SENTINEL_URL,
+  get urlEndpoint() {
+    return getLocalhostSentinelUrl();
+  },
   response: {
     jsonrpc: '2.0',
     result: {
diff --git a/tests/api-mocking/mock-responses/transaction-pay.ts b/tests/api-mocking/mock-responses/transaction-pay.ts
index b19f8caa0ce2..c9761113bdcd 100644
--- a/tests/api-mocking/mock-responses/transaction-pay.ts
+++ b/tests/api-mocking/mock-responses/transaction-pay.ts
@@ -406,7 +406,8 @@ export async function mockRelayQuote(mockServer: Mockttp) {
       return Boolean(
         url?.includes('api.relay.link/quote') ||
           url?.includes('bridge.api.cx.metamask.io/relay/quote') ||
-          url?.includes('bridge.dev-api.cx.metamask.io/relay/quote'),
+          url?.includes('bridge.dev-api.cx.metamask.io/relay/quote') ||
+          url?.includes('intents.api.cx.metamask.io/relay/quote'),
       );
     })
     .thenCallback(() => ({
@@ -427,13 +428,22 @@ export async function mockRelayQuoteMainnetMusd(mockServer: Mockttp) {
       return Boolean(
         url?.includes('api.relay.link/quote') ||
           url?.includes('bridge.api.cx.metamask.io/relay/quote') ||
-          url?.includes('bridge.dev-api.cx.metamask.io/relay/quote'),
+          url?.includes('bridge.dev-api.cx.metamask.io/relay/quote') ||
+          url?.includes('intents.api.cx.metamask.io/relay/quote'),
       );
     })
     .thenCallback(() => ({
       statusCode: 200,
       json: MAINNET_MUSD_RELAY_QUOTE_MOCK,
     }));
+
+  // Direct (non-proxied) quote host used by current client-config relayQuoteUrl
+  await mockServer
+    .forPost(/intents\.api\.cx\.metamask\.io\/relay\/quote/)
+    .thenCallback(() => ({
+      statusCode: 200,
+      json: MAINNET_MUSD_RELAY_QUOTE_MOCK,
+    }));
 }
 
 export async function mockRelayStatus(mockServer: Mockttp) {
@@ -444,11 +454,19 @@ export async function mockRelayStatus(mockServer: Mockttp) {
       return Boolean(
         url?.includes('api.relay.link/intents/status') ||
           url?.includes('bridge.api.cx.metamask.io/relay/intents/status') ||
-          url?.includes('bridge.dev-api.cx.metamask.io/relay/intents/status'),
+          url?.includes('bridge.dev-api.cx.metamask.io/relay/intents/status') ||
+          url?.includes('intents.api.cx.metamask.io/relay/intents/status'),
       );
     })
     .thenCallback(() => ({
       statusCode: 200,
       json: RELAY_STATUS_MOCK,
     }));
+
+  await mockServer
+    .forGet(/intents\.api\.cx\.metamask\.io\/relay\/intents\/status/)
+    .thenCallback(() => ({
+      statusCode: 200,
+      json: RELAY_STATUS_MOCK,
+    }));
 }
diff --git a/tests/api-mocking/mock-responses/transaction-relay-mocks.ts b/tests/api-mocking/mock-responses/transaction-relay-mocks.ts
index aa614891204a..491f4cae0445 100644
--- a/tests/api-mocking/mock-responses/transaction-relay-mocks.ts
+++ b/tests/api-mocking/mock-responses/transaction-relay-mocks.ts
@@ -1,5 +1,5 @@
-import { device } from 'detox';
 import { RelayStatus } from '../../../app/util/transactions/transaction-relay.ts';
+import { PlatformDetector } from '../../framework/PlatformLocator.ts';
 
 const SENDER_ADDRESS_MOCK = '0x76cf1cdd1fcc252442b50d6e97207228aa4aefc3';
 const RECIPIENT_ADDRESS_MOCK = '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb';
@@ -9,8 +9,10 @@ const TRANSACTION_HASH =
   '0xf25183af3bf64af01e9210201a2ede3c1dcd6d16091283152d13265242939fc4';
 
 const SENTINEL_URL = 'https://tx-sentinel-ethereum-mainnet.api.cx.metamask.io';
-const LOCALHOST_SENTINEL_URL =
-  device.getPlatform() === 'android'
+
+/** Resolved at use-time so Appium can import this module without Detox `device`. */
+export const getLocalhostSentinelUrl = (): string =>
+  PlatformDetector.isAndroid()
     ? 'https://tx-sentinel-127.0.0.1.api.cx.metamask.io'
     : 'https://tx-sentinel-localhost.api.cx.metamask.io';
 
@@ -22,7 +24,9 @@ export const SEND_ETH_TRANSACTION_MOCK = {
 };
 
 export const TRANSACTION_RELAY_SUBMIT_NETWORKS_MOCK = {
-  urlEndpoint: `${LOCALHOST_SENTINEL_URL}`,
+  get urlEndpoint() {
+    return getLocalhostSentinelUrl();
+  },
   responseCode: 200,
   response: {
     jsonrpc: '2.0',
diff --git a/tests/component-view/fixtures/predict.ts b/tests/component-view/fixtures/predict.ts
index 70a6254a92f7..d4283395bbfd 100644
--- a/tests/component-view/fixtures/predict.ts
+++ b/tests/component-view/fixtures/predict.ts
@@ -1,6 +1,8 @@
 import {
+  PredictPositionStatus,
   Recurrence,
   type PredictMarket,
+  type PredictPosition,
 } from '../../../app/components/UI/Predict/types';
 
 export const MOCK_PREDICT_MARKET: PredictMarket = {
@@ -35,6 +37,104 @@ export const MOCK_PREDICT_MARKET: PredictMarket = {
   volume: 1_000_000,
 };
 
+/**
+ * Closed binary market resolved to "Yes".
+ *
+ * `useOutcomeResolution` derives the winner from a token priced at exactly 1 and
+ * the loser from a token priced at exactly 0, so those prices are load-bearing.
+ */
+export const MOCK_PREDICT_CLOSED_MARKET: PredictMarket = {
+  ...MOCK_PREDICT_MARKET,
+  id: 'market-closed-1',
+  slug: 'will-btc-reach-100k-closed',
+  status: 'closed',
+  outcomes: [
+    {
+      ...MOCK_PREDICT_MARKET.outcomes[0],
+      marketId: 'market-closed-1',
+      status: 'closed',
+      resolutionStatus: 'resolved',
+      tokens: [
+        { id: 'token-yes', title: 'Yes', price: 1 },
+        { id: 'token-no', title: 'No', price: 0 },
+      ],
+    },
+  ],
+};
+
+/** Open market with three outcomes, which surfaces the Outcomes tab. */
+export const MOCK_PREDICT_MULTI_OUTCOME_MARKET: PredictMarket = {
+  ...MOCK_PREDICT_MARKET,
+  id: 'market-multi-1',
+  slug: 'who-wins-the-election',
+  title: 'Who will win the election?',
+  outcomes: ['Alice', 'Bob', 'Carol'].map((candidate, index) => ({
+    id: `outcome-${candidate.toLowerCase()}`,
+    providerId: 'polymarket',
+    marketId: 'market-multi-1',
+    title: candidate,
+    description: '',
+    image: '',
+    status: 'open' as const,
+    tokens: [
+      { id: `token-${candidate.toLowerCase()}`, title: 'Yes', price: 0.3 },
+      { id: `token-${candidate.toLowerCase()}-no`, title: 'No', price: 0.7 },
+    ],
+    volume: 100_000 * (index + 1),
+    groupItemTitle: candidate,
+  })),
+};
+
+/**
+ * Open market where one of the outcomes has already resolved, which renders the
+ * collapsible "Resolved outcomes" section alongside the still-open outcomes.
+ */
+export const MOCK_PREDICT_PARTIALLY_RESOLVED_MARKET: PredictMarket = {
+  ...MOCK_PREDICT_MULTI_OUTCOME_MARKET,
+  id: 'market-partial-1',
+  slug: 'who-wins-the-election-partial',
+  outcomes: MOCK_PREDICT_MULTI_OUTCOME_MARKET.outcomes.map((outcome, index) =>
+    index === 2
+      ? {
+          ...outcome,
+          marketId: 'market-partial-1',
+          status: 'closed' as const,
+          resolutionStatus: 'resolved',
+        }
+      : { ...outcome, marketId: 'market-partial-1' },
+  ),
+};
+
+/**
+ * Builds a position for the default market fixture. Override `claimable` and
+ * `percentPnl` to drive the claim CTA (shown for claimable positions in profit).
+ */
+export const buildMockPredictPosition = (
+  overrides: Partial<PredictPosition> = {},
+): PredictPosition => ({
+  id: 'position-1',
+  providerId: 'polymarket',
+  marketId: 'market-btc-1',
+  outcomeId: 'outcome-yes',
+  outcome: 'Yes',
+  outcomeTokenId: 'token-yes',
+  currentValue: 60,
+  title: 'Will Bitcoin reach $100k?',
+  icon: '',
+  amount: 100,
+  price: 0.65,
+  status: PredictPositionStatus.OPEN,
+  size: 50,
+  outcomeIndex: 0,
+  percentPnl: 20,
+  cashPnl: 10,
+  claimable: false,
+  initialValue: 50,
+  avgPrice: 0.5,
+  endDate: '2026-12-31',
+  ...overrides,
+});
+
 /** Scoreboard-capable live sports market for Live Now / sport-card view tests. */
 export const MOCK_PREDICT_LIVE_SPORT_MARKET: PredictMarket = {
   id: 'market-live-sport-1',
diff --git a/tests/component-view/mocks.ts b/tests/component-view/mocks.ts
index 8d5209d643de..770ea710fbfe 100644
--- a/tests/component-view/mocks.ts
+++ b/tests/component-view/mocks.ts
@@ -366,6 +366,7 @@ jest.mock('../../app/core/Engine', () => {
         getActivity: jest.fn().mockResolvedValue([]),
         getPositions: jest.fn().mockResolvedValue([]),
         getPrices: jest.fn().mockResolvedValue({ providerId: '', results: [] }),
+        getPriceHistory: jest.fn().mockResolvedValue([]),
         getMarketSeries: jest.fn().mockResolvedValue([]),
         getCryptoPriceHistory: jest.fn().mockResolvedValue([]),
         getCryptoTargetPrice: jest.fn().mockResolvedValue(69000),
@@ -393,10 +394,18 @@ jest.mock('../../app/core/Engine', () => {
         trackPortfolioTransactionInitiated: jest.fn(),
         trackPositionsScreenViewed: jest.fn(),
         trackPositionsTabViewed: jest.fn(),
+        trackPredictOrderEvent: jest.fn(),
+        trackBetslipDismissed: jest.fn(),
+        trackCategoryClicked: jest.fn(),
+        trackShareAction: jest.fn(),
         refreshEligibility: jest.fn().mockResolvedValue(undefined),
         claimWithConfirmation: jest.fn().mockResolvedValue(undefined),
         depositWithConfirmation: jest.fn().mockResolvedValue(undefined),
         prepareWithdraw: jest.fn().mockResolvedValue(undefined),
+        placeOrder: jest.fn().mockResolvedValue(undefined),
+        previewOrder: jest.fn().mockResolvedValue(undefined),
+        initPayWithAnyToken: jest.fn().mockResolvedValue(undefined),
+        getUnrealizedPnL: jest.fn().mockResolvedValue(undefined),
       },
       // Perps: stub so hooks (usePerpsClosePosition, usePerpsMarkets, etc.) do not throw
       // getMarkets returns one market so explore sections render "See all perps"
diff --git a/tests/component-view/presets/cardStatePreset.ts b/tests/component-view/presets/cardStatePreset.ts
index 180843bf9271..11c6c6ea2663 100644
--- a/tests/component-view/presets/cardStatePreset.ts
+++ b/tests/component-view/presets/cardStatePreset.ts
@@ -85,7 +85,6 @@ export const initialStateCard = () =>
             cardHomeData: defaultCardHomeData,
             cardHomeDataStatus: 'success',
             selectedCountry: null,
-            selectedCardProgramId: null,
           },
           MoneyAccountController: { moneyAccounts: {} },
           RemoteFeatureFlagController: {
diff --git a/tests/component-view/presets/perpsStatePreset.test.ts b/tests/component-view/presets/perpsStatePreset.test.ts
index 77877ca647a8..e23842f2f660 100644
--- a/tests/component-view/presets/perpsStatePreset.test.ts
+++ b/tests/component-view/presets/perpsStatePreset.test.ts
@@ -1,4 +1,4 @@
-import { initialStatePerps } from './perpsStatePreset';
+import { initialStatePerps, initialStatePerpsPro } from './perpsStatePreset';
 
 describe('initialStatePerps', () => {
   it('returns a builder with build method', () => {
@@ -45,4 +45,23 @@ describe('initialStatePerps', () => {
       sortCallback: 'stringNumeric',
     });
   });
+
+  it('builds Pro state with layout preferences', () => {
+    const state = initialStatePerpsPro().build();
+
+    const perps = state?.engine?.backgroundState?.PerpsController as
+      | {
+          mode?: string;
+          proLayoutPreferences?: {
+            orderBookExpanded?: boolean;
+            chartExpanded?: boolean;
+          };
+        }
+      | undefined;
+    expect(perps?.mode).toBe('pro');
+    expect(perps?.proLayoutPreferences).toMatchObject({
+      orderBookExpanded: false,
+      chartExpanded: false,
+    });
+  });
 });
diff --git a/tests/component-view/presets/perpsStatePreset.ts b/tests/component-view/presets/perpsStatePreset.ts
index 1a3d9db669a9..a02491347f69 100644
--- a/tests/component-view/presets/perpsStatePreset.ts
+++ b/tests/component-view/presets/perpsStatePreset.ts
@@ -31,11 +31,15 @@ const defaultPerpsControllerState = {
 
 const defaultConfirmationTransactionId = 'perps-cv-confirmation-tx';
 
+interface InitialStatePerpsOptions {
+  mode?: 'lite' | 'pro';
+}
+
 /**
  * Returns a StateFixtureBuilder with minimal state for Perps views.
  * Use .withOverrides() to set PerpsController.isEligible, etc.
  */
-export const initialStatePerps = () =>
+export const initialStatePerps = (options: InitialStatePerpsOptions = {}) =>
   createStateFixture()
     .withMinimalAccounts()
     .withMinimalKeyringController()
@@ -59,7 +63,10 @@ export const initialStatePerps = () =>
     .withOverrides({
       engine: {
         backgroundState: {
-          PerpsController: defaultPerpsControllerState,
+          PerpsController: {
+            ...defaultPerpsControllerState,
+            mode: options.mode ?? defaultPerpsControllerState.mode,
+          },
           NetworkController: {
             providerConfig: { chainId: '0x1', type: 'mainnet' },
             selectedNetworkClientId: 'mainnet',
@@ -177,3 +184,8 @@ export const initialStatePerps = () =>
         },
       },
     } as unknown as DeepPartial<RootState>);
+
+/**
+ * Returns the Perps state fixture configured for the Pro interface.
+ */
+export const initialStatePerpsPro = () => initialStatePerps({ mode: 'pro' });
diff --git a/tests/component-view/renderers/perpsViewRenderer.tsx b/tests/component-view/renderers/perpsViewRenderer.tsx
index aaff8137bfef..9b4ae161940e 100644
--- a/tests/component-view/renderers/perpsViewRenderer.tsx
+++ b/tests/component-view/renderers/perpsViewRenderer.tsx
@@ -10,7 +10,10 @@ import type { RootState } from '../../../app/reducers';
 import Routes from '../../../app/constants/navigation/Routes';
 import { ConnectionStatus } from '@metamask/hw-wallet-sdk';
 import { renderComponentViewScreen, renderScreenWithRoutes } from '../render';
-import { initialStatePerps } from '../presets/perpsStatePreset';
+import {
+  initialStatePerps,
+  initialStatePerpsPro,
+} from '../presets/perpsStatePreset';
 import {
   PerpsConnectionContext,
   type PerpsConnectionContextValue,
@@ -37,6 +40,7 @@ import PerpsHeroCardView from '../../../app/components/UI/Perps/Views/PerpsHeroC
 import PerpsTPSLView from '../../../app/components/UI/Perps/Views/PerpsTPSLView/PerpsTPSLView';
 import PerpsOrderDetailsView from '../../../app/components/UI/Perps/Views/PerpsOrderDetailsView/PerpsOrderDetailsView';
 import PerpsOrderView from '../../../app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView';
+import PerpsProMarketView from '../../../app/components/UI/Perps/Views/PerpsProMarketView/PerpsProMarketView';
 import PerpsCancelAllOrdersView from '../../../app/components/UI/Perps/Views/PerpsCancelAllOrdersView/PerpsCancelAllOrdersView';
 import PerpsCloseAllPositionsView from '../../../app/components/UI/Perps/Views/PerpsCloseAllPositionsView/PerpsCloseAllPositionsView';
 import PerpsSelectAdjustMarginActionView from '../../../app/components/UI/Perps/Views/PerpsSelectAdjustMarginActionView/PerpsSelectAdjustMarginActionView';
@@ -238,10 +242,9 @@ function focusedPriceChannel() {
 }
 
 /** Prices channel: usePerpsLivePrices calls subscribeToSymbols */
-const pricesChannel = () => {
-  const channel = mutableChannelWithInitialValue<Record<string, PriceUpdate>>(
-    {},
-  );
+const pricesChannel = (initialPrices: Record<string, PriceUpdate> = {}) => {
+  const channel =
+    mutableChannelWithInitialValue<Record<string, PriceUpdate>>(initialPrices);
 
   return {
     ...channel,
@@ -282,7 +285,8 @@ const typedMarkets = (markets: unknown[]): PerpsMarketData[] =>
 const typedAccount = (account: unknown): AccountState =>
   account as AccountState;
 
-const createPricesChannel = () => pricesChannel();
+const createPricesChannel = (prices?: Record<string, PriceUpdate>) =>
+  pricesChannel(prices);
 
 const createAccountChannel = (account: unknown) =>
   mutableChannelWithInitialValue(typedAccount(account));
@@ -306,6 +310,8 @@ export interface PerpsStreamOverrides {
   marketData?: unknown[];
   /** When set, usePerpsLiveOrders() receives this array (e.g. to test CancelAllOrders with/without orders). */
   orders?: unknown[];
+  /** When set, usePerpsLivePrices() receives these prices on first subscription. */
+  prices?: Record<string, PriceUpdate>;
 }
 
 /** Creates a minimal stream manager double so views using usePerpsStream() render without WebSocket. */
@@ -320,7 +326,7 @@ function createTestStreamManager(
   const account = createAccountChannel(
     streamOverrides?.account ?? initialAccount,
   );
-  const prices = createPricesChannel();
+  const prices = createPricesChannel(streamOverrides?.prices);
 
   const streamManager = {
     prices,
@@ -363,6 +369,8 @@ interface RenderPerpsViewOptions {
   streamOverrides?: PerpsStreamOverrides;
   /** Optional extra routes so navigation can be asserted (e.g. [{ name: Routes.PERPS.MARKET_LIST }]). */
   extraRoutes?: PerpsExtraRoute[];
+  /** Selects the matching Perps state preset. */
+  mode?: 'lite' | 'pro';
 }
 
 const DefaultRouteProbe =
@@ -381,8 +389,9 @@ export function renderPerpsView(
   routeName: string,
   options: RenderPerpsViewOptions = {},
 ) {
-  const { overrides, initialParams, streamOverrides, extraRoutes } = options;
-  const builder = initialStatePerps();
+  const { overrides, initialParams, streamOverrides, extraRoutes, mode } =
+    options;
+  const builder = mode === 'pro' ? initialStatePerpsPro() : initialStatePerps();
   if (overrides) {
     builder.withOverrides(overrides);
   }
@@ -580,6 +589,45 @@ export function renderPerpsMarketDetailsView(
   );
 }
 
+const defaultProMarket = {
+  ...defaultMarketDetailsMarket,
+  szDecimals: 2,
+};
+
+const defaultProPrices: Record<string, PriceUpdate> = {
+  ETH: {
+    symbol: 'ETH',
+    price: '2500',
+    markPrice: '2500',
+    percentChange24h: '2',
+    timestamp: 1,
+    isTradable: true,
+  },
+};
+
+/**
+ * Renders PerpsProMarketView with Pro state and live price fixtures.
+ */
+export function renderPerpsProMarketView(options: RenderPerpsViewOptions = {}) {
+  return renderPerpsView(
+    PerpsProMarketView as unknown as React.ComponentType,
+    Routes.PERPS.MARKET_DETAILS,
+    {
+      ...options,
+      mode: 'pro',
+      initialParams: {
+        market: defaultProMarket,
+        ...options.initialParams,
+      },
+      streamOverrides: {
+        marketData: [defaultProMarket],
+        prices: defaultProPrices,
+        ...options.streamOverrides,
+      },
+    },
+  );
+}
+
 /**
  * Renders PerpsMarketListView. Use in PerpsMarketListView.view.test.tsx.
  */
diff --git a/tests/component-view/renderers/predictMarketDetails.tsx b/tests/component-view/renderers/predictMarketDetails.tsx
index 1f164615fc14..9b97beb5986c 100644
--- a/tests/component-view/renderers/predictMarketDetails.tsx
+++ b/tests/component-view/renderers/predictMarketDetails.tsx
@@ -6,6 +6,7 @@ import type { RootState } from '../../../app/reducers';
 import { renderComponentViewScreen, renderScreenWithRoutes } from '../render';
 import Routes from '../../../app/constants/navigation/Routes';
 import PredictMarketDetails from '../../../app/components/UI/Predict/views/PredictMarketDetails';
+import { PredictPreviewSheetProvider } from '../../../app/components/UI/Predict/contexts';
 import { initialStatePredict } from '../presets/predict';
 
 interface RenderPredictMarketDetailsOptions {
@@ -14,21 +15,34 @@ interface RenderPredictMarketDetailsOptions {
 }
 
 /**
- * Creates a PredictMarketDetails component wrapped with QueryClientProvider.
+ * Creates a PredictMarketDetails component wrapped with QueryClientProvider and
+ * PredictPreviewSheetProvider, matching the providers the real navigator supplies.
  *
  * A fresh QueryClient (retry: false) is created per call so that query state
  * does not leak between tests. usePredictPositions uses @tanstack/react-query.
  */
 function createWrappedPredictMarketDetails(): React.ComponentType {
   const queryClient = new QueryClient({
-    defaultOptions: { queries: { retry: false } },
+    defaultOptions: { queries: { retry: false, cacheTime: 0 } },
   });
 
-  return (props: Record<string, unknown>) => (
-    <QueryClientProvider client={queryClient}>
-      <PredictMarketDetails {...(props as object)} />
-    </QueryClientProvider>
-  );
+  return function WrappedPredictMarketDetails(props: Record<string, unknown>) {
+    React.useEffect(
+      () => () => {
+        queryClient.cancelQueries();
+        queryClient.clear();
+      },
+      [],
+    );
+
+    return (
+      <QueryClientProvider client={queryClient}>
+        <PredictPreviewSheetProvider>
+          <PredictMarketDetails {...(props as object)} />
+        </PredictPreviewSheetProvider>
+      </QueryClientProvider>
+    );
+  };
 }
 
 /**
diff --git a/tests/docs/PLAYWRIGHT_LOCAL_EMULATOR.md b/tests/docs/PLAYWRIGHT_LOCAL_EMULATOR.md
index 542353897bdd..6752855cb7a7 100644
--- a/tests/docs/PLAYWRIGHT_LOCAL_EMULATOR.md
+++ b/tests/docs/PLAYWRIGHT_LOCAL_EMULATOR.md
@@ -31,6 +31,14 @@ We keep Appium’s reset flags **mild** in [`EmulatorConfigBuilder`](../framewor
 
 > **Note:** `noReset: true` for the **Appium session** still means the driver is not asked to wipe app data on its own. After `globalSetup`’s explicit uninstall+install, the app is freshly installed for that run.
 
+## Session reuse (local emulator)
+
+Playwright Appium runs on emulator/simulator **reuse one WDIO session per worker** by default (`APPIUM_SESSION_REUSE`). Between tests, `withFixtures({ restartDevice: true })` soft-reloads the app (clear data + launch + fixture bootstrap) without `deleteSession`.
+
+- **Disable reuse:** `APPIUM_SESSION_REUSE=false`
+- **BrowserStack:** reuse is always off
+- Details: [appium-smoke-testing.md](../../docs/testing/appium-smoke-testing.md#session-reuse-and-soft-reload)
+
 ## Android device targeting
 
 For Android, the adb serial is resolved from `use.device.name` (AVD name) or `use.device.udid` — see [`resolveAndroidAdbUdid`](../framework/services/providers/emulator/android/resolveAndroidAdbUdid.ts) and the `EmulatorConfig` JSDoc in [`types.ts`](../framework/types.ts).
@@ -61,3 +69,5 @@ Get available Simulators:
 - [`reinstallLocalBuildFromPath`](../framework/services/providers/emulator/reinstallLocalBuildFromPath.ts) — `adb` / `simctl` install helpers.
 - `EmulatorProvider.globalSetup` — path check, then reinstall when `buildPath` is set; or `isAppInstalled()` when unset.
 - `EmulatorProvider.getDriver` / `EmulatorConfigBuilder.build` — capabilities including `appium:app` when `buildPath` is set.
+- Worker session reuse — [`sessionReuse.ts`](../framework/fixtures/playwright/sessionReuse.ts), [`driver.fixture.ts`](../framework/fixtures/playwright/driver.fixture.ts).
+- Soft reload — [`softReloadApp.ts`](../framework/services/appium/softReloadApp.ts).
diff --git a/tests/docs/README.md b/tests/docs/README.md
index d22586ae40ca..049d5999b414 100644
--- a/tests/docs/README.md
+++ b/tests/docs/README.md
@@ -13,8 +13,8 @@
 
 ## E2E Framework Structure
 
-- **Smoke Testing Scenarios (`tests/smoke/`)** - Smoke Test files organized by feature (Detox)
-- **Appium smoke (`tests/smoke-appium/`)** - Playwright + Appium smoke parity with `tests/smoke/` — see [appium-smoke-testing.md](../../docs/testing/appium-smoke-testing.md)
+- **Appium smoke (`tests/smoke-appium/`)** — Primary E2E path for new coverage (Playwright + Appium). See [appium-smoke-testing.md](../../docs/testing/appium-smoke-testing.md)
+- **Legacy Detox smoke (`tests/smoke/`)** — Do not add new coverage here; treat as gone for new work
 - **TypeScript Framework (`tests/framework/`)**: Modern testing framework with type safety
 - **Page Objects (`tests/page-objects/`)**: Page Object Model implementation
 - **Selectors (`tests/selectors/`)**: Element selectors organized by feature
@@ -34,8 +34,8 @@
 **Key E2E Directories:**
 
 - `tests/framework/` - TypeScript framework foundation (USE THIS)
-- `tests/smoke/` - Detox smoke tests organized by feature
-- `tests/smoke-appium/` - Appium smoke tests (Playwright); same layout as `tests/smoke/`
+- `tests/smoke-appium/` - Appium smoke tests (Playwright); primary path for new specs
+- `tests/smoke/` - Legacy Detox smoke (do not add new coverage)
 - `tests/page-objects/` - Page Object classes following POM pattern
 - `tests/selectors/` - Element selectors (avoid direct use in tests)
 - `tests/api-mocking/` - API mocking utilities and responses
@@ -66,7 +66,7 @@ await withFixtures(
 - ✅ **ALWAYS** import from `tests/framework/index.ts` (not individual files)
 - ✅ **ALWAYS** use modern TypeScript framework methods
 - ❌ **NEVER** use legacy methods marked with `@deprecated`
-- ❌ **NEVER** use `TestHelpers.delay()` - use proper waiting instead
+- ❌ **NEVER** use fixed delays (`setTimeout` / bare `sleep`) when waiting for UI — use Assertions instead
 
 **Page Object Model (REQUIRED):**
 
@@ -74,7 +74,7 @@ await withFixtures(
 - ✅ **ALWAYS** define element selectors in page objects or selector files
 - ✅ **ALWAYS** access UI elements through page object methods
 - ❌ **NEVER** use `element(by.id())` directly in test specs
-- ❌ **NEVER** use raw Detox assertions in test specs
+- ❌ **NEVER** use raw driver assertions or Detox APIs in new specs
 
 **Test Structure Requirements:**
 
@@ -256,8 +256,8 @@ export default new WalletView();
 **❌ PROHIBITED Patterns:**
 
 ```typescript
-// DON'T: Use TestHelpers.delay()
-await TestHelpers.delay(5000);
+// DON'T: Use fixed delays when waiting for UI
+await sleep(5000);
 
 // DON'T: Use deprecated methods
 await Assertions.checkIfVisible(element);
@@ -265,7 +265,7 @@ await Assertions.checkIfVisible(element);
 // DON'T: Use direct element selectors in tests
 element(by.id('send-button')).tap();
 
-// DON'T: Use raw Detox assertions
+// DON'T: Use raw driver assertions or Detox APIs in new specs
 await waitFor(element).toBeVisible();
 
 // DON'T: Missing descriptions
@@ -317,7 +317,7 @@ await Utilities.executeWithRetry(
 
 - [ ] Uses `withFixtures` pattern for test setup
 - [ ] Imports from `tests/framework/index.ts` (not individual files)
-- [ ] No usage of `TestHelpers.delay()` or `setTimeout()`
+- [ ] No fixed delays (`setTimeout` / bare `sleep`) when waiting for UI — use Assertions instead
 - [ ] No deprecated methods (check `@deprecated` tags)
 - [ ] All assertions have descriptive `description` parameters
 - [ ] All gestures have descriptive `description` parameters
@@ -331,9 +331,10 @@ await Utilities.executeWithRetry(
 
 ## Existing tooling
 
-| Tool                 | Type              | Current use          | When to use                                                                                                         | Notes and Limitations                                                                                                                                                                                                                                                                         |
-| -------------------- | ----------------- | -------------------- | ------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Component View Tests | White box testing | UI integration tests | - When following a full user flow is not needed <br> - When we want to test individual component and view rendering | - Does **not** require builds <br> - Low cost (faster runtime) <br> - Fast feedback loop                                                                                                                                                                                                      |
-| Detox                | Grey box testing  | E2E                  | - When we want to test user flows <br> - Run on PR basis                                                            | - High cost <br> - Low tool (detox) maintenance <br> - JS/TS based test files <br> - Handles deeply nested elements better (easier to find and locate elements) <br> - Uses emulators/simulators <br> - Allows runs with local Builds <br> - Can't be used with real devices (cloud included) |
-| Maestro              | Black box testing | TBD                  | TBD                                                                                                                 | - **Still in experimentation phase (!)** <br> - Struggles with deeply nested elements <br> - YAML based spec files <br> - Allows runs with local builds <br> - Can run on real devices (cloud) but can't be used with real devices                                                            |
-| Appium               | Black box testing | Performance tests    | - When we want to test user flows as a end user <br> - When we want to measure and report performance stats         | - High cost <br> - Struggles with deeply nested <br> - Uses a Cloud provider for real device testing elements <br> - Does not allow runs with local builds                                                                                                                                    |
+| Tool                      | Type              | Current use          | When to use                                                                                                         | Notes and Limitations                                                                                                                                                                                                              |
+| ------------------------- | ----------------- | -------------------- | ------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Component View Tests      | White box testing | UI integration tests | - When following a full user flow is not needed <br> - When we want to test individual component and view rendering | - Does **not** require builds <br> - Low cost (faster runtime) <br> - Fast feedback loop                                                                                                                                           |
+| Appium smoke (Playwright) | Black box testing | **Current E2E**      | - New smoke / user-flow coverage <br> - PR and CI smoke (`tests/smoke-appium/`)                                     | - Uses `main-e2e` builds and Playwright fixture <br> - See [appium-smoke-testing.md](../../docs/testing/appium-smoke-testing.md) <br> - Page objects use `Gestures` / `Assertions` / `Matchers` facades                            |
+| Detox                     | Grey box testing  | Legacy E2E           | - Maintaining existing `tests/smoke/` specs only — **do not add new Detox coverage**                                | - High cost <br> - JS/TS based test files <br> - Uses emulators/simulators <br> - Being phased out in favor of Appium smoke                                                                                                        |
+| Maestro                   | Black box testing | TBD                  | TBD                                                                                                                 | - **Still in experimentation phase (!)** <br> - Struggles with deeply nested elements <br> - YAML based spec files <br> - Allows runs with local builds <br> - Can run on real devices (cloud) but can't be used with real devices |
+| Appium (WDIO / cloud)     | Black box testing | Performance tests    | - When we want to test user flows as an end user <br> - When we want to measure and report performance stats        | - High cost <br> - Struggles with deeply nested elements <br> - Uses a cloud provider for real device testing <br> - Separate from Appium smoke / Playwright path                                                                  |
diff --git a/tests/docs/UNIFIED_E2E_ARCHITECTURE.md b/tests/docs/UNIFIED_E2E_ARCHITECTURE.md
index 7d83f356867f..a298e59acaf9 100644
--- a/tests/docs/UNIFIED_E2E_ARCHITECTURE.md
+++ b/tests/docs/UNIFIED_E2E_ARCHITECTURE.md
@@ -1,295 +1,59 @@
-# Final Architecture - Unified E2E Framework
+# E2E Architecture (Appium)
 
 ## Overview
 
-A clean, layered architecture for writing page objects that work with **both Detox and WebdriverIO**.
+Page objects and smoke specs target **Appium + Playwright** (`tests/smoke-appium/`). Use the canonical facades from `tests/framework/index.ts`:
 
-## Architecture Layers
+- `Matchers` — element locators
+- `Gestures` — taps, typing, swipes, scrolls
+- `Assertions` — waits and expectations
 
-### Complete Stack
+Do **not** import `UnifiedGestures` in page objects or specs. It remains an internal dual-runner implementation detail used by `Gestures` on Appium until Detox removal is complete.
+
+## Layers
 
 ```
 ┌─────────────────────────────────────────────────────────────┐
-│              Page Objects (Your Code)                       │
-│       - LoginView, SettingsView, etc.                       │
+│ Page Objects (Your Code) │
+│ - LoginView, SettingsView, etc. │
 └─────────────────────────────────────────────────────────────┘
-                              ↓
-        ┌─────────────────────────────────────┐
-        │   Element Locators (encapsulated)   │
-        │     detox: () => Matchers...        │
-        │     appium: () => PlaywrightMatchers│
-        └─────────────────────────────────────┘
-                              ↓
-                  ┌───────────┴───────────┐
-                  ↓                       ↓
-        ┌─────────────────┐     ┌──────────────────┐
-        │  DetoxElement   │     │ PlaywrightElement │
-        │  (Promise)      │     │  (Promise)        │
-        └─────────────────┘     └──────────────────┘
-                  ↓                       ↓
-        ┌─────────────────┐     ┌──────────────────┐
-        │    Matchers     │     │PlaywrightMatchers│
-        │    (Detox)      │     │  (WebdriverIO)   │
-        │  - getByID      │     │  - getByXPath    │
-        │  - getByText    │     │  - getByText     │
-        │  - getByLabel   │     │  - getByAccessID │
-        └─────────────────┘     └──────────────────┘
-                              ↓
-                  ┌───────────┴───────────┐
-                  ↓                       ↓
-        ┌─────────────────┐     ┌──────────────────┐
-        │    Gestures     │     │PlaywrightGestures│
-        │    (Detox)      │     │  (WebdriverIO)   │
-        └─────────────────┘     └──────────────────┘
-                              ↓
-        ┌─────────────────────────────────────┐
-        │      Detox / WebdriverIO APIs       │
-        │   (Native element interactions)     │
-        └─────────────────────────────────────┘
-```
-
-### Locator Flow in Detail
-
-```
-Page Object Getter
-       ↓
-encapsulated({
-  detox: () => Matchers.getElementByID('my-id'),      ← Function
-  appium: () => PlaywrightMatchers.getByXPath('...')  ← Function
-})
-       ↓
-FrameworkDetector.detect()
-       ↓
-  ┌────┴─────┐
-  ↓          ↓
-DETOX      APPIUM
-  ↓          ↓
-Execute    Execute
-detox()    appium()
-  ↓          ↓
-Matchers   PlaywrightMatchers
-.getByID   .getByXPath
-  ↓          ↓
-element(   driver.$
-by.id())   (xpath)
-  ↓          ↓
-Returns    Returns
-DetoxElement  Promise<PlaywrightElement>
-```
-
-## Core Components
-
-### 1. Element Locators (Function-Based) - The Foundation
-
-**Pattern:**
-
-```typescript
-get passwordInput(): EncapsulatedElementType {
-  return encapsulated({
-    detox: () => Matchers.getElementByID('password-input'),
-    appium: () => PlaywrightMatchers.getByXPath('//*[@resource-id="password-input"]'),
-  });
-}
-```
-
-**Locator Levels Explained:**
-
-```
-Level 1: Page Object Getter
-         ↓
-get passwordInput(): EncapsulatedElementType
-
-Level 2: Encapsulated Configuration
-         ↓
-return encapsulated({
-  detox: () => Matchers.getElementByID('password-input'),
-  appium: () => PlaywrightMatchers.getByXPath('//*[@resource-id="password-input"]')
-})
-
-Level 3: Framework Detection
-         ↓
-FrameworkDetector.detect()
-         ↓
-    ┌────┴────┐
-    ↓         ↓
-  DETOX    APPIUM
-
-Level 4: Execute Locator Function
-         ↓         ↓
-  detox()    appium()
-         ↓         ↓
-  Matchers   PlaywrightMatchers
-
-Level 5: Find Element
-         ↓         ↓
-element(by.id)  driver.$(xpath)
-         ↓         ↓
-  DetoxElement  PlaywrightElement
-```
-
-**Key Points:**
-
-- ✅ **Level 1-2:** Define once in page object
-- ✅ **Level 3:** Automatic framework detection
-- ✅ **Level 4-5:** Execute appropriate locator
-- ✅ **Level 6 (Optional):** Unwrap for direct WebdriverIO access
-- ✅ Use functions that return elements (lazy evaluation)
-- ✅ Leverage existing `Matchers` helpers
-- ✅ No new patterns to learn
-
-**When to Use `unwrap()`:**
-
-```typescript
-// ✅ Most cases - use PlaywrightElement API
-const elem = await asPlaywrightElement(LoginView.passwordInput);
-await elem.fill('text');
-await elem.click();
-
-// ✅ When you need WebdriverIO-specific methods
-const elem = await asPlaywrightElement(LoginView.passwordInput);
-const wdioElem = elem.unwrap();
-await wdioElem.touchAction([{ action: 'longPress', x: 100, y: 200 }]);
-await wdioElem.moveTo({ xOffset: 50, yOffset: 50 });
-await wdioElem.dragAndDrop(targetElement);
-// Any ChainablePromiseElement method!
+↓
+Matchers / Gestures / Assertions
+↓
+Appium (Playwright) adapters & strategies
+↓
+Device / emulator APIs
 ```
 
-**Real Example with Values:**
+## Default page object pattern
 
 ```typescript
-// Level 1: Page Object
-get passwordInput(): EncapsulatedElementType {
-  // Level 2: Encapsulated configuration
-  return encapsulated({
-    detox: () => Matchers.getElementByID('login-password-input'),
-    appium: () => PlaywrightMatchers.getByXPath('//*[@resource-id="login-password-input"]')
-  });
-}
-
-// When used in test:
-await LoginView.enterPassword('MyPassword123');
-         ↓
-// Level 3: Framework detected = APPIUM
-         ↓
-// Level 4: Execute appium() function
-         ↓
-PlaywrightMatchers.getByXPath('//*[@resource-id="login-password-input"]')
-         ↓
-// Level 5: WebdriverIO finds element
-         ↓
-driver.$('//*[@resource-id="login-password-input"]')
-         ↓
-// Returns: PlaywrightElement wrapping the WebdriverIO element
-         ↓
-await elem.fill('MyPassword123');
-
-// Optional Level 6: Unwrap for low-level access
-         ↓
-const wdioElement = elem.unwrap();
-         ↓
-// Direct WebdriverIO API access when needed
-await wdioElement.touchAction([...]);
-await wdioElement.moveTo();
-await wdioElement.getAttribute('content-desc');
-// ... any WebdriverIO ChainablePromiseElement method
-```
-
-**Key Points:**
+import Matchers from '../framework/Matchers';
+import Gestures from '../framework/Gestures';
+import Assertions from '../framework/Assertions';
 
-- ✅ Framework detection encapsulated
-- ✅ Proxies to appropriate implementation
-- ✅ Clean API for page objects
-
-### 3. PlaywrightGestures (WebdriverIO Wrapper)
-
-**Purpose:** Wrapper around PlaywrightElement API, future enhancement point.
-
-**Current:** Simple wrappers
-
-```typescript
-static async tap(elem: PlaywrightElement): Promise<void> {
-  await elem.tap();
-}
-```
-
-**Future:** Can add retries, stability, logging
-
-```typescript
-static async tap(elem: PlaywrightElement): Promise<void> {
-  await Utilities.executeWithRetry(async () => {
-    await elem.waitForDisplayed();
-    await elem.tap();
-  }, { timeout: 10000 });
-}
-```
-
-## Usage Patterns
-
-### Pattern 1: UnifiedGestures (Recommended for Simple Cases)
-
-```typescript
-class LoginView {
-  get passwordInput(): EncapsulatedElementType {
-    return encapsulated({
-      detox: () => Matchers.getElementByID('password'),
-      appium: () =>
-        PlaywrightMatchers.getByXPath('//*[@resource-id="password"]'),
-    });
+class LoginPage {
+  get passwordInput() {
+    return Matchers.getElementByID('login-password-input');
   }
 
-  // Clean - no framework detection!
   async enterPassword(password: string): Promise<void> {
-    await UnifiedGestures.replaceText(this.passwordInput, password);
-  }
-
-  async tapSubmit(): Promise<void> {
-    await UnifiedGestures.tap(this.submitButton);
+    await Gestures.typeText(this.passwordInput, password, {
+      elemDescription: 'password input',
+    });
   }
 }
-```
-
-### Pattern 2: Direct Gestures (For Complex Cases)
 
-```typescript
-class LoginView {
-  // When you need framework-specific options
-  async complexEntry(password: string): Promise<void> {
-    if (FrameworkDetector.isDetox()) {
-      await Gestures.typeText(this.passwordInput as DetoxElement, password, {
-        checkStability: true,
-        clearFirst: true,
-        hideKeyboard: true,
-      });
-    } else {
-      const elem = (await this.passwordInput) as PlaywrightElement;
-      await PlaywrightGestures.fill(elem, password);
-      // Future: Add custom retry logic here
-    }
-  }
-}
+export default new LoginPage();
 ```
 
-### Pattern 3: Mixed (Best of Both)
+## When to branch
 
-```typescript
-class MyPage {
-  // Simple actions - use UnifiedGestures
-  async tapButton(): Promise<void> {
-    await UnifiedGestures.tap(this.button);
-  }
+Prefer the same `Matchers` / `Gestures` / `Assertions` call for iOS and Android.
 
-  // Complex actions - use direct Gestures
-  async complexFlow(): Promise<void> {
-    if (FrameworkDetector.isDetox()) {
-      await Gestures.tap(this.element as DetoxElement, {
-        checkStability: true,
-        timeout: 10000,
-      });
-    } else {
-      // Direct PlaywrightGestures access
-      const elem = (await this.element) as PlaywrightElement;
-      await PlaywrightGestures.tap(elem);
-    }
-  }
-}
-```
+- Different testID / platform locator → `resolve({ testID, iosAppiumTestID, ... })`
+- Different selector strategy → `encapsulated({ appium: () => ... })` (legacy `detox` key may still exist for unmigrated suites; new work should not add Detox branches)
+- Structurally different action flow → `encapsulatedAction({ appium: async () => ... })`
+
+Canonical guide: [docs/testing/e2e-testing.md](../../docs/testing/e2e-testing.md).  
+Runbook: [docs/testing/appium-smoke-testing.md](../../docs/testing/appium-smoke-testing.md).
diff --git a/tests/docs/UNIFIED_GESTURES_MIGRATION.md b/tests/docs/UNIFIED_GESTURES_MIGRATION.md
index 4df498f32699..a20b93162282 100644
--- a/tests/docs/UNIFIED_GESTURES_MIGRATION.md
+++ b/tests/docs/UNIFIED_GESTURES_MIGRATION.md
@@ -1,224 +1,53 @@
-# Unified Gestures Migration Guide
+# Migrate off UnifiedGestures → Gestures
 
-## Overview
+## Why
 
-`UnifiedGestures` is a static facade that lets page objects execute gestures without knowing whether Detox or Appium/WebdriverIO is running. It uses the **Strategy pattern**: a single `GestureStrategy` interface with two implementations (`DetoxGestureStrategy` and `AppiumGestureStrategy`), selected once at startup.
+`Gestures` is the **canonical** interaction API for Appium smoke. `UnifiedGestures` is a legacy dual-runner facade. New page objects and specs must use `Gestures` only (ESLint enforces this: error in smoke specs, warn in page objects).
 
-```
-Page Objects  →  UnifiedGestures (static)  →  GestureStrategy (interface)
-                                                  ├── DetoxGestureStrategy   → Gestures (existing)
-                                                  └── AppiumGestureStrategy  → PlaywrightElement / PlaywrightGestures
-```
-
-This is the **action** counterpart to `encapsulated()` (which handles element locators). Together they let you write fully framework-agnostic page objects.
-
-## Available Methods
-
-| Method                                       | Description                                                                    |
-| -------------------------------------------- | ------------------------------------------------------------------------------ |
-| `tap(elem, opts?)`                           | Tap an element                                                                 |
-| `waitAndTap(elem, opts?)`                    | Wait for visibility then tap                                                   |
-| `typeText(elem, text, opts?)`                | Clear field and type text                                                      |
-| `replaceText(elem, text, opts?)`             | Replace existing text                                                          |
-| `swipe(elem, direction, opts?)`              | Swipe in a direction                                                           |
-| `scrollToElement(target, scrollView, opts?)` | Scroll until target is visible                                                 |
-| `longPress(elem, opts?)`                     | Long press an element                                                          |
-| `dblTap(elem, opts?)`                        | Double tap an element                                                          |
-| `tapAtPoint(elem, point, opts?)`             | Tap at specific {x, y} coordinates on an element                               |
-| `tapAtIndex(elem, index, opts?)`             | Tap the nth matching element (accepts single element or `PlaywrightElement[]`) |
-
-All methods accept optional `UnifiedGestureOptions`:
-
-```typescript
-interface UnifiedGestureOptions {
-  timeout?: number; // Max wait time in ms
-  description?: string; // For logging / error messages
-  hideKeyboard?: boolean; // Dismiss keyboard after typing (default: true)
-  clearFirst?: boolean; // Clear field before typing — Detox only (default: true)
-}
-```
+On Appium, `Gestures` already delegates to the Appium strategy — calling `UnifiedGestures` from page objects is redundant and confusing for agents/humans.
 
-## Migration Steps
+## Migration steps (existing POs)
 
-### 1. Update element getters to use `encapsulated()`
-
-If your page object still uses Detox-only matchers, convert them first:
+### 1. Change the import
 
 ```typescript
 // Before
-get passwordInput(): DetoxElement {
-  return Matchers.getElementByID(LoginViewSelectors.PASSWORD_INPUT);
-}
+import UnifiedGestures from '../../framework/UnifiedGestures';
+// or
+import { UnifiedGestures } from '../../framework';
 
 // After
-get passwordInput(): EncapsulatedElementType {
-  return encapsulated({
-    detox: () => Matchers.getElementByID(LoginViewSelectors.PASSWORD_INPUT),
-    appium: () => PlaywrightMatchers.getElementById(LoginViewSelectors.PASSWORD_INPUT),
-  });
-}
-```
-
-### 2. Replace `Gestures.*` calls with `UnifiedGestures.*`
-
-```typescript
-// Before
+import Gestures from '../../framework/Gestures';
+// or
 import { Gestures } from '../../framework';
-
-async enterPassword(password: string) {
-  await Gestures.typeText(this.passwordInput, password, {
-    hideKeyboard: true,
-    elemDescription: 'password field',
-  });
-}
-
-// After
-import { UnifiedGestures } from '../../framework';
-
-async enterPassword(password: string) {
-  await UnifiedGestures.typeText(this.passwordInput, password, {
-    description: 'password field',
-    hideKeyboard: true,
-  });
-}
 ```
 
-Framework-specific options like `checkStability` are still handled per strategy. `hideKeyboard` and `clearFirst` are unified:
+### 2. Rename call sites
 
-- **Detox**: forwarded to `Gestures.typeText` (`hideKeyboard` appends `\n`; default both `true`)
-- **Appium**: `fill()` then `PlaywrightGestures.hideKeyboard()` when `hideKeyboard` is true (default `true`)
-
-### 3. Handle edge cases with `encapsulatedAction()`
-
-For the rare ~3% of methods where Detox and Appium need structurally different flows:
-
-```typescript
-import { encapsulatedAction } from '../../framework';
-
-async dismissOnboarding() {
-  await encapsulatedAction({
-    detox: async () => {
-      await Gestures.swipe(this.overlay, 'up');
-      await Gestures.tap(this.dismissButton);
-    },
-    appium: async () => {
-      const btn = await asPlaywrightElement(this.dismissButton);
-      await btn.click();
-    },
-  });
-}
-```
+| Before                                 | After                           |
+| -------------------------------------- | ------------------------------- |
+| `UnifiedGestures.tap(...)`             | `Gestures.tap(...)`             |
+| `UnifiedGestures.waitAndTap(...)`      | `Gestures.waitAndTap(...)`      |
+| `UnifiedGestures.typeText(...)`        | `Gestures.typeText(...)`        |
+| `UnifiedGestures.replaceText(...)`     | `Gestures.replaceText(...)`     |
+| `UnifiedGestures.swipe(...)`           | `Gestures.swipe(...)`           |
+| `UnifiedGestures.scrollToElement(...)` | `Gestures.scrollToElement(...)` |
+| `UnifiedGestures.longPress(...)`       | `Gestures.longPress(...)`       |
+| `UnifiedGestures.dblTap(...)`          | `Gestures.dblTap(...)`          |
+| `UnifiedGestures.tapAtPoint(...)`      | `Gestures.tapAtPoint(...)`      |
+| `UnifiedGestures.tapAtIndex(...)`      | `Gestures.tapAtIndex(...)`      |
 
-Both `detox` and `appium` branches are **optional** — you can provide only one when the method only exists for a single framework. This is useful during incremental migration when porting a method that has no equivalent on the other side:
+### 3. Option naming
 
-```typescript
-// Only the appium branch is needed — Detox doesn't have this flow
-async waitForScreenToDisplay() {
-  await encapsulatedAction({
-    appium: async () => {
-      const element = await asPlaywrightElement(this.title);
-      await element.waitForDisplayed({ timeout: 15000 });
-    },
-  });
-}
-```
-
-If the active framework doesn't have a matching branch, `encapsulatedAction` throws an error to catch misconfiguration early.
-
-## Escape Hatch
-
-When the unified approach becomes overly complex for a specific case, you can always use `FrameworkDetector` or `PlatformDetector` directly for custom conditional logic:
-
-```typescript
-import { FrameworkDetector } from '../../framework';
-
-async complexSpecialCase() {
-  if (FrameworkDetector.isDetox()) {
-    // Detox-specific multi-step flow
-  } else {
-    // Appium-specific multi-step flow
-  }
-}
-```
-
-This should be the last resort. Prefer `UnifiedGestures` > `encapsulatedAction()` > direct `FrameworkDetector` checks, in that order.
-
-## Full Before/After Example
-
-### Before (Detox-only)
-
-```typescript
-import { Gestures, Matchers } from '../../framework';
-import { LoginViewSelectors } from '../../selectors/LoginView.selectors';
-
-class LoginView {
-  get passwordInput(): DetoxElement {
-    return Matchers.getElementByID(LoginViewSelectors.PASSWORD_INPUT);
-  }
-
-  get loginButton(): DetoxElement {
-    return Matchers.getElementByID(LoginViewSelectors.LOGIN_BUTTON);
-  }
-
-  async login(password: string) {
-    await Gestures.typeText(this.passwordInput, password, {
-      hideKeyboard: true,
-      elemDescription: 'password input',
-    });
-    await Gestures.waitAndTap(this.loginButton, {
-      elemDescription: 'login button',
-    });
-  }
-}
-```
-
-### After (Unified)
-
-```typescript
-import { UnifiedGestures } from '../../framework';
-import {
-  encapsulated,
-  EncapsulatedElementType,
-  Matchers,
-  PlaywrightMatchers,
-} from '../../framework';
-import { LoginViewSelectors } from '../../selectors/LoginView.selectors';
-
-class LoginView {
-  get passwordInput(): EncapsulatedElementType {
-    return encapsulated({
-      detox: () => Matchers.getElementByID(LoginViewSelectors.PASSWORD_INPUT),
-      appium: () =>
-        PlaywrightMatchers.getElementById(LoginViewSelectors.PASSWORD_INPUT),
-    });
-  }
-
-  get loginButton(): EncapsulatedElementType {
-    return encapsulated({
-      detox: () => Matchers.getElementByID(LoginViewSelectors.LOGIN_BUTTON),
-      appium: () =>
-        PlaywrightMatchers.getElementById(LoginViewSelectors.LOGIN_BUTTON),
-    });
-  }
-
-  async login(password: string) {
-    await UnifiedGestures.typeText(this.passwordInput, password, {
-      description: 'password input',
-    });
-    await UnifiedGestures.waitAndTap(this.loginButton, {
-      description: 'login button',
-    });
-  }
-}
-```
+Prefer Gestures option names already used in the codebase (`elemDescription`, etc.). If a call used Unified-only `description`, map it to the Gestures equivalent used by neighboring methods in the same file.
 
-## FAQ
+## Do not
 
-**Q: Does this change existing Detox test behavior?**
-No. `DetoxGestureStrategy` wraps the existing `Gestures` class — all retry logic, stability checks, and platform-specific scroll behavior are preserved.
+- Do not add new `UnifiedGestures` imports.
+- Do not remove the `UnifiedGestures` export from `tests/framework/index.ts` until Phase 2 cleanup (breaks remaining call sites and `Gestures` internals).
+- Full repo-wide codemod is **Phase 2** (after Detox smoke is empty).
 
-**Q: What if I need a Detox-specific option like `checkStability`?**
-Use `encapsulatedAction()` and call `Gestures` directly in the Detox branch.
+## Canonical docs
 
-**Q: Can I still use `Gestures` directly?**
-Yes. The `Gestures` class is not removed or modified. For Detox-only page objects that haven't been migrated, `Gestures` works exactly as before.
+- [docs/testing/e2e-testing.md](../../docs/testing/e2e-testing.md)
+- [docs/testing/appium-smoke-testing.md](../../docs/testing/appium-smoke-testing.md)
diff --git a/tests/feature-flags/feature-flag-registry.test.ts b/tests/feature-flags/feature-flag-registry.test.ts
index 2e987a20ebab..4fba263a67fc 100644
--- a/tests/feature-flags/feature-flag-registry.test.ts
+++ b/tests/feature-flags/feature-flag-registry.test.ts
@@ -139,6 +139,7 @@ describe('Feature Flag Registry', () => {
 
       expect(flagNames).toContain('bridgeConfigV2');
       expect(flagNames).toContain('bitcoinAccounts');
+      expect(flagNames).toContain('stellarAccounts');
       expect(flagNames).toContain('tronAccounts');
       expect(flagNames).toContain('tronClaimUnstakedTrxButtonEnabled');
     });
@@ -155,6 +156,7 @@ describe('Feature Flag Registry', () => {
       const defaults = getProductionRemoteFlagDefaults();
       expect(defaults.assetsDefiPositionsEnabled).toBe(true);
       expect(defaults.bitcoinTestnetsEnabled).toBe(false);
+      expect(defaults.moneyAccountBalanceSource).toBe('rpc');
     });
 
     it('only includes remote production flags', () => {
diff --git a/tests/feature-flags/feature-flag-registry.ts b/tests/feature-flags/feature-flag-registry.ts
index 7dde76a22923..f7c57f1a0d5a 100644
--- a/tests/feature-flags/feature-flag-registry.ts
+++ b/tests/feature-flags/feature-flag-registry.ts
@@ -238,6 +238,20 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     status: FeatureFlagStatus.Active,
   },
 
+  defiControllerV2: {
+    name: 'defiControllerV2',
+    type: FeatureFlagType.Remote,
+    inProd: false,
+    productionDefault: {
+      versions: {
+        '8.5.0': {
+          enabled: false,
+        },
+      },
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
   assetsEnableNotificationsByDefault: {
     name: 'assetsEnableNotificationsByDefault',
     type: FeatureFlagType.Remote,
@@ -3440,6 +3454,14 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     status: FeatureFlagStatus.Active,
   },
 
+  earnMoneyCardTiltAnimationEnabled: {
+    name: 'earnMoneyCardTiltAnimationEnabled',
+    type: FeatureFlagType.Remote,
+    inProd: false,
+    productionDefault: false,
+    status: FeatureFlagStatus.Active,
+  },
+
   earnMoneyFirstTimeDepositAnimationEnabled: {
     name: 'earnMoneyFirstTimeDepositAnimationEnabled',
     type: FeatureFlagType.Remote,
@@ -5138,6 +5160,29 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     status: FeatureFlagStatus.Active,
   },
 
+  swapsSWAPS4784AbtestCTAButtonColor: {
+    name: 'swapsSWAPS4784AbtestCTAButtonColor',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: [
+      {
+        name: 'control',
+        scope: {
+          type: 'percentage_rollout',
+          value: 0.5,
+        },
+      },
+      {
+        name: 'treatment',
+        scope: {
+          type: 'percentage_rollout',
+          value: 1,
+        },
+      },
+    ],
+    status: FeatureFlagStatus.Active,
+  },
+
   tempoConfig: {
     name: 'tempoConfig',
     type: FeatureFlagType.Remote,
@@ -5513,48 +5558,6 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     status: FeatureFlagStatus.Active,
   },
 
-  predictWorldCup: {
-    name: 'predictWorldCup',
-    type: FeatureFlagType.Remote,
-    inProd: true,
-    productionDefault: {
-      enabled: true,
-      minimumVersion: '7.79.0',
-      showMainFeedBanner: true,
-      showMainFeedTab: true,
-      showWorldCupScreen: true,
-      stages: [
-        {
-          eventIds: [
-            '632707',
-            '636318',
-            '640346',
-            '636324',
-            '640353',
-            '640358',
-            '643861',
-            '643867',
-            '643872',
-            '636329',
-            '643876',
-            '643880',
-            '643884',
-            '640362',
-            '640364',
-            '643888',
-          ],
-          key: 'round_of_32',
-        },
-      ],
-      bannerImage: {
-        height: 354,
-        url: 'https://braze-images.com/appboy/communication/assets/image_assets/images/6a29c2c64cef47009e1a3019/original.png',
-        width: 720,
-      },
-    },
-    status: FeatureFlagStatus.Active,
-  },
-
   predictSportsFeed: {
     name: 'predictSportsFeed',
     type: FeatureFlagType.Remote,
@@ -5829,7 +5832,7 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
       id: '',
       title: '',
       description: '',
-      position: 'after-world-cup-banner',
+      position: 'after-featured-carousel',
       severity: 'info',
       dismissible: false,
     },
@@ -5935,6 +5938,14 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     status: FeatureFlagStatus.Active,
   },
 
+  moneyAccountBalanceSource: {
+    name: 'moneyAccountBalanceSource',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: 'rpc',
+    status: FeatureFlagStatus.Active,
+  },
+
   moneyAccountBalanceStaletime: {
     name: 'moneyAccountBalanceStaletime',
     type: FeatureFlagType.Remote,
diff --git a/tests/flows/bitcoin-connection.flow.ts b/tests/flows/bitcoin-connection.flow.ts
deleted file mode 100644
index f0b87aea0103..000000000000
--- a/tests/flows/bitcoin-connection.flow.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import BrowserView from '../page-objects/Browser/BrowserView';
-import ConnectBottomSheet from '../page-objects/Browser/ConnectBottomSheet';
-import ConnectedAccountsModal from '../page-objects/Browser/ConnectedAccountsModal';
-import BitcoinTestDApp from '../page-objects/Browser/BitcoinTestDapp';
-import Assertions from '../framework/Assertions';
-import { navigateToBrowserView } from './browser.flow';
-
-export const account1Short = 'bc1q...yump';
-
-export const signedMessageStandard =
-  '271486823211510961053671593213121630193816218985222159577512714825421410039180175314517251232893341221418210218699217951999213157247101787166209162102702122391448617217326133312849199212551951866224105551902392399522115638752383224419341608718511954214130102';
-
-/**
- * Connects the Bitcoin test dapp to the wallet.
- *
- * @param options.selectAllAccounts - Whether we connect with all accounts or only the default one
- */
-export const connectBitcoinTestDapp = async (
-  options: {
-    selectAllAccounts?: boolean;
-    assert?: () => Promise<void>;
-  } = {},
-): Promise<void> => {
-  const { selectAllAccounts, assert } = options;
-
-  const header = BitcoinTestDApp.getHeader();
-  await header.connect();
-  await header.selectMetaMask();
-  await header.selectStandard();
-
-  if (selectAllAccounts) {
-    await ConnectedAccountsModal.tapAccountListBottomSheet();
-    await ConnectBottomSheet.tapSelectAllButton();
-    await ConnectBottomSheet.tapAccountConnectMultiSelectButton();
-  }
-
-  if (assert) {
-    await assert();
-  }
-
-  await ConnectBottomSheet.tapConnectButton();
-};
-
-export const navigateToBitcoinTestDApp = async (): Promise<void> => {
-  await navigateToBrowserView();
-  await Assertions.expectElementToBeVisible(BrowserView.browserScreenID);
-  await BitcoinTestDApp.navigateToBitcoinTestDApp();
-};
diff --git a/tests/flows/browser.flow.ts b/tests/flows/browser.flow.ts
index e652fbffec80..ea5b62549484 100644
--- a/tests/flows/browser.flow.ts
+++ b/tests/flows/browser.flow.ts
@@ -4,6 +4,7 @@ import Matchers from '../framework/Matchers';
 import Utilities, { sleep } from '../framework/Utilities';
 import BrowserView from '../page-objects/Browser/BrowserView';
 import TestDApp from '../page-objects/Browser/TestDApp';
+import ConnectBottomSheet from '../page-objects/Browser/ConnectBottomSheet';
 import { BrowserViewSelectorsIDs } from '../../app/components/Views/BrowserTab/BrowserView.testIds';
 import { BrowserURLBarSelectorsIDs } from '../../app/components/UI/BrowserUrlBar/BrowserURLBar.testIds';
 import TabBarComponent from '../page-objects/wallet/TabBarComponent';
@@ -226,3 +227,14 @@ export const openUrlInBrowserView = async (): Promise<void> => {
     },
   );
 };
+
+/**
+ * Opens the in-app test dapp and completes the default connect sheet approval.
+ * Assumes the browser tab is already open (e.g. after {@link navigateToBrowserView}).
+ */
+export const connectToTestDapp = async (): Promise<void> => {
+  await BrowserView.navigateToTestDApp();
+  await waitForTestDappToLoad();
+  await TestDApp.tapDappConnectButton();
+  await ConnectBottomSheet.tapConnectButton();
+};
diff --git a/tests/flows/confirmations.flow.ts b/tests/flows/confirmations.flow.ts
new file mode 100644
index 000000000000..bf9582a1a311
--- /dev/null
+++ b/tests/flows/confirmations.flow.ts
@@ -0,0 +1,291 @@
+import Assertions from '../framework/Assertions';
+import ChromeCdpHelpers from '../framework/ChromeCdpHelpers';
+import { getDappUrl } from '../framework/fixtures/FixtureUtils';
+import { PlatformDetector } from '../framework/PlatformLocator';
+import Utilities from '../framework/Utilities';
+import WebView from '../framework/WebView';
+import Browser from '../page-objects/Browser/BrowserView';
+import ConnectBottomSheet from '../page-objects/Browser/ConnectBottomSheet';
+import FooterActions from '../page-objects/Browser/Confirmations/FooterActions';
+import RowComponents from '../page-objects/Browser/Confirmations/RowComponents';
+import TestDApp from '../page-objects/Browser/TestDApp';
+import NetworkListModal from '../page-objects/Network/NetworkListModal';
+import AccountDetails from '../page-objects/MultichainAccounts/AccountDetails';
+import SmartAccount from '../page-objects/MultichainAccounts/SmartAccount';
+import SendView from '../page-objects/Send/RedesignedSendView';
+import AccountListBottomSheet from '../page-objects/wallet/AccountListBottomSheet';
+import NetworkManager from '../page-objects/wallet/NetworkManager';
+import SwitchAccountModal from '../page-objects/wallet/SwitchAccountModal';
+import ActivitiesView from '../page-objects/Transactions/ActivitiesView';
+import TabBarComponent from '../page-objects/wallet/TabBarComponent';
+import WalletView from '../page-objects/wallet/WalletView';
+import { navigateToBrowserView, waitForTestDappToLoad } from './browser.flow';
+import {
+  dismissPushNotificationExistingUserSheet,
+  waitForWalletHomePlaywright,
+} from './wallet.flow';
+
+const LOCAL_CHAIN_NAME = 'Local RPC';
+const LOCAL_CHAIN_CAIP = 'eip155:1337';
+const SMART_ACCOUNT_UPGRADED_ACTIVITY = 'Smart account upgraded';
+const SMART_ACCOUNT_UPGRADING_ACTIVITY = 'Upgrading smart account';
+
+export {
+  LOCAL_CHAIN_CAIP,
+  SMART_ACCOUNT_UPGRADED_ACTIVITY,
+  SMART_ACCOUNT_UPGRADING_ACTIVITY,
+};
+
+/**
+ * Tap a test-dapp WebView button and wait for the confirmation sheet.
+ *
+ * Android: CDP can report a successful DOM click without MetaMask opening
+ * the confirmation sheet. Retry the click when confirm-button never appears.
+ */
+const tapTestDappButtonAndWaitForConfirm = async (
+  buttonId: string,
+  description: string,
+): Promise<void> => {
+  const pageUrl = getDappUrl(0);
+  const confirmTimeoutMs = 30_000;
+
+  if (PlatformDetector.isAndroidAppium()) {
+    ChromeCdpHelpers.resetMetaMaskWebViewCache();
+    const maxAttempts = 3;
+    // Short per-attempt wait so we can re-click within a reasonable budget.
+    const perAttemptConfirmTimeoutMs = 12_000;
+    let lastError: unknown;
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      if (attempt > 1) {
+        ChromeCdpHelpers.resetMetaMaskWebViewCache();
+      }
+      const clicked = await ChromeCdpHelpers.clickByIdInWebView(
+        pageUrl,
+        buttonId,
+      );
+      if (!clicked) {
+        lastError = new Error(
+          `CDP could not click #${buttonId} (${description}) on attempt ${attempt}/${maxAttempts}`,
+        );
+        continue;
+      }
+      try {
+        await FooterActions.waitForConfirmButton(perAttemptConfirmTimeoutMs);
+        return;
+      } catch (error) {
+        lastError = error;
+      }
+    }
+    throw lastError instanceof Error
+      ? lastError
+      : new Error(
+          `Confirmation sheet did not open after clicking #${buttonId} (${description}) in ${maxAttempts} attempts`,
+        );
+  }
+
+  await ChromeCdpHelpers.waitForElementEnabledByIdInWebView(pageUrl, buttonId);
+  await WebView.tapById(buttonId, {
+    pageUrl,
+    description,
+  });
+  await FooterActions.waitForConfirmButton(confirmTimeoutMs);
+};
+
+export const navigateToContractAndTap = async (
+  contractAddress: string,
+  buttonId: string,
+  description: string,
+): Promise<void> => {
+  await navigateToBrowserView();
+  await TestDApp.navigateToTestDappWithContract({
+    contractAddress,
+    scrollTo: buttonId,
+  });
+  await waitForTestDappToLoad();
+  await tapTestDappButtonAndWaitForConfirm(buttonId, description);
+};
+
+export const navigateToTestDappAndTap = async (
+  buttonId: string,
+  description: string,
+): Promise<void> => {
+  await navigateToBrowserView();
+  await Browser.navigateToTestDApp();
+  await waitForTestDappToLoad();
+  await tapTestDappButtonAndWaitForConfirm(buttonId, description);
+};
+
+export const confirmCloseAndAssertActivity = async (
+  activityLabel?: string,
+): Promise<void> => {
+  await FooterActions.tapConfirmButton();
+  // Browser can still "exist" while the confirmation sheet is open.
+  await FooterActions.waitForConfirmButtonGone();
+  await dismissPushNotificationExistingUserSheet();
+
+  await Assertions.expectElementToExist(Browser.browserScreenID, {
+    description: 'Browser screen after confirm',
+  });
+  await Browser.tapCloseBrowserButton();
+  await Assertions.expectElementToBeVisible(
+    TabBarComponent.tabBarWalletButton,
+    {
+      description: 'Wallet tab visible after leaving browser',
+    },
+  );
+  await TabBarComponent.tapActivity();
+  if (activityLabel) {
+    await Assertions.expectTextDisplayed(activityLabel, {
+      description: `Activity row "${activityLabel}"`,
+    });
+  }
+  await Assertions.expectTextDisplayed('Confirmed', {
+    description: 'Activity status Confirmed',
+  });
+};
+
+export const switchToLocalNetworkFromNetworkManager =
+  async (): Promise<void> => {
+    await NetworkManager.navigateToTokensFullView();
+    await NetworkManager.openNetworkManager();
+    await NetworkListModal.tapOnCustomTab();
+    await NetworkListModal.changeNetworkTo(LOCAL_CHAIN_NAME);
+    await NetworkManager.navigateBackFromTokensFullView();
+  };
+
+/**
+ * Wallet → Network Manager → select a popular/default network by name.
+ */
+export const changeNetworkFromNetworkManager = async (
+  networkName: string,
+): Promise<void> => {
+  await TabBarComponent.tapWallet();
+  await NetworkManager.navigateToTokensFullView();
+  await NetworkManager.openNetworkManager();
+  await NetworkListModal.changeNetworkTo(networkName);
+  await NetworkManager.navigateBackFromTokensFullView();
+};
+
+/**
+ * Wallet → Network Manager → Custom tab → select network by name.
+ */
+export const selectCustomNetworkFromNetworkManager = async (
+  networkName: string,
+): Promise<void> => {
+  await TabBarComponent.tapWallet();
+  await NetworkManager.navigateToTokensFullView();
+  await NetworkManager.openNetworkManager();
+  await NetworkListModal.tapOnCustomTab();
+  await NetworkListModal.selectNetworkInCustomTab(networkName);
+  await NetworkManager.navigateBackFromTokensFullView();
+};
+
+/**
+ * Starts a redesigned Send of native ETH amount "5" through the review screen.
+ */
+export const startRedesignedNativeSendFiveEthToReview = async (
+  recipientAddress: string,
+): Promise<void> => {
+  await WalletView.tapWalletSendButton();
+  await SendView.selectEthereumToken();
+  await SendView.pressAmountFiveButton();
+  await SendView.pressContinueButton();
+  await SendView.inputRecipientAddress(recipientAddress);
+  await SendView.pressReviewButton();
+};
+
+/**
+ * Sponsored EIP-7702 native send: review → MetaMask-paid gas → confirm → Activity.
+ * Caller must already be logged in.
+ */
+export const confirmSponsoredNativeSendAndOpenActivity =
+  async (): Promise<void> => {
+    await Assertions.expectElementToBeVisible(RowComponents.GasFeesDetails, {
+      description: 'gas fees row is present on review screen',
+      timeout: 30000,
+    });
+    await Assertions.expectElementToBeVisible(
+      RowComponents.NetworkFeePaidByMetaMask,
+      {
+        description:
+          'network fee shows MetaMask-sponsored gas after relay + simulation settle',
+        timeout: 60000,
+      },
+    );
+    await Utilities.waitForElementToBeVisible(FooterActions.confirmButton);
+    await Utilities.waitForElementToStopMoving(FooterActions.confirmButton, {
+      timeout: 5000,
+      interval: 500,
+      stableCount: 6,
+    });
+    await FooterActions.tapConfirmButton();
+    await TabBarComponent.tapActivity();
+  };
+
+/**
+ * Opens Account 1 details and toggles Local RPC smart-account (EIP-7702 upgrade).
+ * Appium: name-based ellipsis — index-0 can "succeed" without opening details.
+ */
+export const openSmartAccountSwitchForSelectedAccount =
+  async (): Promise<void> => {
+    await WalletView.tapIdenticon();
+    await AccountListBottomSheet.waitForAccountListVisible();
+    await AccountListBottomSheet.tapAccountEllipsisForAccountNameV2(
+      'Account 1',
+    );
+
+    await Assertions.expectElementToExist(AccountDetails.container, {
+      description: 'Account details after tapping account ellipsis',
+      timeout: 15_000,
+    });
+
+    await SwitchAccountModal.tapSmartAccountLink();
+    await Assertions.expectTextDisplayed('Use smart account', {
+      description: 'Smart account network toggle screen',
+      timeout: 15_000,
+    });
+    await SmartAccount.tapSmartAccountSwitchForNetwork(LOCAL_CHAIN_NAME);
+    await FooterActions.waitForConfirmButton();
+  };
+
+/**
+ * After upgrade confirm: Smart Account → Account Details → wallet → Activity,
+ * filtered to Local RPC (redesign "All networks" chip).
+ */
+export const dismissSmartAccountScreensAndOpenFilteredActivity =
+  async (): Promise<void> => {
+    await FooterActions.tapConfirmButton();
+    await FooterActions.waitForConfirmButtonGone();
+    await dismissPushNotificationExistingUserSheet();
+
+    await SwitchAccountModal.tapSmartAccountBackButton();
+    await AccountDetails.tapBackButton();
+    await AccountListBottomSheet.waitForAccountListVisible(10_000);
+    await AccountListBottomSheet.tapAccountByNameV2('Account 1');
+    await waitForWalletHomePlaywright();
+
+    await TabBarComponent.tapActivity();
+    await ActivitiesView.filterByNetwork(LOCAL_CHAIN_CAIP);
+  };
+
+export const assertSmartAccountUpgradeActivity = async (
+  activityTitle: string,
+  timeoutMs = 30_000,
+): Promise<void> => {
+  await Assertions.expectTextDisplayed(activityTitle, {
+    description: `Activity row "${activityTitle}"`,
+    timeout: timeoutMs,
+  });
+};
+
+export const assertUpgradeConfirmationRows = async (): Promise<void> => {
+  await Assertions.expectElementToExist(RowComponents.AccountNetwork, {
+    description: 'Account Network',
+  });
+  await Assertions.expectElementToExist(RowComponents.GasFeesDetails, {
+    description: 'Gas Fees Details',
+  });
+  await Assertions.expectElementToExist(RowComponents.AdvancedDetails, {
+    description: 'Advanced Details',
+  });
+};
diff --git a/tests/flows/snaps.flow.ts b/tests/flows/snaps.flow.ts
index da56731aae2e..da4f1b65af17 100644
--- a/tests/flows/snaps.flow.ts
+++ b/tests/flows/snaps.flow.ts
@@ -1,14 +1,15 @@
 import { Assertions } from '../framework';
-import Utilities from '../framework/Utilities';
 import AccountMenu from '../page-objects/AccountMenu/AccountMenu';
 import BrowserView from '../page-objects/Browser/BrowserView';
 import TestSnaps from '../page-objects/Browser/TestSnaps';
 import SettingsView from '../page-objects/Settings/SettingsView';
 import SnapSettingsView from '../page-objects/Settings/SnapSettingsView';
+import TrendingView from '../page-objects/Trending/TrendingView';
 import TabBarComponent from '../page-objects/wallet/TabBarComponent';
 import WalletView from '../page-objects/wallet/WalletView';
 import { navigateToBrowserView, waitForTestSnapsToLoad } from './browser.flow';
 import { loginToAppPlaywright } from './wallet.flow';
+import { TEST_SNAPS_URL } from '../selectors/Browser/TestSnaps.selectors';
 
 /**
  * Logs in with the e2e wallet fixture and navigates to the test-snaps page.
@@ -43,7 +44,8 @@ export const navigateFromBrowserToSnapSettings = async (): Promise<void> => {
 
 /**
  * Navigate from Snap Settings back to the in-app browser (test-snaps page).
- * Walks back through Snap Settings → Settings → Account menu → browser.
+ * Walks back through Snap Settings → Settings → Account menu → Explore →
+ * Browser, then selects the test-snaps tab by host a11y label.
  */
 export const navigateFromSnapSettingsToBrowser = async (): Promise<void> => {
   await SnapSettingsView.tapBackButton();
@@ -60,6 +62,8 @@ export const navigateFromSnapSettingsToBrowser = async (): Promise<void> => {
   });
   await AccountMenu.tapBack();
 
-  await navigateToBrowserView();
+  await TabBarComponent.tapExploreButton();
+  await TrendingView.tapBrowserButton();
+  await BrowserView.selectTabByPartialUrl(new URL(TEST_SNAPS_URL).origin);
   await waitForTestSnapsToLoad();
 };
diff --git a/tests/flows/solana-connection.flow.ts b/tests/flows/solana-connection.flow.ts
deleted file mode 100644
index 9443151c2d1b..000000000000
--- a/tests/flows/solana-connection.flow.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import BrowserView from '../page-objects/Browser/BrowserView';
-import ConnectBottomSheet from '../page-objects/Browser/ConnectBottomSheet';
-import ConnectedAccountsModal from '../page-objects/Browser/ConnectedAccountsModal';
-import SolanaTestDApp from '../page-objects/Browser/SolanaTestDApp';
-import Assertions from '../framework/Assertions';
-import { navigateToBrowserView } from './browser.flow';
-
-export const account1Short = 'CEQ8...Yrrd';
-export const account2Short = '9Wa2...Dj2U';
-
-/**
- * Connects the Solana test dapp to the wallet.
- *
- * @param options.selectAllAccounts - Whether we connect with all accounts or only the default one
- */
-export const connectSolanaTestDapp = async (
-  options: {
-    selectAllAccounts?: boolean;
-    assert?: () => Promise<void>;
-  } = {},
-): Promise<void> => {
-  const { selectAllAccounts, assert } = options;
-
-  const header = SolanaTestDApp.getHeader();
-  await header.connect();
-  await header.selectMetaMask();
-
-  if (selectAllAccounts) {
-    await ConnectedAccountsModal.tapAccountListBottomSheet();
-    await ConnectBottomSheet.tapSelectAllButton();
-    await ConnectBottomSheet.tapAccountConnectMultiSelectButton();
-  }
-
-  if (assert) {
-    await assert();
-  }
-
-  await ConnectBottomSheet.tapConnectButton();
-};
-
-export const navigateToSolanaTestDApp = async (): Promise<void> => {
-  await navigateToBrowserView();
-  await Assertions.expectElementToBeVisible(BrowserView.browserScreenID);
-  await SolanaTestDApp.navigateToSolanaTestDApp();
-};
diff --git a/tests/flows/wallet.flow.ts b/tests/flows/wallet.flow.ts
index bef075007245..b4941f4e1cfc 100644
--- a/tests/flows/wallet.flow.ts
+++ b/tests/flows/wallet.flow.ts
@@ -48,6 +48,7 @@ import { resolveE2EWaitTimeoutMs } from '../framework/Constants';
 import PlaywrightUtilities, {
   getDriver,
 } from '../framework/PlaywrightUtilities';
+import UnifiedGestures from '../framework/UnifiedGestures';
 import AccountListBottomSheet from '../page-objects/wallet/AccountListBottomSheet';
 import MetaMetricsOptInView from '../page-objects/Onboarding/MetaMetricsOptInView';
 import PredictModalView from '../page-objects/Predict/PredictModalView';
@@ -55,6 +56,8 @@ import OnboardingInterestQuestionnaireView from '../page-objects/Onboarding/Onbo
 import ExperienceEnhancerBottomSheet from '../page-objects/Onboarding/ExperienceEnhancerBottomSheet';
 import { fetchProductionFeatureFlags } from '../performance/feature-flag-helper';
 import { ExistingUserSheetSelectorsIDs } from '../../app/components/Views/Notifications/PushNotificationOnboarding/ExistingUserSheet/ExistingUserSheet.testIds';
+import type { CurrentDeviceDetails } from '../framework/fixtures/playwright';
+import { startPhase } from '../framework/telemetry/PhaseTimer.ts';
 import {
   isLoginScreenDisplayed,
   isWalletHomeReadyOnAndroidStable,
@@ -136,15 +139,24 @@ export const ensureAccountListOpenPlaywright = async (
     }
 
     if (await isWalletHomeReadyOnAppium()) {
+      if (PlatformDetector.isAndroid()) {
+        await dismissAndroidSystemOverlaysPlaywright();
+      }
       await WalletView.tapIdenticon();
-      await Assertions.expectElementToBeVisible(
-        AccountListBottomSheet.accountList,
-        {
-          timeout: resolveE2EWaitTimeoutMs(10_000),
-          description: 'Account list should open from wallet home',
-        },
-      );
-      return;
+      try {
+        // Keep each tap attempt short so we can re-tap if wallet chrome is still settling.
+        await Assertions.expectElementToBeVisible(
+          AccountListBottomSheet.accountList,
+          {
+            timeout: 3_000,
+            description: 'Account list should open from wallet home',
+          },
+        );
+        return;
+      } catch {
+        await sleep(250);
+        continue;
+      }
     }
 
     if (PlatformDetector.isAndroid()) {
@@ -750,11 +762,19 @@ export const loginToAppPlaywright = async (
   const { scenarioType = 'login' } = options;
 
   const dismissPostLoginModals = async (): Promise<void> => {
-    await PlaywrightUtilities.wait(500);
-    await dismissPushNotificationExistingUserSheet();
-    await dismissExperienceEnhancerModal();
+    startPhase('modal_dismissal');
+    try {
+      await PlaywrightUtilities.wait(500);
+      await dismissPushNotificationExistingUserSheet();
+      await dismissExperienceEnhancerModal();
+    } finally {
+      // Resume test_body after login + modals (exclusive phases).
+      startPhase('test_body');
+    }
   };
 
+  startPhase('login');
+
   await dismissAndroidSystemOverlaysPlaywright();
 
   if (await isUnlockedWalletHomeReady()) {
@@ -799,6 +819,130 @@ export const loginToAppPlaywright = async (
   await dismissPostLoginModals();
 };
 
+const MM_CONNECT_UNLOCK_ATTEMPTS = 3;
+const MM_CONNECT_LOCK_GONE_TIMEOUT_MS = 10_000;
+
+async function dismissUnlockBlockers(): Promise<void> {
+  // Play services heads-up on google_apis CI emulators covers Unlock and
+  // makes the control non-interactive until the banner is dismissed.
+  PlaywrightUtilities.dismissAndroidHeadsUpNotifications();
+  await dismissAndroidSystemOverlaysPlaywright();
+}
+
+async function isPasswordFieldVisible(): Promise<boolean> {
+  try {
+    const passwordInput = await asPlaywrightElement(LoginView.passwordInput);
+    return await passwordInput.isVisible();
+  } catch {
+    return false;
+  }
+}
+
+async function waitForLockScreenGone(timeoutMs: number): Promise<boolean> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (!(await isPasswordFieldVisible())) {
+      return true;
+    }
+    await sleep(300);
+  }
+  return false;
+}
+
+/**
+ * Tap Unlock without waiting for UiAutomator2 "interactive" — heads-up banners
+ * make that check fail for ~10s even when a plain tap would succeed.
+ */
+async function tapUnlockWithoutInteractiveWait(): Promise<void> {
+  await UnifiedGestures.waitAndTap(LoginView.loginButton, {
+    description: 'Login Button (MM Connect unlock)',
+    checkForDisplayed: true,
+    checkForEnabled: true,
+    waitForInteractive: false,
+    timeout: 10_000,
+  });
+}
+
+/**
+ * If MetaMask's lock / login screen is showing, unlock with the e2e password.
+ *
+ * Prefer the password field over the outer login container — after a deeplink
+ * the lock screen is often the only UI, and CI auto-lock hits right after
+ * returning to MetaMask for dapp connect.
+ *
+ * Intentionally does NOT use full {@link loginToAppPlaywright}: after a connect
+ * deeplink we expect the permission sheet (not wallet home).
+ */
+export const unlockIfLockScreenVisible = async (): Promise<void> => {
+  await dismissUnlockBlockers();
+
+  if (!(await isPasswordFieldVisible())) {
+    return;
+  }
+
+  logger.debug('Lock screen detected; unlocking for MM Connect flow');
+  const password = getPasswordForScenario('e2e') ?? '123123123';
+
+  let lastError: unknown;
+  for (let attempt = 0; attempt < MM_CONNECT_UNLOCK_ATTEMPTS; attempt++) {
+    await dismissUnlockBlockers();
+
+    try {
+      await LoginView.enterPassword(password);
+      await dismissUnlockBlockers();
+      await tapUnlockWithoutInteractiveWait();
+
+      if (await waitForLockScreenGone(MM_CONNECT_LOCK_GONE_TIMEOUT_MS)) {
+        return;
+      }
+      lastError = new Error('Lock screen still visible after unlock tap');
+    } catch (error) {
+      lastError = error;
+      logger.debug(
+        `Unlock attempt ${attempt + 1} failed: ${
+          error instanceof Error ? error.message : String(error)
+        }`,
+      );
+    }
+
+    await sleep(500);
+  }
+
+  throw lastError instanceof Error
+    ? lastError
+    : new Error(`Failed to unlock MetaMask lock screen: ${String(lastError)}`);
+};
+
+/**
+ * Wait for the wallet to be visible, then cycle the app twice to ensure all
+ * account groups (including Solana) are created and syncing completes.
+ * Must be called after login.
+ */
+export const ensureAccountGroupsFinishedLoading = async (
+  currentDeviceDetails: CurrentDeviceDetails,
+): Promise<void> => {
+  await PlaywrightAssertions.expectElementToBeVisible(
+    asPlaywrightElement(WalletView.container),
+    { timeout: 15000 },
+  );
+  await PlaywrightGestures.terminateApp(currentDeviceDetails);
+  await PlaywrightGestures.activateApp(currentDeviceDetails);
+  await loginToAppPlaywright();
+  await PlaywrightAssertions.expectElementToBeVisible(
+    asPlaywrightElement(WalletView.container),
+    { timeout: 15000 },
+  );
+  await WalletView.tapIdenticon();
+  await AccountListBottomSheet.waitForAccountSyncToComplete();
+  await PlaywrightGestures.terminateApp(currentDeviceDetails);
+  await PlaywrightGestures.activateApp(currentDeviceDetails);
+  await loginToAppPlaywright();
+  await PlaywrightAssertions.expectElementToBeVisible(
+    asPlaywrightElement(WalletView.container),
+    { timeout: 15000 },
+  );
+};
+
 /**
  * Logs in (Appium), waits for the wallet, and opens the account list bottom sheet.
  */
diff --git a/tests/framework/.eslintrc.js b/tests/framework/.eslintrc.js
index 7030e3405286..102398323575 100644
--- a/tests/framework/.eslintrc.js
+++ b/tests/framework/.eslintrc.js
@@ -6,15 +6,6 @@ module.exports = {
       rules: {
         // E2E Framework Best Practices (starting with warnings, we will be changing to errors when the migration is complete)
         'no-console': 'off',
-        'no-restricted-syntax': [
-          'warn',
-          {
-            selector:
-              "CallExpression[callee.object.name='TestHelpers'][callee.property.name='delay']",
-            message:
-              'Avoid TestHelpers.delay(). Use proper waiting (from `tests/framework/index.ts`) with Assertions.expectElementToBeVisible() or similar framework methods instead.',
-          },
-        ],
       },
     },
     {
@@ -47,12 +38,6 @@ module.exports = {
         ],
         'no-restricted-syntax': [
           'warn',
-          {
-            selector:
-              "CallExpression[callee.object.name='TestHelpers'][callee.property.name='delay']",
-            message:
-              'Avoid TestHelpers.delay(). Use proper waiting (from `tests/framework/index.ts`) with Assertions.expectElementToBeVisible() or similar framework methods instead.',
-          },
           {
             selector: "CallExpression[callee.name='element']",
             message:
@@ -89,5 +74,69 @@ module.exports = {
         ],
       },
     },
+    {
+      files: ['**/page-objects/**/*.{js,ts}', '**/flows/**/*.{js,ts}'],
+      excludedFiles: [
+        '**/page-objects/**/*.test.ts',
+        '**/page-objects/**/*.test.js',
+        '**/flows/**/*.test.ts',
+        '**/flows/**/*.test.js',
+      ],
+      rules: {
+        'no-restricted-imports': [
+          'warn',
+          {
+            patterns: [
+              {
+                group: ['**/UnifiedGestures', '**/UnifiedGestures.ts'],
+                message:
+                  'Use Gestures from tests/framework (canonical). UnifiedGestures is legacy dual-runner API.',
+              },
+              {
+                group: [
+                  '**/framework',
+                  '**/framework/index',
+                  '**/framework/index.ts',
+                  '**/framework/index.js',
+                ],
+                importNames: ['UnifiedGestures'],
+                message:
+                  'Use Gestures from tests/framework (canonical). UnifiedGestures is legacy dual-runner API.',
+              },
+            ],
+          },
+        ],
+      },
+    },
+    // MMQA-2174: ban UnifiedGestures in smoke specs (error)
+    {
+      files: ['**/smoke-appium/**/*.{js,ts}', '**/smoke/**/*.{js,ts}'],
+      excludedFiles: ['**/smoke-appium/**/*.test.ts', '**/smoke/**/*.test.ts'],
+      rules: {
+        'no-restricted-imports': [
+          'error',
+          {
+            patterns: [
+              {
+                group: ['**/UnifiedGestures', '**/UnifiedGestures.ts'],
+                message:
+                  'Use Gestures from tests/framework (canonical). UnifiedGestures is legacy dual-runner API.',
+              },
+              {
+                group: [
+                  '**/framework',
+                  '**/framework/index',
+                  '**/framework/index.ts',
+                  '**/framework/index.js',
+                ],
+                importNames: ['UnifiedGestures'],
+                message:
+                  'Use Gestures from tests/framework (canonical). UnifiedGestures is legacy dual-runner API.',
+              },
+            ],
+          },
+        ],
+      },
+    },
   ],
 };
diff --git a/tests/framework/AndroidWebViewCdpHelpers.test.ts b/tests/framework/AndroidWebViewCdpHelpers.test.ts
new file mode 100644
index 000000000000..198c9991f822
--- /dev/null
+++ b/tests/framework/AndroidWebViewCdpHelpers.test.ts
@@ -0,0 +1,692 @@
+/* eslint-disable import-x/no-nodejs-modules */
+import { execFileSync } from 'child_process';
+import AndroidWebViewCdpHelpers, {
+  isAndroidWebViewCdpEnabled,
+  pickMetaMaskWebViewDebuggerUrl,
+  pickPageTargetFromContexts,
+  urlsReferToSameDapp,
+  type RawAppiumWebViewContext,
+} from './AndroidWebViewCdpHelpers';
+import { getDriver } from './PlaywrightUtilities';
+
+jest.mock('child_process', () => ({
+  execFileSync: jest.fn(),
+}));
+
+const execFileSyncMock = execFileSync as unknown as jest.Mock;
+
+jest.mock('./PlaywrightUtilities', () => ({
+  getDriver: jest.fn(),
+}));
+
+jest.mock('ws', () => {
+  class MockWebSocket {
+    static OPEN = 1;
+    readyState = MockWebSocket.OPEN;
+    private readonly handlers = new Map<
+      string,
+      ((...args: unknown[]) => void)[]
+    >();
+    private opened = false;
+    readonly mockUrl: string;
+    terminated = false;
+
+    constructor(mockUrl: string) {
+      this.mockUrl = mockUrl;
+      // Simulate a WebSocket that never opens so connect timeout can fire.
+      if (mockUrl.includes('/hang')) {
+        return;
+      }
+      queueMicrotask(() => {
+        this.opened = true;
+        this.emit('open');
+      });
+    }
+
+    on(event: string, handler: (...args: unknown[]) => void): void {
+      const list = this.handlers.get(event) ?? [];
+      list.push(handler);
+      this.handlers.set(event, list);
+      if (event === 'open' && this.opened) {
+        queueMicrotask(() => handler());
+      }
+    }
+
+    once(event: string, handler: (...args: unknown[]) => void): void {
+      const wrap = (...args: unknown[]) => {
+        this.off(event, wrap);
+        handler(...args);
+      };
+      this.on(event, wrap);
+    }
+
+    off(event: string, handler: (...args: unknown[]) => void): void {
+      const list = this.handlers.get(event) ?? [];
+      this.handlers.set(
+        event,
+        list.filter((h) => h !== handler),
+      );
+    }
+
+    send(raw: string): void {
+      const msg = JSON.parse(raw) as {
+        id: number;
+        method: string;
+        params?: { expression?: string };
+      };
+      let value: unknown = false;
+      if (msg.method === 'Runtime.evaluate') {
+        const expression = msg.params?.expression ?? '';
+        if (expression.includes('"missing-id"')) {
+          value =
+            expression.includes('textContent') ||
+            expression.includes('innerText')
+              ? null
+              : false;
+        } else if (expression.includes('activeElement')) {
+          value = true;
+        } else if (
+          expression.includes('el.click') ||
+          expression.includes('.click(')
+        ) {
+          // Disabled controls return false → native wait-until-enabled.
+          value =
+            expression.includes('getElementById') &&
+            !expression.includes('"disabled-id"');
+        } else if (
+          expression.includes('_valueTracker') &&
+          (expression.includes("dispatchEvent(new Event('input'") ||
+            expression.includes('dispatchEvent(new Event("input"'))
+        ) {
+          // Require `_valueTracker` path (do not match on `options` alone).
+          value = expression.includes('getElementById');
+        } else if (
+          expression.includes('innerText') ||
+          expression.includes('textContent')
+        ) {
+          value = expression.includes('getElementById')
+            ? 'hello-from-cdp'
+            : null;
+        } else if (expression.includes('scrollIntoView')) {
+          value = expression.includes('getElementById');
+        } else if (
+          expression === 'location.href' ||
+          expression.includes('location.href')
+        ) {
+          value = 'https://metamask.github.io/snaps/test-snaps/3.5.2/';
+        } else {
+          value = false;
+        }
+      }
+      const payload = JSON.stringify({
+        id: msg.id,
+        result: {
+          result: {
+            value,
+            type: typeof value === 'string' ? 'string' : 'boolean',
+          },
+        },
+      });
+      setImmediate(() => {
+        this.emit('message', payload);
+      });
+    }
+
+    close(): void {
+      // no-op
+    }
+
+    terminate(): void {
+      this.terminated = true;
+    }
+
+    private emit(event: string, ...args: unknown[]): void {
+      for (const handler of [...(this.handlers.get(event) ?? [])]) {
+        handler(...args);
+      }
+    }
+  }
+
+  return { WebSocket: MockWebSocket };
+});
+
+/** Dynamic key — babel inlines static `process.env.ANDROID_WEBVIEW_CDP` / deletes. */
+const CDP_ENV_KEY = 'ANDROID_WEBVIEW_CDP';
+
+function clearCdpEnv(): void {
+  delete process.env[CDP_ENV_KEY];
+}
+
+function setCdpEnv(value: string): void {
+  process.env[CDP_ENV_KEY] = value;
+}
+
+describe('isAndroidWebViewCdpEnabled', () => {
+  afterEach(() => {
+    clearCdpEnv();
+  });
+
+  it('returns true when env is unset', () => {
+    clearCdpEnv();
+    expect(isAndroidWebViewCdpEnabled()).toBe(true);
+  });
+
+  it('returns false when env is 0', () => {
+    setCdpEnv('0');
+    expect(isAndroidWebViewCdpEnabled()).toBe(false);
+  });
+
+  it('returns false when env is false', () => {
+    setCdpEnv('false');
+    expect(isAndroidWebViewCdpEnabled()).toBe(false);
+  });
+});
+
+describe('urlsReferToSameDapp', () => {
+  it('matches identical https URLs', () => {
+    const url = 'https://metamask.github.io/snaps/test-snaps/3.5.2/';
+
+    expect(urlsReferToSameDapp(url, url)).toBe(true);
+  });
+
+  it('matches trailing-slash variants', () => {
+    expect(
+      urlsReferToSameDapp(
+        'https://metamask.github.io/snaps/test-snaps/3.5.2',
+        'https://metamask.github.io/snaps/test-snaps/3.5.2/',
+      ),
+    ).toBe(true);
+  });
+
+  it('rejects about:blank', () => {
+    expect(
+      urlsReferToSameDapp(
+        'about:blank',
+        'https://metamask.github.io/snaps/test-snaps/3.5.2/',
+      ),
+    ).toBe(false);
+  });
+
+  it('rejects different paths', () => {
+    expect(
+      urlsReferToSameDapp(
+        'https://metamask.github.io/other/',
+        'https://metamask.github.io/snaps/test-snaps/3.5.2/',
+      ),
+    ).toBe(false);
+  });
+
+  it('treats index.html as the same path', () => {
+    expect(
+      urlsReferToSameDapp(
+        'https://metamask.github.io/snaps/test-snaps/3.5.2/index.html',
+        'https://metamask.github.io/snaps/test-snaps/3.5.2/',
+      ),
+    ).toBe(true);
+  });
+});
+
+describe('pickMetaMaskWebViewDebuggerUrl', () => {
+  const packageId = 'io.metamask';
+
+  it('prefers MetaMask package WebView over WEBVIEW_chrome', () => {
+    const contexts: RawAppiumWebViewContext[] = [
+      {
+        webviewName: 'WEBVIEW_chrome',
+        info: {
+          webSocketDebuggerUrl: 'ws://127.0.0.1:9222/devtools/page/chrome',
+        },
+      },
+      {
+        webviewName: 'WEBVIEW_io.metamask',
+        info: {
+          webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/page/mm',
+        },
+      },
+    ];
+
+    expect(pickMetaMaskWebViewDebuggerUrl(contexts, packageId)).toBe(
+      'ws://127.0.0.1:9223/devtools/page/mm',
+    );
+  });
+
+  it('matches packageName field when webviewName is generic', () => {
+    const contexts: RawAppiumWebViewContext[] = [
+      {
+        webview: 'WEBVIEW_1',
+        packageName: 'io.metamask',
+        info: {
+          webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/page/mm',
+        },
+      },
+    ];
+
+    expect(pickMetaMaskWebViewDebuggerUrl(contexts, packageId)).toBe(
+      'ws://127.0.0.1:9223/devtools/page/mm',
+    );
+  });
+
+  it('returns undefined when only Chrome contexts exist', () => {
+    const contexts: RawAppiumWebViewContext[] = [
+      {
+        webviewName: 'WEBVIEW_chrome',
+        info: {
+          webSocketDebuggerUrl: 'ws://127.0.0.1:9222/devtools/page/chrome',
+        },
+      },
+    ];
+
+    expect(pickMetaMaskWebViewDebuggerUrl(contexts, packageId)).toBeUndefined();
+  });
+});
+
+describe('pickPageTargetFromContexts', () => {
+  const packageId = 'io.metamask';
+  const pageUrl = 'https://metamask.github.io/snaps/test-snaps/3.5.2/';
+
+  it('returns the matching page from Appium pages[]', () => {
+    const page = {
+      type: 'page',
+      url: pageUrl,
+      webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/page/snaps',
+    };
+    const contexts: RawAppiumWebViewContext[] = [
+      {
+        webviewName: 'WEBVIEW_io.metamask',
+        info: {
+          webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/browser/b',
+        },
+        pages: [page],
+      },
+    ];
+
+    expect(pickPageTargetFromContexts(contexts, packageId, pageUrl)).toEqual(
+      page,
+    );
+  });
+
+  it('returns undefined when pages do not match pageUrl', () => {
+    const contexts: RawAppiumWebViewContext[] = [
+      {
+        webviewName: 'WEBVIEW_io.metamask',
+        pages: [
+          {
+            url: 'https://other.example/',
+            webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/page/other',
+          },
+        ],
+      },
+    ];
+
+    expect(
+      pickPageTargetFromContexts(contexts, packageId, pageUrl),
+    ).toBeUndefined();
+  });
+});
+
+const pageUrl = 'https://metamask.github.io/snaps/test-snaps/3.5.2/';
+const originalFetch = global.fetch;
+
+describe('AndroidWebViewCdpHelpers.primePage', () => {
+  beforeEach(installCdpHappyPathMocks);
+  afterEach(restoreCdpMocks);
+
+  it('caches a verified page WebSocket when location matches', async () => {
+    await expect(AndroidWebViewCdpHelpers.primePage(pageUrl)).resolves.toBe(
+      true,
+    );
+
+    const execute = (getDriver as jest.Mock)().execute as jest.Mock;
+    execute.mockClear();
+
+    await AndroidWebViewCdpHelpers.tapElementById('connectbip32', { pageUrl });
+    expect(execute).not.toHaveBeenCalled();
+  });
+
+  it('returns false when ANDROID_WEBVIEW_CDP is disabled', async () => {
+    setCdpEnv('0');
+    await expect(AndroidWebViewCdpHelpers.primePage(pageUrl)).resolves.toBe(
+      false,
+    );
+  });
+});
+
+function installCdpHappyPathMocks(): void {
+  clearCdpEnv();
+  AndroidWebViewCdpHelpers.resetCache();
+  execFileSyncMock.mockReset();
+  (getDriver as jest.Mock).mockReturnValue({
+    execute: jest.fn().mockResolvedValue([
+      {
+        webviewName: 'WEBVIEW_io.metamask',
+        info: {
+          webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/browser/b',
+        },
+        pages: [
+          {
+            type: 'page',
+            url: pageUrl,
+            webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/page/mm',
+          },
+        ],
+      },
+    ]),
+  });
+
+  global.fetch = jest.fn(async (input: RequestInfo | URL) => {
+    const url = String(input);
+    if (url.endsWith('/json/version')) {
+      return { ok: true } as Response;
+    }
+    if (url.endsWith('/json/list')) {
+      return {
+        ok: true,
+        json: async () => [
+          {
+            type: 'page',
+            url: pageUrl,
+            webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/page/mm',
+          },
+        ],
+      } as Response;
+    }
+    return { ok: false } as Response;
+  }) as typeof fetch;
+}
+
+function restoreCdpMocks(): void {
+  global.fetch = originalFetch;
+  clearCdpEnv();
+  AndroidWebViewCdpHelpers.resetCache();
+  jest.clearAllMocks();
+}
+
+describe('AndroidWebViewCdpHelpers.scrollElementByIdIntoView', () => {
+  beforeEach(installCdpHappyPathMocks);
+  afterEach(restoreCdpMocks);
+
+  it('returns true when CDP evaluate scrolls an existing element', async () => {
+    const result = await AndroidWebViewCdpHelpers.scrollElementByIdIntoView(
+      'connectbip32',
+      { pageUrl },
+    );
+
+    expect(result).toBe(true);
+  });
+
+  it('uses Appium pages[] and can skip waiting on empty /json/list', async () => {
+    const result = await AndroidWebViewCdpHelpers.scrollElementByIdIntoView(
+      'connectbip32',
+      { pageUrl },
+    );
+
+    expect(result).toBe(true);
+  });
+
+  it('reuses a cached page WebSocket on the next action', async () => {
+    const execute = jest.fn().mockResolvedValue([
+      {
+        webviewName: 'WEBVIEW_io.metamask',
+        info: {
+          webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/browser/b',
+        },
+        pages: [
+          {
+            type: 'page',
+            url: pageUrl,
+            webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/page/mm',
+          },
+        ],
+      },
+    ]);
+    (getDriver as jest.Mock).mockReturnValue({ execute });
+
+    await AndroidWebViewCdpHelpers.scrollElementByIdIntoView('connectbip32', {
+      pageUrl,
+    });
+    await AndroidWebViewCdpHelpers.tapElementById('connectbip32', { pageUrl });
+
+    expect(execute).toHaveBeenCalledTimes(1);
+  });
+
+  it('returns false when element id is missing in the page', async () => {
+    const result = await AndroidWebViewCdpHelpers.scrollElementByIdIntoView(
+      'missing-id',
+      { pageUrl },
+    );
+
+    expect(result).toBe(false);
+  });
+
+  it('returns false when ANDROID_WEBVIEW_CDP is disabled', async () => {
+    setCdpEnv('0');
+
+    const result = await AndroidWebViewCdpHelpers.scrollElementByIdIntoView(
+      'connectbip32',
+      { pageUrl },
+    );
+
+    expect(result).toBe(false);
+    expect(getDriver).not.toHaveBeenCalled();
+  });
+
+  it('returns false when Appium contexts have no MetaMask debugger URL', async () => {
+    (getDriver as jest.Mock).mockReturnValue({
+      execute: jest.fn().mockResolvedValue([
+        {
+          webviewName: 'WEBVIEW_chrome',
+          info: {
+            webSocketDebuggerUrl: 'ws://127.0.0.1:9222/devtools/page/chrome',
+          },
+        },
+      ]),
+    });
+    execFileSyncMock.mockImplementation(() => {
+      throw new Error('adb unavailable in unit test');
+    });
+
+    const result = await AndroidWebViewCdpHelpers.scrollElementByIdIntoView(
+      'connectbip32',
+      { pageUrl },
+    );
+
+    expect(result).toBe(false);
+  });
+
+  it('returns false when CDP WebSocket connect never opens', async () => {
+    jest.useFakeTimers();
+    try {
+      // No pages[] → fall through to /json/list hang URL.
+      (getDriver as jest.Mock).mockReturnValue({
+        execute: jest.fn().mockResolvedValue([
+          {
+            webviewName: 'WEBVIEW_io.metamask',
+            info: {
+              webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/browser/b',
+            },
+          },
+        ]),
+      });
+      global.fetch = jest.fn(async (input: RequestInfo | URL) => {
+        const url = String(input);
+        if (url.endsWith('/json/version')) {
+          return { ok: true } as Response;
+        }
+        if (url.endsWith('/json/list')) {
+          return {
+            ok: true,
+            json: async () => [
+              {
+                type: 'page',
+                url: pageUrl,
+                webSocketDebuggerUrl: 'ws://127.0.0.1:9223/devtools/page/hang',
+              },
+            ],
+          } as Response;
+        }
+        return { ok: false } as Response;
+      }) as typeof fetch;
+
+      const resultPromise = AndroidWebViewCdpHelpers.scrollElementByIdIntoView(
+        'connectbip32',
+        { pageUrl },
+      );
+      await jest.advanceTimersByTimeAsync(5_000);
+      const result = await resultPromise;
+
+      expect(result).toBe(false);
+    } finally {
+      jest.useRealTimers();
+    }
+  });
+});
+
+describe('AndroidWebViewCdpHelpers.tapElementById', () => {
+  beforeEach(installCdpHappyPathMocks);
+  afterEach(restoreCdpMocks);
+
+  it('returns true when CDP click succeeds', async () => {
+    const result = await AndroidWebViewCdpHelpers.tapElementById(
+      'connectbip32',
+      { pageUrl },
+    );
+    expect(result).toBe(true);
+  });
+
+  it('returns false when element is missing', async () => {
+    const result = await AndroidWebViewCdpHelpers.tapElementById('missing-id', {
+      pageUrl,
+    });
+    expect(result).toBe(false);
+  });
+
+  it('returns false when element is disabled so native can wait', async () => {
+    const result = await AndroidWebViewCdpHelpers.tapElementById(
+      'disabled-id',
+      { pageUrl },
+    );
+    expect(result).toBe(false);
+  });
+
+  it('returns false when ANDROID_WEBVIEW_CDP is disabled', async () => {
+    setCdpEnv('0');
+    const result = await AndroidWebViewCdpHelpers.tapElementById(
+      'connectbip32',
+      { pageUrl },
+    );
+    expect(result).toBe(false);
+    expect(getDriver).not.toHaveBeenCalled();
+  });
+});
+
+describe('AndroidWebViewCdpHelpers.fillElementById', () => {
+  beforeEach(installCdpHappyPathMocks);
+  afterEach(restoreCdpMocks);
+
+  it('returns true when CDP fill succeeds', async () => {
+    const result = await AndroidWebViewCdpHelpers.fillElementById(
+      'message',
+      'hi',
+      { pageUrl },
+    );
+    expect(result).toBe(true);
+  });
+
+  it('returns false when element is missing', async () => {
+    const result = await AndroidWebViewCdpHelpers.fillElementById(
+      'missing-id',
+      'hi',
+      { pageUrl },
+    );
+    expect(result).toBe(false);
+  });
+
+  it('returns false when ANDROID_WEBVIEW_CDP is disabled', async () => {
+    setCdpEnv('0');
+    const result = await AndroidWebViewCdpHelpers.fillElementById(
+      'message',
+      'hi',
+      { pageUrl },
+    );
+    expect(result).toBe(false);
+  });
+});
+
+describe('AndroidWebViewCdpHelpers.readElementTextById', () => {
+  beforeEach(installCdpHappyPathMocks);
+  afterEach(restoreCdpMocks);
+
+  it('returns text when CDP read succeeds', async () => {
+    const result = await AndroidWebViewCdpHelpers.readElementTextById(
+      'status',
+      { pageUrl },
+    );
+    expect(result).toBe('hello-from-cdp');
+  });
+
+  it('returns undefined when element is missing', async () => {
+    const result = await AndroidWebViewCdpHelpers.readElementTextById(
+      'missing-id',
+      { pageUrl },
+    );
+    expect(result).toBeUndefined();
+  });
+
+  it('returns undefined when ANDROID_WEBVIEW_CDP is disabled', async () => {
+    setCdpEnv('0');
+    const result = await AndroidWebViewCdpHelpers.readElementTextById(
+      'status',
+      { pageUrl },
+    );
+    expect(result).toBeUndefined();
+  });
+});
+
+describe('AndroidWebViewCdpHelpers.selectOptionById', () => {
+  beforeEach(installCdpHappyPathMocks);
+  afterEach(restoreCdpMocks);
+
+  it('returns true when option is selected', async () => {
+    const result = await AndroidWebViewCdpHelpers.selectOptionById(
+      'chain',
+      'Ethereum',
+      { pageUrl },
+    );
+    expect(result).toBe(true);
+  });
+
+  it('returns false when select is missing', async () => {
+    const result = await AndroidWebViewCdpHelpers.selectOptionById(
+      'missing-id',
+      'Ethereum',
+      { pageUrl },
+    );
+    expect(result).toBe(false);
+  });
+
+  it('returns false when ANDROID_WEBVIEW_CDP is disabled', async () => {
+    setCdpEnv('0');
+    const result = await AndroidWebViewCdpHelpers.selectOptionById(
+      'chain',
+      'Ethereum',
+      { pageUrl },
+    );
+    expect(result).toBe(false);
+  });
+});
+
+describe('AndroidWebViewCdpHelpers.blurActiveElement', () => {
+  beforeEach(installCdpHappyPathMocks);
+  afterEach(restoreCdpMocks);
+
+  it('returns true when blur evaluate succeeds', async () => {
+    const result = await AndroidWebViewCdpHelpers.blurActiveElement(pageUrl);
+    expect(result).toBe(true);
+  });
+
+  it('returns false when ANDROID_WEBVIEW_CDP is disabled', async () => {
+    setCdpEnv('0');
+    const result = await AndroidWebViewCdpHelpers.blurActiveElement(pageUrl);
+    expect(result).toBe(false);
+  });
+});
diff --git a/tests/framework/AndroidWebViewCdpHelpers.ts b/tests/framework/AndroidWebViewCdpHelpers.ts
new file mode 100644
index 000000000000..ec8a686f54b3
--- /dev/null
+++ b/tests/framework/AndroidWebViewCdpHelpers.ts
@@ -0,0 +1,766 @@
+/* eslint-disable import-x/no-nodejs-modules */
+import { execFileSync } from 'child_process';
+import { WebSocket as WsClient } from 'ws';
+import { APP_PACKAGE_IDS } from './Constants.ts';
+import { getDriver } from './PlaywrightUtilities';
+import { createPlaywrightLogger } from './playwrightLogger.ts';
+
+const logger = createPlaywrightLogger('AndroidWebViewCdp');
+
+/** Host port for `adb forward` to MetaMask `@webview_devtools_remote_<pid>`. */
+const WEBVIEW_CDP_FORWARD_PORT = 9223;
+const CDP_READY_TIMEOUT_MS = 10_000;
+/** Short `/json/list` poll when Appium `pages[]` has no match. */
+const PAGE_TIMEOUT_MS = 3_000;
+/** Cap stuck WebSocket handshakes. */
+const CDP_CONNECT_TIMEOUT_MS = 5_000;
+const POLL_MS = 400;
+
+export interface CdpTarget {
+  id?: string;
+  type?: string;
+  url?: string;
+  title?: string;
+  webSocketDebuggerUrl?: string;
+}
+
+export interface RawAppiumWebViewContext {
+  webviewName?: string;
+  webview?: string;
+  packageName?: string;
+  proc?: string;
+  info?: { webSocketDebuggerUrl?: string };
+  /** Appium page targets; preferred over `/json/list`. */
+  pages?: CdpTarget[];
+}
+
+interface CdpEvaluateResult {
+  result?: { value?: unknown; type?: string };
+  exceptionDetails?: { text?: string; exception?: { description?: string } };
+}
+
+class CdpSession {
+  private readonly ws: WsClient;
+  private nextId = 1;
+  private readonly pending = new Map<
+    number,
+    { resolve: (value: unknown) => void; reject: (error: Error) => void }
+  >();
+
+  private constructor(ws: WsClient) {
+    this.ws = ws;
+    this.ws.on('message', (data) => {
+      try {
+        const msg = JSON.parse(String(data)) as {
+          id?: number;
+          result?: unknown;
+          error?: { message?: string };
+        };
+        if (msg.id == null) return;
+        const waiter = this.pending.get(msg.id);
+        if (!waiter) return;
+        this.pending.delete(msg.id);
+        if (msg.error) {
+          waiter.reject(new Error(msg.error.message ?? 'CDP error'));
+        } else {
+          waiter.resolve(msg.result);
+        }
+      } catch {
+        // Ignore malformed CDP frames
+      }
+    });
+  }
+
+  static connect(wsUrl: string): Promise<CdpSession> {
+    return new Promise((resolve, reject) => {
+      const ws = new WsClient(wsUrl);
+      const session = new CdpSession(ws);
+      let settled = false;
+      const timerRef: { id?: ReturnType<typeof setTimeout> } = {};
+
+      const settle = (fn: () => void) => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        if (timerRef.id !== undefined) {
+          clearTimeout(timerRef.id);
+        }
+        fn();
+      };
+
+      timerRef.id = setTimeout(() => {
+        settle(() => {
+          try {
+            ws.terminate();
+          } catch {
+            ws.close();
+          }
+          reject(
+            new Error(
+              `CDP WebSocket connect timed out after ${CDP_CONNECT_TIMEOUT_MS}ms`,
+            ),
+          );
+        });
+      }, CDP_CONNECT_TIMEOUT_MS);
+
+      ws.once('open', () => {
+        settle(() => resolve(session));
+      });
+      ws.once('error', (err) => {
+        settle(() => reject(err));
+      });
+    });
+  }
+
+  async send(
+    method: string,
+    params: Record<string, unknown> = {},
+  ): Promise<unknown> {
+    const id = this.nextId++;
+    return new Promise<unknown>((resolve, reject) => {
+      const timer = setTimeout(() => {
+        this.pending.delete(id);
+        reject(new Error(`CDP ${method} timed out for id=${id}`));
+      }, 15_000);
+      this.pending.set(id, {
+        resolve: (value) => {
+          clearTimeout(timer);
+          resolve(value);
+        },
+        reject: (error) => {
+          clearTimeout(timer);
+          reject(error);
+        },
+      });
+      this.ws.send(JSON.stringify({ id, method, params }));
+    });
+  }
+
+  async evaluate<T>(expression: string): Promise<T> {
+    const result = (await this.send('Runtime.evaluate', {
+      expression,
+      returnByValue: true,
+      awaitPromise: true,
+    })) as CdpEvaluateResult;
+
+    if (result.exceptionDetails) {
+      const detail =
+        result.exceptionDetails.exception?.description ??
+        result.exceptionDetails.text ??
+        'Runtime.evaluate failed';
+      throw new Error(detail);
+    }
+
+    return result.result?.value as T;
+  }
+
+  close(): void {
+    for (const [, waiter] of this.pending) {
+      waiter.reject(new Error('CDP session closed'));
+    }
+    this.pending.clear();
+    this.ws.close();
+  }
+}
+
+/** Default on. Dynamic env read (do not inline). Disable: 0|false|off|no. */
+export function isAndroidWebViewCdpEnabled(): boolean {
+  const envKey = 'ANDROID_WEBVIEW_CDP';
+  const raw = process.env[envKey]?.trim().toLowerCase();
+  if (!raw) {
+    return true;
+  }
+  return raw !== '0' && raw !== 'false' && raw !== 'off' && raw !== 'no';
+}
+
+export function urlsReferToSameDapp(
+  candidateUrl: string,
+  dappUrl: string,
+): boolean {
+  if (!candidateUrl || candidateUrl === 'about:blank') {
+    return false;
+  }
+  if (candidateUrl.includes(dappUrl)) {
+    return true;
+  }
+  try {
+    const target = new URL(dappUrl);
+    const candidate = new URL(candidateUrl);
+    const loopbackAliases = new Set(['10.0.2.2', 'localhost', '127.0.0.1']);
+    const sameHostFamily =
+      target.hostname === candidate.hostname ||
+      (loopbackAliases.has(target.hostname) &&
+        loopbackAliases.has(candidate.hostname));
+    const samePort =
+      (candidate.port || defaultPort(candidate.protocol)) ===
+      (target.port || defaultPort(target.protocol));
+    return (
+      sameHostFamily &&
+      samePort &&
+      samePathname(candidate.pathname, target.pathname)
+    );
+  } catch {
+    return false;
+  }
+
+  function defaultPort(protocol: string): string {
+    return protocol === 'https:' ? '443' : '80';
+  }
+
+  function samePathname(a: string, b: string): boolean {
+    const norm = (p: string) =>
+      p.replace(/\/index\.html$/i, '').replace(/\/$/, '');
+    return norm(a) === norm(b);
+  }
+}
+
+function contextName(ctx: RawAppiumWebViewContext): string {
+  return ctx.webviewName ?? ctx.webview ?? '';
+}
+
+function isChromeWebViewContext(ctx: RawAppiumWebViewContext): boolean {
+  const name = contextName(ctx);
+  return (
+    /chrome/i.test(name) ||
+    ctx.packageName === 'com.android.chrome' ||
+    /chrome/i.test(ctx.packageName ?? '')
+  );
+}
+
+function isMetaMaskWebViewContext(
+  ctx: RawAppiumWebViewContext,
+  packageId: string,
+): boolean {
+  if (isChromeWebViewContext(ctx)) {
+    return false;
+  }
+  const name = contextName(ctx);
+  return (
+    name.includes(packageId) ||
+    ctx.packageName === packageId ||
+    Boolean(ctx.packageName?.startsWith(`${packageId}.`))
+  );
+}
+
+/** MetaMask WebView debugger URL (often browser-level, not page). */
+export function pickMetaMaskWebViewDebuggerUrl(
+  rawContexts: RawAppiumWebViewContext[],
+  packageId: string,
+): string | undefined {
+  for (const ctx of rawContexts) {
+    const wsUrl = ctx.info?.webSocketDebuggerUrl;
+    if (!wsUrl) continue;
+    if (isMetaMaskWebViewContext(ctx, packageId)) {
+      return wsUrl;
+    }
+  }
+  return undefined;
+}
+
+/**
+ * MetaMask page targets from Appium `pages[]`.
+ * URL matches first; other page targets follow (Appium url metadata can be stale —
+ * callers must verify with location.href).
+ */
+export function listPageTargetsFromContexts(
+  rawContexts: RawAppiumWebViewContext[],
+  packageId: string,
+  pageUrl: string,
+): CdpTarget[] {
+  const matched: CdpTarget[] = [];
+  const other: CdpTarget[] = [];
+  for (const ctx of rawContexts) {
+    if (!isMetaMaskWebViewContext(ctx, packageId)) {
+      continue;
+    }
+    for (const page of ctx.pages ?? []) {
+      if (!page.webSocketDebuggerUrl) {
+        continue;
+      }
+      if (page.type && page.type !== 'page') {
+        continue;
+      }
+      if (urlsReferToSameDapp(page.url ?? '', pageUrl)) {
+        matched.push(page);
+      } else {
+        other.push(page);
+      }
+    }
+  }
+  return [...matched, ...other];
+}
+
+/** First Appium `pages[]` entry whose reported url matches `pageUrl`. */
+export function pickPageTargetFromContexts(
+  rawContexts: RawAppiumWebViewContext[],
+  packageId: string,
+  pageUrl: string,
+): CdpTarget | undefined {
+  return listPageTargetsFromContexts(rawContexts, packageId, pageUrl).find(
+    (page) => urlsReferToSameDapp(page.url ?? '', pageUrl),
+  );
+}
+
+export function httpEndpointFromWebSocketUrl(
+  wsUrl: string,
+): string | undefined {
+  try {
+    const parsed = new URL(wsUrl);
+    const protocol = parsed.protocol === 'wss:' ? 'https:' : 'http:';
+    return `${protocol}//${parsed.host}`;
+  } catch {
+    return undefined;
+  }
+}
+
+/** MetaMask in-app WebView actions via CDP. */
+export default class AndroidWebViewCdpHelpers {
+  private static readonly cachedPageWsByUrl = new Map<string, string>();
+
+  /** Drop cached page sockets (soft-reload / relaunch). */
+  static resetCache(): void {
+    this.cachedPageWsByUrl.clear();
+  }
+
+  /**
+   * Warm + verify the page WS for `pageUrl` (location.href match).
+   * Call after Test Snaps is visible so later actions skip rediscovery.
+   */
+  static async primePage(pageUrl: string): Promise<boolean> {
+    if (!isAndroidWebViewCdpEnabled() || !pageUrl?.trim()) {
+      return false;
+    }
+    this.cachedPageWsByUrl.delete(pageUrl);
+    const href = await this.withEvaluate<string>(pageUrl, 'location.href');
+    return typeof href === 'string' && urlsReferToSameDapp(href, pageUrl);
+  }
+
+  private static async withEvaluate<T>(
+    pageUrl: string,
+    expression: string,
+  ): Promise<T | undefined> {
+    if (!isAndroidWebViewCdpEnabled()) {
+      return undefined;
+    }
+    if (!pageUrl?.trim()) {
+      return undefined;
+    }
+
+    let lastError = '';
+    const attempt = async (
+      wsUrl: string,
+      verifyLocation: boolean,
+    ): Promise<{ ok: true; value: T } | { ok: false }> => {
+      try {
+        const session = await CdpSession.connect(wsUrl);
+        try {
+          if (verifyLocation) {
+            const href = await session.evaluate<string>('location.href');
+            if (
+              typeof href !== 'string' ||
+              !urlsReferToSameDapp(href, pageUrl)
+            ) {
+              logger.debug(`CDP skip WS (href=${String(href)}) for ${pageUrl}`);
+              return { ok: false };
+            }
+          }
+          const value = await session.evaluate<T>(expression);
+          this.cachedPageWsByUrl.set(pageUrl, wsUrl);
+          return { ok: true, value };
+        } finally {
+          session.close();
+        }
+      } catch (error) {
+        this.cachedPageWsByUrl.delete(pageUrl);
+        lastError = error instanceof Error ? error.message : String(error);
+        return { ok: false };
+      }
+    };
+
+    const cached = this.cachedPageWsByUrl.get(pageUrl);
+    if (cached) {
+      const cachedResult = await attempt(cached, false);
+      if (cachedResult.ok) {
+        return cachedResult.value;
+      }
+    }
+
+    for (const wsUrl of await this.listPageDebuggerUrls(pageUrl)) {
+      if (wsUrl === cached) {
+        continue;
+      }
+      const result = await attempt(wsUrl, true);
+      if (result.ok) {
+        return result.value;
+      }
+    }
+
+    if (lastError) {
+      logger.debug(`CDP evaluate failed: ${lastError}`);
+    }
+    return undefined;
+  }
+
+  /**
+   * Candidate page WS URLs: Appium `pages[]` (url-match first) + `/json/list`.
+   * Always merge `/json/list` — Appium page.url metadata is often wrong/stale.
+   */
+  private static async listPageDebuggerUrls(
+    pageUrl: string,
+  ): Promise<string[]> {
+    const packageId = APP_PACKAGE_IDS.ANDROID;
+    const seen = new Set<string>();
+    const preferred: string[] = [];
+    const rest: string[] = [];
+    const add = (wsUrl: string | undefined, toPreferred: boolean) => {
+      if (!wsUrl || seen.has(wsUrl)) {
+        return;
+      }
+      seen.add(wsUrl);
+      (toPreferred ? preferred : rest).push(wsUrl);
+    };
+
+    let rawContexts: RawAppiumWebViewContext[] | undefined;
+    try {
+      rawContexts = (await getDriver().execute(
+        'mobile: getContexts',
+      )) as RawAppiumWebViewContext[];
+      for (const page of listPageTargetsFromContexts(
+        rawContexts,
+        packageId,
+        pageUrl,
+      )) {
+        add(
+          page.webSocketDebuggerUrl,
+          urlsReferToSameDapp(page.url ?? '', pageUrl),
+        );
+      }
+    } catch (error) {
+      logger.debug(
+        'Could not read Appium WebView pages for CDP:',
+        error instanceof Error ? error.message : String(error),
+      );
+    }
+
+    try {
+      const endpoint = await this.resolveCdpHttpEndpoint(rawContexts);
+      const deadline = Date.now() + PAGE_TIMEOUT_MS;
+      while (Date.now() < deadline) {
+        try {
+          const response = await fetch(`${endpoint}/json/list`);
+          if (response.ok) {
+            const targets = (await response.json()) as CdpTarget[];
+            for (const t of targets) {
+              if (
+                (t.type === 'page' || !t.type) &&
+                t.webSocketDebuggerUrl &&
+                urlsReferToSameDapp(t.url ?? '', pageUrl)
+              ) {
+                add(t.webSocketDebuggerUrl, true);
+              }
+            }
+            if (preferred.length > 0) {
+              break;
+            }
+          }
+        } catch {
+          // Keep polling
+        }
+        await new Promise((r) => setTimeout(r, POLL_MS));
+      }
+    } catch (error) {
+      logger.debug(
+        `CDP /json/list miss for ${pageUrl}: ${
+          error instanceof Error ? error.message : String(error)
+        }`,
+      );
+    }
+
+    const urls = [...preferred, ...rest];
+    if (urls.length > 0) {
+      logger.debug(
+        `CDP page WS candidates for ${pageUrl}: ${urls.length} (preferred=${preferred.length})`,
+      );
+    }
+    return urls;
+  }
+
+  /** Scroll `#webId` into view. False → native fallback. */
+  static async scrollElementByIdIntoView(
+    webId: string,
+    options: { pageUrl: string },
+  ): Promise<boolean> {
+    if (!webId.trim()) {
+      return false;
+    }
+
+    const scrolled = await this.withEvaluate<boolean>(
+      options.pageUrl,
+      `(() => {
+      const el = document.getElementById(${JSON.stringify(webId)});
+      if (!el) return false;
+      el.scrollIntoView({ block: 'center', inline: 'nearest' });
+      return true;
+    })()`,
+    );
+    if (scrolled) {
+      logger.debug(`CDP scrolled #${webId} into view on ${options.pageUrl}`);
+    }
+    return Boolean(scrolled);
+  }
+
+  static async tapElementById(
+    webId: string,
+    options: { pageUrl: string },
+  ): Promise<boolean> {
+    if (!webId.trim()) {
+      return false;
+    }
+
+    const clicked = await this.withEvaluate<boolean>(
+      options.pageUrl,
+      `(() => {
+      const el = document.getElementById(${JSON.stringify(webId)});
+      if (!el || typeof el.click !== 'function') return false;
+      const disabled =
+        ('disabled' in el && Boolean(el.disabled)) ||
+        el.getAttribute('aria-disabled') === 'true' ||
+        (typeof el.matches === 'function' && el.matches(':disabled'));
+      if (disabled) return false;
+      el.scrollIntoView({ block: 'center', inline: 'nearest' });
+      el.click();
+      return true;
+    })()`,
+    );
+    return Boolean(clicked);
+  }
+
+  static async fillElementById(
+    webId: string,
+    value: string,
+    options: { pageUrl: string },
+  ): Promise<boolean> {
+    if (!webId.trim()) {
+      return false;
+    }
+
+    // Native value setter + `_valueTracker` (React controlled inputs).
+    const filled = await this.withEvaluate<boolean>(
+      options.pageUrl,
+      `(() => {
+      const el = document.getElementById(${JSON.stringify(webId)});
+      if (!el) return false;
+      el.scrollIntoView({ block: 'center', inline: 'nearest' });
+      el.focus?.();
+      const next = ${JSON.stringify(value)};
+      if (!('value' in el)) {
+        el.textContent = next;
+      } else {
+        const proto = Object.getPrototypeOf(el);
+        const valueDesc =
+          Object.getOwnPropertyDescriptor(proto, 'value') ||
+          Object.getOwnPropertyDescriptor(
+            window.HTMLInputElement.prototype,
+            'value',
+          ) ||
+          Object.getOwnPropertyDescriptor(
+            window.HTMLTextAreaElement.prototype,
+            'value',
+          );
+        if (valueDesc && valueDesc.set) {
+          valueDesc.set.call(el, next);
+        } else {
+          el.value = next;
+        }
+        const tracker = el._valueTracker;
+        if (tracker && typeof tracker.setValue === 'function') {
+          tracker.setValue('');
+        }
+      }
+      el.dispatchEvent(new Event('input', { bubbles: true }));
+      el.dispatchEvent(new Event('change', { bubbles: true }));
+      return true;
+    })()`,
+    );
+    return Boolean(filled);
+  }
+
+  static async readElementTextById(
+    webId: string,
+    options: { pageUrl: string },
+  ): Promise<string | undefined> {
+    if (!webId.trim()) {
+      return undefined;
+    }
+
+    const text = await this.withEvaluate<string | null>(
+      options.pageUrl,
+      `(() => {
+      const el = document.getElementById(${JSON.stringify(webId)});
+      if (!el) return null;
+      if ('value' in el && typeof el.value === 'string' && el.value.length > 0) {
+        return el.value;
+      }
+      const text = (el.innerText ?? el.textContent ?? '').trim();
+      return text.length > 0 ? text : (el.value ?? null);
+    })()`,
+    );
+    return text == null ? undefined : text;
+  }
+
+  static async selectOptionById(
+    webId: string,
+    optionText: string,
+    options: { pageUrl: string },
+  ): Promise<boolean> {
+    if (!webId.trim() || !optionText.trim()) {
+      return false;
+    }
+
+    const selected = await this.withEvaluate<boolean>(
+      options.pageUrl,
+      `(() => {
+      const el = document.getElementById(${JSON.stringify(webId)});
+      if (!el || !('options' in el) || !el.options) return false;
+      const option = Array.from(el.options).find((opt) =>
+        opt.text.includes(${JSON.stringify(optionText)}),
+      );
+      if (!option) return false;
+      const next = option.value;
+      const proto = Object.getPrototypeOf(el);
+      const valueDesc =
+        Object.getOwnPropertyDescriptor(proto, 'value') ||
+        Object.getOwnPropertyDescriptor(
+          window.HTMLSelectElement.prototype,
+          'value',
+        );
+      if (valueDesc && valueDesc.set) {
+        valueDesc.set.call(el, next);
+      } else {
+        el.value = next;
+      }
+      option.selected = true;
+      const tracker = el._valueTracker;
+      if (tracker && typeof tracker.setValue === 'function') {
+        tracker.setValue('');
+      }
+      el.dispatchEvent(new Event('input', { bubbles: true }));
+      el.dispatchEvent(new Event('change', { bubbles: true }));
+      return true;
+    })()`,
+    );
+    return Boolean(selected);
+  }
+
+  static async blurActiveElement(pageUrl: string): Promise<boolean> {
+    const blurred = await this.withEvaluate<boolean>(
+      pageUrl,
+      `(() => {
+      const active = document.activeElement;
+      if (active && typeof active.blur === 'function') {
+        active.blur();
+        return true;
+      }
+      return false;
+    })()`,
+    );
+    return Boolean(blurred);
+  }
+
+  private static async resolveCdpHttpEndpoint(
+    rawContexts?: RawAppiumWebViewContext[],
+  ): Promise<string> {
+    const fromContexts = await this.tryEndpointFromAppiumContexts(rawContexts);
+    if (fromContexts) {
+      return fromContexts;
+    }
+
+    this.ensureAdbForwardToWebView();
+    const endpoint = `http://127.0.0.1:${WEBVIEW_CDP_FORWARD_PORT}`;
+    await this.waitForCdpEndpoint(endpoint);
+    return endpoint;
+  }
+
+  private static async tryEndpointFromAppiumContexts(
+    rawContexts?: RawAppiumWebViewContext[],
+  ): Promise<string | undefined> {
+    try {
+      const packageId = APP_PACKAGE_IDS.ANDROID;
+      const contexts =
+        rawContexts ??
+        ((await getDriver().execute(
+          'mobile: getContexts',
+        )) as RawAppiumWebViewContext[]);
+      const wsUrl = pickMetaMaskWebViewDebuggerUrl(contexts, packageId);
+      if (!wsUrl) {
+        return undefined;
+      }
+      const http = httpEndpointFromWebSocketUrl(wsUrl);
+      if (!http) {
+        return undefined;
+      }
+      await this.waitForCdpEndpoint(http);
+      logger.debug(`Using Appium-forwarded MetaMask WebView CDP at ${http}`);
+      return http;
+    } catch (error) {
+      logger.debug(
+        'Could not resolve WebView CDP from Appium contexts:',
+        error instanceof Error ? error.message : String(error),
+      );
+      return undefined;
+    }
+  }
+
+  private static ensureAdbForwardToWebView(): void {
+    const packageId = APP_PACKAGE_IDS.ANDROID;
+    const pid = execFileSync('adb', ['shell', 'pidof', packageId], {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    })
+      .trim()
+      .split(/\s+/)[0];
+    if (!pid) {
+      throw new Error(`adb pidof ${packageId} returned empty`);
+    }
+
+    const port = String(WEBVIEW_CDP_FORWARD_PORT);
+    try {
+      execFileSync('adb', ['forward', '--remove', `tcp:${port}`], {
+        stdio: 'pipe',
+      });
+    } catch {
+      // No existing forward is fine.
+    }
+    execFileSync(
+      'adb',
+      [
+        'forward',
+        `tcp:${port}`,
+        `localabstract:webview_devtools_remote_${pid}`,
+      ],
+      { stdio: 'pipe' },
+    );
+    logger.debug(`ADB forwarded tcp:${port} → webview_devtools_remote_${pid}`);
+  }
+
+  private static async waitForCdpEndpoint(endpoint: string): Promise<void> {
+    const deadline = Date.now() + CDP_READY_TIMEOUT_MS;
+    let lastError = '';
+    while (Date.now() < deadline) {
+      try {
+        const response = await fetch(`${endpoint}/json/version`);
+        if (response.ok) {
+          return;
+        }
+        lastError = `HTTP ${response.status}`;
+      } catch (error) {
+        lastError = error instanceof Error ? error.message : String(error);
+      }
+      await new Promise((r) => setTimeout(r, POLL_MS));
+    }
+    throw new Error(
+      `WebView CDP endpoint ${endpoint} not ready within ${CDP_READY_TIMEOUT_MS}ms: ${lastError}`,
+    );
+  }
+}
diff --git a/tests/framework/AndroidWebViewNative.test.ts b/tests/framework/AndroidWebViewNative.test.ts
new file mode 100644
index 000000000000..2bccc6332efe
--- /dev/null
+++ b/tests/framework/AndroidWebViewNative.test.ts
@@ -0,0 +1,436 @@
+import {
+  blurAndroidWebView,
+  fillAndroidWebId,
+  readAndroidWebIdText,
+  scrollAndroidWebIdIntoView,
+  selectAndroidWebId,
+  tapAndroidWebId,
+} from './AndroidWebViewNative';
+import AndroidWebViewCdpHelpers, {
+  isAndroidWebViewCdpEnabled,
+} from './AndroidWebViewCdpHelpers';
+import Gestures from './Gestures';
+import Matchers from './Matchers';
+import PlaywrightContextHelpers from './PlaywrightContextHelpers';
+import PlaywrightGestures from './PlaywrightGestures';
+import { getDriver } from './PlaywrightUtilities';
+
+jest.mock('./PlaywrightContextHelpers', () => ({
+  __esModule: true,
+  default: {
+    switchToNativeContext: jest.fn().mockResolvedValue(undefined),
+  },
+}));
+
+jest.mock('./PlaywrightUtilities', () => ({
+  getDriver: jest.fn(),
+  boxedStep:
+    () =>
+    (
+      _target: unknown,
+      _key: string,
+      descriptor: PropertyDescriptor,
+    ): PropertyDescriptor =>
+      descriptor,
+}));
+
+jest.mock('./PlaywrightAdapter', () => ({
+  wrapElement: (elem: unknown) => ({
+    unwrap: () => elem,
+    isEnabled: async () => true,
+    click: jest.fn().mockResolvedValue(undefined),
+    clear: jest.fn().mockResolvedValue(undefined),
+    getText: jest.fn().mockResolvedValue('native-text'),
+  }),
+}));
+
+jest.mock('./AndroidWebViewCdpHelpers', () => ({
+  __esModule: true,
+  isAndroidWebViewCdpEnabled: jest.fn(() => true),
+  default: {
+    scrollElementByIdIntoView: jest.fn(),
+    tapElementById: jest.fn(),
+    fillElementById: jest.fn(),
+    readElementTextById: jest.fn(),
+    selectOptionById: jest.fn(),
+    blurActiveElement: jest.fn(),
+  },
+}));
+
+jest.mock('./PlaywrightGestures', () => ({
+  __esModule: true,
+  default: {
+    waitAndTap: jest.fn().mockResolvedValue(undefined),
+    hideKeyboard: jest.fn().mockResolvedValue(undefined),
+  },
+}));
+
+jest.mock('./Gestures', () => ({
+  __esModule: true,
+  default: {
+    waitAndTap: jest.fn().mockResolvedValue(undefined),
+  },
+}));
+
+jest.mock('./Matchers', () => ({
+  __esModule: true,
+  default: {
+    getElementByText: jest.fn((text: string) => ({ text })),
+  },
+}));
+
+jest.mock('./Utilities', () => {
+  const actual = jest.requireActual('./Utilities');
+  return {
+    ...actual,
+    __esModule: true,
+    default: {
+      ...actual.default,
+      waitUntil: jest.fn(async (predicate: () => Promise<boolean>) => {
+        await predicate();
+      }),
+    },
+    sleep: jest.fn().mockResolvedValue(undefined),
+  };
+});
+
+jest.mock('./playwrightLogger', () => ({
+  createPlaywrightLogger: () => ({
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  }),
+}));
+
+interface MockElement {
+  waitForExist: jest.Mock;
+  elementId?: string;
+}
+
+function mockDriverWithFindSequence(outcomes: ('miss' | 'hit')[]): jest.Mock {
+  let call = 0;
+  const dollar = jest.fn(() => {
+    const outcome = outcomes[Math.min(call, outcomes.length - 1)];
+    call += 1;
+    const elem: MockElement = {
+      waitForExist: jest.fn(async () => {
+        if (outcome === 'miss') {
+          throw new Error('element not found');
+        }
+      }),
+      elementId: outcome === 'hit' ? 'elem-1' : undefined,
+    };
+    return elem;
+  });
+  (getDriver as jest.Mock).mockReturnValue({
+    $: dollar,
+    keys: jest.fn().mockResolvedValue(undefined),
+  });
+  return dollar;
+}
+
+describe('scrollAndroidWebIdIntoView', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (isAndroidWebViewCdpEnabled as jest.Mock).mockReturnValue(true);
+    (
+      AndroidWebViewCdpHelpers.scrollElementByIdIntoView as jest.Mock
+    ).mockResolvedValue(false);
+  });
+
+  it('uses CDP scroll when pageUrl is set and re-finds the resource-id', async () => {
+    mockDriverWithFindSequence(['miss', 'hit']);
+    (
+      AndroidWebViewCdpHelpers.scrollElementByIdIntoView as jest.Mock
+    ).mockResolvedValue(true);
+
+    const elem = await scrollAndroidWebIdIntoView('connectbip32', {
+      pageUrl: 'https://metamask.github.io/snaps/test-snaps/3.5.2/',
+    });
+
+    expect(PlaywrightContextHelpers.switchToNativeContext).toHaveBeenCalled();
+    expect(
+      AndroidWebViewCdpHelpers.scrollElementByIdIntoView,
+    ).toHaveBeenCalledWith('connectbip32', {
+      pageUrl: 'https://metamask.github.io/snaps/test-snaps/3.5.2/',
+    });
+    expect(elem).toBeDefined();
+  });
+
+  it('skips CDP when pageUrl is omitted', async () => {
+    // in-place miss, then UiScrollable hit (android= UiScrollable selector)
+    const dollar = mockDriverWithFindSequence(['miss', 'hit']);
+
+    await scrollAndroidWebIdIntoView('connectbip32', {
+      scrollLabels: { connectbip32: 'Connect to BIP-32 Snap' },
+    });
+
+    expect(
+      AndroidWebViewCdpHelpers.scrollElementByIdIntoView,
+    ).not.toHaveBeenCalled();
+    expect(dollar).toHaveBeenCalled();
+  });
+
+  it('falls back to UiScrollable when CDP scroll returns false', async () => {
+    mockDriverWithFindSequence(['miss', 'hit']);
+    (
+      AndroidWebViewCdpHelpers.scrollElementByIdIntoView as jest.Mock
+    ).mockResolvedValue(false);
+
+    await scrollAndroidWebIdIntoView('connectbip32', {
+      pageUrl: 'https://metamask.github.io/snaps/test-snaps/3.5.2/',
+    });
+
+    expect(
+      AndroidWebViewCdpHelpers.scrollElementByIdIntoView,
+    ).toHaveBeenCalled();
+  });
+
+  it('skips CDP when ANDROID_WEBVIEW_CDP is disabled', async () => {
+    (isAndroidWebViewCdpEnabled as jest.Mock).mockReturnValue(false);
+    mockDriverWithFindSequence(['miss', 'hit']);
+
+    await scrollAndroidWebIdIntoView('connectbip32', {
+      pageUrl: 'https://metamask.github.io/snaps/test-snaps/3.5.2/',
+    });
+
+    expect(
+      AndroidWebViewCdpHelpers.scrollElementByIdIntoView,
+    ).not.toHaveBeenCalled();
+  });
+});
+
+describe('tapAndroidWebId CDP path', () => {
+  const pageUrl = 'https://metamask.github.io/snaps/test-snaps/3.5.2/';
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (isAndroidWebViewCdpEnabled as jest.Mock).mockReturnValue(true);
+    (AndroidWebViewCdpHelpers.tapElementById as jest.Mock).mockResolvedValue(
+      false,
+    );
+  });
+
+  it('returns after successful CDP tap without native waitAndTap', async () => {
+    (AndroidWebViewCdpHelpers.tapElementById as jest.Mock).mockResolvedValue(
+      true,
+    );
+
+    await tapAndroidWebId('connectbip32', { pageUrl });
+
+    expect(AndroidWebViewCdpHelpers.tapElementById).toHaveBeenCalledWith(
+      'connectbip32',
+      { pageUrl },
+    );
+    expect(PlaywrightGestures.waitAndTap).not.toHaveBeenCalled();
+  });
+
+  it('falls back to native tap when CDP returns false', async () => {
+    mockDriverWithFindSequence(['hit']);
+    (AndroidWebViewCdpHelpers.tapElementById as jest.Mock).mockResolvedValue(
+      false,
+    );
+
+    await tapAndroidWebId('connectbip32', { pageUrl });
+
+    expect(AndroidWebViewCdpHelpers.tapElementById).toHaveBeenCalled();
+    expect(PlaywrightGestures.waitAndTap).toHaveBeenCalled();
+  });
+
+  it('skips CDP tap when pageUrl omitted', async () => {
+    mockDriverWithFindSequence(['hit']);
+    await tapAndroidWebId('connectbip32', {});
+    expect(AndroidWebViewCdpHelpers.tapElementById).not.toHaveBeenCalled();
+  });
+
+  it('skips CDP tap when kill switch disabled', async () => {
+    (isAndroidWebViewCdpEnabled as jest.Mock).mockReturnValue(false);
+    mockDriverWithFindSequence(['hit']);
+    await tapAndroidWebId('connectbip32', { pageUrl });
+    expect(AndroidWebViewCdpHelpers.tapElementById).not.toHaveBeenCalled();
+  });
+});
+
+describe('fillAndroidWebId CDP path', () => {
+  const pageUrl = 'https://metamask.github.io/snaps/test-snaps/3.5.2/';
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (isAndroidWebViewCdpEnabled as jest.Mock).mockReturnValue(true);
+    (AndroidWebViewCdpHelpers.fillElementById as jest.Mock).mockResolvedValue(
+      false,
+    );
+    (getDriver as jest.Mock).mockReturnValue({
+      $: jest.fn(),
+      keys: jest.fn().mockResolvedValue(undefined),
+    });
+  });
+
+  it('returns after successful CDP fill without native keys', async () => {
+    (AndroidWebViewCdpHelpers.fillElementById as jest.Mock).mockResolvedValue(
+      true,
+    );
+
+    await fillAndroidWebId('message', 'hi', { pageUrl });
+
+    expect(AndroidWebViewCdpHelpers.fillElementById).toHaveBeenCalledWith(
+      'message',
+      'hi',
+      { pageUrl },
+    );
+    expect(getDriver().keys).not.toHaveBeenCalled();
+    expect(PlaywrightGestures.hideKeyboard).toHaveBeenCalled();
+  });
+
+  it('falls back to native keys when CDP returns false', async () => {
+    mockDriverWithFindSequence(['hit']);
+    (AndroidWebViewCdpHelpers.fillElementById as jest.Mock).mockResolvedValue(
+      false,
+    );
+
+    await fillAndroidWebId('message', 'hi', { pageUrl });
+
+    expect(AndroidWebViewCdpHelpers.fillElementById).toHaveBeenCalled();
+    expect(getDriver().keys).toHaveBeenCalled();
+  });
+
+  it('skips CDP fill when pageUrl omitted', async () => {
+    mockDriverWithFindSequence(['hit']);
+    await fillAndroidWebId('message', 'hi', {});
+    expect(AndroidWebViewCdpHelpers.fillElementById).not.toHaveBeenCalled();
+  });
+
+  it('skips CDP fill when kill switch disabled', async () => {
+    (isAndroidWebViewCdpEnabled as jest.Mock).mockReturnValue(false);
+    mockDriverWithFindSequence(['hit']);
+    await fillAndroidWebId('message', 'hi', { pageUrl });
+    expect(AndroidWebViewCdpHelpers.fillElementById).not.toHaveBeenCalled();
+  });
+});
+
+describe('readAndroidWebIdText CDP path', () => {
+  const pageUrl = 'https://metamask.github.io/snaps/test-snaps/3.5.2/';
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (isAndroidWebViewCdpEnabled as jest.Mock).mockReturnValue(true);
+    (
+      AndroidWebViewCdpHelpers.readElementTextById as jest.Mock
+    ).mockResolvedValue(undefined);
+  });
+
+  it('returns CDP text without native getText', async () => {
+    (
+      AndroidWebViewCdpHelpers.readElementTextById as jest.Mock
+    ).mockResolvedValue('from-cdp');
+
+    const text = await readAndroidWebIdText('status', { pageUrl });
+
+    expect(text).toBe('from-cdp');
+    expect(AndroidWebViewCdpHelpers.readElementTextById).toHaveBeenCalledWith(
+      'status',
+      { pageUrl },
+    );
+  });
+
+  it('falls back to native getText when CDP returns undefined', async () => {
+    mockDriverWithFindSequence(['hit']);
+    (
+      AndroidWebViewCdpHelpers.readElementTextById as jest.Mock
+    ).mockResolvedValue(undefined);
+
+    const text = await readAndroidWebIdText('status', { pageUrl });
+
+    expect(AndroidWebViewCdpHelpers.readElementTextById).toHaveBeenCalled();
+    expect(text).toBe('native-text');
+  });
+
+  it('skips CDP read when pageUrl omitted', async () => {
+    mockDriverWithFindSequence(['hit']);
+    await readAndroidWebIdText('status', {});
+    expect(AndroidWebViewCdpHelpers.readElementTextById).not.toHaveBeenCalled();
+  });
+
+  it('skips CDP read when kill switch disabled', async () => {
+    (isAndroidWebViewCdpEnabled as jest.Mock).mockReturnValue(false);
+    mockDriverWithFindSequence(['hit']);
+    await readAndroidWebIdText('status', { pageUrl });
+    expect(AndroidWebViewCdpHelpers.readElementTextById).not.toHaveBeenCalled();
+  });
+});
+
+describe('selectAndroidWebId', () => {
+  const pageUrl = 'https://metamask.github.io/snaps/test-snaps/3.5.2/';
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (isAndroidWebViewCdpEnabled as jest.Mock).mockReturnValue(true);
+    (AndroidWebViewCdpHelpers.selectOptionById as jest.Mock).mockResolvedValue(
+      false,
+    );
+  });
+
+  it('returns after successful CDP select without native option tap', async () => {
+    (AndroidWebViewCdpHelpers.selectOptionById as jest.Mock).mockResolvedValue(
+      true,
+    );
+
+    await selectAndroidWebId('chain', 'Ethereum', { pageUrl });
+
+    expect(AndroidWebViewCdpHelpers.selectOptionById).toHaveBeenCalledWith(
+      'chain',
+      'Ethereum',
+      { pageUrl },
+    );
+    expect(Gestures.waitAndTap).not.toHaveBeenCalled();
+  });
+
+  it('falls back to tap select + option text when CDP fails', async () => {
+    (AndroidWebViewCdpHelpers.selectOptionById as jest.Mock).mockResolvedValue(
+      false,
+    );
+    (AndroidWebViewCdpHelpers.tapElementById as jest.Mock).mockResolvedValue(
+      true,
+    );
+
+    await selectAndroidWebId('chain', 'Ethereum', { pageUrl });
+
+    expect(Gestures.waitAndTap).toHaveBeenCalled();
+    expect(Matchers.getElementByText).toHaveBeenCalledWith('Ethereum');
+  });
+});
+
+describe('blurAndroidWebView', () => {
+  const pageUrl = 'https://metamask.github.io/snaps/test-snaps/3.5.2/';
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (isAndroidWebViewCdpEnabled as jest.Mock).mockReturnValue(true);
+    (AndroidWebViewCdpHelpers.blurActiveElement as jest.Mock).mockResolvedValue(
+      false,
+    );
+  });
+
+  it('calls CDP blur then always hideKeyboard', async () => {
+    (AndroidWebViewCdpHelpers.blurActiveElement as jest.Mock).mockResolvedValue(
+      true,
+    );
+
+    await blurAndroidWebView(pageUrl);
+
+    expect(AndroidWebViewCdpHelpers.blurActiveElement).toHaveBeenCalledWith(
+      pageUrl,
+    );
+    expect(PlaywrightGestures.hideKeyboard).toHaveBeenCalled();
+  });
+
+  it('skips CDP when kill switch disabled but still hideKeyboard', async () => {
+    (isAndroidWebViewCdpEnabled as jest.Mock).mockReturnValue(false);
+
+    await blurAndroidWebView(pageUrl);
+
+    expect(AndroidWebViewCdpHelpers.blurActiveElement).not.toHaveBeenCalled();
+    expect(PlaywrightGestures.hideKeyboard).toHaveBeenCalled();
+  });
+});
diff --git a/tests/framework/AndroidWebViewNative.ts b/tests/framework/AndroidWebViewNative.ts
index 5119e9949f79..3480c535f464 100644
--- a/tests/framework/AndroidWebViewNative.ts
+++ b/tests/framework/AndroidWebViewNative.ts
@@ -1,5 +1,10 @@
 /* eslint-disable import-x/no-nodejs-modules */
 import { BrowserViewSelectorsIDs } from '../../app/components/Views/BrowserTab/BrowserView.testIds';
+import AndroidWebViewCdpHelpers, {
+  isAndroidWebViewCdpEnabled,
+} from './AndroidWebViewCdpHelpers';
+import Gestures from './Gestures';
+import Matchers from './Matchers';
 import { wrapElement, type PlaywrightElement } from './PlaywrightAdapter';
 import PlaywrightContextHelpers from './PlaywrightContextHelpers';
 import { getDriver } from './PlaywrightUtilities';
@@ -16,6 +21,11 @@ const IN_PLACE_FIND_TIMEOUT_MS = 5_000;
 export interface AndroidWebViewScrollOptions {
   /** Optional visible text labels used when resource-id nodes are virtualized off-screen. */
   scrollLabels?: Record<string, string>;
+  /**
+   * Page URL for CDP scroll target selection (Android Appium).
+   * When set and CDP is enabled, scroll tries DOM scrollIntoView before UiScrollable.
+   */
+  pageUrl?: string;
 }
 
 export type AndroidWebViewTapOptions = AndroidWebViewScrollOptions & {
@@ -185,12 +195,43 @@ export async function scrollAndroidWebIdIntoView(
     return alreadyVisible;
   }
 
+  // Prefer CDP DOM scroll when pageUrl is known — avoids slow UiScrollable sweeps.
+  // Never uses Chromedriver; failures fall through to native scroll.
+  if (options.pageUrl && isAndroidWebViewCdpEnabled()) {
+    const cdpScrolled =
+      await AndroidWebViewCdpHelpers.scrollElementByIdIntoView(webId, {
+        pageUrl: options.pageUrl,
+      });
+    if (cdpScrolled) {
+      const afterCdp = await tryFindNativeWebIdElement(
+        webId,
+        IN_PLACE_FIND_TIMEOUT_MS,
+      );
+      if (afterCdp) {
+        return afterCdp;
+      }
+      logger.debug(
+        `CDP scrolled #${webId} but resource-id still missing; falling back to UiScrollable`,
+      );
+    }
+  }
+
   const viaUiScrollable = await scrollNativeWebIdIntoViewViaUiScrollable(
     webId,
     options.scrollLabels,
   );
   if (viaUiScrollable) {
-    return viaUiScrollable;
+    // Text-label fallback may match a nearby unique anchor (not the target
+    // resource-id). Re-resolve by id now that the section should be materialized.
+    // If id is still missing, fall through to gesture scroll instead of
+    // returning the anchor (which would tap/fill the wrong control).
+    const byId = await tryFindNativeWebIdElement(
+      webId,
+      IN_PLACE_FIND_TIMEOUT_MS,
+    );
+    if (byId) {
+      return byId;
+    }
   }
 
   return scrollNativeWebIdIntoViewViaScrollGesture(webId);
@@ -202,6 +243,15 @@ export async function tapAndroidWebId(
 ): Promise<void> {
   logger.debug(options.description ?? `Android native WebView tap: ${webId}`);
 
+  if (options.pageUrl && isAndroidWebViewCdpEnabled()) {
+    const cdpTapped = await AndroidWebViewCdpHelpers.tapElementById(webId, {
+      pageUrl: options.pageUrl,
+    });
+    if (cdpTapped) {
+      return;
+    }
+  }
+
   // Re-find until enabled so we don't hold a stale disabled node across React re-renders.
   let elem!: PlaywrightElement;
   await Utilities.waitUntil(
@@ -236,6 +286,18 @@ export async function fillAndroidWebId(
   value: string,
   options: AndroidWebViewFillOptions = {},
 ): Promise<void> {
+  if (options.pageUrl && isAndroidWebViewCdpEnabled()) {
+    const cdpFilled = await AndroidWebViewCdpHelpers.fillElementById(
+      webId,
+      value,
+      { pageUrl: options.pageUrl },
+    );
+    if (cdpFilled) {
+      await PlaywrightGestures.hideKeyboard().catch(() => undefined);
+      return;
+    }
+  }
+
   const elem = await scrollAndroidWebIdIntoView(webId, options);
   await elem.click();
   await elem.clear().catch((error) => {
@@ -252,6 +314,49 @@ export async function readAndroidWebIdText(
   webId: string,
   options: AndroidWebViewReadOptions = {},
 ): Promise<string> {
+  if (options.pageUrl && isAndroidWebViewCdpEnabled()) {
+    const cdpText = await AndroidWebViewCdpHelpers.readElementTextById(webId, {
+      pageUrl: options.pageUrl,
+    });
+    if (cdpText !== undefined) {
+      return cdpText;
+    }
+  }
+
   const elem = await scrollAndroidWebIdIntoView(webId, options);
   return elem.getText();
 }
+
+export async function selectAndroidWebId(
+  webId: string,
+  optionText: string,
+  options: AndroidWebViewTapOptions = {},
+): Promise<void> {
+  if (options.pageUrl && isAndroidWebViewCdpEnabled()) {
+    const cdpSelected = await AndroidWebViewCdpHelpers.selectOptionById(
+      webId,
+      optionText,
+      { pageUrl: options.pageUrl },
+    );
+    if (cdpSelected) {
+      return;
+    }
+  }
+
+  await tapAndroidWebId(webId, {
+    ...options,
+    timeout: options.timeout ?? 60_000,
+    description: options.description ?? `WebView select open "${webId}"`,
+  });
+  await Gestures.waitAndTap(Matchers.getElementByText(optionText), {
+    elemDescription: `WebView select option "${optionText}"`,
+    timeout: 30_000,
+  });
+}
+
+export async function blurAndroidWebView(pageUrl: string): Promise<void> {
+  if (pageUrl && isAndroidWebViewCdpEnabled()) {
+    await AndroidWebViewCdpHelpers.blurActiveElement(pageUrl);
+  }
+  await PlaywrightGestures.hideKeyboard().catch(() => undefined);
+}
diff --git a/tests/framework/Assertions.ts b/tests/framework/Assertions.ts
index 7bae59487648..c85c421d5d3c 100644
--- a/tests/framework/Assertions.ts
+++ b/tests/framework/Assertions.ts
@@ -10,7 +10,6 @@ import {
 import { Json } from '@metamask/utils';
 import { FrameworkDetector } from './FrameworkDetector.ts';
 import PlaywrightAssertions from './PlaywrightAssertions.ts';
-import PlaywrightContextHelpers from './PlaywrightContextHelpers.ts';
 
 /**
  * Assertions with auto-retry and better error messages
@@ -30,11 +29,6 @@ export default class Assertions {
     options: AssertionOptions = {},
   ): Promise<void> {
     if (FrameworkDetector.isAppium()) {
-      // Switch context BEFORE resolving the matcher so its findElement is
-      // minted against UiAutomator2, not the webview automator. Passing a
-      // thunk defers the find until after the switch, avoiding a cross-engine
-      // request-shape error on the confirmation screen post webview sign.
-      await PlaywrightContextHelpers.switchToNativeContext();
       const resolved = typeof elem === 'function' ? elem() : elem;
       return PlaywrightAssertions.expectElementToBeVisible(
         asPlaywrightElement(resolved as EncapsulatedElementType),
@@ -71,6 +65,33 @@ export default class Assertions {
     );
   }
 
+  /**
+   * Assert element exists in the hierarchy (may not report as displayed).
+   * Use for BottomSheet / confirmation children under Appium where
+   * isDisplayed=false while the UI is on screen.
+   */
+  static async expectElementToExist(
+    elem:
+      | DetoxElement
+      | WebElement
+      | DetoxMatcher
+      | IndexableNativeElement
+      | EncapsulatedElementType
+      | (() => EncapsulatedElementType),
+    options: AssertionOptions = {},
+  ): Promise<void> {
+    if (FrameworkDetector.isAppium()) {
+      const resolved = typeof elem === 'function' ? elem() : elem;
+      return PlaywrightAssertions.expectElementToExist(
+        asPlaywrightElement(resolved as EncapsulatedElementType),
+        options,
+      );
+    }
+
+    // Detox: existence is already how iOS visibility is asserted.
+    return this.expectElementToBeVisible(elem, options);
+  }
+
   /**
    * Assert element is not visible with auto-retry
    */
@@ -85,7 +106,6 @@ export default class Assertions {
     options: AssertionOptions = {},
   ): Promise<void> {
     if (FrameworkDetector.isAppium()) {
-      await PlaywrightContextHelpers.switchToNativeContext();
       const resolved = typeof elem === 'function' ? elem() : elem;
       return PlaywrightAssertions.expectElementToNotBeVisible(
         asPlaywrightElement(resolved as EncapsulatedElementType),
@@ -230,7 +250,6 @@ export default class Assertions {
     options: AssertionOptions = {},
   ): Promise<void> {
     if (FrameworkDetector.isAppium()) {
-      await PlaywrightContextHelpers.switchToNativeContext();
       return PlaywrightAssertions.expectElementToHaveLabel(
         asPlaywrightElement(elem),
         label,
diff --git a/tests/framework/ChromeCdpHelpers.ts b/tests/framework/ChromeCdpHelpers.ts
index b7b0a56278b2..0c230461436c 100644
--- a/tests/framework/ChromeCdpHelpers.ts
+++ b/tests/framework/ChromeCdpHelpers.ts
@@ -5,6 +5,8 @@ import type { Context } from '@wdio/protocols';
 import type { AndroidDetailedContext } from 'webdriverio/build/types';
 import { APP_PACKAGE_IDS } from './Constants.ts';
 import { getDriver, executeMobileDeepLink } from './PlaywrightUtilities';
+import { PlatformDetector } from './PlatformLocator';
+import PlaywrightContextHelpers from './PlaywrightContextHelpers';
 import { createPlaywrightLogger } from './playwrightLogger.ts';
 
 const logger = createPlaywrightLogger('ChromeCdpHelpers');
@@ -178,6 +180,18 @@ export default class ChromeCdpHelpers {
    * Forward host → device Chrome DevTools abstract socket.
    */
   private static ensureAdbForward(port = CDP_FORWARD_PORT): void {
+    this.ensureAdbForwardToAbstractSocket(port, 'chrome_devtools_remote');
+    logger.debug(`ADB forwarded tcp:${port} → chrome_devtools_remote`);
+  }
+
+  /**
+   * Replace any existing `adb forward` for `port` so rediscovery cannot leave
+   * the host port pointed at a dead abstract socket ("already forwarded").
+   */
+  private static ensureAdbForwardToAbstractSocket(
+    port: number,
+    abstractSocket: string,
+  ): void {
     try {
       execFileSync('adb', ['forward', '--remove', `tcp:${port}`], {
         stdio: 'pipe',
@@ -187,10 +201,9 @@ export default class ChromeCdpHelpers {
     }
     execFileSync(
       'adb',
-      ['forward', `tcp:${port}`, 'localabstract:chrome_devtools_remote'],
+      ['forward', `tcp:${port}`, `localabstract:${abstractSocket}`],
       { stdio: 'pipe' },
     );
-    logger.debug(`ADB forwarded tcp:${port} → chrome_devtools_remote`);
   }
 
   /**
@@ -340,6 +353,67 @@ export default class ChromeCdpHelpers {
     });
   }
 
+  private static elementEnabledExpression(elementId: string): string {
+    return `(() => {
+      const el = document.getElementById(${JSON.stringify(elementId)});
+      if (!el) return false;
+      if ('disabled' in el && Boolean(el.disabled)) return false;
+      if (el.getAttribute('aria-disabled') === 'true') return false;
+      return true;
+    })()`;
+  }
+
+  private static async waitForEnabledInSession(
+    session: CdpSession,
+    elementId: string,
+    timeoutMs: number,
+  ): Promise<void> {
+    const isEnabledExpression = this.elementEnabledExpression(elementId);
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+      const ready = await session.evaluate<boolean>(isEnabledExpression);
+      if (ready) return;
+      await new Promise<void>((r) => setTimeout(r, POLL_MS));
+    }
+    throw new Error(
+      `Timed out after ${timeoutMs}ms waiting for #${elementId} to be enabled`,
+    );
+  }
+
+  private static async dispatchTrustedClickById(
+    session: CdpSession,
+    elementId: string,
+  ): Promise<void> {
+    const clicked = await session.evaluate<boolean>(
+      `(() => {
+        const el = document.getElementById(${JSON.stringify(elementId)});
+        if (!el || typeof el.click !== 'function') return false;
+        // Disabled controls ignore HTMLElement.click(); treat as miss.
+        if ('disabled' in el && Boolean(el.disabled)) return false;
+        if (el.getAttribute('aria-disabled') === 'true') return false;
+        el.scrollIntoView({ block: 'center', inline: 'center' });
+        el.click();
+        return true;
+      })()`,
+      { userGesture: true },
+    );
+    if (!clicked) {
+      throw new Error(`CDP: could not click #${elementId}`);
+    }
+  }
+
+  /**
+   * Wait until `#elementId` is DOM-enabled, then trusted-click (same CDP session).
+   */
+  private static async waitForEnabledAndClickById(
+    session: CdpSession,
+    elementId: string,
+    timeoutMs = DAPP_PAGE_TIMEOUT_MS,
+  ): Promise<void> {
+    await this.waitForEnabledInSession(session, elementId, timeoutMs);
+    await this.dispatchTrustedClickById(session, elementId);
+  }
+
   private static async installDeeplinkCapture(
     session: CdpSession,
   ): Promise<void> {
@@ -690,7 +764,7 @@ export default class ChromeCdpHelpers {
     return (
       Boolean(target.title) &&
       /multichain api test dapp/i.test(target.title ?? '') &&
-      /:8090\b/.test(dappUrl)
+      dappUrl.includes('localhost')
     );
   }
 
@@ -728,4 +802,308 @@ export default class ChromeCdpHelpers {
       return protocol === 'https:' ? '443' : '80';
     }
   }
+
+  // ── MetaMask in-app WebView CDP support ────────────────────────────────────
+  //
+  // The MetaMask in-app browser uses `webview_devtools_remote_<pid>` instead
+  // of `chrome_devtools_remote`. These methods mirror the Chrome helpers above
+  // but resolve the WebView socket via `mobile: getContexts`. The socket name
+  // is cached so `mobile: getContexts` (which can be slow) is called at most
+  // once per test — call `resetMetaMaskWebViewCache()` between tests.
+
+  private static readonly MM_WV_CDP_PORT = 10902;
+  private static cachedMmWebViewSocket: string | null = null;
+
+  /** Clear the WebView socket cache — call at the start of each test. */
+  static resetMetaMaskWebViewCache(): void {
+    this.cachedMmWebViewSocket = null;
+  }
+
+  private static async resolveMetaMaskWebViewEndpoint(): Promise<string> {
+    if (this.cachedMmWebViewSocket) {
+      try {
+        this.ensureAdbForwardToAbstractSocket(
+          this.MM_WV_CDP_PORT,
+          this.cachedMmWebViewSocket,
+        );
+        const endpoint = `http://127.0.0.1:${this.MM_WV_CDP_PORT}`;
+        // adb forward succeeds even when the abstract socket is gone — probe CDP.
+        const response = await fetch(`${endpoint}/json/version`);
+        if (response.ok) {
+          return endpoint;
+        }
+        this.cachedMmWebViewSocket = null;
+      } catch {
+        this.cachedMmWebViewSocket = null;
+      }
+    }
+
+    const rawContexts = (await getDriver().execute('mobile: getContexts')) as {
+      proc?: string;
+      webviewName?: string;
+    }[];
+    const mmCtx = rawContexts.find(
+      (ctx) =>
+        ctx.webviewName === 'WEBVIEW_io.metamask' ||
+        ctx.proc?.includes('webview_devtools_remote'),
+    );
+    if (!mmCtx?.proc) throw new Error('MetaMask WebView CDP context not found');
+
+    const socketName = mmCtx.proc.replace(/^@/, '');
+    this.ensureAdbForwardToAbstractSocket(this.MM_WV_CDP_PORT, socketName);
+    this.cachedMmWebViewSocket = socketName;
+    return `http://127.0.0.1:${this.MM_WV_CDP_PORT}`;
+  }
+
+  private static async withMetaMaskWebViewSession<T>(
+    dappUrl: string,
+    fn: (session: CdpSession) => Promise<T>,
+  ): Promise<T> {
+    try {
+      const endpoint = await this.resolveMetaMaskWebViewEndpoint();
+      const target = await this.waitForCdpTarget(endpoint, dappUrl);
+      if (!target.webSocketDebuggerUrl) {
+        throw new Error(
+          `MetaMask WebView CDP target for ${dappUrl} has no webSocketDebuggerUrl`,
+        );
+      }
+      const session = await CdpSession.connect(target.webSocketDebuggerUrl);
+      try {
+        return await fn(session);
+      } finally {
+        session.close();
+      }
+    } catch (error) {
+      // Stale webview_devtools_remote_<pid> after app restart / fixture reuse
+      // otherwise burns the full CDP target timeout on a dead socket.
+      this.resetMetaMaskWebViewCache();
+      throw error;
+    }
+  }
+
+  /**
+   * Evaluate arbitrary JavaScript in the MetaMask in-app WebView page at `dappUrl`.
+   * Android: CDP Runtime.evaluate. iOS: Appium WebView context + execute().
+   * Note: expression must be synchronous — do not return Promises.
+   */
+  static async evaluateInWebView<T>(
+    dappUrl: string,
+    expression: string,
+  ): Promise<T | null> {
+    if (PlatformDetector.isAndroid()) {
+      try {
+        return await this.withMetaMaskWebViewSession(dappUrl, (session) =>
+          session.evaluate<T>(expression),
+        );
+      } catch {
+        return null;
+      }
+    }
+    // iOS: use Appium WebView context switching
+    try {
+      await PlaywrightContextHelpers.switchToWebViewContext(dappUrl);
+      const result = (await getDriver().execute(
+        `return (${expression})`,
+      )) as T | null;
+      await PlaywrightContextHelpers.switchToNativeContext();
+      return result ?? null;
+    } catch {
+      await PlaywrightContextHelpers.switchToNativeContext().catch(
+        () => undefined,
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Click an element by HTML `id` in the MetaMask in-app WebView.
+   * Waits until the control exists and is not disabled (test-dapp buttons start
+   * disabled until connect / contract deploy), then clicks.
+   * Android: CDP trusted click. iOS: Appium WebView context + element.click().
+   */
+  static async clickByIdInWebView(
+    dappUrl: string,
+    elementId: string,
+    timeoutMs = DAPP_PAGE_TIMEOUT_MS,
+  ): Promise<boolean> {
+    if (PlatformDetector.isAndroid()) {
+      try {
+        await this.withMetaMaskWebViewSession(dappUrl, (session) =>
+          this.waitForEnabledAndClickById(session, elementId, timeoutMs),
+        );
+        return true;
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        logger.debug(`clickByIdInWebView failed for #${elementId}: ${message}`);
+        // Surface enable timeouts — native UiAutomator fallback cannot fix a
+        // control that never becomes DOM-enabled.
+        if (
+          message.includes('Timed out after') &&
+          message.includes('to be enabled')
+        ) {
+          throw error;
+        }
+        return false;
+      }
+    }
+    // iOS
+    try {
+      await PlaywrightContextHelpers.switchToWebViewContext(dappUrl);
+      const el = getDriver().$(`#${elementId}`);
+      await el.waitForExist({ timeout: timeoutMs });
+      await el.waitForEnabled({ timeout: timeoutMs });
+      await el.scrollIntoView();
+      await el.click();
+      await PlaywrightContextHelpers.switchToNativeContext();
+      return true;
+    } catch {
+      await PlaywrightContextHelpers.switchToNativeContext().catch(
+        () => undefined,
+      );
+      return false;
+    }
+  }
+
+  /**
+   * Read `textContent` of an element by HTML `id` (single attempt).
+   * Android: CDP. iOS: Appium WebView context.
+   */
+  static async readTextByIdInWebView(
+    dappUrl: string,
+    elementId: string,
+  ): Promise<string | null> {
+    if (PlatformDetector.isAndroid()) {
+      try {
+        return await this.withMetaMaskWebViewSession(dappUrl, (session) =>
+          session.evaluate<string | null>(
+            `(() => {
+              const el = document.getElementById(${JSON.stringify(elementId)});
+              return el ? (el.textContent ?? null) : null;
+            })()`,
+          ),
+        );
+      } catch {
+        return null;
+      }
+    }
+    // iOS
+    try {
+      await PlaywrightContextHelpers.switchToWebViewContext(dappUrl);
+      const text = (await getDriver().execute(
+        `return document.getElementById(${JSON.stringify(elementId)})?.textContent ?? null`,
+      )) as string | null;
+      await PlaywrightContextHelpers.switchToNativeContext();
+      return text || null;
+    } catch {
+      await PlaywrightContextHelpers.switchToNativeContext().catch(
+        () => undefined,
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Poll until `#elementId` exists and is not disabled / aria-disabled.
+   * Android: CDP. iOS: Appium WebView context.
+   */
+  static async waitForElementEnabledByIdInWebView(
+    dappUrl: string,
+    elementId: string,
+    timeoutMs = DAPP_PAGE_TIMEOUT_MS,
+  ): Promise<void> {
+    const isEnabledExpression = this.elementEnabledExpression(elementId);
+    const deadline = Date.now() + timeoutMs;
+
+    if (PlatformDetector.isAndroid()) {
+      await this.withMetaMaskWebViewSession(dappUrl, (session) =>
+        this.waitForEnabledInSession(session, elementId, timeoutMs),
+      );
+      return;
+    }
+
+    try {
+      await PlaywrightContextHelpers.switchToWebViewContext(dappUrl);
+      while (Date.now() < deadline) {
+        const ready = (await getDriver().execute(
+          `return (${isEnabledExpression})`,
+        )) as boolean;
+        if (ready) {
+          await PlaywrightContextHelpers.switchToNativeContext();
+          return;
+        }
+        await new Promise<void>((r) => setTimeout(r, POLL_MS));
+      }
+      await PlaywrightContextHelpers.switchToNativeContext();
+    } catch (error) {
+      await PlaywrightContextHelpers.switchToNativeContext().catch(
+        () => undefined,
+      );
+      throw error;
+    }
+
+    throw new Error(
+      `Timed out after ${timeoutMs}ms waiting for #${elementId} to be enabled`,
+    );
+  }
+
+  /**
+   * Poll until the element's `textContent` is non-empty (truthy).
+   * Android: single CDP session held open for the full duration.
+   * iOS: Appium WebView context held open for the full duration.
+   */
+  static async waitForElementTextInWebView(
+    dappUrl: string,
+    elementId: string,
+    timeoutMs = 10_000,
+  ): Promise<string | null> {
+    if (PlatformDetector.isAndroid()) {
+      try {
+        return await this.withMetaMaskWebViewSession(
+          dappUrl,
+          async (session) => {
+            const deadline = Date.now() + timeoutMs;
+            while (Date.now() < deadline) {
+              const text = await session.evaluate<string | null>(
+                `(() => {
+                const el = document.getElementById(${JSON.stringify(elementId)});
+                return el ? (el.textContent ?? null) : null;
+              })()`,
+              );
+              if (text) return text;
+              await new Promise<void>((r) => setTimeout(r, POLL_MS));
+            }
+            return null;
+          },
+        );
+      } catch {
+        return null;
+      }
+    }
+    // iOS: hold WebView context open for the full polling duration
+    try {
+      await PlaywrightContextHelpers.switchToWebViewContext(dappUrl);
+      const deadline = Date.now() + timeoutMs;
+      while (Date.now() < deadline) {
+        try {
+          const text = (await getDriver().execute(
+            `return document.getElementById(${JSON.stringify(elementId)})?.textContent ?? null`,
+          )) as string | null;
+          if (text) {
+            await PlaywrightContextHelpers.switchToNativeContext();
+            return text;
+          }
+        } catch {
+          // element not yet in DOM
+        }
+        await new Promise<void>((r) => setTimeout(r, POLL_MS));
+      }
+      await PlaywrightContextHelpers.switchToNativeContext();
+      return null;
+    } catch {
+      await PlaywrightContextHelpers.switchToNativeContext().catch(
+        () => undefined,
+      );
+      return null;
+    }
+  }
 }
diff --git a/tests/framework/Constants.ts b/tests/framework/Constants.ts
index c39c0129b7bf..471fd5246497 100644
--- a/tests/framework/Constants.ts
+++ b/tests/framework/Constants.ts
@@ -1,8 +1,8 @@
 /* eslint-disable import-x/no-nodejs-modules */
 import path from 'path';
 import { GanacheHardfork, RampsRegion } from './types';
-import { DEFAULT_ANVIL_PORT } from '../seeder/anvil-manager';
 import { PlatformDetector } from './PlatformLocator.ts';
+export const DEFAULT_ANVIL_PORT = 8545;
 
 // The RPC URL for the local node
 // This should be used in fixtures where a url is needed.
diff --git a/tests/framework/Gestures.ts b/tests/framework/Gestures.ts
index 8b98de731561..9f71c9167a10 100644
--- a/tests/framework/Gestures.ts
+++ b/tests/framework/Gestures.ts
@@ -96,6 +96,8 @@ export default class Gestures {
         timeout: options.timeout,
         description: options.elemDescription,
         delay: options.delay,
+        checkForDisplayed: options.checkForDisplayed,
+        checkForEnabled: options.checkEnabled,
       });
     }
 
@@ -141,6 +143,8 @@ export default class Gestures {
         timeout: options.timeout,
         description: options.elemDescription,
         delay: options.delay,
+        checkForDisplayed: options.checkForDisplayed,
+        checkForEnabled: options.checkEnabled,
       });
     }
 
@@ -387,6 +391,7 @@ export default class Gestures {
         description: options.elemDescription,
         hideKeyboard: options.hideKeyboard,
         clearFirst: options.clearFirst,
+        checkForDisplayed: options.checkForDisplayed,
       });
     }
 
diff --git a/tests/framework/PlaywrightAssertions.ts b/tests/framework/PlaywrightAssertions.ts
index 307f76b1d0c8..05ac9cdd51e1 100644
--- a/tests/framework/PlaywrightAssertions.ts
+++ b/tests/framework/PlaywrightAssertions.ts
@@ -140,6 +140,48 @@ export default class PlaywrightAssertions {
     await this.pollUntilVisible(el, this.getTimeout(options));
   }
 
+  /**
+   * Asserts that a target element eventually exists in the hierarchy.
+   * Prefer this over {@link expectElementToBeVisible} for BottomSheet /
+   * confirmation children that report isDisplayed=false while on screen.
+   */
+  static async expectElementToExist(
+    targetElement: PlaywrightElement | Promise<PlaywrightElement>,
+    options: AssertionOptions = {},
+  ): Promise<void> {
+    const el = await targetElement;
+    const timeout = this.getTimeout(options);
+    const description = options.description ?? 'element';
+    const start = Date.now();
+
+    const found = await withImplicitWait(
+      this.POLL_IMPLICIT_WAIT_MS,
+      async () => {
+        while (Date.now() - start < timeout) {
+          try {
+            if (await el.unwrap().isExisting()) {
+              return true;
+            }
+          } catch {
+            // element not ready yet
+          }
+          const remaining = timeout - (Date.now() - start);
+          if (remaining <= 0) {
+            break;
+          }
+          await sleep(Math.min(this.POLL_INTERVAL_MS, remaining));
+        }
+        return false;
+      },
+    );
+
+    if (!found) {
+      throw new Error(
+        `Element "${description}" not in hierarchy after ${timeout}ms`,
+      );
+    }
+  }
+
   /**
    * Waits until an element stays enabled (and on Android, native attrs are not false).
    * Prefer waitForInteractive on waitAndTap for tap flows.
diff --git a/tests/framework/PlaywrightContextHelpers.ts b/tests/framework/PlaywrightContextHelpers.ts
index 37c9ad8ed919..2e945eca3c3a 100644
--- a/tests/framework/PlaywrightContextHelpers.ts
+++ b/tests/framework/PlaywrightContextHelpers.ts
@@ -199,7 +199,10 @@ export default class PlaywrightContextHelpers {
     }
     const title = ctx.title ?? '';
     // Playground title is stable when Chrome URL metadata is empty on CI.
-    if (/multichain api test dapp/i.test(title) && /:8090\b/.test(dappUrl)) {
+    if (
+      /multichain api test dapp/i.test(title) &&
+      dappUrl.includes('localhost')
+    ) {
       return true;
     }
     return false;
diff --git a/tests/framework/PlaywrightGestures.ts b/tests/framework/PlaywrightGestures.ts
index f3350a8ee5fa..2db91ec75b50 100644
--- a/tests/framework/PlaywrightGestures.ts
+++ b/tests/framework/PlaywrightGestures.ts
@@ -225,6 +225,7 @@ export default class PlaywrightGestures {
       checkForStable?: boolean;
       enabledStableReads?: number;
       postEnabledSettleMs?: number;
+      elemDescription?: string;
     },
   ): Promise<void> {
     const {
@@ -236,6 +237,7 @@ export default class PlaywrightGestures {
       checkForStable = false,
       enabledStableReads = 3,
       postEnabledSettleMs,
+      elemDescription,
     } = options || {};
 
     if (checkForDisplayed) {
@@ -264,7 +266,13 @@ export default class PlaywrightGestures {
       await new Promise((resolve) => setTimeout(resolve, delay));
     }
 
-    await debugElementAction(logger, 'Wait and tap element', elem);
+    await debugElementAction(
+      logger,
+      elemDescription
+        ? `Wait and tap element: ${elemDescription}`
+        : 'Wait and tap element',
+      elem,
+    );
     await elem.unwrap().click();
   }
 
@@ -322,7 +330,11 @@ export default class PlaywrightGestures {
   }
 
   /**
-   * Long press an element
+   * Long press an element via W3C pointer actions.
+   *
+   * Avoid `touchAction` — some WDIO/Appium combinations still route that call
+   * through the legacy `touch/perform` endpoint, which can fail for native
+   * mobile sessions (GET with body).
    */
   @boxedStep
   static async longPress(
@@ -330,20 +342,24 @@ export default class PlaywrightGestures {
     duration = 1000,
   ): Promise<void> {
     await assertResolvedElementId(elem, 'longPress', 'target');
+    const drv = getDriver();
+    if (!drv) throw new Error('Driver is not available');
+
     const location = await elem.unwrap().getLocation();
     const size = await elem.unwrap().getSize();
-
-    const x = location.x + size.width / 2;
-    const y = location.y + size.height / 2;
+    const x = Math.floor(location.x + size.width / 2);
+    const y = Math.floor(location.y + size.height / 2);
 
     await debugElementAction(logger, 'Long pressing element', elem);
-    await elem
-      .unwrap()
-      .touchAction([
-        { action: 'press', x, y },
-        { action: 'wait', ms: duration },
-        'release',
-      ]);
+    await drv
+      .action('pointer', {
+        parameters: { pointerType: 'touch' },
+      })
+      .move({ x, y })
+      .down()
+      .pause(duration)
+      .up()
+      .perform();
   }
 
   /**
@@ -557,15 +573,41 @@ export default class PlaywrightGestures {
     await drv.execute('mobile: backgroundApp', { seconds });
   }
 
+  /**
+   * Tap a single iOS soft-keyboard key by accessibility id (e.g. "Delete", "1").
+   */
+  @boxedStep
+  static async tapIosKeyboardKey(keyName: string): Promise<void> {
+    const drv = getDriver();
+    if (!drv) throw new Error('Driver is not available');
+
+    const key = await drv.$(`~${keyName}`);
+    await key.waitForExist({ timeout: 5000 });
+    await key.click();
+  }
+
   /**
    * Type into the focused iOS soft keyboard by tapping keys.
    * Supports lowercase letters, digits 0-9, '.', and space only.
+   *
+   * @param options.numberPad - When true, skip QWERTY `~more` switching
+   * (digits are already on the pad). Use for `keyboardType="numeric"` fields.
    */
   @boxedStep
-  static async typeViaIosKeyboard(text: string): Promise<void> {
+  static async typeViaIosKeyboard(
+    text: string,
+    options?: { numberPad?: boolean },
+  ): Promise<void> {
     const drv = getDriver();
     if (!drv) throw new Error('Driver is not available');
 
+    if (options?.numberPad) {
+      for (const ch of text) {
+        await this.tapIosKeyboardKey(ch);
+      }
+      return;
+    }
+
     await drv
       .$('//XCUIElementTypeKeyboard')
       .waitForDisplayed({ timeout: 10000 });
@@ -573,13 +615,13 @@ export default class PlaywrightGestures {
     let onNumbers = false;
     const ensureLetters = async (): Promise<void> => {
       if (onNumbers) {
-        await drv.$('~more').click();
+        await this.tapIosKeyboardKey('more');
         onNumbers = false;
       }
     };
     const ensureNumbers = async (): Promise<void> => {
       if (!onNumbers) {
-        await drv.$('~more').click();
+        await this.tapIosKeyboardKey('more');
         onNumbers = true;
       }
     };
@@ -587,10 +629,10 @@ export default class PlaywrightGestures {
     for (const ch of text) {
       if (ch === '.' || (ch >= '0' && ch <= '9')) {
         await ensureNumbers();
-        await drv.$(`~${ch}`).click();
+        await this.tapIosKeyboardKey(ch);
       } else if (ch === ' ') {
         await ensureLetters();
-        await drv.$('~space').click();
+        await this.tapIosKeyboardKey('space');
       } else {
         const letter = ch.toLowerCase();
         if (letter < 'a' || letter > 'z') {
@@ -599,7 +641,7 @@ export default class PlaywrightGestures {
           );
         }
         await ensureLetters();
-        await drv.$(`~${letter}`).click();
+        await this.tapIosKeyboardKey(letter);
       }
     }
   }
diff --git a/tests/framework/PlaywrightWebMatchers.ts b/tests/framework/PlaywrightWebMatchers.ts
index 05823eb767cf..05144a98c1f9 100644
--- a/tests/framework/PlaywrightWebMatchers.ts
+++ b/tests/framework/PlaywrightWebMatchers.ts
@@ -37,6 +37,11 @@ export default class PlaywrightWebMatchers {
     return this.findElementByWebID(innerID);
   }
 
+  /**
+   * Run `action` in the page's WEBVIEW context, then always restore NATIVE_APP.
+   * Native assertions after WebView interaction rely on this restore — do not
+   * compensate inside Assertions.
+   */
   static async withWebViewAction(
     pageUrl: string,
     action: () => Promise<void>,
diff --git a/tests/framework/Utilities.ts b/tests/framework/Utilities.ts
index c083b557500a..3d93fbfecd0a 100644
--- a/tests/framework/Utilities.ts
+++ b/tests/framework/Utilities.ts
@@ -107,12 +107,10 @@ export default class Utilities {
       if (!(await el.isEnabled())) {
         return;
       }
-      // Android RN reports isEnabled=true while disabled — use native enabled attr
-      if (PlatformDetector.isAndroidAppium()) {
-        const enabledAttr = await el.getAttribute('enabled');
-        if (enabledAttr === 'false') {
-          return;
-        }
+      // RN may report isEnabled=true while native enabled="false".
+      const enabledAttr = await el.getAttribute('enabled');
+      if (enabledAttr === 'false') {
+        return;
       }
       throw new Error('🚫 Element is enabled, but should be disabled.');
     }
diff --git a/tests/framework/WebView.ts b/tests/framework/WebView.ts
index 295059209113..d7c530038dcc 100644
--- a/tests/framework/WebView.ts
+++ b/tests/framework/WebView.ts
@@ -1,8 +1,10 @@
 import { BrowserViewSelectorsIDs } from '../../app/components/Views/BrowserTab/BrowserView.testIds';
 import {
+  blurAndroidWebView,
   fillAndroidWebId,
   readAndroidWebIdText,
   scrollAndroidWebIdIntoView,
+  selectAndroidWebId,
   tapAndroidWebId,
   type AndroidWebViewScrollOptions,
   type AndroidWebViewTapOptions,
@@ -114,15 +116,11 @@ export default class WebView {
     options: WebViewByIdOptions = {},
   ): Promise<void> {
     if (PlatformDetector.isAndroidAppium()) {
-      await tapAndroidWebId(webId, {
+      await selectAndroidWebId(webId, optionText, {
         ...options,
         timeout: 60_000,
         description: options.description ?? `WebView select open "${webId}"`,
       });
-      await Gestures.waitAndTap(Matchers.getElementByText(optionText), {
-        elemDescription: `WebView select option "${optionText}"`,
-        timeout: 30_000,
-      });
       return;
     }
 
@@ -193,8 +191,7 @@ export default class WebView {
     }
 
     if (PlatformDetector.isAndroidAppium()) {
-      // No Chromedriver context — dismiss the soft keyboard only.
-      await PlaywrightGestures.hideKeyboard().catch(() => undefined);
+      await blurAndroidWebView(pageUrl);
       return;
     }
 
diff --git a/tests/framework/detox/DetoxAppLaunch.js b/tests/framework/detox/DetoxAppLaunch.js
new file mode 100644
index 000000000000..b756655d4622
--- /dev/null
+++ b/tests/framework/detox/DetoxAppLaunch.js
@@ -0,0 +1,183 @@
+/* eslint-disable import-x/no-nodejs-modules */
+/**
+ * Detox-only app launch helpers.
+ * Appium uses PlaywrightUtilities.launchApp instead.
+ */
+import { resolveConfig } from 'detox/internals';
+import { exec } from 'child_process';
+import { promisify } from 'util';
+import { createLogger } from '../logger';
+
+const logger = createLogger({
+  name: 'DetoxAppLaunch',
+});
+const execAsync = promisify(exec);
+
+function getDeepLinkUrl(url) {
+  return `expo-metamask://expo-development-client/?url=${encodeURIComponent(
+    url,
+  )}`;
+}
+
+function getDevLauncherPackagerUrl(platform) {
+  const port = process.env.METRO_PORT_E2E || process.env.WATCHER_PORT || '8081';
+  return `http://localhost:${port}/index.bundle?platform=${platform}&dev=true&minify=false&disableOnboarding=1`;
+}
+
+function getAdbDeviceFlag() {
+  return device?.id ? `-s ${device.id}` : '';
+}
+
+async function logAndroidReversePorts(context) {
+  if (device.getPlatform() !== 'android') {
+    return;
+  }
+
+  try {
+    const command = `adb ${getAdbDeviceFlag()} reverse --list`;
+    const { stdout } = await execAsync(command);
+    logger.debug(
+      `[launch diagnostics] ${context} | adb reverse --list:\n${
+        stdout?.trim() || '(empty)'
+      }`,
+    );
+  } catch (error) {
+    logger.warn(
+      `[launch diagnostics] ${context} | Failed to list adb reverse ports`,
+      error,
+    );
+  }
+}
+
+function isAndroidReverseAddressInUseError(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return (
+    device.getPlatform() === 'android' &&
+    message.includes('adb') &&
+    message.includes('reverse tcp:') &&
+    message.includes('Address already in use')
+  );
+}
+
+function extractConflictingReversePort(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  const match = message.match(/reverse tcp:(\d+) tcp:\1/);
+  return match?.[1];
+}
+
+async function removeAndroidReversePort(port) {
+  try {
+    const command = `adb ${getAdbDeviceFlag()} reverse --remove tcp:${port}`;
+    await execAsync(command);
+    logger.warn(
+      `[launch recovery] Removed conflicting adb reverse tcp:${port}. Retrying app launch once.`,
+    );
+  } catch (removeError) {
+    const msg =
+      removeError instanceof Error ? removeError.message : String(removeError);
+    if (msg.includes('not found')) {
+      logger.warn(
+        `[launch recovery] Port tcp:${port} not in adb reverse table (likely TIME_WAIT or OS-level bind). Will still retry.`,
+      );
+    } else {
+      logger.error(
+        `[launch recovery] Unexpected error removing tcp:${port}: ${msg}`,
+      );
+    }
+  }
+}
+
+async function diagnoseEmulatorPort(port) {
+  const deviceFlag = getAdbDeviceFlag();
+  try {
+    const hexPort = parseInt(port, 10)
+      .toString(16)
+      .toUpperCase()
+      .padStart(4, '0');
+    const { stdout: tcpState } = await execAsync(
+      `adb ${deviceFlag} shell cat /proc/net/tcp6 2>/dev/null || adb ${deviceFlag} shell cat /proc/net/tcp 2>/dev/null`,
+    );
+    const relevantLines = tcpState
+      .split('\n')
+      .filter((line) => line.includes(`:${hexPort}`));
+    if (relevantLines.length > 0) {
+      logger.warn(
+        `[launch diagnostics] Emulator socket state for port ${port} (hex ${hexPort}):\n${relevantLines.join('\n')}`,
+      );
+      logger.warn(
+        `[launch diagnostics] TCP state reference: 01=ESTABLISHED, 06=TIME_WAIT, 0A=LISTEN`,
+      );
+    } else {
+      logger.warn(
+        `[launch diagnostics] No socket entries found for port ${port} inside emulator`,
+      );
+    }
+  } catch (diagError) {
+    logger.debug(
+      `[launch diagnostics] Could not read emulator socket state: ${diagError.message}`,
+    );
+  }
+}
+
+async function launchAppWithRecovery(launchOptions) {
+  await logAndroidReversePorts('before device.launchApp');
+
+  try {
+    return await device.launchApp(launchOptions);
+  } catch (error) {
+    if (!isAndroidReverseAddressInUseError(error)) {
+      throw error;
+    }
+
+    const conflictingPort = extractConflictingReversePort(error);
+    if (!conflictingPort) {
+      throw error;
+    }
+
+    logger.warn(
+      `[launch recovery] Detected Detox adb reverse port collision on tcp:${conflictingPort}.`,
+    );
+    await logAndroidReversePorts('launch failure before reverse cleanup');
+    await diagnoseEmulatorPort(conflictingPort);
+    await removeAndroidReversePort(conflictingPort);
+    await logAndroidReversePorts('after reverse cleanup before retry');
+
+    return device.launchApp(launchOptions);
+  }
+}
+
+async function launchAppForDebugBuild(platform, launchOptions) {
+  const deepLinkUrl = getDeepLinkUrl(getDevLauncherPackagerUrl(platform));
+
+  if (platform === 'ios') {
+    await launchAppWithRecovery(launchOptions);
+    return device.openURL({
+      url: deepLinkUrl,
+    });
+  }
+
+  return launchAppWithRecovery({
+    url: deepLinkUrl,
+    ...launchOptions,
+  });
+}
+
+/**
+ * Launch the app under Detox with debug deep-link or recovery-based launch.
+ * @param {object} launchOptions Detox device.launchApp options
+ */
+export async function launchApp(launchOptions) {
+  const config = await resolveConfig();
+  const platform = device.getPlatform();
+  // Use debug launch for configs explicitly named 'debug' (original behavior)
+  // AND for any non-CI config (e.g. ios.sim.main which uses ios.debug app locally).
+  // CI configs (*.ci) use release apps and the normal recovery-based launch.
+  if (
+    config.configurationName.endsWith('debug') ||
+    !config.configurationName.endsWith('.ci')
+  ) {
+    return launchAppForDebugBuild(platform, launchOptions);
+  }
+
+  return launchAppWithRecovery(launchOptions);
+}
diff --git a/tests/framework/fixtures/FixtureBuilder.ts b/tests/framework/fixtures/FixtureBuilder.ts
index 592c686ef6af..50aea84233dd 100644
--- a/tests/framework/fixtures/FixtureBuilder.ts
+++ b/tests/framework/fixtures/FixtureBuilder.ts
@@ -2070,7 +2070,6 @@ class FixtureBuilder {
     merge(this.fixture.state.engine.backgroundState, {
       CardController: {
         selectedCountry: null,
-        selectedCardProgramId: null,
         providerData: {},
         isAuthenticated,
         cardholderAccounts: [`eip155:0:${walletAddress}`],
diff --git a/tests/framework/fixtures/FixtureHelper.ts b/tests/framework/fixtures/FixtureHelper.ts
index 6c480563e656..813ff7b6acde 100644
--- a/tests/framework/fixtures/FixtureHelper.ts
+++ b/tests/framework/fixtures/FixtureHelper.ts
@@ -15,14 +15,14 @@ import {
   startMultiInstanceResourceWithRetry,
   cleanupAllAndroidPortForwarding,
 } from './FixtureUtils';
-import Utilities, { sleep } from '../Utilities';
+import Utilities from '../Utilities';
 import {
   dismissAndroidSystemOverlaysPlaywright,
   dismissDevScreens,
   dismissDeveloperMenuPlaywright,
   dismissDevelopmentServerPickerPlaywright,
 } from '../../flows/general.flow';
-import TestHelpers from '../../helpers';
+import { launchApp as launchDetoxApp } from '../detox/DetoxAppLaunch';
 import MockServerE2E from '../../api-mocking/MockServerE2E';
 import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
 import { AnvilSeeder } from '../../seeder/anvil-seeder';
@@ -46,13 +46,13 @@ import {
   FALLBACK_MOCKSERVER_PORT,
   FALLBACK_FIXTURE_SERVER_PORT,
   FALLBACK_COMMAND_QUEUE_SERVER_PORT,
-  resolveE2EFixtureBootstrapTimeoutMs,
   shouldHandleMetroDevLauncherLocally,
 } from '../Constants';
 import ContractAddressRegistry from '../../../app/util/test/contract-address-registry';
 import FixtureBuilder from './FixtureBuilder';
 import { createLogger } from '../logger';
 import { mockNotificationServices } from '../../smoke-appium/notifications/utils/mocks';
+import { softReloadAppForFixtures } from '../services/appium/softReloadApp';
 import {
   runAnalyticsExpectations,
   shouldRunAnalyticsExpectations,
@@ -70,8 +70,13 @@ import {
   resetAccountActivityMockState,
 } from '../../websocket/account-activity-mocks';
 import { FrameworkDetector } from '../FrameworkDetector';
-import PlaywrightUtilities from '../PlaywrightUtilities';
 import { DeviceCommandHandler } from '../services/device-commands';
+import {
+  getPhaseTimer,
+  recordPhase,
+  startPhase,
+  stopPhase,
+} from '../telemetry/PhaseTimer.ts';
 
 const logger = createLogger({
   name: 'FixtureHelper',
@@ -543,9 +548,6 @@ export async function withFixtures(
   // This ensures we start with a clean slate on Android
   await cleanupAllAndroidPortForwarding();
 
-  // Prepare android devices for testing to avoid having this in all tests
-  await TestHelpers.reverseServerPort();
-
   // ========== RESOURCE STARTUP ORDER (IMPORTANT!) ==========
   // Resources must be started in this specific order to ensure ports are allocated
   // before they're referenced by subsequent resources, especially in testSpecificMock.
@@ -578,6 +580,8 @@ export async function withFixtures(
   let didAttemptPlaywrightDevelopmentServerPickerDismissal = false;
 
   try {
+    startPhase('servers_start');
+
     // Step 1: Start local nodes (Anvil/Ganache)
     if (!disableLocalNodes) {
       localNodes = await handleLocalNodes(localNodeOptions);
@@ -637,6 +641,10 @@ export async function withFixtures(
         commandQueueServer,
       );
     }
+
+    // End servers_start before soft-reload / device launch phases.
+    stopPhase();
+
     // Due to the fact that the app was already launched on `init.js`, it is necessary to
     // launch into a fresh installation of the app to apply the new fixture loaded perviously.
 
@@ -648,7 +656,7 @@ export async function withFixtures(
       const framework = FrameworkDetector.isDetox() ? 'Detox' : 'Appium';
 
       if (framework === 'Detox') {
-        await TestHelpers.launchApp({
+        await launchDetoxApp({
           delete: true,
           launchArgs: {
             fixtureServerPort: isAndroid
@@ -690,42 +698,18 @@ export async function withFixtures(
           ...(launchArgs || {}),
         };
 
-        if (deviceCommands) {
-          await deviceCommands.clearAppData();
-        }
-
-        // Cold Metro bundles can take 60–160s locally; pre-warm runs in launchApp but
-        // device-side load + E2E bootstrap still need headroom after deep link.
-        const appStateRequest = fixtureServer.waitForNextStateRequest(
-          resolveE2EFixtureBootstrapTimeoutMs(),
-        );
-        try {
-          await PlaywrightUtilities.launchApp(currentDeviceDetails, {
-            launchArgs: testArgs,
-          });
-          if (shouldHandleMetroDevLauncherLocally()) {
-            didAttemptPlaywrightDevelopmentServerPickerDismissal = true;
-            await Promise.all([
-              appStateRequest,
-              (async () => {
-                for (;;) {
-                  await dismissDevelopmentServerPickerPlaywright();
-                  const bootstrapped = await Promise.race([
-                    appStateRequest.then(() => true),
-                    sleep(1500).then(() => false),
-                  ]);
-                  if (bootstrapped) {
-                    return;
-                  }
-                }
-              })(),
-            ]);
-          } else {
-            await appStateRequest;
-          }
-        } catch (error) {
-          appStateRequest.catch(() => undefined);
-          throw error;
+        const softReloadResult = await softReloadAppForFixtures({
+          currentDeviceDetails,
+          deviceCommands,
+          launchArgs: testArgs,
+          fixtureServer,
+        });
+        recordPhase('app_clear', softReloadResult.clearAppDataMs);
+        recordPhase('context_reset', softReloadResult.contextResetMs);
+        recordPhase('app_launch', softReloadResult.launchAppMs);
+        recordPhase('fixture_bootstrap', softReloadResult.fixtureBootstrapMs);
+        if (softReloadResult.attemptedMetroDevLauncherDismissal) {
+          didAttemptPlaywrightDevelopmentServerPickerDismissal = true;
         }
       } else {
         throw new Error(`Unsupported test runner: ${framework}`);
@@ -755,6 +739,7 @@ export async function withFixtures(
       }
     }
 
+    startPhase('test_body');
     await testSuite({
       contractRegistry,
       mockServer: mockServerInstance.server,
@@ -762,10 +747,15 @@ export async function withFixtures(
       commandQueueServer,
       deviceCommands,
     });
+    stopPhase();
   } catch (error) {
     testError = error as Error;
     logger.error('Error in withFixtures:', error);
   } finally {
+    // Prefer teardown phase even if test_body / login left a phase open.
+    if (getPhaseTimer()) {
+      startPhase('teardown');
+    }
     const cleanupErrors: Error[] = [];
 
     if (endTestfn) {
@@ -910,6 +900,8 @@ export async function withFixtures(
     }
 
     // Handle error reporting: prioritize test error over cleanup errors
+    stopPhase();
+
     if (testError && cleanupErrors.length > 0) {
       // Both test and cleanup failed - report both but throw the test error
       const cleanupErrorMessages = cleanupErrors
diff --git a/tests/framework/fixtures/FixtureUtils.ts b/tests/framework/fixtures/FixtureUtils.ts
index 05d577d001c8..1548945fc837 100644
--- a/tests/framework/fixtures/FixtureUtils.ts
+++ b/tests/framework/fixtures/FixtureUtils.ts
@@ -499,13 +499,6 @@ function getServerPort(resourceType: ResourceType): number {
   return allocatedPort;
 }
 
-/**
- * Gets the URL for the second test dapp.
- * This function is used instead of a constant to ensure device.getPlatform() is called
- * after Detox is properly initialized, preventing initialization errors in the apiSpecs tests.
- *
- * @returns {string} The URL for the second test dapp
- */
 // ========== New Clean Dapp API (Use These) ==========
 
 /**
diff --git a/tests/framework/fixtures/fixture-validation.ts b/tests/framework/fixtures/fixture-validation.ts
index 18a9c30f5d34..5103864c99dc 100644
--- a/tests/framework/fixtures/fixture-validation.ts
+++ b/tests/framework/fixtures/fixture-validation.ts
@@ -299,6 +299,7 @@ export function getMobileFixtureIgnoredKeys(): string[] {
     'engine.backgroundState.BridgeStatusController',
     'engine.backgroundState.ConnectivityController',
     'engine.backgroundState.DeFiPositionsController',
+    'engine.backgroundState.DeFiPositionsControllerV2',
     'engine.backgroundState.DelegationController',
     'engine.backgroundState.EarnController',
     'engine.backgroundState.GatorPermissionsController',
diff --git a/tests/framework/fixtures/json/default-fixture.json b/tests/framework/fixtures/json/default-fixture.json
index a38a5edfba0e..e7d28b297c78 100644
--- a/tests/framework/fixtures/json/default-fixture.json
+++ b/tests/framework/fixtures/json/default-fixture.json
@@ -163,8 +163,7 @@
           "lastUnauthenticatedReason": null,
           "moneyAccountCardLinkInProgress": false,
           "providerData": {},
-          "selectedCountry": null,
-          "selectedCardProgramId": null
+          "selectedCountry": null
         },
         "ClientController": {
           "isUiOpen": false
diff --git a/tests/framework/fixtures/playwright/deviceProvider.fixture.ts b/tests/framework/fixtures/playwright/deviceProvider.fixture.ts
index 98cbf4920c73..4484ac62b115 100644
--- a/tests/framework/fixtures/playwright/deviceProvider.fixture.ts
+++ b/tests/framework/fixtures/playwright/deviceProvider.fixture.ts
@@ -1,29 +1,92 @@
-import type { FullProject, TestInfo } from '@playwright/test';
+import type { Fixtures, FullProject, WorkerInfo } from '@playwright/test';
 import { createServiceProvider, type ServiceProvider } from '../../services';
 import type { WebDriverConfig } from '../../types.ts';
 import { createPlaywrightLogger } from '../../playwrightLogger.ts';
+import { FrameworkDetector } from '../../FrameworkDetector.ts';
+import UnifiedGestures from '../../UnifiedGestures.ts';
+import type { SharedAppiumSession, WorkerLevelFixtures } from './types.ts';
 
 const logger = createPlaywrightLogger('deviceProvider');
 
-export const deviceProviderFixture = {
-  deviceProvider: async (
-    {}, // eslint-disable-line no-empty-pattern
-    use: (deviceProvider: ServiceProvider) => Promise<void>,
-    testInfo: TestInfo,
-  ) => {
-    const project = testInfo.project as FullProject<WebDriverConfig>;
-    const providerName = project.use.device?.provider ?? 'unknown';
+/**
+ * Worker-scoped provider + mutable session holder.
+ * Session create/delete for reuse lives in the test-scoped `driver` fixture;
+ * this fixture only creates the provider once and tears down session+server
+ * at worker end.
+ */
+export const workerDeviceProviderFixture: Fixtures<
+  // No test-scoped fixtures declared here.
+  object,
+  WorkerLevelFixtures
+> = {
+  deviceProvider: [
+    async (
+      {}, // eslint-disable-line no-empty-pattern
+      use: (deviceProvider: ServiceProvider) => Promise<void>,
+      workerInfo: WorkerInfo,
+    ) => {
+      const project = workerInfo.project as FullProject<WebDriverConfig>;
+      const providerName = project.use.device?.provider ?? 'unknown';
 
-    logger.info(
-      `Creating device provider "${providerName}" for project "${project.name}"`,
-    );
+      logger.info(
+        `Creating worker-scoped device provider "${providerName}" for project "${project.name}"`,
+      );
 
-    const deviceProvider = createServiceProvider(project);
+      const deviceProvider = createServiceProvider(project);
+      await use(deviceProvider);
 
-    await use(deviceProvider);
+      logger.info(
+        `Worker device provider "${providerName}" fixture ended (sessionId=${deviceProvider.sessionId ?? 'none'})`,
+      );
+    },
+    { scope: 'worker' },
+  ],
 
-    logger.info(
-      `Device provider "${providerName}" teardown complete (sessionId=${deviceProvider.sessionId ?? 'none'})`,
-    );
-  },
+  sharedSession: [
+    async (
+      { deviceProvider }: { deviceProvider: ServiceProvider },
+      use: (sharedSession: SharedAppiumSession) => Promise<void>,
+    ) => {
+      const sharedSession: SharedAppiumSession = {};
+      await use(sharedSession);
+
+      logger.info(
+        'Worker sharedSession teardown: cleanupSession then cleanupProvider',
+      );
+
+      try {
+        if (sharedSession.drv) {
+          await deviceProvider.cleanupSession?.(sharedSession.drv);
+        } else {
+          await deviceProvider.cleanupSession?.();
+        }
+      } catch (error) {
+        logger.error('Worker cleanupSession failed:', error);
+      } finally {
+        sharedSession.drv = undefined;
+      }
+
+      try {
+        delete globalThis.driver;
+        FrameworkDetector.reset();
+        UnifiedGestures.resetStrategy();
+      } catch (error) {
+        logger.error(
+          'Failed to clear global driver on worker teardown:',
+          error,
+        );
+      }
+
+      try {
+        if (deviceProvider.cleanupProvider) {
+          await deviceProvider.cleanupProvider();
+        } else {
+          await deviceProvider.cleanup?.();
+        }
+      } catch (error) {
+        logger.error('Worker cleanupProvider failed:', error);
+      }
+    },
+    { scope: 'worker' },
+  ],
 };
diff --git a/tests/framework/fixtures/playwright/driver.fixture.ts b/tests/framework/fixtures/playwright/driver.fixture.ts
index ec70d67d201a..0a70f7d22700 100644
--- a/tests/framework/fixtures/playwright/driver.fixture.ts
+++ b/tests/framework/fixtures/playwright/driver.fixture.ts
@@ -2,64 +2,125 @@ import type { FullProject, TestInfo } from '@playwright/test';
 import type { WebDriverConfig } from '../../types.ts';
 import { DEFAULT_IMPLICIT_WAIT_MS } from '../../Constants.ts';
 import { setDeviceInfo } from '../../DeviceInfoCache.ts';
-import type { TestLevelFixtures } from './types.ts';
+import type { SharedAppiumSession, WorkerLevelFixtures } from './types.ts';
 import {
   isVideoRecordingOnFailureEnabled,
   startFailureRecording,
   stopFailureRecordingAndAttach,
 } from '../../services/appium/ScreenRecording.ts';
+import { isSessionAlive } from '../../services/appium/sessionHealth.ts';
+import {
+  consumeSharedSessionRecreate,
+  isDeviceHealthError,
+  requestSharedSessionRecreate,
+} from '../../services/appium/sessionRecovery.ts';
 import { createPlaywrightLogger } from '../../playwrightLogger.ts';
 import { FrameworkDetector, TestFramework } from '../../FrameworkDetector.ts';
 import UnifiedGestures from '../../UnifiedGestures.ts';
+import type { ServiceProvider } from '../../services';
+import { isAppiumSessionReuseEnabled } from './sessionReuse.ts';
 
 const logger = createPlaywrightLogger('driver');
 
+async function configureImplicitWait(
+  drv: WebdriverIO.Browser,
+  implicitMs: number,
+): Promise<void> {
+  // Wrapped in retry because BrowserStack sessions can transiently reject
+  // the setTimeout command before the session is fully initialised.
+  const maxRetries = 5;
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      await drv.setTimeout({ implicit: implicitMs });
+      return;
+    } catch (err) {
+      if (attempt === maxRetries) throw err;
+      const backoff = Math.min(2 ** attempt * 1000, 15000);
+      logger.warn(
+        `driver.setTimeout failed (attempt ${attempt}/${maxRetries}), retrying in ${backoff}ms`,
+      );
+      await new Promise((r) => setTimeout(r, backoff));
+    }
+  }
+}
+
+async function createSession(
+  deviceProvider: ServiceProvider,
+  sharedSession: SharedAppiumSession,
+): Promise<WebdriverIO.Browser> {
+  const drv = await deviceProvider.getDriver();
+  sharedSession.drv = drv;
+  return drv;
+}
+
 export const driverFixture = {
   driver: async (
-    { deviceProvider }: Pick<TestLevelFixtures, 'deviceProvider'>,
-    use: (driver: WebdriverIO.Browser) => Promise<void>,
+    {
+      deviceProvider,
+      sharedSession,
+    }: Pick<WorkerLevelFixtures, 'deviceProvider' | 'sharedSession'>,
+    use: (drv: WebdriverIO.Browser) => Promise<void>,
     testInfo: TestInfo,
   ) => {
-    let driver: WebdriverIO.Browser | undefined;
+    let drv: WebdriverIO.Browser | undefined;
     let recordingBackend: Awaited<ReturnType<typeof startFailureRecording>>;
     const project = testInfo.project as FullProject<WebDriverConfig>;
     const platform = project.use.platform;
+    const reuseEnabled = isAppiumSessionReuseEnabled(project.use);
     const recordVideoOnFailure = isVideoRecordingOnFailureEnabled(
       project.use.device?.provider,
     );
 
-    try {
-      logger.info(
-        `Starting WebDriver session for "${testInfo.title}" (project: ${project.name})`,
-      );
+    let sessionReused = false;
+    let sessionRecreated = false;
 
-      driver = await deviceProvider.getDriver();
-
-      // Wrapped in retry because BrowserStack sessions can transiently reject
-      // the setTimeout command before the session is fully initialised.
-      const implicitMs = project.use.expectTimeout ?? DEFAULT_IMPLICIT_WAIT_MS;
-      const maxRetries = 5;
-      for (let attempt = 1; attempt <= maxRetries; attempt++) {
-        try {
-          await driver.setTimeout({ implicit: implicitMs });
-          break;
-        } catch (err) {
-          if (attempt === maxRetries) throw err;
-          const backoff = Math.min(2 ** attempt * 1000, 15000);
+    try {
+      if (reuseEnabled && sharedSession.drv) {
+        const forceRecreate = consumeSharedSessionRecreate();
+        const alive =
+          !forceRecreate && (await isSessionAlive(sharedSession.drv));
+        if (alive) {
+          drv = sharedSession.drv;
+          sessionReused = true;
+          logger.info(
+            `Reusing WebDriver session sessionId=${deviceProvider.sessionId ?? sharedSession.drv.sessionId ?? 'unknown'} for "${testInfo.title}"`,
+          );
+        } else {
           logger.warn(
-            `driver.setTimeout failed (attempt ${attempt}/${maxRetries}), retrying in ${backoff}ms`,
+            forceRecreate
+              ? `Shared WebDriver session recreate requested; recreating for "${testInfo.title}"`
+              : `Shared WebDriver session is unhealthy; recreating for "${testInfo.title}"`,
           );
-          await new Promise((r) => setTimeout(r, backoff));
+          try {
+            await deviceProvider.cleanupSession?.(sharedSession.drv);
+          } catch (error) {
+            logger.error(
+              'Failed to cleanup unhealthy session before recreate:',
+              error,
+            );
+          }
+          sharedSession.drv = undefined;
+          sessionRecreated = true;
+          drv = await createSession(deviceProvider, sharedSession);
         }
+      } else {
+        consumeSharedSessionRecreate();
+        logger.info(
+          `${reuseEnabled ? 'Starting' : 'Starting (reuse off)'} WebDriver session for "${testInfo.title}" (project: ${project.name})`,
+        );
+        drv = await createSession(deviceProvider, sharedSession);
       }
 
-      globalThis.driver = driver;
+      const implicitMs = project.use.expectTimeout ?? DEFAULT_IMPLICIT_WAIT_MS;
+      await configureImplicitWait(drv, implicitMs);
+
+      globalThis.driver = drv;
       FrameworkDetector.reset();
       FrameworkDetector.setFramework(TestFramework.APPIUM);
       UnifiedGestures.resetStrategy();
 
-      const platformName = (await driver.capabilities)?.platformName;
-      const windowSize = await driver.getWindowSize();
+      const platformName = (await drv.capabilities)?.platformName;
+      const windowSize = await drv.getWindowSize();
       setDeviceInfo(
         (platformName?.toLowerCase() === 'android' ? 'android' : 'ios') as
           | 'android'
@@ -73,7 +134,8 @@ export const driverFixture = {
         `WebDriver session ready: sessionId=${deviceProvider.sessionId ?? 'unknown'}, ` +
           `platform=${platformName ?? 'unknown'}, ` +
           `screen=${windowSize.width}x${windowSize.height}, ` +
-          `implicitWait=${implicitMs}ms, provider=${deviceProviderName ?? 'unknown'}` +
+          `implicitWait=${implicitMs}ms, provider=${deviceProviderName ?? 'unknown'}, ` +
+          `sessionReused=${sessionReused}, sessionRecreated=${sessionRecreated}` +
           (deviceProvider.sessionCreationDurationMs !== undefined
             ? `, sessionCreation=${deviceProvider.sessionCreationDurationMs}ms`
             : ''),
@@ -88,6 +150,14 @@ export const driverFixture = {
           type: 'sessionId',
           description: deviceProvider.sessionId || 'no-session',
         },
+        {
+          type: 'sessionReused',
+          description: String(sessionReused),
+        },
+        {
+          type: 'sessionRecreated',
+          description: String(sessionRecreated),
+        },
       );
 
       try {
@@ -97,22 +167,22 @@ export const driverFixture = {
       }
 
       if (recordVideoOnFailure) {
-        recordingBackend = await startFailureRecording(driver, platform);
+        recordingBackend = await startFailureRecording(drv, platform);
       }
 
-      await use(driver);
+      await use(drv);
     } finally {
       const testStatus = testInfo.status;
       const testError = testInfo.error?.message;
 
       logger.info(
-        `Tearing down WebDriver session for "${testInfo.title}" (status: ${testStatus ?? 'unknown'})`,
+        `Tearing down driver fixture for "${testInfo.title}" (status: ${testStatus ?? 'unknown'}, reuse=${reuseEnabled})`,
       );
 
       try {
-        if (driver) {
+        if (drv) {
           await stopFailureRecordingAndAttach(
-            driver,
+            drv,
             testInfo,
             recordingBackend,
             platform,
@@ -132,27 +202,54 @@ export const driverFixture = {
         logger.error('Failed to sync test details:', error);
       }
 
-      try {
-        if (driver) {
-          await driver.deleteSession();
-          logger.info('WebDriver session deleted');
+      if (
+        reuseEnabled &&
+        (testStatus === 'failed' || testStatus === 'timedOut') &&
+        isDeviceHealthError(testError)
+      ) {
+        requestSharedSessionRecreate();
+        try {
+          if (drv) {
+            await deviceProvider.cleanupSession?.(drv);
+          }
+        } catch (error) {
+          logger.error(
+            'Failed to cleanup WebDriver session after device-health failure:',
+            error,
+          );
+        } finally {
+          sharedSession.drv = undefined;
         }
-      } catch (error) {
-        logger.error('Failed to delete WebDriver session:', error);
       }
 
-      try {
-        delete globalThis.driver;
-        FrameworkDetector.reset();
-        UnifiedGestures.resetStrategy();
-      } catch (error) {
-        logger.error('Failed to clean up global driver:', error);
-      }
+      if (!reuseEnabled) {
+        try {
+          if (drv) {
+            // Always pass drv so providers (including BrowserStack via
+            // BaseServiceProvider) actually deleteSession — a no-arg /
+            // missing cleanupSession must not leave cloud sessions open.
+            if (deviceProvider.cleanupSession) {
+              await deviceProvider.cleanupSession(drv);
+            } else {
+              await drv.deleteSession();
+              logger.info('WebDriver session deleted');
+            }
+          }
+        } catch (error) {
+          logger.error('Failed to delete WebDriver session:', error);
+        } finally {
+          sharedSession.drv = undefined;
+        }
 
-      try {
-        await deviceProvider.cleanup?.();
-      } catch (error) {
-        logger.error('Provider cleanup failed:', error);
+        try {
+          delete globalThis.driver;
+          FrameworkDetector.reset();
+          UnifiedGestures.resetStrategy();
+        } catch (error) {
+          logger.error('Failed to clean up global driver:', error);
+        }
+        // Appium server stop is deferred to worker sharedSession teardown
+        // (cleanupProvider) so local runs do not depend on SKIP_APPIUM_STOP.
       }
     }
   },
diff --git a/tests/framework/fixtures/playwright/index.ts b/tests/framework/fixtures/playwright/index.ts
index 3c935fff5eb9..49b7f09530cf 100644
--- a/tests/framework/fixtures/playwright/index.ts
+++ b/tests/framework/fixtures/playwright/index.ts
@@ -1,21 +1,28 @@
 import '../../nodeNativeUtilsShim.cjs';
 import { test as base } from '@playwright/test';
-import type { TestLevelFixtures } from './types.ts';
+import type { TestLevelFixtures, WorkerLevelFixtures } from './types.ts';
 import { currentDeviceDetailsFixture } from './currentDeviceDetails.fixture.ts';
-import { deviceProviderFixture } from './deviceProvider.fixture.ts';
+import { workerDeviceProviderFixture } from './deviceProvider.fixture.ts';
 import { driverFixture } from './driver.fixture.ts';
 import { performanceTrackerFixture } from './performanceTracker.fixture.ts';
+import { phaseTimerFixture } from './phaseTimer.fixture.ts';
 
-export type { CurrentDeviceDetails, TestLevelFixtures } from './types.ts';
+export type {
+  CurrentDeviceDetails,
+  SharedAppiumSession,
+  TestLevelFixtures,
+  WorkerLevelFixtures,
+} from './types.ts';
 
 declare global {
   // eslint-disable-next-line no-var
   var driver: WebdriverIO.Browser | undefined;
 }
 
-export const test = base.extend<TestLevelFixtures>({
+export const test = base.extend<TestLevelFixtures, WorkerLevelFixtures>({
+  ...workerDeviceProviderFixture,
   ...currentDeviceDetailsFixture,
-  ...deviceProviderFixture,
   ...driverFixture,
   ...performanceTrackerFixture,
+  ...phaseTimerFixture,
 });
diff --git a/tests/framework/fixtures/playwright/performanceTracker.fixture.ts b/tests/framework/fixtures/playwright/performanceTracker.fixture.ts
index 1822c309564f..5cfa350aabb9 100644
--- a/tests/framework/fixtures/playwright/performanceTracker.fixture.ts
+++ b/tests/framework/fixtures/playwright/performanceTracker.fixture.ts
@@ -12,7 +12,7 @@ import {
 } from '../../quality-gates';
 import { getTeamInfoFromTags } from '../../utils/teams';
 import { publishPerformanceScenarioToSentry } from '../../../reporters/providers/sentry/PerformanceSentryPublisher';
-import type { TestLevelFixtures } from './types.ts';
+import type { TestLevelFixtures, WorkerLevelFixtures } from './types.ts';
 import { createPlaywrightLogger } from '../../playwrightLogger.ts';
 
 const logger = createPlaywrightLogger('performanceTracker');
@@ -25,7 +25,7 @@ function getSessionIdFromAnnotations(
 
 export const performanceTrackerFixture = {
   performanceTracker: async (
-    { deviceProvider }: Pick<TestLevelFixtures, 'deviceProvider'>,
+    { deviceProvider }: Pick<WorkerLevelFixtures, 'deviceProvider'>,
     use: (performanceTracker: PerformanceTracker) => Promise<void>,
     testInfo: TestInfo,
   ) => {
diff --git a/tests/framework/fixtures/playwright/phaseTimer.fixture.ts b/tests/framework/fixtures/playwright/phaseTimer.fixture.ts
new file mode 100644
index 000000000000..24c4a0f7e09c
--- /dev/null
+++ b/tests/framework/fixtures/playwright/phaseTimer.fixture.ts
@@ -0,0 +1,86 @@
+import type { Fixtures, FullProject, TestInfo } from '@playwright/test';
+import type { WebDriverConfig } from '../../types.ts';
+import {
+  createPhaseTimer,
+  PHASE_TIMINGS_ATTACHMENT_NAME,
+  runWithPhaseTimer,
+  type PhaseTimer,
+} from '../../telemetry/PhaseTimer.ts';
+import { createPlaywrightLogger } from '../../playwrightLogger.ts';
+import type { TestLevelFixtures, WorkerLevelFixtures } from './types.ts';
+
+const logger = createPlaywrightLogger('phaseTimer');
+
+function annotationDescription(
+  annotations: { type: string; description?: string }[] | undefined,
+  type: string,
+): string | undefined {
+  return annotations?.find((a) => a.type === type)?.description;
+}
+
+function parseBooleanAnnotation(
+  value: string | undefined,
+): boolean | undefined {
+  if (value === 'true') {
+    return true;
+  }
+  if (value === 'false') {
+    return false;
+  }
+  return undefined;
+}
+
+/**
+ * Auto phase-timer fixture: binds ALS for FixtureHelper/login and attaches JSON.
+ * Depends on `driver` so session annotations exist before attach.
+ */
+export const phaseTimerFixture: Fixtures<
+  TestLevelFixtures,
+  WorkerLevelFixtures
+> = {
+  phaseTimer: [
+    async ({ driver: _driver, deviceProvider }, use, testInfo: TestInfo) => {
+      const timer = createPhaseTimer();
+      const project = testInfo.project as FullProject<WebDriverConfig>;
+      const suiteName = process.env.APPIUM_SMOKE_SUITE_NAME?.trim();
+
+      timer.setMeta({
+        platform: project.use.platform,
+        suite: suiteName || 'local',
+        spec: testInfo.file,
+        title: testInfo.title,
+        retry: testInfo.retry,
+        sessionCreationMs: deviceProvider.sessionCreationDurationMs,
+      });
+
+      await runWithPhaseTimer(timer, async () => {
+        try {
+          await use(timer);
+        } finally {
+          timer.setMeta({
+            outcome: testInfo.status,
+            sessionReused: parseBooleanAnnotation(
+              annotationDescription(testInfo.annotations, 'sessionReused'),
+            ),
+            sessionRecreated: parseBooleanAnnotation(
+              annotationDescription(testInfo.annotations, 'sessionRecreated'),
+            ),
+            sessionCreationMs: deviceProvider.sessionCreationDurationMs,
+          });
+
+          try {
+            await testInfo.attach(PHASE_TIMINGS_ATTACHMENT_NAME, {
+              body: JSON.stringify(timer.snapshot()),
+              contentType: 'application/json',
+            });
+          } catch (error) {
+            const message =
+              error instanceof Error ? error.message : String(error);
+            logger.error(`Failed to attach phase timings: ${message}`);
+          }
+        }
+      });
+    },
+    { auto: true },
+  ],
+};
diff --git a/tests/framework/fixtures/playwright/sessionReuse.test.ts b/tests/framework/fixtures/playwright/sessionReuse.test.ts
new file mode 100644
index 000000000000..2e497aeeec74
--- /dev/null
+++ b/tests/framework/fixtures/playwright/sessionReuse.test.ts
@@ -0,0 +1,65 @@
+import { isAppiumSessionReuseEnabled } from './sessionReuse.ts';
+import { ProviderName } from '../../types.ts';
+
+describe('isAppiumSessionReuseEnabled', () => {
+  // Bracket access — babel transform-inline-environment-variables must not
+  // bake these reads/writes or afterEach cleanup becomes `delete undefined`.
+  // eslint-disable-next-line dot-notation
+  const envKey = 'APPIUM_SESSION_REUSE';
+  // eslint-disable-next-line dot-notation
+  const previous = process.env[envKey];
+
+  afterEach(() => {
+    if (previous === undefined) {
+      // eslint-disable-next-line dot-notation
+      delete process.env[envKey];
+    } else {
+      // eslint-disable-next-line dot-notation
+      process.env[envKey] = previous;
+    }
+  });
+
+  it('returns false for BrowserStack regardless of env', () => {
+    // eslint-disable-next-line dot-notation
+    process.env[envKey] = 'true';
+
+    const result = isAppiumSessionReuseEnabled({
+      device: { provider: ProviderName.BROWSERSTACK, name: 'Pixel' },
+    });
+
+    expect(result).toBe(false);
+  });
+
+  it('returns false when APPIUM_SESSION_REUSE is false', () => {
+    // eslint-disable-next-line dot-notation
+    process.env[envKey] = 'false';
+
+    const result = isAppiumSessionReuseEnabled({
+      device: { provider: ProviderName.EMULATOR, name: 'Pixel' },
+    });
+
+    expect(result).toBe(false);
+  });
+
+  it('returns true by default for emulator when env is unset', () => {
+    // eslint-disable-next-line dot-notation
+    delete process.env[envKey];
+
+    const result = isAppiumSessionReuseEnabled({
+      device: { provider: ProviderName.EMULATOR, name: 'Pixel' },
+    });
+
+    expect(result).toBe(true);
+  });
+
+  it('returns true when APPIUM_SESSION_REUSE is true', () => {
+    // eslint-disable-next-line dot-notation
+    process.env[envKey] = 'true';
+
+    const result = isAppiumSessionReuseEnabled({
+      device: { provider: ProviderName.SIMULATOR, name: 'iPhone' },
+    });
+
+    expect(result).toBe(true);
+  });
+});
diff --git a/tests/framework/fixtures/playwright/sessionReuse.ts b/tests/framework/fixtures/playwright/sessionReuse.ts
new file mode 100644
index 000000000000..7784af507f61
--- /dev/null
+++ b/tests/framework/fixtures/playwright/sessionReuse.ts
@@ -0,0 +1,33 @@
+import { ProviderName, type WebDriverConfig } from '../../types.ts';
+
+/**
+ * Whether Appium WebDriver sessions should be reused across Playwright tests
+ * in the same worker.
+ *
+ * - BrowserStack: always false (out of scope)
+ * - APPIUM_SESSION_REUSE=false|0: force off (rollback)
+ * - APPIUM_SESSION_REUSE=true|1: force on
+ * - default: true for emulator/simulator
+ */
+export function isAppiumSessionReuseEnabled(projectUse: {
+  // Playwright `project.use` makes config fields optional even when WebDriverConfig
+  // declares them required.
+  device?: WebDriverConfig['device'];
+}): boolean {
+  if (projectUse.device?.provider === ProviderName.BROWSERSTACK) {
+    return false;
+  }
+
+  // Bracket access avoids babel transform-inline-environment-variables so
+  // APPIUM_SESSION_REUSE can be toggled at runtime (local + tests).
+  // eslint-disable-next-line dot-notation
+  const flag = process.env['APPIUM_SESSION_REUSE']?.trim().toLowerCase();
+  if (flag === 'false' || flag === '0') {
+    return false;
+  }
+  if (flag === 'true' || flag === '1') {
+    return true;
+  }
+
+  return true;
+}
diff --git a/tests/framework/fixtures/playwright/types.ts b/tests/framework/fixtures/playwright/types.ts
index 5a2acc33e4bd..9f755082b589 100644
--- a/tests/framework/fixtures/playwright/types.ts
+++ b/tests/framework/fixtures/playwright/types.ts
@@ -1,5 +1,6 @@
 import type { ServiceProvider } from '../../services';
 import type { PerformanceTracker } from '../../../reporters/PerformanceTracker';
+import type { PhaseTimer } from '../../telemetry/PhaseTimer.ts';
 
 export interface CurrentDeviceDetails {
   platform: 'android' | 'ios';
@@ -16,6 +17,26 @@ export interface CurrentDeviceDetails {
   isBrowserstack: boolean;
 }
 
+/**
+ * Mutable holder for the worker-scoped Appium/WDIO session.
+ * The test-scoped `driver` fixture reads/writes `drv`.
+ */
+export interface SharedAppiumSession {
+  drv?: WebdriverIO.Browser;
+}
+
+export interface WorkerLevelFixtures {
+  /**
+   * Worker-scoped device provider (one instance per Playwright worker/shard).
+   */
+  deviceProvider: ServiceProvider;
+
+  /**
+   * Worker-scoped session holder for reuse across tests.
+   */
+  sharedSession: SharedAppiumSession;
+}
+
 export interface TestLevelFixtures {
   /**
    * Platform detector to be used for the test.
@@ -23,12 +44,6 @@ export interface TestLevelFixtures {
    */
   currentDeviceDetails: CurrentDeviceDetails;
 
-  /**
-   * Device provider to be used for the test.
-   * This creates and manages the device lifecycle for the test
-   */
-  deviceProvider: ServiceProvider;
-
   /**
    * The device instance that will be used for running the test.
    * This provides the functionality to interact with the device
@@ -42,4 +57,9 @@ export interface TestLevelFixtures {
    * It also handles quality gate validation and Sentry publishing.
    */
   performanceTracker: PerformanceTracker;
+
+  /**
+   * Appium smoke phase timer. Auto-fixture; attaches JSON timings.
+   */
+  phaseTimer: PhaseTimer;
 }
diff --git a/tests/framework/services/appium/EmulatorHelpers.ts b/tests/framework/services/appium/EmulatorHelpers.ts
index 7e3937ddbfc0..4142c8773b6f 100644
--- a/tests/framework/services/appium/EmulatorHelpers.ts
+++ b/tests/framework/services/appium/EmulatorHelpers.ts
@@ -516,6 +516,17 @@ export async function ensureAndroidEmulatorReady(
       logger.info(
         `Using configured Android emulator ${serial} — skipping AVD name lookup.`,
       );
+      // Already booted: do not re-run cold-boot stabilize.
+      try {
+        const { stdout } = await execAsync(
+          `adb -s ${serial} shell getprop sys.boot_completed 2>/dev/null`,
+        );
+        if (stdout.trim() === '1') {
+          return serial;
+        }
+      } catch {
+        // Fall through to full boot wait if the property check fails.
+      }
       await waitForEmulatorBoot(serial);
       return serial;
     }
diff --git a/tests/framework/services/appium/index.ts b/tests/framework/services/appium/index.ts
index 33ca9ce6912e..3847020832b8 100644
--- a/tests/framework/services/appium/index.ts
+++ b/tests/framework/services/appium/index.ts
@@ -13,3 +13,17 @@ export {
   startFailureRecording,
   stopFailureRecordingAndAttach,
 } from './ScreenRecording.ts';
+export { isSessionAlive, switchToNativeContext } from './sessionHealth.ts';
+export {
+  consumeSharedSessionRecreate,
+  isDeviceHealthError,
+  requestSharedSessionRecreate,
+  resetSharedSessionRecreateState,
+} from './sessionRecovery.ts';
+export {
+  softReloadAppForFixtures,
+  type SoftReloadAppForFixturesOptions,
+  type SoftReloadAppForFixturesResult,
+  type SoftReloadDeviceCommands,
+  type SoftReloadFixtureServer,
+} from './softReloadApp.ts';
diff --git a/tests/framework/services/appium/sessionHealth.test.ts b/tests/framework/services/appium/sessionHealth.test.ts
new file mode 100644
index 000000000000..0154520891e8
--- /dev/null
+++ b/tests/framework/services/appium/sessionHealth.test.ts
@@ -0,0 +1,59 @@
+import { isSessionAlive, switchToNativeContext } from './sessionHealth.ts';
+
+describe('isSessionAlive', () => {
+  it('returns false when drv is undefined', async () => {
+    const result = await isSessionAlive(undefined);
+
+    expect(result).toBe(false);
+  });
+
+  it('returns true when getWindowSize resolves', async () => {
+    const drv = {
+      getWindowSize: jest.fn().mockResolvedValue({ width: 390, height: 844 }),
+    } as unknown as WebdriverIO.Browser;
+
+    const result = await isSessionAlive(drv);
+
+    expect(result).toBe(true);
+    expect(drv.getWindowSize).toHaveBeenCalledTimes(1);
+  });
+
+  it('returns false when getWindowSize rejects', async () => {
+    const drv = {
+      getWindowSize: jest.fn().mockRejectedValue(new Error('invalid session')),
+    } as unknown as WebdriverIO.Browser;
+
+    const result = await isSessionAlive(drv);
+
+    expect(result).toBe(false);
+  });
+});
+
+describe('switchToNativeContext', () => {
+  it('returns false when drv is undefined', async () => {
+    const result = await switchToNativeContext(undefined);
+
+    expect(result).toBe(false);
+  });
+
+  it('switches to NATIVE_APP and returns true', async () => {
+    const drv = {
+      switchContext: jest.fn().mockResolvedValue(undefined),
+    } as unknown as WebdriverIO.Browser;
+
+    const result = await switchToNativeContext(drv);
+
+    expect(result).toBe(true);
+    expect(drv.switchContext).toHaveBeenCalledWith('NATIVE_APP');
+  });
+
+  it('returns false when switchContext rejects', async () => {
+    const drv = {
+      switchContext: jest.fn().mockRejectedValue(new Error('no contexts')),
+    } as unknown as WebdriverIO.Browser;
+
+    const result = await switchToNativeContext(drv);
+
+    expect(result).toBe(false);
+  });
+});
diff --git a/tests/framework/services/appium/sessionHealth.ts b/tests/framework/services/appium/sessionHealth.ts
new file mode 100644
index 000000000000..e792a9913c9b
--- /dev/null
+++ b/tests/framework/services/appium/sessionHealth.ts
@@ -0,0 +1,38 @@
+/**
+ * Cheap liveness check for a reused Appium/WDIO session.
+ * Prefer getWindowSize over getSession — it exercises the session without
+ * depending on provider-specific session APIs.
+ */
+export async function isSessionAlive(
+  drv: WebdriverIO.Browser | undefined,
+): Promise<boolean> {
+  if (!drv) {
+    return false;
+  }
+
+  try {
+    await drv.getWindowSize();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Best-effort reset to the native app context after WebView / browser work.
+ * Soft reload must not leave a stale WEBVIEW context on a reused session.
+ */
+export async function switchToNativeContext(
+  drv: WebdriverIO.Browser | undefined,
+): Promise<boolean> {
+  if (!drv || typeof drv.switchContext !== 'function') {
+    return false;
+  }
+
+  try {
+    await drv.switchContext('NATIVE_APP');
+    return true;
+  } catch {
+    return false;
+  }
+}
diff --git a/tests/framework/services/appium/sessionRecovery.test.ts b/tests/framework/services/appium/sessionRecovery.test.ts
new file mode 100644
index 000000000000..7a284a41c233
--- /dev/null
+++ b/tests/framework/services/appium/sessionRecovery.test.ts
@@ -0,0 +1,44 @@
+import {
+  consumeSharedSessionRecreate,
+  isDeviceHealthError,
+  requestSharedSessionRecreate,
+  resetSharedSessionRecreateState,
+} from './sessionRecovery.ts';
+
+describe('isDeviceHealthError', () => {
+  it('returns true for pm clear and MainActivity failures', () => {
+    expect(
+      isDeviceHealthError(
+        new Error('Command failed: adb shell pm clear io.metamask'),
+      ),
+    ).toBe(true);
+    expect(
+      isDeviceHealthError(
+        new Error(
+          'Activity class {io.metamask/io.metamask.MainActivity} does not exist.',
+        ),
+      ),
+    ).toBe(true);
+  });
+
+  it('returns false for ordinary assertion failures', () => {
+    expect(
+      isDeviceHealthError(
+        new Error('Timed out: expected "Connected", got "Not connected"'),
+      ),
+    ).toBe(false);
+  });
+});
+
+describe('shared session recreate requests', () => {
+  afterEach(() => {
+    resetSharedSessionRecreateState();
+  });
+
+  it('stores and consumes a recreate request once', () => {
+    requestSharedSessionRecreate();
+
+    expect(consumeSharedSessionRecreate()).toBe(true);
+    expect(consumeSharedSessionRecreate()).toBe(false);
+  });
+});
diff --git a/tests/framework/services/appium/sessionRecovery.ts b/tests/framework/services/appium/sessionRecovery.ts
new file mode 100644
index 000000000000..98d0b0da8294
--- /dev/null
+++ b/tests/framework/services/appium/sessionRecovery.ts
@@ -0,0 +1,42 @@
+const DEVICE_HEALTH_ERROR_PATTERNS: readonly RegExp[] = [
+  /pm clear/i,
+  /MainActivity.*does not exist/i,
+  /Activity class \{.*\} does not exist/i,
+  /Cannot start the ['"].*['"] application/i,
+  /session is either terminated or not started/i,
+  /UiAutomation not connected/i,
+  /Error executing adbExec/i,
+];
+
+let recreateRequested = false;
+
+/** True when the error looks like emulator/session health failure, not a product assert. */
+export function isDeviceHealthError(error: unknown): boolean {
+  const message =
+    error instanceof Error
+      ? error.message
+      : typeof error === 'string'
+        ? error
+        : '';
+  return (
+    message.length > 0 &&
+    DEVICE_HEALTH_ERROR_PATTERNS.some((pattern) => pattern.test(message))
+  );
+}
+
+/** Ask the next driver fixture setup to drop the reused WebDriver session. */
+export function requestSharedSessionRecreate(): void {
+  recreateRequested = true;
+}
+
+/** Consume and clear a pending recreate request. */
+export function consumeSharedSessionRecreate(): boolean {
+  const requested = recreateRequested;
+  recreateRequested = false;
+  return requested;
+}
+
+/** Test-only reset. */
+export function resetSharedSessionRecreateState(): void {
+  recreateRequested = false;
+}
diff --git a/tests/framework/services/appium/softReloadApp.test.ts b/tests/framework/services/appium/softReloadApp.test.ts
new file mode 100644
index 000000000000..832fc333d0d1
--- /dev/null
+++ b/tests/framework/services/appium/softReloadApp.test.ts
@@ -0,0 +1,211 @@
+import {
+  softReloadAppForFixtures,
+  type SoftReloadDeviceCommands,
+  type SoftReloadFixtureServer,
+} from './softReloadApp.ts';
+import type { CurrentDeviceDetails } from '../../fixtures/playwright';
+import AndroidWebViewCdpHelpers from '../../AndroidWebViewCdpHelpers.ts';
+import ChromeCdpHelpers from '../../ChromeCdpHelpers.ts';
+import PlaywrightUtilities from '../../PlaywrightUtilities.ts';
+import { shouldHandleMetroDevLauncherLocally } from '../../Constants.ts';
+import { switchToNativeContext } from './sessionHealth.ts';
+import { dismissDevelopmentServerPickerPlaywright } from '../../../flows/general.flow';
+import {
+  consumeSharedSessionRecreate,
+  resetSharedSessionRecreateState,
+} from './sessionRecovery.ts';
+
+jest.mock('../../AndroidWebViewCdpHelpers.ts', () => ({
+  __esModule: true,
+  default: {
+    resetCache: jest.fn(),
+  },
+}));
+
+jest.mock('../../ChromeCdpHelpers.ts', () => ({
+  __esModule: true,
+  default: {
+    resetMetaMaskWebViewCache: jest.fn(),
+  },
+}));
+
+jest.mock('../../PlaywrightUtilities.ts', () => ({
+  __esModule: true,
+  default: {
+    launchApp: jest.fn().mockResolvedValue(undefined),
+  },
+}));
+
+jest.mock('../../Constants.ts', () => ({
+  ...jest.requireActual('../../Constants.ts'),
+  resolveE2EFixtureBootstrapTimeoutMs: jest.fn(() => 5_000),
+  shouldHandleMetroDevLauncherLocally: jest.fn(() => false),
+}));
+
+jest.mock('./sessionHealth.ts', () => ({
+  switchToNativeContext: jest.fn().mockResolvedValue(true),
+}));
+
+jest.mock('../../../flows/general.flow', () => ({
+  dismissDevelopmentServerPickerPlaywright: jest
+    .fn()
+    .mockResolvedValue(undefined),
+}));
+
+const launchAppMock = PlaywrightUtilities.launchApp as jest.MockedFunction<
+  typeof PlaywrightUtilities.launchApp
+>;
+const switchToNativeContextMock = switchToNativeContext as jest.MockedFunction<
+  typeof switchToNativeContext
+>;
+const shouldHandleMetroMock =
+  shouldHandleMetroDevLauncherLocally as jest.MockedFunction<
+    typeof shouldHandleMetroDevLauncherLocally
+  >;
+const dismissMetroMock =
+  dismissDevelopmentServerPickerPlaywright as jest.MockedFunction<
+    typeof dismissDevelopmentServerPickerPlaywright
+  >;
+
+describe('softReloadAppForFixtures', () => {
+  const currentDeviceDetails: CurrentDeviceDetails = {
+    platform: 'android',
+    deviceName: 'Pixel_5',
+    udid: 'emulator-5554',
+    packageName: 'io.metamask',
+    launchableActivity: 'io.metamask.MainActivity',
+    isBrowserstack: false,
+  };
+
+  let fixtureServer: SoftReloadFixtureServer;
+  let deviceCommands: SoftReloadDeviceCommands;
+  let waitForNextStateRequest: jest.Mock;
+  let clearAppData: jest.Mock;
+
+  beforeEach(() => {
+    waitForNextStateRequest = jest.fn().mockResolvedValue(undefined);
+    clearAppData = jest.fn().mockResolvedValue(undefined);
+    fixtureServer = { waitForNextStateRequest };
+    deviceCommands = { clearAppData };
+    shouldHandleMetroMock.mockReturnValue(false);
+    switchToNativeContextMock.mockResolvedValue(true);
+    launchAppMock.mockResolvedValue(undefined);
+    dismissMetroMock.mockResolvedValue(undefined);
+    resetSharedSessionRecreateState();
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    resetSharedSessionRecreateState();
+  });
+
+  it('clears app data, resets NATIVE_APP context, launches, and waits for bootstrap', async () => {
+    const drv = { sessionId: 's1' } as unknown as WebdriverIO.Browser;
+    const launchArgs = { fixtureServerPort: '1234' };
+
+    const result = await softReloadAppForFixtures({
+      currentDeviceDetails,
+      deviceCommands,
+      launchArgs,
+      fixtureServer,
+      drv,
+    });
+
+    expect(AndroidWebViewCdpHelpers.resetCache).toHaveBeenCalled();
+    expect(ChromeCdpHelpers.resetMetaMaskWebViewCache).toHaveBeenCalled();
+    expect(clearAppData).toHaveBeenCalledTimes(1);
+    expect(switchToNativeContextMock).toHaveBeenCalledWith(drv);
+    expect(waitForNextStateRequest).toHaveBeenCalledWith(5_000);
+    expect(launchAppMock).toHaveBeenCalledWith(currentDeviceDetails, {
+      launchArgs,
+    });
+    expect(result.attemptedMetroDevLauncherDismissal).toBe(false);
+    expect(result.clearAppDataMs).toBeGreaterThanOrEqual(0);
+    expect(result.contextResetMs).toBeGreaterThanOrEqual(0);
+    expect(result.launchAppMs).toBeGreaterThanOrEqual(0);
+    expect(result.fixtureBootstrapMs).toBeGreaterThanOrEqual(0);
+  });
+
+  it('skips clearAppData when deviceCommands is omitted', async () => {
+    await softReloadAppForFixtures({
+      currentDeviceDetails,
+      launchArgs: {},
+      fixtureServer,
+      drv: {} as WebdriverIO.Browser,
+    });
+
+    expect(clearAppData).not.toHaveBeenCalled();
+    expect(launchAppMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('registers bootstrap waiter before launching the app', async () => {
+    const callOrder: string[] = [];
+    waitForNextStateRequest.mockImplementation(async () => {
+      callOrder.push('wait');
+    });
+    launchAppMock.mockImplementation(async () => {
+      callOrder.push('launch');
+    });
+
+    await softReloadAppForFixtures({
+      currentDeviceDetails,
+      deviceCommands,
+      launchArgs: {},
+      fixtureServer,
+      drv: {} as WebdriverIO.Browser,
+    });
+
+    expect(callOrder.indexOf('wait')).toBeLessThan(callOrder.indexOf('launch'));
+  });
+
+  it('runs metro dismissal loop when local Metro launch handling is enabled', async () => {
+    shouldHandleMetroMock.mockReturnValue(true);
+
+    const result = await softReloadAppForFixtures({
+      currentDeviceDetails,
+      deviceCommands,
+      launchArgs: {},
+      fixtureServer,
+      drv: {} as WebdriverIO.Browser,
+    });
+
+    expect(result.attemptedMetroDevLauncherDismissal).toBe(true);
+    expect(dismissMetroMock).toHaveBeenCalled();
+  });
+
+  it('retries clearAppData once then continues', async () => {
+    clearAppData
+      .mockRejectedValueOnce(new Error('Command failed: adb shell pm clear'))
+      .mockResolvedValueOnce(undefined);
+
+    await softReloadAppForFixtures({
+      currentDeviceDetails,
+      deviceCommands,
+      launchArgs: {},
+      fixtureServer,
+      drv: {} as WebdriverIO.Browser,
+    });
+
+    expect(clearAppData).toHaveBeenCalledTimes(2);
+    expect(consumeSharedSessionRecreate()).toBe(false);
+  });
+
+  it('requests shared session recreate when clearAppData keeps failing', async () => {
+    clearAppData.mockRejectedValue(
+      new Error('Command failed: adb shell pm clear io.metamask'),
+    );
+
+    await expect(
+      softReloadAppForFixtures({
+        currentDeviceDetails,
+        deviceCommands,
+        launchArgs: {},
+        fixtureServer,
+        drv: {} as WebdriverIO.Browser,
+      }),
+    ).rejects.toThrow(/pm clear/);
+
+    expect(clearAppData).toHaveBeenCalledTimes(2);
+    expect(consumeSharedSessionRecreate()).toBe(true);
+  });
+});
diff --git a/tests/framework/services/appium/softReloadApp.ts b/tests/framework/services/appium/softReloadApp.ts
new file mode 100644
index 000000000000..13c7712eadef
--- /dev/null
+++ b/tests/framework/services/appium/softReloadApp.ts
@@ -0,0 +1,181 @@
+import type { CurrentDeviceDetails } from '../../fixtures/playwright';
+import type { LaunchArgs } from '../../types.ts';
+import {
+  resolveE2EFixtureBootstrapTimeoutMs,
+  shouldHandleMetroDevLauncherLocally,
+} from '../../Constants.ts';
+import AndroidWebViewCdpHelpers from '../../AndroidWebViewCdpHelpers.ts';
+import ChromeCdpHelpers from '../../ChromeCdpHelpers.ts';
+import PlaywrightUtilities from '../../PlaywrightUtilities.ts';
+import { createPlaywrightLogger } from '../../playwrightLogger.ts';
+import { dismissDevelopmentServerPickerPlaywright } from '../../../flows/general.flow';
+import { switchToNativeContext } from './sessionHealth.ts';
+import {
+  isDeviceHealthError,
+  requestSharedSessionRecreate,
+} from './sessionRecovery.ts';
+
+const logger = createPlaywrightLogger('softReloadApp');
+
+const sleep = (ms: number): Promise<void> =>
+  new Promise((resolve) => {
+    const timer = setTimeout(resolve, ms);
+    // Allow Jest / process exit when this timer loses a Promise.race.
+    if (typeof timer.unref === 'function') {
+      timer.unref();
+    }
+  });
+
+/**
+ * Minimal fixture-server surface needed for soft reload bootstrap wait.
+ */
+export interface SoftReloadFixtureServer {
+  waitForNextStateRequest(timeoutMs?: number): Promise<void>;
+}
+
+/**
+ * Minimal device-command surface for clearing app data before relaunch.
+ */
+export interface SoftReloadDeviceCommands {
+  clearAppData(): Promise<void>;
+}
+
+export interface SoftReloadAppForFixturesOptions {
+  currentDeviceDetails: CurrentDeviceDetails;
+  deviceCommands?: SoftReloadDeviceCommands;
+  launchArgs: Partial<LaunchArgs>;
+  fixtureServer: SoftReloadFixtureServer;
+  /**
+   * Override bootstrap timeout. Defaults to resolveE2EFixtureBootstrapTimeoutMs().
+   */
+  bootstrapTimeoutMs?: number;
+  /**
+   * WDIO browser used for NATIVE_APP context reset. Defaults to globalThis.driver.
+   */
+  drv?: WebdriverIO.Browser;
+}
+
+export interface SoftReloadAppForFixturesResult {
+  clearAppDataMs: number;
+  contextResetMs: number;
+  launchAppMs: number;
+  fixtureBootstrapMs: number;
+  /** True when the Metro/dev-launcher picker dismissal loop ran during bootstrap. */
+  attemptedMetroDevLauncherDismissal: boolean;
+}
+
+async function measureMs(fn: () => Promise<void>): Promise<number> {
+  const start = Date.now();
+  await fn();
+  return Date.now() - start;
+}
+
+/**
+ * Soft-reload the app on an existing Appium session for fixture re-bootstrap.
+ *
+ * Extract of the Appium `restartDevice: true` path:
+ * clearAppData → NATIVE_APP context reset → launchApp → wait for /state.json.
+ */
+export async function softReloadAppForFixtures(
+  options: SoftReloadAppForFixturesOptions,
+): Promise<SoftReloadAppForFixturesResult> {
+  const {
+    currentDeviceDetails,
+    deviceCommands,
+    launchArgs,
+    fixtureServer,
+    bootstrapTimeoutMs = resolveE2EFixtureBootstrapTimeoutMs(),
+    drv = globalThis.driver,
+  } = options;
+
+  // Both caches key on the WebView socket, whose name embeds the app pid.
+  AndroidWebViewCdpHelpers.resetCache();
+  ChromeCdpHelpers.resetMetaMaskWebViewCache();
+
+  let clearAppDataMs = 0;
+  if (deviceCommands) {
+    try {
+      clearAppDataMs = await measureMs(async () => {
+        try {
+          await deviceCommands.clearAppData();
+        } catch (firstError) {
+          logger.warn('clearAppData failed; retrying once:', firstError);
+          await sleep(1000);
+          await deviceCommands.clearAppData();
+        }
+      });
+    } catch (error) {
+      if (isDeviceHealthError(error)) {
+        requestSharedSessionRecreate();
+      }
+      throw error;
+    }
+  }
+
+  const contextResetMs = await measureMs(async () => {
+    const switched = await switchToNativeContext(drv);
+    if (!switched) {
+      logger.debug('NATIVE_APP context reset skipped or failed (best-effort)');
+    }
+  });
+
+  // Register waiter before launch so we do not miss a fast /state.json request.
+  const appStateRequest =
+    fixtureServer.waitForNextStateRequest(bootstrapTimeoutMs);
+
+  let attemptedMetroDevLauncherDismissal = false;
+  let launchAppMs = 0;
+  let fixtureBootstrapMs = 0;
+
+  try {
+    launchAppMs = await measureMs(() =>
+      PlaywrightUtilities.launchApp(currentDeviceDetails, { launchArgs }),
+    );
+
+    const bootstrapStart = Date.now();
+    if (shouldHandleMetroDevLauncherLocally()) {
+      attemptedMetroDevLauncherDismissal = true;
+      await Promise.all([
+        appStateRequest,
+        (async () => {
+          for (;;) {
+            await dismissDevelopmentServerPickerPlaywright();
+            const bootstrapped = await Promise.race([
+              appStateRequest.then(() => true),
+              sleep(1500).then(() => false),
+            ]);
+            if (bootstrapped) {
+              return;
+            }
+          }
+        })(),
+      ]);
+    } else {
+      await appStateRequest;
+    }
+    fixtureBootstrapMs = Date.now() - bootstrapStart;
+  } catch (error) {
+    appStateRequest.catch(() => undefined);
+    if (isDeviceHealthError(error)) {
+      requestSharedSessionRecreate();
+    }
+    throw error;
+  }
+
+  logger.info(
+    `Soft reload complete: clearAppData=${clearAppDataMs}ms, ` +
+      `contextReset=${contextResetMs}ms, launchApp=${launchAppMs}ms, ` +
+      `fixtureBootstrap=${fixtureBootstrapMs}ms` +
+      (attemptedMetroDevLauncherDismissal
+        ? ', metroDevLauncherDismissal=true'
+        : ''),
+  );
+
+  return {
+    clearAppDataMs,
+    contextResetMs,
+    launchAppMs,
+    fixtureBootstrapMs,
+    attemptedMetroDevLauncherDismissal,
+  };
+}
diff --git a/tests/framework/services/common/base/BaseServiceProvider.cleanupSession.test.ts b/tests/framework/services/common/base/BaseServiceProvider.cleanupSession.test.ts
new file mode 100644
index 000000000000..16ea87acd22e
--- /dev/null
+++ b/tests/framework/services/common/base/BaseServiceProvider.cleanupSession.test.ts
@@ -0,0 +1,50 @@
+import type { Browser } from 'webdriverio';
+import { BaseServiceProvider } from './BaseServiceProvider.ts';
+import type { ProjectConfig } from '../types.ts';
+import { Platform, ProviderName } from '../../../types.ts';
+
+class TestServiceProvider extends BaseServiceProvider {
+  async getDriver(): Promise<Browser> {
+    throw new Error('not used');
+  }
+}
+
+function createProject(): ProjectConfig {
+  return {
+    use: {
+      platform: Platform.ANDROID,
+      device: {
+        provider: ProviderName.BROWSERSTACK,
+        name: 'Pixel_5',
+      },
+    },
+  } as ProjectConfig;
+}
+
+describe('BaseServiceProvider.cleanupSession', () => {
+  it('deletes the WebDriver session when drv is provided', async () => {
+    const provider = new TestServiceProvider(createProject(), 'TestProvider');
+    provider.sessionId = 'bs-session-1';
+    const deleteSession = jest.fn().mockResolvedValue(undefined);
+    const drv = {
+      sessionId: 'bs-session-1',
+      deleteSession,
+    } as unknown as Browser;
+
+    await provider.cleanupSession(drv);
+
+    expect(deleteSession).toHaveBeenCalledTimes(1);
+    expect(provider.sessionId).toBeUndefined();
+  });
+
+  it('clears sessionId without deleting when drv is omitted', async () => {
+    const provider = new TestServiceProvider(createProject(), 'TestProvider');
+    provider.sessionId = 'bs-session-2';
+    const deleteSession = jest.fn();
+
+    await provider.cleanupSession();
+
+    expect(deleteSession).not.toHaveBeenCalled();
+    expect(provider.sessionId).toBeUndefined();
+  });
+});
diff --git a/tests/framework/services/common/base/BaseServiceProvider.ts b/tests/framework/services/common/base/BaseServiceProvider.ts
index 005aca41423f..f7632994d6e6 100644
--- a/tests/framework/services/common/base/BaseServiceProvider.ts
+++ b/tests/framework/services/common/base/BaseServiceProvider.ts
@@ -31,7 +31,42 @@ export abstract class BaseServiceProvider implements ServiceProvider {
   }
 
   /**
-   * Optional cleanup - override in subclasses if needed
+   * Deletes the WebDriver session when a browser is provided.
+   * Providers that cache a browser (e.g. EmulatorProvider) should override
+   * this so they can also clear their local reference.
+   */
+  async cleanupSession(drv?: Browser): Promise<void> {
+    if (!drv) {
+      this.sessionId = undefined;
+      this.logger.debug(
+        `Session cleanup for ${this.constructor.name}: no active session`,
+      );
+      return;
+    }
+
+    this.logger.debug(
+      `Deleting WebDriver session ${drv.sessionId ?? this.sessionId ?? 'unknown'} (${this.constructor.name})`,
+    );
+    try {
+      await drv.deleteSession();
+      this.logger.info('WebDriver session deleted');
+    } catch (error) {
+      this.logger.error('Failed to delete WebDriver session:', error);
+      throw error;
+    } finally {
+      this.sessionId = undefined;
+    }
+  }
+
+  /**
+   * Optional provider cleanup - override in subclasses if needed
+   */
+  async cleanupProvider?(): Promise<void> {
+    this.logger.debug(`Provider cleanup for ${this.constructor.name}`);
+  }
+
+  /**
+   * Legacy cleanup — prefer cleanupSession + cleanupProvider.
    */
   async cleanup?(): Promise<void> {
     this.logger.debug(`Cleanup for ${this.constructor.name}`);
diff --git a/tests/framework/services/common/interfaces/ServiceProvider.ts b/tests/framework/services/common/interfaces/ServiceProvider.ts
index 4da4b7a97713..6391afe1c41b 100644
--- a/tests/framework/services/common/interfaces/ServiceProvider.ts
+++ b/tests/framework/services/common/interfaces/ServiceProvider.ts
@@ -12,7 +12,7 @@ export interface ServiceProvider {
 
   /**
    * Time in milliseconds from session creation request to session ready.
-   * Only populated by providers that involve remote session allocation (e.g. BrowserStack).
+   * Populated by Emulator and BrowserStack providers after getDriver().
    */
   sessionCreationDurationMs?: number;
 
@@ -36,7 +36,20 @@ export interface ServiceProvider {
   }): Promise<void>;
 
   /**
-   * Cleanup resources (optional)
+   * Deletes the active WebDriver session and clears session metadata.
+   * Does not stop the Appium server.
+   */
+  cleanupSession?(drv?: Browser): Promise<void>;
+
+  /**
+   * Releases provider-level resources (e.g. stop local Appium server).
+   * Does not delete the WebDriver session.
+   */
+  cleanupProvider?(): Promise<void>;
+
+  /**
+   * Legacy cleanup — prefer `cleanupSession` then `cleanupProvider`.
+   * EmulatorProvider maps this to `cleanupProvider` only (historical behavior).
    */
   cleanup?(): Promise<void>;
 
diff --git a/tests/framework/services/providers/emulator/EmulatorProvider.cleanup.test.ts b/tests/framework/services/providers/emulator/EmulatorProvider.cleanup.test.ts
new file mode 100644
index 000000000000..e7a1a49d5414
--- /dev/null
+++ b/tests/framework/services/providers/emulator/EmulatorProvider.cleanup.test.ts
@@ -0,0 +1,92 @@
+import type { Browser } from 'webdriverio';
+import { stopAppiumServer } from '../../appium';
+import type { ProjectConfig } from '../../common/types.ts';
+import { Platform, ProviderName } from '../../../types.ts';
+import { EmulatorProvider } from './EmulatorProvider.ts';
+
+jest.mock('../../appium', () => ({
+  startAppiumServer: jest.fn().mockResolvedValue(undefined),
+  stopAppiumServer: jest.fn().mockResolvedValue(undefined),
+}));
+
+const stopAppiumServerMock = stopAppiumServer as jest.MockedFunction<
+  typeof stopAppiumServer
+>;
+
+function createProject(): ProjectConfig {
+  return {
+    use: {
+      platform: Platform.ANDROID,
+      device: {
+        provider: ProviderName.EMULATOR,
+        name: 'Pixel_5',
+        udid: 'emulator-5554',
+      },
+      app: {
+        packageName: 'io.metamask',
+      },
+    },
+  } as ProjectConfig;
+}
+
+describe('EmulatorProvider cleanup split', () => {
+  beforeEach(() => {
+    stopAppiumServerMock.mockClear();
+    stopAppiumServerMock.mockResolvedValue(undefined);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('cleanupSession deletes the WebDriver session without stopping Appium', async () => {
+    const provider = new EmulatorProvider(createProject());
+    const deleteSession = jest.fn().mockResolvedValue(undefined);
+    const browser = {
+      sessionId: 'session-1',
+      deleteSession,
+    } as unknown as Browser;
+    // Seed the private browser used when no drv arg is passed.
+    (provider as unknown as { browser?: Browser }).browser = browser;
+    provider.sessionId = 'session-1';
+
+    await provider.cleanupSession();
+
+    expect(deleteSession).toHaveBeenCalledTimes(1);
+    expect(stopAppiumServerMock).not.toHaveBeenCalled();
+    expect(provider.sessionId).toBeUndefined();
+  });
+
+  it('cleanupProvider stops Appium without deleting the session', async () => {
+    const provider = new EmulatorProvider(createProject());
+    const deleteSession = jest.fn().mockResolvedValue(undefined);
+    const browser = {
+      sessionId: 'session-2',
+      deleteSession,
+    } as unknown as Browser;
+    (provider as unknown as { browser?: Browser }).browser = browser;
+    provider.sessionId = 'session-2';
+
+    await provider.cleanupProvider();
+
+    expect(stopAppiumServerMock).toHaveBeenCalledTimes(1);
+    expect(deleteSession).not.toHaveBeenCalled();
+    expect(provider.sessionId).toBe('session-2');
+  });
+
+  it('legacy cleanup only stops Appium (cleanupProvider)', async () => {
+    const provider = new EmulatorProvider(createProject());
+    const deleteSession = jest.fn().mockResolvedValue(undefined);
+    (provider as unknown as { browser?: Browser }).browser = {
+      sessionId: 'session-3',
+      deleteSession,
+    } as unknown as Browser;
+    provider.sessionId = 'session-3';
+
+    await provider.cleanup();
+
+    expect(stopAppiumServerMock).toHaveBeenCalledTimes(1);
+    expect(deleteSession).not.toHaveBeenCalled();
+    expect(provider.sessionId).toBe('session-3');
+  });
+});
diff --git a/tests/framework/services/providers/emulator/EmulatorProvider.ts b/tests/framework/services/providers/emulator/EmulatorProvider.ts
index 1ba4a00714a8..2983f64295f7 100644
--- a/tests/framework/services/providers/emulator/EmulatorProvider.ts
+++ b/tests/framework/services/providers/emulator/EmulatorProvider.ts
@@ -26,6 +26,9 @@ import {
  * Service provider for local emulator/simulator testing
  */
 export class EmulatorProvider extends BaseServiceProvider {
+  /** Active WDIO browser for cleanupSession when no drv arg is passed. */
+  private browser?: Browser;
+
   constructor(project: ProjectConfig) {
     super(project, 'EmulatorProvider');
   }
@@ -299,20 +302,50 @@ export class EmulatorProvider extends BaseServiceProvider {
     const configBuilder = new EmulatorConfigBuilder(this.project);
     const config = configBuilder.build();
 
+    const sessionCreationStart = Date.now();
     const browser = await remote(config);
+    this.sessionCreationDurationMs = Date.now() - sessionCreationStart;
+    this.browser = browser;
     this.sessionId = browser.sessionId;
 
     this.logger.info(
-      `Driver created for emulator with session: ${this.sessionId}`,
+      `Driver created for emulator with session: ${this.sessionId} ` +
+        `(session creation took ${this.sessionCreationDurationMs}ms)`,
     );
     return browser;
   }
 
   /**
-   * Cleanup - stop the Appium server
+   * Delete the WebDriver session. Does not stop the Appium server.
    */
-  async cleanup(): Promise<void> {
-    this.logger.debug('Cleaning up emulator provider');
+  async cleanupSession(drv?: Browser): Promise<void> {
+    const session = drv ?? this.browser;
+    if (!session) {
+      this.sessionId = undefined;
+      this.browser = undefined;
+      return;
+    }
+
+    this.logger.debug(
+      `Deleting WebDriver session ${session.sessionId ?? this.sessionId ?? 'unknown'}`,
+    );
+    try {
+      await session.deleteSession();
+      this.logger.info('WebDriver session deleted');
+    } catch (error) {
+      this.logger.error('Failed to delete WebDriver session:', error);
+      throw error;
+    } finally {
+      this.browser = undefined;
+      this.sessionId = undefined;
+    }
+  }
+
+  /**
+   * Stop the Appium server. Does not delete the WebDriver session.
+   */
+  async cleanupProvider(): Promise<void> {
+    this.logger.debug('Cleaning up emulator provider (Appium server)');
     try {
       await stopAppiumServer();
       this.logger.info('Appium server stopped successfully');
@@ -321,4 +354,12 @@ export class EmulatorProvider extends BaseServiceProvider {
       throw error;
     }
   }
+
+  /**
+   * Legacy cleanup — stops Appium only (historical EmulatorProvider behavior).
+   * Callers that also need session teardown should call cleanupSession first.
+   */
+  async cleanup(): Promise<void> {
+    await this.cleanupProvider();
+  }
 }
diff --git a/tests/framework/telemetry/PhaseTimer.test.ts b/tests/framework/telemetry/PhaseTimer.test.ts
new file mode 100644
index 000000000000..f3863f048eb1
--- /dev/null
+++ b/tests/framework/telemetry/PhaseTimer.test.ts
@@ -0,0 +1,199 @@
+/* eslint-disable import-x/no-nodejs-modules -- AsyncResource simulates ALS context loss across Playwright's use() boundary */
+import { AsyncResource } from 'node:async_hooks';
+import {
+  bindPhaseTimer,
+  createPhaseTimer,
+  getPhaseTimer,
+  getPhaseTimerAlsStore,
+  recordPhase,
+  runWithPhaseTimer,
+  startPhase,
+  stopPhase,
+} from './PhaseTimer.ts';
+
+describe('PhaseTimer', () => {
+  it('accumulates duration when the same phase is started again after another phase', () => {
+    let now = 1_000;
+    const timer = createPhaseTimer({ now: () => now });
+
+    timer.start('test_body');
+    now += 20;
+    timer.start('login');
+    now += 10;
+    timer.start('test_body');
+    now += 15;
+    timer.stop();
+
+    const { phases } = timer.snapshot();
+
+    expect(phases.login).toBe(10);
+    expect(phases.test_body).toBe(35);
+  });
+
+  it('records absolute durations without stopping the current phase', () => {
+    let now = 1_000;
+    const timer = createPhaseTimer({ now: () => now });
+
+    timer.start('test_body');
+    timer.record('app_clear', 100);
+    timer.record('app_clear', 50);
+    now += 10;
+    timer.stop();
+
+    const { phases } = timer.snapshot();
+
+    expect(phases.app_clear).toBe(150);
+    expect(phases.test_body).toBe(10);
+  });
+
+  it('ignores non-finite or negative recorded durations', () => {
+    const timer = createPhaseTimer();
+
+    timer.record('app_launch', Number.NaN);
+    timer.record('app_launch', -5);
+    timer.record('app_launch', 42);
+
+    expect(timer.snapshot().phases.app_launch).toBe(42);
+  });
+
+  it('merges meta via setMeta', () => {
+    const timer = createPhaseTimer();
+
+    timer.setMeta({ platform: 'android', sessionReused: true });
+    timer.setMeta({ title: 'example', retry: 1 });
+
+    expect(timer.snapshot().meta).toEqual({
+      platform: 'android',
+      sessionReused: true,
+      title: 'example',
+      retry: 1,
+    });
+  });
+
+  it('binds the timer to AsyncLocalStorage for nested helpers', async () => {
+    let now = 1_000;
+    const timer = createPhaseTimer({ now: () => now });
+
+    await runWithPhaseTimer(timer, async () => {
+      expect(getPhaseTimer()).toBe(timer);
+      startPhase('login');
+      now += 5;
+      stopPhase();
+      recordPhase('fixture_bootstrap', 12);
+    });
+
+    expect(getPhaseTimer()).toBeUndefined();
+
+    const { phases } = timer.snapshot();
+
+    expect(phases.login).toBe(5);
+    expect(phases.fixture_bootstrap).toBe(12);
+  });
+
+  it('no-ops convenience helpers when no timer is bound', () => {
+    expect(() => {
+      startPhase('login');
+      recordPhase('app_clear', 1);
+      stopPhase();
+    }).not.toThrow();
+
+    expect(getPhaseTimer()).toBeUndefined();
+  });
+
+  it('records via active binding even when AsyncLocalStorage store is unset', () => {
+    let now = 1_000;
+    const timer = createPhaseTimer({ now: () => now });
+    const unbind = bindPhaseTimer(timer);
+
+    try {
+      expect(getPhaseTimerAlsStore()).toBeUndefined();
+      expect(getPhaseTimer()).toBe(timer);
+      startPhase('login');
+      now += 7;
+      stopPhase();
+      recordPhase('fixture_bootstrap', 3);
+    } finally {
+      unbind();
+    }
+
+    expect(getPhaseTimer()).toBeUndefined();
+
+    const { phases } = timer.snapshot();
+
+    expect(phases.login).toBe(7);
+    expect(phases.fixture_bootstrap).toBe(3);
+  });
+
+  it('runWithPhaseTimer keeps active binding when AsyncLocalStorage context is lost', async () => {
+    let now = 1_000;
+    const timer = createPhaseTimer({ now: () => now });
+    // Construct outside runWithPhaseTimer so runInAsyncScope restores an empty
+    // ALS store (construction-time context), forcing the activeTimer fallback.
+    const resource = new AsyncResource('als-loss-probe');
+
+    await runWithPhaseTimer(timer, async () => {
+      expect(getPhaseTimerAlsStore()).toBe(timer);
+
+      await new Promise<void>((resolve) => {
+        resource.runInAsyncScope(() => {
+          expect(getPhaseTimerAlsStore()).toBeUndefined();
+          expect(getPhaseTimer()).toBe(timer);
+          startPhase('test_body');
+          now += 11;
+          resolve();
+        });
+      });
+      stopPhase();
+    });
+
+    expect(getPhaseTimer()).toBeUndefined();
+    expect(timer.snapshot().phases.test_body).toBe(11);
+  });
+
+  it('runWithPhaseTimer clears active binding after async completion', async () => {
+    const timer = createPhaseTimer();
+
+    await runWithPhaseTimer(timer, async () => {
+      expect(getPhaseTimer()).toBe(timer);
+    });
+
+    expect(getPhaseTimer()).toBeUndefined();
+  });
+
+  it('clears the active binding when the callback throws synchronously', () => {
+    const timer = createPhaseTimer();
+
+    expect(() =>
+      runWithPhaseTimer(timer, () => {
+        throw new Error('boom');
+      }),
+    ).toThrow('boom');
+
+    expect(getPhaseTimer()).toBeUndefined();
+  });
+
+  it('clears the active binding when the async callback rejects', async () => {
+    const timer = createPhaseTimer();
+
+    await expect(
+      runWithPhaseTimer(timer, async () => {
+        throw new Error('async boom');
+      }),
+    ).rejects.toThrow('async boom');
+
+    expect(getPhaseTimer()).toBeUndefined();
+  });
+
+  it('nested bindPhaseTimer restores the previous active timer', () => {
+    const outer = createPhaseTimer();
+    const inner = createPhaseTimer();
+    const unbindOuter = bindPhaseTimer(outer);
+    const unbindInner = bindPhaseTimer(inner);
+
+    expect(getPhaseTimer()).toBe(inner);
+    unbindInner();
+    expect(getPhaseTimer()).toBe(outer);
+    unbindOuter();
+    expect(getPhaseTimer()).toBeUndefined();
+  });
+});
diff --git a/tests/framework/telemetry/PhaseTimer.ts b/tests/framework/telemetry/PhaseTimer.ts
new file mode 100644
index 000000000000..644920f02a6f
--- /dev/null
+++ b/tests/framework/telemetry/PhaseTimer.ts
@@ -0,0 +1,158 @@
+/* eslint-disable import-x/no-nodejs-modules -- AsyncLocalStorage for per-test PhaseTimer binding */
+import { AsyncLocalStorage } from 'node:async_hooks';
+
+export type PhaseName = string;
+
+export interface PhaseTimerMeta {
+  platform?: 'android' | 'ios' | string;
+  suite?: string;
+  spec?: string;
+  title?: string;
+  retry?: number;
+  outcome?: string;
+  sessionReused?: boolean;
+  sessionRecreated?: boolean;
+  sessionCreationMs?: number;
+  [key: string]: string | number | boolean | undefined;
+}
+
+export interface PhaseTimerSnapshot {
+  phases: Record<string, number>;
+  meta: PhaseTimerMeta;
+}
+
+export interface PhaseTimer {
+  start(phase: PhaseName): void;
+  record(phase: PhaseName, ms: number): void;
+  stop(): void;
+  setMeta(meta: Partial<PhaseTimerMeta>): void;
+  snapshot(): PhaseTimerSnapshot;
+}
+
+export interface CreatePhaseTimerOptions {
+  now?: () => number;
+}
+
+const storage = new AsyncLocalStorage<PhaseTimer>();
+/**
+ * Fallback when Playwright's `use()` resumes the test outside the ALS store.
+ * Meta is written on the timer object directly; phases go through getPhaseTimer().
+ */
+let activeTimer: PhaseTimer | undefined;
+
+export function bindPhaseTimer(timer: PhaseTimer): () => void {
+  const previous = activeTimer;
+  activeTimer = timer;
+  return () => {
+    if (activeTimer === timer) {
+      activeTimer = previous;
+    }
+  };
+}
+
+class PhaseTimerImpl implements PhaseTimer {
+  readonly #phases = new Map<string, number>();
+  readonly #now: () => number;
+  #meta: PhaseTimerMeta = {};
+  #currentPhase: string | null = null;
+  #currentStartedAt: number | null = null;
+
+  constructor(now: () => number = Date.now) {
+    this.#now = now;
+  }
+
+  start(phase: PhaseName): void {
+    this.#stopCurrent();
+    this.#currentPhase = phase;
+    this.#currentStartedAt = this.#now();
+  }
+
+  record(phase: PhaseName, ms: number): void {
+    if (!Number.isFinite(ms) || ms < 0) {
+      return;
+    }
+    this.#phases.set(phase, (this.#phases.get(phase) ?? 0) + ms);
+  }
+
+  stop(): void {
+    this.#stopCurrent();
+  }
+
+  setMeta(meta: Partial<PhaseTimerMeta>): void {
+    this.#meta = { ...this.#meta, ...meta };
+  }
+
+  snapshot(): PhaseTimerSnapshot {
+    this.#stopCurrent();
+    return {
+      phases: Object.fromEntries(this.#phases.entries()),
+      meta: { ...this.#meta },
+    };
+  }
+
+  #stopCurrent(): void {
+    if (this.#currentPhase === null || this.#currentStartedAt === null) {
+      this.#currentPhase = null;
+      this.#currentStartedAt = null;
+      return;
+    }
+    const elapsed = this.#now() - this.#currentStartedAt;
+    this.#phases.set(
+      this.#currentPhase,
+      (this.#phases.get(this.#currentPhase) ?? 0) + elapsed,
+    );
+    this.#currentPhase = null;
+    this.#currentStartedAt = null;
+  }
+}
+
+export function createPhaseTimer(
+  options: CreatePhaseTimerOptions = {},
+): PhaseTimer {
+  return new PhaseTimerImpl(options.now);
+}
+
+export function runWithPhaseTimer<T>(
+  timer: PhaseTimer,
+  fn: () => T | Promise<T>,
+): T | Promise<T> {
+  const unbind = bindPhaseTimer(timer);
+  let result: T | Promise<T>;
+  try {
+    result = storage.run(timer, fn);
+  } catch (error) {
+    unbind();
+    throw error;
+  }
+  if (result instanceof Promise) {
+    return result.finally(unbind);
+  }
+  unbind();
+  return result;
+}
+
+export function getPhaseTimer(): PhaseTimer | undefined {
+  return storage.getStore() ?? activeTimer;
+}
+
+/**
+ * ALS store only — ignores the activeTimer fallback.
+ * Tests use this to prove a real context gap while getPhaseTimer() still resolves.
+ */
+export function getPhaseTimerAlsStore(): PhaseTimer | undefined {
+  return storage.getStore();
+}
+
+export function startPhase(phase: PhaseName): void {
+  getPhaseTimer()?.start(phase);
+}
+
+export function recordPhase(phase: PhaseName, ms: number): void {
+  getPhaseTimer()?.record(phase, ms);
+}
+
+export function stopPhase(): void {
+  getPhaseTimer()?.stop();
+}
+
+export const PHASE_TIMINGS_ATTACHMENT_NAME = 'appium-phase-timings';
diff --git a/tests/framework/telemetry/aggregatePhaseTimings.test.ts b/tests/framework/telemetry/aggregatePhaseTimings.test.ts
new file mode 100644
index 000000000000..3f7b6c5eaa1e
--- /dev/null
+++ b/tests/framework/telemetry/aggregatePhaseTimings.test.ts
@@ -0,0 +1,121 @@
+import {
+  aggregateTimingSuites,
+  average,
+  formatTrendMarkdown,
+  parseArgs,
+  percentile,
+} from './aggregatePhaseTimings.ts';
+
+describe('aggregatePhaseTimings', () => {
+  it('returns null average for empty input', () => {
+    expect(average([])).toBeNull();
+  });
+
+  it('returns arithmetic mean', () => {
+    expect(average([10, 20, 30])).toBe(20);
+  });
+
+  it('returns null percentile for empty input', () => {
+    expect(percentile([], 95)).toBeNull();
+  });
+
+  it('returns p95 from sorted values', () => {
+    const values = [10, 20, 30, 40, 50, 60, 70, 80, 90, 100];
+
+    expect(percentile(values, 95)).toBe(100);
+    expect(percentile(values, 50)).toBe(50);
+  });
+
+  it('computes phase stats, slowest shard, and retry attempts', () => {
+    const report = aggregateTimingSuites([
+      {
+        suite: 'suite-a',
+        sourcePath: '/tmp/a.json',
+        tests: [
+          {
+            title: 't1',
+            file: 'a.spec.ts',
+            retry: 0,
+            outcome: 'passed',
+            phases: { login: 100, test_body: 200 },
+            meta: { platform: 'android', sessionReused: true },
+          },
+          {
+            title: 't2',
+            file: 'a.spec.ts',
+            retry: 1,
+            outcome: 'passed',
+            phases: { login: 150, test_body: 250 },
+            meta: { platform: 'android', sessionReused: false },
+          },
+          {
+            title: 'timed-out-once',
+            file: 'a.spec.ts',
+            retry: 0,
+            outcome: 'timedOut',
+            phases: { login: 10 },
+            meta: { platform: 'android' },
+          },
+        ],
+      },
+      {
+        suite: 'suite-b',
+        sourcePath: '/tmp/b.json',
+        tests: [
+          {
+            title: 't3',
+            file: 'b.spec.ts',
+            retry: 0,
+            outcome: 'passed',
+            phases: { login: 50, test_body: 50 },
+            meta: { platform: 'ios', sessionReused: true },
+          },
+        ],
+      },
+    ]);
+
+    expect(report.testCount).toBe(4);
+    expect(report.suiteCount).toBe(2);
+    expect(report.phases.android.login.avg).toBe(260 / 3);
+    expect(report.phases.android.login.samples).toBe(3);
+    expect(report.slowestShard?.suite).toBe('suite-a');
+    expect(report.sessionReuse.rate).toBe(2 / 3);
+    expect(report.retryRatePerSpec['a.spec.ts::t2'].retries).toBe(1);
+    // timedOut with retry === 0 is not counted as a retry attempt
+    expect(report.retryRatePerSpec['a.spec.ts::timed-out-once'].retries).toBe(
+      0,
+    );
+  });
+
+  it('formats trend markdown with phase table headers', () => {
+    const report = aggregateTimingSuites([
+      {
+        suite: 's',
+        tests: [
+          {
+            title: 't',
+            file: 'f.ts',
+            phases: { login: 10 },
+            meta: { platform: 'android' },
+          },
+        ],
+      },
+    ]);
+
+    const md = formatTrendMarkdown(report);
+
+    expect(md).toMatch(/# Appium phase timing trend/);
+    expect(md).toMatch(/\| Phase \| Avg \| p95 \| Samples \|/);
+    expect(md).toMatch(/login/);
+  });
+
+  it('reads CLI flags', () => {
+    const opts = parseArgs(
+      ['--input', '/tmp/timings', '--markdown', '/tmp/out.md'],
+      '/default',
+    );
+
+    expect(opts.input).toMatch(/timings$/);
+    expect(opts.markdown).toMatch(/out\.md$/);
+  });
+});
diff --git a/tests/framework/telemetry/aggregatePhaseTimings.ts b/tests/framework/telemetry/aggregatePhaseTimings.ts
new file mode 100644
index 000000000000..f2f1855b2079
--- /dev/null
+++ b/tests/framework/telemetry/aggregatePhaseTimings.ts
@@ -0,0 +1,269 @@
+/* eslint-disable import-x/no-nodejs-modules */
+import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+
+export const DEFAULT_INPUT_DIR = 'tests/test-reports/appium-timings';
+
+export function average(values: number[]): number | null {
+  if (!values.length) return null;
+  return values.reduce((a, b) => a + b, 0) / values.length;
+}
+
+export function percentile(
+  values: number[],
+  percentileValue: number,
+): number | null {
+  if (!values.length) return null;
+  const sorted = [...values].sort((a, b) => a - b);
+  const index = Math.min(
+    sorted.length - 1,
+    Math.max(0, Math.ceil((percentileValue / 100) * sorted.length) - 1),
+  );
+  return sorted[index];
+}
+
+function isObject(value: unknown): value is Record<string, unknown> {
+  return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+export function collectTimingFiles(inputPath: string): string[] {
+  const resolved = resolve(inputPath);
+  if (!existsSync(resolved)) return [];
+  const stats = statSync(resolved);
+  if (stats.isFile()) return resolved.endsWith('.json') ? [resolved] : [];
+  const files: string[] = [];
+  for (const name of readdirSync(resolved)) {
+    const full = join(resolved, name);
+    const st = statSync(full);
+    if (st.isFile() && name.endsWith('.json')) files.push(full);
+    else if (st.isDirectory()) {
+      for (const nested of readdirSync(full)) {
+        if (nested.endsWith('.json')) files.push(join(full, nested));
+      }
+    }
+  }
+  return files.sort();
+}
+
+export interface TimingTestEntry {
+  phases?: Record<string, number>;
+  meta?: Record<string, unknown>;
+  outcome?: string;
+  retry?: number;
+  title?: string;
+  file?: string;
+}
+
+export interface TimingSuiteFile {
+  suite?: string;
+  tests?: TimingTestEntry[];
+  sourcePath?: string;
+}
+
+export function loadTimingFile(filePath: string): TimingSuiteFile | null {
+  try {
+    const raw: unknown = JSON.parse(readFileSync(filePath, 'utf8'));
+    if (!isObject(raw) || !Array.isArray(raw.tests)) return null;
+    return { ...(raw as TimingSuiteFile), sourcePath: filePath };
+  } catch {
+    return null;
+  }
+}
+
+export interface PhaseStats {
+  avg: number | null;
+  p95: number | null;
+  samples: number;
+}
+
+export interface AggregateTimingReport {
+  schemaVersion: 1;
+  generatedAt: string;
+  testCount: number;
+  suiteCount: number;
+  phases: Record<string, Record<string, PhaseStats>>;
+  slowestShard: {
+    suite: string;
+    platform: string;
+    totalMs: number;
+    sourcePath?: string;
+  } | null;
+  retryRatePerSpec: Record<
+    string,
+    { attempts: number; retries: number; retryRate: number }
+  >;
+  sessionReuse: { known: number; reused: number; rate: number | null };
+}
+
+export function aggregateTimingSuites(
+  suites: TimingSuiteFile[],
+): AggregateTimingReport {
+  const phaseByPlatform = new Map<string, number[]>();
+  const retryBySpec = new Map<string, { attempts: number; retries: number }>();
+  const shardTotals: AggregateTimingReport['slowestShard'][] = [];
+  let sessionReuseTrue = 0;
+  let sessionReuseKnown = 0;
+  let testCount = 0;
+
+  for (const suite of suites) {
+    const suiteName = suite.suite || 'unknown';
+    const totalsByPlatform = new Map<string, number>();
+
+    for (const test of suite.tests ?? []) {
+      testCount += 1;
+      const platform =
+        typeof test.meta?.platform === 'string'
+          ? test.meta.platform
+          : 'unknown';
+      let testPhaseSum = 0;
+      for (const [phase, ms] of Object.entries(test.phases ?? {})) {
+        if (typeof ms !== 'number' || !Number.isFinite(ms)) continue;
+        testPhaseSum += ms;
+        const key = `${platform}::${phase}`;
+        const bucket = phaseByPlatform.get(key) ?? [];
+        bucket.push(ms);
+        phaseByPlatform.set(key, bucket);
+      }
+      totalsByPlatform.set(
+        platform,
+        (totalsByPlatform.get(platform) ?? 0) + testPhaseSum,
+      );
+
+      const specKey = `${test.file ?? 'unknown'}::${test.title ?? 'unknown'}`;
+      const retryStats = retryBySpec.get(specKey) ?? {
+        attempts: 0,
+        retries: 0,
+      };
+      retryStats.attempts += 1;
+      if ((test.retry ?? 0) > 0) retryStats.retries += 1;
+      retryBySpec.set(specKey, retryStats);
+
+      if (typeof test.meta?.sessionReused === 'boolean') {
+        sessionReuseKnown += 1;
+        if (test.meta.sessionReused) sessionReuseTrue += 1;
+      }
+    }
+
+    for (const [platform, totalMs] of totalsByPlatform.entries()) {
+      shardTotals.push({
+        suite: suiteName,
+        platform,
+        totalMs,
+        sourcePath: suite.sourcePath,
+      });
+    }
+  }
+
+  const phases: AggregateTimingReport['phases'] = {};
+  for (const [key, values] of phaseByPlatform.entries()) {
+    const [platform, phase] = key.split('::');
+    phases[platform] ??= {};
+    phases[platform][phase] = {
+      avg: average(values),
+      p95: percentile(values, 95),
+      samples: values.length,
+    };
+  }
+
+  const retryRatePerSpec: AggregateTimingReport['retryRatePerSpec'] = {};
+  for (const [spec, stats] of retryBySpec.entries()) {
+    retryRatePerSpec[spec] = {
+      ...stats,
+      retryRate: stats.attempts === 0 ? 0 : stats.retries / stats.attempts,
+    };
+  }
+
+  const sortedShards = [...shardTotals].filter(
+    (shard): shard is NonNullable<typeof shard> => shard != null,
+  );
+  sortedShards.sort((a, b) => b.totalMs - a.totalMs);
+
+  return {
+    schemaVersion: 1,
+    generatedAt: new Date().toISOString(),
+    testCount,
+    suiteCount: suites.length,
+    phases,
+    slowestShard: sortedShards[0] ?? null,
+    retryRatePerSpec,
+    sessionReuse: {
+      known: sessionReuseKnown,
+      reused: sessionReuseTrue,
+      rate:
+        sessionReuseKnown === 0 ? null : sessionReuseTrue / sessionReuseKnown,
+    },
+  };
+}
+
+export function formatTrendMarkdown(report: AggregateTimingReport): string {
+  const lines = [
+    '# Appium phase timing trend',
+    '',
+    `Generated: ${report.generatedAt}`,
+    `Suites: ${report.suiteCount} · Tests: ${report.testCount}`,
+    '',
+  ];
+  if (report.sessionReuse.rate !== null) {
+    lines.push(
+      `Session reuse rate: ${(report.sessionReuse.rate * 100).toFixed(1)}% (${report.sessionReuse.reused}/${report.sessionReuse.known})`,
+      '',
+    );
+  }
+  if (report.slowestShard) {
+    lines.push(
+      `Slowest shard: **${report.slowestShard.suite}** (${report.slowestShard.platform}) — ${Math.round(report.slowestShard.totalMs)}ms phase sum`,
+      '',
+    );
+  }
+  lines.push('## Avg / p95 by phase (ms)', '');
+  for (const platform of Object.keys(report.phases).sort()) {
+    lines.push(
+      `### ${platform}`,
+      '',
+      '| Phase | Avg | p95 | Samples |',
+      '| --- | ---: | ---: | ---: |',
+    );
+    for (const phase of Object.keys(report.phases[platform]).sort()) {
+      const row = report.phases[platform][phase];
+      lines.push(
+        `| ${phase} | ${row.avg === null ? '—' : Math.round(row.avg)} | ${row.p95 === null ? '—' : Math.round(row.p95)} | ${row.samples} |`,
+      );
+    }
+    lines.push('');
+  }
+  const retryEntries = Object.entries(report.retryRatePerSpec)
+    .filter(([, s]) => s.retries > 0)
+    .sort((a, b) => b[1].retryRate - a[1].retryRate)
+    .slice(0, 20);
+  if (retryEntries.length > 0) {
+    lines.push(
+      '## Specs with retries',
+      '',
+      '| Spec | Retry rate | Retries / Attempts |',
+      '| --- | ---: | ---: |',
+    );
+    for (const [spec, stats] of retryEntries) {
+      lines.push(
+        `| ${spec} | ${(stats.retryRate * 100).toFixed(0)}% | ${stats.retries}/${stats.attempts} |`,
+      );
+    }
+    lines.push('');
+  }
+  return `${lines.join('\n')}\n`;
+}
+
+export function parseArgs(
+  argv: string[],
+  defaultInput: string = DEFAULT_INPUT_DIR,
+): { input: string; markdown: string | null } {
+  const opts = { input: defaultInput, markdown: null as string | null };
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i];
+    if (arg === '--input' && argv[i + 1]) {
+      opts.input = resolve(argv[++i]);
+    } else if (arg === '--markdown' && argv[i + 1]) {
+      opts.markdown = resolve(argv[++i]);
+    }
+  }
+  return opts;
+}
diff --git a/tests/framework/types.ts b/tests/framework/types.ts
index 7de0bca66c69..070dd27a79dc 100644
--- a/tests/framework/types.ts
+++ b/tests/framework/types.ts
@@ -114,6 +114,8 @@ export interface GestureOptions {
   checkStability?: boolean;
   checkVisibility?: boolean;
   checkEnabled?: boolean;
+  /** Appium: when false, skip waitForDisplayed (XCUITest visible=false nodes). */
+  checkForDisplayed?: boolean;
   elemDescription?: string; // For better error messages - i.e "Get Started button"
 }
 
diff --git a/tests/helpers.js b/tests/helpers.js
deleted file mode 100644
index b06806605078..000000000000
--- a/tests/helpers.js
+++ /dev/null
@@ -1,568 +0,0 @@
-/* eslint-disable import-x/no-nodejs-modules */
-import { waitFor, web } from 'detox';
-import { getFixturesServerPort } from './framework/fixtures/FixtureUtils';
-import Utilities from './framework/Utilities';
-import { resolveConfig } from 'detox/internals';
-import { createLogger } from './framework/logger';
-import { exec } from 'child_process';
-import { promisify } from 'util';
-
-const logger = createLogger({
-  name: 'TestHelpers',
-});
-const execAsync = promisify(exec);
-
-export default class TestHelpers {
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async waitAndTap(elementId, timeout, index) {
-    await waitFor(element(by.id(elementId)))
-      .toBeVisible()
-      .withTimeout(timeout || 8000);
-
-    return element(by.id(elementId))
-      .atIndex(index || 0)
-      .tap();
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async waitAndTapText(text, timeout) {
-    await waitFor(element(by.text(text)))
-      .toBeVisible()
-      .withTimeout(timeout || 8000);
-
-    return element(by.text(text)).tap();
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static tap(elementId) {
-    return element(by.id(elementId)).tap();
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static tapByDescendentTestID(parentElement, ChildElement) {
-    return element(
-      by.id(parentElement).withDescendant(by.id(ChildElement)),
-    ).tap();
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static tapByText(text, index) {
-    return element(by.text(text))
-      .atIndex(index || 0)
-      .tap();
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static doubleTapByText(text, index) {
-    return element(by.text(text))
-      .atIndex(index || 0)
-      .multiTap(2);
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static tapAtPoint(elementId, point) {
-    return element(by.id(elementId)).tap(point);
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static tapItemAtIndex(elementID, index) {
-    return element(by.id(elementID))
-      .atIndex(index || 0)
-      .tap();
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static tapItemAtIndexByLabel(elementID, index) {
-    return element(by.label(elementID, index))
-      .atIndex(index || 0)
-      .tap();
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async typeText(elementId, text) {
-    await TestHelpers.tap(elementId);
-    return element(by.id(elementId)).typeText(text);
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async typeNumbers(elementId, text, submitLabel) {
-    await element(by.id(elementId)).replaceText(text.replace('\n', ''));
-    return element(by.label(submitLabel)).atIndex(0).tap();
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async typeTextAndHideKeyboard(elementId, text) {
-    if (device.getPlatform() === 'android') {
-      await TestHelpers.clearField(elementId);
-    }
-    await TestHelpers.typeText(elementId, text + '\n');
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async clearField(elementId) {
-    return element(by.id(elementId)).replaceText('');
-  }
-
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async tapAndLongPress(elementId) {
-    await TestHelpers.tap(elementId);
-    return element(by.id(elementId)).longPress(2000);
-  }
-
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async tapAndLongPressAtIndex(elementId, index) {
-    return element(by.id(elementId))
-      .atIndex(index || 0)
-      .longPress(2000);
-  }
-
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async replaceTextInField(elementId, text) {
-    return element(by.id(elementId)).replaceText(text);
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-
-  static tapAlertWithButton(text, index) {
-    if (device.getPlatform() === 'android') {
-      return element(by.text(text))
-        .atIndex(index || 0)
-        .tap();
-    }
-
-    return element(by.label(text)).atIndex(0).tap();
-  }
-
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async waitAndTapByLabel(text, timeout, index) {
-    await waitFor(element(by.label(text)))
-      .toBeVisible()
-      .withTimeout(timeout || 15000);
-
-    return element(by.label(text))
-      .atIndex(index || 0)
-      .tap();
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async tapWebviewElement(elementId) {
-    // this method only words on android: https://wix.github.io/Detox/docs/api/webviews/
-    return web.element(by.web.id(elementId)).tap();
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async swipe(elementId, direction, speed, percentage, xStart, yStart) {
-    await element(by.id(elementId)).swipe(
-      direction,
-      speed,
-      percentage,
-      xStart,
-      yStart,
-    );
-  }
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async swipeByLabel(elementId, direction, speed, percentage) {
-    await element(by.label(elementId)).swipe(direction, speed, percentage);
-  }
-
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async swipeByText(text, direction, speed, percentage) {
-    await element(by.text(text)).atIndex(0).swipe(direction, speed, percentage);
-  }
-
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async scrollTo(scrollViewId, edge) {
-    await element(by.id(scrollViewId)).scrollTo(edge);
-  }
-
-  /**
-   * @deprecated Use Guestures Class to accomplish this.
-   */
-  static async scrollUpTo(elementId, distance, direction) {
-    await element(by.id(elementId)).scroll(distance, direction);
-  }
-
-  static async openDeepLink(inputURL) {
-    await device.launchApp({
-      newInstance: true,
-      url: inputURL,
-      sourceApp: 'io.metamask',
-      launchArgs: {
-        fixtureServerPort: `${getFixturesServerPort()}`,
-        detoxURLBlacklistRegex: Utilities.BlacklistURLs,
-      },
-    });
-  }
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static async checkIfVisible(elementId) {
-    return await waitFor(element(by.id(elementId)))
-      .toBeVisible()
-      .withTimeout(15000);
-  }
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static async checkIfNotVisible(elementId) {
-    return await waitFor(element(by.id(elementId)))
-      .not.toBeVisible()
-      .withTimeout(10000);
-  }
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static async checkIfElementWithTextIsNotVisible(text) {
-    return await expect(element(by.text(text)).atIndex(0)).not.toBeVisible();
-  }
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static async checkIfElementNotToHaveText(elementId, text) {
-    await waitFor(element(by.id(elementId)))
-      .toBeVisible()
-      .withTimeout(10000);
-
-    return expect(element(by.id(elementId))).not.toHaveText(text);
-  }
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static async checkIfExists(elementId) {
-    await waitFor(element(by.id(elementId)))
-      .toBeVisible()
-      .withTimeout(10000);
-    return expect(element(by.id(elementId))).toExist();
-  }
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static async checkIfHasText(elementId, text) {
-    await waitFor(element(by.id(elementId)))
-      .toBeVisible()
-      .withTimeout(10000);
-
-    return expect(element(by.id(elementId))).toHaveText(text);
-  }
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static async checkIfElementWithTextIsVisible(text, index) {
-    return await waitFor(element(by.text(text)).atIndex(index || 0))
-      .toBeVisible()
-      .withTimeout(10000);
-  }
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static async checkIfElementByTextIsVisible(text, timeout = 25000) {
-    return await waitFor(element(by.text(text)))
-      .toBeVisible()
-      .withTimeout(timeout);
-  }
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static async checkIfElementHasString(elementID, text) {
-    return expect(element(by.id(elementID))).toString(text);
-  }
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static checkIfToggleIsOn(elementID) {
-    return expect(element(by.id(elementID))).toHaveToggleValue(true);
-  }
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static checkIfToggleIsOff(elementID) {
-    return expect(element(by.id(elementID))).toHaveToggleValue(false);
-  }
-
-  static relaunchApp() {
-    return this.launchApp({
-      newInstance: true,
-      launchArgs: {
-        detoxURLBlacklistRegex: Utilities.BlacklistURLs,
-      },
-    });
-  }
-
-  static delay(ms) {
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        resolve();
-      }, ms);
-    });
-  } // Detox has no waits for webview elements visibility. Here is the custom one.
-
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-  static async waitForWebElementToBeVisibleById(elementId, timeout = 15000) {
-    const start = Date.now();
-    while (Date.now() - start < timeout) {
-      try {
-        await expect(web.element(by.web.id(elementId))).toExist(); // Element found
-        return;
-      } catch {
-        // Element not found yet: waiting for 200ms
-        await new Promise((resolve) => setTimeout(resolve, 200));
-      }
-    }
-    throw new Error('Element with ' + elementId + ' not found');
-  }
-  /**
-   * @deprecated Use Assertion Class to accomplish this.
-   */
-
-  static async retry(maxAttempts, testLogic) {
-    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-      try {
-        await testLogic();
-        return;
-      } catch (error) {
-        if (attempt === maxAttempts) {
-          throw error;
-        } else {
-          logger.error('Test attempt failed', {
-            attempt,
-            error,
-          });
-        }
-      }
-    }
-  }
-
-  static async reverseServerPort() {
-    // Port forwarding is now handled automatically in FixtureUtils.startResourceWithRetry()
-    // and startMultiInstanceResourceWithRetry() when ports are allocated.
-    // This function is kept for backwards compatibility with existing tests.
-    // will be removed in future.
-    logger.debug(
-      'reverseServerPort() called but port forwarding is now automatic',
-    );
-    return;
-  }
-
-  static async terminateApp() {
-    return device.terminateApp();
-  }
-
-  static async launchApp(launchOptions) {
-    const config = await resolveConfig();
-    const platform = device.getPlatform();
-    // Use debug launch for configs explicitly named 'debug' (original behavior)
-    // AND for any non-CI config (e.g. ios.sim.main which uses ios.debug app locally).
-    // CI configs (*.ci) use release apps and the normal recovery-based launch.
-    if (
-      config.configurationName.endsWith('debug') ||
-      !config.configurationName.endsWith('.ci')
-    ) {
-      return this.launchAppForDebugBuild(platform, launchOptions);
-    }
-
-    return this.launchAppWithRecovery(launchOptions);
-  }
-
-  static async launchAppForDebugBuild(platform, launchOptions) {
-    const deepLinkUrl = this.getDeepLinkUrl(
-      this.getDevLauncherPackagerUrl(platform),
-    );
-
-    if (platform === 'ios') {
-      await this.launchAppWithRecovery(launchOptions);
-      return device.openURL({
-        url: deepLinkUrl,
-      });
-    }
-
-    return this.launchAppWithRecovery({
-      url: deepLinkUrl,
-      ...launchOptions,
-    });
-  }
-
-  static getAdbDeviceFlag() {
-    return device?.id ? `-s ${device.id}` : '';
-  }
-
-  static async logAndroidReversePorts(context) {
-    if (device.getPlatform() !== 'android') {
-      return;
-    }
-
-    try {
-      const command = `adb ${this.getAdbDeviceFlag()} reverse --list`;
-      const { stdout } = await execAsync(command);
-      logger.debug(
-        `[launch diagnostics] ${context} | adb reverse --list:\n${
-          stdout?.trim() || '(empty)'
-        }`,
-      );
-    } catch (error) {
-      logger.warn(
-        `[launch diagnostics] ${context} | Failed to list adb reverse ports`,
-        error,
-      );
-    }
-  }
-
-  static isAndroidReverseAddressInUseError(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return (
-      device.getPlatform() === 'android' &&
-      message.includes('adb') &&
-      message.includes('reverse tcp:') &&
-      message.includes('Address already in use')
-    );
-  }
-
-  static extractConflictingReversePort(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    const match = message.match(/reverse tcp:(\d+) tcp:\1/);
-    return match?.[1];
-  }
-
-  static async removeAndroidReversePort(port) {
-    try {
-      const command = `adb ${this.getAdbDeviceFlag()} reverse --remove tcp:${port}`;
-      await execAsync(command);
-      logger.warn(
-        `[launch recovery] Removed conflicting adb reverse tcp:${port}. Retrying app launch once.`,
-      );
-    } catch (removeError) {
-      const msg =
-        removeError instanceof Error
-          ? removeError.message
-          : String(removeError);
-      if (msg.includes('not found')) {
-        logger.warn(
-          `[launch recovery] Port tcp:${port} not in adb reverse table (likely TIME_WAIT or OS-level bind). Will still retry.`,
-        );
-      } else {
-        logger.error(
-          `[launch recovery] Unexpected error removing tcp:${port}: ${msg}`,
-        );
-      }
-    }
-  }
-
-  static async diagnoseEmulatorPort(port) {
-    const deviceFlag = this.getAdbDeviceFlag();
-    try {
-      // Dump socket state inside the emulator to identify what holds the port
-      const hexPort = parseInt(port, 10)
-        .toString(16)
-        .toUpperCase()
-        .padStart(4, '0');
-      const { stdout: tcpState } = await execAsync(
-        `adb ${deviceFlag} shell cat /proc/net/tcp6 2>/dev/null || adb ${deviceFlag} shell cat /proc/net/tcp 2>/dev/null`,
-      );
-      // Filter for the specific port (column 2 = local_address, port is after the colon in hex)
-      const relevantLines = tcpState
-        .split('\n')
-        .filter((line) => line.includes(`:${hexPort}`));
-      if (relevantLines.length > 0) {
-        logger.warn(
-          `[launch diagnostics] Emulator socket state for port ${port} (hex ${hexPort}):\n${relevantLines.join('\n')}`,
-        );
-        // TCP states: 01=ESTABLISHED, 02=SYN_SENT, 06=TIME_WAIT, 0A=LISTEN
-        logger.warn(
-          `[launch diagnostics] TCP state reference: 01=ESTABLISHED, 06=TIME_WAIT, 0A=LISTEN`,
-        );
-      } else {
-        logger.warn(
-          `[launch diagnostics] No socket entries found for port ${port} inside emulator`,
-        );
-      }
-    } catch (diagError) {
-      logger.debug(
-        `[launch diagnostics] Could not read emulator socket state: ${diagError.message}`,
-      );
-    }
-  }
-
-  static async launchAppWithRecovery(launchOptions) {
-    await this.logAndroidReversePorts('before device.launchApp');
-
-    try {
-      return await device.launchApp(launchOptions);
-    } catch (error) {
-      if (!this.isAndroidReverseAddressInUseError(error)) {
-        throw error;
-      }
-
-      const conflictingPort = this.extractConflictingReversePort(error);
-      if (!conflictingPort) {
-        throw error;
-      }
-
-      logger.warn(
-        `[launch recovery] Detected Detox adb reverse port collision on tcp:${conflictingPort}.`,
-      );
-      await this.logAndroidReversePorts(
-        'launch failure before reverse cleanup',
-      );
-      await this.diagnoseEmulatorPort(conflictingPort);
-      await this.removeAndroidReversePort(conflictingPort);
-      await this.logAndroidReversePorts('after reverse cleanup before retry');
-
-      return device.launchApp(launchOptions);
-    }
-  }
-
-  static getDeepLinkUrl(url) {
-    return `expo-metamask://expo-development-client/?url=${encodeURIComponent(
-      url,
-    )}`;
-  }
-
-  static getDevLauncherPackagerUrl(platform) {
-    const port =
-      process.env.METRO_PORT_E2E || process.env.WATCHER_PORT || '8081';
-    return `http://localhost:${port}/index.bundle?platform=${platform}&dev=true&minify=false&disableOnboarding=1`;
-  }
-}
diff --git a/tests/helpers/analytics/expectations/predict-open-position.analytics.ts b/tests/helpers/analytics/expectations/predict-open-position.analytics.ts
index 4d5c209a8af6..7f9186876886 100644
--- a/tests/helpers/analytics/expectations/predict-open-position.analytics.ts
+++ b/tests/helpers/analytics/expectations/predict-open-position.analytics.ts
@@ -14,7 +14,7 @@ export const predictOpenPositionAnalyticsExpectations: AnalyticsExpectations = {
     {
       name: PREDICT_FEED_VIEWED,
       containProperties: {
-        predict_feed_tab: 'world-cup',
+        predict_feed_tab: 'trending',
         entry_point: 'homepage_positions',
       },
     },
diff --git a/tests/jest.e2e.detox.config.js b/tests/jest.e2e.detox.config.js
index ed069dc1e0ef..7c7478ab9bfe 100644
--- a/tests/jest.e2e.detox.config.js
+++ b/tests/jest.e2e.detox.config.js
@@ -1,7 +1,7 @@
 /* eslint-disable import-x/no-commonjs */
 // dotenv never overrides existing vars — first file loaded wins on collisions.
 // Load .e2e.env first so test accounts/flags take precedence, then .js.env
-// for WATCHER_PORT used by helpers.js and general.flow.ts at test runtime.
+// for WATCHER_PORT used by DetoxAppLaunch and general.flow.ts at test runtime.
 require('dotenv').config({ path: '.e2e.env' });
 require('dotenv').config({ path: '.js.env' });
 
diff --git a/tests/llm-workflow/README.md b/tests/llm-workflow/README.md
new file mode 100644
index 000000000000..dd28850558ab
--- /dev/null
+++ b/tests/llm-workflow/README.md
@@ -0,0 +1,173 @@
+# MetaMask Mobile LLM Workflow
+
+Local CLI tooling for LLM agents to launch and interact with MetaMask Mobile on an iOS Simulator. The workflow uses the `mm` CLI and a persistent local HTTP daemon from `@metamask/client-mcp-core`.
+
+This MVP supports **prod only**. It operates on the app and wallet state already installed on the simulator. It does not start test infrastructure or create wallet state.
+
+## Architecture
+
+```text
+LLM Agent / Developer
+    │ yarn mm commands
+    ▼
+@metamask/client-mcp-core CLI and daemon
+    │
+    ├─ MetaMaskMobileSessionManager
+    ├─ MobilePlatformDriver
+    └─ KnowledgeStore
+    │
+    ▼
+iOS Simulator + @metamask/device-mcp
+```
+
+| Component       | Location                         | Responsibility                                                                      |
+| --------------- | -------------------------------- | ----------------------------------------------------------------------------------- |
+| Daemon          | `daemon.ts`                      | Starts the local server and creates the prod workflow context.                      |
+| Session manager | `metamask-provider.ts`           | Resolves the simulator/app, manages launch and cleanup, and exposes mobile drivers. |
+| Prerequisites   | `ios/prerequisites.ts`           | Validates Xcode, simulator, app identity, install safety, and optional Metro.       |
+| State snapshot  | `capabilities/state-snapshot.ts` | Reports current app state through the mobile platform driver.                       |
+
+## Prerequisites
+
+- Node.js and Yarn versions required by this repository
+- Xcode with command-line tools
+- An iOS Simulator
+- `idb` and `idb-companion` (`brew tap facebook/fb && brew install idb-companion && pip3 install fb-idb`)
+- MetaMask already installed on the target simulator
+
+Run `yarn mm:doctor` to verify the iOS toolchain (Xcode, `idb`, `idb_companion`, and a booted simulator) before launching. It prints a PASS/FAIL report with install commands for anything missing and exits non-zero when a prerequisite is absent.
+
+`mm launch` does not build MetaMask and does not search local build outputs or Xcode DerivedData. You must install the app separately on the simulator before launching.
+
+## Basic Workflow
+
+```bash
+# Boot a simulator if needed
+xcrun simctl boot <UDID>
+
+# Launch the installed app while preserving its current state
+yarn mm launch
+
+# Optionally choose a simulator
+yarn mm launch --device-id <UDID>
+
+# Install a specific build before launching
+yarn mm launch --app-bundle ios/build/MetaMask.app
+
+# Observe and interact
+yarn mm describe-screen
+yarn mm click e1
+yarn mm type e2 "text"
+yarn mm screenshot --name "result"
+
+# Cleanup
+yarn mm cleanup
+yarn mm cleanup --shutdown
+```
+
+There is no alternate launch context. Supplying `--context e2e` is rejected clearly.
+
+## Installed-App Safety
+
+- The already-installed MetaMask app is reused without installation or data reset.
+- If no app is installed on the simulator, launch fails with instructions to install one before launching.
+- When launching, the workflow performs internal safety checks on the app's identity. If an identity mismatch is detected, you should reuse the existing installed app or install a matching app outside of the `mm` workflow.
+
+## Metro Watch Mode
+
+Metro attachment is available for development builds. The workflow is **attach-only** — it never spawns Metro. Start Metro separately and provide its port with either the flag or the environment variable (the flag wins when both are set):
+
+```bash
+yarn watch:clean
+yarn mm launch --metro-port 8081
+
+# Equivalent, still supported
+MM_METRO_PORT=8081 yarn mm launch
+```
+
+If Metro is not reachable on the given port, launch fails with `MM_INVALID_CONFIG` instructing you to run `yarn watch:clean`. Release/prod builds have no Hermes inspector; Metro attach requires a dev build.
+
+### Pure-Attach Behavior
+
+When the app is already running and healthily attached to Metro (a Hermes debug target is found at `/json` matching the app bundle ID), `mm launch` connects **without relaunching** — no deep-link, no app restart. This prevents the "reload required" overlay and crashes caused by unnecessary re-launches.
+
+If the app is running but **not** healthily attached (stale, crashed, or stuck on an overlay), the workflow terminates and re-launches via the deep link, then verifies JS liveness via a CDP `Runtime.evaluate` probe.
+
+On a fresh-booted simulator where the accessibility bridge was just enabled, a one-time relaunch is performed to ensure the accessibility tree is valid.
+
+On Node 20, CDP WebSocket use may require:
+
+```bash
+NODE_OPTIONS="--experimental-websocket" yarn mm launch --metro-port 8081
+```
+
+## Destructive Launch Flags
+
+`--reinstall` and `--reset-app-data` replace the installed app and destroy the wallet state it holds. `--allow-fox-code-mismatch` bypasses the app-identity guard and may make existing wallet/keychain data unreadable. This workflow is prod-only, so all three are guarded:
+
+- `--reinstall` and `--reset-app-data` are rejected unless `--app-bundle` is also supplied, because the installed app is otherwise the only copy and would be destroyed by the uninstall step.
+- Installing a bundle whose `fox_code` differs from the installed app is rejected unless `--reinstall` or `--allow-fox-code-mismatch` is passed.
+- A warning is printed to stderr whenever a destructive flag is honored.
+
+```bash
+# Replace the installed app with a local build, discarding wallet state
+yarn mm launch --app-bundle ios/build/MetaMask.app --reinstall
+```
+
+## Force Launch
+
+If a session is already active, `mm launch` rejects with `MM_SESSION_ALREADY_RUNNING`. Use `--force` to clean up the existing session (terminate the app, clear session state) and launch a new one in a single step:
+
+```bash
+yarn mm launch --force
+```
+
+## Commands
+
+### Lifecycle
+
+- `yarn mm launch`: launch the installed app in its current state
+- `yarn mm cleanup`: terminate the app and clear the active session
+- `yarn mm status`: inspect daemon/session status
+- `yarn mm stop`: stop the daemon
+
+### Interaction
+
+- `yarn mm describe-screen`
+- `yarn mm click <a11yRef>` or `--testid <id>`
+- `yarn mm type <a11yRef> <text>` or `--testid <id>`
+- `yarn mm wait-for`
+- `yarn mm get-text`
+- `yarn mm screenshot`
+- `yarn mm run-steps '<json>'`
+- `yarn mm cdp Runtime.evaluate '<json>'` when attached to Metro
+
+### Knowledge Store
+
+- `yarn mm knowledge-search <query>`
+- `yarn mm knowledge-last`
+- `yarn mm knowledge-sessions`
+- `yarn mm knowledge-summarize`
+
+## Operational Notes
+
+- The daemon binds only to `127.0.0.1` and records its worktree-local state in `.mm-server`.
+- The daemon shuts down after 30 minutes of inactivity and writes logs to `.mm-daemon.log`.
+- Android and browser-only navigation/tab APIs are not supported by this mobile workflow.
+- Accessibility references are ephemeral; call `describe-screen` again after navigation or major UI changes.
+- Preserve sensitive installed wallet state. The workflow operates purely by reusing the installed app.
+
+## Troubleshooting
+
+Launch errors use the core `ErrorCode` set, because `@metamask/client-mcp-core` only preserves a consumer-thrown code when it is a known core code and collapses anything else into `MM_LAUNCH_FAILED`. The iOS-specific detail is carried in the message and remediation text.
+
+| Error                     | Resolution                                                                                                                                                                                                                                                        |
+| ------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `MM_DEPENDENCIES_MISSING` | Xcode command-line tools or `idb` are missing. Run `yarn mm:doctor`, then install `idb` with `brew tap facebook/fb && brew install idb-companion && pip3 install fb-idb`.                                                                                         |
+| `MM_DEVICE_NOT_AVAILABLE` | No simulator is booted, the given UDID does not exist, or `simctl` failed. Run `xcrun simctl list devices` and boot one.                                                                                                                                          |
+| `MM_INVALID_CONFIG`       | The launch options are not usable: no app installed and no `--app-bundle`, a destructive flag without `--app-bundle`, a `fox_code` mismatch, an unreachable Metro port, or an E2E-only option in this prod-only workflow. Read the remediation text in the error. |
+| `MM_LAUNCH_FAILED`        | The app or platform driver failed to start. Run `yarn mm cleanup` and retry.                                                                                                                                                                                      |
+| `MM_NO_ACTIVE_SESSION`    | Run `yarn mm launch`.                                                                                                                                                                                                                                             |
+| `MM_TARGET_NOT_FOUND`     | Run `yarn mm describe-screen` and use fresh refs.                                                                                                                                                                                                                 |
+
+For the complete agent-facing interaction guide, see `.claude/skills/metamask-mobile-visual-testing/SKILL.md`. Mobile platform support is part of `@metamask/client-mcp-core`; `@metamask/device-mcp` supplies the device backend.
diff --git a/tests/llm-workflow/__tests__/accessibility-bridge.test.ts b/tests/llm-workflow/__tests__/accessibility-bridge.test.ts
new file mode 100644
index 000000000000..e3996010b6ed
--- /dev/null
+++ b/tests/llm-workflow/__tests__/accessibility-bridge.test.ts
@@ -0,0 +1,125 @@
+/* eslint-disable import-x/no-nodejs-modules */
+import { execFileSync } from 'node:child_process';
+
+import {
+  ACCESSIBILITY_SETTLE_MS,
+  ensureAccessibilityBridgeEnabled,
+  readAccessibilityBridge,
+} from '../ios/accessibility-bridge';
+
+jest.mock('node:child_process', () => ({ execFileSync: jest.fn() }));
+
+const mockExecFileSync = jest.mocked(execFileSync);
+
+describe('accessibility-bridge', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('ACCESSIBILITY_SETTLE_MS', () => {
+    it('exports a positive conservative settle constant', () => {
+      expect(ACCESSIBILITY_SETTLE_MS).toBeGreaterThan(0);
+      expect(ACCESSIBILITY_SETTLE_MS).toBeLessThanOrEqual(1000);
+    });
+  });
+
+  describe('readAccessibilityBridge', () => {
+    it('returns true when the flag is enabled (value "1")', () => {
+      mockExecFileSync.mockReturnValue('1\n');
+
+      expect(readAccessibilityBridge('SIM-UDID')).toBe(true);
+
+      expect(mockExecFileSync).toHaveBeenCalledWith(
+        'xcrun',
+        [
+          'simctl',
+          'spawn',
+          'SIM-UDID',
+          'defaults',
+          'read',
+          'com.apple.Accessibility',
+          'ApplicationAccessibilityEnabled',
+        ],
+        { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] },
+      );
+    });
+
+    it('returns true when the flag is enabled (value "true")', () => {
+      mockExecFileSync.mockReturnValue('true\n');
+
+      expect(readAccessibilityBridge('SIM-UDID')).toBe(true);
+    });
+
+    it('returns false when the key does not exist (fresh-booted sim)', () => {
+      const error = new Error(
+        'Domain com.apple.Accessibility does not exist',
+      ) as NodeJS.ErrnoException;
+      mockExecFileSync.mockImplementation(() => {
+        throw error;
+      });
+
+      expect(readAccessibilityBridge('SIM-UDID')).toBe(false);
+    });
+
+    it('returns false when the value is "0"', () => {
+      mockExecFileSync.mockReturnValue('0\n');
+
+      expect(readAccessibilityBridge('SIM-UDID')).toBe(false);
+    });
+  });
+
+  describe('ensureAccessibilityBridgeEnabled', () => {
+    it('fresh sim: reads false, writes true, returns wasAlreadyOn=false', () => {
+      mockExecFileSync
+        .mockImplementationOnce(() => {
+          throw new Error('Domain does not exist');
+        })
+        .mockReturnValueOnce(Buffer.from(''));
+
+      const result = ensureAccessibilityBridgeEnabled('SIM-UDID');
+
+      expect(result).toEqual({ wasAlreadyOn: false });
+      expect(mockExecFileSync).toHaveBeenCalledTimes(2);
+
+      const writeCall = mockExecFileSync.mock.calls[1];
+      expect(writeCall[0]).toBe('xcrun');
+      expect(writeCall[1]).toEqual([
+        'simctl',
+        'spawn',
+        'SIM-UDID',
+        'defaults',
+        'write',
+        'com.apple.Accessibility',
+        'ApplicationAccessibilityEnabled',
+        '-bool',
+        'true',
+      ]);
+    });
+
+    it('warm sim: already true, does not write, returns wasAlreadyOn=true', () => {
+      mockExecFileSync.mockReturnValue('1\n');
+
+      const result = ensureAccessibilityBridgeEnabled('SIM-UDID');
+
+      expect(result).toEqual({ wasAlreadyOn: true });
+      expect(mockExecFileSync).toHaveBeenCalledTimes(1);
+    });
+
+    it('externally disabled: reads false, writes true, returns wasAlreadyOn=false', () => {
+      mockExecFileSync
+        .mockReturnValueOnce('0\n')
+        .mockReturnValueOnce(Buffer.from(''));
+
+      const result = ensureAccessibilityBridgeEnabled('SIM-UDID');
+
+      expect(result).toEqual({ wasAlreadyOn: false });
+      expect(mockExecFileSync).toHaveBeenCalledTimes(2);
+
+      const writeCall = mockExecFileSync.mock.calls[1];
+      const writeArgs = writeCall[1] as string[];
+      expect(writeArgs).toContain('write');
+      expect(writeArgs).toContain('-bool');
+      expect(writeArgs).toContain('true');
+    });
+  });
+});
diff --git a/tests/llm-workflow/__tests__/daemon.test.ts b/tests/llm-workflow/__tests__/daemon.test.ts
new file mode 100644
index 000000000000..770a0e95cbf9
--- /dev/null
+++ b/tests/llm-workflow/__tests__/daemon.test.ts
@@ -0,0 +1,84 @@
+/* eslint-disable import-x/no-extraneous-dependencies */
+import {
+  createServer,
+  KnowledgeStore,
+  setKnowledgeStore,
+} from '@metamask/client-mcp-core';
+import { createMetaMaskMobileContext } from '../capabilities';
+
+jest.mock('@metamask/client-mcp-core', () => ({
+  createServer: jest.fn(),
+  KnowledgeStore: jest.fn().mockImplementation(() => ({})),
+  setKnowledgeStore: jest.fn(),
+}));
+jest.mock('../metamask-provider', () => ({
+  MetaMaskMobileSessionManager: jest.fn().mockImplementation(() => ({
+    getPlatformDriver: jest.fn(),
+  })),
+}));
+jest.mock('../capabilities', () => ({
+  createMetaMaskMobileContext: jest.fn(() => ({
+    config: { environment: 'prod' },
+    stateSnapshot: {},
+  })),
+}));
+jest.mock('../resolve-repo-root', () => ({
+  resolveRepoRoot: jest.fn(() => '/repo/root'),
+}));
+
+const mockCreateServer = jest.mocked(createServer);
+const mockKnowledgeStore = jest.mocked(KnowledgeStore);
+const mockSetKnowledgeStore = jest.mocked(setKnowledgeStore);
+const mockCreateMetaMaskMobileContext = jest.mocked(
+  createMetaMaskMobileContext,
+);
+
+interface ServerConfig {
+  sessionManager: { getPlatformDriver: () => unknown };
+  knowledgeStore: unknown;
+  idleShutdownMs: number;
+  logFilePath: string;
+  contextFactory: () => Promise<Record<string, unknown>>;
+}
+
+function importDaemon(): ServerConfig {
+  mockCreateServer.mockReturnValue({
+    start: jest.fn().mockReturnValue(new Promise(() => undefined)),
+  } as never);
+
+  jest.isolateModules(() => {
+    jest.requireActual('../daemon');
+  });
+
+  return mockCreateServer.mock.calls[0][0] as unknown as ServerConfig;
+}
+
+describe('daemon', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('registers one knowledge store and configures the server', () => {
+    const config = importDaemon();
+
+    expect(mockKnowledgeStore).toHaveBeenCalledTimes(1);
+    expect(mockSetKnowledgeStore).toHaveBeenCalledWith(config.knowledgeStore);
+    expect(config.idleShutdownMs).toBe(30 * 60 * 1000);
+    expect(config.logFilePath).toBe('/repo/root/.mm-daemon.log');
+  });
+
+  it('constructs only the prod workflow context without allocated E2E ports', async () => {
+    const config = importDaemon();
+
+    const context = await config.contextFactory();
+
+    expect(mockCreateMetaMaskMobileContext).toHaveBeenCalledWith({
+      getPlatformDriver: expect.any(Function),
+    });
+    expect(context).toEqual({
+      config: { environment: 'prod' },
+      stateSnapshot: {},
+    });
+    expect(context).not.toHaveProperty('allocatedPorts');
+  });
+});
diff --git a/tests/llm-workflow/__tests__/doctor.test.ts b/tests/llm-workflow/__tests__/doctor.test.ts
new file mode 100644
index 000000000000..d44cdf790110
--- /dev/null
+++ b/tests/llm-workflow/__tests__/doctor.test.ts
@@ -0,0 +1,139 @@
+/* eslint-disable import-x/no-nodejs-modules */
+import { execFileSync } from 'node:child_process';
+import { collectDoctorReport, formatDoctorReport } from '../ios/doctor';
+
+jest.mock('node:child_process', () => ({ execFileSync: jest.fn() }));
+
+const mockedExecFileSync = jest.mocked(execFileSync);
+
+interface Availability {
+  simctl?: boolean;
+  idb?: boolean;
+  idbCompanion?: boolean;
+  bootedSimulators?: number;
+}
+
+function notInstalled(): never {
+  const error = new Error('spawn ENOENT') as NodeJS.ErrnoException;
+  error.code = 'ENOENT';
+  throw error;
+}
+
+function mockEnvironment(options: Availability): void {
+  const {
+    simctl = true,
+    idb = true,
+    idbCompanion = true,
+    bootedSimulators = 1,
+  } = options;
+
+  mockedExecFileSync.mockImplementation((file, args) => {
+    const values = (args as string[]) ?? [];
+    const name = String(file);
+
+    if (name.endsWith('idb_companion')) {
+      return idbCompanion ? '' : notInstalled();
+    }
+    if (name.endsWith('idb')) {
+      return idb ? '' : notInstalled();
+    }
+    if (name === 'xcrun' && values[1] === 'help') {
+      return simctl ? '' : notInstalled();
+    }
+    if (name === 'xcrun' && values[1] === 'list') {
+      const devices = Array.from({ length: bootedSimulators }, () => ({
+        state: 'Booted',
+      }));
+      return JSON.stringify({ devices: { 'iOS 17': devices } });
+    }
+    throw new Error(`Unexpected command: ${name} ${values.join(' ')}`);
+  });
+}
+
+describe('collectDoctorReport', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('reports ok when every prerequisite is satisfied', () => {
+    mockEnvironment({});
+
+    const report = collectDoctorReport();
+
+    expect(report.ok).toBe(true);
+    expect(report.checks.every((check) => check.ok)).toBe(true);
+  });
+
+  it('flags a missing idb with remediation', () => {
+    mockEnvironment({ idb: false });
+
+    const report = collectDoctorReport();
+
+    expect(report.ok).toBe(false);
+    const idbCheck = report.checks.find((check) =>
+      check.name.includes('idb (fb-idb'),
+    );
+    expect(idbCheck?.ok).toBe(false);
+    expect(idbCheck?.remediation).toContain('idb-companion');
+  });
+
+  it('treats an installed binary as available even when its probe exits non-zero', () => {
+    // Regression: `idb_companion --version` exits 0, but `idb_companion --help`
+    // exits 1. A real (non-ENOENT) failure must still count as installed.
+    mockedExecFileSync.mockImplementation((file, args) => {
+      const name = String(file);
+      const values = (args as string[]) ?? [];
+      if (name.endsWith('idb_companion')) {
+        const error = new Error('non-zero exit') as Error & { status: number };
+        error.status = 1;
+        throw error;
+      }
+      if (name.endsWith('idb')) return '';
+      if (name === 'xcrun' && values[1] === 'help') return '';
+      if (name === 'xcrun' && values[1] === 'list') {
+        return JSON.stringify({ devices: { 'iOS 17': [{ state: 'Booted' }] } });
+      }
+      throw new Error(`Unexpected command: ${name}`);
+    });
+
+    const report = collectDoctorReport();
+
+    const companionCheck = report.checks.find((check) =>
+      check.name.includes('idb_companion'),
+    );
+    expect(companionCheck?.ok).toBe(true);
+    expect(report.ok).toBe(true);
+  });
+
+  it('flags no booted simulator without failing the idb check', () => {
+    mockEnvironment({ bootedSimulators: 0 });
+
+    const report = collectDoctorReport();
+
+    expect(report.ok).toBe(false);
+    const simCheck = report.checks.find((check) =>
+      check.name.includes('Booted iOS Simulator'),
+    );
+    expect(simCheck?.ok).toBe(false);
+    const idbCheck = report.checks.find((check) =>
+      check.name.includes('idb (fb-idb'),
+    );
+    expect(idbCheck?.ok).toBe(true);
+  });
+});
+
+describe('formatDoctorReport', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders PASS/FAIL lines and a summary', () => {
+    mockEnvironment({ idb: false });
+
+    const output = formatDoctorReport(collectDoctorReport());
+
+    expect(output).toContain('[FAIL] idb (fb-idb CLI)');
+    expect(output).toContain('[PASS] Xcode command-line tools');
+    expect(output).toContain('yarn mm:doctor');
+  });
+});
diff --git a/tests/llm-workflow/__tests__/factory.test.ts b/tests/llm-workflow/__tests__/factory.test.ts
new file mode 100644
index 000000000000..bc512e30f3f7
--- /dev/null
+++ b/tests/llm-workflow/__tests__/factory.test.ts
@@ -0,0 +1,49 @@
+import { createMetaMaskMobileContext } from '../capabilities/factory';
+import { MetaMaskMobileStateSnapshotCapability } from '../capabilities/state-snapshot';
+
+jest.mock('@metamask/client-mcp-core', () => ({}));
+jest.mock('../capabilities/state-snapshot');
+
+const MockedStateSnapshotCapability =
+  MetaMaskMobileStateSnapshotCapability as jest.MockedClass<
+    typeof MetaMaskMobileStateSnapshotCapability
+  >;
+
+describe('createMetaMaskMobileContext', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('creates a prod context with only state snapshot support', () => {
+    const getPlatformDriver = () => undefined;
+
+    const context = createMetaMaskMobileContext({ getPlatformDriver });
+
+    expect(context.config).toEqual({
+      extensionName: 'MetaMask',
+      defaultPassword: 'correct horse battery staple',
+      artifactsDir: 'test-artifacts',
+      environment: 'prod',
+      defaultChainId: 1,
+    });
+    expect(context.stateSnapshot).toBeDefined();
+    expect(context.fixture).toBeUndefined();
+    expect(context.chain).toBeUndefined();
+    expect(context.contractSeeding).toBeUndefined();
+    expect(context.mockServer).toBeUndefined();
+    expect(MockedStateSnapshotCapability).toHaveBeenCalledWith({
+      getPlatformDriver,
+    });
+  });
+
+  it('preserves prod while applying supported configuration overrides', () => {
+    const context = createMetaMaskMobileContext({
+      config: { artifactsDir: 'custom-artifacts', defaultChainId: 59144 },
+      getPlatformDriver: () => undefined,
+    });
+
+    expect(context.config.environment).toBe('prod');
+    expect(context.config.artifactsDir).toBe('custom-artifacts');
+    expect(context.config.defaultChainId).toBe(59144);
+  });
+});
diff --git a/tests/llm-workflow/__tests__/hermes-health.test.ts b/tests/llm-workflow/__tests__/hermes-health.test.ts
new file mode 100644
index 000000000000..058b40b0c49d
--- /dev/null
+++ b/tests/llm-workflow/__tests__/hermes-health.test.ts
@@ -0,0 +1,323 @@
+import {
+  fetchDiscoveryTargets,
+  selectHermesTarget,
+  type HermesTarget,
+} from '@metamask/device-mcp';
+
+import { probeHermesHealthy, verifyJsLiveness } from '../ios/hermes-health';
+
+jest.mock('@metamask/device-mcp', () => ({
+  fetchDiscoveryTargets: jest.fn(),
+  selectHermesTarget: jest.fn(),
+}));
+
+const mockFetchDiscoveryTargets = jest.mocked(fetchDiscoveryTargets);
+const mockSelectHermesTarget = jest.mocked(selectHermesTarget);
+
+const healthyTarget: HermesTarget = {
+  id: 'target-1',
+  title: 'Hermes React Native',
+  appId: 'io.metamask.MetaMask',
+  webSocketDebuggerUrl: 'ws://localhost:8081/inspector/page/1',
+  reactNative: { logicalDeviceId: 'SIM-UDID' },
+};
+
+const unhealthySelection = {
+  ok: false as const,
+  code: 'HERMES_TARGET_NOT_FOUND',
+  message: 'No Hermes debug target found',
+};
+
+describe('hermes-health', () => {
+  let stderrSpy: jest.SpyInstance;
+
+  afterEach(() => {
+    stderrSpy?.mockRestore();
+    jest.useRealTimers();
+  });
+
+  describe('probeHermesHealthy', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+      jest.useFakeTimers();
+      stderrSpy = jest
+        .spyOn(process.stderr, 'write')
+        .mockImplementation(() => true);
+      mockSelectHermesTarget.mockReturnValue(unhealthySelection);
+    });
+
+    it('returns healthy when a matching target is found on first poll', async () => {
+      mockFetchDiscoveryTargets.mockResolvedValue([healthyTarget]);
+      mockSelectHermesTarget.mockReturnValue({
+        ok: true,
+        target: healthyTarget,
+      });
+
+      const result = await probeHermesHealthy({
+        port: 8081,
+        appId: 'io.metamask.MetaMask',
+        intervalMs: 10,
+        ceilingMs: 1_000,
+      });
+
+      expect(result.healthy).toBe(true);
+      expect(result.target).toEqual(healthyTarget);
+      expect(result.pinnedDeviceId).toBe('SIM-UDID');
+    });
+
+    it('returns unhealthy when target is not found (release build with empty /json)', async () => {
+      mockFetchDiscoveryTargets.mockResolvedValue([]);
+      mockSelectHermesTarget.mockReturnValue({
+        ok: false,
+        code: 'HERMES_TARGET_NOT_FOUND',
+        message: 'No Hermes debug target found',
+      });
+
+      const promise = probeHermesHealthy({
+        port: 8081,
+        appId: 'io.metamask.MetaMask',
+        intervalMs: 10,
+        ceilingMs: 50,
+      });
+
+      await jest.advanceTimersByTimeAsync(60);
+      const result = await promise;
+
+      expect(result.healthy).toBe(false);
+      expect(result.reason).toBe('HERMES_TARGET_NOT_FOUND');
+    });
+
+    it('returns unhealthy when multiple devices are ambiguous', async () => {
+      mockFetchDiscoveryTargets.mockResolvedValue([healthyTarget]);
+      mockSelectHermesTarget.mockReturnValue({
+        ok: false,
+        code: 'HERMES_MULTIPLE_DEVICES',
+        message: 'Ambiguous Hermes target',
+      });
+
+      const promise = probeHermesHealthy({
+        port: 8081,
+        appId: 'io.metamask.MetaMask',
+        intervalMs: 10,
+        ceilingMs: 50,
+      });
+
+      await jest.advanceTimersByTimeAsync(60);
+      const result = await promise;
+
+      expect(result.healthy).toBe(false);
+      expect(result.reason).toBe('HERMES_MULTIPLE_DEVICES');
+    });
+
+    it('retries until a target appears after initial failure', async () => {
+      mockFetchDiscoveryTargets
+        .mockRejectedValueOnce(new Error('fetch failed'))
+        .mockResolvedValueOnce([healthyTarget]);
+      mockSelectHermesTarget.mockReturnValue({
+        ok: true,
+        target: healthyTarget,
+      });
+
+      const promise = probeHermesHealthy({
+        port: 8081,
+        appId: 'io.metamask.MetaMask',
+        intervalMs: 10,
+        ceilingMs: 2_000,
+      });
+
+      await jest.advanceTimersByTimeAsync(20);
+      const result = await promise;
+
+      expect(result.healthy).toBe(true);
+      expect(mockFetchDiscoveryTargets).toHaveBeenCalledTimes(2);
+    });
+
+    it('returns unhealthy when fetchDiscoveryTargets throws persistently', async () => {
+      mockFetchDiscoveryTargets.mockRejectedValue(new Error('ECONNREFUSED'));
+
+      const promise = probeHermesHealthy({
+        port: 8081,
+        appId: 'io.metamask.MetaMask',
+        intervalMs: 10,
+        ceilingMs: 50,
+      });
+
+      await jest.advanceTimersByTimeAsync(60);
+      const result = await promise;
+
+      expect(result.healthy).toBe(false);
+      expect(result.reason).toContain('ECONNREFUSED');
+    });
+  });
+
+  describe('verifyJsLiveness', () => {
+    let originalWebSocket: typeof globalThis.WebSocket | undefined;
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+      jest.useRealTimers();
+      stderrSpy = jest
+        .spyOn(process.stderr, 'write')
+        .mockImplementation(() => true);
+      originalWebSocket = globalThis.WebSocket;
+    });
+
+    afterEach(() => {
+      if (originalWebSocket === undefined) {
+        delete (globalThis as Partial<typeof globalThis>).WebSocket;
+      } else {
+        globalThis.WebSocket = originalWebSocket;
+      }
+    });
+
+    it('returns false when global WebSocket is unavailable (Node 20 without --experimental-websocket)', async () => {
+      delete (globalThis as Partial<typeof globalThis>).WebSocket;
+
+      const result = await verifyJsLiveness(
+        'ws://localhost:8081/inspector/page/1',
+        1_000,
+      );
+
+      expect(result).toBe(false);
+      expect(stderrSpy).toHaveBeenCalledWith(
+        expect.stringContaining('global WebSocket unavailable'),
+      );
+    });
+
+    it('returns true when a CDP Runtime.evaluate result arrives', async () => {
+      const mockWs = createMockWebSocket();
+      globalThis.WebSocket = mockWs.constructor as unknown as typeof WebSocket;
+
+      const promise = verifyJsLiveness(
+        'ws://localhost:8081/inspector/page/1',
+        2_000,
+      );
+
+      mockWs.simulateOpen();
+      mockWs.simulateMessage(JSON.stringify({ id: 1, result: { value: 2 } }));
+
+      await expect(promise).resolves.toBe(true);
+    });
+
+    it('returns false on timeout when no CDP response arrives', async () => {
+      jest.useFakeTimers();
+      const mockWs = createMockWebSocket();
+      globalThis.WebSocket = mockWs.constructor as unknown as typeof WebSocket;
+
+      const promise = verifyJsLiveness(
+        'ws://localhost:8081/inspector/page/1',
+        50,
+      );
+
+      mockWs.simulateOpen();
+      await jest.advanceTimersByTimeAsync(60);
+
+      await expect(promise).resolves.toBe(false);
+      jest.useRealTimers();
+    });
+
+    it('returns false when the WebSocket errors', async () => {
+      const mockWs = createMockWebSocket();
+      globalThis.WebSocket = mockWs.constructor as unknown as typeof WebSocket;
+
+      const promise = verifyJsLiveness(
+        'ws://localhost:8081/inspector/page/1',
+        2_000,
+      );
+
+      mockWs.simulateError();
+
+      await expect(promise).resolves.toBe(false);
+    });
+
+    it('returns false when the WebSocket closes before a result', async () => {
+      const mockWs = createMockWebSocket();
+      globalThis.WebSocket = mockWs.constructor as unknown as typeof WebSocket;
+
+      const promise = verifyJsLiveness(
+        'ws://localhost:8081/inspector/page/1',
+        2_000,
+      );
+
+      mockWs.simulateOpen();
+      mockWs.simulateClose();
+
+      await expect(promise).resolves.toBe(false);
+    });
+
+    it('ignores non-JSON messages and waits for the correct response', async () => {
+      const mockWs = createMockWebSocket();
+      globalThis.WebSocket = mockWs.constructor as unknown as typeof WebSocket;
+
+      const promise = verifyJsLiveness(
+        'ws://localhost:8081/inspector/page/1',
+        2_000,
+      );
+
+      mockWs.simulateOpen();
+      mockWs.simulateMessage('not-json');
+      mockWs.simulateMessage(
+        JSON.stringify({ id: 99, result: { value: 'other' } }),
+      );
+      mockWs.simulateMessage(JSON.stringify({ id: 1, result: { value: 2 } }));
+
+      await expect(promise).resolves.toBe(true);
+    });
+  });
+});
+
+interface MockWebSocketHandler {
+  onopen: (() => void) | null;
+  onmessage: ((event: { data: string }) => void) | null;
+  onerror: (() => void) | null;
+  onclose: (() => void) | null;
+  send: (data: string) => void;
+  close: () => void;
+  readyState: number;
+}
+
+interface MockWebSocketInstance {
+  constructor: new (url: string) => unknown;
+  simulateOpen(): void;
+  simulateMessage(data: string): void;
+  simulateError(): void;
+  simulateClose(): void;
+}
+
+function createMockWebSocket(): MockWebSocketInstance {
+  const instances: MockWebSocketHandler[] = [];
+
+  class MockWebSocket {
+    onopen: (() => void) | null = null;
+    onmessage: ((event: { data: string }) => void) | null = null;
+    onerror: (() => void) | null = null;
+    onclose: (() => void) | null = null;
+    send = jest.fn() as jest.MockedFunction<(data: string) => void>;
+    close = jest.fn() as jest.MockedFunction<() => void>;
+    readyState = 0;
+
+    constructor(_url: string) {
+      instances.push(this);
+    }
+  }
+
+  const last = (): MockWebSocketHandler => instances[instances.length - 1];
+
+  return {
+    constructor: MockWebSocket as unknown as new (url: string) => unknown,
+    simulateOpen() {
+      const inst = last();
+      inst.readyState = 1;
+      inst.onopen?.();
+    },
+    simulateMessage(data: string) {
+      last().onmessage?.({ data });
+    },
+    simulateError() {
+      last().onerror?.();
+    },
+    simulateClose() {
+      last().onclose?.();
+    },
+  };
+}
diff --git a/tests/llm-workflow/__tests__/launcher-types.test.ts b/tests/llm-workflow/__tests__/launcher-types.test.ts
new file mode 100644
index 000000000000..546f4fde0707
--- /dev/null
+++ b/tests/llm-workflow/__tests__/launcher-types.test.ts
@@ -0,0 +1,36 @@
+/* eslint-disable import-x/no-extraneous-dependencies */
+import { ErrorCodes } from '@metamask/client-mcp-core';
+
+import { IOSLaunchError, type IOSLaunchErrorCode } from '../launcher-types';
+
+// Runtime mirror of IOSLaunchErrorCode, so a newly added code is checked here.
+const IOS_LAUNCH_ERROR_CODES: IOSLaunchErrorCode[] = [
+  'MM_LAUNCH_FAILED',
+  'MM_SESSION_ALREADY_RUNNING',
+  'MM_DEPENDENCIES_MISSING',
+  'MM_DEVICE_NOT_AVAILABLE',
+  'MM_INVALID_CONFIG',
+];
+
+describe('IOSLaunchErrorCode', () => {
+  it.each(IOS_LAUNCH_ERROR_CODES)(
+    'uses %s, a known core ErrorCode preserved by the launch tool',
+    (code) => {
+      expect(Object.values(ErrorCodes)).toContain(code);
+    },
+  );
+
+  it('exposes the code and remediation that the launch tool forwards', () => {
+    const error = new IOSLaunchError({
+      code: 'MM_DEPENDENCIES_MISSING',
+      message: 'idb not found',
+      remediation: 'brew install idb-companion',
+    });
+
+    expect(error).toBeInstanceOf(Error);
+    expect(error.name).toBe('IOSLaunchError');
+    expect(error.code).toBe(ErrorCodes.MM_DEPENDENCIES_MISSING);
+    expect(error.message).toBe('idb not found');
+    expect(error.remediation).toBe('brew install idb-companion');
+  });
+});
diff --git a/tests/llm-workflow/__tests__/metamask-provider.test.ts b/tests/llm-workflow/__tests__/metamask-provider.test.ts
new file mode 100644
index 000000000000..6aaa899a5bac
--- /dev/null
+++ b/tests/llm-workflow/__tests__/metamask-provider.test.ts
@@ -0,0 +1,679 @@
+/* eslint-disable import-x/no-nodejs-modules, import-x/no-extraneous-dependencies */
+import { execFileSync } from 'node:child_process';
+import type {
+  IPlatformDriver,
+  SessionLaunchInput,
+  StateSnapshotCapability,
+  WorkflowContext,
+} from '@metamask/client-mcp-core';
+import { MetaMaskMobileSessionManager } from '../metamask-provider';
+import {
+  createIOSPlatformDriver,
+  type CreatedIOSDriver,
+} from '../ios/platform-driver-factory';
+import { attachToMetroWatchMode } from '../ios/metro-watch-attach';
+import { ensureAccessibilityBridgeEnabled } from '../ios/accessibility-bridge';
+import { probeHermesHealthy } from '../ios/hermes-health';
+import { validateIOSPrerequisites } from '../ios/prerequisites';
+import {
+  IOSLaunchError,
+  type ResolvedIOSLaunchOptions,
+} from '../launcher-types';
+
+jest.mock('@metamask/client-mcp-core', () => ({}));
+jest.mock('node:child_process', () => ({ execFileSync: jest.fn() }));
+jest.mock('../ios/prerequisites', () => ({
+  validateIOSPrerequisites: jest.fn(),
+}));
+jest.mock('../ios/platform-driver-factory', () => ({
+  createIOSPlatformDriver: jest.fn(),
+}));
+jest.mock('../ios/metro-watch-attach', () => ({
+  attachToMetroWatchMode: jest.fn(),
+}));
+jest.mock('../ios/accessibility-bridge', () => ({
+  ensureAccessibilityBridgeEnabled: jest.fn(),
+  ACCESSIBILITY_SETTLE_MS: 250,
+}));
+jest.mock('../ios/hermes-health', () => ({
+  probeHermesHealthy: jest.fn(),
+  verifyJsLiveness: jest.fn(),
+}));
+
+const mockExecFileSync = jest.mocked(execFileSync);
+const mockValidateIOSPrerequisites = jest.mocked(validateIOSPrerequisites);
+const mockCreateIOSPlatformDriver = jest.mocked(createIOSPlatformDriver);
+const mockAttachToMetroWatchMode = jest.mocked(attachToMetroWatchMode);
+const mockEnsureAccessibilityBridgeEnabled = jest.mocked(
+  ensureAccessibilityBridgeEnabled,
+);
+const mockProbeHermesHealthy = jest.mocked(probeHermesHealthy);
+
+const resolved: ResolvedIOSLaunchOptions = {
+  simulatorDeviceId: 'SIM-UDID',
+  appBundlePath: '/tmp/MetaMask.app',
+  appBundleId: 'io.metamask.MetaMask',
+  destination: 'platform=iOS Simulator,id=SIM-UDID',
+  appAlreadyInstalled: true,
+  selectedAppMetadata: {
+    appBundlePath: '/tmp/MetaMask.app',
+    bundleId: 'io.metamask.MetaMask',
+    foxCode: 'PROD',
+    shortVersion: '7.35.0',
+    buildVersion: '1',
+  },
+  installedAppMetadata: null,
+  installAction: 'reuse-installed',
+};
+
+function createLaunchInput(
+  overrides: Partial<SessionLaunchInput> & { force?: boolean } = {},
+): SessionLaunchInput & { force?: boolean } {
+  return {
+    platform: 'ios',
+    deviceId: 'SIM-UDID',
+    ...overrides,
+  };
+}
+
+describe('MetaMaskMobileSessionManager', () => {
+  let sessionManager: MetaMaskMobileSessionManager;
+  let stateSnapshot: StateSnapshotCapability;
+  let platformDriver: Pick<IPlatformDriver, 'getAppState' | 'screenshot'>;
+  let backend: {
+    openApp: jest.MockedFunction<(bundleId: string) => Promise<void>>;
+    closeApp: jest.MockedFunction<(bundleId: string) => Promise<void>>;
+    getAppState: jest.MockedFunction<
+      (
+        bundleId: string,
+      ) => Promise<{ bundleId: string; state: string; pid?: number }>
+    >;
+  };
+  let stderrSpy: jest.SpyInstance;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    stderrSpy = jest
+      .spyOn(process.stderr, 'write')
+      .mockImplementation(() => true);
+    stateSnapshot = {} as StateSnapshotCapability;
+    platformDriver = {
+      getAppState: jest.fn().mockResolvedValue({
+        isLoaded: true,
+        currentUrl: '',
+        extensionId: 'io.metamask.MetaMask',
+        isUnlocked: false,
+        currentScreen: 'unknown',
+        accountAddress: null,
+        networkName: null,
+        chainId: null,
+        balance: null,
+      }),
+      screenshot: jest.fn().mockResolvedValue({ path: '/tmp/screen.png' }),
+    };
+    backend = {
+      openApp: jest.fn().mockResolvedValue(undefined),
+      closeApp: jest.fn().mockResolvedValue(undefined),
+      getAppState: jest.fn().mockResolvedValue({
+        bundleId: 'io.metamask.MetaMask',
+        state: 'Unknown',
+      }),
+    };
+    mockValidateIOSPrerequisites.mockResolvedValue(resolved);
+    mockCreateIOSPlatformDriver.mockResolvedValue({
+      driver: platformDriver as IPlatformDriver,
+      backend,
+    } as unknown as CreatedIOSDriver);
+    mockEnsureAccessibilityBridgeEnabled.mockReturnValue({
+      wasAlreadyOn: false,
+    });
+    mockProbeHermesHealthy.mockResolvedValue({
+      healthy: false,
+      reason: 'HERMES_TARGET_NOT_FOUND',
+    });
+    mockAttachToMetroWatchMode.mockResolvedValue({ pinnedDeviceId: undefined });
+    mockExecFileSync.mockImplementation((file, args) => {
+      if (file === 'xcrun' && args?.[1] === 'list') {
+        return JSON.stringify({
+          devices: { 'iOS 17': [{ udid: 'SIM-UDID', state: 'Booted' }] },
+        });
+      }
+      return Buffer.from('');
+    });
+    sessionManager = new MetaMaskMobileSessionManager();
+    sessionManager.setWorkflowContext({
+      config: {
+        extensionName: 'MetaMask',
+        defaultPassword: '',
+        artifactsDir: 'test-artifacts',
+        environment: 'prod',
+        defaultChainId: 1,
+      },
+      stateSnapshot,
+    } as WorkflowContext);
+  });
+
+  afterEach(() => {
+    stderrSpy.mockRestore();
+  });
+
+  it('always reports the prod environment and a non-switchable prod context', () => {
+    expect(sessionManager.getEnvironmentMode()).toBe('prod');
+    expect(sessionManager.getContextInfo()).toEqual({
+      currentContext: 'prod',
+      hasActiveSession: false,
+      sessionId: null,
+      capabilities: { available: ['stateSnapshot'] },
+      canSwitchContext: false,
+    });
+  });
+
+  it('accepts prod context and clearly rejects e2e context', () => {
+    expect(() => sessionManager.setContext('prod')).not.toThrow();
+    expect(() => sessionManager.setContext('e2e')).toThrow(
+      'MetaMask Mobile supports only the prod context',
+    );
+  });
+
+  it('keeps E2E capability getters undefined and exposes state snapshot', () => {
+    expect(sessionManager.getFixtureCapability()).toBeUndefined();
+    expect(sessionManager.getChainCapability()).toBeUndefined();
+    expect(sessionManager.getContractSeedingCapability()).toBeUndefined();
+    expect(sessionManager.getBuildCapability()).toBeUndefined();
+    expect(sessionManager.getStateSnapshotCapability()).toBe(stateSnapshot);
+  });
+
+  it('launches installed app state without context or E2E port setup', async () => {
+    const result = await sessionManager.launch(createLaunchInput());
+
+    expect(mockValidateIOSPrerequisites).toHaveBeenCalledWith({
+      simulatorDeviceId: 'SIM-UDID',
+      appBundlePath: undefined,
+      metroPort: undefined,
+      reinstall: undefined,
+      resetAppData: undefined,
+      allowFoxCodeMismatch: undefined,
+    });
+    expect(result.extensionId).toBe('io.metamask.MetaMask');
+    expect(sessionManager.getSessionState()?.ports).toEqual({
+      anvil: 0,
+      fixtureServer: 0,
+    });
+    expect(mockExecFileSync).not.toHaveBeenCalledWith(
+      'xcrun',
+      expect.arrayContaining(['fixtureServerPort']),
+      expect.anything(),
+    );
+  });
+
+  it('passes the core deviceId to iOS simulator prerequisite selection', async () => {
+    await sessionManager.launch(createLaunchInput({ deviceId: 'INPUT-SIM' }));
+
+    expect(mockValidateIOSPrerequisites).toHaveBeenCalledWith(
+      expect.objectContaining({ simulatorDeviceId: 'INPUT-SIM' }),
+    );
+  });
+
+  it('preserves Metro attachment for not-running app', async () => {
+    mockValidateIOSPrerequisites.mockResolvedValueOnce({
+      ...resolved,
+      metroPort: 8081,
+    });
+
+    await sessionManager.launch(createLaunchInput({ metroPort: 8081 }));
+
+    expect(mockAttachToMetroWatchMode).toHaveBeenCalledWith({
+      simulatorUdid: 'SIM-UDID',
+      metroPort: 8081,
+      appBundleId: 'io.metamask.MetaMask',
+    });
+  });
+
+  it('preserves cleanup of app and session state', async () => {
+    await sessionManager.launch(createLaunchInput());
+
+    await expect(sessionManager.cleanup()).resolves.toBe(true);
+    expect(backend.closeApp).toHaveBeenCalledWith('io.metamask.MetaMask');
+    expect(sessionManager.hasActiveSession()).toBe(false);
+  });
+
+  it('retains the state snapshot capability across launch and cleanup cycles', async () => {
+    await sessionManager.launch(createLaunchInput());
+    await sessionManager.cleanup();
+
+    expect(sessionManager.getStateSnapshotCapability()).toBe(stateSnapshot);
+    expect(sessionManager.getContextInfo().capabilities.available).toEqual([
+      'stateSnapshot',
+    ]);
+
+    await expect(sessionManager.launch(createLaunchInput())).resolves.toEqual(
+      expect.objectContaining({ extensionId: 'io.metamask.MetaMask' }),
+    );
+    expect(sessionManager.getStateSnapshotCapability()).toBe(stateSnapshot);
+  });
+
+  it('rejects cleanup while a launch is still in progress', async () => {
+    const pendingState = platformDriver.getAppState() as ReturnType<
+      IPlatformDriver['getAppState']
+    >;
+    let releaseLaunch: () => void = () => undefined;
+    jest.mocked(platformDriver.getAppState).mockReturnValueOnce(
+      new Promise((resolve) => {
+        releaseLaunch = () => resolve(pendingState);
+      }),
+    );
+
+    const launchPromise = sessionManager.launch(createLaunchInput());
+    await Promise.resolve();
+
+    await expect(sessionManager.cleanup()).rejects.toMatchObject({
+      name: 'IOSLaunchError',
+      code: 'MM_SESSION_ALREADY_RUNNING',
+    });
+
+    releaseLaunch();
+    await launchPromise;
+  });
+
+  it('tears down a partially launched app when state capture fails', async () => {
+    jest
+      .mocked(platformDriver.getAppState)
+      .mockRejectedValueOnce(new Error('state failed'));
+
+    await expect(
+      sessionManager.launch(createLaunchInput()),
+    ).rejects.toMatchObject({
+      name: 'IOSLaunchError',
+      code: 'MM_LAUNCH_FAILED',
+      message: 'state failed',
+    });
+    expect(backend.closeApp).toHaveBeenCalledWith('io.metamask.MetaMask');
+    expect(sessionManager.hasActiveSession()).toBe(false);
+  });
+
+  it('rejects Android while preserving the iOS error contract', async () => {
+    await expect(
+      sessionManager.launch(createLaunchInput({ platform: 'android' })),
+    ).rejects.toBeInstanceOf(IOSLaunchError);
+  });
+
+  it('rejects unsupported E2E launch options with MM_INVALID_CONFIG', async () => {
+    await expect(
+      sessionManager.launch(createLaunchInput({ stateMode: 'onboarding' })),
+    ).rejects.toMatchObject({
+      name: 'IOSLaunchError',
+      code: 'MM_INVALID_CONFIG',
+      message: expect.stringContaining("stateMode='onboarding'"),
+    });
+    expect(mockValidateIOSPrerequisites).not.toHaveBeenCalled();
+  });
+
+  it('install-new path calls simctl install with the resolved bundle path', async () => {
+    mockValidateIOSPrerequisites.mockResolvedValueOnce({
+      ...resolved,
+      installAction: 'install-new',
+      appAlreadyInstalled: false,
+    });
+
+    await sessionManager.launch(createLaunchInput());
+
+    expect(mockExecFileSync).toHaveBeenCalledWith(
+      'xcrun',
+      ['simctl', 'install', 'SIM-UDID', '/tmp/MetaMask.app'],
+      expect.anything(),
+    );
+    expect(mockExecFileSync).not.toHaveBeenCalledWith(
+      'xcrun',
+      ['simctl', 'uninstall', 'SIM-UDID', 'io.metamask.MetaMask'],
+      expect.anything(),
+    );
+  });
+
+  it('reinstall path uninstalls the existing app before installing the new build', async () => {
+    mockValidateIOSPrerequisites.mockResolvedValueOnce({
+      ...resolved,
+      installAction: 'reinstall',
+    });
+
+    await sessionManager.launch(
+      createLaunchInput({
+        appBundlePath: '/tmp/MetaMask.app',
+        reinstall: true,
+      }),
+    );
+
+    expect(mockExecFileSync).toHaveBeenCalledWith(
+      'xcrun',
+      ['simctl', 'uninstall', 'SIM-UDID', 'io.metamask.MetaMask'],
+      expect.anything(),
+    );
+    expect(mockExecFileSync).toHaveBeenCalledWith(
+      'xcrun',
+      ['simctl', 'install', 'SIM-UDID', '/tmp/MetaMask.app'],
+      expect.anything(),
+    );
+
+    const findSimctlInvocationOrder = (subcommand: string): number => {
+      const calls = mockExecFileSync.mock.calls;
+      const orders = mockExecFileSync.mock.invocationCallOrder;
+      const index = calls.findIndex((call) => {
+        const args = call[1];
+        return Array.isArray(args) && args[1] === subcommand;
+      });
+      if (index === -1) {
+        throw new Error(`Expected simctl ${subcommand} call was not recorded`);
+      }
+      return orders[index];
+    };
+
+    const uninstallOrder = findSimctlInvocationOrder('uninstall');
+    const installOrder = findSimctlInvocationOrder('install');
+
+    expect(uninstallOrder).toBeLessThan(installOrder);
+  });
+
+  it('emits a destructive-flag warning to stderr when reinstall is requested', async () => {
+    mockValidateIOSPrerequisites.mockResolvedValueOnce({
+      ...resolved,
+      installAction: 'reinstall',
+    });
+
+    await sessionManager.launch(
+      createLaunchInput({
+        appBundlePath: '/tmp/MetaMask.app',
+        reinstall: true,
+      }),
+    );
+
+    expect(stderrSpy).toHaveBeenCalledWith(
+      expect.stringContaining('WARNING: Using destructive flags'),
+    );
+  });
+
+  it('surfaces simctl stderr text when the install call fails', async () => {
+    mockValidateIOSPrerequisites.mockResolvedValueOnce({
+      ...resolved,
+      installAction: 'install-new',
+      appAlreadyInstalled: false,
+    });
+    mockExecFileSync.mockImplementation((file, args) => {
+      if (file === 'xcrun' && args?.[1] === 'list') {
+        return JSON.stringify({
+          devices: { 'iOS 17': [{ udid: 'SIM-UDID', state: 'Booted' }] },
+        });
+      }
+      if (file === 'xcrun' && args?.[1] === 'install') {
+        throw Object.assign(new Error('Command failed: xcrun simctl install'), {
+          stderr: Buffer.from('simctl: Invalid device state'),
+        });
+      }
+      return Buffer.from('');
+    });
+
+    await expect(
+      sessionManager.launch(createLaunchInput()),
+    ).rejects.toMatchObject({
+      name: 'IOSLaunchError',
+      code: 'MM_LAUNCH_FAILED',
+      message: expect.stringContaining('simctl: Invalid device state'),
+    });
+  });
+
+  it('throws MM_DEVICE_NOT_AVAILABLE with stderr text when booting the simulator fails', async () => {
+    mockExecFileSync.mockImplementation((file, args) => {
+      if (file === 'xcrun' && args?.[1] === 'list') {
+        return JSON.stringify({
+          devices: { 'iOS 17': [{ udid: 'SIM-UDID', state: 'Shutdown' }] },
+        });
+      }
+      if (file === 'xcrun' && args?.[1] === 'boot') {
+        throw Object.assign(new Error('Command failed: xcrun simctl boot'), {
+          stderr: Buffer.from('simctl: Unable to boot device'),
+        });
+      }
+      return Buffer.from('');
+    });
+
+    await expect(
+      sessionManager.launch(createLaunchInput()),
+    ).rejects.toMatchObject({
+      name: 'IOSLaunchError',
+      code: 'MM_DEVICE_NOT_AVAILABLE',
+      message: expect.stringContaining('simctl: Unable to boot device'),
+    });
+  });
+
+  describe('state-gated launch decision matrix', () => {
+    it('1.1 pure attach: app Running + bridge already on + Hermes healthy → no deep-link, no relaunch', async () => {
+      mockValidateIOSPrerequisites.mockResolvedValueOnce({
+        ...resolved,
+        metroPort: 8081,
+      });
+      mockEnsureAccessibilityBridgeEnabled.mockReturnValue({
+        wasAlreadyOn: true,
+      });
+      backend.getAppState.mockResolvedValue({
+        bundleId: 'io.metamask.MetaMask',
+        state: 'Running',
+      });
+      mockProbeHermesHealthy.mockResolvedValue({
+        healthy: true,
+        target: {
+          id: 't1',
+          appId: 'io.metamask.MetaMask',
+          webSocketDebuggerUrl: 'ws://localhost:8081/page/1',
+          reactNative: { logicalDeviceId: 'SIM-UDID' },
+        },
+        pinnedDeviceId: 'SIM-UDID',
+      });
+
+      await sessionManager.launch(createLaunchInput({ metroPort: 8081 }));
+
+      expect(mockProbeHermesHealthy).toHaveBeenCalledWith(
+        expect.objectContaining({ port: 8081, appId: 'io.metamask.MetaMask' }),
+      );
+      expect(mockAttachToMetroWatchMode).not.toHaveBeenCalled();
+      expect(backend.openApp).not.toHaveBeenCalled();
+    });
+
+    it('1.3a stale→relaunch: app Running + bridge on + Hermes unhealthy → terminate + deep-link', async () => {
+      mockValidateIOSPrerequisites.mockResolvedValueOnce({
+        ...resolved,
+        metroPort: 8081,
+      });
+      mockEnsureAccessibilityBridgeEnabled.mockReturnValue({
+        wasAlreadyOn: true,
+      });
+      backend.getAppState.mockResolvedValue({
+        bundleId: 'io.metamask.MetaMask',
+        state: 'Running',
+      });
+      mockProbeHermesHealthy.mockResolvedValue({
+        healthy: false,
+        reason: 'HERMES_TARGET_NOT_FOUND',
+      });
+
+      await sessionManager.launch(createLaunchInput({ metroPort: 8081 }));
+
+      expect(mockExecFileSync).toHaveBeenCalledWith(
+        'xcrun',
+        ['simctl', 'terminate', 'SIM-UDID', 'io.metamask.MetaMask'],
+        expect.anything(),
+      );
+      expect(mockAttachToMetroWatchMode).toHaveBeenCalledWith({
+        simulatorUdid: 'SIM-UDID',
+        metroPort: 8081,
+        appBundleId: 'io.metamask.MetaMask',
+      });
+    });
+
+    it('1.4 metro-down error: /status not reachable → MM_INVALID_CONFIG', async () => {
+      mockValidateIOSPrerequisites.mockRejectedValueOnce(
+        new IOSLaunchError({
+          code: 'MM_INVALID_CONFIG',
+          message: 'Metro bundler not reachable on port 8081',
+          remediation: 'Run `yarn watch:clean` in another terminal.',
+        }),
+      );
+
+      await expect(
+        sessionManager.launch(createLaunchInput({ metroPort: 8081 })),
+      ).rejects.toMatchObject({
+        code: 'MM_INVALID_CONFIG',
+        message: expect.stringContaining('Metro bundler not reachable'),
+      });
+    });
+
+    it('1.3b not-installed error: app state Not Installed → MM_INVALID_CONFIG', async () => {
+      backend.getAppState.mockResolvedValue({
+        bundleId: 'io.metamask.MetaMask',
+        state: 'Not Installed',
+      });
+
+      await expect(
+        sessionManager.launch(createLaunchInput()),
+      ).rejects.toMatchObject({
+        code: 'MM_INVALID_CONFIG',
+        message: expect.stringContaining('not installed'),
+      });
+    });
+
+    it('3.1 install-explicit then launch: new binary → terminate + deep-link', async () => {
+      mockValidateIOSPrerequisites.mockResolvedValueOnce({
+        ...resolved,
+        metroPort: 8081,
+        installAction: 'install-explicit',
+      });
+
+      await sessionManager.launch(
+        createLaunchInput({
+          metroPort: 8081,
+          appBundlePath: '/tmp/MetaMask.app',
+        }),
+      );
+
+      expect(mockExecFileSync).toHaveBeenCalledWith(
+        'xcrun',
+        ['simctl', 'install', 'SIM-UDID', '/tmp/MetaMask.app'],
+        expect.anything(),
+      );
+      expect(mockExecFileSync).toHaveBeenCalledWith(
+        'xcrun',
+        ['simctl', 'terminate', 'SIM-UDID', 'io.metamask.MetaMask'],
+        expect.anything(),
+      );
+      expect(mockAttachToMetroWatchMode).toHaveBeenCalledWith({
+        simulatorUdid: 'SIM-UDID',
+        metroPort: 8081,
+        appBundleId: 'io.metamask.MetaMask',
+      });
+      expect(backend.getAppState).not.toHaveBeenCalled();
+    });
+
+    it('--force: active session + force → cleanup then launch', async () => {
+      await sessionManager.launch(createLaunchInput());
+      expect(sessionManager.hasActiveSession()).toBe(true);
+
+      await sessionManager.launch(createLaunchInput({ force: true }));
+
+      expect(sessionManager.hasActiveSession()).toBe(true);
+      expect(backend.closeApp).toHaveBeenCalledWith('io.metamask.MetaMask');
+    });
+
+    it('rejects second launch without --force with MM_SESSION_ALREADY_RUNNING', async () => {
+      await sessionManager.launch(createLaunchInput());
+
+      await expect(
+        sessionManager.launch(createLaunchInput()),
+      ).rejects.toMatchObject({
+        code: 'MM_SESSION_ALREADY_RUNNING',
+        message: expect.stringContaining('--force'),
+      });
+    });
+
+    it('fresh-boot a11y relaunch: app Running + bridge just flipped → terminate + deep-link', async () => {
+      mockValidateIOSPrerequisites.mockResolvedValueOnce({
+        ...resolved,
+        metroPort: 8081,
+      });
+      mockEnsureAccessibilityBridgeEnabled.mockReturnValue({
+        wasAlreadyOn: false,
+      });
+      backend.getAppState.mockResolvedValue({
+        bundleId: 'io.metamask.MetaMask',
+        state: 'Running',
+      });
+
+      await sessionManager.launch(createLaunchInput({ metroPort: 8081 }));
+
+      expect(mockExecFileSync).toHaveBeenCalledWith(
+        'xcrun',
+        ['simctl', 'terminate', 'SIM-UDID', 'io.metamask.MetaMask'],
+        expect.anything(),
+      );
+      expect(mockAttachToMetroWatchMode).toHaveBeenCalledWith({
+        simulatorUdid: 'SIM-UDID',
+        metroPort: 8081,
+        appBundleId: 'io.metamask.MetaMask',
+      });
+      expect(mockProbeHermesHealthy).not.toHaveBeenCalled();
+    });
+
+    it('prod pure attach: app Running + bridge on → no openApp, no terminate', async () => {
+      mockEnsureAccessibilityBridgeEnabled.mockReturnValue({
+        wasAlreadyOn: true,
+      });
+      backend.getAppState.mockResolvedValue({
+        bundleId: 'io.metamask.MetaMask',
+        state: 'Running',
+      });
+
+      await sessionManager.launch(createLaunchInput());
+
+      expect(backend.openApp).not.toHaveBeenCalled();
+      expect(mockExecFileSync).not.toHaveBeenCalledWith(
+        'xcrun',
+        ['simctl', 'terminate', 'SIM-UDID', 'io.metamask.MetaMask'],
+        expect.anything(),
+      );
+    });
+
+    it('prod fresh-boot a11y relaunch: app Running + bridge flipped → terminate + openApp', async () => {
+      mockEnsureAccessibilityBridgeEnabled.mockReturnValue({
+        wasAlreadyOn: false,
+      });
+      backend.getAppState.mockResolvedValue({
+        bundleId: 'io.metamask.MetaMask',
+        state: 'Running',
+      });
+
+      await sessionManager.launch(createLaunchInput());
+
+      expect(mockExecFileSync).toHaveBeenCalledWith(
+        'xcrun',
+        ['simctl', 'terminate', 'SIM-UDID', 'io.metamask.MetaMask'],
+        expect.anything(),
+      );
+      expect(backend.openApp).toHaveBeenCalledWith('io.metamask.MetaMask');
+    });
+
+    it('prod not-running launch: app Not Running + bridge on → openApp, no terminate', async () => {
+      mockEnsureAccessibilityBridgeEnabled.mockReturnValue({
+        wasAlreadyOn: true,
+      });
+      backend.getAppState.mockResolvedValue({
+        bundleId: 'io.metamask.MetaMask',
+        state: 'Not Running',
+      });
+
+      await sessionManager.launch(createLaunchInput());
+
+      expect(backend.openApp).toHaveBeenCalledWith('io.metamask.MetaMask');
+      expect(mockExecFileSync).not.toHaveBeenCalledWith(
+        'xcrun',
+        ['simctl', 'terminate', 'SIM-UDID', 'io.metamask.MetaMask'],
+        expect.anything(),
+      );
+    });
+  });
+});
diff --git a/tests/llm-workflow/__tests__/metro-watch-attach.test.ts b/tests/llm-workflow/__tests__/metro-watch-attach.test.ts
new file mode 100644
index 000000000000..0de65c7a5bcf
--- /dev/null
+++ b/tests/llm-workflow/__tests__/metro-watch-attach.test.ts
@@ -0,0 +1,258 @@
+/* eslint-disable import-x/no-nodejs-modules */
+import { execFileSync } from 'node:child_process';
+
+import { IOSLaunchError } from '../launcher-types';
+import {
+  attachToMetroWatchMode,
+  buildMetroDeepLink,
+  type AttachToMetroResult,
+} from '../ios/metro-watch-attach';
+import {
+  probeHermesHealthy,
+  verifyJsLiveness,
+  type ProbeHermesHealthyResult,
+} from '../ios/hermes-health';
+
+jest.mock('node:child_process', () => ({ execFileSync: jest.fn() }));
+jest.mock('../ios/hermes-health', () => ({
+  probeHermesHealthy: jest.fn(),
+  verifyJsLiveness: jest.fn(),
+}));
+
+const mockExecFileSync = jest.mocked(execFileSync);
+const mockProbeHermesHealthy = jest.mocked(probeHermesHealthy);
+const mockVerifyJsLiveness = jest.mocked(verifyJsLiveness);
+
+describe('metro-watch-attach', () => {
+  let mockFetch: jest.MockedFunction<typeof fetch>;
+  let stderrSpy: jest.SpyInstance;
+  let abortTimeoutSpy: jest.SpyInstance;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.useFakeTimers();
+    stderrSpy = jest
+      .spyOn(process.stderr, 'write')
+      .mockImplementation(() => true);
+    abortTimeoutSpy = jest
+      .spyOn(AbortSignal, 'timeout')
+      .mockReturnValue(new AbortController().signal);
+    mockFetch = jest.fn().mockResolvedValue({ ok: true } as Response);
+    mockExecFileSync.mockReturnValue(Buffer.from(''));
+    mockProbeHermesHealthy.mockResolvedValue({
+      healthy: true,
+      target: {
+        id: 'target-1',
+        title: 'Hermes React Native',
+        appId: 'io.metamask.MetaMask',
+        webSocketDebuggerUrl: 'ws://localhost:8081/inspector/page/1',
+        reactNative: { logicalDeviceId: 'SIM-UDID' },
+      },
+      pinnedDeviceId: 'SIM-UDID',
+    } as ProbeHermesHealthyResult);
+    mockVerifyJsLiveness.mockResolvedValue(true);
+  });
+
+  afterEach(() => {
+    abortTimeoutSpy.mockRestore();
+    stderrSpy.mockRestore();
+    jest.useRealTimers();
+  });
+
+  it('builds correct deep-link URL via buildMetroDeepLink', () => {
+    const result = buildMetroDeepLink(8081);
+
+    expect(result.bundleUrl).toBe(
+      'http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false&disableOnboarding=1',
+    );
+    expect(result.deepLinkUrl).toBe(
+      `expo-metamask://expo-development-client/?url=${encodeURIComponent(
+        result.bundleUrl,
+      )}`,
+    );
+  });
+
+  it('calls xcrun simctl openurl with the deep link URL', async () => {
+    const { deepLinkUrl } = buildMetroDeepLink(8081);
+
+    const promise = attachToMetroWatchMode({
+      simulatorUdid: 'SIM-UDID',
+      metroPort: 8081,
+      appBundleId: 'io.metamask.MetaMask',
+      fetchImpl: mockFetch,
+    });
+
+    await jest.advanceTimersByTimeAsync(100);
+    await promise;
+
+    expect(mockExecFileSync).toHaveBeenCalledWith(
+      'xcrun',
+      ['simctl', 'openurl', 'SIM-UDID', deepLinkUrl],
+      { stdio: ['ignore', 'pipe', 'pipe'], timeout: 10_000 },
+    );
+  });
+
+  it('polls /status instead of /index.bundle to avoid concurrent bundle requests', async () => {
+    const promise = attachToMetroWatchMode({
+      simulatorUdid: 'SIM-UDID',
+      metroPort: 8081,
+      appBundleId: 'io.metamask.MetaMask',
+      fetchImpl: mockFetch,
+    });
+
+    await jest.advanceTimersByTimeAsync(100);
+    await promise;
+
+    expect(mockFetch).toHaveBeenCalledWith('http://localhost:8081/status', {
+      signal: expect.any(AbortSignal),
+    });
+  });
+
+  it('probes Hermes health and verifies JS liveness after Metro is ready', async () => {
+    const promise = attachToMetroWatchMode({
+      simulatorUdid: 'SIM-UDID',
+      metroPort: 8081,
+      appBundleId: 'io.metamask.MetaMask',
+      fetchImpl: mockFetch,
+    });
+
+    await jest.advanceTimersByTimeAsync(100);
+    const result = await promise;
+
+    expect(mockProbeHermesHealthy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        port: 8081,
+        appId: 'io.metamask.MetaMask',
+      }),
+    );
+    expect(mockVerifyJsLiveness).toHaveBeenCalledWith(
+      'ws://localhost:8081/inspector/page/1',
+      expect.any(Number),
+    );
+    expect(result).toEqual<AttachToMetroResult>({ pinnedDeviceId: 'SIM-UDID' });
+  });
+
+  it('throws IOSLaunchError when openurl fails', async () => {
+    mockExecFileSync.mockImplementation(() => {
+      throw new Error('openurl failed');
+    });
+
+    await expect(
+      attachToMetroWatchMode({
+        simulatorUdid: 'SIM-UDID',
+        metroPort: 8081,
+        appBundleId: 'io.metamask.MetaMask',
+        retryDelayMs: 1,
+        fetchImpl: mockFetch,
+      }),
+    ).rejects.toMatchObject({
+      code: 'MM_DEVICE_NOT_AVAILABLE',
+      message: expect.stringContaining('Failed to open Metro deep link'),
+    } satisfies Partial<IOSLaunchError>);
+
+    expect(mockExecFileSync).toHaveBeenCalledTimes(1);
+  });
+
+  it('retries when fetch fails, eventually succeeds', async () => {
+    mockFetch
+      .mockRejectedValueOnce(new Error('fetch failed'))
+      .mockResolvedValueOnce({ ok: true } as Response);
+
+    const promise = attachToMetroWatchMode({
+      simulatorUdid: 'SIM-UDID',
+      metroPort: 8081,
+      appBundleId: 'io.metamask.MetaMask',
+      metroReadyTimeoutMs: 1_000,
+      fetchImpl: mockFetch,
+    });
+
+    await jest.advanceTimersByTimeAsync(1_500);
+    await promise;
+
+    expect(mockFetch.mock.calls.length).toBeGreaterThanOrEqual(2);
+  });
+
+  it('throws IOSLaunchError after maxAttempts', async () => {
+    mockFetch.mockResolvedValue({ ok: false } as Response);
+
+    const promise = attachToMetroWatchMode({
+      simulatorUdid: 'SIM-UDID',
+      metroPort: 8081,
+      appBundleId: 'io.metamask.MetaMask',
+      maxAttempts: 2,
+      metroReadyTimeoutMs: 1,
+      fetchImpl: mockFetch,
+    });
+
+    await Promise.all([
+      jest.advanceTimersByTimeAsync(2_000),
+      expect(promise).rejects.toMatchObject({
+        code: 'MM_INVALID_CONFIG',
+        message: expect.stringContaining('attach failed after 2 attempts'),
+        remediation: expect.stringContaining('yarn watch:clean'),
+      } satisfies Partial<IOSLaunchError>),
+    ]);
+  });
+
+  it('throws MM_LAUNCH_FAILED when Hermes target is not found (release build)', async () => {
+    mockProbeHermesHealthy.mockResolvedValue({
+      healthy: false,
+      reason: 'HERMES_TARGET_NOT_FOUND',
+    } as ProbeHermesHealthyResult);
+
+    const promise = attachToMetroWatchMode({
+      simulatorUdid: 'SIM-UDID',
+      metroPort: 8081,
+      appBundleId: 'io.metamask.MetaMask',
+      fetchImpl: mockFetch,
+    });
+    const assertion = await expect(promise).rejects.toMatchObject({
+      code: 'MM_LAUNCH_FAILED',
+      message: expect.stringContaining('Hermes health check failed'),
+      remediation: expect.stringContaining('dev build'),
+    } satisfies Partial<IOSLaunchError>);
+
+    await jest.advanceTimersByTimeAsync(100);
+    await assertion;
+  });
+
+  it('throws MM_LAUNCH_FAILED when Hermes target is ambiguous', async () => {
+    mockProbeHermesHealthy.mockResolvedValue({
+      healthy: false,
+      reason: 'HERMES_MULTIPLE_DEVICES',
+    } as ProbeHermesHealthyResult);
+
+    const promise = attachToMetroWatchMode({
+      simulatorUdid: 'SIM-UDID',
+      metroPort: 8081,
+      appBundleId: 'io.metamask.MetaMask',
+      fetchImpl: mockFetch,
+    });
+    const assertion = await expect(promise).rejects.toMatchObject({
+      code: 'MM_LAUNCH_FAILED',
+      message: expect.stringContaining('HERMES_MULTIPLE_DEVICES'),
+    } satisfies Partial<IOSLaunchError>);
+
+    await jest.advanceTimersByTimeAsync(100);
+    await assertion;
+  });
+
+  it('proceeds with target-presence-only when JS liveness returns false', async () => {
+    mockVerifyJsLiveness.mockResolvedValue(false);
+
+    const promise = attachToMetroWatchMode({
+      simulatorUdid: 'SIM-UDID',
+      metroPort: 8081,
+      appBundleId: 'io.metamask.MetaMask',
+      fetchImpl: mockFetch,
+    });
+
+    await jest.advanceTimersByTimeAsync(100);
+    const result = await promise;
+
+    expect(result).toEqual<AttachToMetroResult>({ pinnedDeviceId: 'SIM-UDID' });
+    expect(stderrSpy).toHaveBeenCalledWith(
+      expect.stringContaining('JS liveness probe failed'),
+    );
+  });
+});
diff --git a/tests/llm-workflow/__tests__/prerequisites.test.ts b/tests/llm-workflow/__tests__/prerequisites.test.ts
new file mode 100644
index 000000000000..69917c8dd798
--- /dev/null
+++ b/tests/llm-workflow/__tests__/prerequisites.test.ts
@@ -0,0 +1,190 @@
+/* eslint-disable import-x/no-nodejs-modules */
+import { execFileSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import {
+  readAppBundleMetadata,
+  validateIOSPrerequisites,
+} from '../ios/prerequisites';
+import { IOSLaunchError } from '../launcher-types';
+
+jest.mock('node:child_process', () => ({ execFileSync: jest.fn() }));
+jest.mock('node:fs', () => ({ existsSync: jest.fn() }));
+jest.mock('../resolve-repo-root', () => ({
+  resolveRepoRoot: jest.fn(() => '/repo'),
+}));
+
+const mockedExecFileSync = jest.mocked(execFileSync);
+const mockedExistsSync = jest.mocked(existsSync);
+const UDID = 'BOOTED-UDID';
+const INSTALLED_APP = '/simulator/MetaMask.app';
+
+function mockSystem(
+  options: {
+    installedApp?: string;
+    installedFoxCode?: string;
+    explicitFoxCode?: string;
+  } = {},
+): void {
+  mockedExistsSync.mockImplementation((candidate) =>
+    [options.installedApp, '/repo/explicit/MetaMask.app'].includes(
+      candidate as string,
+    ),
+  );
+  mockedExecFileSync.mockImplementation((file, args) => {
+    const values = args as string[];
+    if (typeof file === 'string' && file.endsWith('idb')) return '';
+    if (file === 'xcrun' && values[1] === 'help') return '';
+    if (file === 'xcrun' && values[1] === 'list') {
+      return JSON.stringify({
+        devices: { 'iOS 17': [{ udid: UDID, state: 'Booted' }] },
+      });
+    }
+    if (file === 'xcrun' && values[1] === 'get_app_container') {
+      if (options.installedApp) return `${options.installedApp}\n`;
+      throw new Error('not installed');
+    }
+    if (file === 'defaults' && values[0] === 'read') {
+      const isInstalled = values[1].includes('/simulator/');
+      switch (values[2]) {
+        case 'CFBundleIdentifier':
+          return 'io.metamask.MetaMask\n';
+        case 'fox_code':
+          return `${isInstalled ? (options.installedFoxCode ?? 'PROD') : (options.explicitFoxCode ?? 'PROD')}\n`;
+        case 'CFBundleShortVersionString':
+          return '7.35.0\n';
+        case 'CFBundleVersion':
+          return '1\n';
+        default:
+          return '';
+      }
+    }
+    throw new Error(`Unexpected command: ${file} ${values.join(' ')}`);
+  });
+}
+
+describe('validateIOSPrerequisites', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('uses an installed app first without searching local build outputs', async () => {
+    mockSystem({ installedApp: INSTALLED_APP });
+
+    const result = await validateIOSPrerequisites({});
+
+    expect(result.appBundlePath).toBe(INSTALLED_APP);
+    expect(result.installAction).toBe('reuse-installed');
+    expect(mockedExecFileSync).not.toHaveBeenCalledWith(
+      'find',
+      expect.anything(),
+      expect.anything(),
+    );
+  });
+
+  it('requires an installed app or explicit app bundle', async () => {
+    mockSystem();
+
+    await expect(validateIOSPrerequisites({})).rejects.toMatchObject({
+      code: 'MM_INVALID_CONFIG',
+      message: expect.stringContaining('No MetaMask app installed'),
+    });
+  });
+
+  it('installs an explicit bundle when no app is installed', async () => {
+    mockSystem();
+
+    const result = await validateIOSPrerequisites({
+      appBundlePath: 'explicit/MetaMask.app',
+    });
+
+    expect(result.appBundlePath).toBe('/repo/explicit/MetaMask.app');
+    expect(result.installAction).toBe('install-new');
+  });
+
+  it('blocks destructive actions when the installed app is the only copy', async () => {
+    mockSystem({ installedApp: INSTALLED_APP });
+
+    await expect(
+      validateIOSPrerequisites({ reinstall: true }),
+    ).rejects.toMatchObject({
+      code: 'MM_INVALID_CONFIG',
+      remediation: expect.not.stringContaining('e2e'),
+    });
+  });
+
+  it('blocks mismatched fox_code for an explicit replacement', async () => {
+    mockSystem({
+      installedApp: INSTALLED_APP,
+      installedFoxCode: 'INSTALLED',
+      explicitFoxCode: 'EXPLICIT',
+    });
+
+    await expect(
+      validateIOSPrerequisites({ appBundlePath: 'explicit/MetaMask.app' }),
+    ).rejects.toMatchObject({
+      code: 'MM_INVALID_CONFIG',
+      message: expect.stringContaining('different fox_code'),
+    });
+  });
+
+  it('allows explicit destructive replacement when requested', async () => {
+    mockSystem({ installedApp: INSTALLED_APP });
+
+    const result = await validateIOSPrerequisites({
+      appBundlePath: 'explicit/MetaMask.app',
+      resetAppData: true,
+    });
+
+    expect(result.installAction).toBe('reset-and-install');
+  });
+
+  it('fails fast when idb is not installed', async () => {
+    mockSystem({ installedApp: INSTALLED_APP });
+    mockedExecFileSync.mockImplementation((file, args) => {
+      const values = args as string[];
+      if (typeof file === 'string' && file.endsWith('idb')) {
+        const error = new Error('spawn ENOENT') as NodeJS.ErrnoException;
+        error.code = 'ENOENT';
+        throw error;
+      }
+      if (file === 'xcrun' && values[1] === 'help') return '';
+      throw new Error(`Unexpected command: ${String(file)}`);
+    });
+
+    await expect(validateIOSPrerequisites({})).rejects.toMatchObject({
+      code: 'MM_DEPENDENCIES_MISSING',
+      remediation: expect.stringContaining('idb-companion'),
+    });
+  });
+
+  it('rejects an unavailable simulator', async () => {
+    mockSystem();
+    mockedExecFileSync.mockImplementation((file, args) => {
+      const values = args as string[];
+      if (typeof file === 'string' && file.endsWith('idb')) return '';
+      if (file === 'xcrun' && values[1] === 'help') return '';
+      if (file === 'xcrun' && values[1] === 'list') {
+        return JSON.stringify({ devices: {} });
+      }
+      throw new Error('unexpected');
+    });
+
+    await expect(validateIOSPrerequisites({})).rejects.toMatchObject({
+      code: 'MM_DEVICE_NOT_AVAILABLE',
+    });
+  });
+});
+
+describe('readAppBundleMetadata', () => {
+  it('reads app identity metadata', () => {
+    mockSystem();
+
+    expect(readAppBundleMetadata('/repo/explicit/MetaMask.app')).toEqual({
+      appBundlePath: '/repo/explicit/MetaMask.app',
+      bundleId: 'io.metamask.MetaMask',
+      foxCode: 'PROD',
+      shortVersion: '7.35.0',
+      buildVersion: '1',
+    });
+  });
+});
diff --git a/tests/llm-workflow/__tests__/state-snapshot.test.ts b/tests/llm-workflow/__tests__/state-snapshot.test.ts
new file mode 100644
index 000000000000..0ba9324bd1de
--- /dev/null
+++ b/tests/llm-workflow/__tests__/state-snapshot.test.ts
@@ -0,0 +1,225 @@
+import type { IPlatformDriver } from '@metamask/client-mcp-core';
+import { MetaMaskMobileStateSnapshotCapability } from '../capabilities/state-snapshot';
+
+jest.mock('@metamask/client-mcp-core', () => ({}));
+
+type MockPlatformDriver = Pick<IPlatformDriver, 'getAppState' | 'getTestIds'>;
+type TestIdItem = Awaited<ReturnType<IPlatformDriver['getTestIds']>>[number];
+
+const createTestIdItem = (testId: string): TestIdItem => ({
+  testId,
+  tag: 'View',
+  visible: true,
+});
+
+describe('MetaMaskMobileStateSnapshotCapability', () => {
+  let stateSnapshotCapability: MetaMaskMobileStateSnapshotCapability;
+  let mockPlatformDriver: jest.Mocked<MockPlatformDriver>;
+  let getPlatformDriverMock: jest.MockedFunction<
+    () => IPlatformDriver | undefined
+  >;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    mockPlatformDriver = {
+      getAppState: jest.fn().mockResolvedValue({
+        isLoaded: true,
+        currentUrl: '',
+        extensionId: '',
+        isUnlocked: true,
+        accountAddress: '0x123',
+        networkName: 'Ethereum Mainnet',
+        chainId: '1',
+        balance: '1.5',
+      }),
+      getTestIds: jest.fn().mockResolvedValue([]),
+    } as unknown as jest.Mocked<MockPlatformDriver>;
+    getPlatformDriverMock = jest.fn(
+      () => mockPlatformDriver as unknown as IPlatformDriver,
+    );
+    stateSnapshotCapability = new MetaMaskMobileStateSnapshotCapability({
+      getPlatformDriver: getPlatformDriverMock,
+    });
+  });
+
+  describe('getState', () => {
+    it('returns app state with current screen', async () => {
+      mockPlatformDriver.getTestIds.mockResolvedValue([
+        createTestIdItem('wallet-screen'),
+      ]);
+
+      const result = await stateSnapshotCapability.getState(
+        undefined as never,
+        {} as never,
+      );
+
+      expect(result).toEqual({
+        isLoaded: true,
+        currentUrl: '',
+        extensionId: '',
+        isUnlocked: true,
+        accountAddress: '0x123',
+        networkName: 'Ethereum Mainnet',
+        chainId: '1',
+        balance: '1.5',
+        currentScreen: 'home',
+      });
+    });
+
+    it('returns default state when platform driver not available', async () => {
+      getPlatformDriverMock.mockReturnValue(undefined);
+
+      const result = await stateSnapshotCapability.getState(
+        undefined as never,
+        {} as never,
+      );
+
+      expect(result).toEqual({
+        isLoaded: false,
+        currentUrl: '',
+        extensionId: '',
+        isUnlocked: false,
+        currentScreen: 'unknown',
+        accountAddress: null,
+        networkName: null,
+        chainId: null,
+        balance: null,
+      });
+    });
+  });
+
+  describe('detectCurrentScreen', () => {
+    it('detects unlock screen from login testId', async () => {
+      mockPlatformDriver.getTestIds.mockResolvedValue([
+        createTestIdItem('login'),
+      ]);
+
+      const result = await stateSnapshotCapability.detectCurrentScreen(
+        undefined as never,
+      );
+
+      expect(result).toBe('unlock');
+    });
+
+    it('detects unlock screen from login-with-biometric-switch', async () => {
+      mockPlatformDriver.getTestIds.mockResolvedValue([
+        createTestIdItem('login-with-biometric-switch'),
+      ]);
+
+      const result = await stateSnapshotCapability.detectCurrentScreen(
+        undefined as never,
+      );
+
+      expect(result).toBe('unlock');
+    });
+
+    it('detects onboarding-welcome screen from onboarding-screen', async () => {
+      mockPlatformDriver.getTestIds.mockResolvedValue([
+        createTestIdItem('onboarding-screen'),
+      ]);
+
+      const result = await stateSnapshotCapability.detectCurrentScreen(
+        undefined as never,
+      );
+
+      expect(result).toBe('onboarding-welcome');
+    });
+
+    it('detects onboarding-welcome screen from create wallet button', async () => {
+      mockPlatformDriver.getTestIds.mockResolvedValue([
+        createTestIdItem('wallet-setup-screen-create-new-wallet-button-id'),
+      ]);
+
+      const result = await stateSnapshotCapability.detectCurrentScreen(
+        undefined as never,
+      );
+
+      expect(result).toBe('onboarding-welcome');
+    });
+
+    it('detects home screen from wallet-screen testId', async () => {
+      mockPlatformDriver.getTestIds.mockResolvedValue([
+        createTestIdItem('wallet-screen'),
+      ]);
+
+      const result = await stateSnapshotCapability.detectCurrentScreen(
+        undefined as never,
+      );
+
+      expect(result).toBe('home');
+    });
+
+    it('detects home screen from tab bar wallet testId', async () => {
+      mockPlatformDriver.getTestIds.mockResolvedValue([
+        createTestIdItem('tab-bar-item-Wallet'),
+      ]);
+
+      const result = await stateSnapshotCapability.detectCurrentScreen(
+        undefined as never,
+      );
+
+      expect(result).toBe('home');
+    });
+
+    it('detects settings screen', async () => {
+      mockPlatformDriver.getTestIds.mockResolvedValue([
+        createTestIdItem('settings-scroll'),
+      ]);
+
+      const result = await stateSnapshotCapability.detectCurrentScreen(
+        undefined as never,
+      );
+
+      expect(result).toBe('settings');
+    });
+
+    it('returns unknown when no matching testIds found', async () => {
+      mockPlatformDriver.getTestIds.mockResolvedValue([
+        createTestIdItem('unknown-screen'),
+      ]);
+
+      const result = await stateSnapshotCapability.detectCurrentScreen(
+        undefined as never,
+      );
+
+      expect(result).toBe('unknown');
+    });
+
+    it('returns unknown when platform driver not available', async () => {
+      getPlatformDriverMock.mockReturnValue(undefined);
+
+      const result = await stateSnapshotCapability.detectCurrentScreen(
+        undefined as never,
+      );
+
+      expect(result).toBe('unknown');
+    });
+
+    it('returns unknown when getTestIds throws error', async () => {
+      mockPlatformDriver.getTestIds.mockRejectedValue(
+        new Error('Failed to get testIds'),
+      );
+
+      const result = await stateSnapshotCapability.detectCurrentScreen(
+        undefined as never,
+      );
+
+      expect(result).toBe('unknown');
+    });
+
+    it('detects first matching screen when multiple testIds present', async () => {
+      mockPlatformDriver.getTestIds.mockResolvedValue([
+        createTestIdItem('unknown-id'),
+        createTestIdItem('wallet-screen'),
+        createTestIdItem('settings-scroll'),
+      ]);
+
+      const result = await stateSnapshotCapability.detectCurrentScreen(
+        undefined as never,
+      );
+
+      expect(result).toBe('home');
+    });
+  });
+});
diff --git a/tests/llm-workflow/capabilities/factory.ts b/tests/llm-workflow/capabilities/factory.ts
new file mode 100644
index 000000000000..48c54c0999ed
--- /dev/null
+++ b/tests/llm-workflow/capabilities/factory.ts
@@ -0,0 +1,34 @@
+import type {
+  IPlatformDriver,
+  ProdEnvironmentConfig,
+  WorkflowContext,
+} from '@metamask/client-mcp-core';
+
+import { MetaMaskMobileStateSnapshotCapability } from './state-snapshot';
+
+const DEFAULT_PROD_CONFIG: ProdEnvironmentConfig = {
+  extensionName: 'MetaMask',
+  defaultPassword: 'correct horse battery staple',
+  artifactsDir: 'test-artifacts',
+  environment: 'prod',
+  defaultChainId: 1,
+};
+
+export interface CreateMetaMaskMobileContextOptions {
+  config?: Partial<Omit<ProdEnvironmentConfig, 'environment'>>;
+  getPlatformDriver: () => IPlatformDriver | undefined;
+}
+
+export function createMetaMaskMobileContext(
+  options: CreateMetaMaskMobileContextOptions,
+): WorkflowContext {
+  const config: ProdEnvironmentConfig = {
+    ...DEFAULT_PROD_CONFIG,
+    ...options.config,
+    environment: 'prod',
+  };
+  const stateSnapshot = new MetaMaskMobileStateSnapshotCapability({
+    getPlatformDriver: options.getPlatformDriver,
+  });
+  return { stateSnapshot, config };
+}
diff --git a/tests/llm-workflow/capabilities/index.ts b/tests/llm-workflow/capabilities/index.ts
new file mode 100644
index 000000000000..b9b9e25bc150
--- /dev/null
+++ b/tests/llm-workflow/capabilities/index.ts
@@ -0,0 +1,8 @@
+export {
+  MetaMaskMobileStateSnapshotCapability,
+  type StateSnapshotCapabilityOptions,
+} from './state-snapshot';
+export {
+  createMetaMaskMobileContext,
+  type CreateMetaMaskMobileContextOptions,
+} from './factory';
diff --git a/tests/llm-workflow/capabilities/state-snapshot.ts b/tests/llm-workflow/capabilities/state-snapshot.ts
new file mode 100644
index 000000000000..52cd428790db
--- /dev/null
+++ b/tests/llm-workflow/capabilities/state-snapshot.ts
@@ -0,0 +1,75 @@
+import type {
+  IPlatformDriver,
+  ScreenName,
+  StateOptions,
+  StateSnapshot,
+  StateSnapshotCapability,
+} from '@metamask/client-mcp-core';
+import type { Page } from '@playwright/test';
+
+const SCREEN_DETECTION_MAP = new Map<string, ScreenName>([
+  ['login', 'unlock'],
+  ['login-with-biometric-switch', 'unlock'],
+  ['login-password-input', 'unlock'],
+  ['onboarding-screen', 'onboarding-welcome'],
+  ['wallet-setup-screen-create-new-wallet-button-id', 'onboarding-welcome'],
+  ['wallet-screen', 'home'],
+  ['tab-bar-item-Wallet', 'home'],
+  ['account-overview', 'home'],
+  ['settings-scroll', 'settings'],
+  ['settings-header', 'settings'],
+]);
+
+export interface StateSnapshotCapabilityOptions {
+  /** Resolver returning the current iOS platform driver (may be undefined if no session). */
+  getPlatformDriver: () => IPlatformDriver | undefined;
+}
+
+export class MetaMaskMobileStateSnapshotCapability
+  implements StateSnapshotCapability
+{
+  private readonly getPlatformDriver: () => IPlatformDriver | undefined;
+
+  constructor(options: StateSnapshotCapabilityOptions) {
+    this.getPlatformDriver = options.getPlatformDriver;
+  }
+
+  async getState(_page: Page, _options: StateOptions): Promise<StateSnapshot> {
+    const platformDriver = this.getPlatformDriver();
+    if (!platformDriver) {
+      return {
+        isLoaded: false,
+        currentUrl: '',
+        extensionId: '',
+        isUnlocked: false,
+        currentScreen: 'unknown',
+        accountAddress: null,
+        networkName: null,
+        chainId: null,
+        balance: null,
+      };
+    }
+    const appState = await platformDriver.getAppState();
+    const currentScreen = await this.detectCurrentScreen(_page);
+    return { ...appState, currentScreen };
+  }
+
+  async detectCurrentScreen(_page: Page): Promise<string> {
+    const platformDriver = this.getPlatformDriver();
+    if (!platformDriver) {
+      return 'unknown';
+    }
+    try {
+      const testIds = await platformDriver.getTestIds();
+      for (const item of testIds) {
+        const screen = SCREEN_DETECTION_MAP.get(item.testId);
+        if (screen) {
+          return screen;
+        }
+      }
+      return 'unknown';
+    } catch {
+      return 'unknown';
+    }
+  }
+}
diff --git a/tests/llm-workflow/daemon-entry.cjs b/tests/llm-workflow/daemon-entry.cjs
new file mode 100644
index 000000000000..9a01a5299cab
--- /dev/null
+++ b/tests/llm-workflow/daemon-entry.cjs
@@ -0,0 +1,57 @@
+#!/usr/bin/env node
+// Bootstrap for the mm-mobile daemon.
+//
+// The daemon process runs under `tsx` (esbuild) which transforms every JS/TS
+// file it encounters.  Several @metamask packages transitively depend on
+// react-native and react-native-nitro-modules whose source files contain Flow
+// syntax that esbuild cannot parse.
+//
+// Two layers of defence keep the module graph intact:
+//
+// 1. nodeNativeUtilsShim — intercepts `require('@metamask/native-utils')` at
+//    the Module._load level, returning real JS implementations (via
+//    @noble/curves) instead of the native C++ module.  This is the primary
+//    fix: the Yarn-patched @ethereumjs/util replaces pubToAddress with
+//    `require('@metamask/native-utils').pubToAddress`, which would otherwise
+//    pull in react-native-nitro-modules → react-native.  With the shim in
+//    place the downstream chain never fires, and functions like pubToAddress
+//    return correct values instead of silent noops.
+//
+// 2. Module._resolveFilename stubs — a safety net that redirects any
+//    remaining react-native / react-native-nitro-modules imports (from
+//    unknown transitive paths) to lightweight stubs so esbuild never
+//    encounters Flow syntax.
+'use strict';
+
+const Module = require('node:module');
+const path = require('node:path');
+
+// Layer 1: real JS fallbacks for @metamask/native-utils (must run first).
+require('../../tests/framework/nodeNativeUtilsShim.cjs');
+
+// Layer 2: filename-level redirects for react-native packages.
+const STUBS_DIR = path.join(__dirname, 'stubs');
+
+const REDIRECT_MAP = {
+  'react-native': path.join(STUBS_DIR, 'react-native.cjs'),
+  'react-native-nitro-modules': path.join(STUBS_DIR, 'react-native-nitro-modules.cjs'),
+};
+
+const originalResolve = Module._resolveFilename;
+
+Module._resolveFilename = function patchedResolve(request, parent, isMain, options) {
+  for (const [pkg, stubPath] of Object.entries(REDIRECT_MAP)) {
+    if (request === pkg || request.startsWith(pkg + '/')) {
+      return stubPath;
+    }
+  }
+  return originalResolve.call(this, request, parent, isMain, options);
+};
+
+// Load the real daemon.  Dynamic import() is fine here — both hooks above are
+// already synchronously registered so any transitive require() inside daemon.ts
+// (or its capability modules) will hit the shim / stubs.
+import('./daemon.ts').catch((err) => {
+  process.stderr.write(`daemon-entry: failed to load daemon.ts: ${err.message}\n`);
+  process.exit(1);
+});
diff --git a/tests/llm-workflow/daemon.ts b/tests/llm-workflow/daemon.ts
new file mode 100644
index 000000000000..24d511359a4f
--- /dev/null
+++ b/tests/llm-workflow/daemon.ts
@@ -0,0 +1,42 @@
+#!/usr/bin/env node
+/* eslint-disable import-x/no-nodejs-modules, import-x/no-extraneous-dependencies */
+import path from 'path';
+import {
+  createServer,
+  KnowledgeStore,
+  setKnowledgeStore,
+} from '@metamask/client-mcp-core';
+
+import { createMetaMaskMobileContext } from './capabilities';
+import { MetaMaskMobileSessionManager } from './metamask-provider';
+import { resolveRepoRoot } from './resolve-repo-root';
+
+// Single shared KnowledgeStore instance used by both the global singleton
+// (for session manager metadata recording) and createServer (for tool context).
+const knowledgeStore = new KnowledgeStore();
+setKnowledgeStore(knowledgeStore);
+
+const sessionManager = new MetaMaskMobileSessionManager();
+
+const server = createServer({
+  sessionManager,
+  knowledgeStore,
+  idleShutdownMs: 30 * 60 * 1000,
+  logFilePath: path.join(resolveRepoRoot(), '.mm-daemon.log'),
+  contextFactory: async () =>
+    createMetaMaskMobileContext({
+      getPlatformDriver: () => sessionManager.getPlatformDriver(),
+    }),
+});
+
+server
+  .start()
+  .then((state) => {
+    process.stderr.write(
+      `MetaMask Mobile daemon started on port ${state.port}\n`,
+    );
+  })
+  .catch((error: Error) => {
+    process.stderr.write(`Failed to start daemon: ${error.message}\n`);
+    process.exit(1);
+  });
diff --git a/tests/llm-workflow/doctor-entry.ts b/tests/llm-workflow/doctor-entry.ts
new file mode 100644
index 000000000000..0e60fb5d055e
--- /dev/null
+++ b/tests/llm-workflow/doctor-entry.ts
@@ -0,0 +1,6 @@
+/* eslint-disable import-x/no-nodejs-modules */
+import { collectDoctorReport, formatDoctorReport } from './ios/doctor';
+
+const report = collectDoctorReport();
+process.stdout.write(`${formatDoctorReport(report)}\n`);
+process.exit(report.ok ? 0 : 1);
diff --git a/tests/llm-workflow/index.ts b/tests/llm-workflow/index.ts
new file mode 100644
index 000000000000..5893c132dfdf
--- /dev/null
+++ b/tests/llm-workflow/index.ts
@@ -0,0 +1,2 @@
+export { MetaMaskMobileSessionManager } from './metamask-provider';
+export * from './launcher-types';
diff --git a/tests/llm-workflow/ios/accessibility-bridge.ts b/tests/llm-workflow/ios/accessibility-bridge.ts
new file mode 100644
index 000000000000..010c335829c4
--- /dev/null
+++ b/tests/llm-workflow/ios/accessibility-bridge.ts
@@ -0,0 +1,83 @@
+import { execFileSync } from 'node:child_process';
+
+/**
+ * Conservative settle wait after writing the accessibility flag, pending the
+ * Task 0 empirical probe that determines whether `defaults write` propagates
+ * into the app sandbox synchronously enough before a subsequent
+ * `simctl launch`. Trivially tunable — set to 0 once the probe confirms
+ * synchronous propagation, or raise if collapsed a11y trees are observed.
+ */
+export const ACCESSIBILITY_SETTLE_MS = 250;
+
+const ACCESSIBILITY_DOMAIN = 'com.apple.Accessibility';
+const ACCESSIBILITY_KEY = 'ApplicationAccessibilityEnabled';
+
+/**
+ * Reads the current value of the simulator's
+ * `ApplicationAccessibilityEnabled` preference.
+ *
+ * Returns `false` when the key does not exist (fresh-booted sim) or when the
+ * `defaults read` command fails for any other reason — this is the one
+ * tolerated-error case (the key is absent on a fresh sim).
+ *
+ * @param udid - The simulator UDID to spawn the command on.
+ * @returns `true` if the flag is already enabled, `false` otherwise.
+ */
+export function readAccessibilityBridge(udid: string): boolean {
+  try {
+    const output = execFileSync(
+      'xcrun',
+      [
+        'simctl',
+        'spawn',
+        udid,
+        'defaults',
+        'read',
+        ACCESSIBILITY_DOMAIN,
+        ACCESSIBILITY_KEY,
+      ],
+      { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] },
+    ).trim();
+    return output === '1' || output.toLowerCase() === 'true';
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Ensures the accessibility bridge is enabled on the simulator, proactively
+ * setting the flag at boot (before any launch decision) so that
+ * `IdbBackend.ensureConnected()` finds it already on.
+ *
+ * Uses `execFileSync` to guarantee write-before-launch ordering. The prior
+ * value is captured so the caller knows whether a one-time relaunch is needed
+ * (only the pre-existing-app-on-fresh-boot case requires it).
+ *
+ * @param udid - The simulator UDID to spawn the command on.
+ * @returns `{ wasAlreadyOn: boolean }` — the prior value of the flag.
+ */
+export function ensureAccessibilityBridgeEnabled(
+  udid: string,
+): { wasAlreadyOn: boolean } {
+  const wasAlreadyOn = readAccessibilityBridge(udid);
+
+  if (!wasAlreadyOn) {
+    execFileSync(
+      'xcrun',
+      [
+        'simctl',
+        'spawn',
+        udid,
+        'defaults',
+        'write',
+        ACCESSIBILITY_DOMAIN,
+        ACCESSIBILITY_KEY,
+        '-bool',
+        'true',
+      ],
+      { stdio: ['ignore', 'pipe', 'pipe'] },
+    );
+  }
+
+  return { wasAlreadyOn };
+}
diff --git a/tests/llm-workflow/ios/doctor.ts b/tests/llm-workflow/ios/doctor.ts
new file mode 100644
index 000000000000..39706e6e29c7
--- /dev/null
+++ b/tests/llm-workflow/ios/doctor.ts
@@ -0,0 +1,119 @@
+/* eslint-disable import-x/no-nodejs-modules */
+import { execFileSync } from 'node:child_process';
+
+import {
+  IDB_INSTALL_HINT,
+  isIdbAvailable,
+  isIdbCompanionAvailable,
+} from './environment-checks';
+
+export interface DoctorCheck {
+  name: string;
+  ok: boolean;
+  detail: string;
+  remediation?: string;
+}
+
+export interface DoctorReport {
+  ok: boolean;
+  checks: DoctorCheck[];
+}
+
+function isSimctlAvailable(): boolean {
+  try {
+    execFileSync('xcrun', ['simctl', 'help'], {
+      stdio: ['ignore', 'ignore', 'ignore'],
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function countBootedSimulators(): number | null {
+  try {
+    const output = execFileSync(
+      'xcrun',
+      ['simctl', 'list', 'devices', 'booted', '--json'],
+      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] },
+    );
+    const parsed = JSON.parse(output) as {
+      devices?: Record<string, { state?: string }[]>;
+    };
+    return Object.values(parsed.devices ?? {})
+      .flat()
+      .filter((entry) => entry.state === 'Booted').length;
+  } catch {
+    return null;
+  }
+}
+
+export function collectDoctorReport(): DoctorReport {
+  const checks: DoctorCheck[] = [];
+
+  const simctlOk = isSimctlAvailable();
+  checks.push({
+    name: 'Xcode command-line tools (xcrun simctl)',
+    ok: simctlOk,
+    detail: simctlOk ? 'available' : '`xcrun simctl` not found',
+    remediation: simctlOk
+      ? undefined
+      : 'Install Xcode from the Mac App Store and run `xcode-select --install`.',
+  });
+
+  const idbOk = isIdbAvailable();
+  checks.push({
+    name: 'idb (fb-idb CLI)',
+    ok: idbOk,
+    detail: idbOk ? 'available' : '`idb` not found on PATH or in Homebrew paths',
+    remediation: idbOk ? undefined : `Install idb: ${IDB_INSTALL_HINT}`,
+  });
+
+  const companionOk = isIdbCompanionAvailable();
+  checks.push({
+    name: 'idb_companion (daemon)',
+    ok: companionOk,
+    detail: companionOk ? 'available' : '`idb_companion` not found',
+    remediation: companionOk
+      ? undefined
+      : 'Install idb_companion: brew tap facebook/fb && brew install idb-companion',
+  });
+
+  const bootedCount = simctlOk ? countBootedSimulators() : null;
+  const simulatorOk = bootedCount !== null && bootedCount > 0;
+  checks.push({
+    name: 'Booted iOS Simulator',
+    ok: simulatorOk,
+    detail:
+      bootedCount === null
+        ? 'unable to query simulators'
+        : bootedCount === 0
+          ? 'no simulator is booted'
+          : `${bootedCount} booted`,
+    remediation: simulatorOk
+      ? undefined
+      : 'Boot a simulator: `xcrun simctl boot <UDID>` (or open Xcode > Window > Devices and Simulators).',
+  });
+
+  return {
+    ok: checks.every((check) => check.ok),
+    checks,
+  };
+}
+
+export function formatDoctorReport(report: DoctorReport): string {
+  const lines = report.checks.map((check) => {
+    const status = check.ok ? 'PASS' : 'FAIL';
+    const base = `[${status}] ${check.name} — ${check.detail}`;
+    return check.remediation ? `${base}\n       → ${check.remediation}` : base;
+  });
+
+  lines.push('');
+  lines.push(
+    report.ok
+      ? 'All iOS visual-testing prerequisites satisfied.'
+      : 'Some prerequisites are missing. Fix the items marked FAIL above, then re-run `yarn mm:doctor`.',
+  );
+
+  return lines.join('\n');
+}
diff --git a/tests/llm-workflow/ios/environment-checks.ts b/tests/llm-workflow/ios/environment-checks.ts
new file mode 100644
index 000000000000..2c56bad4cdb8
--- /dev/null
+++ b/tests/llm-workflow/ios/environment-checks.ts
@@ -0,0 +1,71 @@
+/* eslint-disable import-x/no-nodejs-modules */
+import { execFileSync } from 'node:child_process';
+
+import { IOSLaunchError } from '../launcher-types';
+
+// device-mcp's IdbBackend shells out to `idb` (fb-idb), which in turn talks to
+// the `idb_companion` daemon. This single hint installs both.
+export const IDB_INSTALL_HINT =
+  'brew tap facebook/fb && brew install idb-companion && pip3 install fb-idb';
+
+// A binary is "installed" when it can be spawned at all. We only treat ENOENT
+// (not found) as missing — a non-zero exit still means the binary exists, which
+// matters because probe flags differ: `idb --help` exits 0 but `idb --version`
+// exits 2, while `idb_companion --help` exits 1 but `idb_companion --version`
+// exits 0.
+function isBinaryInstalled(file: string, args: string[]): boolean {
+  try {
+    execFileSync(file, args, { stdio: ['ignore', 'ignore', 'ignore'] });
+    return true;
+  } catch (error) {
+    return (error as NodeJS.ErrnoException).code !== 'ENOENT';
+  }
+}
+
+/**
+ * @throws {IOSLaunchError} `MM_DEPENDENCIES_MISSING` when Xcode tools are absent.
+ */
+export function validateSimctlAvailable(): void {
+  if (!isBinaryInstalled('xcrun', ['simctl', 'help'])) {
+    throw new IOSLaunchError({
+      code: 'MM_DEPENDENCIES_MISSING',
+      message: '`xcrun simctl` not available. Is Xcode installed?',
+      remediation:
+        'Install Xcode from the Mac App Store and run `xcode-select --install`.',
+    });
+  }
+}
+
+// Probe order mirrors device-mcp's resolveIdbPath: PATH first, then Homebrew.
+export function isIdbAvailable(): boolean {
+  const candidates = ['idb', '/opt/homebrew/bin/idb', '/usr/local/bin/idb'];
+  return candidates.some((candidate) =>
+    isBinaryInstalled(candidate, ['--help']),
+  );
+}
+
+export function isIdbCompanionAvailable(): boolean {
+  const candidates = [
+    'idb_companion',
+    '/opt/homebrew/bin/idb_companion',
+    '/usr/local/bin/idb_companion',
+  ];
+  return candidates.some((candidate) =>
+    isBinaryInstalled(candidate, ['--version']),
+  );
+}
+
+/**
+ * @throws {IOSLaunchError} `MM_DEPENDENCIES_MISSING` when `idb` is not found.
+ */
+export function validateIdbAvailable(): void {
+  if (!isIdbAvailable()) {
+    throw new IOSLaunchError({
+      code: 'MM_DEPENDENCIES_MISSING',
+      message:
+        '`idb` (Facebook iOS Debug Bridge) not found. It is required to drive ' +
+        'the iOS Simulator (tap, type, snapshot, screenshot).',
+      remediation: `Install idb: ${IDB_INSTALL_HINT}`,
+    });
+  }
+}
diff --git a/tests/llm-workflow/ios/hermes-health.ts b/tests/llm-workflow/ios/hermes-health.ts
new file mode 100644
index 000000000000..04625c134d9f
--- /dev/null
+++ b/tests/llm-workflow/ios/hermes-health.ts
@@ -0,0 +1,166 @@
+/* eslint-disable import-x/no-extraneous-dependencies */
+import {
+  fetchDiscoveryTargets,
+  selectHermesTarget,
+  type HermesTarget,
+} from '@metamask/device-mcp';
+
+const DEFAULT_PROBE_INTERVAL_MS = 500;
+const DEFAULT_PROBE_CEILING_MS = 3_000;
+const DEFAULT_FETCH_TIMEOUT_MS = 2_000;
+const DEFAULT_LIVENESS_TIMEOUT_MS = 5_000;
+
+export type ProbeHermesHealthyInput = {
+  port: number;
+  appId: string;
+  pinnedDeviceId?: string;
+  intervalMs?: number;
+  ceilingMs?: number;
+  fetchTimeoutMs?: number;
+};
+
+export type ProbeHermesHealthyResult = {
+  healthy: boolean;
+  target?: HermesTarget;
+  pinnedDeviceId?: string;
+  reason?: string;
+};
+
+export type ProbeHermesHealthy = typeof probeHermesHealthy;
+
+/**
+ * Bounded poll for a healthy Hermes target matching `appId` on the given
+ * Metro port. Repeats `fetchDiscoveryTargets` + `selectHermesTarget` every
+ * `intervalMs` until a healthy target is found or `ceilingMs` elapses.
+ *
+ * Persisting failure for the full ceiling (e.g. release build with no
+ * Hermes inspector, or genuinely detached app) yields `{ healthy: false }`
+ * with the last failure `reason`.
+ */
+export async function probeHermesHealthy(
+  input: ProbeHermesHealthyInput,
+): Promise<ProbeHermesHealthyResult> {
+  const intervalMs = input.intervalMs ?? DEFAULT_PROBE_INTERVAL_MS;
+  const ceilingMs = input.ceilingMs ?? DEFAULT_PROBE_CEILING_MS;
+  const fetchTimeoutMs = input.fetchTimeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS;
+  const deadline = Date.now() + ceilingMs;
+  let lastReason = 'HERMES_TARGET_NOT_FOUND';
+
+  while (Date.now() < deadline) {
+    try {
+      const targets = await fetchDiscoveryTargets(input.port, fetchTimeoutMs);
+      const selection = selectHermesTarget(
+        targets,
+        input.appId,
+        input.pinnedDeviceId,
+      );
+
+      if (selection.ok) {
+        const logicalDeviceId =
+          selection.target.reactNative?.logicalDeviceId;
+        return {
+          healthy: true,
+          target: selection.target,
+          pinnedDeviceId: logicalDeviceId ?? input.pinnedDeviceId,
+        };
+      }
+
+      lastReason = selection.code;
+    } catch (error) {
+      lastReason =
+        error instanceof Error ? error.message : 'discovery fetch failed';
+    }
+
+    const remaining = deadline - Date.now();
+    if (remaining > 0) {
+      await sleep(Math.min(intervalMs, remaining));
+    }
+  }
+
+  return { healthy: false, reason: lastReason };
+}
+
+/**
+ * Verifies that the Hermes runtime at the given CDP WebSocket URL is actively
+ * executing JavaScript by sending a single `Runtime.evaluate` (`1+1`) and
+ * checking for a prompt result.
+ *
+ * Feature-detects `globalThis.WebSocket` — on Node 20 without
+ * `--experimental-websocket` the global is absent, and this function degrades
+ * gracefully by returning `false` (callers treat this as "cannot verify
+ * liveness" and fall back to target-presence-only health).
+ */
+export async function verifyJsLiveness(
+  webSocketDebuggerUrl: string,
+  timeoutMs = DEFAULT_LIVENESS_TIMEOUT_MS,
+): Promise<boolean> {
+  if (typeof globalThis.WebSocket !== 'function') {
+    process.stderr.write(
+      '[mm-mobile] hermes-health: global WebSocket unavailable (Node 20 needs --experimental-websocket); skipping JS liveness probe\n',
+    );
+    return false;
+  }
+
+  return new Promise<boolean>((resolve) => {
+    let settled = false;
+    const WebSocketCtor = globalThis.WebSocket;
+    let ws: WebSocket;
+    let timeoutId: ReturnType<typeof setTimeout>;
+
+    const cleanup = () => {
+      if (timeoutId) clearTimeout(timeoutId);
+      if (
+        ws &&
+        (ws.readyState === WebSocketCtor.OPEN ||
+          ws.readyState === WebSocketCtor.CONNECTING)
+      ) {
+        ws.close();
+      }
+    };
+
+    const finish = (result: boolean) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      resolve(result);
+    };
+
+    timeoutId = setTimeout(() => finish(false), timeoutMs);
+
+    try {
+      ws = new WebSocketCtor(webSocketDebuggerUrl);
+    } catch {
+      finish(false);
+      return;
+    }
+
+    ws.onopen = () => {
+      const cdpMessage = JSON.stringify({
+        id: 1,
+        method: 'Runtime.evaluate',
+        params: { expression: '1+1', returnByValue: true },
+      });
+      ws.send(cdpMessage);
+    };
+
+    ws.onmessage = (event: MessageEvent) => {
+      try {
+        const payload = JSON.parse(
+          typeof event.data === 'string' ? event.data : String(event.data),
+        ) as { id?: number; result?: { value?: unknown } };
+        if (payload.id === 1 && payload.result) {
+          finish(true);
+        }
+      } catch {
+        // Ignore non-JSON or unexpected messages; keep waiting for the result.
+      }
+    };
+
+    ws.onerror = () => finish(false);
+    ws.onclose = () => finish(false);
+  });
+}
+
+function sleep(durationMs: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, durationMs));
+}
diff --git a/tests/llm-workflow/ios/metro-watch-attach.ts b/tests/llm-workflow/ios/metro-watch-attach.ts
new file mode 100644
index 000000000000..8552391fd765
--- /dev/null
+++ b/tests/llm-workflow/ios/metro-watch-attach.ts
@@ -0,0 +1,198 @@
+import { execFileSync } from 'node:child_process';
+
+import {
+  probeHermesHealthy,
+  verifyJsLiveness,
+  type ProbeHermesHealthy,
+} from './hermes-health';
+import { IOSLaunchError } from '../launcher-types';
+
+const DEFAULT_MAX_ATTEMPTS = 5;
+const DEFAULT_RETRY_DELAY_MS = 1_000;
+const DEFAULT_METRO_READY_TIMEOUT_MS = 30_000;
+const DEFAULT_DEEPLINK_TIMEOUT_MS = 10_000;
+const METRO_POLL_INTERVAL_MS = 500;
+const DEFAULT_HERMES_PROBE_INTERVAL_MS = 500;
+const DEFAULT_HERMES_PROBE_CEILING_MS = 20_000;
+const DEFAULT_LIVENESS_TIMEOUT_MS = 5_000;
+
+export type AttachToMetroOptions = {
+  simulatorUdid: string;
+  metroPort: number;
+  appBundleId: string;
+  pinnedDeviceId?: string;
+  maxAttempts?: number;
+  retryDelayMs?: number;
+  metroReadyTimeoutMs?: number;
+  hermesProbeIntervalMs?: number;
+  hermesProbeCeilingMs?: number;
+  livenessTimeoutMs?: number;
+  fetchImpl?: typeof fetch;
+  probeHealthyImpl?: ProbeHermesHealthy;
+  verifyLivenessImpl?: typeof verifyJsLiveness;
+};
+
+export type AttachToMetroResult = {
+  pinnedDeviceId?: string;
+};
+
+export function buildMetroDeepLink(metroPort: number): {
+  bundleUrl: string;
+  deepLinkUrl: string;
+} {
+  const bundleUrl =
+    `http://localhost:${metroPort}/index.bundle?` +
+    'platform=ios&dev=true&minify=false&disableOnboarding=1';
+  const deepLinkUrl =
+    `expo-metamask://expo-development-client/?url=` +
+    encodeURIComponent(bundleUrl);
+
+  return { bundleUrl, deepLinkUrl };
+}
+
+export async function attachToMetroWatchMode(
+  options: AttachToMetroOptions,
+): Promise<AttachToMetroResult> {
+  const maxAttempts = options.maxAttempts ?? DEFAULT_MAX_ATTEMPTS;
+  const metroReadyTimeoutMs =
+    options.metroReadyTimeoutMs ?? DEFAULT_METRO_READY_TIMEOUT_MS;
+  const fetchFn = options.fetchImpl ?? globalThis.fetch;
+  const probeHealthy = options.probeHealthyImpl ?? probeHermesHealthy;
+  const verifyLiveness = options.verifyLivenessImpl ?? verifyJsLiveness;
+  const hermesProbeIntervalMs =
+    options.hermesProbeIntervalMs ?? DEFAULT_HERMES_PROBE_INTERVAL_MS;
+  const hermesProbeCeilingMs =
+    options.hermesProbeCeilingMs ?? DEFAULT_HERMES_PROBE_CEILING_MS;
+  const livenessTimeoutMs =
+    options.livenessTimeoutMs ?? DEFAULT_LIVENESS_TIMEOUT_MS;
+  const { deepLinkUrl } = buildMetroDeepLink(options.metroPort);
+
+  process.stderr.write(
+    `[mm-mobile] metro-attach: opening deep link to Metro:${options.metroPort}\n`,
+  );
+
+  try {
+    execFileSync(
+      'xcrun',
+      ['simctl', 'openurl', options.simulatorUdid, deepLinkUrl],
+      {
+        stdio: ['ignore', 'pipe', 'pipe'],
+        timeout: DEFAULT_DEEPLINK_TIMEOUT_MS,
+      },
+    );
+  } catch (error) {
+    process.stderr.write(
+      `[mm-mobile] metro-attach: deep link open failed: ${errorMessage(error)}\n`,
+    );
+    throw new IOSLaunchError({
+      code: 'MM_DEVICE_NOT_AVAILABLE',
+      message: `Failed to open Metro deep link on simulator ${options.simulatorUdid}`,
+      remediation:
+        'Ensure the simulator is booted and the app is installed. Try `mm cleanup` then re-launch.',
+    });
+  }
+
+  const statusUrl = `http://localhost:${options.metroPort}/status`;
+
+  for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+    process.stderr.write(
+      `[mm-mobile] metro-attach: waiting for Metro to be ready (attempt ${attempt}/${maxAttempts})\n`,
+    );
+
+    if (await waitForMetroReady(statusUrl, metroReadyTimeoutMs, fetchFn)) {
+      process.stderr.write(
+        `[mm-mobile] metro-attach: Metro ready after attempt ${attempt}, probing Hermes health\n`,
+      );
+
+      const healthResult = await probeHealthy({
+        port: options.metroPort,
+        appId: options.appBundleId,
+        pinnedDeviceId: options.pinnedDeviceId,
+        intervalMs: hermesProbeIntervalMs,
+        ceilingMs: hermesProbeCeilingMs,
+      });
+
+      if (!healthResult.healthy || !healthResult.target?.webSocketDebuggerUrl) {
+        throw new IOSLaunchError({
+          code: 'MM_LAUNCH_FAILED',
+          message:
+            `Hermes health check failed after deep-link attach on port ${options.metroPort}` +
+            (healthResult.reason ? ` (reason: ${healthResult.reason})` : ''),
+          remediation:
+            healthResult.reason === 'HERMES_TARGET_NOT_FOUND'
+              ? 'Metro attach requires a dev build with a Hermes inspector. Release/prod builds have no debuggable target.'
+              : 'Ensure the app is installed and Metro is serving the correct bundle. Try `mm cleanup` then re-launch.',
+        });
+      }
+
+      const live = await verifyLiveness(
+        healthResult.target.webSocketDebuggerUrl,
+        livenessTimeoutMs,
+      );
+
+      if (!live) {
+        process.stderr.write(
+          '[mm-mobile] metro-attach: JS liveness probe failed or unavailable, proceeding with target-presence-only health\n',
+        );
+      }
+
+      process.stderr.write(
+        `[mm-mobile] metro-attach: Hermes target healthy, attach complete\n`,
+      );
+
+      return {
+        pinnedDeviceId: healthResult.pinnedDeviceId,
+      };
+    }
+
+    process.stderr.write(
+      `[mm-mobile] metro-attach: Metro not ready within ${metroReadyTimeoutMs}ms on attempt ${attempt}\n`,
+    );
+
+    if (attempt < maxAttempts) {
+      const retryDelayMs = options.retryDelayMs ?? DEFAULT_RETRY_DELAY_MS;
+      await sleep(retryDelayMs);
+    }
+  }
+
+  throw new IOSLaunchError({
+    code: 'MM_INVALID_CONFIG',
+    message: `Metro watch-mode attach failed after ${maxAttempts} attempts (port ${options.metroPort})`,
+    remediation:
+      'Ensure `yarn watch:clean` is running and the Metro bundler is responsive. Try `mm cleanup` then re-launch.',
+  });
+}
+
+async function waitForMetroReady(
+  statusUrl: string,
+  timeoutMs: number,
+  fetchFn: typeof fetch,
+): Promise<boolean> {
+  const deadline = Date.now() + timeoutMs;
+
+  while (Date.now() < deadline) {
+    try {
+      const response = await fetchFn(statusUrl, {
+        signal: AbortSignal.timeout(2_000),
+      });
+
+      if (response.ok) {
+        return true;
+      }
+    } catch {
+      // Keep polling until the overall deadline expires.
+    }
+
+    await sleep(METRO_POLL_INTERVAL_MS);
+  }
+
+  return false;
+}
+
+function sleep(durationMs: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, durationMs));
+}
+
+function errorMessage(error: unknown): string {
+  return error instanceof Error ? error.message : 'Unknown error';
+}
diff --git a/tests/llm-workflow/ios/platform-driver-factory.ts b/tests/llm-workflow/ios/platform-driver-factory.ts
new file mode 100644
index 000000000000..3567eec7c8aa
--- /dev/null
+++ b/tests/llm-workflow/ios/platform-driver-factory.ts
@@ -0,0 +1,39 @@
+import { MobilePlatformDriver } from '@metamask/client-mcp-core';
+import { createBackend } from '@metamask/device-mcp';
+// eslint-disable-next-line no-duplicate-imports
+import type { DeviceBackend } from '@metamask/device-mcp';
+
+import {
+  IOSLaunchError,
+  type ResolvedIOSLaunchOptions,
+} from '../launcher-types';
+
+export interface CreatedIOSDriver {
+  driver: MobilePlatformDriver;
+  backend: DeviceBackend;
+}
+
+/**
+ * Creates a MobilePlatformDriver backed by @metamask/device-mcp for iOS.
+ *
+ * Uses createBackend() which internally creates an IdbBackend for iOS
+ * simulators. This replaces the old XCUITestClient/IOSPlatformDriver
+ * approach from the previous client-mcp-core version.
+ */
+export async function createIOSPlatformDriver(
+  resolved: ResolvedIOSLaunchOptions,
+): Promise<CreatedIOSDriver> {
+  try {
+    const backend = await createBackend(resolved.simulatorDeviceId, 'ios');
+    const driver = new MobilePlatformDriver(backend, resolved.appBundleId);
+
+    return { driver, backend };
+  } catch (error) {
+    throw new IOSLaunchError({
+      code: 'MM_LAUNCH_FAILED',
+      message: error instanceof Error
+        ? error.message
+        : 'Failed to create iOS platform driver',
+    });
+  }
+}
diff --git a/tests/llm-workflow/ios/prerequisites.ts b/tests/llm-workflow/ios/prerequisites.ts
new file mode 100644
index 000000000000..396f9ee4a70d
--- /dev/null
+++ b/tests/llm-workflow/ios/prerequisites.ts
@@ -0,0 +1,329 @@
+import { execFileSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import path from 'node:path';
+
+import {
+  IOSLaunchError,
+  type IOSAppBundleMetadata,
+  type ResolvedIOSLaunchOptions,
+} from '../launcher-types';
+import { resolveRepoRoot } from '../resolve-repo-root';
+import {
+  validateIdbAvailable,
+  validateSimctlAvailable,
+} from './environment-checks';
+
+type SimctlDevice = {
+  udid: string;
+  state?: string;
+};
+
+type SimctlDevicesResponse = {
+  devices?: Record<string, SimctlDevice[]>;
+};
+
+type ResolveAppBundleInput = {
+  appBundlePath?: string;
+  simulatorDeviceId: string;
+  reinstall?: boolean;
+  resetAppData?: boolean;
+  allowFoxCodeMismatch?: boolean;
+};
+
+type ResolveAppBundleResult = {
+  appBundlePath: string;
+  appAlreadyInstalled: boolean;
+  selectedAppMetadata: IOSAppBundleMetadata;
+  installedAppMetadata: IOSAppBundleMetadata | null;
+  installAction: ResolvedIOSLaunchOptions['installAction'];
+};
+
+export async function validateIOSPrerequisites(input: {
+  simulatorDeviceId?: string;
+  appBundlePath?: string;
+  metroPort?: number;
+  reinstall?: boolean;
+  resetAppData?: boolean;
+  allowFoxCodeMismatch?: boolean;
+}): Promise<ResolvedIOSLaunchOptions> {
+  validateSimctlAvailable();
+  validateIdbAvailable();
+
+  const simulatorDeviceId = input.simulatorDeviceId
+    ? validateSimulatorDevice(input.simulatorDeviceId)
+    : resolveBootedSimulatorDevice();
+  const { appBundlePath, appAlreadyInstalled, selectedAppMetadata, installedAppMetadata, installAction } = resolveAppBundlePath({
+    appBundlePath: input.appBundlePath,
+    simulatorDeviceId,
+    reinstall: input.reinstall,
+    resetAppData: input.resetAppData,
+    allowFoxCodeMismatch: input.allowFoxCodeMismatch,
+  });
+
+  if (input.metroPort !== undefined) {
+    await validateMetroPort(input.metroPort);
+  }
+
+  return {
+    simulatorDeviceId,
+    appBundlePath,
+    appBundleId: selectedAppMetadata.bundleId,
+    metroPort: input.metroPort,
+    destination: `platform=iOS Simulator,id=${simulatorDeviceId}`,
+    appAlreadyInstalled,
+    selectedAppMetadata,
+    installedAppMetadata,
+    installAction,
+  };
+}
+
+function validateSimulatorDevice(simulatorDeviceId: string): string {
+  const devices = listSimctlDevices(['list', 'devices', '--json']);
+  const found = Object.values(devices.devices ?? {})
+    .flat()
+    .some((device) => device.udid === simulatorDeviceId);
+
+  if (!found) {
+    throw new IOSLaunchError({
+      code: 'MM_DEVICE_NOT_AVAILABLE',
+      message: `Simulator UDID ${simulatorDeviceId} not found`,
+      remediation: 'Run `xcrun simctl list devices` to find an available UDID.',
+    });
+  }
+
+  return simulatorDeviceId;
+}
+
+function resolveBootedSimulatorDevice(): string {
+  const devices = listSimctlDevices(['list', 'devices', 'booted', '--json']);
+  const booted = Object.values(devices.devices ?? {})
+    .flat()
+    .find((device) => device.state === 'Booted');
+
+  if (!booted) {
+    throw new IOSLaunchError({
+      code: 'MM_DEVICE_NOT_AVAILABLE',
+      message: 'No simulator is booted',
+      remediation:
+        'Boot a simulator: `xcrun simctl boot <UDID>` (or open Xcode > Window > Devices and Simulators).',
+    });
+  }
+
+  return booted.udid;
+}
+
+function listSimctlDevices(args: string[]): SimctlDevicesResponse {
+  try {
+    const output = execFileSync('xcrun', ['simctl', ...args], {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    return JSON.parse(output) as SimctlDevicesResponse;
+  } catch {
+    throw new IOSLaunchError({
+      code: 'MM_DEVICE_NOT_AVAILABLE',
+      message: 'Unable to list iOS simulator devices',
+      remediation: 'Run `xcrun simctl list devices --json` to verify simctl works.',
+    });
+  }
+}
+
+function resolveAppBundlePath(input: ResolveAppBundleInput): ResolveAppBundleResult {
+  const installedMeta = readInstalledAppMetadata(input.simulatorDeviceId);
+
+  // Guard: destructive flags without an explicit bundle would uninstall the only
+  // copy of the app (the simulator-internal path) and then fail to reinstall.
+  if (installedMeta && !input.appBundlePath && (input.reinstall || input.resetAppData)) {
+    throw new IOSLaunchError({
+      code: 'MM_INVALID_CONFIG',
+      message:
+        'Cannot use --reinstall or --reset-app-data without --app-bundle in prod context. ' +
+        'The installed app is the only copy and would be destroyed by the uninstall step.',
+      remediation:
+        'Provide --app-bundle <path> pointing to a local .app build.',
+    });
+  }
+
+  if (installedMeta && !input.appBundlePath) {
+    return {
+      appBundlePath: installedMeta.appBundlePath,
+      appAlreadyInstalled: true,
+      selectedAppMetadata: installedMeta,
+      installedAppMetadata: installedMeta,
+      installAction: 'reuse-installed',
+    };
+  }
+
+  if (installedMeta && input.appBundlePath) {
+    const resolvedExplicitPath = path.resolve(resolveRepoRoot(), input.appBundlePath);
+    assertValidAppBundle(resolvedExplicitPath);
+    const requestedMeta = readAppBundleMetadata(resolvedExplicitPath);
+
+    if (!installedMeta.foxCode || !requestedMeta.foxCode) {
+      process.stderr.write(
+        `[mm-mobile] WARNING: Cannot verify fox_code compatibility ` +
+        `(installed=${installedMeta.foxCode ?? 'missing'}, requested=${requestedMeta.foxCode ?? 'missing'}). ` +
+        `Proceeding with install.\n`,
+      );
+    }
+
+    if (
+      installedMeta.foxCode &&
+      requestedMeta.foxCode &&
+      installedMeta.foxCode !== requestedMeta.foxCode &&
+      !input.allowFoxCodeMismatch &&
+      !input.reinstall
+    ) {
+      throw new IOSLaunchError({
+        code: 'MM_INVALID_CONFIG',
+        message: [
+          `Refusing to install app with different fox_code.`,
+          `  Installed fox_code: ${installedMeta.foxCode}`,
+          `  Requested fox_code: ${requestedMeta.foxCode}`,
+          `Installing this bundle may make existing wallet/keychain data unreadable.`,
+        ].join('\n'),
+        remediation: [
+          'Options:',
+          '  1. Use the already-installed app (omit --app-bundle)',
+          '  2. Pass a matching --app-bundle',
+          '  3. Use --reinstall to replace the installed app (DESTRUCTIVE)',
+          '  4. Use --allow-fox-code-mismatch to bypass this guard (DANGEROUS)',
+        ].join('\n'),
+      });
+    }
+
+    return {
+      appBundlePath: requestedMeta.appBundlePath,
+      appAlreadyInstalled: true,
+      selectedAppMetadata: requestedMeta,
+      installedAppMetadata: installedMeta,
+      installAction: resolveDestructiveInstallAction(input, 'install-explicit'),
+    };
+  }
+
+  if (!installedMeta && !input.appBundlePath) {
+    throw new IOSLaunchError({
+      code: 'MM_INVALID_CONFIG',
+      message: 'No MetaMask app installed on the simulator and no --app-bundle provided.',
+      remediation: [
+        'Options:',
+        '  1. Install an app first: yarn install:ios:runway',
+        '  2. Provide an explicit bundle: --app-bundle build/MetaMask.app',
+      ].join('\n'),
+    });
+  }
+
+  const resolvedExplicitPath = path.resolve(resolveRepoRoot(), input.appBundlePath!);
+  assertValidAppBundle(resolvedExplicitPath);
+  const requestedMeta = readAppBundleMetadata(resolvedExplicitPath);
+  return {
+    appBundlePath: requestedMeta.appBundlePath,
+    appAlreadyInstalled: false,
+    selectedAppMetadata: requestedMeta,
+    installedAppMetadata: null,
+    installAction: 'install-new',
+  };
+}
+
+function resolveDestructiveInstallAction(
+  input: ResolveAppBundleInput,
+  defaultAction: ResolveAppBundleResult['installAction'],
+): ResolveAppBundleResult['installAction'] {
+  if (input.resetAppData) return 'reset-and-install';
+  if (input.reinstall) return 'reinstall';
+  return defaultAction;
+}
+
+const METAMASK_BUNDLE_ID = 'io.metamask.MetaMask';
+
+function getInstalledAppPath(simulatorDeviceId: string, bundleId: string = METAMASK_BUNDLE_ID): string | null {
+  try {
+    const output = execFileSync(
+      'xcrun',
+      ['simctl', 'get_app_container', simulatorDeviceId, bundleId, 'app'],
+      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] },
+    ).trim();
+    return output.endsWith('.app') && existsSync(output) ? output : null;
+  } catch {
+    return null;
+  }
+}
+
+export function readInstalledAppMetadata(
+  simulatorDeviceId: string,
+  bundleId: string = METAMASK_BUNDLE_ID,
+): IOSAppBundleMetadata | null {
+  const appPath = getInstalledAppPath(simulatorDeviceId, bundleId);
+  if (!appPath) return null;
+  return readAppBundleMetadata(appPath);
+}
+
+function assertValidAppBundle(appBundlePath: string): void {
+  if (!appBundlePath.endsWith('.app') || !existsSync(appBundlePath)) {
+    throwAppBundleNotFound(appBundlePath);
+  }
+}
+
+function throwAppBundleNotFound(
+  appBundlePath: string,
+): never {
+  throw new IOSLaunchError({
+    code: 'MM_INVALID_CONFIG',
+    message: `MetaMask.app not found at ${appBundlePath}`,
+    remediation: 'Build and run the iOS app first, for example with `yarn start:ios`.',
+  });
+}
+
+async function validateMetroPort(metroPort: number): Promise<void> {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 2_000);
+
+  try {
+    const response = await fetch(`http://localhost:${metroPort}/status`, {
+      method: 'GET',
+      signal: controller.signal,
+    });
+
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}`);
+    }
+  } catch {
+    throw new IOSLaunchError({
+      code: 'MM_INVALID_CONFIG',
+      message: `Metro bundler not reachable on port ${metroPort}`,
+      remediation: 'Run `yarn watch:clean` in another terminal.',
+    });
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
+function readPlistKey(appBundlePath: string, key: string): string | null {
+  try {
+    return execFileSync(
+      'defaults',
+      ['read', path.join(appBundlePath, 'Info'), key],
+      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] },
+    ).trim() || null;
+  } catch {
+    return null;
+  }
+}
+
+export function readAppBundleMetadata(appBundlePath: string): IOSAppBundleMetadata {
+  const bundleId = readPlistKey(appBundlePath, 'CFBundleIdentifier');
+  if (!bundleId) {
+    throw new IOSLaunchError({
+      code: 'MM_INVALID_CONFIG',
+      message: `Cannot read CFBundleIdentifier from ${appBundlePath}/Info.plist. The .app bundle may be corrupt.`,
+      remediation: 'Rebuild the app or provide a valid .app bundle path.',
+    });
+  }
+  return {
+    appBundlePath,
+    bundleId,
+    foxCode: readPlistKey(appBundlePath, 'fox_code'),
+    shortVersion: readPlistKey(appBundlePath, 'CFBundleShortVersionString'),
+    buildVersion: readPlistKey(appBundlePath, 'CFBundleVersion'),
+  };
+}
diff --git a/tests/llm-workflow/launcher-types.ts b/tests/llm-workflow/launcher-types.ts
new file mode 100644
index 000000000000..6729d6fb5ff7
--- /dev/null
+++ b/tests/llm-workflow/launcher-types.ts
@@ -0,0 +1,89 @@
+/* eslint-disable import-x/no-extraneous-dependencies */
+import type { ErrorCode } from '@metamask/client-mcp-core';
+
+/**
+ * Resolved iOS launch options after prerequisites validation.
+ */
+export interface ResolvedIOSLaunchOptions {
+  /** UDID of the target simulator device (from input or auto-resolved booted device). */
+  readonly simulatorDeviceId: string;
+  /** Absolute path to MetaMask.app bundle (.app directory). */
+  readonly appBundlePath: string;
+  /** iOS application bundle identifier. */
+  readonly appBundleId: string;
+  /** Optional Metro bundler port for watch-mode attach (Phase 3). */
+  readonly metroPort?: number;
+  /** xcodebuild destination string built from simulator UDID (e.g. `platform=iOS Simulator,id=<UDID>`). */
+  readonly destination: string;
+  /** True when the app was discovered already installed on the target simulator (factual, never mutated). */
+  readonly appAlreadyInstalled: boolean;
+  /** Metadata from the `.app` bundle that was selected for this launch. */
+  readonly selectedAppMetadata: IOSAppBundleMetadata;
+  /** Metadata from the app currently installed on the target simulator (null if none). */
+  readonly installedAppMetadata: IOSAppBundleMetadata | null;
+  /**
+   * How the app will be installed during this launch.
+   *
+   * - `reuse-installed`   – App is already on the simulator, no install needed.
+   * - `install-new`       – No app on simulator, install from resolved path.
+   * - `install-explicit`  – Explicit bundle provided, install it.
+   * - `reinstall`         – Uninstall existing app, then install from resolved path.
+   * - `reset-and-install` – Terminate + uninstall existing app (clearing data), then install.
+   */
+  readonly installAction:
+    | 'reuse-installed'
+    | 'install-new'
+    | 'install-explicit'
+    | 'reinstall'
+    | 'reset-and-install';
+}
+
+/**
+ * Metadata extracted from an iOS `.app` bundle's Info.plist.
+ */
+export interface IOSAppBundleMetadata {
+  /** Absolute path to the resolved `.app` bundle directory. */
+  appBundlePath: string;
+  /** iOS application bundle identifier (CFBundleIdentifier). */
+  bundleId: string;
+  /** The `fox_code` plist key, used to distinguish production vs dev/e2e builds. */
+  foxCode: string | null;
+  /** CFBundleShortVersionString — user-facing version like "7.35.0". */
+  shortVersion: string | null;
+  /** CFBundleVersion — build number. */
+  buildVersion: string | null;
+}
+
+/**
+ * Error codes used by iOS prerequisites and launch.
+ *
+ * Constrained to core `ErrorCode`s: the `launch` tool collapses unknown codes
+ * into `MM_LAUNCH_FAILED`. iOS-specific detail belongs in the message and
+ * `remediation`.
+ */
+export type IOSLaunchErrorCode = Extract<
+  ErrorCode,
+  | 'MM_LAUNCH_FAILED'
+  | 'MM_SESSION_ALREADY_RUNNING'
+  | 'MM_DEPENDENCIES_MISSING'
+  | 'MM_DEVICE_NOT_AVAILABLE'
+  | 'MM_INVALID_CONFIG'
+>;
+
+export class IOSLaunchError extends Error {
+  readonly code: IOSLaunchErrorCode;
+
+  /** Optional remediation hint shown alongside the error message. */
+  readonly remediation?: string;
+
+  constructor(args: {
+    code: IOSLaunchErrorCode;
+    message: string;
+    remediation?: string;
+  }) {
+    super(args.message);
+    this.name = 'IOSLaunchError';
+    this.code = args.code;
+    this.remediation = args.remediation;
+  }
+}
diff --git a/tests/llm-workflow/metamask-provider.ts b/tests/llm-workflow/metamask-provider.ts
new file mode 100644
index 000000000000..11526333b618
--- /dev/null
+++ b/tests/llm-workflow/metamask-provider.ts
@@ -0,0 +1,795 @@
+/* eslint-disable import-x/no-nodejs-modules, import-x/no-extraneous-dependencies */
+import { execFileSync } from 'node:child_process';
+import { randomUUID } from 'node:crypto';
+
+import type { BrowserContext, Page } from '@playwright/test';
+import {
+  type BuildCapability,
+  type ChainCapability,
+  type ContractSeedingCapability,
+  type EnvironmentMode,
+  type ExtensionState,
+  type FixtureCapability,
+  type IPlatformDriver,
+  type ISessionManager,
+  type ScreenshotResult,
+  type SessionLaunchInput,
+  type SessionLaunchResult,
+  type SessionMetadata,
+  type SessionScreenshotOptions,
+  type SessionState,
+  type StateSnapshotCapability,
+  type TabRole,
+  type TrackedPage,
+  type WorkflowContext,
+} from '@metamask/client-mcp-core';
+
+import {
+  createIOSPlatformDriver,
+  type CreatedIOSDriver,
+} from './ios/platform-driver-factory';
+import { attachToMetroWatchMode } from './ios/metro-watch-attach';
+import { ensureAccessibilityBridgeEnabled } from './ios/accessibility-bridge';
+import { probeHermesHealthy } from './ios/hermes-health';
+import { validateIOSPrerequisites } from './ios/prerequisites';
+import {
+  IOSLaunchError,
+  type ResolvedIOSLaunchOptions,
+} from './launcher-types';
+import { appendLog } from './utils';
+
+const IOS_PAGE_UNAVAILABLE =
+  'Playwright Page/BrowserContext is not available on iOS sessions.';
+
+const PURE_ATTACH_PROBE_INTERVAL_MS = 500;
+const PURE_ATTACH_PROBE_CEILING_MS = 3_000;
+
+function isNewBinaryAction(
+  action: ResolvedIOSLaunchOptions['installAction'],
+): boolean {
+  return (
+    action === 'install-explicit' ||
+    action === 'install-new' ||
+    action === 'reinstall' ||
+    action === 'reset-and-install'
+  );
+}
+
+export class MetaMaskMobileSessionManager implements ISessionManager {
+  private refMap: Map<string, string> = new Map();
+
+  private workflowContext: WorkflowContext | undefined;
+
+  private launchInProgress = false;
+
+  private sessionId: string | undefined;
+
+  private sessionState: SessionState | undefined;
+
+  private sessionMetadata: SessionMetadata | undefined;
+
+  private platformDriver: IPlatformDriver | undefined;
+
+  private iosDriver: CreatedIOSDriver | undefined;
+
+  private resolved: ResolvedIOSLaunchOptions | undefined;
+
+  hasActiveSession(): boolean {
+    return this.sessionId !== undefined;
+  }
+
+  isLaunchInProgress(): boolean {
+    return this.launchInProgress;
+  }
+
+  getSessionId(): string | undefined {
+    return this.sessionId;
+  }
+
+  getSessionState(): SessionState | undefined {
+    return this.sessionState;
+  }
+
+  getSessionMetadata(): SessionMetadata | undefined {
+    return this.sessionMetadata;
+  }
+
+  async launch(input: SessionLaunchInput): Promise<SessionLaunchResult> {
+    appendLog('MetaMask Provider Launch Started');
+    if (this.launchInProgress) {
+      throw new IOSLaunchError({
+        code: 'MM_SESSION_ALREADY_RUNNING',
+        message:
+          'A launch is already in progress. Wait for it to complete or run `mm cleanup` first.',
+      });
+    }
+
+    const force =
+      (input as SessionLaunchInput & { force?: boolean }).force === true;
+    if (this.hasActiveSession()) {
+      if (force) {
+        appendLog(
+          'Force flag set — cleaning up existing session before launch',
+        );
+        await this.cleanup();
+      } else {
+        throw new IOSLaunchError({
+          code: 'MM_SESSION_ALREADY_RUNNING',
+          message:
+            'A session is already active. Run `mm cleanup` first or use --force.',
+        });
+      }
+    }
+
+    // The core launch schema defaults `platform` to "browser" before invoking
+    // the consumer session manager. For the mobile provider, treat any
+    // non-android platform as iOS so `yarn mm launch` works without extra flags.
+    if (input.platform === 'android') {
+      throw new IOSLaunchError({
+        code: 'MM_INVALID_CONFIG',
+        message:
+          'Android is not supported in this first-iteration mobile integration.',
+      });
+    }
+
+    // MetaMask Mobile is prod-only and operates on the already-installed
+    // wallet.  The generic core CLI/schema accepts E2E-oriented launch
+    // options (state/fixture/seeding/ports) that have no effect here.
+    // Reject them explicitly so an agent does not mistakenly believe it
+    // has a fresh or seeded test wallet.
+    const unsupported: string[] = [];
+    if (input.stateMode !== undefined && input.stateMode !== 'default') {
+      unsupported.push(`stateMode='${input.stateMode}'`);
+    }
+    if (input.fixturePreset !== undefined) {
+      unsupported.push('fixturePreset');
+    }
+    if (input.fixture !== undefined) {
+      unsupported.push('fixture');
+    }
+    if (input.seedContracts !== undefined && input.seedContracts.length > 0) {
+      unsupported.push('seedContracts');
+    }
+    if (input.ports !== undefined) {
+      unsupported.push('ports');
+    }
+    if (unsupported.length > 0) {
+      throw new IOSLaunchError({
+        code: 'MM_INVALID_CONFIG',
+        message:
+          'MetaMask Mobile is prod-only and operates on the already-installed wallet. ' +
+          `Unsupported E2E launch option(s): ${unsupported.join(', ')}. ` +
+          'State initialization, fixtures, contract seeding, and port configuration are not available in this workflow.',
+      });
+    }
+
+    this.launchInProgress = true;
+
+    try {
+      const metroPort = this.resolveMetroPort(input.metroPort);
+
+      if (input.reinstall || input.resetAppData) {
+        process.stderr.write(
+          '[mm-mobile] WARNING: Using destructive flags (--reinstall/--reset-app-data) in prod context. Wallet state will be lost.\n',
+        );
+      }
+
+      const resolved = await validateIOSPrerequisites({
+        simulatorDeviceId: input.deviceId,
+        appBundlePath: input.appBundlePath,
+        metroPort,
+        reinstall: input.reinstall,
+        resetAppData: input.resetAppData,
+        allowFoxCodeMismatch: input.allowFoxCodeMismatch,
+      });
+
+      this.logLaunchMetadata(resolved, { metroPort: input.metroPort });
+
+      // Store resolved early so the catch block can tear down the runner
+      // and app if a later step (capabilities, bind, getAppState) fails.
+      this.resolved = resolved;
+
+      if (!this.isSimulatorBooted(resolved.simulatorDeviceId)) {
+        appendLog('Booting device');
+        this.bootSimulator(resolved.simulatorDeviceId);
+      }
+
+      const { wasAlreadyOn: bridgeWasAlreadyOn } =
+        ensureAccessibilityBridgeEnabled(resolved.simulatorDeviceId);
+      appendLog(`Accessibility bridge: wasAlreadyOn=${bridgeWasAlreadyOn}`);
+
+      this.executeInstallAction(resolved);
+
+      appendLog('Creating iOS platform driver');
+      const iosDriver = await createIOSPlatformDriver(resolved);
+
+      this.iosDriver = iosDriver;
+      this.platformDriver = iosDriver.driver;
+
+      const newBinaryInstalled = isNewBinaryAction(resolved.installAction);
+      let appIsRunning: boolean;
+
+      if (newBinaryInstalled) {
+        if (resolved.installAction === 'install-explicit') {
+          this.terminateSimulatorApp(resolved);
+        }
+        appIsRunning = false;
+      } else {
+        const rawState = await iosDriver.backend.getAppState(
+          resolved.appBundleId,
+        );
+        if (rawState.state === 'Not Installed') {
+          throw new IOSLaunchError({
+            code: 'MM_INVALID_CONFIG',
+            message: 'MetaMask app is not installed on the target simulator.',
+            remediation: 'Install the app first or pass --app-bundle <path>.',
+          });
+        }
+        appIsRunning = rawState.state === 'Running';
+      }
+
+      if (resolved.metroPort !== undefined) {
+        if (appIsRunning && bridgeWasAlreadyOn) {
+          appendLog(
+            'Metro branch: app running with bridge already on — pure attach candidate',
+          );
+          const healthResult = await probeHermesHealthy({
+            port: resolved.metroPort,
+            appId: resolved.appBundleId,
+            intervalMs: PURE_ATTACH_PROBE_INTERVAL_MS,
+            ceilingMs: PURE_ATTACH_PROBE_CEILING_MS,
+          });
+
+          if (healthResult.healthy) {
+            appendLog(
+              'Pure attach: app healthily attached to Metro, skipping relaunch',
+            );
+          } else {
+            appendLog(
+              `Pure attach failed (${healthResult.reason}) — terminating and deep-linking`,
+            );
+            this.terminateSimulatorApp(resolved);
+            await attachToMetroWatchMode({
+              simulatorUdid: resolved.simulatorDeviceId,
+              metroPort: resolved.metroPort,
+              appBundleId: resolved.appBundleId,
+            });
+          }
+        } else if (appIsRunning && !bridgeWasAlreadyOn) {
+          appendLog(
+            'Metro branch: app running but bridge just flipped — relaunching for a11y',
+          );
+          this.terminateSimulatorApp(resolved);
+          await attachToMetroWatchMode({
+            simulatorUdid: resolved.simulatorDeviceId,
+            metroPort: resolved.metroPort,
+            appBundleId: resolved.appBundleId,
+          });
+        } else {
+          appendLog('Metro branch: app not running — deep-linking to launch');
+          await attachToMetroWatchMode({
+            simulatorUdid: resolved.simulatorDeviceId,
+            metroPort: resolved.metroPort,
+            appBundleId: resolved.appBundleId,
+          });
+        }
+      } else if (appIsRunning && !bridgeWasAlreadyOn) {
+        appendLog(
+          'Prod branch: app running but bridge just flipped — relaunching for a11y',
+        );
+        this.terminateSimulatorApp(resolved);
+        await iosDriver.backend.openApp(resolved.appBundleId);
+      } else if (!appIsRunning) {
+        appendLog('Prod branch: app not running — launching');
+        await iosDriver.backend.openApp(resolved.appBundleId);
+      } else {
+        appendLog(
+          'Prod branch: app running with bridge already on — pure attach',
+        );
+      }
+
+      const state = await iosDriver.driver.getAppState();
+      const sessionId = randomUUID();
+      const startedAt = new Date().toISOString();
+
+      this.sessionId = sessionId;
+      this.sessionState = {
+        sessionId,
+        extensionId: resolved.appBundleId,
+        startedAt,
+        ports: {
+          anvil: 0,
+          fixtureServer: 0,
+        },
+        stateMode: 'default',
+      };
+      this.sessionMetadata = {
+        schemaVersion: 1,
+        sessionId,
+        createdAt: startedAt,
+        goal: input.goal,
+        flowTags: input.flowTags ?? [],
+        tags: input.tags ?? [],
+        launch: {
+          stateMode: 'default',
+          fixturePreset: null,
+          extensionPath: resolved.appBundlePath,
+          ports: undefined,
+        },
+      };
+
+      return {
+        sessionId,
+        extensionId: resolved.appBundleId,
+        state,
+      };
+    } catch (error) {
+      await this.teardownPartialLaunch();
+      const launchError = this.toLaunchError(error);
+      process.stderr.write(
+        `iOS launch failed: ${this.formatLaunchErrorMessage(launchError)}\n`,
+      );
+      throw launchError;
+    } finally {
+      this.launchInProgress = false;
+    }
+  }
+
+  async cleanup(): Promise<boolean> {
+    if (this.launchInProgress) {
+      throw new IOSLaunchError({
+        code: 'MM_SESSION_ALREADY_RUNNING',
+        message:
+          'A launch is in progress. Wait for it to complete before running `mm cleanup`.',
+      });
+    }
+
+    if (!this.hasActiveSession()) {
+      return false;
+    }
+
+    const resolved = this.resolved;
+    const iosDriver = this.iosDriver;
+
+    try {
+      if (resolved) {
+        await this.closeAndTerminateApp(resolved, iosDriver);
+      }
+    } finally {
+      this.resetSessionState();
+    }
+
+    return true;
+  }
+
+  getPlatformDriver(): IPlatformDriver | undefined {
+    return this.platformDriver;
+  }
+
+  setPlatformDriver(platformDriver: IPlatformDriver): void {
+    this.platformDriver = platformDriver;
+  }
+
+  getPage(): Page {
+    throw this.notAvailableOnIOS();
+  }
+
+  setActivePage(_page: Page): void {
+    // Browser-only: iOS sessions are driven by MobilePlatformDriver.
+  }
+
+  getTrackedPages(): TrackedPage[] {
+    return [];
+  }
+
+  classifyPageRole(_page: Page, _extensionId?: string): TabRole {
+    return 'extension';
+  }
+
+  getContext(): BrowserContext {
+    throw this.notAvailableOnIOS();
+  }
+
+  async getExtensionState(): Promise<ExtensionState> {
+    if (!this.platformDriver) {
+      throw this.noActiveIOSSession();
+    }
+
+    return this.platformDriver.getAppState();
+  }
+
+  setRefMap(map: Map<string, string>): void {
+    this.refMap = new Map(map);
+  }
+
+  getRefMap(): Map<string, string> {
+    return new Map(this.refMap);
+  }
+
+  clearRefMap(): void {
+    this.refMap.clear();
+  }
+
+  resolveA11yRef(ref: string): string | undefined {
+    return this.refMap.get(ref);
+  }
+
+  async navigateToHome(): Promise<void> {
+    this.assertActiveSession();
+    // TODO(Phase 2b follow-up): add native tab-bar navigation support.
+    throw new IOSLaunchError({
+      code: 'MM_LAUNCH_FAILED',
+      message:
+        'navigateToHome() not yet implemented for iOS — Phase 2b deferral. Use describe-screen + click instead.',
+    });
+  }
+
+  async navigateToSettings(): Promise<void> {
+    this.assertActiveSession();
+    // TODO(Phase 2b follow-up): add native tab-bar navigation support.
+    throw new IOSLaunchError({
+      code: 'MM_LAUNCH_FAILED',
+      message:
+        'navigateToSettings() not yet implemented for iOS — Phase 2b deferral. Use describe-screen + click instead.',
+    });
+  }
+
+  async navigateToUrl(_url: string): Promise<Page> {
+    throw new IOSLaunchError({
+      code: 'MM_LAUNCH_FAILED',
+      message: 'URL navigation is browser-only and is not available on iOS.',
+    });
+  }
+
+  async navigateToNotification(): Promise<Page> {
+    throw new IOSLaunchError({
+      code: 'MM_LAUNCH_FAILED',
+      message:
+        'Notification pages are browser-only and are not available on iOS.',
+    });
+  }
+
+  async waitForNotificationPage(_timeoutMs: number): Promise<Page> {
+    throw new IOSLaunchError({
+      code: 'MM_LAUNCH_FAILED',
+      message:
+        'Notification pages are browser-only and are not available on iOS.',
+    });
+  }
+
+  async screenshot(
+    options: SessionScreenshotOptions,
+  ): Promise<ScreenshotResult> {
+    if (!this.platformDriver) {
+      throw this.noActiveIOSSession();
+    }
+
+    return this.platformDriver.screenshot({
+      name: options.name,
+      fullPage: options.fullPage,
+      selector: options.selector,
+    });
+  }
+
+  getBuildCapability(): BuildCapability | undefined {
+    return undefined;
+  }
+
+  getFixtureCapability(): FixtureCapability | undefined {
+    return undefined;
+  }
+
+  getChainCapability(): ChainCapability | undefined {
+    return undefined;
+  }
+
+  getContractSeedingCapability(): ContractSeedingCapability | undefined {
+    return undefined;
+  }
+
+  getStateSnapshotCapability(): StateSnapshotCapability | undefined {
+    return this.workflowContext?.stateSnapshot;
+  }
+
+  setWorkflowContext(context: WorkflowContext): void {
+    this.workflowContext = context;
+  }
+
+  getEnvironmentMode(): EnvironmentMode {
+    return 'prod';
+  }
+
+  setContext(
+    context: 'e2e' | 'prod',
+    _options?: Record<string, unknown>,
+  ): void {
+    if (context === 'e2e') {
+      throw new IOSLaunchError({
+        code: 'MM_LAUNCH_FAILED',
+        message:
+          'MetaMask Mobile supports only the prod context. E2E launch context is not available.',
+      });
+    }
+  }
+
+  getContextInfo(): {
+    currentContext: 'e2e' | 'prod';
+    hasActiveSession: boolean;
+    sessionId: string | null;
+    capabilities: { available: string[] };
+    canSwitchContext: boolean;
+  } {
+    return {
+      currentContext: 'prod',
+      hasActiveSession: this.hasActiveSession(),
+      sessionId: this.sessionId ?? null,
+      capabilities: { available: this.computeAvailableCapabilities() },
+      canSwitchContext: false,
+    };
+  }
+
+  private installApp(resolved: ResolvedIOSLaunchOptions): void {
+    try {
+      execFileSync(
+        'xcrun',
+        [
+          'simctl',
+          'install',
+          resolved.simulatorDeviceId,
+          resolved.appBundlePath,
+        ],
+        { stdio: ['ignore', 'pipe', 'pipe'] },
+      );
+    } catch (error) {
+      throw new IOSLaunchError({
+        code: 'MM_LAUNCH_FAILED',
+        message: `Failed to install ${resolved.appBundleId}: ${this.errorMessage(error)}`,
+      });
+    }
+  }
+
+  private executeInstallAction(resolved: ResolvedIOSLaunchOptions): void {
+    switch (resolved.installAction) {
+      case 'reuse-installed':
+        appendLog(`Reusing installed app at ${resolved.appBundlePath}`);
+        break;
+      case 'reinstall':
+        appendLog('Reinstalling: uninstalling existing app');
+        this.uninstallApp(resolved);
+        this.installApp(resolved);
+        break;
+      case 'reset-and-install':
+        appendLog('Resetting app data: terminating and uninstalling');
+        this.terminateSimulatorApp(resolved);
+        this.uninstallApp(resolved);
+        this.installApp(resolved);
+        break;
+      case 'install-new':
+      case 'install-explicit':
+        appendLog('Installing App');
+        this.installApp(resolved);
+        break;
+    }
+  }
+
+  private async closeAndTerminateApp(
+    resolved: ResolvedIOSLaunchOptions,
+    iosDriver: CreatedIOSDriver | undefined,
+  ): Promise<void> {
+    await iosDriver?.backend
+      .closeApp(resolved.appBundleId)
+      .catch(() => undefined);
+    this.terminateSimulatorApp(resolved);
+  }
+
+  private terminateSimulatorApp(resolved: ResolvedIOSLaunchOptions): void {
+    try {
+      execFileSync(
+        'xcrun',
+        [
+          'simctl',
+          'terminate',
+          resolved.simulatorDeviceId,
+          resolved.appBundleId,
+        ],
+        { stdio: ['ignore', 'pipe', 'pipe'] },
+      );
+    } catch {
+      // best-effort: app might not be running
+    }
+  }
+
+  private uninstallApp(resolved: ResolvedIOSLaunchOptions): void {
+    try {
+      execFileSync(
+        'xcrun',
+        [
+          'simctl',
+          'uninstall',
+          resolved.simulatorDeviceId,
+          resolved.appBundleId,
+        ],
+        { stdio: ['ignore', 'pipe', 'pipe'] },
+      );
+    } catch (error) {
+      throw new IOSLaunchError({
+        code: 'MM_LAUNCH_FAILED',
+        message: `Failed to uninstall ${resolved.appBundleId}: ${this.errorMessage(error)}`,
+      });
+    }
+  }
+
+  private resolveMetroPort(inputMetroPort?: number): number | undefined {
+    if (inputMetroPort !== undefined) {
+      if (
+        Number.isInteger(inputMetroPort) &&
+        inputMetroPort >= 1 &&
+        inputMetroPort <= 65535
+      ) {
+        return inputMetroPort;
+      }
+      process.stderr.write(
+        `[mm-mobile] Ignoring invalid metroPort=${inputMetroPort} (must be integer 1-65535).\n`,
+      );
+    }
+
+    const raw = process.env.MM_METRO_PORT?.trim();
+    if (!raw) return undefined;
+
+    const port = Number(raw);
+    if (!Number.isInteger(port) || port < 1 || port > 65535) {
+      process.stderr.write(
+        `[mm-mobile] Ignoring invalid MM_METRO_PORT="${raw}" (must be integer 1-65535).\n`,
+      );
+      return undefined;
+    }
+
+    return port;
+  }
+
+  private computeAvailableCapabilities(): string[] {
+    return this.workflowContext?.stateSnapshot ? ['stateSnapshot'] : [];
+  }
+
+  private async teardownPartialLaunch(): Promise<void> {
+    const { iosDriver, resolved } = this;
+    if (resolved) {
+      await this.closeAndTerminateApp(resolved, iosDriver);
+    }
+
+    this.resetSessionState();
+  }
+
+  private resetSessionState(): void {
+    this.sessionId = undefined;
+    this.platformDriver = undefined;
+    this.iosDriver = undefined;
+    this.resolved = undefined;
+    this.sessionState = undefined;
+    this.sessionMetadata = undefined;
+    this.refMap.clear();
+  }
+
+  private assertActiveSession(): void {
+    if (!this.hasActiveSession()) {
+      throw this.noActiveIOSSession();
+    }
+  }
+
+  private noActiveIOSSession(): IOSLaunchError {
+    return new IOSLaunchError({
+      code: 'MM_LAUNCH_FAILED',
+      message: 'No active iOS session. Run `mm launch` first.',
+    });
+  }
+
+  private notAvailableOnIOS(): IOSLaunchError {
+    return new IOSLaunchError({
+      code: 'MM_LAUNCH_FAILED',
+      message: IOS_PAGE_UNAVAILABLE,
+    });
+  }
+
+  private toLaunchError(error: unknown): IOSLaunchError {
+    if (error instanceof IOSLaunchError) {
+      return error;
+    }
+
+    return new IOSLaunchError({
+      code: 'MM_LAUNCH_FAILED',
+      message: this.errorMessage(error),
+    });
+  }
+
+  private formatLaunchErrorMessage(error: IOSLaunchError): string {
+    const message = `${error.code}: ${error.message}`;
+    return error.remediation
+      ? `${message}\nRemediation: ${error.remediation}`
+      : message;
+  }
+
+  private errorMessage(error: unknown): string {
+    if (error && typeof error === 'object' && 'stderr' in error) {
+      const { stderr } = error as { stderr?: Buffer | string };
+      const text =
+        typeof stderr === 'string'
+          ? stderr
+          : stderr instanceof Buffer
+            ? stderr.toString('utf8')
+            : '';
+      const trimmed = text.trim();
+      if (trimmed) {
+        return trimmed;
+      }
+    }
+    return error instanceof Error ? error.message : 'Unknown error';
+  }
+
+  private logLaunchMetadata(
+    resolved: ResolvedIOSLaunchOptions,
+    launchInput: { metroPort?: number },
+  ): void {
+    const metroSource = launchInput.metroPort
+      ? '--metro-port'
+      : process.env.MM_METRO_PORT
+        ? 'MM_METRO_PORT'
+        : 'none';
+    const lines = [
+      '[mm-mobile] context=prod',
+      `[mm-mobile] simulator=${resolved.simulatorDeviceId}`,
+      `[mm-mobile] selectedApp=${resolved.appBundlePath}`,
+      `[mm-mobile] bundleId=${resolved.appBundleId}`,
+      `[mm-mobile] version=${resolved.selectedAppMetadata.shortVersion ?? 'unknown'}`,
+      `[mm-mobile] build=${resolved.selectedAppMetadata.buildVersion ?? 'unknown'}`,
+      `[mm-mobile] fox_code=${resolved.selectedAppMetadata.foxCode ?? 'unknown'}`,
+      `[mm-mobile] appAlreadyInstalled=${resolved.appAlreadyInstalled}`,
+      `[mm-mobile] installAction=${resolved.installAction}`,
+      `[mm-mobile] metroPort=${resolved.metroPort ?? 'none'} source=${metroSource}`,
+    ];
+
+    if (resolved.installedAppMetadata) {
+      lines.push(
+        `[mm-mobile] installedApp=${resolved.installedAppMetadata.appBundlePath}`,
+        `[mm-mobile] installedFoxCode=${resolved.installedAppMetadata.foxCode ?? 'unknown'}`,
+      );
+    }
+
+    process.stderr.write(lines.join('\n') + '\n');
+  }
+
+  private isSimulatorBooted(udid: string): boolean {
+    try {
+      const raw = execFileSync('xcrun', ['simctl', 'list', 'devices', '-j'], {
+        encoding: 'utf-8',
+      });
+      const parsed = JSON.parse(raw) as {
+        devices?: Record<string, { udid: string; state?: string }[]>;
+      };
+      for (const devices of Object.values(parsed.devices ?? {})) {
+        for (const entry of devices) {
+          if (entry.udid === udid && entry.state === 'Booted') {
+            return true;
+          }
+        }
+      }
+      return false;
+    } catch {
+      return false;
+    }
+  }
+
+  private bootSimulator(udid: string): void {
+    try {
+      execFileSync('xcrun', ['simctl', 'boot', udid], {
+        stdio: ['ignore', 'pipe', 'pipe'],
+      });
+    } catch (error) {
+      throw new IOSLaunchError({
+        code: 'MM_DEVICE_NOT_AVAILABLE',
+        message: `Failed to boot simulator ${udid}: ${this.errorMessage(error)}`,
+        remediation:
+          'Run `xcrun simctl list devices` to verify the UDID and simulator state.',
+      });
+    }
+  }
+}
diff --git a/tests/llm-workflow/resolve-repo-root.ts b/tests/llm-workflow/resolve-repo-root.ts
new file mode 100644
index 000000000000..d2f68803474d
--- /dev/null
+++ b/tests/llm-workflow/resolve-repo-root.ts
@@ -0,0 +1,44 @@
+/* eslint-disable import-x/no-nodejs-modules */
+import path from 'path';
+import { existsSync, readFileSync } from 'fs';
+
+const REPO_PACKAGE_NAME = 'metamask';
+
+/**
+ * Walk up from `startDir` until we find a `package.json` whose `name` field
+ * equals {@link REPO_PACKAGE_NAME}.  This lets every file in the tree resolve
+ * the repository root without fragile `../..` chains or reliance on
+ * `process.cwd()` (which points to the IDE/client directory when launched
+ * via MCP).
+ *
+ * @param startDir - Directory to start searching from. Defaults to `__dirname`
+ * of the caller — pass it explicitly so the walk starts from the right place.
+ * @returns Absolute path to the repository root.
+ */
+export function resolveRepoRoot(startDir: string = __dirname): string {
+  let dir = path.resolve(startDir);
+
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    const candidate = path.join(dir, 'package.json');
+    if (existsSync(candidate)) {
+      try {
+        const pkg = JSON.parse(readFileSync(candidate, 'utf-8'));
+        if (pkg.name === REPO_PACKAGE_NAME) {
+          return dir;
+        }
+      } catch {
+        // malformed JSON — keep walking
+      }
+    }
+
+    const parent = path.dirname(dir);
+    if (parent === dir) {
+      throw new Error(
+        `Could not locate repository root (package "${REPO_PACKAGE_NAME}"). ` +
+          `Started from: ${startDir}`,
+      );
+    }
+    dir = parent;
+  }
+}
diff --git a/tests/llm-workflow/stubs/react-native-nitro-modules.cjs b/tests/llm-workflow/stubs/react-native-nitro-modules.cjs
new file mode 100644
index 000000000000..a801378ac322
--- /dev/null
+++ b/tests/llm-workflow/stubs/react-native-nitro-modules.cjs
@@ -0,0 +1,26 @@
+// Stub for react-native-nitro-modules.
+// @metamask/native-utils calls NitroModules.createHybridObject() at module load
+// time.  The daemon never exercises the resulting hybrid object — it only needs
+// the constant values that live alongside the native-utils import in
+// @metamask/transaction-controller.  Returning a Proxy that silently absorbs
+// every property access and function call keeps the module graph intact without
+// pulling in real native code.
+'use strict';
+
+const noop = () => noopProxy;
+const noopProxy = new Proxy(noop, {
+  get(_target, prop) {
+    if (prop === Symbol.toPrimitive) return () => '';
+    if (prop === 'then') return undefined; // not thenable
+    return noopProxy;
+  },
+  apply() {
+    return noopProxy;
+  },
+});
+
+const NitroModules = { createHybridObject: (_name) => noopProxy };
+
+module.exports = { NitroModules };
+module.exports.__esModule = true;
+module.exports.default = module.exports;
diff --git a/tests/llm-workflow/stubs/react-native.cjs b/tests/llm-workflow/stubs/react-native.cjs
new file mode 100644
index 000000000000..60ea0683d368
--- /dev/null
+++ b/tests/llm-workflow/stubs/react-native.cjs
@@ -0,0 +1,8 @@
+// Empty stub for react-native.
+// The react-native package ships Flow syntax (`import typeof`) that esbuild/tsx
+// cannot transform.  The daemon never uses React Native APIs — this module is
+// pulled in transitively by @metamask/native-utils via
+// @metamask/transaction-controller when FixtureBuilder is loaded at runtime.
+'use strict';
+
+module.exports = {};
diff --git a/tests/llm-workflow/utils.ts b/tests/llm-workflow/utils.ts
new file mode 100644
index 000000000000..a65205f931c9
--- /dev/null
+++ b/tests/llm-workflow/utils.ts
@@ -0,0 +1,28 @@
+/* eslint-disable import-x/no-namespace */
+/* eslint-disable import-x/no-nodejs-modules */
+import * as fs from 'node:fs/promises';
+import path from 'node:path';
+import { resolveRepoRoot } from './resolve-repo-root';
+
+let cachedLogFilePath: string | undefined;
+
+/**
+ * Appends a timestamped line to the daemon log file.
+ *
+ * @param message - The log message to append.
+ * @param fatal - Whether to also write to stderr.
+ */
+export function appendLog(message: string, fatal = false): void {
+  const line = `[${new Date().toISOString()}] ${message}\n`;
+  if (fatal) {
+    process.stderr.write(line);
+  }
+
+  if (!cachedLogFilePath) {
+    cachedLogFilePath = path.join(resolveRepoRoot(), '.mm-daemon.log');
+  }
+
+  fs.appendFile(cachedLogFilePath, line, 'utf-8').catch((error) => {
+    process.stderr.write(`Failed to write log: ${error.message}\n`);
+  });
+}
diff --git a/tests/page-objects/Browser/BitcoinTestDapp.ts b/tests/page-objects/Browser/BitcoinTestDapp.ts
index dcdc75d88f21..b014cfb0d4fb 100644
--- a/tests/page-objects/Browser/BitcoinTestDapp.ts
+++ b/tests/page-objects/Browser/BitcoinTestDapp.ts
@@ -1,231 +1,203 @@
+import ChromeCdpHelpers from '../../framework/ChromeCdpHelpers.js';
+import {
+  loginToAppPlaywright,
+  dismissPushNotificationExistingUserSheet,
+} from '../../flows/wallet.flow.js';
+import { navigateToBrowserView } from '../../flows/browser.flow.js';
+import BrowserView from './BrowserView.js';
+import DappConnectionModal from '../MMConnect/DappConnectionModal.js';
+import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
+import PlaywrightGestures from '../../framework/PlaywrightGestures';
 import { dataTestIds } from '@metamask/test-dapp-bitcoin';
-import { getDappUrl } from '../../framework/fixtures/FixtureUtils';
-import Matchers from '../../framework/Matchers';
-import { BrowserViewSelectorsIDs } from '../../../app/components/Views/BrowserTab/BrowserView.testIds';
-import Gestures from '../../framework/Gestures';
-import Browser from './BrowserView';
-import Utilities, { BASE_DEFAULTS } from '../../framework/Utilities';
 
-class BitcoinTestDapp {
-  get connectButtonSelector(): WebElement {
-    return Matchers.getTestElement(dataTestIds.testPage.header.connect, {
-      tag: 'button',
-    });
-  }
+export const BITCOIN_DAPP_PORT = 8094;
+const BASE_URL = `http://localhost:${BITCOIN_DAPP_PORT}`;
 
-  get disconnectButtonSelector(): WebElement {
-    return Matchers.getTestElement(dataTestIds.testPage.header.disconnect, {
-      tag: 'button',
-    });
-  }
+const DAPP_LOAD_TIMEOUT_MS = 30_000;
+const CONNECT_TIMEOUT_MS = 30_000;
+const CLICK_TIMEOUT_MS = 15_000;
+const POLL_MS = 300;
 
-  get walletButtonSelector(): WebElement {
-    return Matchers.getTestElement(
-      dataTestIds.testPage.walletSelectionModal.walletOption,
-      {
-        tag: 'button',
-      },
-    );
-  }
+const { header, walletSelectionModal, signMessage } = dataTestIds.testPage;
 
-  get standardButtonSelector(): WebElement {
-    return Matchers.getTestElement(
-      dataTestIds.testPage.walletSelectionModal.standardButton,
-      {
-        tag: 'button',
-      },
-    );
-  }
+function sel(testId: string): string {
+  return `[data-testid="${testId}"]`;
+}
 
-  get signMessageButtonSelector(): WebElement {
-    return Matchers.getTestElement(
-      dataTestIds.testPage.signMessage.signMessage,
-      {
-        tag: 'button',
-      },
-    );
-  }
+const wait = (ms: number): Promise<void> =>
+  new Promise((resolve) => setTimeout(resolve, ms));
 
-  get confirmSignMessageButtonSelector(): WebElement {
-    return Matchers.getElementByText('Approve');
+class BitcoinTestDapp {
+  private async getConnectionStatus(): Promise<string | null> {
+    return this.evaluate<string>(
+      `document.querySelector(${JSON.stringify(sel(header.connectionStatus))})?.textContent?.trim() || null`,
+    ).catch(() => null);
+  }
+
+  async setupAndNavigate(): Promise<void> {
+    ChromeCdpHelpers.resetMetaMaskWebViewCache();
+    await loginToAppPlaywright({ scenarioType: 'e2e' });
+    await navigateToBrowserView();
+    await dismissPushNotificationExistingUserSheet();
+    await BrowserView.tapUrlInputBox();
+    await BrowserView.navigateToURL(BASE_URL);
+    await this.waitForDappLoaded();
   }
 
-  async navigateToBitcoinTestDApp(): Promise<void> {
-    await Browser.tapUrlInputBox();
-
-    await Browser.navigateToURL(getDappUrl(0));
+  private async evaluate<T>(expression: string): Promise<T | null> {
+    return ChromeCdpHelpers.evaluateInWebView<T>(BASE_URL, expression);
+  }
 
-    await waitFor(element(by.id(BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID)))
-      .toBeVisible()
-      .withTimeout(10000);
+  /** Waits until the dapp header has rendered (connection status is readable). */
+  private async waitForDappLoaded(
+    timeoutMs = DAPP_LOAD_TIMEOUT_MS,
+  ): Promise<void> {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+      const text = await this.getConnectionStatus();
+      if (text) return;
+      await wait(POLL_MS);
+    }
+    throw new Error(
+      `Timed out waiting for Bitcoin test dapp to load within ${timeoutMs}ms`,
+    );
+  }
 
-    await this.waitForDappLoaded();
+  private async waitForElement(
+    cssSelector: string,
+    timeoutMs = 10_000,
+  ): Promise<void> {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+      const exists = await this.evaluate<boolean>(
+        `Boolean(document.querySelector(${JSON.stringify(cssSelector)}))`,
+      );
+      if (exists) return;
+      await wait(POLL_MS);
+    }
+    throw new Error(`Timed out waiting for "${cssSelector}" to appear`);
+  }
+
+  private async click(
+    cssSelector: string,
+    timeoutMs = CLICK_TIMEOUT_MS,
+  ): Promise<void> {
+    await this.waitForElement(cssSelector, timeoutMs);
+    const clicked = await this.evaluate<boolean>(
+      `(() => {
+        const el = document.querySelector(${JSON.stringify(cssSelector)});
+        if (!el) return false;
+        el.click();
+        return true;
+      })()`,
+    );
+    if (!clicked) {
+      throw new Error(`Element not found in WebView: ${cssSelector}`);
+    }
   }
 
-  async reloadBitcoinTestDApp(): Promise<void> {
-    await Browser.reloadTab();
-    await this.waitForDappLoaded();
+  private async pollForText(
+    cssSelector: string,
+    expected: string,
+    timeoutMs = 10_000,
+  ): Promise<void> {
+    const deadline = Date.now() + timeoutMs;
+    let actual: string | null = null;
+    while (Date.now() < deadline) {
+      actual = await this.evaluate<string>(
+        `document.querySelector(${JSON.stringify(cssSelector)})?.textContent?.trim() || null`,
+      ).catch(() => null);
+      if (actual === expected) return;
+      await wait(POLL_MS);
+    }
+    throw new Error(`Timed out: expected "${expected}", got "${actual}"`);
   }
 
   /**
-   * Tap a button in the WebView
+   * After reload, the dapp may auto-reconnect (status → Connected) or re-open
+   * the MetaMask connect sheet. Poll for Connected and periodically approve
+   * the sheet if it appears (CI Android often needs this).
    */
-  async tapButton(webElement: WebElement): Promise<void> {
-    await Utilities.executeWithRetry(
-      async () => {
-        // eslint-disable-next-line jest/valid-expect, @typescript-eslint/no-explicit-any
-        await (expect(await webElement) as any).toExist();
-        await (await webElement).tap();
-      },
-      {
-        timeout: BASE_DEFAULTS.timeout,
-        description: 'Tap Bitcoin test dapp button',
-      },
-    );
-  }
+  private async waitForReconnect(
+    timeoutMs = CONNECT_TIMEOUT_MS,
+  ): Promise<void> {
+    const deadline = Date.now() + timeoutMs;
+    let lastConnectAttemptAt = 0;
+    let actual: string | null = null;
+
+    while (Date.now() < deadline) {
+      actual = await this.getConnectionStatus();
+      if (actual === 'Connected') return;
+
+      // Auto-reconnect may re-open the MetaMask connect sheet after wallets register.
+      if (Date.now() - lastConnectAttemptAt >= 3_000) {
+        lastConnectAttemptAt = Date.now();
+        try {
+          await DappConnectionModal.tapConnectButton({ timeout: 1_000 });
+        } catch {
+          // Connect sheet not shown yet.
+        }
+      }
 
-  async waitForDappLoaded(): Promise<void> {
-    await Utilities.executeWithRetry(
-      async () => {
-        await this.getHeader().getConnectionStatus();
-      },
-      {
-        timeout: 30_000,
-        description: 'Bitcoin test dapp to load',
-      },
+      await wait(POLL_MS);
+    }
+
+    throw new Error(
+      `Timed out waiting for reconnect: expected "Connected", got "${actual}"`,
     );
   }
 
-  async waitForWalletOption(): Promise<void> {
-    await Utilities.executeWithRetry(
-      async () => {
-        // eslint-disable-next-line jest/valid-expect, @typescript-eslint/no-explicit-any
-        await (expect(await this.walletButtonSelector) as any).toExist();
-      },
-      {
-        timeout: BASE_DEFAULTS.timeout,
-        description: 'Bitcoin test dapp wallet option to appear',
-      },
+  async connect(): Promise<void> {
+    await this.click(`button${sel(header.connect)}`);
+    await this.waitForElement(
+      `button${sel(walletSelectionModal.walletOption)}`,
     );
+    await this.click(`button${sel(walletSelectionModal.walletOption)}`);
+    await this.click(`button${sel(walletSelectionModal.standardButton)}`);
+    await DappConnectionModal.tapConnectButton({ timeout: 15_000 });
+    await this.verifyConnectionStatus('Connected', CONNECT_TIMEOUT_MS);
   }
 
-  async openWalletSelectionModal(): Promise<void> {
-    await this.tapButton(this.connectButtonSelector);
+  async disconnect(): Promise<void> {
+    await this.click(`button${sel(header.disconnect)}`);
+  }
 
-    try {
-      await this.waitForWalletOption();
-    } catch (error) {
-      await this.reloadBitcoinTestDApp();
-      await this.tapButton(this.connectButtonSelector);
-      await this.waitForWalletOption();
-    }
+  async verifyConnectionStatus(
+    expected: string,
+    timeoutMs = 10_000,
+  ): Promise<void> {
+    await this.pollForText(sel(header.connectionStatus), expected, timeoutMs);
   }
 
-  getHeader() {
-    return {
-      connect: async () => {
-        await this.openWalletSelectionModal();
-      },
-      disconnect: async () => {
-        await this.tapButton(this.disconnectButtonSelector);
-      },
-      selectMetaMask: async () => {
-        await this.tapButton(this.walletButtonSelector);
-      },
-      selectStandard: async () => {
-        await this.tapButton(this.standardButtonSelector);
-      },
-      getConnectionStatus: async () => {
-        const connectionStatusDiv = await Matchers.getTestElement(
-          dataTestIds.testPage.header.connectionStatus,
-        );
-        return await connectionStatusDiv.getText();
-      },
-      getAccount: async () => {
-        const account = await Matchers.getTestElement(
-          dataTestIds.testPage.header.account,
-          { extraXPath: '/a' },
-        );
-        return await account.getText();
-      },
-    };
+  async verifyAccount(expected: string, timeoutMs = 10_000): Promise<void> {
+    await this.pollForText(`${sel(header.account)} a`, expected, timeoutMs);
   }
 
   async signMessage(): Promise<void> {
-    await this.tapButton(this.signMessageButtonSelector);
-  }
-
-  async verifyConnectedAccount(connectionStatus: string): Promise<void> {
-    await Utilities.executeWithRetry(
-      async () => {
-        const account = await Matchers.getTestElement(
-          dataTestIds.testPage.header.account,
-          {
-            extraXPath: '/a',
-          },
-        );
-        const actualText = await account.getText();
-
-        if (actualText !== connectionStatus) {
-          throw new Error(
-            `Expected text containing "${connectionStatus}" but got "${actualText}"`,
-          );
-        }
-      },
-      {
-        timeout: BASE_DEFAULTS.timeout,
-        description: 'Verify connection status',
-      },
-    );
+    await this.click(`button${sel(signMessage.signMessage)}`);
   }
 
-  async verifyConnectionStatus(connectionStatus: string): Promise<void> {
-    await Utilities.executeWithRetry(
-      async () => {
-        const connectionStatusDiv = await Matchers.getTestElement(
-          dataTestIds.testPage.header.connectionStatus,
-        );
-        const actualText = await connectionStatusDiv.getText();
-
-        if (actualText !== connectionStatus) {
-          throw new Error(
-            `Expected text containing "${connectionStatus}" but got "${actualText}"`,
-          );
-        }
-      },
-      {
-        timeout: BASE_DEFAULTS.timeout,
-        description: 'Verify connection status',
-      },
-    );
+  async confirmSignMessage(): Promise<void> {
+    const el = await PlaywrightMatchers.getElementByText('Approve', true);
+    await PlaywrightGestures.waitAndTap(el, {
+      checkForDisplayed: true,
+      timeout: 15_000,
+    });
   }
 
-  async verifySignedMessage(signedMessage: string): Promise<void> {
-    await Utilities.executeWithRetry(
-      async () => {
-        const signedMessageElement = await Matchers.getTestElement(
-          dataTestIds.testPage.signMessage.signedMessage,
-          {
-            tag: 'pre',
-          },
-        );
-        const actualText = await signedMessageElement.getText();
-
-        if (actualText !== signedMessage) {
-          throw new Error(
-            `Expected text containing "${signedMessage}" but got "${actualText}"`,
-          );
-        }
-      },
-      {
-        timeout: BASE_DEFAULTS.timeout,
-        description: 'Verify signed message',
-      },
-    );
+  async verifySignedMessage(
+    expected: string,
+    timeoutMs = 15_000,
+  ): Promise<void> {
+    await this.pollForText(sel(signMessage.signedMessage), expected, timeoutMs);
   }
 
-  async confirmSignMessage(): Promise<void> {
-    await Gestures.waitAndTap(this.confirmSignMessageButtonSelector);
+  async reload(): Promise<void> {
+    // IIFE: iOS evaluateInWebView wraps as `return (${expression})`.
+    await this.evaluate('(() => { location.reload(); return true; })()');
+    ChromeCdpHelpers.resetMetaMaskWebViewCache();
+    await this.waitForDappLoaded();
+    await this.waitForReconnect();
   }
 }
 
diff --git a/tests/page-objects/Browser/BrowserView.ts b/tests/page-objects/Browser/BrowserView.ts
index 0ecf7f314032..9ff14f01c2ce 100644
--- a/tests/page-objects/Browser/BrowserView.ts
+++ b/tests/page-objects/Browser/BrowserView.ts
@@ -1,4 +1,3 @@
-import TestHelpers from '../../helpers';
 import {
   BrowserViewSelectorsIDs,
   BrowserViewSelectorsText,
@@ -331,10 +330,22 @@ class Browser {
    * unmounted while the URL editor is focused.
    */
   async dismissUrlEditorIfOpen(): Promise<void> {
-    if (await Utilities.isElementVisible(this.cancelUrlInputButton, 3_000)) {
+    if (!(await Utilities.isElementVisible(this.cancelUrlInputButton, 3_000))) {
+      return;
+    }
+
+    try {
       await Gestures.waitAndTap(this.cancelUrlInputButton, {
         elemDescription: 'Cancel URL input (dismiss URL editor)',
       });
+    } catch (error) {
+      // Submitting the URL bar calls `dismissEditing()` in-app, so Cancel can
+      // unmount between the visibility check above and the tap. The editor
+      // being closed is the desired outcome either way — only rethrow if it
+      // is still open.
+      if (await Utilities.isElementVisible(this.cancelUrlInputButton, 3_000)) {
+        throw error;
+      }
     }
   }
 
@@ -392,6 +403,40 @@ class Browser {
     });
   }
 
+  /**
+   * Opens the tabs overview (if needed) and selects the tab whose a11y label
+   * matches `{host}, Switch tab` (TabThumbnail). Pass a URL or origin such as
+   * `https://metamask.github.io`.
+   */
+  async selectTabByPartialUrl(url: string): Promise<void> {
+    await this.dismissUrlEditorIfOpen();
+
+    const tabsOverview = Matchers.getElementByID(
+      BrowserViewSelectorsIDs.TABS_OPENED_TITLE,
+    );
+    const alreadyOnOverview = await Utilities.isElementVisible(
+      tabsOverview,
+      2_000,
+    );
+    if (!alreadyOnOverview) {
+      await this.tapOpenAllTabsButton();
+    }
+
+    await Assertions.expectElementToBeVisible(tabsOverview, {
+      timeout: 10_000,
+      description: 'Tabs overview should be visible before selecting a tab',
+    });
+
+    const host = url.replace(/^https?:\/\//, '');
+    await Gestures.waitAndTap(
+      Matchers.getElementByLabel(`${host}, Switch tab`),
+      {
+        elemDescription: `Browser tab matching "${url}"`,
+        timeout: 10_000,
+      },
+    );
+  }
+
   /**
    * Closes every open in-app browser tab so WebView/Chromedriver only sees the
    * upcoming navigation target (CI emulators can accumulate stale tabs).
@@ -547,8 +592,9 @@ class Browser {
    * @returns {Promise<void>}
    */
   async waitForBrowserPageToLoad(): Promise<void> {
-    // eslint-disable-next-line no-restricted-syntax
-    await TestHelpers.delay(5000);
+    await Assertions.expectElementToBeVisible(this.browserScreenID, {
+      elemDescription: 'Browser screen',
+    });
   }
 
   async navigateToTestDApp(): Promise<void> {
diff --git a/tests/page-objects/Browser/Confirmations/FooterActions.ts b/tests/page-objects/Browser/Confirmations/FooterActions.ts
index b2dcfeface97..597a09d89e08 100644
--- a/tests/page-objects/Browser/Confirmations/FooterActions.ts
+++ b/tests/page-objects/Browser/Confirmations/FooterActions.ts
@@ -1,11 +1,13 @@
 import { ConfirmationFooterSelectorIDs } from '../../../../app/components/Views/confirmations/ConfirmationView.testIds';
 import Matchers from '../../../framework/Matchers';
 import Gestures from '../../../framework/Gestures';
-import TestHelpers from '../../../helpers';
+import Assertions from '../../../framework/Assertions';
 import { encapsulatedAction } from '../../../framework/encapsulatedAction';
 import { EncapsulatedElementType } from '../../../framework/EncapsulatedElement';
+import { FrameworkDetector } from '../../../framework/FrameworkDetector';
 import PlaywrightMatchers from '../../../framework/PlaywrightMatchers';
-import PlaywrightGestures from '../../../framework/PlaywrightGestures';
+import PlaywrightAssertions from '../../../framework/PlaywrightAssertions';
+import Utilities, { sleep } from '../../../framework/Utilities';
 
 class FooterActions {
   get confirmButton(): EncapsulatedElementType {
@@ -18,29 +20,76 @@ class FooterActions {
     return Matchers.getElementByID(ConfirmationFooterSelectorIDs.CANCEL_BUTTON);
   }
 
+  async waitForConfirmButton(timeout = 30_000): Promise<void> {
+    await Assertions.expectElementToExist(this.confirmButton, {
+      timeout,
+      description: 'confirm-button',
+    });
+  }
+
+  /**
+   * Wait until confirm-button leaves the hierarchy (does not use isDisplayed).
+   * BottomSheet children often report isDisplayed=false while still present.
+   */
+  async waitForConfirmButtonGone(timeout = 30_000): Promise<void> {
+    if (!FrameworkDetector.isAppium()) {
+      await Utilities.waitForElementToDisappear(this.confirmButton, timeout);
+      return;
+    }
+
+    const el = await PlaywrightMatchers.getElementById(
+      ConfirmationFooterSelectorIDs.CONFIRM_BUTTON,
+    );
+    const start = Date.now();
+    while (Date.now() - start < timeout) {
+      if (!(await el.unwrap().isExisting())) {
+        return;
+      }
+      await sleep(250);
+    }
+    throw new Error(`confirm-button still in hierarchy after ${timeout}ms`);
+  }
+
   async tapConfirmButton(timeout?: number): Promise<void> {
     await encapsulatedAction({
       detox: async () => {
         const isAndroid = device.getPlatform() === 'android';
-        // Android needs extra delay to avoid element being obscured by bottom toast notifications
-        // eslint-disable-next-line no-restricted-syntax
-        if (isAndroid) await TestHelpers.delay(3000);
+        // Android needs extra pre-tap delay so toasts do not obscure the button
         await Gestures.waitAndTap(this.confirmButton, {
           elemDescription: 'Confirm button',
-          delay: 1800,
+          delay: isAndroid ? 4800 : 1800,
           timeout,
           waitForElementToDisappear: isAndroid,
         });
       },
       appium: async () => {
-        const el = await PlaywrightMatchers.getElementById(
-          ConfirmationFooterSelectorIDs.CONFIRM_BUTTON,
+        // iOS BottomSheet confirmation containers often exist in the
+        // accessibility tree with isDisplayed=false. Click once by existence;
+        // if confirm is already gone after a prior click, treat as success
+        // (do not click again — avoids double-submit on retry).
+        const maxRetries = Math.max(5, Math.ceil((timeout ?? 30000) / 1000));
+        let didClick = false;
+        await PlaywrightAssertions.expectConditionWithRetry(
+          async () => {
+            const el = await PlaywrightMatchers.getElementById(
+              ConfirmationFooterSelectorIDs.CONFIRM_BUTTON,
+            );
+            const exists = await el.unwrap().isExisting();
+            if (!exists) {
+              if (didClick) {
+                return;
+              }
+              throw new Error('confirm-button not in hierarchy yet');
+            }
+            if (didClick) {
+              throw new Error('confirm-button still present after click');
+            }
+            await sleep(300);
+            await el.unwrap().click();
+            didClick = true;
+          },
+          { maxRetries, interval: 1000 },
         );
-        await PlaywrightGestures.waitAndTap(el, {
-          timeout,
-          checkForDisplayed: true,
-          checkForEnabled: true,
-        });
       },
     });
   }
diff --git a/tests/page-objects/Browser/MMConnectBrowserPlaygroundDapp.ts b/tests/page-objects/Browser/MMConnectBrowserPlaygroundDapp.ts
index 9626456c9ee9..26d5d51a9746 100644
--- a/tests/page-objects/Browser/MMConnectBrowserPlaygroundDapp.ts
+++ b/tests/page-objects/Browser/MMConnectBrowserPlaygroundDapp.ts
@@ -2,7 +2,6 @@
 import { waitFor } from 'detox';
 import { isCaipChainId } from '@metamask/utils';
 
-import TestHelpers from '../../helpers';
 import { getDappUrl } from '../../framework/fixtures/FixtureUtils';
 import { loginToApp } from '../../flows/wallet.flow';
 import { navigateToBrowserView } from '../../flows/browser.flow';
@@ -206,7 +205,6 @@ class MMConnectBrowserPlaygroundDapp {
     skipLogin = false,
   }: { skipLogin?: boolean } = {}): Promise<void> {
     if (!skipLogin) {
-      await TestHelpers.reverseServerPort();
       await loginToApp();
     }
     await navigateToBrowserView();
@@ -305,8 +303,7 @@ class MMConnectBrowserPlaygroundDapp {
       el.value = '${escaped}';
       el.dispatchEvent(new Event('change', { bubbles: true }));
     }`);
-    // Give React a tick to commit the selected-method state.
-    await TestHelpers.delay(500);
+    // Subsequent invokeScopeCardMethod taps wait for the button; no fixed delay.
   }
 
   /** Tap the per-scope "Invoke Method" button after selecting a method. */
diff --git a/tests/page-objects/Browser/MultichainTestDApp.ts b/tests/page-objects/Browser/MultichainTestDApp.ts
index dc96468d343b..8d2953e562de 100644
--- a/tests/page-objects/Browser/MultichainTestDApp.ts
+++ b/tests/page-objects/Browser/MultichainTestDApp.ts
@@ -1,63 +1,31 @@
-/* eslint-disable no-restricted-syntax */
-import TestHelpers from '../../helpers';
-import { getDappUrl } from '../../framework/fixtures/FixtureUtils';
-import Matchers from '../../framework/Matchers';
-import { BrowserViewSelectorsIDs } from '../../../app/components/Views/BrowserTab/BrowserView.testIds';
 import {
-  MultichainTestDappViewSelectorsIDs,
-  MULTICHAIN_TEST_TIMEOUTS,
-} from '../../selectors/Browser/MultichainTestDapp.selectors';
-import Browser from './BrowserView';
-import Gestures from '../../framework/Gestures';
-import { waitFor } from 'detox';
-import ConnectBottomSheet from './ConnectBottomSheet';
-import MultichainUtilities from '../../helpers/multichain/MultichainUtilities';
-import { loginToApp } from '../../flows/wallet.flow';
-import Assertions from '../../framework/Assertions';
-import { isCaipChainId } from '@metamask/utils';
-import { createLogger } from '../../framework/logger';
-import { navigateToBrowserView } from '../../flows/browser.flow';
+  loginToAppPlaywright,
+  dismissPushNotificationExistingUserSheet,
+} from '../../flows/wallet.flow.js';
+import { navigateToBrowserView } from '../../flows/browser.flow.js';
+import BrowserView from './BrowserView.js';
+import DappConnectionModal from '../MMConnect/DappConnectionModal.js';
+import ChromeCdpHelpers from '../../framework/ChromeCdpHelpers.js';
+import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
+import PlaywrightGestures from '../../framework/PlaywrightGestures';
+import { MultichainTestDappViewSelectorsIDs } from '../../selectors/Browser/MultichainTestDapp.selectors.js';
+import { createLogger } from '../../framework/logger.js';
+import { ConfirmationFooterSelectorIDs } from '../../../app/components/Views/confirmations/ConfirmationView.testIds';
+import {
+  applyNetworkSelection,
+  clearSessionResult,
+  readAllCheckboxStates,
+  readConnectionState,
+  type ConnectionState,
+  MULTICHAIN_TEST_DAPP_BASE_URL,
+} from './MultichainTestDAppNetworkSelection.js';
 
 const logger = createLogger({
   name: 'MultichainTestDApp',
 });
 
-export const DEFAULT_MULTICHAIN_TEST_DAPP_URL =
-  'https://metamask.github.io/test-dapp-multichain/';
-
-/**
- * Get the multichain test dapp URL based on environment configuration
- * Priority:
- * 1. USE_LOCAL_DAPP=true (local development server)
- * 2. MULTICHAIN_DAPP_URL environment variable (custom URL)
- * 3. Error if no URL is configured
- */
-export function getMultichainTestDappUrl(): string {
-  // Check for local development flag
-  const useLocal = process.env.USE_LOCAL_DAPP !== 'false'; // default to true if not set
-  if (useLocal) {
-    // Call getDappUrl at runtime (not import time) so port is allocated
-    const localUrl = getDappUrl(0);
-    logger.debug(`🏠 Using local multichain dapp URL: ${localUrl}`);
-    return localUrl;
-  }
+export const MULTICHAIN_DAPP_PORT = 8093;
 
-  // Check for custom URL from environment
-  const customUrl = process.env.MULTICHAIN_DAPP_URL;
-  if (customUrl) {
-    logger.debug(`🌐 Using custom multichain dapp URL: ${customUrl}`);
-    return customUrl;
-  }
-
-  logger.debug(
-    `📱 Using default multichain dapp URL: ${DEFAULT_MULTICHAIN_TEST_DAPP_URL}`,
-  );
-  return DEFAULT_MULTICHAIN_TEST_DAPP_URL;
-}
-
-/**
- * Response object for getSession method
- */
 interface SessionResponse {
   success: boolean;
   sessionScopes?: {
@@ -68,942 +36,350 @@ interface SessionResponse {
   };
 }
 
+const SELECTORS = MultichainTestDappViewSelectorsIDs;
+const BASE_URL = MULTICHAIN_TEST_DAPP_BASE_URL;
+const DEFAULT_URL_PARAMS = '?autoMode=true';
+
 /**
- * Class to interact with the Multichain Test DApp via WebView
+ * The dapp keeps the network checkboxes and the session buttons disabled until
+ * its postMessage handshake resolves, and it rebuilds the whole checkbox
+ * selection from `wallet_getSession` once connected. Toggling before both have
+ * settled is silently discarded, so every toggle is verified and retried.
  */
-class MultichainTestDApp {
-  /**
-   * WebView element getters
-   */
-  get extensionIdInput() {
-    return Matchers.getElementByWebID(
-      BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
-      MultichainTestDappViewSelectorsIDs.EXTENSION_ID_INPUT,
-    );
-  }
-
-  get connectButton() {
-    return Matchers.getElementByWebID(
-      BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
-      MultichainTestDappViewSelectorsIDs.CONNECT_BUTTON,
-    );
-  }
-
-  get createSessionButton() {
-    return Matchers.getElementByWebID(
-      BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
-      MultichainTestDappViewSelectorsIDs.CREATE_SESSION_BUTTON,
-    );
-  }
+const CONNECT_TIMEOUT_MS = 30_000;
+const POLL_INTERVAL_MS = 250;
 
-  get getSessionButton() {
-    return Matchers.getElementByWebID(
-      BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
-      MultichainTestDappViewSelectorsIDs.GET_SESSION_BUTTON,
-    );
-  }
+const wait = (ms: number): Promise<void> =>
+  new Promise((resolve) => setTimeout(resolve, ms));
 
-  get revokeSessionButton() {
-    return Matchers.getElementByWebID(
-      BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
-      MultichainTestDappViewSelectorsIDs.REVOKE_SESSION_BUTTON,
-    );
-  }
-
-  get clearExtensionButton() {
-    return Matchers.getElementByWebID(
-      BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
-      MultichainTestDappViewSelectorsIDs.CLEAR_EXTENSION_BUTTON,
-    );
-  }
-
-  /**
-   * Navigate to the multichain test dapp
-   * @param urlParams - Optional URL parameters to append (e.g., '?autoMode=true')
-   */
-  async navigateToMultichainTestDApp(urlParams = ''): Promise<void> {
-    await Browser.tapUrlInputBox();
-    const baseUrl = getMultichainTestDappUrl();
-    const dappUrl = `${baseUrl}${urlParams}`;
-    await Browser.navigateToURL(dappUrl);
-
-    // Wait for WebView to be visible using native Detox waitFor
-    await waitFor(element(by.id(BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID)))
-      .toBeVisible()
-      .withTimeout(10000);
-  }
+class MultichainTestDApp {
+  private connected = false;
 
-  /**
-   * Common test setup: reverse port, login, navigate to browser, and open multichain dapp
-   * @param urlParams - Optional URL parameters for the dapp (e.g., '?autoMode=true')
-   * @param skipLogin - Optional boolean value to determine if login should be skipped
-   */
   async setupAndNavigateToTestDapp(
-    urlParams = '',
+    urlParams = DEFAULT_URL_PARAMS,
     skipLogin?: boolean,
   ): Promise<void> {
+    ChromeCdpHelpers.resetMetaMaskWebViewCache();
+    this.connected = false;
     if (!skipLogin) {
-      await TestHelpers.reverseServerPort();
-      await loginToApp();
+      await loginToAppPlaywright({ scenarioType: 'e2e' });
     }
     await navigateToBrowserView();
-    await this.navigateToMultichainTestDApp(urlParams);
-
-    // Verify WebView is visible
-    await Assertions.checkIfVisible(
-      Promise.resolve(
-        element(by.id(BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID)),
-      ),
-    );
+    // On fresh CI Android devices the push-notification opt-in sheet ("Never
+    // miss a move") can reappear after navigation even though loginToApp
+    // already dismissed it once. Dismiss it again before touching the browser.
+    await dismissPushNotificationExistingUserSheet();
+    await BrowserView.tapUrlInputBox();
+    await BrowserView.navigateToURL(BASE_URL + urlParams);
   }
 
-  /**
-   * Tap a button in the WebView
-   * @param {any} elementId - The element ID to tap
-   * @returns {Promise<void>}
-   */
-  // Detox ts scripts unclear here.
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async tapButton(elementId: any): Promise<void> {
-    await Gestures.scrollToWebViewPort(elementId);
-    await Gestures.tap(elementId);
-  }
-
-  /**
-   * Create a session with the specified scopes
-   * @param {string[]} _scopes - The scopes to create session with
-   * @param {string[]} _accounts - The accounts to use
-   * @returns {Promise<boolean>} Success status
-   */
-  async initCreateSessionScopes(
-    _scopes: string[],
-    _accounts: string[] = [],
-  ): Promise<boolean> {
-    // Get element first
-    const createSessionBtn = await this.createSessionButton;
-
-    // Tap create session button
-    await this.tapButton(createSessionBtn);
-
-    // Wait for session creation
-    await TestHelpers.delay(1500);
-
-    return true;
-  }
-
-  /**
-   * Clear extension ID
-   * @returns {Promise<boolean>} Success status
-   */
-  async clearExtension(): Promise<boolean> {
-    // Get element first
-    const clearExtensionBtn = await this.clearExtensionButton;
-
-    // Tap clear extension button
-    await this.tapButton(clearExtensionBtn);
-
-    return true;
-  }
-
-  /**
-   * Connect to the dapp using JavaScript injection (alternative method)
-   * This can be used as a fallback if the regular connect method doesn't work
-   * @param {string} _extensionId - The extension ID to connect with
-   * @returns {Promise<boolean>} Success status
-   */
-  async connectViaJS(_extensionId = 'window.postMessage'): Promise<boolean> {
-    // Make sure the webview exists and is visible
-    await waitFor(element(by.id(BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID)))
-      .toBeVisible()
-      .withTimeout(10000);
-
-    // Tap the webview to ensure it has focus
-    await element(by.id(BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID)).tap();
-
-    // Just tap the connect button directly as a fallback
-    const connectBtn = await this.connectButton;
-    await this.tapButton(connectBtn);
-
-    // Wait for connection to establish
-    await TestHelpers.delay(1500);
-
-    return true;
-  }
-
-  /**
-   * Get the WebView object for interaction
-   * @private
-   */
-  private getWebView() {
-    return Matchers.getWebViewByID(BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID);
-  }
-
-  /**
-   * Scroll to the top of the page
-   */
   async scrollToPageTop(): Promise<void> {
-    const webview = this.getWebView();
-    await webview
-      .element(by.web.tag('body'))
-      .runScript('(el) => { window.scrollTo(0, 0); return true; }')
-      .catch(() => {
-        // Scroll might fail if page structure is different, but that's okay
-      });
+    await ChromeCdpHelpers.evaluateInWebView(
+      BASE_URL,
+      'window.scrollTo(0, 0)',
+    ).catch(() => undefined);
   }
 
-  /**
-   * Use the auto-connect button to connect with postMessage
-   */
   async useAutoConnectButton(): Promise<boolean> {
-    const webview = this.getWebView();
-    const autoConnectButton = webview.element(
-      by.web.id('auto-connect-postmessage-button'),
+    if (this.connected) return true;
+    const clicked = await ChromeCdpHelpers.clickByIdInWebView(
+      BASE_URL,
+      SELECTORS.AUTO_CONNECT_BUTTON,
     );
-
-    // Try to click the button - first with JS, then native tap
-    const clicked = await autoConnectButton
-      .runScript('(el) => { el.click(); }')
-      .then(() => true)
-      .catch(async () => {
-        // JS click failed, try native tap
-        await autoConnectButton.tap();
-        return true;
-      })
-      .catch(() => false);
-
     if (!clicked) {
-      logger.error('❌ Auto-connect failed: Could not click button');
+      logger.warn(`could not click #${SELECTORS.AUTO_CONNECT_BUTTON}`);
       return false;
     }
-
-    // Wait for connection to process
-    await TestHelpers.delay(3000);
-
-    // Verify connection status by checking if checkboxes are enabled
-    const ethereumCheckbox = webview.element(
-      by.web.id('network-checkbox-eip155-1'),
-    );
-    const isDisabled = await ethereumCheckbox
-      .runScript('(el) => el ? el.disabled : true')
-      .catch(() => true); // If we can't check, assume disabled
-
-    if (isDisabled) {
-      // Try additional wait
-      await TestHelpers.delay(2000);
-
-      const isStillDisabled = await ethereumCheckbox
-        .runScript('(el) => el ? el.disabled : true')
-        .catch(() => true);
-
-      if (isStillDisabled) {
-        logger.error('❌ Connection failed - checkboxes remain disabled');
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Select a network by chain ID
-   */
-  async selectNetwork(chainId: string): Promise<boolean> {
-    const webview = this.getWebView();
-    const escapedChainId = this.escapeChainIdForHtml(chainId);
-    const networkCheckbox = webview.element(
-      by.web.id(`network-checkbox-${escapedChainId}`),
-    );
-
-    await networkCheckbox.scrollToView();
-    await networkCheckbox.runScript(
-      '(el) => { if(!el.checked) { el.click(); } return el.checked; }',
-    );
-
-    return true;
-  }
-
-  /**
-   * Tap the create session button
-   */
-  async tapCreateSessionButton(): Promise<void> {
-    const webview = this.getWebView();
-    const createSessionButton = webview.element(
-      by.web.id('create-session-btn'),
-    );
-
-    await createSessionButton.scrollToView();
-    await createSessionButton.runScript('(el) => { el.click(); }');
-
-    // Wait for session creation
-    await TestHelpers.delay(2000);
-  }
-
-  /**
-   * Tap the get session button
-   */
-  async tapGetSessionButton(): Promise<void> {
-    const webview = this.getWebView();
-    const getSessionButton = webview.element(by.web.id('get-session-btn'));
-
-    await getSessionButton.scrollToView();
-    await getSessionButton.runScript('(el) => { el.click(); }');
-
-    // Wait for processing
-    await TestHelpers.delay(1000);
-  }
-
-  /**
-   * Tap the revoke session button
-   */
-  async tapRevokeSessionButton(): Promise<void> {
-    const webview = this.getWebView();
-    const revokeSessionButton = webview.element(
-      by.web.id('revoke-session-btn'),
-    );
-
-    await revokeSessionButton.scrollToView();
-    await revokeSessionButton.runScript('(el) => { el.click(); }');
-
-    // Wait for processing
-    await TestHelpers.delay(1500);
-  }
-
-  /**
-   * Get revoke session result data
-   * @param resultIndex - The index of the result to retrieve (defaults to 0)
-   */
-  async getRevokeSessionData(
-    resultIndex: number = 0,
-  ): Promise<SessionResponse> {
-    // Wait for result to be populated
-    await TestHelpers.delay(2000);
-
-    // Try to tap to expand the result (will do nothing if element doesn't exist)
-    await this.tapFirstResultSummary(resultIndex);
-
-    // Get the revoke result content
-    const webview = this.getWebView();
-    const revokeResult = webview.element(
-      by.web.id(`session-method-result-${resultIndex}`),
-    );
-
-    const resultData = await revokeResult
-      .runScript('(el) => el.textContent')
-      .catch(() => null);
-
-    if (resultData) {
-      const parsedResult = JSON.parse(resultData);
-      return {
-        success: true,
-        sessionScopes: parsedResult.sessionScopes || {},
-      };
-    }
-
-    return { success: false, sessionScopes: {} };
+    this.connected = await this.waitForDappConnected();
+    return this.connected;
   }
 
-  /**
-   * Complete multichain connection flow
-   */
-  async completeMultichainFlow(
-    chainIds: string[] = [
-      MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET,
-      MultichainUtilities.CHAIN_IDS.LINEA_MAINNET,
-    ],
-  ): Promise<void> {
-    // Scroll to top
+  async createSessionWithNetworks(chainIds: string[]): Promise<void> {
     await this.scrollToPageTop();
-
-    // Auto connect
     const connected = await this.useAutoConnectButton();
-    if (!connected) throw new Error('Failed to connect to dapp');
+    if (!connected)
+      throw new Error('createSessionWithNetworks: auto-connect failed');
 
-    // Select networks
-    for (const chainId of chainIds) {
-      const selected = await this.selectNetwork(chainId);
-      if (!selected) throw new Error(`Failed to select network ${chainId}`);
-    }
+    await applyNetworkSelection(chainIds);
 
-    await this.tapCreateSessionButton();
-
-    await this.tapGetSessionButton();
-  }
+    await clearSessionResult();
+    await ChromeCdpHelpers.clickByIdInWebView(
+      BASE_URL,
+      SELECTORS.CREATE_SESSION_BUTTON,
+    );
 
-  /**
-   * Tap the result summary to expand session details
-   * @param index - The index of the result to tap (defaults to 0)
-   */
-  async tapFirstResultSummary(index: number = 0): Promise<void> {
     try {
-      const webview = this.getWebView();
-      const firstResult = webview.element(
-        by.web.id(`session-method-details-${index}`),
-      );
-
-      await firstResult.scrollToView();
-      await firstResult.runScript('(el) => { if(!el.open) { el.click(); } }');
-
-      await TestHelpers.delay(500);
-    } catch (error) {
-      // Element doesn't exist, which is expected when there's no session
-      // This is a valid case, so we just return without error
-      return;
+      await DappConnectionModal.tapConnectButton({ timeout: 30_000 });
+    } catch {
+      // No modal — session may already be approved
     }
-  }
 
-  /**
-   * Get session data by parsing the result from the dapp
-   * @param resultIndex - The index of the result to retrieve (defaults to 0)
-   */
-  async getSessionData(resultIndex: number = 0): Promise<SessionResponse> {
-    // Wait for result to be populated
-    await TestHelpers.delay(2000);
-
-    // Try to tap to expand the result (will do nothing if element doesn't exist)
-    await this.tapFirstResultSummary(resultIndex);
-
-    // Get the session result content
-    const webview = this.getWebView();
-    const sessionResult = webview.element(
-      by.web.id(`session-method-result-${resultIndex}`),
+    const result = await ChromeCdpHelpers.waitForElementTextInWebView(
+      BASE_URL,
+      `${SELECTORS.SESSION_METHOD_RESULT}0`,
+      30_000,
     );
-
-    const sessionData = await sessionResult
-      .runScript('(el) => el.textContent')
-      .catch(() => null);
-
-    if (sessionData) {
-      const parsedSession = JSON.parse(sessionData);
-      return {
-        success: true,
-        sessionScopes: parsedSession.sessionScopes || {},
-      };
-    }
-
-    return { success: false, sessionScopes: {} };
-  }
-
-  /**
-   * Verify session contains specific chain IDs
-   */
-  async verifySessionContainsChains(
-    expectedChainIds: string[],
-  ): Promise<boolean> {
-    const sessionData = await this.getSessionData();
-
-    if (!sessionData.success || !sessionData.sessionScopes) {
-      return false;
-    }
-
-    for (const chainId of expectedChainIds) {
-      const fullChainId = chainId.startsWith('eip155:')
-        ? chainId
-        : `eip155:${chainId}`;
-      if (!sessionData.sessionScopes[fullChainId]) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Get the number of chains in the current session
-   */
-  async getSessionChainCount(): Promise<number> {
-    const sessionData = await this.getSessionData();
-
-    if (!sessionData.success || !sessionData.sessionScopes) {
-      return 0;
+    if (result) {
+      logger.debug(`wallet_createSession result: ${result.slice(0, 500)}`);
+    } else {
+      logger.warn(
+        `no text in #${SELECTORS.SESSION_METHOD_RESULT}0 after 30s; checkboxes: ${JSON.stringify(
+          await readAllCheckboxStates(),
+        )}`,
+      );
     }
-
-    return Object.keys(sessionData.sessionScopes).length;
   }
 
   /**
-   * Check if the dapp is properly connected (checkboxes should be enabled)
+   * Waits until the dapp has finished its wallet handshake, which is what
+   * enables the network checkboxes and the session buttons.
    */
-  async isConnectedToDapp(): Promise<boolean> {
-    const webview = this.getWebView();
-    const ethereumCheckbox = webview.element(
-      by.web.id('network-checkbox-eip155-1'),
-    );
-    const isDisabled = await ethereumCheckbox
-      .runScript('(el) => el ? el.disabled : true')
-      .catch(() => true); // If we can't check, assume not connected
-    return !isDisabled;
-  }
+  async waitForDappConnected(timeoutMs = CONNECT_TIMEOUT_MS): Promise<boolean> {
+    const startedAt = Date.now();
+    const deadline = startedAt + timeoutMs;
+    let state: ConnectionState = 'unreadable';
 
-  /**
-   * Wait for the dapp to be connected (checkboxes enabled)
-   */
-  async waitForConnection(timeoutMs = 10000): Promise<boolean> {
-    const startTime = Date.now();
-
-    while (Date.now() - startTime < timeoutMs) {
-      const isConnected = await this.isConnectedToDapp();
-      if (isConnected) {
+    while (Date.now() < deadline) {
+      state = await readConnectionState();
+      if (state === 'enabled') {
+        logger.debug(`dapp connected after ${Date.now() - startedAt}ms`);
         return true;
       }
-
-      await TestHelpers.delay(1000);
+      await wait(POLL_INTERVAL_MS);
     }
 
+    logger.warn(
+      `dapp still not connected after ${timeoutMs}ms (#${SELECTORS.CREATE_SESSION_BUTTON} is "${state}")`,
+    );
     return false;
   }
 
-  /**
-   * Verify the current state of network checkboxes using CSS :checked selector
-   * This is the only reliable method that works in WebView (proven by testing)
-   */
-  async verifyNetworkCheckboxStates(
-    chainIds: string[],
-  ): Promise<Record<string, boolean>> {
-    const webview = this.getWebView();
-    const states: Record<string, boolean> = {};
-
-    for (const chainId of chainIds) {
-      const escapedChainId = this.escapeChainIdForHtml(chainId);
-      const checkboxId = `network-checkbox-${escapedChainId}`;
-
-      // Use CSS :checked pseudo-selector - the only method that works reliably
-      const isChecked = await webview
-        .element(by.web.cssSelector(`#${checkboxId}:checked`))
-        .scrollToView()
-        .then(() => true)
-        .catch(() => false);
-
-      states[chainId] = isChecked;
-    }
-
-    return states;
-  }
-
-  /**
-   * Escape chain ID for HTML element IDs (matches dapp's escapeHtmlId function)
-   * @param chainId - Decimal chain ID (e.g., '1')
-   * @returns Escaped chain ID for HTML element ID (e.g., 'eip155-1')
-   */
-  private escapeChainIdForHtml(chainId: string): string {
-    if (isCaipChainId(chainId)) {
-      return chainId.replace(/:/g, '-');
-    }
-
-    return `eip155-${chainId}`;
-  }
-
-  /**
-   * Get all supported network chain IDs for the dapp
-   */
-  private getAllSupportedNetworks(): string[] {
-    return [
-      MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET,
-      MultichainUtilities.CHAIN_IDS.LINEA_MAINNET,
-      MultichainUtilities.CHAIN_IDS.ARBITRUM_ONE,
-      MultichainUtilities.CHAIN_IDS.AVALANCHE,
-      MultichainUtilities.CHAIN_IDS.BSC,
-      MultichainUtilities.CHAIN_IDS.OPTIMISM,
-      MultichainUtilities.CHAIN_IDS.POLYGON,
-      MultichainUtilities.CHAIN_IDS.ZKSYNC_ERA,
-      MultichainUtilities.CHAIN_IDS.BASE,
-      MultichainUtilities.CHAIN_IDS.LOCALHOST,
-    ];
-  }
-
-  /**
-   * Clear all network selections
-   */
-  async clearAllNetworkSelections(): Promise<boolean> {
-    const webview = this.getWebView();
-    const allNetworks = this.getAllSupportedNetworks();
-
-    for (const chainId of allNetworks) {
-      const escapedChainId = this.escapeChainIdForHtml(chainId);
-      const checkboxId = `network-checkbox-${escapedChainId}`;
-
-      const checkbox = webview.element(by.web.id(checkboxId));
-
-      // Check if element exists and is checked, then uncheck
-      const isChecked = await checkbox
-        .runScript('(el) => el ? el.checked : false')
-        .catch(() => false);
-
-      if (isChecked) {
-        await checkbox.tap().catch(async () => {
-          // If tap fails, try JS click
-          await checkbox.runScript(
-            '(el) => { if(el && el.checked) { el.click(); } }',
-          );
-        });
-        await TestHelpers.delay(200);
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Select specific networks by chain IDs
-   */
-  async selectNetworks(chainIds: string[]): Promise<boolean> {
-    const webview = this.getWebView();
-    // Scroll to the network selection area first
-    await this.scrollToPageTop();
-    await TestHelpers.delay(1000);
-
-    // First clear all network selections
-    const cleared = await this.clearAllNetworkSelections();
-    if (!cleared) {
-      logger.error('❌ Failed to clear network selections');
-      return false;
-    }
-
-    // Then select the requested networks
-    for (const chainId of chainIds) {
-      const escapedChainId = this.escapeChainIdForHtml(chainId);
-      const checkboxId = `network-checkbox-${escapedChainId}`;
-
-      const checkbox = webview.element(by.web.id(checkboxId));
-
-      // Scroll to the checkbox to ensure it's visible
-      await checkbox.scrollToView();
-      await TestHelpers.delay(300);
-
-      // Check current state using reliable CSS :checked selector
-      const isCurrentlyChecked = await webview
-        .element(by.web.cssSelector(`#${checkboxId}:checked`))
-        .scrollToView()
-        .then(() => true)
-        .catch(() => false);
-
-      // Only click if we need to change the state
-      if (!isCurrentlyChecked) {
-        const clicked = await checkbox
-          .tap()
-          .then(() => true)
-          .catch(async () => {
-            // If tap fails, try JS click
-            await checkbox.runScript('(el) => { if(el) { el.click(); } }');
-            return true;
-          })
-          .catch(() => false);
-
-        if (!clicked) {
-          logger.error(`❌ Failed to select network eip155:${chainId}`);
-          return false;
-        }
-
-        await TestHelpers.delay(1500); // Wait for UI update
-      }
-    }
-
-    return true;
+  async tapGetSessionButton(): Promise<void> {
+    await clearSessionResult();
+    await ChromeCdpHelpers.clickByIdInWebView(
+      BASE_URL,
+      SELECTORS.GET_SESSION_BUTTON,
+    );
   }
 
-  /**
-   * Create a session with specific networks
-   */
-  async createSessionWithNetworks(chainIds: string[]): Promise<void> {
-    // Scroll to top
-    await this.scrollToPageTop();
-
-    // Connect
-    const connected = await this.useAutoConnectButton();
-    if (!connected) {
-      throw new Error('Failed to connect to dapp');
-    }
-
-    // Select specific networks
-    const networksSelected = await this.selectNetworks(chainIds);
-    if (!networksSelected) {
-      throw new Error('Failed to select networks');
-    }
-
-    // Create session
-    await this.tapCreateSessionButton();
-
-    // Handle the connect modal that appears after creating session
-    await TestHelpers.delay(2000);
-    await ConnectBottomSheet.tapConnectButton().catch(() => {
-      // Connect modal may not have appeared or already handled
-    });
-
-    // Wait for the connection to be established
-    await TestHelpers.delay(2000);
+  async tapRevokeSessionButton(): Promise<void> {
+    await clearSessionResult();
+    await ChromeCdpHelpers.clickByIdInWebView(
+      BASE_URL,
+      SELECTORS.REVOKE_SESSION_BUTTON,
+    );
   }
 
-  /**
-   * Get session changed event data
-   * @param {number} index - The index of the event result to retrieve
-   * @returns {Promise<string|null>} The event text content or null if not found
-   */
-  async getSessionChangedEventData(index = 0): Promise<string | null> {
-    const webview = this.getWebView();
-    const elementId = `${MultichainTestDappViewSelectorsIDs.WALLET_SESSION_CHANGED_RESULT}${index}`;
-    const eventResult = webview.element(by.web.id(elementId));
-
-    try {
-      await eventResult.scrollToView();
-      const eventText = await eventResult.runScript(
-        (el) => el.textContent || '',
-      );
-      return eventText;
-    } catch (error) {
-      logger.error(
-        `Failed to get session changed event data at index ${index}:`,
-        error,
-      );
-      return null;
-    }
+  async getSessionData(resultIndex = 0): Promise<SessionResponse> {
+    const resultId = `${SELECTORS.SESSION_METHOD_RESULT}${resultIndex}`;
+    const text = await ChromeCdpHelpers.waitForElementTextInWebView(
+      BASE_URL,
+      resultId,
+      30_000,
+    );
+    if (!text)
+      throw new Error(`getSessionData: timed out waiting for #${resultId}`);
+    const parsed = JSON.parse(text);
+    const scopes =
+      parsed !== null && typeof parsed === 'object'
+        ? parsed.sessionScopes
+        : undefined;
+    return {
+      success: Boolean(scopes && Object.keys(scopes).length > 0),
+      sessionScopes: scopes ?? {},
+    };
   }
 
-  /**
-   * Subscribe to events on a specific chain
-   * @param {string} chainId - The chain ID to subscribe to
-   * @returns {Promise<boolean>} Success status
-   */
-  async subscribeToChainEvents(chainId: string): Promise<boolean> {
-    const webview = this.getWebView();
-    const scope = MultichainUtilities.getEIP155Scope(chainId);
-    const escapedScope = scope.replace(/:/g, '-');
-    const directButtonId = `${MultichainTestDappViewSelectorsIDs.DIRECT_INVOKE_PREFIX}${escapedScope}-eth_subscribe`;
-
-    try {
-      const directButton = webview.element(by.web.id(directButtonId));
-      await directButton.tap();
-      await TestHelpers.delay(MULTICHAIN_TEST_TIMEOUTS.DEFAULT_DELAY);
-      return true;
-    } catch (error) {
-      logger.error(
-        `Failed to subscribe to events for chain ${chainId}:`,
-        error,
-      );
-      return false;
-    }
+  async getSessionChangedEventData(
+    index = 0,
+    timeoutMs = 10_000,
+  ): Promise<string | null> {
+    return ChromeCdpHelpers.waitForElementTextInWebView(
+      BASE_URL,
+      `${SELECTORS.WALLET_SESSION_CHANGED_RESULT}${index}`,
+      timeoutMs,
+    );
   }
 
-  /**
-   * Check if notification container is empty
-   * @returns {Promise<boolean>} True if empty, false otherwise
-   */
-  async isNotificationContainerEmpty(): Promise<boolean> {
-    const webview = this.getWebView();
-
-    try {
-      const notificationContainer = webview.element(
-        by.web.id(MultichainTestDappViewSelectorsIDs.WALLET_NOTIFY_CONTAINER),
-      );
-      await notificationContainer.scrollToView();
-
-      const emptyMessage = webview.element(
-        by.web.id(MultichainTestDappViewSelectorsIDs.WALLET_NOTIFY_EMPTY),
+  async invokeMethodOnChain(
+    chainId: string,
+    method: string,
+    timeoutMs = 30_000,
+  ): Promise<boolean> {
+    const elementId = `${SELECTORS.DIRECT_INVOKE_PREFIX}eip155-${chainId}-${method}`;
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+      const clicked = await ChromeCdpHelpers.clickByIdInWebView(
+        BASE_URL,
+        elementId,
       );
-      // For WebView elements, try to interact to check existence
-      await emptyMessage.scrollToView();
-      return true;
-    } catch (error) {
-      // Empty message not found means we have notifications
-      return false;
+      if (clicked) return true;
+      await wait(500);
     }
+    logger.warn(
+      `#${elementId} never became clickable within ${timeoutMs}ms; scopes rendered by the dapp: ${JSON.stringify(
+        await this.readRenderedScopes(),
+      )}`,
+    );
+    return false;
   }
 
   /**
-   * Check if notifications are present
-   * @returns {Promise<boolean>} True if notifications exist, false otherwise
+   * Lists the scopes the dapp currently renders method buttons for. The dapp
+   * only renders them for granted session scopes, so this shows whether a
+   * missing invoke button means a missing permission.
    */
-  async hasNotifications(): Promise<boolean> {
-    const webview = this.getWebView();
-
-    try {
-      const firstNotification = webview.element(
-        by.web.id(
-          `${MultichainTestDappViewSelectorsIDs.WALLET_NOTIFY_DETAILS}0`,
+  private async readRenderedScopes(): Promise<string[]> {
+    const raw = await ChromeCdpHelpers.evaluateInWebView<string>(
+      BASE_URL,
+      `JSON.stringify(
+        Array.from(document.querySelectorAll('[id^="direct-methods-"]')).map(
+          (el) => el.id.replace('direct-methods-', ''),
         ),
-      );
-      await firstNotification.scrollToView();
-      return true;
-    } catch (error) {
-      return false;
-    }
-  }
-
-  /**
-   * Invoke a method on a specific chain
-   * @param {string} chainId - The chain ID
-   * @param {string} method - The method name (e.g., 'eth_chainId', 'eth_getBalance')
-   * @returns {Promise<boolean>} Success status
-   */
-  async invokeMethodOnChain(chainId: string, method: string): Promise<boolean> {
-    const webview = this.getWebView();
-    const scope = MultichainUtilities.getScope(chainId);
-    const escapedScope = scope.replace(/:/g, '-');
-    const directButtonId = `${MultichainTestDappViewSelectorsIDs.DIRECT_INVOKE_PREFIX}${escapedScope}-${method}`;
-
+      )`,
+    );
+    if (!raw) return [];
     try {
-      const directButton = webview.element(by.web.id(directButtonId));
-      // WebView elements don't need visibility checks - tap will fail if element doesn't exist
-      await directButton.tap();
-      await TestHelpers.delay(MULTICHAIN_TEST_TIMEOUTS.DEFAULT_DELAY);
-      return true;
-    } catch (error) {
-      logger.error(`Failed to invoke ${method} on chain ${chainId}:`, error);
-      return false;
+      return JSON.parse(raw) as string[];
+    } catch {
+      return [];
     }
   }
 
-  /**
-   * Get the result of an invoked method
-   * @param {string} chainId - The chain ID
-   * @param {string} method - The method name
-   * @param {number} index - The result index
-   * @returns {Promise<string|null>} The result text or null if not found
-   */
   async getInvokeMethodResult(
     chainId: string,
     method: string,
     index = 0,
   ): Promise<string | null> {
-    const webview = this.getWebView();
-    const scope = MultichainUtilities.getScope(chainId);
-    const escapedScope = scope.replace(/:/g, '-');
-
-    try {
-      // First try to scroll to the invoke container
-      const invokeContainerId = `${MultichainTestDappViewSelectorsIDs.INVOKE_CONTAINER_PREFIX}${escapedScope}`;
-      const invokeContainer = webview.element(by.web.id(invokeContainerId));
-      await invokeContainer.scrollToView();
-    } catch (error) {
-      // Container might not exist or not be visible, continue anyway
-    }
-
-    await TestHelpers.delay(MULTICHAIN_TEST_TIMEOUTS.METHOD_INVOCATION);
-
-    try {
-      // Try to scroll to the result item
-      const itemId = `${MultichainTestDappViewSelectorsIDs.METHOD_RESULT_ITEM_PREFIX}${escapedScope}-${method}-${index}`;
-      const itemElement = webview.element(by.web.id(itemId));
-      await itemElement.scrollToView();
-
-      // Get the actual result content
-      const resultElementId = `${MultichainTestDappViewSelectorsIDs.INVOKE_METHOD_RESULT_PREFIX}${escapedScope}-${method}-result-${index}`;
-      const resultElement = webview.element(by.web.id(resultElementId));
-      const resultText = await resultElement.runScript(
-        (el) => el.textContent || '',
-      );
-
-      return resultText;
-    } catch (error) {
-      logger.error(
-        `Failed to get result for ${method} on chain ${chainId}:`,
-        error,
-      );
-      return null;
-    }
+    const elementId = `${SELECTORS.INVOKE_METHOD_RESULT_PREFIX}eip155-${chainId}-${method}-result-${index}`;
+    return ChromeCdpHelpers.waitForElementTextInWebView(
+      BASE_URL,
+      elementId,
+      10_000,
+    );
   }
 
-  /**
-   * Replace the parameters for a method
-   * @param {string} method - The method name
-   * @param {object} params - The parameters to fill in
-   * @returns {Promise<void>}
-   */
-  async replaceParams(
-    scope: string,
+  async invokeMethod(
+    chainId: string,
     method: string,
-    params: object,
+    params?: unknown[],
   ): Promise<void> {
-    const webview = this.getWebView();
-    const escapedScope = this.escapeChainIdForHtml(scope);
-
-    const textareaElement = webview.element(
-      by.web.cssSelector(
-        `[data-testid="${escapedScope}-collapsible-content-textarea"]`,
-      ),
-    );
+    const scopeId = `eip155-${chainId}`;
 
-    await textareaElement.scrollToView();
+    if (!params) {
+      await ChromeCdpHelpers.clickByIdInWebView(
+        BASE_URL,
+        `${SELECTORS.DIRECT_INVOKE_PREFIX}${scopeId}-${method}`,
+      );
+      return;
+    }
 
-    const request = {
-      method: 'wallet_invokeMethod',
-      params: {
-        scope,
-        request: {
-          method,
-          params,
-        },
+    const scope = `eip155:${chainId}`;
+    const requestBody = JSON.stringify(
+      {
+        method: 'wallet_invokeMethod',
+        params: { scope, request: { method, params } },
       },
-    };
+      null,
+      2,
+    );
 
-    const requestText = JSON.stringify(request);
+    await ChromeCdpHelpers.evaluateInWebView<boolean>(
+      BASE_URL,
+      `(function(){
+        const sel = document.getElementById('method-select-${scopeId}');
+        if (!sel) return false;
+        sel.value = ${JSON.stringify(method)};
+        sel.dispatchEvent(new Event('change', {bubbles: true}));
+        return true;
+      })()`,
+    );
 
-    // Handles updating the textarea value and triggering a change event
-    // on a React controlled component
-    await textareaElement.runScript(`
-      (el) => {
-        Object.getOwnPropertyDescriptor(window.HTMLTextAreaElement.prototype, 'value')
-          .set.call(el, ${JSON.stringify(requestText)});
+    await ChromeCdpHelpers.waitForElementTextInWebView(
+      BASE_URL,
+      `invoke-method-request-${scopeId}`,
+      5_000,
+    );
 
-        el.dispatchEvent(new Event('change', { bubbles: true }));
-      }
-    `);
-  }
+    await ChromeCdpHelpers.evaluateInWebView<boolean>(
+      BASE_URL,
+      `(function(){
+        const ta = document.getElementById('invoke-method-request-${scopeId}');
+        if (!ta) return false;
+        const setter = Object.getOwnPropertyDescriptor(window.HTMLTextAreaElement.prototype, 'value').set;
+        setter.call(ta, ${JSON.stringify(requestBody)});
+        ta.dispatchEvent(new Event('input', {bubbles: true}));
+        return true;
+      })()`,
+    );
 
-  /**
-   * Attempt to invoke a method using the invoke button (used for testing after revoke)
-   * @param {string} scope - The scope of the method
-   * @returns {Promise<boolean>} True if button was clicked, false otherwise
-   */
-  async attemptInvokeMethodWithButton(scope: string): Promise<boolean> {
-    try {
-      const webview = this.getWebView();
-      const scopeId = this.escapeChainIdForHtml(scope);
-      const invokeButtonId = `invoke-method-${scopeId}-btn`;
-
-      const invokeButton = webview.element(by.web.id(invokeButtonId));
-      await invokeButton.scrollToView();
-      await invokeButton.runScript('(el) => { el.click(); }');
-
-      // Wait for processing
-      await TestHelpers.delay(MULTICHAIN_TEST_TIMEOUTS.DEFAULT_DELAY);
-      return true;
-    } catch (error) {
-      return false;
+    // Poll from the framework until the invoke button becomes enabled
+    const buttonId = `invoke-method-${scopeId}-btn`;
+    const deadline = Date.now() + 5_000;
+    while (Date.now() < deadline) {
+      const disabled = await ChromeCdpHelpers.evaluateInWebView<boolean>(
+        BASE_URL,
+        `Boolean(document.getElementById(${JSON.stringify(buttonId)})?.disabled)`,
+      );
+      if (!disabled) break;
+      await new Promise<void>((r) => setTimeout(r, 100));
     }
-  }
 
-  /**
-   * Invoke a method on a specific chain
-   * @param {string} scope - The scope of the method (e.g., 'eip155:1')
-   * @param {string} method - The method to select (e.g., 'wallet_getCallsStatus')
-   * @param {object} params - The method parameters to override default values
-   * @returns {Promise<void>}
-   */
-  async invokeMethod(
-    scope: string,
-    method: string,
-    params?: object,
-  ): Promise<void> {
-    const webview = this.getWebView();
-    const escapedScope = this.escapeChainIdForHtml(scope);
-    const selectId = `method-select-${escapedScope}`;
+    await ChromeCdpHelpers.clickByIdInWebView(BASE_URL, buttonId);
+  }
 
-    const selectElement = webview.element(by.web.id(selectId));
-    await selectElement.scrollToView();
+  async tapConfirmButton(): Promise<void> {
+    const el = await PlaywrightMatchers.getElementById(
+      ConfirmationFooterSelectorIDs.CONFIRM_BUTTON,
+    );
+    await PlaywrightGestures.waitAndTap(el, {
+      checkForDisplayed: true,
+      checkForEnabled: true,
+    });
+  }
 
-    await selectElement.runScript(`
-    (el) => {
-      el.value = '${method}';
-      el.dispatchEvent(new Event('change', { bubbles: true }));
-    }
-  `);
+  async tapCancelButton(timeout = 15_000): Promise<void> {
+    const el = await PlaywrightMatchers.getElementById(
+      ConfirmationFooterSelectorIDs.CANCEL_BUTTON,
+    );
+    await PlaywrightGestures.waitAndTap(el, {
+      timeout,
+      checkForDisplayed: true,
+    });
+  }
 
-    if (params) {
-      await this.replaceParams(scope, method, params);
-    }
+  async subscribeToChainEvents(chainId: string): Promise<boolean> {
+    const clicked = await ChromeCdpHelpers.clickByIdInWebView(
+      BASE_URL,
+      `${SELECTORS.DIRECT_INVOKE_PREFIX}eip155-${chainId}-eth_subscribe`,
+    );
+    if (!clicked) return false;
+    const resultId = `${SELECTORS.INVOKE_METHOD_RESULT_PREFIX}eip155-${chainId}-eth_subscribe-result-0`;
+    const text = await ChromeCdpHelpers.waitForElementTextInWebView(
+      BASE_URL,
+      resultId,
+      10_000,
+    );
+    return text !== null && text.trim().length > 0;
+  }
 
-    await TestHelpers.delay(MULTICHAIN_TEST_TIMEOUTS.DEFAULT_DELAY);
+  async isNotificationContainerEmpty(): Promise<boolean> {
+    return (
+      (await ChromeCdpHelpers.readTextByIdInWebView(
+        BASE_URL,
+        SELECTORS.WALLET_NOTIFY_EMPTY,
+      )) !== null
+    );
+  }
 
-    await this.attemptInvokeMethodWithButton(scope);
+  async hasNotifications(): Promise<boolean> {
+    return (
+      (await ChromeCdpHelpers.waitForElementTextInWebView(
+        BASE_URL,
+        `${SELECTORS.WALLET_NOTIFY_DETAILS}0`,
+        50_000,
+      )) !== null
+    );
   }
 }
 
diff --git a/tests/page-objects/Browser/MultichainTestDAppNetworkSelection.ts b/tests/page-objects/Browser/MultichainTestDAppNetworkSelection.ts
new file mode 100644
index 000000000000..5aaad95f6b10
--- /dev/null
+++ b/tests/page-objects/Browser/MultichainTestDAppNetworkSelection.ts
@@ -0,0 +1,191 @@
+import ChromeCdpHelpers from '../../framework/ChromeCdpHelpers.js';
+import { MultichainTestDappViewSelectorsIDs } from '../../selectors/Browser/MultichainTestDapp.selectors.js';
+import MultichainUtilities from '../../helpers/multichain/MultichainUtilities.js';
+import { createLogger } from '../../framework/logger.js';
+
+const logger = createLogger({
+  name: 'MultichainTestDAppNetworkSelection',
+});
+
+const SELECTORS = MultichainTestDappViewSelectorsIDs;
+export const MULTICHAIN_TEST_DAPP_BASE_URL = `http://localhost:8093`;
+
+const CHECKBOX_SETTLE_TIMEOUT_MS = 10_000;
+const SELECTION_ATTEMPTS = 3;
+const POLL_INTERVAL_MS = 250;
+
+export type CheckboxState =
+  | 'checked'
+  | 'unchecked'
+  | 'checked-disabled'
+  | 'unchecked-disabled'
+  | 'missing';
+
+export type ConnectionState = 'enabled' | 'disabled' | 'missing' | 'unreadable';
+
+const wait = (ms: number): Promise<void> =>
+  new Promise((resolve) => setTimeout(resolve, ms));
+
+const checkboxIdFor = (chainId: string): string =>
+  `${SELECTORS.NETWORK_CHECKBOX_PREFIX}eip155-${chainId}`;
+
+export const ALL_CHAIN_IDS = [
+  MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET,
+  MultichainUtilities.CHAIN_IDS.LINEA_MAINNET,
+  MultichainUtilities.CHAIN_IDS.ARBITRUM_ONE,
+  MultichainUtilities.CHAIN_IDS.AVALANCHE,
+  MultichainUtilities.CHAIN_IDS.OPTIMISM,
+  MultichainUtilities.CHAIN_IDS.POLYGON,
+  MultichainUtilities.CHAIN_IDS.ZKSYNC_ERA,
+  MultichainUtilities.CHAIN_IDS.BASE,
+  MultichainUtilities.CHAIN_IDS.BSC,
+  MultichainUtilities.CHAIN_IDS.LOCALHOST,
+];
+
+export async function clearSessionResult(resultIndex = 0): Promise<void> {
+  const elementId = `${SELECTORS.SESSION_METHOD_RESULT}${resultIndex}`;
+  await ChromeCdpHelpers.evaluateInWebView(
+    MULTICHAIN_TEST_DAPP_BASE_URL,
+    `(() => { const el = document.getElementById(${JSON.stringify(elementId)}); if (el) el.textContent = ''; })()`,
+  ).catch(() => undefined);
+}
+
+/**
+ * Applies the requested network selection, then re-reads every checkbox and
+ * re-applies if the dapp reset the selection mid-loop (it does that whenever
+ * a `wallet_getSession` response lands).
+ */
+export async function applyNetworkSelection(chainIds: string[]): Promise<void> {
+  const requested = chainIds.join(', ') || 'none';
+
+  for (let attempt = 1; attempt <= SELECTION_ATTEMPTS; attempt++) {
+    for (const chainId of ALL_CHAIN_IDS) {
+      await setCheckboxState(chainId, chainIds.includes(chainId));
+    }
+
+    const states = await readAllCheckboxStates();
+    const wrong = ALL_CHAIN_IDS.filter(
+      (chainId) =>
+        states[chainId] !==
+        (chainIds.includes(chainId) ? 'checked' : 'unchecked'),
+    );
+
+    if (wrong.length === 0) {
+      logger.debug(
+        `network selection [${requested}] applied on attempt ${attempt}`,
+      );
+      return;
+    }
+
+    logger.warn(
+      `attempt ${attempt}/${SELECTION_ATTEMPTS}: chains [${wrong.join(
+        ', ',
+      )}] do not match request [${requested}]; observed: ${JSON.stringify(states)}`,
+    );
+  }
+
+  throw new Error(
+    `applyNetworkSelection: selection [${requested}] did not stick after ${SELECTION_ATTEMPTS} attempts. Observed: ${JSON.stringify(
+      await readAllCheckboxStates(),
+    )}`,
+  );
+}
+
+/**
+ * Clicks a network checkbox until it actually reports the desired state.
+ * Clicks land on a disabled input as no-ops, so wait for it to be enabled
+ * before clicking and confirm the state afterwards.
+ */
+export async function setCheckboxState(
+  chainId: string,
+  checked: boolean,
+): Promise<boolean> {
+  const webId = checkboxIdFor(chainId);
+  const desired: CheckboxState = checked ? 'checked' : 'unchecked';
+  const deadline = Date.now() + CHECKBOX_SETTLE_TIMEOUT_MS;
+  let state: CheckboxState = 'missing';
+  let clicks = 0;
+
+  while (Date.now() < deadline) {
+    state = await readCheckboxState(webId);
+    if (state === desired) return true;
+
+    if (state === 'missing' || state.endsWith('-disabled')) {
+      await wait(POLL_INTERVAL_MS);
+      continue;
+    }
+
+    await ChromeCdpHelpers.clickByIdInWebView(
+      MULTICHAIN_TEST_DAPP_BASE_URL,
+      webId,
+    );
+    clicks += 1;
+    await wait(POLL_INTERVAL_MS);
+  }
+
+  logger.warn(
+    `#${webId} stuck at "${state}" (wanted "${desired}") after ${clicks} click(s)`,
+  );
+  return false;
+}
+
+export async function readConnectionState(): Promise<ConnectionState> {
+  const state = await ChromeCdpHelpers.evaluateInWebView<string>(
+    MULTICHAIN_TEST_DAPP_BASE_URL,
+    `(() => {
+        const el = document.getElementById(${JSON.stringify(SELECTORS.CREATE_SESSION_BUTTON)});
+        if (!el) return 'missing';
+        return el.disabled ? 'disabled' : 'enabled';
+      })()`,
+  );
+  if (state === 'enabled' || state === 'disabled' || state === 'missing') {
+    return state;
+  }
+  return 'unreadable';
+}
+
+export async function readCheckboxState(webId: string): Promise<CheckboxState> {
+  const states = await readCheckboxStates([webId]);
+  return states[webId] ?? 'missing';
+}
+
+export async function readAllCheckboxStates(): Promise<
+  Record<string, CheckboxState>
+> {
+  const states = await readCheckboxStates(ALL_CHAIN_IDS.map(checkboxIdFor));
+  const byChainId: Record<string, CheckboxState> = {};
+  for (const chainId of ALL_CHAIN_IDS) {
+    byChainId[chainId] = states[checkboxIdFor(chainId)] ?? 'missing';
+  }
+  return byChainId;
+}
+
+async function readCheckboxStates(
+  webIds: string[],
+): Promise<Record<string, CheckboxState>> {
+  const raw = await ChromeCdpHelpers.evaluateInWebView<string>(
+    MULTICHAIN_TEST_DAPP_BASE_URL,
+    `(() => {
+        const states = {};
+        for (const id of ${JSON.stringify(webIds)}) {
+          const el = document.getElementById(id);
+          if (!(el instanceof HTMLInputElement)) {
+            states[id] = 'missing';
+            continue;
+          }
+          states[id] =
+            (el.checked ? 'checked' : 'unchecked') +
+            (el.disabled ? '-disabled' : '');
+        }
+        return JSON.stringify(states);
+      })()`,
+  );
+
+  if (!raw) return {};
+  try {
+    return JSON.parse(raw) as Record<string, CheckboxState>;
+  } catch {
+    logger.warn(`could not parse checkbox states: ${raw}`);
+    return {};
+  }
+}
diff --git a/tests/page-objects/Browser/NetworkConnectMultiSelector.ts b/tests/page-objects/Browser/NetworkConnectMultiSelector.ts
index 002947766094..ba7b21ba5b37 100644
--- a/tests/page-objects/Browser/NetworkConnectMultiSelector.ts
+++ b/tests/page-objects/Browser/NetworkConnectMultiSelector.ts
@@ -1,7 +1,13 @@
 import { NetworkConnectMultiSelectorSelectorsIDs } from '../../../app/components/Views/NetworkConnect/NetworkConnectMultiSelector.testIds';
 import Matchers from '../../framework/Matchers';
 import Gestures from '../../framework/Gestures';
-import { Assertions, EncapsulatedElementType } from '../../framework';
+import {
+  Assertions,
+  EncapsulatedElementType,
+  encapsulated,
+  PlatformDetector,
+  PlaywrightMatchers,
+} from '../../framework';
 
 class NetworkConnectMultiSelector {
   get updateButton(): EncapsulatedElementType {
@@ -16,8 +22,14 @@ class NetworkConnectMultiSelector {
     );
   }
 
-  getMultiselectElement(label: string): EncapsulatedElementType {
-    return Matchers.getElementByLabel(label);
+  getNetworkRow(networkName: string): EncapsulatedElementType {
+    const escaped = networkName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return encapsulated({
+      appium: () =>
+        PlaywrightMatchers.getElementById(
+          new RegExp(`^${escaped}-(selected|not-selected)$`),
+        ),
+    });
   }
 
   async tapUpdateButton(): Promise<void> {
@@ -33,8 +45,14 @@ class NetworkConnectMultiSelector {
   }
 
   async isNetworkChainPermissionSelected(chainName: string): Promise<void> {
-    const chainPermissionTestId = `${chainName}-selected`;
-    const el = Matchers.getElementByID(chainPermissionTestId);
+    const el = Matchers.getElementByID(`${chainName}-selected`);
+    if (PlatformDetector.isIOSAppium()) {
+      await Assertions.expectElementToExist(el, {
+        timeout: 10000,
+        description: `Network chain permission ${chainName} should be selected`,
+      });
+      return;
+    }
     await Assertions.expectElementToBeVisible(el, {
       timeout: 10000,
       description: `Network chain permission ${chainName} should be selected`,
@@ -42,18 +60,25 @@ class NetworkConnectMultiSelector {
   }
 
   async isNetworkChainPermissionNotSelected(chainName: string): Promise<void> {
-    const chainPermissionTestId = `${chainName}-not-selected`;
-    const el = Matchers.getElementByID(chainPermissionTestId);
+    const el = Matchers.getElementByID(`${chainName}-not-selected`);
+    if (PlatformDetector.isIOSAppium()) {
+      await Assertions.expectElementToExist(el, {
+        timeout: 10000,
+        description: `Network chain permission ${chainName} should not be selected`,
+      });
+      return;
+    }
     await Assertions.expectElementToBeVisible(el, {
       timeout: 10000,
-      description: `Network chain permission ${chainName} should be selected`,
+      description: `Network chain permission ${chainName} should not be selected`,
     });
   }
 
   async selectNetworkChainPermission(chainName: string): Promise<void> {
-    const el = this.getMultiselectElement(chainName);
-    await Gestures.waitAndTap(el, {
+    const row = this.getNetworkRow(chainName);
+    await Gestures.waitAndTap(row, {
       elemDescription: `Tap on the network chain permission ${chainName}`,
+      checkForDisplayed: !PlatformDetector.isIOSAppium(),
     });
   }
 }
diff --git a/tests/page-objects/Browser/SolanaTestDApp.ts b/tests/page-objects/Browser/SolanaTestDApp.ts
index d00eb00722ca..8575adf5e6ee 100644
--- a/tests/page-objects/Browser/SolanaTestDApp.ts
+++ b/tests/page-objects/Browser/SolanaTestDApp.ts
@@ -1,186 +1,228 @@
+import ChromeCdpHelpers from '../../framework/ChromeCdpHelpers.js';
+import {
+  loginToAppPlaywright,
+  dismissPushNotificationExistingUserSheet,
+} from '../../flows/wallet.flow.js';
+import { navigateToBrowserView } from '../../flows/browser.flow.js';
+import BrowserView from './BrowserView.js';
+import DappConnectionModal from '../MMConnect/DappConnectionModal.js';
+import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
+import PlaywrightGestures from '../../framework/PlaywrightGestures';
+import { asPlaywrightElement } from '../../framework/EncapsulatedElement';
+import { SolanaTestDappSelectorsWebIDs } from '../../selectors/Browser/SolanaTestDapp.selectors.js';
 import { dataTestIds } from '@metamask/test-dapp-solana';
-import Matchers from '../../framework/Matchers';
-import { BrowserViewSelectorsIDs } from '../../../app/components/Views/BrowserTab/BrowserView.testIds';
-import Browser from './BrowserView';
-import Gestures from '../../framework/Gestures';
-import { waitFor } from 'detox';
-import { SolanaTestDappSelectorsWebIDs } from '../../selectors/Browser/SolanaTestDapp.selectors';
-import { getDappUrl } from '../../framework/fixtures/FixtureUtils';
-import { Utilities } from '../../framework';
-
-/**
- * Class to interact with the Multichain Test DApp via the WebView
- */
+
+export const SOLANA_DAPP_PORT = 8095;
+const BASE_URL = `http://localhost:${SOLANA_DAPP_PORT}`;
+
+const DAPP_LOAD_TIMEOUT_MS = 30_000;
+const CONNECT_TIMEOUT_MS = 30_000;
+const CLICK_TIMEOUT_MS = 15_000;
+const POLL_MS = 300;
+
+const { header, signMessage, sendSol } = dataTestIds.testPage;
+
+function sel(testId: string): string {
+  return `[data-testid="${testId}"]`;
+}
+
+const wait = (ms: number): Promise<void> =>
+  new Promise((resolve) => setTimeout(resolve, ms));
+
 class SolanaTestDApp {
-  get connectButtonSelector(): WebElement {
-    return Matchers.getTestElement(dataTestIds.testPage.header.connect, {
-      extraXPath: '/div/button',
-    });
+  async setupAndNavigate(): Promise<void> {
+    ChromeCdpHelpers.resetMetaMaskWebViewCache();
+    await loginToAppPlaywright({ scenarioType: 'e2e' });
+    await navigateToBrowserView();
+    await dismissPushNotificationExistingUserSheet();
+    await BrowserView.tapUrlInputBox();
+    await BrowserView.navigateToURL(BASE_URL);
+    await this.waitForDappLoaded();
+  }
+
+  private async evaluate<T>(expression: string): Promise<T | null> {
+    return ChromeCdpHelpers.evaluateInWebView<T>(BASE_URL, expression);
+  }
+
+  /** Waits until the dapp header has rendered (connection status is readable). */
+  private async waitForDappLoaded(
+    timeoutMs = DAPP_LOAD_TIMEOUT_MS,
+  ): Promise<void> {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+      const text = await this.evaluate<string>(
+        `document.querySelector(${JSON.stringify(sel(header.connectionStatus))})?.textContent?.trim() || null`,
+      ).catch(() => null);
+      if (text) return;
+      await wait(POLL_MS);
+    }
+    throw new Error(
+      `Timed out waiting for Solana test dapp to load within ${timeoutMs}ms`,
+    );
   }
 
-  get disconnectButtonSelector(): WebElement {
-    return Matchers.getTestElement(dataTestIds.testPage.header.disconnect, {
-      extraXPath: '/button',
-    });
+  private async waitForElement(
+    cssSelector: string,
+    timeoutMs = 10_000,
+  ): Promise<void> {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+      const exists = await this.evaluate<boolean>(
+        `Boolean(document.querySelector(${JSON.stringify(cssSelector)}))`,
+      );
+      if (exists) return;
+      await wait(POLL_MS);
+    }
+    throw new Error(`Timed out waiting for "${cssSelector}" to appear`);
+  }
+
+  private async click(
+    cssSelector: string,
+    timeoutMs = CLICK_TIMEOUT_MS,
+  ): Promise<void> {
+    await this.waitForElement(cssSelector, timeoutMs);
+    const clicked = await this.evaluate<boolean>(
+      `(() => {
+        const el = document.querySelector(${JSON.stringify(cssSelector)});
+        if (!el) return false;
+        el.click();
+        return true;
+      })()`,
+    );
+    if (!clicked) {
+      throw new Error(`Element not found in WebView: ${cssSelector}`);
+    }
   }
 
-  get endpointSelector(): WebElement {
-    return Matchers.getTestElement(dataTestIds.testPage.header.endpoint, {
-      tag: 'input',
-    });
+  private async pollForText(
+    cssSelector: string,
+    expected: string,
+    timeoutMs = 10_000,
+  ): Promise<void> {
+    const deadline = Date.now() + timeoutMs;
+    let actual: string | null = null;
+    while (Date.now() < deadline) {
+      actual = await this.evaluate<string>(
+        `document.querySelector(${JSON.stringify(cssSelector)})?.textContent?.trim() || null`,
+      ).catch(() => null);
+      if (actual === expected) return;
+      await wait(POLL_MS);
+    }
+    throw new Error(`Timed out: expected "${expected}", got "${actual}"`);
   }
 
-  get walletButtonSelector(): WebElement {
-    return Matchers.getElementByCSS(
-      BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
-      SolanaTestDappSelectorsWebIDs.WALLET_BUTTON,
-    );
+  // Connect button has structure <div data-testid="..."><div><button/></div></div>
+  async clickConnectButton(): Promise<void> {
+    await this.click(`${sel(header.connect)} button`);
+  }
+
+  // MetaMask wallet option is inside the Solana wallet adapter modal (CSS class)
+  async selectMetaMaskWallet(): Promise<void> {
+    await this.waitForElement(SolanaTestDappSelectorsWebIDs.WALLET_BUTTON);
+    await this.click(SolanaTestDappSelectorsWebIDs.WALLET_BUTTON);
+  }
+
+  async connect(): Promise<void> {
+    await this.clickConnectButton();
+    await this.selectMetaMaskWallet();
+    await DappConnectionModal.tapConnectButton({ timeout: 15_000 });
+    await this.verifyConnectionStatus('Connected', CONNECT_TIMEOUT_MS);
+  }
+
+  async disconnect(): Promise<void> {
+    // Disconnect button has structure <div data-testid="..."><button/></div>
+    await this.click(`${sel(header.disconnect)} button`);
+  }
+
+  async tapCancel(): Promise<void> {
+    const el = await PlaywrightMatchers.getElementByText('Cancel', true);
+    await PlaywrightGestures.waitAndTap(el, {
+      checkForDisplayed: true,
+      timeout: 10_000,
+    });
   }
 
-  get confirmTransactionButtonSelector(): WebElement {
-    return Matchers.getElementByID(
-      SolanaTestDappSelectorsWebIDs.CONFIRM_TRANSACTION_BUTTON,
+  async tapCancelTransaction(): Promise<void> {
+    const el = await PlaywrightMatchers.getElementById(
+      SolanaTestDappSelectorsWebIDs.CANCEL_TRANSACTION_BUTTON,
+      { exact: true },
     );
+    await el.unwrap().waitForExist({ timeout: 30_000 });
+    await el.click();
   }
 
-  get confirmSignMessageButtonSelector(): WebElement {
-    return Matchers.getElementByID(
-      SolanaTestDappSelectorsWebIDs.CONFIRM_SIGN_MESSAGE_BUTTON,
+  async connectWithAllAccounts(): Promise<void> {
+    await this.clickConnectButton();
+    await this.selectMetaMaskWallet();
+    // DappConnectionModal.editAccountsButton handles platform differences:
+    // Android uses content-desc="Edit accounts" XPath; iOS uses resource ID.
+    const editAccountsEl = await asPlaywrightElement(
+      DappConnectionModal.editAccountsButton,
+    );
+    await PlaywrightGestures.waitAndTap(editAccountsEl, { timeout: 10_000 });
+    // Both "Select all" and "multiconnect-connect-button" are found by UiSelector but
+    // isDisplayed() returns false for them — bypass with waitForExist + click().
+    const selectAllEl = await PlaywrightMatchers.getElementByText(
+      'Select all',
+      true,
+    );
+    await selectAllEl.unwrap().waitForExist({ timeout: 10_000 });
+    await selectAllEl.click();
+    const multiConnectEl = await PlaywrightMatchers.getElementById(
+      'multiconnect-connect-button',
     );
+    await multiConnectEl.unwrap().waitForExist({ timeout: 10_000 });
+    await multiConnectEl.click();
+    await DappConnectionModal.tapConnectButton({ timeout: 15_000 });
+    await this.verifyConnectionStatus('Connected', CONNECT_TIMEOUT_MS);
   }
 
-  get cancelButtonSelector() {
-    return Matchers.getElementByText('Cancel');
-  }
-
-  async navigateToSolanaTestDApp(): Promise<void> {
-    await Browser.tapUrlInputBox();
-
-    await Browser.navigateToURL(getDappUrl(0));
-
-    await waitFor(element(by.id(BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID)))
-      .toBeVisible()
-      .withTimeout(10000);
-  }
-
-  async reloadSolanaTestDApp(): Promise<void> {
-    await Browser.reloadTab();
-  }
-
-  /**
-   * Tap a button in the WebView
-   */
-  async tapButton(webElement: WebElement): Promise<void> {
-    await Gestures.scrollToWebViewPort(webElement);
-    await Gestures.waitAndTap(webElement);
-  }
-
-  getHeader() {
-    return {
-      connect: async () => {
-        await this.tapButton(this.connectButtonSelector);
-      },
-      disconnect: async () => {
-        await this.tapButton(this.disconnectButtonSelector);
-      },
-      selectMetaMask: async () => {
-        await this.tapButton(this.walletButtonSelector);
-      },
-      getConnectionStatus: async () => {
-        const connectionStatusDiv = await Matchers.getTestElement(
-          dataTestIds.testPage.header.connectionStatus,
-        );
-        return await connectionStatusDiv.getText();
-      },
-      getAccount: async () => {
-        const account = await Matchers.getTestElement(
-          dataTestIds.testPage.header.account,
-          { extraXPath: '/a' },
-        );
-        return await account.getText();
-      },
-    };
-  }
-
-  getSignMessageTest() {
-    return {
-      signMessage: async () => {
-        await this.tapButton(
-          Matchers.getTestElement(
-            dataTestIds.testPage.signMessage.signMessage,
-            {
-              tag: 'button',
-            },
-          ),
-        );
-      },
-      getSignedMessage: () =>
-        Utilities.executeWithRetry(
-          async () => {
-            const el = await Matchers.getTestElement(
-              dataTestIds.testPage.signMessage.signedMessage,
-              { tag: 'pre' },
-            );
-            return el.getText();
-          },
-          { timeout: 30_000, description: 'read signed message from webview' },
-        ),
-    };
-  }
-
-  getSendSolTest() {
-    return {
-      signTransaction: async () => {
-        await this.tapButton(
-          Matchers.getTestElement(
-            dataTestIds.testPage.sendSol.signTransaction,
-            {
-              tag: 'button',
-            },
-          ),
-        );
-      },
-      sendTransaction: async () => {
-        await this.tapButton(
-          Matchers.getTestElement(
-            dataTestIds.testPage.sendSol.sendTransaction,
-            {
-              tag: 'button',
-            },
-          ),
-        );
-      },
-      getSignedTransaction: async () =>
-        (
-          await Matchers.getTestElement(
-            dataTestIds.testPage.sendSol.signedTransaction,
-            {
-              tag: 'pre',
-            },
-          )
-        ).getText(),
-      getTransactionHash: async () =>
-        (
-          await Matchers.getTestElement(
-            dataTestIds.testPage.sendSol.transactionHash,
-            {
-              tag: 'pre',
-            },
-          )
-        ).getText(),
-    };
-  }
-
-  async confirmTransaction(): Promise<void> {
-    await Gestures.waitAndTap(this.confirmTransactionButtonSelector);
+  async signMessage(): Promise<void> {
+    await this.click(`button${sel(signMessage.signMessage)}`);
   }
 
   async confirmSignMessage(): Promise<void> {
-    await Gestures.waitAndTap(this.confirmSignMessageButtonSelector);
+    const el = await PlaywrightMatchers.getElementByText('Confirm', true);
+    await el.unwrap().waitForExist({ timeout: 30_000 });
+    await el.click();
+  }
+
+  async getSignedMessage(timeoutMs = 30_000): Promise<string> {
+    const deadline = Date.now() + timeoutMs;
+    let text: string | null = null;
+    const cssSel = `pre${sel(signMessage.signedMessage)}`;
+    while (Date.now() < deadline) {
+      text = await this.evaluate<string>(
+        `document.querySelector(${JSON.stringify(cssSel)})?.textContent?.trim() || null`,
+      ).catch(() => null);
+      if (text) return text;
+      await wait(POLL_MS);
+    }
+    throw new Error(`Timed out waiting for signed message`);
+  }
+
+  async signTransaction(): Promise<void> {
+    await this.click(`button${sel(sendSol.signTransaction)}`);
+  }
+
+  async verifyConnectionStatus(
+    expected: string,
+    timeoutMs = 10_000,
+  ): Promise<void> {
+    await this.pollForText(sel(header.connectionStatus), expected, timeoutMs);
+  }
+
+  async verifyAccount(expected: string, timeoutMs = 10_000): Promise<void> {
+    // Account element contains an <a> tag with the address text
+    await this.pollForText(`${sel(header.account)} a`, expected, timeoutMs);
   }
 
-  async tapCancelButton(): Promise<void> {
-    await Gestures.waitAndTap(this.cancelButtonSelector);
+  async reload(): Promise<void> {
+    // IIFE: iOS evaluateInWebView wraps as `return (${expression})`.
+    await this.evaluate('(() => { location.reload(); return true; })()');
+    ChromeCdpHelpers.resetMetaMaskWebViewCache();
+    await this.waitForDappLoaded();
+    await this.pollForText(sel(header.connectionStatus), 'Connected');
   }
 }
 
diff --git a/tests/page-objects/Browser/TestDApp.ts b/tests/page-objects/Browser/TestDApp.ts
index 813d29f1d39b..5e435bffb899 100644
--- a/tests/page-objects/Browser/TestDApp.ts
+++ b/tests/page-objects/Browser/TestDApp.ts
@@ -5,14 +5,20 @@ import Matchers from '../../framework/Matchers';
 import { getDappUrl } from '../../framework/fixtures/FixtureUtils';
 import { EncapsulatedElementType } from '../../framework/EncapsulatedElement';
 import { BrowserViewSelectorsIDs } from '../../../app/components/Views/BrowserTab/BrowserView.testIds';
+import { ConnectAccountBottomSheetSelectorsIDs } from '../../../app/components/Views/MultichainAccounts/shared/ConnectAccountBottomSheet.testIds';
 import { TestDappSelectorsWebIDs } from '../../selectors/Browser/TestDapp.selectors';
 import Browser from './BrowserView';
-import { Assertions, TapOptions, Utilities } from '../../framework';
+import { Assertions, TapOptions, Utilities, sleep } from '../../framework';
 import { FrameworkDetector } from '../../framework/FrameworkDetector';
 import { PlatformDetector } from '../../framework/PlatformLocator';
 import PlaywrightWebMatchers from '../../framework/PlaywrightWebMatchers';
 import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
 import PlaywrightGestures from '../../framework/PlaywrightGestures';
+import { getDriver } from '../../framework/PlaywrightUtilities';
+import ChromeCdpHelpers from '../../framework/ChromeCdpHelpers';
+import { createPlaywrightLogger } from '../../framework/playwrightLogger';
+
+const logger = createPlaywrightLogger('TestDApp');
 
 const CONFIRM_BUTTON_TEXT = enContent.confirmation_modal.confirm_cta;
 const APPROVE_BUTTON_TEXT = enContent.transactions.tx_review_approve;
@@ -21,6 +27,7 @@ const DAPP_ACCOUNTS_TEXT = 'Accounts:';
 
 interface ContractNavigationParams {
   contractAddress: string;
+  scrollTo?: string;
 }
 
 const testDappPageUrl = (): string => getDappUrl(0);
@@ -200,12 +207,6 @@ class TestDApp {
     );
   }
 
-  get requestPermissions(): WebElement {
-    return getTestDappWebElementById(
-      TestDappSelectorsWebIDs.REQUEST_PERMISSIONS,
-    );
-  }
-
   get connectButtonText(): WebElement {
     return Matchers.getElementByText(CONNECT_BUTTON_TEXT);
   }
@@ -235,9 +236,15 @@ class TestDApp {
     );
   }
 
-  getNetworkItemByName(networkName: string): WebElement {
+  getNetworkItemByName(
+    networkName: string,
+    { exactMatch = false }: { exactMatch?: boolean } = {},
+  ): WebElement {
+    const textPredicate = exactMatch
+      ? `text()="${networkName}"`
+      : `contains(text(), "${networkName}")`;
     return getTestDappWebElementByXPath(
-      `//div[contains(@class, "network-modal-item-name") and contains(text(), "${networkName}")]`,
+      `//div[contains(@class, "network-modal-item-name") and ${textPredicate}]`,
     );
   }
 
@@ -304,29 +311,49 @@ class TestDApp {
   }
 
   async getConnectedAccounts(): Promise<string> {
-    const webview = Matchers.getWebViewByID(
-      BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
+    return this.readTestDappTextContentById(
+      TestDappSelectorsWebIDs.ACCOUNTS_TEXT,
     );
-    const accountsElement = webview.element(by.web.id(`accounts`));
-
-    const accountsText = await accountsElement
-      .runScript('(el) => el.textContent')
-      .catch(() => '');
-
-    return typeof accountsText === 'string' ? accountsText : '';
   }
 
   async getConnectedChainId(): Promise<string> {
-    const webview = Matchers.getWebViewByID(
-      BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
+    return this.readTestDappTextContentById(
+      TestDappSelectorsWebIDs.CHAIN_ID_TEXT,
     );
-    const chainIdElement = webview.element(by.web.id(`chainId`));
-
-    const chainIdText = await chainIdElement
-      .runScript('(el) => el.textContent')
-      .catch(() => '');
+  }
 
-    return typeof chainIdText === 'string' ? chainIdText : '';
+  /**
+   * Wait until the test-dapp element has non-empty textContent.
+   * Appium: poll via string-form `driver.execute` (no findElement).
+   */
+  private async readTestDappTextContentById(webId: string): Promise<string> {
+    return Utilities.executeWithRetry(
+      async () => {
+        let text = '';
+        await PlaywrightWebMatchers.withWebViewAction(
+          testDappPageUrl(),
+          async () => {
+            // String script — avoids WDIO function polyfill / WDA serialization.
+            const result = await getDriver().execute(
+              `return (document.getElementById(${JSON.stringify(
+                webId,
+              )})?.textContent || '').trim();`,
+            );
+            text = typeof result === 'string' ? result : '';
+          },
+        );
+        if (!text) {
+          throw new Error(
+            `Test dapp #${webId} text is empty (provider may not have injected yet)`,
+          );
+        }
+        return text;
+      },
+      {
+        timeout: 30000,
+        description: `Poll test dapp #${webId} textContent via JS`,
+      },
+    );
   }
 
   async connect(): Promise<void> {
@@ -456,6 +483,135 @@ class TestDApp {
     });
   }
 
+  async tapSwitchChainButton(timeoutMs = 15_000): Promise<void> {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+      const clicked = await ChromeCdpHelpers.clickByIdInWebView(
+        testDappPageUrl(),
+        TestDappSelectorsWebIDs.SWITCH_ETHEREUM_CHAIN,
+      );
+      if (clicked) return;
+      await sleep(300);
+    }
+    throw new Error(
+      `Timed out waiting for #${TestDappSelectorsWebIDs.SWITCH_ETHEREUM_CHAIN} in TestDApp WebView`,
+    );
+  }
+
+  /**
+   * Clicks the Test Dapp `#connectButton` in the WebView (eth_requestAccounts).
+   * Retries until the connect sheet appears — needed on slow Appium Android loads.
+   */
+  async tapDappConnectButton(timeoutMs = 15_000): Promise<void> {
+    const deadline = Date.now() + timeoutMs;
+    let lastClickAt = 0;
+    let clickAttempts = 0;
+    let lastClickResult: boolean | null = null;
+
+    while (Date.now() < deadline) {
+      if (Date.now() - lastClickAt >= 1_000) {
+        lastClickAt = Date.now();
+        clickAttempts += 1;
+        lastClickResult = await ChromeCdpHelpers.evaluateInWebView<boolean>(
+          testDappPageUrl(),
+          `(() => {
+            const el = document.getElementById(${JSON.stringify(
+              TestDappSelectorsWebIDs.CONNECT_BUTTON,
+            )});
+            if (!el) return false;
+            el.click();
+            return true;
+          })()`,
+        );
+        logger.info(
+          `tapDappConnectButton attempt=${clickAttempts} cdpClick=${String(lastClickResult)} url=${testDappPageUrl()}`,
+        );
+      }
+
+      try {
+        const connectSheetButton = await PlaywrightMatchers.getElementById(
+          ConnectAccountBottomSheetSelectorsIDs.CONNECT_BUTTON,
+        );
+        await connectSheetButton.unwrap().waitForDisplayed({ timeout: 500 });
+        logger.info(
+          `tapDappConnectButton connect sheet visible after ${clickAttempts} click attempt(s)`,
+        );
+        return;
+      } catch {
+        // Connect sheet not up yet.
+      }
+
+      await sleep(300);
+    }
+
+    const diagnostics = await ChromeCdpHelpers.evaluateInWebView<{
+      href: string;
+      hasConnectButton: boolean;
+      hasEthereum: boolean;
+      hasProviders: boolean;
+      chainId: string | null;
+      accountsText: string | null;
+      selectedAddress: string | null;
+    }>(
+      testDappPageUrl(),
+      `(() => {
+        const connectEl = document.getElementById(${JSON.stringify(
+          TestDappSelectorsWebIDs.CONNECT_BUTTON,
+        )});
+        const accountsEl = document.getElementById(${JSON.stringify(
+          TestDappSelectorsWebIDs.ACCOUNTS_TEXT,
+        )});
+        const chainEl = document.getElementById(${JSON.stringify(
+          TestDappSelectorsWebIDs.CHAIN_ID_TEXT,
+        )});
+        return {
+          href: location.href,
+          hasConnectButton: Boolean(connectEl),
+          hasEthereum: typeof window.ethereum !== 'undefined',
+          hasProviders: Array.isArray(window.ethereum?.providers)
+            ? window.ethereum.providers.length > 0
+            : Boolean(window.ethereum),
+          chainId: chainEl ? (chainEl.textContent || null) : null,
+          accountsText: accountsEl ? (accountsEl.textContent || null) : null,
+          selectedAddress: window.ethereum?.selectedAddress ?? null,
+        };
+      })()`,
+    );
+
+    logger.error(
+      `tapDappConnectButton timed out after ${clickAttempts} click attempt(s); lastClick=${String(lastClickResult)}; diagnostics=${JSON.stringify(diagnostics)}`,
+    );
+
+    throw new Error(
+      `Timed out waiting for connect sheet after #${TestDappSelectorsWebIDs.CONNECT_BUTTON} click` +
+        ` (attempts=${clickAttempts}, lastClick=${String(lastClickResult)}, diagnostics=${JSON.stringify(diagnostics)})`,
+    );
+  }
+
+  async requestPermissions({
+    accounts,
+  }: { accounts?: string[] } = {}): Promise<void> {
+    const request = JSON.stringify({
+      jsonrpc: '2.0',
+      method: 'wallet_requestPermissions',
+      params: [
+        {
+          eth_accounts: accounts
+            ? {
+                caveats: [
+                  { type: 'restrictReturnedAccounts', value: accounts },
+                ],
+              }
+            : {},
+        },
+      ],
+    });
+    await ChromeCdpHelpers.evaluateInWebView(
+      testDappPageUrl(),
+      `window.ethereum.request(${request})`,
+    );
+  }
+
   async tapApproveButton(): Promise<void> {
     await Gestures.waitAndTap(this.approveButtonText, {
       elemDescription: 'Approve Button',
@@ -495,11 +651,14 @@ class TestDApp {
 
   async navigateToTestDappWithContract({
     contractAddress,
+    scrollTo,
   }: ContractNavigationParams): Promise<void> {
     await Browser.tapUrlInputBox();
-    await Browser.navigateToURL(
-      `${getDappUrl(0)}/?scrollTo=''&contract=${contractAddress}`,
-    );
+    const params = new URLSearchParams({ contract: contractAddress });
+    if (scrollTo) {
+      params.set('scrollTo', scrollTo);
+    }
+    await Browser.navigateToURL(`${getDappUrl(0)}/?${params.toString()}`);
   }
 
   async switchChainFromTestDapp(): Promise<void> {
@@ -532,12 +691,6 @@ class TestDApp {
     });
   }
 
-  async tapRequestPermissions(): Promise<void> {
-    await this.tapButton(this.requestPermissions, {
-      elemDescription: 'Request Permissions Button',
-    });
-  }
-
   async tapERC721RevokeApprovalButton(): Promise<void> {
     await this.tapButton(this.erc721RevokeApprovalButton, {
       elemDescription: 'ERC721 Revoke Approval Button',
@@ -572,25 +725,23 @@ class TestDApp {
     });
   }
 
-  async tapNetworkByName(networkName: string): Promise<void> {
-    if (FrameworkDetector.isAppium() && PlatformDetector.isAndroid()) {
-      const networkItem =
-        await PlaywrightMatchers.getElementByText(networkName);
-      const webview = await PlaywrightMatchers.getElementById(
-        BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
-      );
-      await PlaywrightGestures.scrollIntoView(networkItem, {
-        scrollableElement: webview,
-        scrollParams: { direction: 'up' },
-        maxScrolls: 20,
-      });
-      await PlaywrightGestures.tap(networkItem);
-      return;
-    }
-
-    await this.tapButton(this.getNetworkItemByName(networkName), {
-      elemDescription: `tap ${networkName} network`,
+  async tapNetworkByName(
+    networkName: string,
+    { exactMatch = false }: { exactMatch?: boolean } = {},
+  ): Promise<void> {
+    const networkItem = await PlaywrightMatchers.getElementByText(
+      networkName,
+      exactMatch,
+    );
+    const webview = await PlaywrightMatchers.getElementById(
+      BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
+    );
+    await PlaywrightGestures.scrollIntoView(networkItem, {
+      scrollableElement: webview,
+      scrollParams: { direction: 'up' },
+      maxScrolls: 20,
     });
+    await PlaywrightGestures.tap(networkItem);
   }
 }
 
diff --git a/tests/page-objects/Browser/TestSnaps.ts b/tests/page-objects/Browser/TestSnaps.ts
index 189ea8ff6545..0ffadb594f97 100644
--- a/tests/page-objects/Browser/TestSnaps.ts
+++ b/tests/page-objects/Browser/TestSnaps.ts
@@ -12,19 +12,23 @@ import {
   SnapUIRendererSelectorIDs,
   SnapUIInputSelectorIDs,
   SnapUIInputSelectorXPaths,
+  snapUiNativeIosXPath,
   snapUISelectorItemAndroidUIAutomator,
   snapUISelectorItemIosXPath,
+  SNAP_UI_DROPDOWN_SHEET_TITLE,
+  snapUIJsxCountAndroidXPath,
+  snapUIJsxCountIosXPath,
   TEST_SNAPS_URL,
   testSnapsAndroidScrollOptions,
 } from '../../selectors/Browser/TestSnaps.selectors';
+import type { TapOptions } from '../../framework/types';
 import WebView, { type WebViewByIdOptions } from '../../framework/WebView';
 import Gestures from '../../framework/Gestures';
 import { SNAP_INSTALL_CONNECT } from '../../../app/components/Approvals/InstallSnapApproval/components/InstallSnapConnectionRequest/InstallSnapConnectionRequest.constants';
 import { SNAP_INSTALL_PERMISSIONS_REQUEST_APPROVE } from '../../../app/components/Approvals/InstallSnapApproval/components/InstallSnapPermissionsRequest/InstallSnapPermissionsRequest.constants';
 import { SNAP_INSTALL_OK } from '../../../app/components/Approvals/InstallSnapApproval/InstallSnapApproval.constants';
-import TestHelpers from '../../helpers';
 import Assertions from '../../framework/Assertions';
-import Utilities from '../../framework/Utilities';
+import Utilities, { sleep } from '../../framework/Utilities';
 import { ConfirmationFooterSelectorIDs } from '../../../app/components/Views/confirmations/ConfirmationView.testIds';
 import { waitForTestSnapsToLoad } from '../../flows/browser.flow';
 import {
@@ -36,9 +40,11 @@ import {
 import { FrameworkDetector } from '../../framework/FrameworkDetector';
 import { PlatformDetector } from '../../framework/PlatformLocator';
 import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
+import { getWindowSize } from '../../framework/DeviceInfoCache';
+import { getDriver } from '../../framework/PlaywrightUtilities';
 import { Json } from '@metamask/utils';
 import ToastModal from '../wallet/ToastModal';
-import SolanaTestDApp from './SolanaTestDApp';
+import { SolanaTestDappSelectorsWebIDs } from '../../selectors/Browser/SolanaTestDapp.selectors';
 
 export { TEST_SNAPS_URL } from '../../selectors/Browser/TestSnaps.selectors';
 
@@ -84,33 +90,92 @@ class TestSnaps {
   }
 
   get checkboxElement(): EncapsulatedElementType {
-    return Matchers.getElementByID('snap-ui-renderer__checkbox');
+    return this.getSnapUiNativeElement(SnapUIRendererSelectorIDs.checkbox);
   }
 
   get dateTimePickerTouchable(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      'snap-ui-renderer__date-time-picker--datetime-touchable',
+    return this.getSnapUiNativeElement(
+      SnapUIRendererSelectorIDs.dateTimeTouchable,
     );
   }
 
   get datePickerTouchable(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      'snap-ui-renderer__date-time-picker--date-touchable',
-    );
+    return this.getSnapUiNativeElement(SnapUIRendererSelectorIDs.dateTouchable);
   }
 
   get timePickerTouchable(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      'snap-ui-renderer__date-time-picker--time-touchable',
-    );
+    return this.getSnapUiNativeElement(SnapUIRendererSelectorIDs.timeTouchable);
   }
 
   get dateTimePickerOkButton(): EncapsulatedElementType {
     return Matchers.getElementByText('OK');
   }
 
-  get snapUIRendererScrollView(): Promise<Detox.NativeMatcher> {
-    return Matchers.getIdentifier('snap-ui-renderer__scrollview');
+  get snapUIRendererScrollView() {
+    return Matchers.scrollContainer(SnapUIRendererSelectorIDs.scrollView);
+  }
+
+  /** Native Snap UI control — iOS uses name XPath (testID often not tappable). */
+  getSnapUiNativeElement(testID: string): EncapsulatedElementType {
+    return resolve({
+      detoxTestID: testID,
+      androidAppiumTestID: testID,
+      iosAppiumXPath: snapUiNativeIosXPath(testID),
+    });
+  }
+
+  /** Snap UI text input — iOS: first scrollview textfield (index 0). */
+  getSnapUiInput(name: string): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        element(by.id(`${name}-snap-ui-input`)) as unknown as DetoxElement,
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(`${name}-snap-ui-input`, {
+            exact: true,
+          }),
+        ios: () =>
+          PlaywrightMatchers.getElementByXPath(
+            SnapUIInputSelectorXPaths.textfieldIos,
+            { lastElement: false, index: 0 },
+          ),
+      },
+    });
+  }
+
+  /** JSX Snap counter ("0" / "1"), scoped under the Snap UI scrollview. */
+  jsxCountElement(count: string): EncapsulatedElementType {
+    const scrollViewId = SnapUIRendererSelectorIDs.scrollView;
+    return encapsulated({
+      detox: () =>
+        element(
+          by.text(count).withAncestor(by.id(scrollViewId)),
+        ) as unknown as DetoxElement,
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementByXPath(
+            snapUIJsxCountAndroidXPath(count),
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementByXPath(snapUIJsxCountIosXPath(count)),
+      },
+    });
+  }
+
+  async tapJsxIncrementButton(): Promise<void> {
+    const button = Matchers.getElementByText(/^Increment$/i);
+    await Gestures.waitAndTap(
+      button,
+      this.snapUiTapOptions({ elemDescription: 'JSX Increment' }),
+    );
+  }
+
+  /** iOS: skip displayed/enabled waits for Snap UI nodes with visible=false. */
+  private snapUiTapOptions(extra: TapOptions = {}): TapOptions {
+    if (PlatformDetector.isIOSAppium()) {
+      return { checkForDisplayed: false, checkEnabled: false, ...extra };
+    }
+    return extra;
   }
 
   private getTestSnapsWebElement(innerID: string) {
@@ -370,8 +435,9 @@ class TestSnaps {
   }
 
   async tapOkButton() {
-    const button = Matchers.getElementByText(/^OK$/i);
-    await Gestures.waitAndTap(button);
+    // Optional "I, " prefix: Snap UI icon accessibility labels (e.g. "I, OK").
+    const button = Matchers.getElementByText(/^(I, )?OK$/i);
+    await Gestures.waitAndTap(button, this.snapUiTapOptions());
   }
 
   async tapApproveButton() {
@@ -394,16 +460,22 @@ class TestSnaps {
   }
 
   async tapSubmitButton() {
-    const button = Matchers.getElementByText('Submit');
-    await Gestures.waitAndTap(button);
+    // Optional "I, " prefix: Snap UI icon accessibility labels (e.g. "I, Submit").
+    const button = Matchers.getElementByText(/^(I, )?Submit$/i);
+    await Gestures.waitAndTap(button, this.snapUiTapOptions());
   }
 
   async dismissAlert() {
     try {
-      await Gestures.tap(Matchers.getElementByText(/^OK$/i));
+      await this.tapOkButton();
     } catch (error) {
+      // Teardown-only helper: specs assert on the alert before dismissing it,
+      // and the alert can close on its own first, so a missing OK button means
+      // there is nothing left to dismiss.
       const message = error instanceof Error ? error.message : String(error);
-      if (!/stale|wasn't found|no such element/i.test(message)) {
+      if (
+        !/stale|wasn't found|no such element|still not displayed/i.test(message)
+      ) {
         throw error;
       }
     }
@@ -421,19 +493,39 @@ class TestSnaps {
   }
 
   async fillInput(name: string, text: string) {
-    const input = Matchers.getElementByID(`${name}-snap-ui-input`);
-    await Gestures.typeText(input, text, { hideKeyboard: true });
+    await Gestures.typeText(this.getSnapUiInput(name), text, {
+      hideKeyboard: !PlatformDetector.isIOSAppium(),
+    });
+    if (PlatformDetector.isIOSAppium()) {
+      await this.dismissSnapUiKeyboard();
+    }
+  }
+
+  /** iOS: WDA tapOutside fails on Snap UI sheets — tap near the header instead. */
+  private async dismissSnapUiKeyboard(): Promise<void> {
+    const drv = getDriver();
+    if (!drv) {
+      return;
+    }
+    try {
+      const { width, height } = getWindowSize();
+      await drv
+        .action('pointer', { parameters: { pointerType: 'touch' } })
+        .move({ x: Math.floor(width / 2), y: Math.floor(height * 0.18) })
+        .down()
+        .pause(50)
+        .up()
+        .perform();
+    } catch {
+      // already dismissed
+    }
   }
 
-  /**
-   * Dialog Snap custom input. iOS uses textfield selector as testID
-   * is not exposed in page source.
-   */
   async fillCustomDialogInput(text: string) {
     const input = resolve({
       detoxTestID: SnapUIInputSelectorIDs.customDialogInput,
       androidAppiumTestID: SnapUIInputSelectorIDs.customDialogInput,
-      iosAppiumXPath: SnapUIInputSelectorXPaths.customDialogInputIos,
+      iosAppiumXPath: SnapUIInputSelectorXPaths.textfieldIos,
     });
 
     await Gestures.typeText(input, text, { hideKeyboard: true });
@@ -443,11 +535,22 @@ class TestSnaps {
     selector: keyof typeof NativeDropdownSelectorWebIDS,
     text: string,
   ): Promise<void> {
-    const dropdown = Matchers.getElementByID(
+    const dropdown = this.getSnapUiNativeElement(
       NativeDropdownSelectorWebIDS[selector],
     );
 
-    await Gestures.tap(dropdown);
+    await Gestures.tap(dropdown, this.snapUiTapOptions());
+    try {
+      await this.waitForSnapUiDropdownOption(text);
+    } catch (firstError) {
+      if (!PlatformDetector.isIOSAppium()) {
+        throw firstError;
+      }
+      // First tap often swallowed while keyboard is up — blur and retry once.
+      await this.dismissSnapUiKeyboard();
+      await Gestures.tap(dropdown, this.snapUiTapOptions());
+      await this.waitForSnapUiDropdownOption(text);
+    }
 
     const selectorItem = encapsulated({
       detox: () =>
@@ -464,81 +567,142 @@ class TestSnaps {
         ios: () =>
           PlaywrightMatchers.getElementByXPath(
             snapUISelectorItemIosXPath(text),
+            { lastElement: true },
           ),
       },
     });
-    await Gestures.tap(selectorItem);
+    await Gestures.tap(selectorItem, this.snapUiTapOptions());
+  }
+
+  /** Wait for dropdown sheet + option (iOS: hierarchy only, not displayed). */
+  private async waitForSnapUiDropdownOption(text: string): Promise<void> {
+    if (PlatformDetector.isAndroidAppium()) {
+      await Assertions.expectTextDisplayed(text, {
+        timeout: 15_000,
+        description: `Snap UI dropdown option "${text}"`,
+      });
+      return;
+    }
+
+    if (!PlatformDetector.isIOSAppium()) {
+      return;
+    }
+
+    const optionXPath = snapUISelectorItemIosXPath(text);
+    const sheetOpenXPath = [
+      `//*[@name="${SnapUIRendererSelectorIDs.selectorItem}"]`,
+      `//*[@label="${SNAP_UI_DROPDOWN_SHEET_TITLE}" or @name="${SNAP_UI_DROPDOWN_SHEET_TITLE}"]`,
+    ].join(' | ');
+
+    await Utilities.executeWithRetry(
+      async () => {
+        const drv = getDriver();
+        if (!drv) {
+          throw new Error('Driver is not available');
+        }
+        const sheetNodes = await drv.$$(sheetOpenXPath);
+        if ((await sheetNodes.length) === 0) {
+          throw new Error('Snap UI dropdown/selector sheet not open yet');
+        }
+        const optionNodes = await drv.$$(optionXPath);
+        if ((await optionNodes.length) === 0) {
+          throw new Error(
+            `Snap UI dropdown option "${text}" not in hierarchy yet`,
+          );
+        }
+      },
+      {
+        timeout: 15_000,
+        description: `Snap UI dropdown option "${text}"`,
+      },
+    );
   }
 
   async selectRadioButton(text: string) {
     const radioButton = encapsulated({
       detox: () =>
         element(
-          by.text(text).withAncestor(by.id('snap-ui-renderer__radio-button')),
+          by
+            .text(text)
+            .withAncestor(by.id(SnapUIRendererSelectorIDs.radioButton)),
         ) as unknown as DetoxElement,
       appium: {
         android: () =>
           PlaywrightMatchers.getElementByAndroidUIAutomator(
-            `.resourceIdMatches(".*snap-ui-renderer__radio-button.*").childSelector(new UiSelector().text("${text}"))`,
+            `.resourceIdMatches(".*${SnapUIRendererSelectorIDs.radioButton}.*").childSelector(new UiSelector().text("${text}"))`,
           ),
         ios: () =>
           PlaywrightMatchers.getElementByXPath(
-            `//*[@name="snap-ui-renderer__radio-button" and (@label="${text}" or contains(@label,"${text}") or @name="${text}")] | //*[@name="snap-ui-renderer__radio-button"]//*[@label="${text}" or @name="${text}" or @value="${text}"]`,
+            `//*[@name="${SnapUIRendererSelectorIDs.radioButton}" and (@label="${text}" or contains(@label,"${text}") or @name="${text}")] | //*[@name="${SnapUIRendererSelectorIDs.radioButton}"]//*[@label="${text}" or @name="${text}" or @value="${text}"]`,
           ),
       },
     });
-    await Gestures.tap(radioButton);
+    await Gestures.tap(radioButton, this.snapUiTapOptions());
   }
 
   async tapCheckbox() {
-    await Gestures.tap(this.checkboxElement);
+    await Gestures.tap(this.checkboxElement, this.snapUiTapOptions());
   }
 
-  async selectDateInDateTimePicker() {
-    await Gestures.scrollToElement(
-      this.timePickerTouchable,
-      this.snapUIRendererScrollView,
-      {
-        startPositionX: 0,
-        startPositionY: 0,
-      },
+  /** Android: swipe Snap UI scrollview so date/time rows enter the hierarchy. */
+  async revealSnapUiDatePickers(): Promise<void> {
+    if (!PlatformDetector.isAndroidAppium()) {
+      return;
+    }
+
+    const scrollView = this.getSnapUiNativeElement(
+      SnapUIRendererSelectorIDs.scrollView,
     );
+    for (let i = 0; i < 2; i++) {
+      await Gestures.swipe(scrollView, 'up', {
+        speed: 'slow',
+        percentage: 0.45,
+        elemDescription: 'Snap UI scrollview — reveal date/time pickers',
+      });
+    }
+  }
 
-    await Gestures.waitAndTap(this.dateTimePickerTouchable, {
-      checkStability: true,
-      elemDescription: 'open date-time picker',
+  private async openSnapUiPicker(
+    touchable: EncapsulatedElementType,
+    elemDescription: string,
+    scrollOptions: { startPositionX?: number; startPositionY?: number } = {},
+  ): Promise<void> {
+    await Gestures.scrollToElement(touchable, this.snapUIRendererScrollView, {
+      elemDescription,
+      ...scrollOptions,
     });
-
+    await Gestures.waitAndTap(
+      touchable,
+      this.snapUiTapOptions({ checkStability: true, elemDescription }),
+    );
     await Gestures.waitAndTap(this.dateTimePickerOkButton, {
-      elemDescription: 'date-time picker OK',
+      elemDescription: `${elemDescription} OK`,
     });
+  }
 
-    // Android date and time picker is a two-step process, so we need to tap OK again
+  async selectDateInDateTimePicker() {
+    await this.openSnapUiPicker(
+      this.dateTimePickerTouchable,
+      'date-time picker',
+      {
+        startPositionX: 0,
+        startPositionY: 0,
+      },
+    );
+    // Android date+time is two native steps.
     if (PlatformDetector.isAndroid()) {
       await Gestures.waitAndTap(this.dateTimePickerOkButton);
     }
   }
 
   async selectDateInDatePicker() {
-    await Gestures.waitAndTap(this.datePickerTouchable, {
-      checkStability: true,
-      elemDescription: 'open date picker',
-    });
-
-    await Gestures.waitAndTap(this.dateTimePickerOkButton, {
-      elemDescription: 'date picker OK',
-    });
+    await this.revealSnapUiDatePickers();
+    await this.openSnapUiPicker(this.datePickerTouchable, 'date picker');
   }
 
   async selectTimeInTimePicker() {
-    await Gestures.waitAndTap(this.timePickerTouchable, {
-      checkStability: true,
-      elemDescription: 'open time picker',
-    });
-
-    await Gestures.waitAndTap(this.dateTimePickerOkButton, {
-      elemDescription: 'time picker OK',
-    });
+    await this.revealSnapUiDatePickers();
+    await this.openSnapUiPicker(this.timePickerTouchable, 'time picker');
   }
 
   async expectSnapDialogLinkDisplayed(
@@ -657,9 +821,15 @@ class TestSnaps {
         'network toast dismissed before confirming Solana snap signature',
       timeout: 15_000,
     });
-    // Multichain Solana signing can use SnapDialog/BottomSheetFooter ("Approve") instead of
-    // redesigned `confirm-button` — same as Solana Wallet Standard E2E.
-    await SolanaTestDApp.confirmSignMessage();
+    await this.blurActiveWebViewInput();
+    // Multichain Solana signing can use SnapDialog/BottomSheetFooter instead of
+    // redesigned `confirm-button`.
+    await Gestures.waitAndTap(
+      Matchers.getElementByID(
+        SolanaTestDappSelectorsWebIDs.CONFIRM_SIGN_MESSAGE_BUTTON,
+      ),
+      { elemDescription: 'confirm Solana snap signature' },
+    );
   }
 
   async waitForWebSocketUpdate(state: {
@@ -671,9 +841,7 @@ class TestSnaps {
       async () => {
         try {
           await this.tapButton('getWebSocketState');
-
-          // eslint-disable-next-line no-restricted-syntax
-          await TestHelpers.delay(250);
+          await sleep(250);
 
           const text = await WebView.readTextById(
             TestSnapResultSelectorWebIDS.networkAccessResultSpan,
diff --git a/tests/page-objects/Confirmation/TokenApproveConfirmation.ts b/tests/page-objects/Confirmation/TokenApproveConfirmation.ts
index 7e00fb517a27..d817ad9ced71 100644
--- a/tests/page-objects/Confirmation/TokenApproveConfirmation.ts
+++ b/tests/page-objects/Confirmation/TokenApproveConfirmation.ts
@@ -1,7 +1,19 @@
 import { ApproveComponentIDs } from '../../../app/components/Views/confirmations/ConfirmationView.testIds';
+import { TEXTFIELD_TEST_ID } from '../../../app/component-library/components/Form/TextField/TextField.constants';
 import Matchers from '../../framework/Matchers';
 import Gestures from '../../framework/Gestures';
-import { EncapsulatedElementType } from '../../framework';
+import {
+  EncapsulatedElementType,
+  asPlaywrightElement,
+  encapsulated,
+  encapsulatedAction,
+  PlatformDetector,
+  PlaywrightGestures,
+  PlaywrightMatchers,
+} from '../../framework';
+
+/** Modal title — tap to dismiss number pad without hitting the backdrop (cancel). */
+const EDIT_SPENDING_CAP_MODAL_TITLE = 'Edit approval limit';
 
 // This components are used to check the approve confirmation specific components in the confirmation modal
 class TokenApproveConfirmation {
@@ -16,7 +28,21 @@ class TokenApproveConfirmation {
   }
 
   get EditSpendingCapInput(): EncapsulatedElementType {
-    return Matchers.getElementByID(ApproveComponentIDs.EDIT_SPENDING_CAP_INPUT);
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(ApproveComponentIDs.EDIT_SPENDING_CAP_INPUT),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(
+            ApproveComponentIDs.EDIT_SPENDING_CAP_INPUT,
+            { exact: true },
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementById(TEXTFIELD_TEST_ID, {
+            exact: true,
+          }),
+      },
+    });
   }
 
   get EditSpendingCapSaveButton(): EncapsulatedElementType {
@@ -26,20 +52,70 @@ class TokenApproveConfirmation {
   }
 
   async tapEditSpendingCapButton(): Promise<void> {
-    await Gestures.waitAndTap(this.EditSpendingCapButton);
+    await Gestures.waitAndTap(this.EditSpendingCapButton, {
+      elemDescription: 'Edit Spending Cap Button in Token Approve Confirmation',
+      // iOS BottomSheet children often report isDisplayed=false while visible.
+      checkForDisplayed: false,
+    });
   }
 
   async tapEditSpendingCapSaveButton(): Promise<void> {
-    await Gestures.waitAndTap(this.EditSpendingCapSaveButton, {
-      elemDescription:
-        'Edit Spending Cap Save Button in Token Approve Confirmation',
+    await encapsulatedAction({
+      detox: async () => {
+        await Gestures.waitAndTap(this.EditSpendingCapSaveButton, {
+          elemDescription:
+            'Edit Spending Cap Save Button in Token Approve Confirmation',
+        });
+      },
+      appium: async () => {
+        if (PlatformDetector.isIOS()) {
+          const title = await PlaywrightMatchers.getElementByText(
+            EDIT_SPENDING_CAP_MODAL_TITLE,
+          );
+          // Blur number pad via modal title (backdrop tap cancels the edit).
+          await PlaywrightGestures.waitAndTap(title, {
+            checkForDisplayed: false,
+          });
+        }
+
+        await Gestures.waitAndTap(this.EditSpendingCapSaveButton, {
+          elemDescription:
+            'Edit Spending Cap Save Button in Token Approve Confirmation',
+          checkForDisplayed: false,
+        });
+      },
     });
   }
 
   async inputSpendingCap(spendingCap: string): Promise<void> {
-    await Gestures.typeText(this.EditSpendingCapInput, spendingCap, {
-      elemDescription: 'Edit Spending Cap Input in Token Approve Confirmation',
-      hideKeyboard: true,
+    await encapsulatedAction({
+      detox: async () => {
+        await Gestures.typeText(this.EditSpendingCapInput, spendingCap, {
+          elemDescription:
+            'Edit Spending Cap Input in Token Approve Confirmation',
+          hideKeyboard: true,
+        });
+      },
+      appium: async () => {
+        if (PlatformDetector.isIOS()) {
+          const input = await asPlaywrightElement(this.EditSpendingCapInput);
+          await PlaywrightGestures.waitAndTap(input, {
+            checkForDisplayed: false,
+          });
+          // Burst Delete clears the open edit-modal default on the number pad.
+          for (let i = 0; i < 3; i++) {
+            await PlaywrightGestures.tapIosKeyboardKey('Delete');
+          }
+          await PlaywrightGestures.typeViaIosKeyboard(spendingCap, {
+            numberPad: true,
+          });
+          return;
+        }
+
+        const el = await asPlaywrightElement(this.EditSpendingCapInput);
+        await el.fill(spendingCap);
+        await PlaywrightGestures.hideKeyboard();
+      },
     });
   }
 }
diff --git a/tests/page-objects/Confirmation/TransactionPayConfirmation.ts b/tests/page-objects/Confirmation/TransactionPayConfirmation.ts
index 8f7ce5f10b7d..1a80234095df 100644
--- a/tests/page-objects/Confirmation/TransactionPayConfirmation.ts
+++ b/tests/page-objects/Confirmation/TransactionPayConfirmation.ts
@@ -485,6 +485,11 @@ class TransactionPayConfirmation {
 
   async enterAmountAndContinue(amount: string): Promise<void> {
     await this.tapKeyboardAmount(amount);
+    // Done replaces percentage chips only after hasInput (debounced amountHuman).
+    await Assertions.expectElementToBeVisible(this.keyboardContinueButton, {
+      timeout: 30_000,
+      description: 'Deposit keyboard Done button after amount entry (hasInput)',
+    });
     await this.tapKeyboardContinueButton();
   }
 
diff --git a/tests/page-objects/MMConnect/AndroidScreenHelpers.ts b/tests/page-objects/MMConnect/AndroidScreenHelpers.ts
index 23a576e1e5ef..adc28855fb61 100644
--- a/tests/page-objects/MMConnect/AndroidScreenHelpers.ts
+++ b/tests/page-objects/MMConnect/AndroidScreenHelpers.ts
@@ -3,7 +3,7 @@ import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
 import PlaywrightGestures from '../../framework/PlaywrightGestures';
 import PlaywrightUtilities from '../../framework/PlaywrightUtilities';
 import { ConnectAccountBottomSheetSelectorsIDs } from '../../../app/components/Views/MultichainAccounts/shared/ConnectAccountBottomSheet.testIds';
-import { unlockIfLockScreenVisible } from './unlockHelpers';
+import { unlockIfLockScreenVisible } from '../../flows/wallet.flow';
 
 const logger = createLogger({
   name: 'AndroidScreenHelpers',
diff --git a/tests/page-objects/MMConnect/DappConnectionModal.ts b/tests/page-objects/MMConnect/DappConnectionModal.ts
index ca2a8391360b..a3fee9bc4be7 100644
--- a/tests/page-objects/MMConnect/DappConnectionModal.ts
+++ b/tests/page-objects/MMConnect/DappConnectionModal.ts
@@ -8,9 +8,10 @@ import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
 import UnifiedGestures from '../../framework/UnifiedGestures';
 import { getDriver } from '../../framework/PlaywrightUtilities';
 import { ConnectAccountBottomSheetSelectorsIDs } from '../../../app/components/Views/MultichainAccounts/shared/ConnectAccountBottomSheet.testIds';
-import { ConnectedAccountsSelectorsIDs } from '../../../app/components/Views/MultichainAccounts/shared/ConnectedAccountModal.testIds';
-import { AccountCellIds } from '../../../app/component-library/components-temp/MultichainAccounts/AccountCell/AccountCell.testIds';
-import { CellComponentSelectorsIDs } from '../../../app/component-library/components/Cells/Cell/CellComponent.testIds';
+import {
+  ConnectedAccountModalSelectorsText,
+  ConnectedAccountsSelectorsIDs,
+} from '../../../app/components/Views/MultichainAccounts/shared/ConnectedAccountModal.testIds';
 import { sleep } from '../../framework';
 
 class DappConnectionModal {
@@ -50,8 +51,9 @@ class DappConnectionModal {
   get permissionsTabButton(): EncapsulatedElementType {
     return encapsulated({
       appium: () =>
-        PlaywrightMatchers.getElementByXPath(
-          '//android.view.ViewGroup[@content-desc="Permissions"]',
+        PlaywrightMatchers.getElementByText(
+          ConnectedAccountModalSelectorsText.PERMISSION_LINK,
+          true,
         ),
     });
   }
@@ -59,36 +61,27 @@ class DappConnectionModal {
   get editNetworksButton(): EncapsulatedElementType {
     return encapsulated({
       appium: () =>
-        PlaywrightMatchers.getElementByXPath(
-          '(//android.widget.TextView[@text="Edit"])[2]',
+        PlaywrightMatchers.getElementById(
+          ConnectedAccountsSelectorsIDs.NAVIGATE_TO_EDIT_NETWORKS_PERMISSIONS_BUTTON,
         ),
     });
   }
 
   get updateNetworksButton(): EncapsulatedElementType {
     return encapsulated({
-      appium: () =>
-        PlaywrightMatchers.getElementByXPath(
-          '//android.widget.Button[@content-desc="Update"]',
-        ),
+      appium: () => PlaywrightMatchers.getElementByText('Update', true),
     });
   }
 
   getAccountButton(accountName: string): EncapsulatedElementType {
     return encapsulated({
-      appium: () =>
-        PlaywrightMatchers.getElementByXPath(
-          `//android.widget.TextView[@resource-id="${AccountCellIds.ADDRESS}" and @text="${accountName}"]`,
-        ),
+      appium: () => PlaywrightMatchers.getElementByText(accountName, true),
     });
   }
 
   getNetworkButton(networkName: string): EncapsulatedElementType {
     return encapsulated({
-      appium: () =>
-        PlaywrightMatchers.getElementByXPath(
-          `//android.widget.TextView[@resource-id="${CellComponentSelectorsIDs.BASE_TITLE}" and @text="${networkName}"]`,
-        ),
+      appium: () => PlaywrightMatchers.getElementByText(networkName, true),
     });
   }
 
diff --git a/tests/page-objects/MMConnect/unlockHelpers.ts b/tests/page-objects/MMConnect/unlockHelpers.ts
deleted file mode 100644
index 3dc482cc97bf..000000000000
--- a/tests/page-objects/MMConnect/unlockHelpers.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import LoginView from '../wallet/LoginView';
-import { createLogger, sleep } from '../../framework';
-import { asPlaywrightElement } from '../../framework/EncapsulatedElement';
-import { getPasswordForScenario } from '../../framework/utils/TestConstants';
-import { dismissAndroidSystemOverlaysPlaywright } from '../../flows/general.flow';
-import PlaywrightUtilities from '../../framework/PlaywrightUtilities';
-import UnifiedGestures from '../../framework/UnifiedGestures';
-
-const logger = createLogger({
-  name: 'MMConnectUnlockHelpers',
-});
-
-const UNLOCK_ATTEMPTS = 3;
-const LOCK_GONE_TIMEOUT_MS = 10_000;
-
-async function dismissUnlockBlockers(): Promise<void> {
-  // Play services heads-up on google_apis CI emulators covers Unlock and
-  // makes the control non-interactive until the banner is dismissed.
-  PlaywrightUtilities.dismissAndroidHeadsUpNotifications();
-  await dismissAndroidSystemOverlaysPlaywright();
-}
-
-async function isPasswordFieldVisible(): Promise<boolean> {
-  try {
-    const passwordInput = await asPlaywrightElement(LoginView.passwordInput);
-    return await passwordInput.isVisible();
-  } catch {
-    return false;
-  }
-}
-
-async function waitForLockScreenGone(timeoutMs: number): Promise<boolean> {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    if (!(await isPasswordFieldVisible())) {
-      return true;
-    }
-    await sleep(300);
-  }
-  return false;
-}
-
-/**
- * Tap Unlock without waiting for UiAutomator2 "interactive" — heads-up banners
- * make that check fail for ~10s even when a plain tap would succeed.
- */
-async function tapUnlockWithoutInteractiveWait(): Promise<void> {
-  await UnifiedGestures.waitAndTap(LoginView.loginButton, {
-    description: 'Login Button (MM Connect unlock)',
-    checkForDisplayed: true,
-    checkForEnabled: true,
-    waitForInteractive: false,
-    timeout: 10_000,
-  });
-}
-
-/**
- * If MetaMask's lock / login screen is showing, unlock with the e2e password.
- *
- * Prefer the password field over the outer login container — after a deeplink
- * the lock screen is often the only UI, and CI auto-lock hits right after
- * returning to MetaMask for dapp connect.
- *
- * Intentionally does NOT use full {@link loginToAppPlaywright}: after a connect
- * deeplink we expect the permission sheet (not wallet home).
- */
-export async function unlockIfLockScreenVisible(): Promise<void> {
-  await dismissUnlockBlockers();
-
-  if (!(await isPasswordFieldVisible())) {
-    return;
-  }
-
-  logger.debug('Lock screen detected; unlocking for MM Connect flow');
-  const password = getPasswordForScenario('e2e') ?? '123123123';
-
-  let lastError: unknown;
-  for (let attempt = 0; attempt < UNLOCK_ATTEMPTS; attempt++) {
-    await dismissUnlockBlockers();
-
-    try {
-      await LoginView.enterPassword(password);
-      await dismissUnlockBlockers();
-      await tapUnlockWithoutInteractiveWait();
-
-      if (await waitForLockScreenGone(LOCK_GONE_TIMEOUT_MS)) {
-        return;
-      }
-      lastError = new Error('Lock screen still visible after unlock tap');
-    } catch (error) {
-      lastError = error;
-      logger.debug(
-        `Unlock attempt ${attempt + 1} failed: ${
-          error instanceof Error ? error.message : String(error)
-        }`,
-      );
-    }
-
-    await sleep(500);
-  }
-
-  throw lastError instanceof Error
-    ? lastError
-    : new Error(`Failed to unlock MetaMask lock screen: ${String(lastError)}`);
-}
diff --git a/tests/page-objects/MultichainAccounts/SmartAccount.ts b/tests/page-objects/MultichainAccounts/SmartAccount.ts
index 5d5e8d9d9cac..34c6a533f2cb 100644
--- a/tests/page-objects/MultichainAccounts/SmartAccount.ts
+++ b/tests/page-objects/MultichainAccounts/SmartAccount.ts
@@ -1,7 +1,11 @@
 import Matchers from '../../framework/Matchers';
-import Gestures from '../../framework/Gestures';
 import { SmartAccountIds } from '../../../app/components/Views/MultichainAccounts/SmartAccount.testIds';
 import { EncapsulatedElementType } from '../../framework';
+import { PlatformDetector } from '../../framework/PlatformLocator';
+import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
+import PlaywrightGestures from '../../framework/PlaywrightGestures';
+import type { PlaywrightElement } from '../../framework/PlaywrightAdapter';
+import Assertions from '../../framework/Assertions';
 
 class SmartAccount {
   get container(): EncapsulatedElementType {
@@ -12,11 +16,124 @@ class SmartAccount {
     return Matchers.getElementByID(SmartAccountIds.SMART_ACCOUNT_SWITCH);
   }
 
-  async tapSmartAccountSwitch(): Promise<void> {
-    await Gestures.waitAndTap(this.smartAccountSwitch, {
-      elemDescription: 'Smart Account Switch in Smart Account',
+  /**
+   * Toggle smart-account switch for a network row (e.g. Local RPC).
+   */
+  async tapSmartAccountSwitchForNetwork(networkName: string): Promise<void> {
+    await Assertions.expectElementToExist(
+      Matchers.getElementByText(networkName),
+      {
+        description: `Smart account network row "${networkName}"`,
+        timeout: 20_000,
+      },
+    );
+
+    const labelEl = await PlaywrightMatchers.getElementByText(networkName);
+    await PlaywrightGestures.scrollIntoView(labelEl);
+
+    const switchEl = PlatformDetector.isIOS()
+      ? await this.getIosSwitchInNetworkRow(networkName)
+      : await this.getAndroidSwitchInNetworkRow(networkName);
+
+    await PlaywrightGestures.waitAndTap(switchEl, {
+      elemDescription: `Smart account switch for "${networkName}"`,
+      timeout: 15_000,
+      checkForDisplayed: false,
+      checkForEnabled: false,
     });
   }
+
+  private async getAndroidSwitchInNetworkRow(
+    networkName: string,
+  ): Promise<PlaywrightElement> {
+    // UiAutomator2 XPath2 breaks on `/following::*` — use Y-alignment instead.
+    return this.getFallbackSwitchAlignedToLabel(networkName);
+  }
+
+  /** Prefer first switch after the network label; fall back to Y-alignment. */
+  private async getIosSwitchInNetworkRow(
+    networkName: string,
+  ): Promise<PlaywrightElement> {
+    const switchId = SmartAccountIds.SMART_ACCOUNT_SWITCH;
+    const byTestIdXPath = `//*[@name='${networkName}' or @label='${networkName}']/following::*[@name='${switchId}'][1]`;
+    const byTestId = await Matchers.getAllElementsByXPath(byTestIdXPath);
+    if (byTestId.length > 0) {
+      return byTestId[0];
+    }
+
+    const byTypeXPath = `//*[@name='${networkName}' or @label='${networkName}']/following::XCUIElementTypeSwitch[1]`;
+    const byType = await Matchers.getAllElementsByXPath(byTypeXPath);
+    if (byType.length > 0) {
+      return byType[0];
+    }
+
+    return this.getFallbackSwitchAlignedToLabel(networkName);
+  }
+
+  /** Pick switch to the right of the label with closest center Y. */
+  private async getFallbackSwitchAlignedToLabel(
+    networkName: string,
+  ): Promise<PlaywrightElement> {
+    const labelEl = await PlaywrightMatchers.getElementByText(networkName);
+    await PlaywrightGestures.scrollIntoView(labelEl);
+
+    const labelLocation = await labelEl.unwrap().getLocation();
+    const labelSize = await labelEl.unwrap().getSize();
+    const labelCenterY = labelLocation.y + labelSize.height / 2;
+    const labelRightX = labelLocation.x + labelSize.width;
+
+    const switchElements = PlatformDetector.isIOS()
+      ? await this.getIosSmartAccountSwitches()
+      : await this.getAndroidSmartAccountSwitches();
+    if (switchElements.length === 0) {
+      throw new Error(
+        `No smart-account switches found while targeting "${networkName}"`,
+      );
+    }
+
+    let bestSwitch: PlaywrightElement | undefined;
+    let bestDelta = Number.POSITIVE_INFINITY;
+    for (const switchEl of switchElements) {
+      const switchLocation = await switchEl.unwrap().getLocation();
+      const switchSize = await switchEl.unwrap().getSize();
+      const switchCenterY = switchLocation.y + switchSize.height / 2;
+      const switchCenterX = switchLocation.x + switchSize.width / 2;
+      if (switchCenterX <= labelRightX) {
+        continue;
+      }
+      const delta = Math.abs(switchCenterY - labelCenterY);
+      if (delta < bestDelta) {
+        bestDelta = delta;
+        bestSwitch = switchEl;
+      }
+    }
+
+    if (!bestSwitch || bestDelta > Math.max(labelSize.height * 2, 64)) {
+      throw new Error(
+        `Could not align switch to "${networkName}" (Δy=${Math.round(bestDelta)})`,
+      );
+    }
+
+    return bestSwitch;
+  }
+
+  private async getAndroidSmartAccountSwitches(): Promise<PlaywrightElement[]> {
+    return Matchers.getAllElementsByXPath(
+      `//*[@resource-id='${SmartAccountIds.SMART_ACCOUNT_SWITCH}']`,
+    );
+  }
+
+  /** Prefer testID; fall back to XCUIElementTypeSwitch if iOS drops it. */
+  private async getIosSmartAccountSwitches(): Promise<PlaywrightElement[]> {
+    const byTestId = await Matchers.getAllElementsByXPath(
+      `//*[@name='${SmartAccountIds.SMART_ACCOUNT_SWITCH}']`,
+    );
+    if (byTestId.length > 0) {
+      return byTestId;
+    }
+
+    return Matchers.getAllElementsByXPath('//XCUIElementTypeSwitch');
+  }
 }
 
 export default new SmartAccount();
diff --git a/tests/page-objects/Network/NetworkListModal.ts b/tests/page-objects/Network/NetworkListModal.ts
index 4f6e9cd7d54b..f2f0b460c5fc 100644
--- a/tests/page-objects/Network/NetworkListModal.ts
+++ b/tests/page-objects/Network/NetworkListModal.ts
@@ -8,6 +8,7 @@ import Gestures from '../../framework/Gestures';
 import { PlatformDetector } from '../../framework/PlatformLocator';
 import { NETWORK_MULTI_SELECTOR_TEST_IDS } from '../../../app/components/UI/NetworkMultiSelector/NetworkMultiSelector.constants';
 import { EncapsulatedElementType } from '../../framework';
+import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
 
 class NetworkListModal {
   get networkScroll(): EncapsulatedElementType {
@@ -75,6 +76,16 @@ class NetworkListModal {
     await Gestures.waitAndTap(this.deleteNetworkButton);
   }
 
+  async confirmDeleteNetwork(): Promise<void> {
+    await Gestures.waitAndTap(
+      PlaywrightMatchers.getElementByText(
+        NetworkListModalSelectorsText.DELETE_NETWORK,
+        true,
+      ),
+      { elemDescription: 'Confirm delete network' },
+    );
+  }
+
   async scrollToTopOfNetworkList(): Promise<void> {
     await Gestures.swipe(this.networkScroll, 'down', {
       speed: 'fast',
@@ -161,6 +172,23 @@ class NetworkListModal {
     });
   }
 
+  async tapNetworkRowMenuButton(networkName: string): Promise<void> {
+    const escapedName = networkName.replace(/'/g, "\\'");
+    const menuId = 'button-menu-select-test-id';
+    const menuButton = PlaywrightMatchers.getElementByXPath(
+      `(//*[contains(@text,'${escapedName}') or contains(@content-desc,'${escapedName}') or contains(@name,'${escapedName}') or contains(@label,'${escapedName}')]/ancestor::*[contains(@resource-id,'network-list-item-') or contains(@name,'network-list-item-') or contains(@label,'network-list-item-')][1])//*[@resource-id='${menuId}' or @content-desc='${menuId}' or @name='${menuId}']`,
+    );
+    await Gestures.waitAndTap(menuButton, {
+      elemDescription: `Network row menu button for ${networkName}`,
+    });
+  }
+
+  async closeNetworkManager(): Promise<void> {
+    await Gestures.waitAndTap(Matchers.getElementByID('button-icon'), {
+      elemDescription: 'Close NetworkManager bottom sheet',
+    });
+  }
+
   async tapOnCustomTab(): Promise<void> {
     const networkCell = Matchers.getElementByLabel('Custom');
     await Gestures.waitAndTap(networkCell);
diff --git a/tests/page-objects/Network/NetworkNonPemittedBottomSheet.ts b/tests/page-objects/Network/NetworkNonPemittedBottomSheet.ts
index 201875b45cfa..6ce8a3f89ab7 100644
--- a/tests/page-objects/Network/NetworkNonPemittedBottomSheet.ts
+++ b/tests/page-objects/Network/NetworkNonPemittedBottomSheet.ts
@@ -13,36 +13,12 @@ class NetworkNonPemittedBottomSheet {
     );
   }
 
-  get sepoliaNetworkName(): EncapsulatedElementType {
-    return Matchers.getElementByText(
-      NetworkNonPemittedBottomSheetSelectorsText.SEPOLIA_NETWORK_NAME,
-    );
-  }
-
-  get ethereumMainNetNetworkName(): EncapsulatedElementType {
-    return Matchers.getElementByText(
-      NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME,
-    );
-  }
-
   get addThisNetworkButton(): EncapsulatedElementType {
     return Matchers.getElementByID(
       NetworkNonPemittedBottomSheetSelectorsIDs.ADD_THIS_NETWORK_BUTTON,
     );
   }
 
-  get lineaSepoliaNetworkName(): EncapsulatedElementType {
-    return Matchers.getElementByText(
-      NetworkNonPemittedBottomSheetSelectorsText.LINEA_SEPOLIA_NETWORK_NAME,
-    );
-  }
-
-  get elysiumTestnetNetworkName(): EncapsulatedElementType {
-    return Matchers.getElementByText(
-      NetworkNonPemittedBottomSheetSelectorsText.ELYSIUM_TESTNET_NETWORK_NAME,
-    );
-  }
-
   get chooseFromPermittedNetworksButton(): EncapsulatedElementType {
     return Matchers.getElementByID(
       NetworkNonPemittedBottomSheetSelectorsIDs.CHOOSE_FROM_PERMITTED_NETWORKS_BUTTON,
@@ -61,30 +37,6 @@ class NetworkNonPemittedBottomSheet {
     });
   }
 
-  async tapSepoliaNetworkName(): Promise<void> {
-    await Gestures.waitAndTap(this.sepoliaNetworkName, {
-      elemDescription: 'Sepolia network name',
-    });
-  }
-
-  async tapEthereumMainNetNetworkName(): Promise<void> {
-    await Gestures.waitAndTap(this.ethereumMainNetNetworkName, {
-      elemDescription: 'Ethereum main net network name',
-    });
-  }
-
-  async tapLineaSepoliaNetworkName(): Promise<void> {
-    await Gestures.waitAndTap(this.lineaSepoliaNetworkName, {
-      elemDescription: 'Linea Sepolia network name',
-    });
-  }
-
-  async tapElysiumTestnetNetworkName(): Promise<void> {
-    await Gestures.waitAndTap(this.elysiumTestnetNetworkName, {
-      elemDescription: 'Elysium testnet network name',
-    });
-  }
-
   async tapChooseFromPermittedNetworksButton(): Promise<void> {
     await Gestures.waitAndTap(this.chooseFromPermittedNetworksButton, {
       elemDescription: 'Choose from permitted networks button',
diff --git a/tests/page-objects/Onboarding/CreatePasswordView.ts b/tests/page-objects/Onboarding/CreatePasswordView.ts
index 79a3c85c1050..0b366625d52b 100644
--- a/tests/page-objects/Onboarding/CreatePasswordView.ts
+++ b/tests/page-objects/Onboarding/CreatePasswordView.ts
@@ -315,11 +315,18 @@ class CreatePasswordView {
     checkbox: Awaited<ReturnType<typeof asPlaywrightElement>>,
   ): Promise<boolean | undefined> {
     // Fetch attributes independently. Android UiAutomator2 does not support
-    // `aria-checked`; requesting it first used to abort the whole read and
-    // leave isChecked undefined (see seedless Apple/Telegram perf failures).
+    // `aria-checked` (only `checked` / `value`); requesting it floods WARN/ERROR
+    // logs and used to abort the whole read when tried first.
     const attributes: Record<string, unknown> = {};
+    const attributeNames: ('checked' | 'value' | 'aria-checked')[] = [
+      'checked',
+      'value',
+    ];
+    if (PlatformDetector.isIOS()) {
+      attributeNames.push('aria-checked');
+    }
 
-    for (const name of ['checked', 'value', 'aria-checked'] as const) {
+    for (const name of attributeNames) {
       try {
         attributes[name] = await checkbox.getAttribute(name);
       } catch {
diff --git a/tests/page-objects/Send/RedesignedSendView.ts b/tests/page-objects/Send/RedesignedSendView.ts
index 86ac08c4acab..8dd109e05a35 100644
--- a/tests/page-objects/Send/RedesignedSendView.ts
+++ b/tests/page-objects/Send/RedesignedSendView.ts
@@ -14,12 +14,11 @@ import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
 import PlaywrightGestures from '../../framework/PlaywrightGestures';
 import { PlaywrightElement } from '../../framework/PlaywrightAdapter';
 import { PlatformDetector } from '../../framework/PlatformLocator';
-import { getNetworkFilterTestId } from '../../../app/components/Views/confirmations/components/network-filter/network-filter.testIds';
 import { getAssetTestId } from '../../selectors/Wallet/WalletView.selectors';
 
 class SendView {
-  get ethereumTokenButton(): EncapsulatedElementType {
-    return Matchers.getElementByText('Ethereum');
+  get ethTokenAssetButton(): EncapsulatedElementType {
+    return Matchers.getElementByID(getAssetTestId('ETH'), 0);
   }
 
   get erc20TokenButton(): EncapsulatedElementType {
@@ -99,24 +98,31 @@ class SendView {
   }
 
   async selectEthereumToken(): Promise<void> {
-    await encapsulatedAction({
-      detox: async () => {
-        await Gestures.waitAndTap(this.ethereumTokenButton, {
+    // With device.disableSynchronization(), the asset list can still re-render
+    // (duplicate rows hydrating) when Detox taps. The tap may highlight the row
+    // without firing onPress, so we wait for stability and retry until Amount.
+    await Utilities.executeWithRetry(
+      async () => {
+        try {
+          await Utilities.waitForElementToBeVisible(this.amountScreen, 500);
+          return;
+        } catch {
+          // Still on the asset picker
+        }
+
+        await Gestures.waitAndTap(this.ethTokenAssetButton, {
           elemDescription: 'Select ethereum token',
+          checkStability: true,
+          delay: 1000,
         });
+
+        await Utilities.waitForElementToBeVisible(this.amountScreen, 5000);
       },
-      appium: async () => {
-        // Tap the Ethereum network filter chip (chainId 0x1) to filter tokens
-        const networkChip = await PlaywrightMatchers.getElementById(
-          getNetworkFilterTestId('0x1'),
-        );
-        await PlaywrightGestures.scrollIntoView(networkChip);
-        await PlaywrightGestures.waitAndTap(networkChip);
-        // Tap the first ETH token row (no testID in production, use text)
-        const ethToken = await PlaywrightMatchers.getElementByText('ETH');
-        await PlaywrightGestures.waitAndTap(ethToken);
+      {
+        timeout: 25000,
+        description: 'Select ethereum token and open amount screen',
       },
-    });
+    );
   }
 
   async selectERC20Token(): Promise<void> {
diff --git a/tests/page-objects/Transactions/ActivitiesView.ts b/tests/page-objects/Transactions/ActivitiesView.ts
index 19af9e246617..a5910df17aea 100644
--- a/tests/page-objects/Transactions/ActivitiesView.ts
+++ b/tests/page-objects/Transactions/ActivitiesView.ts
@@ -2,6 +2,7 @@ import {
   ActivitiesViewSelectorsIDs,
   ActivitiesViewSelectorsText,
 } from '../../../app/components/Views/ActivityView/ActivitiesView.testIds';
+import { ActivityScreenSelectorsIDs } from '../../../app/components/Views/ActivityScreen/ActivityScreen.testIds';
 import {
   getOrderRowFiatAmountTestId,
   getOrderRowCryptoAmountTestId,
@@ -25,6 +26,43 @@ class ActivitiesView {
   get title(): EncapsulatedElementType {
     return Matchers.getElementByText(ActivitiesViewSelectorsText.TITLE);
   }
+
+  get networkFilterChip(): EncapsulatedElementType {
+    return Matchers.getElementByID(
+      ActivityScreenSelectorsIDs.NETWORK_FILTER_CHIP,
+    );
+  }
+
+  get redesignedScreen(): EncapsulatedElementType {
+    return Matchers.getElementByID(ActivityScreenSelectorsIDs.SAFE_AREA_VIEW);
+  }
+
+  /**
+   * Selects redesigned Activity network filter by CAIP (needs tmcuActivityRedesignEnabled).
+   */
+  async filterByNetwork(caipChainId: string): Promise<void> {
+    await Assertions.expectElementToExist(this.redesignedScreen, {
+      description: 'Redesigned Activity screen',
+      timeout: 15_000,
+    });
+    await Assertions.expectElementToExist(this.networkFilterChip, {
+      description: 'Activity network filter chip (All networks)',
+      timeout: 15_000,
+    });
+    await Gestures.waitAndTap(this.networkFilterChip, {
+      elemDescription: 'Activity network filter chip',
+      checkForDisplayed: false,
+      timeout: 15_000,
+    });
+    await Gestures.waitAndTap(
+      Matchers.getElementByID(`network-select-${caipChainId}`),
+      {
+        elemDescription: `Activity network filter option ${caipChainId}`,
+        checkForDisplayed: false,
+        timeout: 15_000,
+      },
+    );
+  }
   get predictionsTab(): EncapsulatedElementType {
     const label = ActivitiesViewSelectorsText.PREDICTIONS_TAB;
     return encapsulated({
diff --git a/tests/page-objects/wallet/AccountListBottomSheet.ts b/tests/page-objects/wallet/AccountListBottomSheet.ts
index b513753806ba..f64401e63205 100644
--- a/tests/page-objects/wallet/AccountListBottomSheet.ts
+++ b/tests/page-objects/wallet/AccountListBottomSheet.ts
@@ -23,6 +23,7 @@ import { PlatformDetector } from '../../framework/PlatformLocator';
 import {
   createLogger,
   encapsulatedAction,
+  getDriver,
   LogLevel,
   PlaywrightGestures,
   sleep,
@@ -583,14 +584,68 @@ class AccountListBottomSheet {
       throw new Error(`No account row found for "${accountName}"`);
     }
 
-    await PlaywrightGestures.scrollIntoView(
-      accountCells[accountCells.length - 1],
-    );
+    const accountCell = accountCells[accountCells.length - 1];
+    await PlaywrightGestures.scrollIntoView(accountCell);
+
+    const menuEl = await this.getAccountEllipsisMenuByNameXPath(accountName);
+    if (menuEl) {
+      await PlaywrightGestures.waitAndTap(menuEl, {
+        elemDescription: `Ellipsis menu for "${accountName}"`,
+        timeout: 15_000,
+        checkForDisplayed: false,
+        checkForEnabled: false,
+      });
+      return;
+    }
+
+    if (PlatformDetector.isIOS()) {
+      await this.tapAccountEllipsisAlignedToRowIos(accountCell, accountName);
+      return;
+    }
 
-    const addressXpath = PlatformDetector.isAndroid()
-      ? `//*[@resource-id='${AccountCellIds.ADDRESS}']`
-      : `//*[@name='${AccountCellIds.ADDRESS}']`;
-    const addressElements = await Matchers.getAllElementsByXPath(addressXpath);
+    const menuIndex =
+      await this.getAccountEllipsisMenuIndexByAddress(accountName);
+    await this.tapAccountEllipsisButtonV2(menuIndex, { shouldWait: true });
+  }
+
+  /**
+   * Resolve the ellipsis for `accountName` via CONTAINER/parent-scoped XPath.
+   * TODO: Add TestIds for element
+   */
+  private async getAccountEllipsisMenuByNameXPath(
+    accountName: string,
+  ): Promise<PlaywrightElement | undefined> {
+    const escaped = accountName.replace(/'/g, "\\'");
+    const menu = AccountCellIds.MENU;
+    const xpaths = PlatformDetector.isAndroid()
+      ? [
+          `//*[@resource-id='${AccountCellIds.ADDRESS}' and @text='${escaped}']/ancestor::*[@resource-id='${AccountCellIds.CONTAINER}'][1]//*[@resource-id='${menu}' or @resource-id='${menu}-${escaped}' or starts-with(@resource-id,'${menu}-')]`,
+          `//*[@resource-id='${AccountCellIds.ADDRESS}' and contains(@text,'${escaped}')]/ancestor::*[@resource-id='${AccountCellIds.CONTAINER}'][1]//*[@resource-id='${menu}' or starts-with(@resource-id,'${menu}-')]`,
+        ]
+      : [
+          `//*[@name='${AccountCellIds.SELECT}' and contains(@label,'${escaped}')]/parent::*//*[@name='${menu}' or @name='${menu}-${escaped}' or starts-with(@name,'${menu}-')]`,
+          `//*[@name='${AccountCellIds.CONTAINER}'][.//*[@name='${AccountCellIds.SELECT}' and contains(@label,'${escaped}')]]//*[@name='${menu}' or starts-with(@name,'${menu}-')]`,
+          `//*[@name='${AccountCellIds.ADDRESS}' and contains(@label,'${escaped}')]/ancestor::*[@name='${AccountCellIds.CONTAINER}'][1]//*[@name='${menu}' or starts-with(@name,'${menu}-')]`,
+        ];
+
+    for (const xpath of xpaths) {
+      const menus = await Matchers.getAllElementsByXPath(xpath);
+      if (menus.length > 0) {
+        return menus[menus.length - 1];
+      }
+    }
+    return undefined;
+  }
+
+  private async getAccountEllipsisMenuIndexByAddress(
+    accountName: string,
+  ): Promise<number> {
+    const addressAttr = PlatformDetector.isAndroid()
+      ? `@resource-id='${AccountCellIds.ADDRESS}'`
+      : `@name='${AccountCellIds.ADDRESS}'`;
+    const addressElements = await Matchers.getAllElementsByXPath(
+      `//*[${addressAttr}]`,
+    );
 
     let menuIndex = -1;
     for (let i = 0; i < addressElements.length; i++) {
@@ -602,11 +657,71 @@ class AccountListBottomSheet {
 
     if (menuIndex < 0) {
       throw new Error(
-        `Could not resolve ellipsis menu index for account "${accountName}"`,
+        `Could not resolve ellipsis menu for account "${accountName}" via XPath or address index`,
+      );
+    }
+    return menuIndex;
+  }
+
+  /**
+   * iOS-only: Needed when the accessibility tree flattens CONTAINER
+   * so parent-scoped XPath cannot reach the ellipsis.
+   */
+  private async tapAccountEllipsisAlignedToRowIos(
+    accountCell: PlaywrightElement,
+    accountName: string,
+  ): Promise<void> {
+    const drv = getDriver();
+    if (!drv) {
+      throw new Error('Driver is not available');
+    }
+
+    const rowLocation = await accountCell.unwrap().getLocation();
+    const rowSize = await accountCell.unwrap().getSize();
+    const rowCenterY = rowLocation.y + rowSize.height / 2;
+
+    const menuElements = await Matchers.getAllElementsByXPath(
+      `//*[@name='${AccountCellIds.MENU}' or starts-with(@name,'${AccountCellIds.MENU}-')]`,
+    );
+    if (menuElements.length === 0) {
+      throw new Error(
+        `No ellipsis menu buttons found while targeting "${accountName}"`,
+      );
+    }
+
+    let bestMenu = menuElements[0];
+    let bestDelta = Number.POSITIVE_INFINITY;
+    for (const menu of menuElements) {
+      const menuLocation = await menu.unwrap().getLocation();
+      const menuSize = await menu.unwrap().getSize();
+      const menuCenterY = menuLocation.y + menuSize.height / 2;
+      const delta = Math.abs(menuCenterY - rowCenterY);
+      if (delta < bestDelta) {
+        bestDelta = delta;
+        bestMenu = menu;
+      }
+    }
+
+    if (bestDelta > Math.max(rowSize.height, 48)) {
+      throw new Error(
+        `Could not align ellipsis menu to "${accountName}" (Δy=${Math.round(bestDelta)})`,
       );
     }
 
-    await this.tapAccountEllipsisButtonV2(menuIndex);
+    const menuLocation = await bestMenu.unwrap().getLocation();
+    const menuSize = await bestMenu.unwrap().getSize();
+    const x = Math.floor(menuLocation.x + menuSize.width / 2);
+    const y = Math.floor(menuLocation.y + menuSize.height / 2);
+
+    await drv
+      .action('pointer', {
+        parameters: { pointerType: 'touch' },
+      })
+      .move({ x, y })
+      .down()
+      .pause(80)
+      .up()
+      .perform();
   }
 
   async expectAccountVisibleByNameV2(
diff --git a/tests/page-objects/wallet/NetworkManager.ts b/tests/page-objects/wallet/NetworkManager.ts
index 6252a62d1285..3356f2dcb0fb 100644
--- a/tests/page-objects/wallet/NetworkManager.ts
+++ b/tests/page-objects/wallet/NetworkManager.ts
@@ -8,12 +8,12 @@ import {
   NetworkManagerSelectorIDs,
   NetworkManagerSelectorText,
 } from '../../../app/components/UI/NetworkMultiSelector/NetworkManager.testIds';
-import TestHelpers from '../../helpers';
 import {
   WalletViewSelectorsIDs,
   WalletViewSelectorsText,
 } from '../../../app/components/Views/Wallet/WalletView.testIds';
 import { EncapsulatedElementType, FrameworkDetector } from '../../framework';
+import { PlatformDetector } from '../../framework/PlatformLocator';
 import WalletView from './WalletView';
 import TokensFullView from './HomeSections';
 
@@ -438,11 +438,19 @@ class NetworkManager {
             timeout: 15_000,
           },
         );
+        // Android only: on iOS XCUITest finds the BottomSheet testID but reports
+        // displayed=false.
+        if (PlatformDetector.isAndroid()) {
+          await Assertions.expectElementToBeVisible(
+            this.networkManagerBottomSheet,
+            {
+              elemDescription: 'Network Manager Bottom Sheet after open',
+              timeout: 10_000,
+            },
+          );
+        }
       },
     });
-    // Wait for bottom sheet animation to complete
-    // eslint-disable-next-line no-restricted-syntax
-    await TestHelpers.delay(1000); // Allow for bottom sheet slide-up animation
   }
 
   /**
diff --git a/tests/page-objects/wallet/SendActionBottomSheet.ts b/tests/page-objects/wallet/SendActionBottomSheet.ts
deleted file mode 100644
index 75d1d88b9b82..000000000000
--- a/tests/page-objects/wallet/SendActionBottomSheet.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { SendActionViewSelectorsIDs } from '../../selectors/SendFlow/SendActionView.selectors';
-import Gestures from '../../framework/Gestures';
-import Matchers from '../../framework/Matchers';
-import { EncapsulatedElementType } from '../../framework';
-
-class SendActionBottomSheet {
-  get solanaAddressInputField(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      SendActionViewSelectorsIDs.SOLANA_INPUT_ADDRESS_FIELD,
-    );
-  }
-
-  get solanaAmountInputField(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      SendActionViewSelectorsIDs.SOLANA_INPUT_AMOUNT_FIELD,
-    );
-  }
-
-  get invalidAddressError(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      SendActionViewSelectorsIDs.INVALID_ADDRESS_ERROR,
-    );
-  }
-
-  get continueButton(): EncapsulatedElementType {
-    return Matchers.getElementByID(SendActionViewSelectorsIDs.CONTINUE_BUTTON);
-  }
-
-  get cancelButton(): EncapsulatedElementType {
-    return Matchers.getElementByID(SendActionViewSelectorsIDs.CANCEL_BUTTON);
-  }
-
-  get closeModalButton(): EncapsulatedElementType {
-    return Matchers.getElementByID(SendActionViewSelectorsIDs.CLOSE_BUTTON);
-  }
-
-  get sendSOLTransactionButton(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      SendActionViewSelectorsIDs.SEND_TRANSACTION_BUTTON,
-    );
-  }
-
-  async sendActionInputAddress(address: string) {
-    await Gestures.typeText(this.solanaAddressInputField, address, {
-      hideKeyboard: true,
-      elemDescription: 'Solana address input field',
-    });
-  }
-
-  async sendActionInputAmount(amount: string) {
-    await Gestures.typeText(this.solanaAmountInputField, amount, {
-      hideKeyboard: true,
-    });
-  }
-
-  async tapSendSOLTransactionButton() {
-    await Gestures.waitAndTap(this.sendSOLTransactionButton, {
-      delay: 1500,
-      elemDescription: 'Send SOL transaction button',
-    });
-  }
-
-  async tapCancelButton() {
-    await Gestures.waitAndTap(this.cancelButton);
-  }
-
-  async tapContinueButton() {
-    await Gestures.waitAndTap(this.continueButton, {
-      delay: 1000,
-    });
-  }
-
-  async tapCloseButton() {
-    await Gestures.waitAndTap(this.closeModalButton);
-  }
-}
-
-export default new SendActionBottomSheet();
diff --git a/tests/page-objects/wallet/SwitchAccountModal.ts b/tests/page-objects/wallet/SwitchAccountModal.ts
index 56dd0ac4e656..2a68baaa8adb 100644
--- a/tests/page-objects/wallet/SwitchAccountModal.ts
+++ b/tests/page-objects/wallet/SwitchAccountModal.ts
@@ -1,39 +1,39 @@
-import Gestures from '../../framework/Gestures';
 import Matchers from '../../framework/Matchers';
+import { AccountDetailsIds } from '../../../app/components/Views/MultichainAccounts/AccountDetails.testIds';
 import { SwitchAccountModalSelectorIDs } from '../../../app/components/Views/confirmations/components/modals/switch-account-type-modal/SwitchAccountModal.testIds';
-class SwitchAccountModal {
-  get smartAccountLink() {
-    return Matchers.getElementByText('Smart account');
-  }
+import { EncapsulatedElementType, asPlaywrightElement } from '../../framework';
+import { PlatformDetector } from '../../framework/PlatformLocator';
+import PlaywrightGestures from '../../framework/PlaywrightGestures';
 
-  get switchAccountButton() {
-    return Matchers.getElementByID(
-      SwitchAccountModalSelectorIDs.SWITCH_ACCOUNT_BUTTON_LOCALHOST,
-    );
+class SwitchAccountModal {
+  get smartAccountLink(): EncapsulatedElementType {
+    return Matchers.getElementByID(AccountDetailsIds.SMART_ACCOUNT_LINK);
   }
 
-  get smartAccountBackButton() {
+  get smartAccountBackButton(): EncapsulatedElementType {
     return Matchers.getElementByID(
       SwitchAccountModalSelectorIDs.SMART_ACCOUNT_BACK_BUTTON,
     );
   }
 
-  async tapSwitchAccountButton(): Promise<void> {
-    await Gestures.waitAndTap(this.switchAccountButton, {
-      checkEnabled: false,
-      elemDescription: 'Switch Account button',
-    });
-  }
-
   async tapSmartAccountLink(): Promise<void> {
-    await Gestures.waitAndTap(this.smartAccountLink, {
+    const linkEl = await asPlaywrightElement(this.smartAccountLink);
+    await PlaywrightGestures.scrollIntoView(linkEl);
+    await PlaywrightGestures.waitAndTap(linkEl, {
       elemDescription: 'Smart Account link',
+      timeout: 15_000,
+      checkForDisplayed: false,
+      checkForEnabled: false,
     });
   }
 
   async tapSmartAccountBackButton(): Promise<void> {
-    await Gestures.waitAndTap(this.smartAccountBackButton, {
+    const backEl = await asPlaywrightElement(this.smartAccountBackButton);
+    await PlaywrightGestures.waitAndTap(backEl, {
       elemDescription: 'Smart Account back button',
+      timeout: 15_000,
+      checkForDisplayed: !PlatformDetector.isIOS(),
+      checkForEnabled: false,
     });
   }
 }
diff --git a/tests/page-objects/wallet/WalletHomeScroll.ts b/tests/page-objects/wallet/WalletHomeScroll.ts
new file mode 100644
index 000000000000..37c9f285a77d
--- /dev/null
+++ b/tests/page-objects/wallet/WalletHomeScroll.ts
@@ -0,0 +1,263 @@
+import { WalletViewSelectorsIDs } from '../../../app/components/Views/Wallet/WalletView.testIds';
+import Gestures from '../../framework/Gestures';
+import UnifiedGestures from '../../framework/UnifiedGestures';
+import Matchers from '../../framework/Matchers';
+import Assertions from '../../framework/Assertions';
+import PlaywrightAssertions from '../../framework/PlaywrightAssertions';
+import { encapsulatedAction } from '../../framework/encapsulatedAction';
+import {
+  EncapsulatedElementType,
+  asPlaywrightElement,
+} from '../../framework/EncapsulatedElement';
+import PlaywrightGestures from '../../framework/PlaywrightGestures';
+import { PlatformDetector } from '../../framework/PlatformLocator';
+import { FrameworkDetector } from '../../framework/FrameworkDetector';
+import { resolveE2EWaitTimeoutMs } from '../../framework/Constants';
+
+export class WalletHomeScroll {
+  get walletScrollContainer(): string {
+    return WalletViewSelectorsIDs.WALLET_SCROLL_VIEW;
+  }
+
+  get walletScrollView(): EncapsulatedElementType {
+    return Matchers.getElementByID(WalletViewSelectorsIDs.WALLET_SCROLL_VIEW);
+  }
+
+  isAndroidAppium(): boolean {
+    return FrameworkDetector.isAppium() && !PlatformDetector.isIOS();
+  }
+
+  mapWalletHomeScrollToSwipe(scrollDirection: 'up' | 'down'): 'up' | 'down' {
+    return scrollDirection === 'down' ? 'up' : 'down';
+  }
+
+  async scrollWalletHome(
+    scrollDirection: 'up' | 'down',
+    percent = 0.45,
+  ): Promise<void> {
+    if (this.isAndroidAppium()) {
+      await this.scrollWalletHomeAndroid(scrollDirection, percent);
+      return;
+    }
+
+    const swipeDirection = this.mapWalletHomeScrollToSwipe(scrollDirection);
+    await UnifiedGestures.swipe(this.walletScrollView, swipeDirection, {
+      percentage: percent,
+      description: `Scroll wallet homepage ${scrollDirection}`,
+    });
+  }
+
+  async scrollWalletHomeAndroid(
+    scrollDirection: 'up' | 'down',
+    percent = 0.45,
+  ): Promise<void> {
+    const container = await asPlaywrightElement(this.walletScrollView);
+    const location = await container.unwrap().getLocation();
+    const size = await container.unwrap().getSize();
+    const centerX = Math.floor(location.x + size.width / 2);
+    const travel = Math.floor(
+      size.height * Math.min(Math.max(percent, 0.1), 0.9),
+    );
+    const fingerDirection = scrollDirection === 'down' ? 'up' : 'down';
+
+    const fromY =
+      fingerDirection === 'up'
+        ? location.y + Math.floor(size.height * 0.75)
+        : location.y + Math.floor(size.height * 0.35);
+    const toY = fingerDirection === 'up' ? fromY - travel : fromY + travel;
+
+    await PlaywrightGestures.swipe({
+      scrollParams: { direction: fingerDirection },
+      percent,
+      duration: 600,
+      from: { x: centerX, y: fromY },
+      to: { x: centerX, y: toY },
+    });
+  }
+
+  async scrollWalletHomeToElement(
+    target: EncapsulatedElementType,
+    description: string,
+    direction: 'up' | 'down' = 'down',
+    maxAttempts = 16,
+  ): Promise<void> {
+    if (this.isAndroidAppium()) {
+      await Assertions.expectElementToBeVisible(this.walletScrollView, {
+        timeout: resolveE2EWaitTimeoutMs(10_000),
+        description: `wallet-scroll-view for ${description}`,
+      });
+      const scrollView = await asPlaywrightElement(this.walletScrollView);
+      const targetElement = await asPlaywrightElement(target);
+      await PlaywrightGestures.scrollIntoView(targetElement, {
+        scrollableElement: scrollView,
+        scrollParams: {
+          direction: direction === 'down' ? 'up' : 'down',
+        },
+        maxScrolls: maxAttempts,
+      });
+      await Assertions.expectElementToBeVisible(target, {
+        timeout: 5_000,
+        description,
+      });
+      return;
+    }
+
+    if (FrameworkDetector.isAppium()) {
+      for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
+        try {
+          await Assertions.expectElementToBeVisible(target, {
+            timeout: 1_500,
+            description,
+          });
+          return;
+        } catch {
+          await this.scrollWalletHome(direction, 0.5);
+        }
+      }
+
+      await Assertions.expectElementToBeVisible(target, {
+        timeout: 5_000,
+        description,
+      });
+      return;
+    }
+
+    for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
+      try {
+        await Assertions.expectElementToBeVisible(target, {
+          timeout: 1_500,
+          description,
+        });
+        return;
+      } catch {
+        await this.scrollWalletHome(direction, 0.5);
+      }
+    }
+
+    await Assertions.expectElementToBeVisible(target, {
+      timeout: 5_000,
+      description,
+    });
+  }
+
+  async tapIfAlreadyVisible(
+    target: DetoxElement | EncapsulatedElementType,
+    description: string,
+    options: { tapTimeout?: number } = {},
+  ): Promise<boolean> {
+    if (!FrameworkDetector.isAppium()) {
+      return false;
+    }
+
+    const { tapTimeout = 30_000 } = options;
+
+    try {
+      await PlaywrightAssertions.expectElementToBeVisible(
+        asPlaywrightElement(target),
+        { timeout: 2000, description },
+      );
+      await Gestures.waitAndTap(target, {
+        elemDescription: description,
+        timeout: tapTimeout,
+      });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  async scrollAndTapSection(
+    target: DetoxElement | EncapsulatedElementType,
+    description: string,
+    direction: 'up' | 'down' = 'down',
+    options: {
+      scrollAmount?: number;
+      overshootSwipe?: { direction: 'up' | 'down'; percentage?: number };
+      timeout?: number;
+      tapTimeout?: number;
+    } = {},
+  ): Promise<void> {
+    const {
+      scrollAmount = 200,
+      overshootSwipe,
+      timeout = 15_000,
+      tapTimeout = 30_000,
+    } = options;
+
+    await encapsulatedAction({
+      detox: async () => {
+        await Gestures.scrollToElement(target, this.walletScrollContainer, {
+          direction,
+          scrollAmount,
+          timeout,
+          elemDescription: `Scroll to ${description}`,
+        });
+        if (overshootSwipe) {
+          await Gestures.swipe(
+            this.walletScrollView,
+            overshootSwipe.direction,
+            {
+              percentage: overshootSwipe.percentage ?? 0.15,
+              speed: 'slow',
+              elemDescription: `Overshoot swipe for ${description}`,
+            },
+          );
+        }
+        await Gestures.waitAndTap(target, {
+          elemDescription: description,
+          timeout: tapTimeout,
+        });
+      },
+      appium: async () => {
+        await this.scrollWalletHomeToElement(
+          target as EncapsulatedElementType,
+          description,
+          direction,
+          Math.max(8, Math.ceil(timeout / 2_000)),
+        );
+        if (overshootSwipe) {
+          const overshootScrollDirection =
+            overshootSwipe.direction === 'up' ? 'down' : 'up';
+          if (this.isAndroidAppium()) {
+            await this.scrollWalletHomeAndroid(
+              overshootScrollDirection,
+              overshootSwipe.percentage ?? 0.15,
+            );
+          } else {
+            await Gestures.swipe(
+              this.walletScrollView,
+              overshootSwipe.direction,
+              {
+                percentage: overshootSwipe.percentage ?? 0.15,
+                speed: 'slow',
+                elemDescription: `Overshoot swipe for ${description}`,
+              },
+            );
+          }
+        }
+        await PlaywrightGestures.waitAndTap(
+          await asPlaywrightElement(target as EncapsulatedElementType),
+          { timeout: tapTimeout },
+        );
+      },
+    });
+  }
+
+  async tryScrollDirections(
+    action: (direction: 'up' | 'down') => Promise<void>,
+    directions: readonly ('up' | 'down')[] = ['down', 'up'],
+  ): Promise<void> {
+    let lastError: unknown;
+    for (const direction of directions) {
+      try {
+        await action(direction);
+        return;
+      } catch (error) {
+        lastError = error;
+      }
+    }
+    throw lastError;
+  }
+}
+
+export default new WalletHomeScroll();
diff --git a/tests/page-objects/wallet/WalletHomeSections.ts b/tests/page-objects/wallet/WalletHomeSections.ts
new file mode 100644
index 000000000000..186469b436d5
--- /dev/null
+++ b/tests/page-objects/wallet/WalletHomeSections.ts
@@ -0,0 +1,450 @@
+import {
+  WalletViewSelectorsIDs,
+  WalletViewSelectorsText,
+} from '../../../app/components/Views/Wallet/WalletView.testIds';
+import {
+  PredictPositionsHeaderSelectorsIDs,
+  PredictClaimConfirmationSelectorsIDs,
+  PredictMarketDetailsSelectorsIDs,
+} from '../../../app/components/UI/Predict/Predict.testIds';
+import Gestures from '../../framework/Gestures';
+import UnifiedGestures from '../../framework/UnifiedGestures';
+import Matchers from '../../framework/Matchers';
+import Assertions from '../../framework/Assertions';
+import Utilities from '../../framework/Utilities';
+import {
+  encapsulated,
+  EncapsulatedElementType,
+  asPlaywrightElement,
+} from '../../framework/EncapsulatedElement';
+import { encapsulatedAction } from '../../framework/encapsulatedAction';
+import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
+import PlaywrightGestures from '../../framework/PlaywrightGestures';
+import { resolveE2EWaitTimeoutMs } from '../../framework/Constants';
+import WalletHomeScroll from './WalletHomeScroll';
+
+export class WalletHomeSections {
+  get defiTab(): EncapsulatedElementType {
+    return Matchers.getElementByText(WalletViewSelectorsText.DEFI_TAB);
+  }
+
+  get defiNetworkFilter(): EncapsulatedElementType {
+    return Matchers.getElementByID(
+      WalletViewSelectorsIDs.DEFI_POSITIONS_NETWORK_FILTER,
+    );
+  }
+
+  get defiTabContainer(): EncapsulatedElementType {
+    return Matchers.getElementByID(
+      WalletViewSelectorsIDs.DEFI_POSITIONS_CONTAINER,
+    );
+  }
+
+  get claimButton(): EncapsulatedElementType {
+    return Matchers.getElementByID(
+      PredictPositionsHeaderSelectorsIDs.CLAIM_BUTTON,
+    );
+  }
+
+  get predictClaimConfirmButton(): EncapsulatedElementType {
+    return Matchers.getElementByID(
+      PredictClaimConfirmationSelectorsIDs.CLAIM_CONFIRM_BUTTON,
+    );
+  }
+
+  get availableBalanceLabel(): EncapsulatedElementType {
+    return Matchers.getElementByText(WalletViewSelectorsText.AVAILABLE_BALANCE);
+  }
+
+  get defiPositionsNew(): EncapsulatedElementType {
+    return Matchers.getElementByText(WalletViewSelectorsText.DEFI_SECTION);
+  }
+
+  get perpsSectionHeader(): EncapsulatedElementType {
+    return Matchers.getElementByID(
+      WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('perps'),
+    );
+  }
+
+  get predictionsSectionHeader(): EncapsulatedElementType {
+    return Matchers.getElementByID(
+      WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('predictions'),
+    );
+  }
+
+  get getMoneySection(): EncapsulatedElementType {
+    return PlaywrightMatchers.getElementById('homepage-section-title-cash', {
+      exact: false,
+    });
+  }
+
+  get tokensSectionHeader(): EncapsulatedElementType {
+    return Matchers.getElementByText(WalletViewSelectorsText.TOKENS_SECTION);
+  }
+
+  get tokensSection(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(
+          WalletViewSelectorsIDs.TOKENS_SECTION_CONTAINER,
+        ),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(
+            WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('tokens'),
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementByAccessibilityId(
+            `${WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('tokens')}`,
+          ),
+      },
+    });
+  }
+
+  get nftsSectionHeader(): EncapsulatedElementType {
+    return Matchers.getElementByText(WalletViewSelectorsText.NFTS_SECTION);
+  }
+
+  async tapOnNewTokensSection(): Promise<void> {
+    await encapsulatedAction({
+      detox: async () => {
+        await Gestures.waitAndTap(this.tokensSectionHeader, {
+          checkStability: true,
+          elemDescription: 'New Tokens Section',
+        });
+      },
+      appium: async () => {
+        await this.scrollAndTapTokensSection();
+      },
+    });
+  }
+
+  async scrollAndTapTokensSection(
+    direction: 'up' | 'down' = 'down',
+  ): Promise<void> {
+    if (
+      await WalletHomeScroll.tapIfAlreadyVisible(
+        this.tokensSectionHeader,
+        'Tokens section',
+      )
+    ) {
+      return;
+    }
+
+    const getScrollOptions = (scrollDirection: 'up' | 'down') => ({
+      overshootSwipe: {
+        direction:
+          scrollDirection === 'down' ? ('up' as const) : ('down' as const),
+        percentage: 0.15,
+      },
+      timeout: 60_000,
+    });
+
+    try {
+      await WalletHomeScroll.scrollAndTapSection(
+        this.tokensSectionHeader,
+        'Tokens section',
+        direction,
+        getScrollOptions(direction),
+      );
+    } catch {
+      const fallbackDirection = direction === 'down' ? 'up' : 'down';
+      await WalletHomeScroll.scrollAndTapSection(
+        this.tokensSectionHeader,
+        'Tokens section',
+        fallbackDirection,
+        getScrollOptions(fallbackDirection),
+      );
+    }
+  }
+
+  async tapOnTokensSection(): Promise<void> {
+    await encapsulatedAction({
+      detox: async () => {
+        await Gestures.waitAndTap(this.tokensSectionHeader, {
+          checkStability: true,
+          elemDescription: 'Tokens Section',
+        });
+      },
+      appium: async () => {
+        const elem = await asPlaywrightElement(this.tokensSection);
+        await PlaywrightGestures.waitForElementStable(elem);
+
+        const freshElem = await asPlaywrightElement(this.tokensSection);
+        await freshElem.unwrap().click();
+      },
+    });
+  }
+
+  async tapOnDeFiTab(): Promise<void> {
+    await Gestures.waitAndTap(this.defiTab, {
+      elemDescription: 'DeFi Tab',
+    });
+  }
+
+  async tapOnDeFiNetworksFilter(): Promise<void> {
+    await Gestures.waitAndTap(this.defiNetworkFilter, {
+      elemDescription: 'DeFi Networks Filter',
+    });
+  }
+
+  async scrollAndTapDefiSection(): Promise<void> {
+    await WalletHomeScroll.scrollAndTapSection(
+      this.defiPositionsNew,
+      'DeFi section',
+    );
+  }
+
+  async scrollAndTapPerpsSection(): Promise<void> {
+    try {
+      await WalletHomeScroll.scrollAndTapSection(
+        this.perpsSectionHeader,
+        'Perpetuals section',
+      );
+    } catch {
+      await WalletHomeScroll.scrollAndTapSection(
+        this.perpsSectionHeader,
+        'Perpetuals section',
+        'up',
+      );
+    }
+  }
+
+  async scrollAndTapPredictionsSection(
+    direction: 'up' | 'down' = 'down',
+    options: {
+      overshootSwipe?: { direction: 'up' | 'down'; percentage?: number };
+    } = {},
+  ): Promise<void> {
+    if (
+      await WalletHomeScroll.tapIfAlreadyVisible(
+        this.predictionsSectionHeader,
+        'Predictions section',
+      )
+    ) {
+      return;
+    }
+
+    const fallbackDirection = direction === 'down' ? 'up' : 'down';
+
+    await WalletHomeScroll.tryScrollDirections(
+      (scrollDirection) =>
+        WalletHomeScroll.scrollAndTapSection(
+          this.predictionsSectionHeader,
+          'Predictions section',
+          scrollDirection,
+          {
+            overshootSwipe: options.overshootSwipe ?? {
+              direction:
+                scrollDirection === 'down'
+                  ? ('up' as const)
+                  : ('down' as const),
+              percentage: 0.15,
+            },
+            timeout: 60_000,
+          },
+        ),
+      [direction, fallbackDirection],
+    );
+  }
+
+  async scrollPredictionsSectionIntoView(
+    direction: 'up' | 'down' = 'down',
+    options: { maxAttempts?: number } = {},
+  ): Promise<void> {
+    const { maxAttempts = 24 } = options;
+
+    await encapsulatedAction({
+      detox: async () => {
+        await Gestures.scrollToElement(
+          this.predictionsSectionHeader,
+          WalletHomeScroll.walletScrollContainer,
+          {
+            direction,
+            scrollAmount: 250,
+            timeout: 60_000,
+            elemDescription: 'Scroll to Predictions section',
+          },
+        );
+      },
+      appium: async () => {
+        await WalletHomeScroll.scrollWalletHomeToElement(
+          this.predictionsSectionHeader,
+          'Predictions section',
+          direction,
+          maxAttempts,
+        );
+      },
+    });
+  }
+
+  async scrollAndTapPredictionsPosition(
+    positionName: string,
+    positionId?: string,
+  ): Promise<void> {
+    const target = positionId
+      ? Matchers.getElementByID(`predict-position-row-${positionId}`)
+      : Matchers.getElementByText(positionName);
+
+    await encapsulatedAction({
+      detox: async () => {
+        if (
+          await WalletHomeScroll.tapIfAlreadyVisible(
+            target,
+            `Predictions Position: ${positionName}`,
+          )
+        ) {
+          return;
+        }
+
+        await WalletHomeScroll.tryScrollDirections((direction) =>
+          this.scrollPredictionsSectionIntoView(direction),
+        );
+
+        if (
+          await WalletHomeScroll.tapIfAlreadyVisible(
+            target,
+            `Predictions Position: ${positionName}`,
+          )
+        ) {
+          return;
+        }
+
+        await WalletHomeScroll.tryScrollDirections((direction) =>
+          WalletHomeScroll.scrollAndTapSection(
+            target,
+            `Predictions Position: ${positionName}`,
+            direction,
+            { timeout: 60_000 },
+          ),
+        );
+      },
+      appium: async () => {
+        const description = `Predictions Position: ${positionName}`;
+        const marketDetailsScreen = Matchers.getElementByID(
+          PredictMarketDetailsSelectorsIDs.SCREEN,
+        );
+        const scrollAndTapRetryTimeoutMs = 90_000;
+        const intoViewMaxAttempts = 8;
+        const scrollAndTapPerDirectionMs = 15_000;
+        const tapTimeoutMs = 10_000;
+        const predictNavigationTimeoutMs = resolveE2EWaitTimeoutMs(15_000);
+
+        const assertMarketDetailsOpened = async (): Promise<void> => {
+          await Assertions.expectElementToBeVisible(marketDetailsScreen, {
+            timeout: predictNavigationTimeoutMs,
+            description: 'Predict market details screen after position tap',
+          });
+        };
+
+        await Utilities.executeWithRetry(
+          async () => {
+            if (
+              await WalletHomeScroll.tapIfAlreadyVisible(target, description, {
+                tapTimeout: tapTimeoutMs,
+              })
+            ) {
+              await assertMarketDetailsOpened();
+              return;
+            }
+
+            await WalletHomeScroll.tryScrollDirections((direction) =>
+              this.scrollPredictionsSectionIntoView(direction, {
+                maxAttempts: intoViewMaxAttempts,
+              }),
+            );
+
+            if (
+              await WalletHomeScroll.tapIfAlreadyVisible(target, description, {
+                tapTimeout: tapTimeoutMs,
+              })
+            ) {
+              await assertMarketDetailsOpened();
+              return;
+            }
+
+            await WalletHomeScroll.tryScrollDirections((direction) =>
+              WalletHomeScroll.scrollAndTapSection(
+                target,
+                description,
+                direction,
+                {
+                  timeout: scrollAndTapPerDirectionMs,
+                  tapTimeout: tapTimeoutMs,
+                  overshootSwipe: {
+                    direction: direction === 'down' ? 'up' : 'down',
+                    percentage: 0.15,
+                  },
+                },
+              ),
+            );
+
+            await assertMarketDetailsOpened();
+          },
+          {
+            timeout: scrollAndTapRetryTimeoutMs,
+            description: `Scroll and tap ${description}`,
+          },
+        );
+      },
+    });
+  }
+
+  async scrollAndTapNftsSection(): Promise<void> {
+    await WalletHomeScroll.scrollAndTapSection(
+      this.nftsSectionHeader,
+      'NFTs section',
+    );
+  }
+
+  async tapOnAvailableBalance(): Promise<void> {
+    await Gestures.waitAndTap(this.availableBalanceLabel, {
+      elemDescription: 'tap available balance to expand balance card',
+    });
+  }
+
+  async tapClaimButton(): Promise<void> {
+    await encapsulatedAction({
+      detox: async () => {
+        await Gestures.scrollToElement(
+          this.claimButton,
+          WalletHomeScroll.walletScrollContainer,
+          {
+            direction: 'down',
+            scrollAmount: 200,
+            elemDescription: 'Scroll to Claim Button',
+          },
+        );
+        await Gestures.waitAndTap(this.claimButton, {
+          elemDescription: 'Claim Button',
+        });
+      },
+      appium: async () => {
+        await Utilities.executeWithRetry(
+          async () => {
+            await WalletHomeScroll.scrollWalletHomeToElement(
+              this.claimButton,
+              'Claim button on wallet homepage',
+            );
+            await UnifiedGestures.waitAndTap(this.claimButton, {
+              description: 'Claim Button',
+              timeout: 30_000,
+            });
+          },
+          {
+            timeout: 90_000,
+            description: 'Tap claim button on wallet homepage',
+          },
+        );
+      },
+    });
+  }
+
+  async tapClaimConfirmButton(): Promise<void> {
+    await Gestures.waitAndTap(this.predictClaimConfirmButton, {
+      elemDescription: 'Claim confirm button',
+    });
+  }
+}
+
+export default new WalletHomeSections();
diff --git a/tests/page-objects/wallet/WalletView.ts b/tests/page-objects/wallet/WalletView.ts
index 61cfdb879228..4ac2cdf3436a 100644
--- a/tests/page-objects/wallet/WalletView.ts
+++ b/tests/page-objects/wallet/WalletView.ts
@@ -5,15 +5,9 @@ import {
 import { EARN_TEST_IDS } from '../../../app/components/UI/Earn/constants/testIds';
 import { CashGetMusdEmptyStateSelectors } from '../../../app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.testIds';
 import { SECONDARY_BALANCE_BUTTON_TEST_ID } from '../../../app/components/UI/AssetElement/index.constants';
-import {
-  PredictPositionsHeaderSelectorsIDs,
-  PredictClaimConfirmationSelectorsIDs,
-  PredictMarketDetailsSelectorsIDs,
-} from '../../../app/components/UI/Predict/Predict.testIds';
 import Gestures from '../../framework/Gestures';
 import UnifiedGestures from '../../framework/UnifiedGestures';
 import Matchers from '../../framework/Matchers';
-import TestHelpers from '../../helpers.js';
 import Assertions from '../../framework/Assertions';
 import PlaywrightAssertions from '../../framework/PlaywrightAssertions';
 import Utilities from '../../framework/Utilities';
@@ -25,13 +19,13 @@ import {
 } from '../../framework/EncapsulatedElement';
 import { encapsulatedAction } from '../../framework/encapsulatedAction';
 import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
-import { PlatformDetector } from '../../framework/PlatformLocator';
-import { FrameworkDetector } from '../../framework/FrameworkDetector';
 import PlaywrightGestures from '../../framework/PlaywrightGestures';
+import { PlatformDetector } from '../../framework/PlatformLocator';
 import { getAssetTestId } from '../../selectors/Wallet/WalletView.selectors';
-import { resolveE2EWaitTimeoutMs } from '../../framework/Constants';
+import WalletHomeScroll from './WalletHomeScroll';
+import { WalletHomeSections as WalletHomeSectionsBase } from './WalletHomeSections';
 
-class WalletView {
+class WalletView extends WalletHomeSectionsBase {
   get container(): EncapsulatedElementType {
     return Matchers.getElementByID(WalletViewSelectorsIDs.WALLET_CONTAINER);
   }
@@ -59,259 +53,12 @@ class WalletView {
     });
   }
 
-  /** Cross-framework scroll container for the wallet homepage ScrollView. */
   get walletScrollContainer(): string {
-    return WalletViewSelectorsIDs.WALLET_SCROLL_VIEW;
+    return WalletHomeScroll.walletScrollContainer;
   }
 
-  /** Wallet ScrollView as element (for gestures like swipe). */
   get walletScrollView(): EncapsulatedElementType {
-    return Matchers.getElementByID(WalletViewSelectorsIDs.WALLET_SCROLL_VIEW);
-  }
-
-  private isAndroidAppium(): boolean {
-    return FrameworkDetector.isAppium() && !PlatformDetector.isIOS();
-  }
-
-  /**
-   * Map Detox scroll direction to swipe args for `wallet-scroll-view` (iOS).
-   */
-  private mapWalletHomeScrollToSwipe(
-    scrollDirection: 'up' | 'down',
-  ): 'up' | 'down' {
-    return scrollDirection === 'down' ? 'up' : 'down';
-  }
-
-  /**
-   * Scroll the wallet homepage by swiping inside `wallet-scroll-view`.
-   * `scrollDirection` matches Detox semantics (`down` reveals content below).
-   */
-  private async scrollWalletHome(
-    scrollDirection: 'up' | 'down',
-    percent = 0.45,
-  ): Promise<void> {
-    if (this.isAndroidAppium()) {
-      await this.scrollWalletHomeAndroid(scrollDirection, percent);
-      return;
-    }
-
-    const swipeDirection = this.mapWalletHomeScrollToSwipe(scrollDirection);
-    await UnifiedGestures.swipe(this.walletScrollView, swipeDirection, {
-      percentage: percent,
-      description: `Scroll wallet homepage ${scrollDirection}`,
-    });
-  }
-
-  /**
-   * Android wallet homepage: use bounded W3C swipes inside the scroll view.
-   * `mobile:scrollGesture` with `up` triggers pull-to-refresh; starting the
-   * gesture near the top edge is unreliable even with `direction: down`.
-   */
-  private async scrollWalletHomeAndroid(
-    scrollDirection: 'up' | 'down',
-    percent = 0.45,
-  ): Promise<void> {
-    const container = await asPlaywrightElement(this.walletScrollView);
-    const location = await container.unwrap().getLocation();
-    const size = await container.unwrap().getSize();
-    const centerX = Math.floor(location.x + size.width / 2);
-    const travel = Math.floor(
-      size.height * Math.min(Math.max(percent, 0.1), 0.9),
-    );
-    const fingerDirection = scrollDirection === 'down' ? 'up' : 'down';
-
-    const fromY =
-      fingerDirection === 'up'
-        ? location.y + Math.floor(size.height * 0.75)
-        : location.y + Math.floor(size.height * 0.35);
-    const toY = fingerDirection === 'up' ? fromY - travel : fromY + travel;
-
-    await PlaywrightGestures.swipe({
-      scrollParams: { direction: fingerDirection },
-      percent,
-      duration: 600,
-      from: { x: centerX, y: fromY },
-      to: { x: centerX, y: toY },
-    });
-  }
-
-  /** Scroll until `target` is visible on the wallet homepage. */
-  private async scrollWalletHomeToElement(
-    target: EncapsulatedElementType,
-    description: string,
-    direction: 'up' | 'down' = 'down',
-    maxAttempts = 16,
-  ): Promise<void> {
-    // Android: scrollIntoView inside the scroll view works reliably.
-    // iOS: scrollIntoView gets stuck on the homepage; use bounded swipe loops instead.
-    if (this.isAndroidAppium()) {
-      await Assertions.expectElementToBeVisible(this.walletScrollView, {
-        timeout: resolveE2EWaitTimeoutMs(10_000),
-        description: `wallet-scroll-view for ${description}`,
-      });
-      const scrollView = await asPlaywrightElement(this.walletScrollView);
-      const element = await asPlaywrightElement(target);
-      await PlaywrightGestures.scrollIntoView(element, {
-        scrollableElement: scrollView,
-        scrollParams: {
-          direction: direction === 'down' ? 'up' : 'down',
-        },
-        maxScrolls: maxAttempts,
-      });
-      await Assertions.expectElementToBeVisible(target, {
-        timeout: 5_000,
-        description,
-      });
-      return;
-    }
-
-    if (FrameworkDetector.isAppium()) {
-      for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
-        try {
-          await Assertions.expectElementToBeVisible(target, {
-            timeout: 1_500,
-            description,
-          });
-          return;
-        } catch {
-          await this.scrollWalletHome(direction, 0.5);
-        }
-      }
-
-      await Assertions.expectElementToBeVisible(target, {
-        timeout: 5_000,
-        description,
-      });
-      return;
-    }
-
-    for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
-      try {
-        await Assertions.expectElementToBeVisible(target, {
-          timeout: 1_500,
-          description,
-        });
-        return;
-      } catch {
-        await this.scrollWalletHome(direction, 0.5);
-      }
-    }
-
-    await Assertions.expectElementToBeVisible(target, {
-      timeout: 5_000,
-      description,
-    });
-  }
-
-  private async tapIfAlreadyVisible(
-    target: DetoxElement | EncapsulatedElementType,
-    description: string,
-    options: { tapTimeout?: number } = {},
-  ): Promise<boolean> {
-    if (!FrameworkDetector.isAppium()) {
-      return false;
-    }
-
-    const { tapTimeout = 30_000 } = options;
-
-    try {
-      await PlaywrightAssertions.expectElementToBeVisible(
-        asPlaywrightElement(target),
-        { timeout: 2000, description },
-      );
-      await Gestures.waitAndTap(target, {
-        elemDescription: description,
-        timeout: tapTimeout,
-      });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  /**
-   * Progressive scroll for homepage sections:
-   * try tap -> small scroll down -> retry, until the section is tappable.
-   * @param options.scrollAmount - Pixels to scroll per step.
-   * @param options.overshootSwipe - After scroll, perform a small swipe to move the section away
-   * from the tab bar (e.g. direction 'up' = one more scroll down = section moves higher on screen).
-   */
-  private async scrollAndTapSection(
-    target: DetoxElement | EncapsulatedElementType,
-    description: string,
-    direction: 'up' | 'down' = 'down',
-    options: {
-      scrollAmount?: number;
-      overshootSwipe?: { direction: 'up' | 'down'; percentage?: number };
-      timeout?: number;
-      /** Appium/Detox tap wait after scroll. Defaults to 30s. */
-      tapTimeout?: number;
-    } = {},
-  ): Promise<void> {
-    const {
-      scrollAmount = 200,
-      overshootSwipe,
-      timeout = 15_000,
-      tapTimeout = 30_000,
-    } = options;
-
-    await encapsulatedAction({
-      detox: async () => {
-        await Gestures.scrollToElement(target, this.walletScrollContainer, {
-          direction,
-          scrollAmount,
-          timeout,
-          elemDescription: `Scroll to ${description}`,
-        });
-        if (overshootSwipe) {
-          await Gestures.swipe(
-            this.walletScrollView,
-            overshootSwipe.direction,
-            {
-              percentage: overshootSwipe.percentage ?? 0.15,
-              speed: 'slow',
-              elemDescription: `Overshoot swipe for ${description}`,
-            },
-          );
-        }
-        await Gestures.waitAndTap(target, {
-          elemDescription: description,
-          timeout: tapTimeout,
-        });
-      },
-      appium: async () => {
-        await this.scrollWalletHomeToElement(
-          target as EncapsulatedElementType,
-          description,
-          direction,
-          Math.max(8, Math.ceil(timeout / 2_000)),
-        );
-        if (overshootSwipe) {
-          const overshootScrollDirection =
-            overshootSwipe.direction === 'up' ? 'down' : 'up';
-          if (this.isAndroidAppium()) {
-            await this.scrollWalletHomeAndroid(
-              overshootScrollDirection,
-              overshootSwipe.percentage ?? 0.15,
-            );
-          } else {
-            await Gestures.swipe(
-              this.walletScrollView,
-              overshootSwipe.direction,
-              {
-                percentage: overshootSwipe.percentage ?? 0.15,
-                speed: 'slow',
-                elemDescription: `Overshoot swipe for ${description}`,
-              },
-            );
-          }
-        }
-        await PlaywrightGestures.waitAndTap(
-          await asPlaywrightElement(target as EncapsulatedElementType),
-          { timeout: tapTimeout },
-        );
-      },
-    });
+    return WalletHomeScroll.walletScrollView;
   }
 
   get earnButton(): EncapsulatedElementType {
@@ -499,7 +246,12 @@ class WalletView {
     });
   }
 
-  // mUSD conversion (Earn) - education screen, token list CTA, asset overview CTA
+  get musdAssetListConversionCta(): EncapsulatedElementType {
+    return Matchers.getElementByID(
+      EARN_TEST_IDS.MUSD.ASSET_LIST_CONVERSION_CTA,
+    );
+  }
+
   get cashGetMusdContainer(): EncapsulatedElementType {
     return Matchers.getElementByID(CashGetMusdEmptyStateSelectors.CONTAINER);
   }
@@ -550,11 +302,10 @@ class WalletView {
           PlaywrightMatchers.getElementById(getAssetTestId(token), {
             exact: true,
           }),
-        // iOS: TokenListItem sets accessibilityLabel to "Name, $fiat, balance"
-        // so the iOS predicate `name` (= accessibilityLabel) differs from testID.
-        // Use `~testID` which maps to accessibilityIdentifier (= testID).
+        // iOS: match accessibilityIdentifier (= RN testID), not accessibilityLabel
+        // (label is "Name, $fiat, balance" and does not contain asset-SYMBOL).
         ios: () =>
-          PlaywrightMatchers.getElementByNameiOS(getAssetTestId(token)),
+          PlaywrightMatchers.getElementByAccessibilityId(getAssetTestId(token)),
       },
     });
   }
@@ -608,7 +359,12 @@ class WalletView {
   }
 
   async tapNetworksButtonOnNavBar(): Promise<void> {
-    await TestHelpers.tap(WalletViewSelectorsIDs.NAVBAR_NETWORK_BUTTON);
+    await Gestures.waitAndTap(
+      Matchers.getElementByID(WalletViewSelectorsIDs.NAVBAR_NETWORK_BUTTON),
+      {
+        elemDescription: 'Navbar Network Button',
+      },
+    );
   }
 
   async tapNavbarCardButton(): Promise<void> {
@@ -623,7 +379,7 @@ class WalletView {
   ): Promise<void> {
     await Gestures.scrollToElement(
       this.tokenInWallet(tokenName) as unknown as DetoxElement,
-      Matchers.getIdentifier(WalletViewSelectorsIDs.TOKENS_CONTAINER_LIST),
+      Matchers.scrollContainer(WalletViewSelectorsIDs.TOKENS_CONTAINER_LIST),
       {
         direction,
         scrollAmount: 50,
@@ -703,450 +459,6 @@ class WalletView {
     });
   }
 
-  get defiTab(): EncapsulatedElementType {
-    return Matchers.getElementByText(WalletViewSelectorsText.DEFI_TAB);
-  }
-
-  get defiNetworkFilter(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      WalletViewSelectorsIDs.DEFI_POSITIONS_NETWORK_FILTER,
-    );
-  }
-
-  get defiTabContainer(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      WalletViewSelectorsIDs.DEFI_POSITIONS_CONTAINER,
-    );
-  }
-  get claimButton(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      PredictPositionsHeaderSelectorsIDs.CLAIM_BUTTON,
-    );
-  }
-  get predictClaimConfirmButton(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      PredictClaimConfirmationSelectorsIDs.CLAIM_CONFIRM_BUTTON,
-    );
-  }
-
-  get availableBalanceLabel(): EncapsulatedElementType {
-    return Matchers.getElementByText(WalletViewSelectorsText.AVAILABLE_BALANCE);
-  }
-
-  get defiPositionsNew(): EncapsulatedElementType {
-    return Matchers.getElementByText(WalletViewSelectorsText.DEFI_SECTION);
-  }
-
-  /** Perpetuals section title button on the homepage. */
-  get perpsSectionHeader(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('perps'),
-    );
-  }
-
-  /** Predictions section title button on the homepage. */
-  get predictionsSectionHeader(): EncapsulatedElementType {
-    return Matchers.getElementByID(
-      WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('predictions'),
-    );
-  }
-
-  get getMoneySection(): EncapsulatedElementType {
-    return PlaywrightMatchers.getElementById('homepage-section-title-cash', {
-      exact: false,
-    });
-  }
-  /** Tokens section header on the homepage. */
-  get tokensSectionHeader(): EncapsulatedElementType {
-    return Matchers.getElementByText(WalletViewSelectorsText.TOKENS_SECTION);
-  }
-
-  get tokensSection(): EncapsulatedElementType {
-    return encapsulated({
-      detox: () =>
-        Matchers.getElementByID(
-          WalletViewSelectorsIDs.TOKENS_SECTION_CONTAINER,
-        ),
-      appium: {
-        android: () =>
-          PlaywrightMatchers.getElementById(
-            WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('tokens'),
-          ),
-        ios: () =>
-          PlaywrightMatchers.getElementByAccessibilityId(
-            `${WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('tokens')}`,
-          ),
-      },
-    });
-  }
-
-  /** NFTs section header on the homepage. */
-  get nftsSectionHeader(): EncapsulatedElementType {
-    return Matchers.getElementByText(WalletViewSelectorsText.NFTS_SECTION);
-  }
-
-  async tapOnNewTokensSection(): Promise<void> {
-    await encapsulatedAction({
-      detox: async () => {
-        await Gestures.waitAndTap(this.tokensSectionHeader, {
-          checkStability: true,
-          elemDescription: 'New Tokens Section',
-        });
-      },
-      appium: async () => {
-        await this.scrollAndTapTokensSection();
-      },
-    });
-  }
-
-  /**
-   * Scrolls the wallet homepage until the Tokens section header is tappable.
-   * On long homepages the header can sit below the fold near the tab bar; a plain
-   * tap then hits the tab bar instead of navigating to Tokens Full View.
-   */
-  async scrollAndTapTokensSection(
-    direction: 'up' | 'down' = 'down',
-  ): Promise<void> {
-    if (
-      await this.tapIfAlreadyVisible(this.tokensSectionHeader, 'Tokens section')
-    ) {
-      return;
-    }
-
-    const getScrollOptions = (scrollDirection: 'up' | 'down') => ({
-      overshootSwipe: {
-        direction:
-          scrollDirection === 'down' ? ('up' as const) : ('down' as const),
-        percentage: 0.15,
-      },
-      timeout: 60_000,
-    });
-
-    try {
-      await this.scrollAndTapSection(
-        this.tokensSectionHeader,
-        'Tokens section',
-        direction,
-        getScrollOptions(direction),
-      );
-    } catch {
-      const fallbackDirection = direction === 'down' ? 'up' : 'down';
-      await this.scrollAndTapSection(
-        this.tokensSectionHeader,
-        'Tokens section',
-        fallbackDirection,
-        getScrollOptions(fallbackDirection),
-      );
-    }
-  }
-
-  async tapOnTokensSection(): Promise<void> {
-    await encapsulatedAction({
-      detox: async () => {
-        await Gestures.waitAndTap(this.tokensSectionHeader, {
-          checkStability: true,
-          elemDescription: 'Tokens Section',
-        });
-      },
-      appium: async () => {
-        const elem = await asPlaywrightElement(this.tokensSection);
-        await PlaywrightGestures.waitForElementStable(elem);
-
-        // Re-fetch to avoid stale reference after stability wait
-        const freshElem = await asPlaywrightElement(this.tokensSection);
-        await freshElem.unwrap().click();
-      },
-    });
-  }
-
-  async tapOnDeFiTab(): Promise<void> {
-    await Gestures.waitAndTap(this.defiTab, {
-      elemDescription: 'DeFi Tab',
-    });
-  }
-
-  async tapOnDeFiNetworksFilter(): Promise<void> {
-    await Gestures.waitAndTap(this.defiNetworkFilter, {
-      elemDescription: 'DeFi Networks Filter',
-    });
-  }
-
-  async scrollAndTapDefiSection(): Promise<void> {
-    await this.scrollAndTapSection(this.defiPositionsNew, 'DeFi section');
-  }
-
-  async scrollAndTapPerpsSection(): Promise<void> {
-    try {
-      await this.scrollAndTapSection(
-        this.perpsSectionHeader,
-        'Perpetuals section',
-      );
-    } catch {
-      await this.scrollAndTapSection(
-        this.perpsSectionHeader,
-        'Perpetuals section',
-        'up',
-      );
-    }
-  }
-
-  /**
-   * Scrolls to the Predictions section and taps it. After scroll, does a small overshoot swipe
-   * so the section sits higher on screen and the tap does not hit the main menu "+" button.
-   */
-  async scrollAndTapPredictionsSection(
-    direction: 'up' | 'down' = 'down',
-    options: {
-      overshootSwipe?: { direction: 'up' | 'down'; percentage?: number };
-    } = {},
-  ): Promise<void> {
-    if (
-      await this.tapIfAlreadyVisible(
-        this.predictionsSectionHeader,
-        'Predictions section',
-      )
-    ) {
-      return;
-    }
-
-    const fallbackDirection = direction === 'down' ? 'up' : 'down';
-
-    await this.tryScrollDirections(
-      (scrollDirection) =>
-        this.scrollAndTapSection(
-          this.predictionsSectionHeader,
-          'Predictions section',
-          scrollDirection,
-          {
-            overshootSwipe: options.overshootSwipe ?? {
-              direction:
-                scrollDirection === 'down'
-                  ? ('up' as const)
-                  : ('down' as const),
-              percentage: 0.15,
-            },
-            timeout: 60_000,
-          },
-        ),
-      [direction, fallbackDirection],
-    );
-  }
-
-  private async scrollPredictionsSectionIntoView(
-    direction: 'up' | 'down' = 'down',
-    options: { maxAttempts?: number } = {},
-  ): Promise<void> {
-    const { maxAttempts = 24 } = options;
-
-    await encapsulatedAction({
-      detox: async () => {
-        await Gestures.scrollToElement(
-          this.predictionsSectionHeader,
-          this.walletScrollContainer,
-          {
-            direction,
-            scrollAmount: 250,
-            timeout: 60_000,
-            elemDescription: 'Scroll to Predictions section',
-          },
-        );
-      },
-      appium: async () => {
-        await this.scrollWalletHomeToElement(
-          this.predictionsSectionHeader,
-          'Predictions section',
-          direction,
-          maxAttempts,
-        );
-      },
-    });
-  }
-
-  /**
-   * Tries scroll actions down then up (or a custom order) without nested try/catch
-   * at call sites. Rethrows the last failure if every direction fails.
-   */
-  private async tryScrollDirections(
-    action: (direction: 'up' | 'down') => Promise<void>,
-    directions: readonly ('up' | 'down')[] = ['down', 'up'],
-  ): Promise<void> {
-    let lastError: unknown;
-    for (const direction of directions) {
-      try {
-        await action(direction);
-        return;
-      } catch (error) {
-        lastError = error;
-      }
-    }
-    throw lastError;
-  }
-
-  async scrollAndTapPredictionsPosition(
-    positionName: string,
-    positionId?: string,
-  ): Promise<void> {
-    const target = positionId
-      ? Matchers.getElementByID(`predict-position-row-${positionId}`)
-      : Matchers.getElementByText(positionName);
-
-    await encapsulatedAction({
-      detox: async () => {
-        if (
-          await this.tapIfAlreadyVisible(
-            target,
-            `Predictions Position: ${positionName}`,
-          )
-        ) {
-          return;
-        }
-
-        await this.tryScrollDirections((direction) =>
-          this.scrollPredictionsSectionIntoView(direction),
-        );
-
-        if (
-          await this.tapIfAlreadyVisible(
-            target,
-            `Predictions Position: ${positionName}`,
-          )
-        ) {
-          return;
-        }
-
-        await this.tryScrollDirections((direction) =>
-          this.scrollAndTapSection(
-            target,
-            `Predictions Position: ${positionName}`,
-            direction,
-            { timeout: 60_000 },
-          ),
-        );
-      },
-      appium: async () => {
-        const description = `Predictions Position: ${positionName}`;
-        const marketDetailsScreen = Matchers.getElementByID(
-          PredictMarketDetailsSelectorsIDs.SCREEN,
-        );
-        // Keep one attempt well under half of the outer budget so
-        // tryScrollDirections (down+up) can fail and still leave a second try.
-        const scrollAndTapRetryTimeoutMs = 90_000;
-        const intoViewMaxAttempts = 8;
-        const scrollAndTapPerDirectionMs = 15_000;
-        const tapTimeoutMs = 10_000;
-        const predictNavigationTimeoutMs = resolveE2EWaitTimeoutMs(15_000);
-
-        const assertMarketDetailsOpened = async (): Promise<void> => {
-          await Assertions.expectElementToBeVisible(marketDetailsScreen, {
-            timeout: predictNavigationTimeoutMs,
-            description: 'Predict market details screen after position tap',
-          });
-        };
-
-        // Align with Detox: tap-if-visible → section into view → tap →
-        // scrollAndTap with overshoot (down/up). Do not require the row to be
-        // visible before scrolling (off-screen rows like Blue Jays).
-        await Utilities.executeWithRetry(
-          async () => {
-            if (
-              await this.tapIfAlreadyVisible(target, description, {
-                tapTimeout: tapTimeoutMs,
-              })
-            ) {
-              await assertMarketDetailsOpened();
-              return;
-            }
-
-            await this.tryScrollDirections((direction) =>
-              this.scrollPredictionsSectionIntoView(direction, {
-                maxAttempts: intoViewMaxAttempts,
-              }),
-            );
-
-            if (
-              await this.tapIfAlreadyVisible(target, description, {
-                tapTimeout: tapTimeoutMs,
-              })
-            ) {
-              await assertMarketDetailsOpened();
-              return;
-            }
-
-            await this.tryScrollDirections((direction) =>
-              this.scrollAndTapSection(target, description, direction, {
-                timeout: scrollAndTapPerDirectionMs,
-                tapTimeout: tapTimeoutMs,
-                overshootSwipe: {
-                  direction: direction === 'down' ? 'up' : 'down',
-                  percentage: 0.15,
-                },
-              }),
-            );
-
-            await assertMarketDetailsOpened();
-          },
-          {
-            timeout: scrollAndTapRetryTimeoutMs,
-            description: `Scroll and tap ${description}`,
-          },
-        );
-      },
-    });
-  }
-
-  async scrollAndTapNftsSection(): Promise<void> {
-    await this.scrollAndTapSection(this.nftsSectionHeader, 'NFTs section');
-  }
-
-  async tapOnAvailableBalance(): Promise<void> {
-    await Gestures.waitAndTap(this.availableBalanceLabel, {
-      elemDescription: 'tap available balance to expand balance card',
-    });
-  }
-
-  async tapClaimButton(): Promise<void> {
-    await encapsulatedAction({
-      detox: async () => {
-        await Gestures.scrollToElement(
-          this.claimButton,
-          this.walletScrollContainer,
-          {
-            direction: 'down',
-            scrollAmount: 200,
-            elemDescription: 'Scroll to Claim Button',
-          },
-        );
-        await Gestures.waitAndTap(this.claimButton, {
-          elemDescription: 'Claim Button',
-        });
-      },
-      appium: async () => {
-        await Utilities.executeWithRetry(
-          async () => {
-            await this.scrollWalletHomeToElement(
-              this.claimButton,
-              'Claim button on wallet homepage',
-            );
-            await UnifiedGestures.waitAndTap(this.claimButton, {
-              description: 'Claim Button',
-              timeout: 30_000,
-            });
-          },
-          {
-            timeout: 90_000,
-            description: 'Tap claim button on wallet homepage',
-          },
-        );
-      },
-    });
-  }
-
-  async tapClaimConfirmButton(): Promise<void> {
-    await Gestures.waitAndTap(this.predictClaimConfirmButton, {
-      elemDescription: 'Claim confirm button',
-    });
-  }
-
   async waitForBalanceToStabilize(
     options: {
       maxWaitTime?: number;
@@ -1336,7 +648,7 @@ class WalletView {
    * container as the Asset/Transactions screen (transactions-container).
    */
   async scrollDownToAssetOverviewMusdCta(): Promise<void> {
-    const assetOverviewScrollContainer = Matchers.getIdentifier(
+    const assetOverviewScrollContainer = Matchers.scrollContainer(
       'transactions-container',
     );
     await Gestures.scrollToElement(
diff --git a/tests/performance/README.md b/tests/performance/README.md
index 3b108e0ac908..518da51ebafc 100644
--- a/tests/performance/README.md
+++ b/tests/performance/README.md
@@ -12,6 +12,7 @@ The performance framework lives under the `tests/` directory alongside the rest
 
 - [Test Structure](#test-structure)
 - [Configuration](#configuration)
+- [CI Triggers](#ci-triggers)
 - [Running Tests](#running-tests)
 - [Test Categories](#test-categories)
 - [Performance Tracking System](#performance-tracking-system)
@@ -122,6 +123,28 @@ The `tests/performance/device-matrix.json` file defines device configurations fo
 }
 ```
 
+## CI Triggers
+
+Performance E2E never runs on push. Coverage comes from PR selection on `main` plus a fixed schedule, with manual dispatch for everything else (release branches, ad-hoc `exp`/`rc` runs, etc.).
+
+| Event                                 | Behavior                                                                                                                                                                          |
+| ------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Push to `main`, `stable`, `release/*` | No performance tests.                                                                                                                                                             |
+| PR targeting `main`                   | Smart E2E Selection decides which performance tags to run (or none). The `run-performance-tests` label forces the full Android low-profile suite regardless of the AI's decision. |
+| PR targeting `release/*` or `stable`  | No automatic performance run — CI ignores AI performance selection for these base branches. The `run-performance-tests` label still forces a full run.                            |
+| Scheduled (Mon–Sat)                   | `e2e` builds from `main` every 6 hours starting at 00:00 UTC. Experimental builds are manual-only.                                                                                |
+| Manual dispatch                       | Run against any selected branch or tag with any build variant (`e2e`, `exp`, or `rc`).                                                                                            |
+
+Workflow layout:
+
+- [`run-performance-e2e.yml`](../../.github/workflows/run-performance-e2e.yml) — reusable execution engine (`workflow_call` only). Builds the apps, runs the Playwright suite on BrowserStack, aggregates results, and posts the PR comment/Slack notification. Never triggered directly.
+- [`run-performance-e2e-manual.yml`](../../.github/workflows/run-performance-e2e-manual.yml) — the only workflow with `schedule`/`workflow_dispatch` triggers. Wraps `run-performance-e2e.yml` for both the scheduled cadence and manual runs.
+- `ci.yml` (`run-performance-tests-pr` job) — calls `run-performance-e2e.yml` for PRs targeting `main`, wired to Smart E2E Selection's `ai_performance_test_tags` output and the `run-performance-tests` label.
+
+For PRs, `run-performance-e2e.yml` builds against the exact PR merge commit (`source_ref: github.sha`), the same ref used by the standard Detox E2E builds, so performance results reflect the same code. `branch_name` (`github.head_ref`) is only used for human-readable build names/reports.
+
+`build_variant` (`e2e`, `exp`, or `rc`) selects which native app profile CI builds and uploads to BrowserStack. It is distinct from `E2E_PERFORMANCE_BUILD_VARIANT` (see [Test Configuration](#test-configuration) below), which selects the remote feature-flag environment (`rc | exp | test`) used inside the test run itself.
+
 ## Running Tests
 
 ### Using Package Scripts
@@ -583,9 +606,10 @@ TEST_PASSWORD_ONBOARDING="your onboarding password"
 # Feature flags for performance tests (client-config API: rc | exp | test; not e2e)
 E2E_PERFORMANCE_BUILD_VARIANT=rc
 
-# CI note: scheduled/feature-branch performance workflows use build_variant=e2e
-# (GitHub environment build-e2e). E2E_PERFORMANCE_BUILD_VARIANT=rc is set separately
-# in performance-test-runner for the flags API. Release workflows use build_variant=rc.
+# CI note: PR (main) and scheduled performance runs use build_variant=e2e
+# (GitHub environment build-e2e). Manual dispatch also supports build_variant=exp
+# or rc. E2E_PERFORMANCE_BUILD_VARIANT=rc is set separately in
+# performance-test-runner for the flags API. See "CI Triggers".
 #
 # Android BrowserStack dual builds (main-e2e-bs-*) follow the same fingerprint
 # procedure as Detox E2E (build-android-e2e.yml), via find-reusable-build in
@@ -620,6 +644,26 @@ What gets sent per scenario:
 - Each test timer as a numeric measurement (duration in milliseconds)
 - Scenario metadata (test name, project, tags, team, retry, worker)
 - Timer details (thresholds and pass/fail validation) in `extra.timer_steps`
+- RC track-only tags when running release builds: `ci_build_variant`,
+  `release_version`, `github_ref`, `github_run_id`, `tracking_mode=observe`
+
+### RC performance tracking (observe-only)
+
+RC performance E2E is available through manual dispatch of
+`run-performance-e2e-manual.yml` against a `release/*` branch with
+`build_variant=rc`. This path is **track-only** (does not block the release):
+
+- Uploads scenario + profiling metrics to the **test** Sentry project by default
+  (`sentry_target: test`)
+- Tags events with `ci_build_variant:rc` and `release_version` (from
+  `release/X.Y.Z`) so RC runs are filterable in Discover
+- Slack summary is labeled `RC <version> (track-only)`
+
+Filter example in Sentry:
+
+```text
+ci_build_variant:rc release_version:7.58.0
+```
 
 ## Reports and Metrics
 
diff --git a/tests/performance/login/asset-balances.spec.ts b/tests/performance/login/asset-balances.spec.ts
index 5bb74a6f69da..ce180aaa2be0 100644
--- a/tests/performance/login/asset-balances.spec.ts
+++ b/tests/performance/login/asset-balances.spec.ts
@@ -5,10 +5,13 @@ import TimerHelper from '../../framework/TimerHelper';
 import WalletView from '../../page-objects/wallet/WalletView';
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 
-import { System, PerformanceAssetLoading } from '../../tags.performance.js';
+import {
+  Performance,
+  PerformanceAssetLoading,
+} from '../../tags.performance.js';
 
 /* Scenario: Aggregated Balance Loading Time, SRP 1 + SRP 2 + SRP 3 */
-test.describe(`${System} ${PerformanceAssetLoading}`, () => {
+test.describe(`${Performance} ${PerformanceAssetLoading}`, () => {
   test(
     'Aggregated Balance Loading Time, SRP 1 + SRP 2 + SRP 3',
     { tag: '@assets-dev-team' },
diff --git a/tests/performance/login/cross-chain-swap-flow.spec.ts b/tests/performance/login/cross-chain-swap-flow.spec.ts
index 14d44269d971..228c87bd88f9 100644
--- a/tests/performance/login/cross-chain-swap-flow.spec.ts
+++ b/tests/performance/login/cross-chain-swap-flow.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '../../framework/fixtures/playwright';
 import TimerHelper from '../../framework/TimerHelper.js';
-import { System, PerformanceSwaps } from '../../tags.performance.js';
+import { Performance, PerformanceSwaps } from '../../tags.performance.js';
 import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
 import { asPlaywrightElement, PlaywrightAssertions } from '../../framework';
 import WalletView from '../../page-objects/wallet/WalletView.js';
@@ -8,7 +8,7 @@ import QuoteView from '../../page-objects/swaps/QuoteView.js';
 import { checkSwapActivity } from '../../helpers/swap/swap-unified-ui';
 
 /* Scenario 7: Cross-chain swap flow - ETH to SOL - 50+ accounts, SRP 1 + SRP 2 + SRP 3 */
-test.describe(`${System} ${PerformanceSwaps}`, () => {
+test.describe(`${Performance} ${PerformanceSwaps}`, () => {
   test(
     'Cross-chain swap flow - ETH to SOL - 50+ accounts, SRP 1 + SRP 2 + SRP 3',
     { tag: '@swap-bridge-dev-team' },
diff --git a/tests/performance/login/eth-swap-flow.spec.ts b/tests/performance/login/eth-swap-flow.spec.ts
index 40429e1eeb82..90e5b900357d 100644
--- a/tests/performance/login/eth-swap-flow.spec.ts
+++ b/tests/performance/login/eth-swap-flow.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '../../framework/fixtures/playwright';
 import TimerHelper from '../../framework/TimerHelper';
-import { System, PerformanceSwaps } from '../../tags.performance.js';
+import { Performance, PerformanceSwaps } from '../../tags.performance.js';
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import WalletView from '../../page-objects/wallet/WalletView';
 import QuoteView from '../../page-objects/swaps/QuoteView';
@@ -8,7 +8,7 @@ import { checkSwapActivity } from '../../helpers/swap/swap-unified-ui';
 import { aiVisualTest, createTestConfig } from '../../framework/ai-visual';
 
 /* Scenario 6: Swap flow - ETH to LINK, SRP 1 + SRP 2 + SRP 3 */
-test.describe(`${System} ${PerformanceSwaps}`, () => {
+test.describe(`${Performance} ${PerformanceSwaps}`, () => {
   test(
     'Swap flow - ETH to LINK, SRP 1 + SRP 2 + SRP 3',
     { tag: '@swap-bridge-dev-team' },
diff --git a/tests/performance/login/import-multiple-srps.spec.ts b/tests/performance/login/import-multiple-srps.spec.ts
index 53157900836f..1fce85c03fd1 100644
--- a/tests/performance/login/import-multiple-srps.spec.ts
+++ b/tests/performance/login/import-multiple-srps.spec.ts
@@ -6,10 +6,10 @@ import ImportWalletView from '../../page-objects/Onboarding/ImportWalletView';
 import AddAccountBottomSheet from '../../page-objects/wallet/AddAccountBottomSheet';
 import AccountListBottomSheet from '../../page-objects/wallet/AccountListBottomSheet';
 import WalletView from '../../page-objects/wallet/WalletView';
-import { PerformanceAccountList } from '../../tags.performance.js';
+import { Performance, PerformanceAccountList } from '../../tags.performance.js';
 import PlaywrightGestures from '../../framework/PlaywrightGestures';
 /* Scenario 4: Import SRP with +50 accounts, SRP 1, SRP 2, SRP 3 */
-perfTest.describe(PerformanceAccountList, () => {
+perfTest.describe(`${Performance} ${PerformanceAccountList}`, () => {
   perfTest.setTimeout(30 * 60 * 1000);
   perfTest(
     'Import SRP with +50 accounts, SRP 1, SRP 2, SRP 3',
diff --git a/tests/performance/login/uniswap-interaction.spec.ts b/tests/performance/login/uniswap-interaction.spec.ts
index fa36dcf007bc..7058e7096ed5 100644
--- a/tests/performance/login/uniswap-interaction.spec.ts
+++ b/tests/performance/login/uniswap-interaction.spec.ts
@@ -2,9 +2,11 @@ import { test as perfTest } from '../../framework/fixtures/playwright';
 import TimerHelper from '../../framework/TimerHelper';
 import UniswapDapp from '../../page-objects/MMConnect/UniswapDapp';
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal';
-import { unlockIfLockScreenVisible } from '../../page-objects/MMConnect/unlockHelpers';
 import { PerformanceLogin } from '../../tags.performance.js';
-import { loginToAppPlaywright } from '../../flows/wallet.flow';
+import {
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow';
 import PlaywrightContextHelpers from '../../framework/PlaywrightContextHelpers';
 import {
   launchMobileBrowser,
diff --git a/tests/performance/onboarding/helpers/seedlessOnboardingTimers.ts b/tests/performance/onboarding/helpers/seedlessOnboardingTimers.ts
new file mode 100644
index 000000000000..225f84267060
--- /dev/null
+++ b/tests/performance/onboarding/helpers/seedlessOnboardingTimers.ts
@@ -0,0 +1,88 @@
+import TimerHelper from '../../../framework/TimerHelper';
+import { asPlaywrightElement, PlaywrightAssertions } from '../../../framework';
+import OnboardingInterestQuestionnaireView from '../../../page-objects/Onboarding/OnboardingInterestQuestionnaireView';
+import OnboardingSuccessView from '../../../page-objects/Onboarding/OnboardingSuccessView';
+import PredictModalView from '../../../page-objects/Predict/PredictModalView';
+
+const waitForFirstSuccessful = async <T>(promises: Promise<T>[]): Promise<T> =>
+  await new Promise<T>((resolve, reject) => {
+    let rejectedCount = 0;
+
+    promises.forEach((promise) => {
+      promise.then(resolve).catch(() => {
+        rejectedCount += 1;
+        if (rejectedCount === promises.length) {
+          reject(new Error('All screen detection promises failed'));
+        }
+      });
+    });
+  });
+
+const expectSuccessDoneVisible = async (): Promise<void> => {
+  await PlaywrightAssertions.expectElementToBeVisible(
+    asPlaywrightElement(OnboardingSuccessView.doneButton),
+    {
+      description: 'Onboarding success done button should be visible',
+    },
+  );
+};
+
+/**
+ * After Create Password tap: measure Create Password → Onboarding Success Done.
+ * Success-first (no survey): timer records the full create → success latency.
+ * Questionnaire-first: skip is untimed after the race; timer is re-measured for
+ * post-skip → success only (survey time is not kept in the recorded duration).
+ */
+export async function measureCreatePasswordToOnboardingSuccess(
+  timer: TimerHelper,
+): Promise<void> {
+  let questionnaireFirst = false;
+
+  await timer.measure(async () => {
+    const next = await waitForFirstSuccessful([
+      PlaywrightAssertions.expectElementToBeVisible(
+        asPlaywrightElement(OnboardingInterestQuestionnaireView.skipButton),
+        {
+          description: 'Interest questionnaire Skip should be visible',
+        },
+      ).then(() => 'questionnaire' as const),
+      expectSuccessDoneVisible().then(() => 'success' as const),
+    ]);
+
+    if (next === 'questionnaire') {
+      questionnaireFirst = true;
+    }
+  });
+
+  if (questionnaireFirst) {
+    await OnboardingInterestQuestionnaireView.tapSkipButton();
+    // Overwrites the race-to-questionnaire duration with post-skip → success only.
+    await timer.measure(async () => {
+      await expectSuccessDoneVisible();
+    });
+  }
+}
+
+/**
+ * Measures Done → Predict GTM "Not now" when the modal appears.
+ * Returns false when the modal is absent (flag/config off) without failing the test.
+ * Does not pre-wait before measuring (avoids collapsing timer5 to ~0ms).
+ */
+export async function measurePredictGtmModalIfShown(
+  timer: TimerHelper,
+): Promise<boolean> {
+  try {
+    await timer.measure(async () => {
+      await PlaywrightAssertions.expectElementToBeVisible(
+        asPlaywrightElement(PredictModalView.notNowButton),
+        {
+          timeout: 10000,
+          description: 'Predict modal should be visible',
+        },
+      );
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
diff --git a/tests/performance/onboarding/import-wallet.spec.ts b/tests/performance/onboarding/import-wallet.spec.ts
index f78a62e20ad2..5fe78f601066 100644
--- a/tests/performance/onboarding/import-wallet.spec.ts
+++ b/tests/performance/onboarding/import-wallet.spec.ts
@@ -27,7 +27,7 @@ import WalletView from '../../page-objects/wallet/WalletView.js';
 const testEnvironment = 'test'; // hard coding this for now. We need a new FF env in LD for e2e. An admin needs to create it..
 
 /* Scenario 4: Imported wallet with +50 accounts */
-test.describe(PerformanceOnboarding, () => {
+test.describe(`${Performance} ${PerformanceOnboarding}`, () => {
   test(
     'Onboarding Import SRP with +50 accounts, SRP 3',
     { tag: '@metamask-onboarding-team' },
diff --git a/tests/performance/onboarding/seedless-apple-onboarding.spec.ts b/tests/performance/onboarding/seedless-apple-onboarding.spec.ts
index 5798de9a7ecf..da4da8d057a4 100644
--- a/tests/performance/onboarding/seedless-apple-onboarding.spec.ts
+++ b/tests/performance/onboarding/seedless-apple-onboarding.spec.ts
@@ -6,11 +6,7 @@ import {
   PlaywrightGestures,
 } from '../../framework';
 import { getPasswordForScenario } from '../../framework/utils/TestConstants.js';
-import {
-  dismissOnboardingInterestQuestionnaire,
-  dismisspredictionsModalPlaywright,
-  dismissPushNotificationExistingUserSheet,
-} from '../../flows/wallet.flow';
+import { dismisspredictionsModalPlaywright } from '../../flows/wallet.flow';
 import {
   Performance,
   System,
@@ -21,9 +17,13 @@ import OnboardingSheet from '../../page-objects/Onboarding/OnboardingSheet';
 import SocialLoginView from '../../page-objects/Onboarding/SocialLoginView';
 import CreatePasswordView from '../../page-objects/Onboarding/CreatePasswordView';
 import OnboardingSuccessView from '../../page-objects/Onboarding/OnboardingSuccessView';
-import PredictModalView from '../../page-objects/Predict/PredictModalView';
 import WalletView from '../../page-objects/wallet/WalletView';
 import LoginView from '../../page-objects/wallet/LoginView';
+import {
+  measureCreatePasswordToOnboardingSuccess,
+  measurePredictGtmModalIfShown,
+} from './helpers/seedlessOnboardingTimers';
+
 const waitForFirstSuccessful = async <T>(promises: Promise<T>[]): Promise<T> =>
   await new Promise<T>((resolve, reject) => {
     let rejectedCount = 0;
@@ -40,7 +40,7 @@ const waitForFirstSuccessful = async <T>(promises: Promise<T>[]): Promise<T> =>
 
 /* Seedless Onboarding: Apple Login */
 test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
-  test.setTimeout(240000);
+  test.setTimeout(300000);
 
   test(
     'Seedless Onboarding: Apple Login New User',
@@ -134,27 +134,13 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
         }
         await PlaywrightGestures.hideKeyboard();
         await CreatePasswordView.tapCreatePasswordButton();
+        await measureCreatePasswordToOnboardingSuccess(timer4);
 
-        await timer4.measure(async () => {
-          await PlaywrightAssertions.expectElementToBeVisible(
-            asPlaywrightElement(OnboardingSuccessView.doneButton),
-            {
-              description: 'Onboarding success done button should be visible',
-            },
-          );
-        });
-        await dismissOnboardingInterestQuestionnaire();
         await OnboardingSuccessView.tapDone();
-        await dismissPushNotificationExistingUserSheet();
-        await timer5.measure(async () => {
-          await PlaywrightAssertions.expectElementToBeVisible(
-            asPlaywrightElement(PredictModalView.notNowButton),
-            {
-              timeout: 10000,
-              description: 'Predict modal should be visible',
-            },
-          );
-        });
+
+        // Optional Predict GTM: measure Done → modal when present (no pre-wait).
+        const predictGtmOnboardingModalEnabled =
+          await measurePredictGtmModalIfShown(timer5);
 
         await dismisspredictionsModalPlaywright();
         await timer6.measure(async () => {
@@ -166,10 +152,14 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
           );
         });
 
-        const timers = [timer1, timer2, timer4, timer5, timer6];
+        const timers = [timer1, timer2, timer4];
         if (currentDeviceDetails.platform === 'ios') {
           timers.splice(2, 0, timer3);
         }
+        if (predictGtmOnboardingModalEnabled) {
+          timers.push(timer5);
+        }
+        timers.push(timer6);
         performanceTracker.addTimers(...timers);
       } else {
         await SocialLoginView.tapAccountFoundLoginButton();
diff --git a/tests/performance/onboarding/seedless-google-onboarding.spec.ts b/tests/performance/onboarding/seedless-google-onboarding.spec.ts
index e2e480d3e836..818d9345a477 100644
--- a/tests/performance/onboarding/seedless-google-onboarding.spec.ts
+++ b/tests/performance/onboarding/seedless-google-onboarding.spec.ts
@@ -7,7 +7,6 @@ import {
 } from '../../framework';
 import { getPasswordForScenario } from '../../framework/utils/TestConstants.js';
 import {
-  dismissOnboardingInterestQuestionnaire,
   dismisspredictionsModalPlaywright,
   dismissPushNotificationExistingUserSheet,
 } from '../../flows/wallet.flow';
@@ -21,9 +20,12 @@ import OnboardingSheet from '../../page-objects/Onboarding/OnboardingSheet';
 import SocialLoginView from '../../page-objects/Onboarding/SocialLoginView';
 import CreatePasswordView from '../../page-objects/Onboarding/CreatePasswordView';
 import OnboardingSuccessView from '../../page-objects/Onboarding/OnboardingSuccessView';
-import PredictModalView from '../../page-objects/Predict/PredictModalView';
 import WalletView from '../../page-objects/wallet/WalletView';
 import LoginView from '../../page-objects/wallet/LoginView';
+import {
+  measureCreatePasswordToOnboardingSuccess,
+  measurePredictGtmModalIfShown,
+} from './helpers/seedlessOnboardingTimers';
 
 const waitForFirstSuccessful = async <T>(promises: Promise<T>[]): Promise<T> =>
   await new Promise<T>((resolve, reject) => {
@@ -41,7 +43,7 @@ const waitForFirstSuccessful = async <T>(promises: Promise<T>[]): Promise<T> =>
 
 /* Seedless Onboarding: Google Login */
 test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
-  test.setTimeout(240000);
+  test.setTimeout(360000);
 
   test(
     'Seedless Onboarding: Google Login New User',
@@ -134,28 +136,14 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
           console.error('Error ensuring marketing opt-in checked:', error);
         }
         await CreatePasswordView.tapCreatePasswordButton();
+        await measureCreatePasswordToOnboardingSuccess(timer4);
 
-        await timer4.measure(async () => {
-          await PlaywrightAssertions.expectElementToBeVisible(
-            asPlaywrightElement(OnboardingSuccessView.doneButton),
-            {
-              description: 'Onboarding success done button should be visible',
-            },
-          );
-        });
-
-        await dismissOnboardingInterestQuestionnaire();
         await OnboardingSuccessView.tapDone();
         await dismissPushNotificationExistingUserSheet();
-        await timer5.measure(async () => {
-          await PlaywrightAssertions.expectElementToBeVisible(
-            asPlaywrightElement(PredictModalView.notNowButton),
-            {
-              timeout: 10000,
-              description: 'Predict modal should be visible',
-            },
-          );
-        });
+
+        // Optional Predict GTM: measure Done → modal when present (no pre-wait).
+        const predictGtmOnboardingModalEnabled =
+          await measurePredictGtmModalIfShown(timer5);
 
         await dismisspredictionsModalPlaywright();
         await timer6.measure(async () => {
@@ -167,10 +155,14 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
           );
         });
 
-        const timers = [timer1, timer2, timer4, timer5, timer6];
+        const timers = [timer1, timer2, timer4];
         if (currentDeviceDetails.platform === 'ios') {
           timers.splice(2, 0, timer3);
         }
+        if (predictGtmOnboardingModalEnabled) {
+          timers.push(timer5);
+        }
+        timers.push(timer6);
         performanceTracker.addTimers(...timers);
       } else {
         await SocialLoginView.tapAccountFoundLoginButton();
diff --git a/tests/performance/onboarding/seedless-telegram-onboarding.spec.ts b/tests/performance/onboarding/seedless-telegram-onboarding.spec.ts
index 735725dc6a29..bbfa4010f288 100644
--- a/tests/performance/onboarding/seedless-telegram-onboarding.spec.ts
+++ b/tests/performance/onboarding/seedless-telegram-onboarding.spec.ts
@@ -7,7 +7,6 @@ import {
 } from '../../framework';
 import { getPasswordForScenario } from '../../framework/utils/TestConstants.js';
 import {
-  dismissOnboardingInterestQuestionnaire,
   dismisspredictionsModalPlaywright,
   dismissPushNotificationExistingUserSheet,
 } from '../../flows/wallet.flow';
@@ -21,9 +20,12 @@ import OnboardingSheet from '../../page-objects/Onboarding/OnboardingSheet';
 import SocialLoginView from '../../page-objects/Onboarding/SocialLoginView';
 import CreatePasswordView from '../../page-objects/Onboarding/CreatePasswordView';
 import OnboardingSuccessView from '../../page-objects/Onboarding/OnboardingSuccessView';
-import PredictModalView from '../../page-objects/Predict/PredictModalView';
 import WalletView from '../../page-objects/wallet/WalletView';
 import LoginView from '../../page-objects/wallet/LoginView';
+import {
+  measureCreatePasswordToOnboardingSuccess,
+  measurePredictGtmModalIfShown,
+} from './helpers/seedlessOnboardingTimers';
 
 const waitForFirstSuccessful = async <T>(promises: Promise<T>[]): Promise<T> =>
   await new Promise<T>((resolve, reject) => {
@@ -65,7 +67,7 @@ const assertTelegramLoginReady = async (): Promise<void> => {
 
 /* TO-916: Seedless Onboarding — Telegram Login */
 perfTest.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
-  perfTest.setTimeout(240000);
+  perfTest.setTimeout(300000);
 
   perfTest(
     'Seedless Onboarding: Telegram Login New User',
@@ -165,28 +167,14 @@ perfTest.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
           console.error('Error ensuring marketing opt-in checked:', error);
         }
         await CreatePasswordView.tapCreatePasswordButton();
+        await measureCreatePasswordToOnboardingSuccess(timer4);
 
-        await timer4.measure(async () => {
-          await PlaywrightAssertions.expectElementToBeVisible(
-            asPlaywrightElement(OnboardingSuccessView.doneButton),
-            {
-              description: 'Onboarding success done button should be visible',
-            },
-          );
-        });
-
-        await dismissOnboardingInterestQuestionnaire();
         await OnboardingSuccessView.tapDone();
         await dismissPushNotificationExistingUserSheet();
-        await timer5.measure(async () => {
-          await PlaywrightAssertions.expectElementToBeVisible(
-            asPlaywrightElement(PredictModalView.notNowButton),
-            {
-              timeout: 10000,
-              description: 'Predict modal should be visible',
-            },
-          );
-        });
+
+        // Optional Predict GTM: measure Done → modal when present (no pre-wait).
+        const predictGtmOnboardingModalEnabled =
+          await measurePredictGtmModalIfShown(timer5);
 
         await dismisspredictionsModalPlaywright();
         await timer6.measure(async () => {
@@ -198,10 +186,14 @@ perfTest.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
           );
         });
 
-        const timers = [timer1, timer2, timer4, timer5, timer6];
+        const timers = [timer1, timer2, timer4];
         if (currentDeviceDetails.platform === 'ios') {
           timers.splice(2, 0, timer3);
         }
+        if (predictGtmOnboardingModalEnabled) {
+          timers.push(timer5);
+        }
+        timers.push(timer6);
         performanceTracker.addTimers(...timers);
       } else {
         // Existing-user rehydration when the QA mock / account returns Account Found.
diff --git a/tests/playwright.smoke-appium.config.ts b/tests/playwright.smoke-appium.config.ts
index 4896afcec182..20b4de7dcbc5 100644
--- a/tests/playwright.smoke-appium.config.ts
+++ b/tests/playwright.smoke-appium.config.ts
@@ -56,8 +56,13 @@ const junitReportPath = suiteName
   : './test-reports/appium-smoke-junit.xml';
 const jsonReportPath = process.env.PLAYWRIGHT_JSON_OUTPUT_FILE?.trim();
 
+// OpenRPC api-specs are colocated under smoke-appium/api-specs but must not run
+// as part of Appium smoke tag suites.
+const includeApiSpecs = process.env.APPIUM_RUN_API_SPECS === '1';
+
 export default defineConfig({
   testDir: './smoke-appium',
+  ...(includeApiSpecs ? {} : { testIgnore: ['**/api-specs/**'] as const }),
   fullyParallel: false,
   // Per-test timeout: cold WDA build on CI can take up to 10 min plus test time.
   timeout: 15 * 60 * 1000,
@@ -66,6 +71,7 @@ export default defineConfig({
     ['html', { open: 'never', outputFolder: htmlReportDir }],
     ['junit', { outputFile: junitReportPath }],
     ['list'],
+    ['./reporters/appium-timing-reporter.ts'],
     ...(jsonReportPath
       ? ([['json', { outputFile: jsonReportPath }] as const] as const)
       : []),
diff --git a/tests/reporters/DetoxPerformanceTestReporter.ts b/tests/reporters/DetoxPerformanceTestReporter.ts
deleted file mode 100644
index fa830f277798..000000000000
--- a/tests/reporters/DetoxPerformanceTestReporter.ts
+++ /dev/null
@@ -1,291 +0,0 @@
-/* eslint-disable no-console, import-x/no-nodejs-modules */
-import fs from 'fs';
-import path from 'path';
-
-// Custom error that carries performance data
-export class PerformanceTestError extends Error {
-  public readonly performanceData: Partial<TestResult>;
-
-  constructor(message: string, performanceData: Partial<TestResult>) {
-    super(message);
-    this.name = 'PerformanceTestError';
-    this.performanceData = performanceData;
-  }
-}
-
-// Test results storage
-export interface TestResult {
-  testName: string;
-  userProfile: string;
-  platform: string;
-  totalTime: number;
-  status: 'PASSED' | 'FAILED';
-  error?: string;
-  timestamp: string;
-  thresholds: {
-    totalTime: number;
-  };
-  metadata?: {
-    testType?: string;
-    measuredMetrics?: {
-      totalTime: boolean;
-    };
-  };
-}
-
-export interface TestSuiteResults {
-  suiteName: string;
-  startTime: string;
-  endTime: string;
-  platform: string;
-  totalTests: number;
-  passedTests: number;
-  failedTests: number;
-  results: TestResult[];
-}
-
-export class PerformanceTestReporter {
-  private testSuiteResults: TestSuiteResults;
-
-  constructor(suiteName: string) {
-    this.testSuiteResults = {
-      suiteName,
-      startTime: new Date().toISOString(),
-      endTime: '',
-      platform: device.getPlatform().toUpperCase(),
-      totalTests: 0,
-      passedTests: 0,
-      failedTests: 0,
-      results: [],
-    };
-  }
-
-  /**
-   * Initialize the test suite
-   */
-  initializeSuite(): void {
-    console.warn(
-      `\n🚀 STARTING ${this.testSuiteResults.suiteName.toUpperCase()}`,
-    );
-    console.warn(`📱 Platform: ${this.testSuiteResults.platform}`);
-    console.warn(`⏰ Start Time: ${this.testSuiteResults.startTime}`);
-    console.warn('='.repeat(60));
-  }
-
-  /**
-   * Finalize the test suite and save results
-   */
-  finalizeSuite(): void {
-    this.testSuiteResults.endTime = new Date().toISOString();
-    this.saveTestResults();
-    console.warn(
-      `\n🏁 FINISHED ${this.testSuiteResults.suiteName.toUpperCase()}`,
-    );
-    console.warn(`⏰ End Time: ${this.testSuiteResults.endTime}`);
-    console.warn('='.repeat(60));
-  }
-
-  /**
-   * Convert milliseconds to seconds with 2 decimal places
-   */
-  private msToSeconds(ms: number): number {
-    return Math.round((ms / 1000) * 100) / 100;
-  }
-
-  /**
-   * Add a passed test result
-   */
-  addPassedTest(
-    testName: string,
-    userProfile: string,
-    result: Partial<TestResult>,
-    _duration: number,
-  ): void {
-    // Handle tests that don't measure navigation/render times
-
-    const testResult: TestResult = {
-      testName,
-      userProfile,
-      platform: this.testSuiteResults.platform,
-      totalTime: this.msToSeconds(result.totalTime || 0),
-      status: 'PASSED',
-      timestamp: new Date().toISOString(),
-      thresholds: {
-        totalTime: this.msToSeconds(result.thresholds?.totalTime || 0),
-      },
-    };
-
-    this.testSuiteResults.results.push(testResult);
-    this.testSuiteResults.passedTests++;
-    this.testSuiteResults.totalTests++;
-  }
-
-  /**
-   * Add a failed test result
-   */
-  addFailedTest(
-    testName: string,
-    userProfile: string,
-    error: unknown,
-    duration: number,
-  ): void {
-    let performanceData: Partial<TestResult> = {};
-
-    // If it's our custom PerformanceTestError, use the embedded performance data
-    if (error instanceof PerformanceTestError) {
-      performanceData = error.performanceData;
-    } else if (
-      error instanceof Error &&
-      error.message.includes('Performance test failed')
-    ) {
-      // Fallback: Extract performance time from error message (temporary console.warn)
-      const timeMatch = error.message.match(/Total time \((\d+)ms\)/);
-      const thresholdMatch = error.message.match(
-        /maximum acceptable time \((\d+)ms\)/,
-      );
-
-      if (timeMatch) {
-        performanceData.totalTime = parseInt(timeMatch[1], 10);
-      }
-      if (thresholdMatch) {
-        performanceData.thresholds = {
-          totalTime: parseInt(thresholdMatch[1], 10),
-        };
-      }
-    }
-
-    const testResult: TestResult = {
-      testName,
-      userProfile,
-      platform: this.testSuiteResults.platform,
-      totalTime: this.msToSeconds(performanceData.totalTime || duration),
-      status: 'FAILED',
-      error: error instanceof Error ? error.message : String(error),
-      timestamp: new Date().toISOString(),
-      thresholds: {
-        totalTime: this.msToSeconds(performanceData.thresholds?.totalTime || 0),
-      },
-    };
-
-    this.testSuiteResults.results.push(testResult);
-    this.testSuiteResults.failedTests++;
-    this.testSuiteResults.totalTests++;
-  }
-
-  /**
-   * Save test results to JSON file
-   */
-  private saveTestResults(): void {
-    const performanceDir = path.join(__dirname, '..', 'smoke', 'performance');
-    const reportsDir = path.join(performanceDir, 'reports');
-    const outputFile = path.join(
-      reportsDir,
-      `${this.testSuiteResults.suiteName
-        .toLowerCase()
-        .replace(/\s+/g, '-')}-performance-results.json`,
-    );
-
-    try {
-      // Ensure reports directory exists
-      if (!fs.existsSync(reportsDir)) {
-        fs.mkdirSync(reportsDir, { recursive: true });
-      }
-
-      fs.writeFileSync(
-        outputFile,
-        JSON.stringify(this.testSuiteResults, null, 2),
-      );
-      console.warn(`📊 Test results saved to: ${outputFile}`);
-    } catch (error) {
-      console.error(`Failed to save test results: ${error}`);
-    }
-  }
-
-  /**
-   * Get current test suite results
-   */
-  getTestSuiteResults(): TestSuiteResults {
-    return this.testSuiteResults;
-  }
-}
-
-/**
- * Helper function to create test iterations for different user profiles
- */
-export const createUserProfileTests = (
-  testName: string,
-  testFunction: (userState: unknown) => Promise<Partial<TestResult>>,
-  userStates: { name: string; state: unknown }[],
-  reporter: PerformanceTestReporter,
-) => {
-  userStates.forEach(({ name, state }, index) => {
-    it(`${testName} - ${name}`, async () => {
-      // Use console.warn to ensure visibility in test output
-      console.warn(
-        `\n🚀 STARTING TEST BLOCK ${index + 1}/${
-          userStates.length
-        }: ${testName} - ${name}`,
-      );
-      console.warn(`📊 Test Details: ${testName} - ${name}`);
-      console.warn(`⏰ Start Time: ${new Date().toISOString()}`);
-
-      const startTime = Date.now();
-
-      try {
-        const result = await testFunction(state);
-        const endTime = Date.now();
-        const duration = endTime - startTime;
-
-        // Add passed test result
-        reporter.addPassedTest(testName, name, result, duration);
-
-        console.warn(
-          `TEST BLOCK ${index + 1}/${
-            userStates.length
-          } PASSED: ${testName} - ${name}`,
-        );
-        console.warn(`⏱️  Performance Time: ${result.totalTime}ms`);
-        console.warn(`🏗️  Test Execution Duration: ${duration}ms`);
-        console.warn(`⏰ End Time: ${new Date().toISOString()}`);
-      } catch (error) {
-        const endTime = Date.now();
-        const duration = endTime - startTime;
-
-        // For performance failures, try to extract actual measured time from error
-        // This provides more accurate reporting than total test execution time
-        reporter.addFailedTest(testName, name, error, duration);
-
-        console.error(
-          `TEST BLOCK ${index + 1}/${
-            userStates.length
-          } FAILED: ${testName} - ${name}`,
-        );
-        console.error(`🏗️  Test Execution Duration: ${duration}ms`);
-
-        // Log the actual performance time if available
-        if (error instanceof PerformanceTestError) {
-          console.error(
-            `⚡ Actual Performance Time: ${error.performanceData.totalTime}ms`,
-          );
-          console.error(
-            `🎯 Performance Threshold: ${error.performanceData.thresholds?.totalTime}ms`,
-          );
-        } else if (
-          error instanceof Error &&
-          error.message.includes('Performance test failed')
-        ) {
-          const timeMatch = error.message.match(/Total time \((\d+)ms\)/);
-          if (timeMatch) {
-            console.error(`⚡ Actual Performance Time: ${timeMatch[1]}ms`);
-          }
-        }
-
-        console.error(
-          `💥 Error: ${error instanceof Error ? error.message : String(error)}`,
-        );
-
-        throw error;
-      }
-    });
-  });
-};
diff --git a/tests/reporters/README.md b/tests/reporters/README.md
index 96ee5e757de3..912f3d5538ca 100644
--- a/tests/reporters/README.md
+++ b/tests/reporters/README.md
@@ -8,7 +8,6 @@ Architecture for the performance test reporting system.
 tests/reporters/
 ├── PerformanceReporter.ts              # Main Playwright reporter (entry point)
 ├── PerformanceTracker.ts               # Timer management + metrics attachment
-├── DetoxPerformanceTestReporter.ts     # Detox reporter (independent, untouched)
 ├── types.ts                            # Shared TypeScript types
 ├── providers/
 │   ├── SessionDataEnricher.ts          # Interface for provider-agnostic enrichment
diff --git a/tests/reporters/appium-timing-reporter.ts b/tests/reporters/appium-timing-reporter.ts
new file mode 100644
index 000000000000..0e21d120c048
--- /dev/null
+++ b/tests/reporters/appium-timing-reporter.ts
@@ -0,0 +1,116 @@
+/* eslint-disable import-x/no-nodejs-modules */
+/**
+ * Collects Appium phase-timing attachments into a suite JSON artifact.
+ *
+ * Output: tests/test-reports/appium-timings/<suite|local>.json
+ */
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { Buffer } from 'node:buffer';
+import type {
+  FullConfig,
+  FullResult,
+  Reporter,
+  Suite,
+  TestCase,
+  TestResult,
+} from '@playwright/test/reporter';
+import { PHASE_TIMINGS_ATTACHMENT_NAME } from '../framework/telemetry/PhaseTimer.ts';
+
+// Repo-root relative: yarn scripts always run from the repository root.
+const testsRoot = join(process.cwd(), 'tests');
+
+interface PhaseTimingEntry {
+  phases: Record<string, number>;
+  meta: Record<string, unknown>;
+  outcome: string;
+  retry: number;
+  durationMs: number;
+  title: string;
+  file: string;
+  projectName?: string;
+}
+
+export default class AppiumTimingReporter implements Reporter {
+  #entries: PhaseTimingEntry[] = [];
+  #outputPath: string | undefined;
+
+  onBegin(_config: FullConfig, _suite: Suite): void {
+    const suiteName = process.env.APPIUM_SMOKE_SUITE_NAME?.trim() || 'local';
+    const outDir = join(testsRoot, 'test-reports', 'appium-timings');
+    mkdirSync(outDir, { recursive: true });
+    this.#outputPath = join(outDir, `${suiteName}.json`);
+  }
+
+  onTestEnd(test: TestCase, result: TestResult): void {
+    const attachment = result.attachments.find(
+      (a) => a.name === PHASE_TIMINGS_ATTACHMENT_NAME,
+    );
+    if (!attachment) {
+      return;
+    }
+
+    let parsed: {
+      phases?: Record<string, number>;
+      meta?: Record<string, unknown>;
+    } | null = null;
+    try {
+      if (attachment.body) {
+        const text =
+          typeof attachment.body === 'string'
+            ? attachment.body
+            : Buffer.from(attachment.body).toString('utf8');
+        parsed = JSON.parse(text) as {
+          phases?: Record<string, number>;
+          meta?: Record<string, unknown>;
+        };
+      } else if (attachment.path) {
+        return;
+      }
+    } catch {
+      return;
+    }
+
+    if (!parsed || typeof parsed !== 'object') {
+      return;
+    }
+
+    this.#entries.push({
+      phases: parsed.phases ?? {},
+      meta: {
+        ...(parsed.meta ?? {}),
+        outcome: result.status,
+        retry: result.retry,
+      },
+      outcome: result.status,
+      retry: result.retry,
+      durationMs: result.duration,
+      title: test.title,
+      file: test.location.file,
+      projectName: test.parent?.project()?.name,
+    });
+  }
+
+  onEnd(result: FullResult): void {
+    if (!this.#outputPath) {
+      return;
+    }
+
+    const suiteName = process.env.APPIUM_SMOKE_SUITE_NAME?.trim() || 'local';
+    const payload = {
+      schemaVersion: 1,
+      suite: suiteName,
+      status: result.status,
+      generatedAt: new Date().toISOString(),
+      runId: process.env.GITHUB_RUN_ID,
+      job: process.env.APPIUM_SMOKE_JOB_TITLE,
+      tests: this.#entries,
+    };
+
+    writeFileSync(
+      this.#outputPath,
+      `${JSON.stringify(payload, null, 2)}\n`,
+      'utf8',
+    );
+  }
+}
diff --git a/tests/reporters/providers/sentry/PerformanceSentryPublisher.test.ts b/tests/reporters/providers/sentry/PerformanceSentryPublisher.test.ts
index 24405efff994..4533de1f0671 100644
--- a/tests/reporters/providers/sentry/PerformanceSentryPublisher.test.ts
+++ b/tests/reporters/providers/sentry/PerformanceSentryPublisher.test.ts
@@ -66,17 +66,34 @@ describe('PerformanceSentryPublisher', () => {
     process.env.E2E_PERFORMANCE_SENTRY_SAMPLE_RATE;
   const originalSentryEnabled = process.env.E2E_PERFORMANCE_SENTRY_ENABLED;
   const originalBuildVariant = process.env.E2E_PERFORMANCE_BUILD_VARIANT;
+  const originalCiBuildVariant = process.env.E2E_PERFORMANCE_CI_BUILD_VARIANT;
+  const originalPerformanceGithubRef =
+    process.env.E2E_PERFORMANCE_GITHUB_REF_NAME;
+  const originalReleaseVersion = process.env.E2E_PERFORMANCE_RELEASE_VERSION;
+  const originalGithubRefName = process.env.GITHUB_REF_NAME;
   const originalGithubServerUrl = process.env.GITHUB_SERVER_URL;
   const originalGithubRepository = process.env.GITHUB_REPOSITORY;
   const originalGithubRunId = process.env.GITHUB_RUN_ID;
   const originalGithubJob = process.env.GITHUB_JOB;
 
+  const restoreEnv = (key: string, original: string | undefined) => {
+    if (original === undefined) {
+      delete process.env[key];
+    } else {
+      process.env[key] = original;
+    }
+  };
+
   beforeEach(() => {
     jest.clearAllMocks();
     delete process.env.E2E_PERFORMANCE_SENTRY_DSN;
     delete process.env.E2E_PERFORMANCE_SENTRY_SAMPLE_RATE;
     delete process.env.E2E_PERFORMANCE_SENTRY_ENABLED;
     delete process.env.E2E_PERFORMANCE_BUILD_VARIANT;
+    delete process.env.E2E_PERFORMANCE_CI_BUILD_VARIANT;
+    delete process.env.E2E_PERFORMANCE_GITHUB_REF_NAME;
+    delete process.env.E2E_PERFORMANCE_RELEASE_VERSION;
+    delete process.env.GITHUB_REF_NAME;
     delete process.env.GITHUB_SERVER_URL;
     delete process.env.GITHUB_REPOSITORY;
     delete process.env.GITHUB_RUN_ID;
@@ -85,53 +102,18 @@ describe('PerformanceSentryPublisher', () => {
   });
 
   afterEach(() => {
-    if (originalSentryDsn === undefined) {
-      delete process.env.E2E_PERFORMANCE_SENTRY_DSN;
-    } else {
-      process.env.E2E_PERFORMANCE_SENTRY_DSN = originalSentryDsn;
-    }
-
-    if (originalSentrySampleRate === undefined) {
-      delete process.env.E2E_PERFORMANCE_SENTRY_SAMPLE_RATE;
-    } else {
-      process.env.E2E_PERFORMANCE_SENTRY_SAMPLE_RATE = originalSentrySampleRate;
-    }
-
-    if (originalSentryEnabled === undefined) {
-      delete process.env.E2E_PERFORMANCE_SENTRY_ENABLED;
-    } else {
-      process.env.E2E_PERFORMANCE_SENTRY_ENABLED = originalSentryEnabled;
-    }
-
-    if (originalBuildVariant === undefined) {
-      delete process.env.E2E_PERFORMANCE_BUILD_VARIANT;
-    } else {
-      process.env.E2E_PERFORMANCE_BUILD_VARIANT = originalBuildVariant;
-    }
-
-    if (originalGithubServerUrl === undefined) {
-      delete process.env.GITHUB_SERVER_URL;
-    } else {
-      process.env.GITHUB_SERVER_URL = originalGithubServerUrl;
-    }
-
-    if (originalGithubRepository === undefined) {
-      delete process.env.GITHUB_REPOSITORY;
-    } else {
-      process.env.GITHUB_REPOSITORY = originalGithubRepository;
-    }
-
-    if (originalGithubRunId === undefined) {
-      delete process.env.GITHUB_RUN_ID;
-    } else {
-      process.env.GITHUB_RUN_ID = originalGithubRunId;
-    }
-
-    if (originalGithubJob === undefined) {
-      delete process.env.GITHUB_JOB;
-    } else {
-      process.env.GITHUB_JOB = originalGithubJob;
-    }
+    restoreEnv('E2E_PERFORMANCE_SENTRY_DSN', originalSentryDsn);
+    restoreEnv('E2E_PERFORMANCE_SENTRY_SAMPLE_RATE', originalSentrySampleRate);
+    restoreEnv('E2E_PERFORMANCE_SENTRY_ENABLED', originalSentryEnabled);
+    restoreEnv('E2E_PERFORMANCE_BUILD_VARIANT', originalBuildVariant);
+    restoreEnv('E2E_PERFORMANCE_CI_BUILD_VARIANT', originalCiBuildVariant);
+    restoreEnv('E2E_PERFORMANCE_GITHUB_REF_NAME', originalPerformanceGithubRef);
+    restoreEnv('E2E_PERFORMANCE_RELEASE_VERSION', originalReleaseVersion);
+    restoreEnv('GITHUB_REF_NAME', originalGithubRefName);
+    restoreEnv('GITHUB_SERVER_URL', originalGithubServerUrl);
+    restoreEnv('GITHUB_REPOSITORY', originalGithubRepository);
+    restoreEnv('GITHUB_RUN_ID', originalGithubRunId);
+    restoreEnv('GITHUB_JOB', originalGithubJob);
 
     fetchMock.mockRestore();
   });
@@ -585,4 +567,130 @@ describe('PerformanceSentryPublisher', () => {
     expect(sent).toBe(false);
     expect(fetchMock).not.toHaveBeenCalled();
   });
+
+  it('tags RC tracking fields for Sentry Discover filtering', async () => {
+    process.env.E2E_PERFORMANCE_SENTRY_DSN =
+      'https://publicKey@o123.ingest.sentry.io/4567';
+    process.env.E2E_PERFORMANCE_BUILD_VARIANT = 'rc';
+    process.env.E2E_PERFORMANCE_CI_BUILD_VARIANT = 'rc';
+    process.env.E2E_PERFORMANCE_RELEASE_VERSION = '7.58.0';
+    process.env.GITHUB_REF_NAME = 'release/7.58.0';
+    process.env.GITHUB_SERVER_URL = 'https://github.com';
+    process.env.GITHUB_REPOSITORY = 'MetaMask/metamask-mobile';
+    process.env.GITHUB_RUN_ID = '999888';
+    process.env.GITHUB_JOB = 'e2e-performance-android';
+    fetchMock.mockResolvedValue({
+      ok: true,
+      status: 200,
+    } as Response);
+
+    const sent = await publishPerformanceScenarioToSentry({
+      metrics: createMetrics(),
+      testTitle: 'Import wallet flow',
+      projectName: 'browserstack-android',
+      testFilePath: 'tests/performance/onboarding/import-wallet.spec.js',
+      tags: ['@PerformanceOnboarding'],
+      status: 'passed',
+      retry: 0,
+      workerIndex: 1,
+    });
+
+    expect(sent).toBe(true);
+    const [, requestInit] = fetchMock.mock.calls[0] ?? [];
+    const body = requestInit?.body as string;
+    const [, , payloadLine] = body.split('\n');
+    const payload = JSON.parse(payloadLine);
+
+    expect(payload.tags.ci_build_variant).toBe('rc');
+    expect(payload.tags.release_version).toBe('7.58.0');
+    expect(payload.tags.github_ref).toBe('release/7.58.0');
+    expect(payload.tags.github_run_id).toBe('999888');
+    expect(payload.tags.tracking_mode).toBe('observe');
+    expect(payload.spans[0].data.ci_build_variant).toBe('rc');
+    expect(payload.spans[0].data.release_version).toBe('7.58.0');
+    expect(payload.spans[0].data.github_ref).toBe('release/7.58.0');
+  });
+
+  it('does not use the feature-flags variant as the CI build variant', async () => {
+    process.env.E2E_PERFORMANCE_SENTRY_DSN =
+      'https://publicKey@o123.ingest.sentry.io/4567';
+    process.env.E2E_PERFORMANCE_BUILD_VARIANT = 'rc';
+    fetchMock.mockResolvedValue({
+      ok: true,
+      status: 200,
+    } as Response);
+
+    await publishPerformanceScenarioToSentry({
+      metrics: createMetrics(),
+      testTitle: 'Import wallet flow',
+      projectName: 'browserstack-android',
+      tags: [],
+      status: 'passed',
+    });
+
+    const [, requestInit] = fetchMock.mock.calls[0] ?? [];
+    const body = requestInit?.body as string;
+    const [, , payloadLine] = body.split('\n');
+    const payload = JSON.parse(payloadLine);
+
+    expect(payload.tags.build_variant).toBe('rc');
+    expect(payload.tags.ci_build_variant).toBe('unknown');
+    expect(payload.spans[0].data.ci_build_variant).toBe('unknown');
+  });
+
+  it('uses the performance branch override for GitHub tags', async () => {
+    process.env.E2E_PERFORMANCE_SENTRY_DSN =
+      'https://publicKey@o123.ingest.sentry.io/4567';
+    process.env.GITHUB_REF_NAME = '1234/merge';
+    process.env.E2E_PERFORMANCE_GITHUB_REF_NAME = 'release/7.60.0';
+    fetchMock.mockResolvedValue({
+      ok: true,
+      status: 200,
+    } as Response);
+
+    await publishPerformanceScenarioToSentry({
+      metrics: createMetrics(),
+      testTitle: 'Import wallet flow',
+      projectName: 'browserstack-android',
+      tags: [],
+      status: 'passed',
+    });
+
+    const [, requestInit] = fetchMock.mock.calls[0] ?? [];
+    const body = requestInit?.body as string;
+    const [, , payloadLine] = body.split('\n');
+    const payload = JSON.parse(payloadLine);
+
+    expect(payload.tags.github_ref).toBe('release/7.60.0');
+    expect(payload.tags.release_version).toBe('7.60.0');
+    expect(payload.spans[0].data.github_ref).toBe('release/7.60.0');
+  });
+
+  it('derives release_version from release/* github ref when env is unset', async () => {
+    process.env.E2E_PERFORMANCE_SENTRY_DSN =
+      'https://publicKey@o123.ingest.sentry.io/4567';
+    process.env.E2E_PERFORMANCE_CI_BUILD_VARIANT = 'rc';
+    process.env.GITHUB_REF_NAME = 'release/7.59.1';
+    process.env.GITHUB_RUN_ID = '111';
+    fetchMock.mockResolvedValue({
+      ok: true,
+      status: 200,
+    } as Response);
+
+    await publishPerformanceScenarioToSentry({
+      metrics: createMetrics(),
+      testTitle: 'Import wallet flow',
+      projectName: 'browserstack-android',
+      tags: [],
+      status: 'passed',
+    });
+
+    const [, requestInit] = fetchMock.mock.calls[0] ?? [];
+    const body = requestInit?.body as string;
+    const [, , payloadLine] = body.split('\n');
+    const payload = JSON.parse(payloadLine);
+
+    expect(payload.tags.release_version).toBe('7.59.1');
+    expect(payload.tags.github_ref).toBe('release/7.59.1');
+  });
 });
diff --git a/tests/reporters/providers/sentry/PerformanceSentryPublisher.ts b/tests/reporters/providers/sentry/PerformanceSentryPublisher.ts
index ce52c35e5110..e1bc9c136dd6 100644
--- a/tests/reporters/providers/sentry/PerformanceSentryPublisher.ts
+++ b/tests/reporters/providers/sentry/PerformanceSentryPublisher.ts
@@ -14,10 +14,15 @@ const ENV_SENTRY_SAMPLE_RATE = 'E2E_PERFORMANCE_SENTRY_SAMPLE_RATE';
 const ENV_SENTRY_ENVIRONMENT = 'E2E_PERFORMANCE_SENTRY_ENVIRONMENT';
 const ENV_SENTRY_RELEASE = 'E2E_PERFORMANCE_SENTRY_RELEASE';
 const ENV_SENTRY_BUILD_VARIANT = 'E2E_PERFORMANCE_BUILD_VARIANT';
+const ENV_SENTRY_CI_BUILD_VARIANT = 'E2E_PERFORMANCE_CI_BUILD_VARIANT';
+const ENV_SENTRY_RELEASE_VERSION = 'E2E_PERFORMANCE_RELEASE_VERSION';
+const ENV_SENTRY_GITHUB_REF_NAME = 'E2E_PERFORMANCE_GITHUB_REF_NAME';
 const ENV_GITHUB_SERVER_URL = 'GITHUB_SERVER_URL';
 const ENV_GITHUB_REPOSITORY = 'GITHUB_REPOSITORY';
 const ENV_GITHUB_RUN_ID = 'GITHUB_RUN_ID';
 const ENV_GITHUB_JOB = 'GITHUB_JOB';
+const ENV_GITHUB_REF_NAME = 'GITHUB_REF_NAME';
+type CiBuildVariant = 'rc' | 'exp' | 'e2e' | 'unknown';
 const MAX_MEASUREMENT_KEY_LENGTH = 64;
 const RESERVED_MEASUREMENT_KEYS = [
   'scenario_total_time_ms',
@@ -80,6 +85,11 @@ interface MirroredScenarioAttributes {
   retry: number;
   worker_index: number;
   build_variant: 'rc' | 'exp' | 'unknown';
+  ci_build_variant: CiBuildVariant;
+  release_version: string | null;
+  github_ref: string | null;
+  github_run_id: string | null;
+  tracking_mode: 'observe';
   device_name: string;
   device_os_version: string;
   test_file_path: string;
@@ -119,6 +129,41 @@ function normalizeBuildVariant(variant?: string): 'rc' | 'exp' | 'unknown' {
   return 'unknown';
 }
 
+function normalizeCiBuildVariant(variant?: string): CiBuildVariant {
+  if (variant === 'rc' || variant === 'exp' || variant === 'e2e') {
+    return variant;
+  }
+
+  return 'unknown';
+}
+
+function resolveGithubRefName(): string | null {
+  return (
+    getEnvValue(ENV_SENTRY_GITHUB_REF_NAME)?.trim() ||
+    getEnvValue(ENV_GITHUB_REF_NAME)?.trim() ||
+    null
+  );
+}
+
+/**
+ * Prefer explicit E2E_PERFORMANCE_RELEASE_VERSION; otherwise parse
+ * `release/X.Y.Z` (and optional suffixes) from the effective GitHub ref name.
+ */
+function resolveReleaseVersion(): string | null {
+  const explicit = getEnvValue(ENV_SENTRY_RELEASE_VERSION)?.trim();
+  if (explicit) {
+    return explicit;
+  }
+
+  const refName = resolveGithubRefName();
+  if (!refName) {
+    return null;
+  }
+
+  const match = refName.match(/^release\/(\d+\.\d+\.\d+(?:[.-][\w.]+)?)$/u);
+  return match?.[1] ?? null;
+}
+
 function sanitizeMeasurementKey(name: string): string {
   const baseKey = name
     .toLowerCase()
@@ -363,6 +408,12 @@ export async function publishPerformanceScenarioToSentry(
   const buildVariant = normalizeBuildVariant(
     getEnvValue(ENV_SENTRY_BUILD_VARIANT),
   );
+  const ciBuildVariant = normalizeCiBuildVariant(
+    getEnvValue(ENV_SENTRY_CI_BUILD_VARIANT),
+  );
+  const releaseVersion = resolveReleaseVersion();
+  const githubRef = resolveGithubRefName();
+  const githubRunId = getEnvValue(ENV_GITHUB_RUN_ID) ?? null;
   const testFilePath = options.testFilePath || '';
 
   const mirroredScenarioAttributes: MirroredScenarioAttributes = {
@@ -375,6 +426,11 @@ export async function publishPerformanceScenarioToSentry(
     retry,
     worker_index: workerIndex,
     build_variant: buildVariant,
+    ci_build_variant: ciBuildVariant,
+    release_version: releaseVersion,
+    github_ref: githubRef,
+    github_run_id: githubRunId,
+    tracking_mode: 'observe',
     device_name: options.metrics.device.name,
     device_os_version: options.metrics.device.osVersion,
     test_file_path: testFilePath,
@@ -448,6 +504,17 @@ export async function publishPerformanceScenarioToSentry(
       retry: String(mirroredScenarioAttributes.retry),
       worker_index: String(mirroredScenarioAttributes.worker_index),
       build_variant: mirroredScenarioAttributes.build_variant,
+      ci_build_variant: mirroredScenarioAttributes.ci_build_variant,
+      tracking_mode: mirroredScenarioAttributes.tracking_mode,
+      ...(mirroredScenarioAttributes.release_version
+        ? { release_version: mirroredScenarioAttributes.release_version }
+        : {}),
+      ...(mirroredScenarioAttributes.github_ref
+        ? { github_ref: mirroredScenarioAttributes.github_ref }
+        : {}),
+      ...(mirroredScenarioAttributes.github_run_id
+        ? { github_run_id: mirroredScenarioAttributes.github_run_id }
+        : {}),
     },
     measurements,
     spans,
diff --git a/tests/scripts/aggregate-performance-reports.mjs b/tests/scripts/aggregate-performance-reports.mjs
index 18e41cd5e2b6..afa9fc59d2c2 100755
--- a/tests/scripts/aggregate-performance-reports.mjs
+++ b/tests/scripts/aggregate-performance-reports.mjs
@@ -15,12 +15,19 @@ import fs from 'fs';
 import path from 'path';
 
 /**
- * Get build variant and display type from environment (rc = normal, exp = experimental).
+ * Get build variant and display type from environment.
  * @returns {{ buildVariant: string, buildType: string }}
  */
 function getBuildTypeInfo() {
   const variant = (process.env.BUILD_VARIANT || 'rc').toLowerCase();
-  const buildType = variant === 'exp' ? 'Experimental' : 'Normal';
+  let buildType = 'Normal';
+  if (variant === 'exp') {
+    buildType = 'Experimental';
+  } else if (variant === 'rc') {
+    buildType = 'RC';
+  } else if (variant === 'e2e') {
+    buildType = 'E2E';
+  }
   return { buildVariant: variant, buildType };
 }
 
diff --git a/tests/scripts/generate-slack-summary.sh b/tests/scripts/generate-slack-summary.sh
index 3152c14f3e43..5d4e36b1bba1 100755
--- a/tests/scripts/generate-slack-summary.sh
+++ b/tests/scripts/generate-slack-summary.sh
@@ -151,10 +151,21 @@ if [ -f "$SUMMARY_FILE" ]; then
     # Build type label
     if [ "$buildType" = "Experimental" ]; then
         buildTypeLabel="Experimental"
+    elif [ "$buildType" = "RC" ]; then
+        buildTypeLabel="RC"
+    elif [ "$buildType" = "E2E" ]; then
+        buildTypeLabel="E2E"
     else
         buildTypeLabel="Normal"
     fi
 
+    releaseVersion=""
+    if [[ "${GITHUB_REF_NAME:-}" =~ ^release/(.+)$ ]]; then
+        releaseVersion="${BASH_REMATCH[1]}"
+    elif [[ "${BRANCH_NAME:-}" =~ ^release/(.+)$ ]]; then
+        releaseVersion="${BASH_REMATCH[1]}"
+    fi
+
     # Helper: format device key "DeviceName+OSVersion" -> "DeviceName (vOSVersion)"
     format_device_name() {
         local device="$1"
@@ -170,7 +181,16 @@ if [ -f "$SUMMARY_FILE" ]; then
     # --- Build the formatted message ---
 
     SUMMARY="━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n"
-    SUMMARY+="*🔄 Performance E2E Tests — ${buildTypeLabel} Build*\n"
+    if [ "$buildTypeLabel" = "RC" ]; then
+        if [ -n "$releaseVersion" ]; then
+            SUMMARY+="*🔄 Performance E2E Tests — RC ${releaseVersion} (track-only)*\n"
+        else
+            SUMMARY+="*🔄 Performance E2E Tests — RC (track-only)*\n"
+        fi
+        SUMMARY+="_Observability only — does not block the release._\n"
+    else
+        SUMMARY+="*🔄 Performance E2E Tests — ${buildTypeLabel} Build*\n"
+    fi
     SUMMARY+="━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n\n"
 
     # Count job-level failures (jobs that failed before producing test results)
@@ -317,10 +337,16 @@ if [ -f "$SUMMARY_FILE" ]; then
     # Build Info
     SUMMARY+="*🔧 BUILD INFO*\n"
     SUMMARY+="├─ Build: ${buildTypeLabel}\n"
+    if [ -n "$releaseVersion" ]; then
+        SUMMARY+="├─ Release: \`${releaseVersion}\`\n"
+    fi
     SUMMARY+="├─ Branch: \`$GITHUB_REF_NAME\`\n"
     SUMMARY+="└─ Commit: \`${GITHUB_SHA:0:7}\`\n\n"
 
     SUMMARY+="<${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}|🔗 View full results>\n"
+    if [ "$buildTypeLabel" = "RC" ]; then
+        SUMMARY+="_Filter in Sentry (test): \`ci_build_variant:rc\` + \`release_version:${releaseVersion:-*}\`_\n"
+    fi
     SUMMARY+="━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 
     echo "$SUMMARY"
diff --git a/tests/seeder/anvil-manager.ts b/tests/seeder/anvil-manager.ts
index 63b6a1b516f0..6472171d6726 100644
--- a/tests/seeder/anvil-manager.ts
+++ b/tests/seeder/anvil-manager.ts
@@ -17,7 +17,10 @@ const logger = createLogger({
   name: 'AnvilManager',
 });
 
-export const DEFAULT_ANVIL_PORT = 8545;
+import { DEFAULT_ANVIL_PORT } from '../framework/Constants';
+
+// Re-export so existing consumers aren't broken by the relocation.
+export { DEFAULT_ANVIL_PORT };
 
 /**
  * Represents the available Ethereum hardforks for the Anvil server
diff --git a/tests/selectors/Browser/BitcoinTestDapp.selectors.ts b/tests/selectors/Browser/BitcoinTestDapp.selectors.ts
deleted file mode 100644
index fca0be239773..000000000000
--- a/tests/selectors/Browser/BitcoinTestDapp.selectors.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * IDs for web elements in the Bitcoin Test Dapp
- */
-export interface BitcoinTestDappWebIDs {
-  WALLET_BUTTON: string;
-  CONFIRM_SIGN_MESSAGE_BUTTON: string;
-}
diff --git a/tests/selectors/Browser/TestDapp.selectors.ts b/tests/selectors/Browser/TestDapp.selectors.ts
index aa4e52009e85..c124c0066378 100644
--- a/tests/selectors/Browser/TestDapp.selectors.ts
+++ b/tests/selectors/Browser/TestDapp.selectors.ts
@@ -1,4 +1,5 @@
 export const TestDappSelectorsWebIDs = {
+  ACCOUNTS_TEXT: 'accounts',
   CHAIN_ID_TEXT: 'chainId',
   TEST_DAPP_FOX_LOGO: 'mm-logo',
   TEST_DAPP_HEADING_TITLE: 'logo-text',
@@ -28,7 +29,6 @@ export const TestDappSelectorsWebIDs = {
   ERC_721_REVOKE_APPROVAL_BUTTON_ID: 'revokeButton',
   ERC_1155_REVOKE_APPROVAL_BUTTON_ID: 'revokeERC1155Button',
   REVOKE_ACCOUNTS_PERMISSIONS: 'revokeAccountsPermission',
-  REQUEST_PERMISSIONS: 'requestPermissions',
   OPEN_NETWORK_PICKER: 'openNetworkPicker',
 } as const;
 
diff --git a/tests/selectors/Browser/TestSnaps.selectors.ts b/tests/selectors/Browser/TestSnaps.selectors.ts
index ba9eaef56b5f..7c0d658b83e5 100644
--- a/tests/selectors/Browser/TestSnaps.selectors.ts
+++ b/tests/selectors/Browser/TestSnaps.selectors.ts
@@ -121,14 +121,33 @@ export const EntropyDropDownSelectorWebIDS = {
   multichainNetworkDropdown: 'select-multichain-chain',
 };
 
-export const NativeDropdownSelectorWebIDS = {
-  snapUISelector: 'snap-ui-renderer__selector',
-  snapUIDropdown: 'snap-ui-renderer__dropdown',
-};
-
 /** Native Snap UI renderer element IDs used outside web dropdown option maps. */
 export const SnapUIRendererSelectorIDs = {
   selectorItem: 'snap-ui-renderer__selector-item',
+  scrollView: 'snap-ui-renderer__scrollview',
+  dropdown: 'snap-ui-renderer__dropdown',
+  selector: 'snap-ui-renderer__selector',
+  checkbox: 'snap-ui-renderer__checkbox',
+  radio: 'snap-ui-renderer__radio',
+  radioButton: 'snap-ui-renderer__radio-button',
+  dateTimeTouchable: 'snap-ui-renderer__date-time-picker--datetime-touchable',
+  dateTouchable: 'snap-ui-renderer__date-time-picker--date-touchable',
+  timeTouchable: 'snap-ui-renderer__date-time-picker--time-touchable',
+  dateTimeInput: 'snap-ui-renderer__date-time-picker--datetime-input',
+  dateInput: 'snap-ui-renderer__date-time-picker--date-input',
+  timeInput: 'snap-ui-renderer__date-time-picker--time-input',
+};
+
+/** Android: read-only date/time inputs (touchables often vanish when disabled). */
+export const SNAP_UI_DATE_PICKER_INPUT_IDS = [
+  SnapUIRendererSelectorIDs.dateTimeInput,
+  SnapUIRendererSelectorIDs.dateInput,
+  SnapUIRendererSelectorIDs.timeInput,
+] as const;
+
+export const NativeDropdownSelectorWebIDS = {
+  snapUISelector: SnapUIRendererSelectorIDs.selector,
+  snapUIDropdown: SnapUIRendererSelectorIDs.dropdown,
 };
 
 /** Native Snap UI dialog custom input (Detox / Android Appium testID). */
@@ -136,23 +155,49 @@ export const SnapUIInputSelectorIDs = {
   customDialogInput: 'custom-input-snap-ui-input',
 };
 
-/**
- * iOS Appium XPath for the dialog custom input — testID is not exposed in
- * the XCUITest page source, so target the textfield under the Snap UI scrollview.
- */
+/** iOS: XCUITest often omits `*-snap-ui-input`; use scrollview textfield instead. */
 export const SnapUIInputSelectorXPaths = {
-  customDialogInputIos:
+  textfieldIos:
     '//*[@name="snap-ui-renderer__scrollview"]//*[@name="textfield"]',
 };
 
+/** iOS Appium XPath by testID/`name` (nodes may be accessible=false / visible=false). */
+export function snapUiNativeIosXPath(testID: string): string {
+  return `//*[@name="${testID}"]`;
+}
+
+/**
+ * JSX Snap count — scoped under the Snap UI scrollview so bare "0"/"1" cannot
+ * match unrelated wallet chrome (especially on Android contains-text matchers).
+ *
+ * iOS: count StaticTexts are accessible=false; the SnapUI card parent exposes
+ * label "Hover for explanation, Count, N, Increment".
+ */
+export function snapUIJsxCountIosXPath(count: string): string {
+  const scrollView = SnapUIRendererSelectorIDs.scrollView;
+  return `//*[@name="${scrollView}"]//*[@accessible="true" and contains(@label,"Count, ${count}")]`;
+}
+
+export function snapUIJsxCountAndroidXPath(count: string): string {
+  const scrollView = SnapUIRendererSelectorIDs.scrollView;
+  return `//*[contains(@resource-id,"${scrollView}")]//*[@text="${count}" or @content-desc="${count}" or contains(@content-desc,"Count, ${count}")]`;
+}
+
 export function snapUISelectorItemAndroidUIAutomator(text: string): string {
   const id = SnapUIRendererSelectorIDs.selectorItem;
   return `.resourceIdMatches(".*${id}.*").childSelector(new UiSelector().text("${text}"))`;
 }
 
+/** iOS SnapUIDropdown bottom-sheet title (`snap_ui.dropdown.title`). */
+export const SNAP_UI_DROPDOWN_SHEET_TITLE = 'Select an option';
+
+/** iOS dropdown/selector sheet option — scoped to SelectorItem (not in-form radios). */
 export function snapUISelectorItemIosXPath(text: string): string {
   const id = SnapUIRendererSelectorIDs.selectorItem;
-  return `//*[@name="${id}" and (@label="${text}" or contains(@label,"${text}") or @name="${text}")] | //*[@name="${id}"]//*[@label="${text}" or @name="${text}" or @value="${text}"]`;
+  return [
+    `//*[@name="${id}" and (@label="${text}" or contains(@label,"${text}") or @name="${text}")]`,
+    `//*[@name="${id}"]//*[@label="${text}" or @name="${text}" or @value="${text}"]`,
+  ].join(' | ');
 }
 
 /**
@@ -176,6 +221,22 @@ export const TEST_SNAPS_ANDROID_SCROLL_LABELS: Record<string, string> = {
   'connectlifecycle-hooks': 'Connect to Lifecycle Hooks Snap',
   'connectmanage-state': 'Connect to Manage State Snap',
   'connectmultichain-provider': 'Connect to Multichain Provider Snap',
+  // Multichain Provider actions — resource-ids often virtualized until scrolled.
+  // Prefer section-unique labels: "Get Accounts" / "Sign Message" / "Sign Typed
+  // Data" also appear in Ethereum Provider / Entropy and can resolve wrong nodes.
+  sendCreateSession: 'Create Session',
+  sendRevokeSession: 'Revoke Session',
+  'select-multichain-chain': 'Select chain',
+  sendMultichainChainId: 'Get Chain ID',
+  sendMultichainGetGenesisHash: 'Get Genesis Hash',
+  sendMultichainAccounts: 'Get Genesis Hash',
+  signMessageMultichain: 'Get Genesis Hash',
+  signMessageMultichainButton: 'Get Genesis Hash',
+  signMessageMultichainResult: 'Get Genesis Hash',
+  signTypedDataMultichain: 'Get Genesis Hash',
+  signTypedDataMultichainButton: 'Get Genesis Hash',
+  signTypedDataMultichainResult: 'Get Genesis Hash',
+  multichainProviderResult: 'Get Genesis Hash',
   'connectname-lookup': 'Connect to Name Lookup Snap',
   'connectnetwork-access': 'Connect to Network Access Snap',
   'connectethereum-provider': 'Connect to Ethereum Provider Snap',
diff --git a/tests/selectors/SendFlow/SendActionView.selectors.ts b/tests/selectors/SendFlow/SendActionView.selectors.ts
index 6d28d6048211..52c690bf8d05 100644
--- a/tests/selectors/SendFlow/SendActionView.selectors.ts
+++ b/tests/selectors/SendFlow/SendActionView.selectors.ts
@@ -1,15 +1,4 @@
 export const SendActionViewSelectorsIDs = {
-  SOLANA_INPUT_ADDRESS_FIELD: 'send-to-snap-ui-input',
-  SOLANA_INPUT_AMOUNT_FIELD: 'send-amount-input-snap-ui-input',
-  INVALID_ADDRESS_ERROR: 'helptext',
-  SOL_CONFIRM_SEND_VIEW: 'snaps-ui-image',
-  SEND_TRANSACTION_BUTTON:
-    'transaction-confirmation-submit-button-snap-footer-button',
-  CANCEL_SEND_TRANSACTION_BUTTON:
-    'transaction-confirmation-cancel-button-snap-footer-button',
-  CONTINUE_BUTTON: 'send-submit-button-snap-footer-button',
-  CANCEL_BUTTON: 'send-cancel-button-snap-footer-button',
-  CLOSE_BUTTON: 'default-snap-footer-button',
   INSUFFICIENT_BALANCE_TO_COVER_FEES_ERROR:
     'Insufficient balance to cover fees',
   INSUFFICIENT_FUNDS_ERROR: 'Insufficient funds',
diff --git a/tests/smoke-appium/api-specs/helpers/ConfirmationsRejectionRule.ts b/tests/smoke-appium/api-specs/helpers/ConfirmationsRejectionRule.ts
new file mode 100644
index 000000000000..ae24968b1b1a
--- /dev/null
+++ b/tests/smoke-appium/api-specs/helpers/ConfirmationsRejectionRule.ts
@@ -0,0 +1,221 @@
+import paramsToObj from '@open-rpc/test-coverage/build/utils/params-to-obj';
+import type {
+  ContentDescriptorObject,
+  JSONSchema,
+  MethodObject,
+  OpenrpcDocument,
+} from '@open-rpc/meta-schema';
+import type { Call, IOptions } from '@open-rpc/test-coverage/build/coverage';
+import type Rule from '@open-rpc/test-coverage/build/rules/rule';
+import Assertions from '../../../framework/Assertions.js';
+import Gestures from '../../../framework/Gestures.js';
+import Matchers from '../../../framework/Matchers.js';
+import PlaywrightContextHelpers from '../../../framework/PlaywrightContextHelpers.js';
+import { getDriver } from '../../../framework/PlaywrightUtilities.js';
+import { sleep } from '../../../framework/Utilities.js';
+import ConnectBottomSheet from '../../../page-objects/Browser/ConnectBottomSheet.js';
+import ConnectedAccountsModal from '../../../page-objects/Browser/ConnectedAccountsModal.js';
+import PermissionSummaryBottomSheet from '../../../page-objects/Browser/PermissionSummaryBottomSheet.js';
+import SpamFilterModal from '../../../page-objects/Browser/SpamFilterModal.js';
+import BrowserView from '../../../page-objects/Browser/BrowserView.js';
+import AssetWatchBottomSheet from '../../../page-objects/Transactions/AssetWatchBottomSheet.js';
+import {
+  addToQueue,
+  fireEthereumRequest,
+  requestViaEthereumProvider,
+} from './transport.js';
+
+interface ConfirmationsRejectRuleOptions {
+  pageUrl: string;
+  only?: string[];
+}
+
+function getMethodResultSchema(method: MethodObject): JSONSchema {
+  const result = method.result;
+  if (!result || !('schema' in result)) {
+    return {};
+  }
+  return result.schema;
+}
+
+/**
+ * Lifecycle hooks enqueue on the shared transport queue so Cancel runs after
+ * the ethereum.request is fired and before the response is polled.
+ */
+export default class ConfirmationsRejectRule implements Rule {
+  private readonly pageUrl: string;
+
+  private readonly only: string[] | undefined;
+
+  private readonly allCapsCancel = ['wallet_watchAsset'];
+
+  private readonly requiresEthAccountsPermission = [
+    'personal_sign',
+    'eth_signTypedData_v4',
+    'eth_getEncryptionPublicKey',
+    'wallet_revokePermissions',
+  ];
+
+  constructor(options: ConfirmationsRejectRuleOptions) {
+    this.pageUrl = options.pageUrl;
+    this.only = options.only;
+  }
+
+  getTitle(): string {
+    return 'Confirmations Rejection Rule';
+  }
+
+  async beforeRequest(_options: IOptions, call: Call): Promise<void> {
+    await new Promise<void>((resolve, reject) => {
+      void addToQueue({
+        name: 'beforeRequest',
+        resolve: () => resolve(),
+        reject,
+        task: async () => {
+          if (this.requiresEthAccountsPermission.includes(call.methodName)) {
+            // Fire permission request; Connect resolves it (Detox parity).
+            await fireEthereumRequest(
+              this.pageUrl,
+              'wallet_requestPermissions',
+              [{ eth_accounts: {} }],
+            );
+
+            await ConnectBottomSheet.tapConnectButton();
+            await Assertions.checkIfNotVisible(
+              PermissionSummaryBottomSheet.container,
+            );
+            await sleep(3000);
+
+            try {
+              await Assertions.checkIfVisible(SpamFilterModal.title);
+              await SpamFilterModal.tapCloseButton();
+              await Assertions.checkIfNotVisible(SpamFilterModal.title);
+            } catch {
+              // Spam modal is optional.
+            }
+          }
+
+          // Mobile requires stringified typed data (same as Detox rule).
+          if (call.methodName === 'eth_signTypedData_v4') {
+            call.params[1] = JSON.stringify(call.params[1]);
+          }
+        },
+      });
+    });
+  }
+
+  getCalls(_openrpcDocument: OpenrpcDocument, method: MethodObject): Call[] {
+    const calls: Call[] = [];
+    const isMethodAllowed = this.only ? this.only.includes(method.name) : true;
+    if (!isMethodAllowed) {
+      return calls;
+    }
+
+    const examples = (
+      method as MethodObject & {
+        examples?: {
+          name?: string;
+          params?: { value?: unknown }[];
+          result?: { value?: unknown };
+        }[];
+      }
+    ).examples;
+
+    if (examples?.length) {
+      const example = examples[0];
+      if (!example.result) {
+        return calls;
+      }
+      const paramValues = (example.params ?? []).map((param) => param.value);
+      const params =
+        method.paramStructure === 'by-name'
+          ? (paramsToObj(
+              paramValues,
+              method.params as ContentDescriptorObject[],
+            ) as unknown[])
+          : paramValues;
+      calls.push({
+        title: `${this.getTitle()} - with example ${example.name ?? method.name}`,
+        methodName: method.name,
+        params,
+        url: '',
+        resultSchema: getMethodResultSchema(method),
+        expectedResult: example.result.value,
+      });
+      return calls;
+    }
+
+    calls.push({
+      title: `${method.name} > confirmation rejection`,
+      methodName: method.name,
+      params: [],
+      url: '',
+      resultSchema: getMethodResultSchema(method),
+    });
+    return calls;
+  }
+
+  async afterRequest(_options: IOptions, call: Call): Promise<void> {
+    await new Promise<void>((resolve, reject) => {
+      void addToQueue({
+        name: 'afterRequest',
+        resolve: () => resolve(),
+        reject,
+        task: async () => {
+          await sleep(3000);
+          const driver = getDriver();
+          await PlaywrightContextHelpers.switchToNativeContext();
+          const image = await driver.takeScreenshot();
+          call.attachments = call.attachments ?? [];
+          call.attachments.push({
+            data: `data:image/png;base64,${image}`,
+            type: 'image',
+          });
+
+          await sleep(3000);
+          if (this.allCapsCancel.includes(call.methodName)) {
+            await AssetWatchBottomSheet.tapCancelButton();
+          } else if (call.methodName === 'wallet_revokePermissions') {
+            await BrowserView.tapLocalHostDefaultAvatar();
+            await Assertions.checkIfNotVisible(ConnectedAccountsModal.title);
+          } else {
+            await PlaywrightContextHelpers.switchToNativeContext();
+            const cancelButton = Matchers.getElementByText('Cancel');
+            await Gestures.waitAndTap(cancelButton, {
+              elemDescription: 'Cancel confirmation',
+            });
+          }
+        },
+      });
+    });
+  }
+
+  async afterResponse(_options: IOptions, call: Call): Promise<void> {
+    await new Promise<void>((resolve, reject) => {
+      void addToQueue({
+        name: 'afterResponse',
+        resolve: () => resolve(),
+        reject,
+        task: async () => {
+          if (this.requiresEthAccountsPermission.includes(call.methodName)) {
+            await requestViaEthereumProvider(
+              this.pageUrl,
+              'wallet_revokePermissions',
+              [{ eth_accounts: {} }],
+            );
+          }
+        },
+      });
+    });
+  }
+
+  validateCall(call: Call): Call {
+    if (call.error) {
+      call.valid = call.error.code === 4001;
+      if (!call.valid) {
+        call.reason = `Expected error code 4001, got ${call.error.code}`;
+      }
+    }
+    return call;
+  }
+}
diff --git a/tests/smoke-appium/api-specs/helpers/mock-server.ts b/tests/smoke-appium/api-specs/helpers/mock-server.ts
new file mode 100644
index 000000000000..c039d31e6b0b
--- /dev/null
+++ b/tests/smoke-appium/api-specs/helpers/mock-server.ts
@@ -0,0 +1,40 @@
+import type { OpenrpcDocument } from '@open-rpc/meta-schema';
+import { MOCK_RPC_PORT } from './openrpc-document.js';
+
+interface StoppableTransport {
+  stop?: () => void;
+}
+
+interface OpenRpcMockServer {
+  start: () => void;
+  transports?: StoppableTransport[];
+}
+
+/**
+ * Start `@open-rpc/mock-server` for api-specs (wallet fixture points at :8545).
+ * Returns a stop handle — Server has no public stop API, so we stop transports.
+ */
+export function startOpenRpcMockServer(
+  openrpcDocument: OpenrpcDocument,
+  port: number = MOCK_RPC_PORT,
+): { stop: () => void } {
+  // eslint-disable-next-line @typescript-eslint/no-require-imports, import-x/no-commonjs
+  const mockServerFactory = require('@open-rpc/mock-server/build/index')
+    .default as (p: number, doc: OpenrpcDocument) => OpenRpcMockServer;
+
+  const server = mockServerFactory(port, openrpcDocument);
+  server.start();
+
+  return {
+    stop: () => {
+      for (const transport of server.transports ?? []) {
+        try {
+          // HTTPTransport (server-js) exposes stop(), not close().
+          transport.stop?.();
+        } catch {
+          // Best-effort teardown between Playwright workers / retries.
+        }
+      }
+    },
+  };
+}
diff --git a/tests/smoke-appium/api-specs/helpers/openrpc-document.ts b/tests/smoke-appium/api-specs/helpers/openrpc-document.ts
new file mode 100644
index 000000000000..5054e04abc48
--- /dev/null
+++ b/tests/smoke-appium/api-specs/helpers/openrpc-document.ts
@@ -0,0 +1,232 @@
+import { parseOpenRPCDocument } from '@open-rpc/schema-utils-js';
+import type { MethodObject, OpenrpcDocument } from '@open-rpc/meta-schema';
+
+/** OpenRPC document version used by Detox api-specs (keep in sync). */
+export const OPENRPC_DOCUMENT_URL =
+  'https://metamask.github.io/api-specs/0.10.8/openrpc.json';
+
+/** Mock JSON-RPC server port (fixed; suite is serial). */
+export const MOCK_RPC_PORT = 8545;
+
+/** Local / Ganache chain id used in fixture + OpenRPC examples. */
+export const API_SPECS_CHAIN_ID = 1337;
+
+export const API_SPECS_ACCOUNT_ADDRESS =
+  '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3';
+
+/**
+ * Methods that surface a confirmation UI (handled by ConfirmationsRejectRule;
+ * excluded from JsonSchemaFaker / Examples rules).
+ */
+export const METHODS_WITH_CONFIRMATIONS: readonly string[] = [
+  'wallet_requestPermissions',
+  'eth_requestAccounts',
+  'wallet_watchAsset',
+  'personal_sign',
+  'wallet_addEthereumChain',
+  'eth_signTypedData_v4',
+  'wallet_switchEthereumChain',
+  'eth_getEncryptionPublicKey',
+];
+
+/**
+ * Methods skipped entirely by `@open-rpc/test-coverage` (unsupported or quarantined).
+ */
+export const SKIP_METHODS: readonly string[] = [
+  'eth_coinbase',
+  'wallet_registerOnboarding',
+  'eth_getEncryptionPublicKey',
+  'wallet_watchAsset',
+  // Quarantined — https://github.com/MetaMask/MetaMask-planning/issues/5207
+  'personal_sign',
+  'eth_signTypedData_v4',
+];
+
+type MethodLike = MethodObject & {
+  examples?: {
+    name?: string;
+    description?: string;
+    params?: { name?: string; value?: unknown }[];
+    result?: { name?: string; value?: unknown; description?: string };
+  }[];
+};
+
+const asMethodObjects = (document: OpenrpcDocument): MethodLike[] =>
+  (document.methods ?? []).filter(
+    (method): method is MethodLike =>
+      typeof method === 'object' &&
+      method !== null &&
+      'name' in method &&
+      typeof (method as MethodObject).name === 'string',
+  );
+
+const requireMethod = (document: OpenrpcDocument, name: string): MethodLike => {
+  const method = asMethodObjects(document).find((m) => m.name === name);
+  if (!method) {
+    throw new Error(`OpenRPC method not found: ${name}`);
+  }
+  return method;
+};
+
+/**
+ * Fetch and mutate the MetaMask OpenRPC document for mobile api-specs runs
+ * (examples, net_version, schema tweaks). Mirrors Detox json-rpc-coverage.js.
+ */
+export async function prepareOpenRpcDocument(
+  chainId: number = API_SPECS_CHAIN_ID,
+): Promise<OpenrpcDocument> {
+  const openrpcDocument = await parseOpenRPCDocument(OPENRPC_DOCUMENT_URL);
+
+  const switchEthereumChain = requireMethod(
+    openrpcDocument,
+    'wallet_switchEthereumChain',
+  );
+  switchEthereumChain.examples = [
+    {
+      name: 'wallet_switchEthereumChain',
+      description: 'Example of a wallet_switchEthereumChain request to sepolia',
+      params: [
+        {
+          name: 'SwitchEthereumChainParameter',
+          value: {
+            chainId: '0xaa36a7',
+          },
+        },
+      ],
+      result: {
+        name: 'wallet_switchEthereumChain',
+        value: null,
+      },
+    },
+  ];
+
+  const chainIdMethod = requireMethod(openrpcDocument, 'eth_chainId');
+  chainIdMethod.examples = [
+    {
+      name: 'chainIdExample',
+      description: 'Example of a chainId request',
+      params: [],
+      result: {
+        name: 'chainIdResult',
+        value: `0x${chainId.toString(16)}`,
+      },
+    },
+  ];
+
+  const blockNumber = requireMethod(openrpcDocument, 'eth_blockNumber');
+  blockNumber.examples = [
+    {
+      name: 'blockNumberExample',
+      description: 'Example of a blockNumber request',
+      params: [],
+      result: {
+        name: 'blockNumberResult',
+        value: '0x1',
+      },
+    },
+  ];
+
+  const signTypedData4 = requireMethod(openrpcDocument, 'eth_signTypedData_v4');
+  if (signTypedData4.examples?.[0]?.params?.[0]) {
+    signTypedData4.examples[0].params[0].value = API_SPECS_ACCOUNT_ADDRESS;
+  }
+  const typedDataDomain = signTypedData4.examples?.[0]?.params?.[1]?.value as
+    | { domain?: { chainId?: number } }
+    | undefined;
+  if (typedDataDomain?.domain) {
+    typedDataDomain.domain.chainId = chainId;
+  }
+
+  const personalSign = requireMethod(openrpcDocument, 'personal_sign');
+  personalSign.examples = [
+    {
+      name: 'personalSignExample',
+      description: 'Example of a personalSign request',
+      params: [
+        {
+          name: 'data',
+          value: '0xdeadbeef',
+        },
+        {
+          name: 'address',
+          value: API_SPECS_ACCOUNT_ADDRESS,
+        },
+      ],
+      result: {
+        name: 'personalSignResult',
+        value: '0x1a8819e0c9bab700',
+      },
+    },
+  ];
+
+  const transaction = (
+    openrpcDocument.components?.schemas?.TransactionInfo as
+      | { allOf?: Record<string, unknown>[] }
+      | undefined
+  )?.allOf?.[0];
+  if (transaction) {
+    delete transaction.unevaluatedProperties;
+  }
+
+  // net_version missing from execution-apis:
+  // https://github.com/ethereum/execution-apis/issues/540
+  // Cast needed: parseOpenRPCDocument types methods via schema-utils-js's
+  // nested @open-rpc/meta-schema, which is a separate type identity.
+  openrpcDocument.methods.push({
+    name: 'net_version',
+    params: [],
+    result: {
+      description: 'Returns the current network ID.',
+      name: 'net_version',
+      schema: {
+        type: 'string',
+      },
+    },
+    description: 'Returns the current network ID.',
+    examples: [
+      {
+        name: 'net_version',
+        description: 'Example of a net_version request',
+        params: [],
+        result: {
+          name: 'net_version',
+          description: 'The current network ID',
+          value: '0x1',
+        },
+      },
+    ],
+  } as (typeof openrpcDocument.methods)[number]);
+
+  return openrpcDocument;
+}
+
+/**
+ * Methods skipped by JsonSchemaFaker / Examples rules (confirmations + unsupported).
+ */
+export function getFilteredMethodsForNonConfirmationRules(
+  document: OpenrpcDocument,
+): string[] {
+  return asMethodObjects(document)
+    .filter((method) => {
+      const name = method.name;
+      return (
+        name.includes('snap') ||
+        name.includes('Snap') ||
+        name.toLowerCase().includes('account') ||
+        name.includes('crypt') ||
+        name.includes('blob') ||
+        name.includes('sendTransaction') ||
+        name.startsWith('wallet_scanQRCode') ||
+        name.includes('filter') ||
+        name.includes('Filter') ||
+        name.includes('getBlockReceipts') ||
+        name.includes('maxPriorityFeePerGas') ||
+        METHODS_WITH_CONFIRMATIONS.includes(name)
+      );
+    })
+    .map((method) => method.name);
+}
+
+export function getAllMethodNames(document: OpenrpcDocument): string[] {
+  return asMethodObjects(document).map((method) => method.name);
+}
diff --git a/tests/smoke-appium/api-specs/helpers/transport.ts b/tests/smoke-appium/api-specs/helpers/transport.ts
new file mode 100644
index 000000000000..18b5e6c9d398
--- /dev/null
+++ b/tests/smoke-appium/api-specs/helpers/transport.ts
@@ -0,0 +1,325 @@
+import { v4 as uuid } from 'uuid';
+import PlaywrightWebMatchers from '../../../framework/PlaywrightWebMatchers.js';
+import { getDriver } from '../../../framework/PlaywrightUtilities.js';
+import { sleep } from '../../../framework/Utilities.js';
+import { getAppiumServerUrl } from '../../../framework/services/appium/AppiumServer.js';
+
+export interface EthereumRpcError {
+  code?: number;
+  message?: string;
+  data?: unknown;
+}
+
+export interface EthereumRpcResponse {
+  result?: unknown;
+  error?: EthereumRpcError;
+}
+
+interface QueueTask {
+  name: string;
+  task: () => Promise<unknown>;
+  resolve: (value: unknown) => void;
+  reject: (reason?: unknown) => void;
+}
+
+const taskQueue: QueueTask[] = [];
+let isProcessing = false;
+let queueGeneration = 0;
+
+const POLL_INTERVAL_MS = 500;
+const DEFAULT_TIMEOUT_MS = 30_000;
+
+interface AppiumExecuteBody {
+  value?: unknown;
+  error?: unknown;
+  message?: string;
+}
+
+function isRuntimeDomainError(value: unknown): boolean {
+  if (!value || typeof value !== 'object') {
+    return false;
+  }
+  const record = value as { error?: { message?: string } };
+  return /Runtime['"]?\s*domain was not found/i.test(
+    record.error?.message ?? '',
+  );
+}
+
+/**
+ * WDIO `driver.execute` can fail opaquely in iOS WKWebView contexts.
+ * Call Appium `/execute/sync` directly after `withWebViewAction` has switched
+ * into the dapp WebView.
+ */
+async function executeInCurrentContext(script: string): Promise<unknown> {
+  const driver = getDriver();
+  const sessionId = driver.sessionId;
+  if (!sessionId) {
+    throw new Error('No Appium session id for WebView execute');
+  }
+
+  const response = await fetch(
+    `${getAppiumServerUrl()}/session/${sessionId}/execute/sync`,
+    {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ script, args: [] }),
+    },
+  );
+  const bodyText = await response.text();
+  let body: AppiumExecuteBody;
+  try {
+    body = JSON.parse(bodyText) as AppiumExecuteBody;
+  } catch {
+    throw new Error(
+      `Appium execute/sync non-JSON response (${response.status}): ${bodyText}`,
+    );
+  }
+
+  if (!response.ok) {
+    throw new Error(
+      `Appium execute/sync failed (${response.status}): ${bodyText}`,
+    );
+  }
+
+  if (body.error != null) {
+    throw new Error(
+      `Appium execute/sync error payload: ${JSON.stringify(body)}`,
+    );
+  }
+
+  // Appium may return HTTP 200 with a nested WebKit inspector error.
+  if (isRuntimeDomainError(body.value)) {
+    throw new Error(
+      `WebKit inspector Runtime domain unavailable (iOS WebView JS bridge). ` +
+        `Raw value: ${JSON.stringify(body.value)}. ` +
+        `Try an iOS 18.x simulator with a matching WDA build; iOS 26.x currently returns this error.`,
+    );
+  }
+
+  if (
+    body.value &&
+    typeof body.value === 'object' &&
+    'error' in (body.value as object)
+  ) {
+    throw new Error(
+      `Appium execute/sync nested error: ${JSON.stringify(body.value)}`,
+    );
+  }
+
+  return body.value;
+}
+
+/**
+ * Drop queued work and abandon the current processor chain.
+ * Required for Playwright CI retries (`retries: 1`): the worker reuses this
+ * module, so leftover tasks from a failed run would otherwise run before the
+ * retry and corrupt OpenRPC fire → Cancel → poll ordering.
+ */
+export function clearTransportQueue(): void {
+  queueGeneration += 1;
+  const pending = taskQueue.splice(0, taskQueue.length);
+  isProcessing = false;
+  for (const item of pending) {
+    item.reject(new Error('Transport queue cleared'));
+  }
+}
+
+export const processQueue = async (): Promise<void> => {
+  if (isProcessing || taskQueue.length === 0) {
+    return;
+  }
+
+  const generation = queueGeneration;
+  isProcessing = true;
+  const { task, resolve, reject } = taskQueue.shift() as QueueTask;
+  try {
+    resolve(await task());
+  } catch (error) {
+    reject(error);
+  } finally {
+    // Skip continuing if clearTransportQueue ran mid-flight (generation bumped).
+    if (generation === queueGeneration) {
+      isProcessing = false;
+      await processQueue();
+    }
+  }
+};
+
+export const addToQueue = ({
+  task,
+  resolve,
+  reject,
+  name: _name,
+}: {
+  name: string;
+  task: () => Promise<unknown>;
+  resolve: (value: unknown) => void;
+  reject: (reason?: unknown) => void;
+}): Promise<void> => {
+  taskQueue.push({ name: _name, task, resolve, reject });
+  return processQueue();
+};
+
+const parseWindowPayload = (text: unknown): EthereumRpcResponse | undefined => {
+  if (text === undefined || text === null) {
+    return undefined;
+  }
+  if (typeof text === 'string') {
+    return JSON.parse(text) as EthereumRpcResponse;
+  }
+  return text as EthereumRpcResponse;
+};
+
+async function waitForEthereumProvider(timeoutMs: number): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const status = await executeInCurrentContext(
+      `return (typeof window.ethereum !== 'undefined' && typeof window.ethereum.request === 'function') ? 'ready' : 'missing';`,
+    );
+    if (status === 'ready') {
+      return;
+    }
+    await sleep(POLL_INTERVAL_MS);
+  }
+
+  const href = await executeInCurrentContext('return location.href;');
+  const title = await executeInCurrentContext('return document.title;');
+  const ethType = await executeInCurrentContext(
+    'return typeof window.ethereum;',
+  );
+  throw new Error(
+    `window.ethereum.request is not available after ${timeoutMs}ms. href=${JSON.stringify(
+      href,
+    )} title=${JSON.stringify(title)} ethType=${JSON.stringify(ethType)}`,
+  );
+}
+
+/**
+ * Start `window.ethereum.request` without waiting for the response.
+ * Used so ConfirmationsRejectRule can tap Cancel while the request is open
+ * (same fire/poll split as Detox api-specs helpers).
+ */
+export async function fireEthereumRequest(
+  pageUrl: string,
+  method: string,
+  params: unknown[] = [],
+  timeoutMs: number = DEFAULT_TIMEOUT_MS,
+): Promise<string> {
+  const generatedKey = uuid();
+
+  await PlaywrightWebMatchers.withWebViewAction(pageUrl, async () => {
+    await waitForEthereumProvider(timeoutMs);
+    await executeInCurrentContext(
+      `var g=${JSON.stringify(generatedKey)};var m=${JSON.stringify(
+        method,
+      )};var p=${JSON.stringify(
+        params,
+      )};window.ethereum.request({method:m,params:p}).then(function(res){window[g]=JSON.stringify({result:res});}).catch(function(err){window[g]=JSON.stringify({error:{code:err&&err.code,message:err&&err.message,data:err&&err.data}});});return 'started';`,
+    );
+  });
+
+  return generatedKey;
+}
+
+/**
+ * Poll a previously fired ethereum request until the window key is set.
+ */
+export async function pollEthereumResponse(
+  pageUrl: string,
+  generatedKey: string,
+  method: string,
+  timeoutMs: number = DEFAULT_TIMEOUT_MS,
+): Promise<EthereumRpcResponse> {
+  let response: EthereumRpcResponse | undefined;
+
+  await PlaywrightWebMatchers.withWebViewAction(pageUrl, async () => {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+      await sleep(POLL_INTERVAL_MS);
+      const text = await executeInCurrentContext(
+        `return window[${JSON.stringify(generatedKey)}];`,
+      );
+      const parsed = parseWindowPayload(text);
+      if (parsed !== undefined) {
+        await executeInCurrentContext(
+          `delete window[${JSON.stringify(generatedKey)}]; return true;`,
+        );
+        response = parsed;
+        return;
+      }
+    }
+
+    throw new Error(
+      `Timed out after ${timeoutMs}ms waiting for ethereum.${method} response`,
+    );
+  });
+
+  if (!response) {
+    throw new Error(`No response captured for ethereum.${method}`);
+  }
+  return response;
+}
+
+/**
+ * Fire `window.ethereum.request` in the in-app browser WebView and poll a
+ * window key for the JSON result (same pattern as Detox api-specs helpers).
+ *
+ * iOS Appium only.
+ */
+export async function requestViaEthereumProvider(
+  pageUrl: string,
+  method: string,
+  params: unknown[] = [],
+  timeoutMs: number = DEFAULT_TIMEOUT_MS,
+): Promise<EthereumRpcResponse> {
+  const generatedKey = await fireEthereumRequest(
+    pageUrl,
+    method,
+    params,
+    timeoutMs,
+  );
+  return pollEthereumResponse(pageUrl, generatedKey, method, timeoutMs);
+}
+
+/**
+ * OpenRPC transport compatible with `@open-rpc/test-coverage`.
+ *
+ * Fire is queued separately from poll so ConfirmationsRejectRule.afterRequest
+ * can enqueue Cancel between them (matches legacy Detox confirmations flow).
+ */
+export const createAppiumDriverTransport =
+  (pageUrl: string) =>
+  async (
+    _url: string | undefined,
+    method: string,
+    params: unknown[] | Record<string, unknown> | undefined,
+  ): Promise<EthereumRpcResponse> => {
+    const normalizedParams = Array.isArray(params)
+      ? params
+      : params
+        ? [params]
+        : [];
+
+    // Fire and poll are separate queue items so ConfirmationsRejectRule
+    // afterRequest (Cancel) can run between them — same ordering as Detox.
+    return new Promise((resolve, reject) => {
+      void addToQueue({
+        name: `transport-fire:${method}`,
+        resolve: resolve as (value: unknown) => void,
+        reject,
+        task: async () =>
+          fireEthereumRequest(pageUrl, method, normalizedParams),
+      });
+    }).then(
+      (generatedKey) =>
+        new Promise((resolve, reject) => {
+          void addToQueue({
+            name: `transport-poll:${method}`,
+            resolve: resolve as (value: unknown) => void,
+            reject,
+            task: async () =>
+              pollEthereumResponse(pageUrl, generatedKey as string, method),
+          });
+        }),
+    );
+  };
diff --git a/tests/smoke-appium/api-specs/json-rpc-coverage.spec.ts b/tests/smoke-appium/api-specs/json-rpc-coverage.spec.ts
new file mode 100644
index 000000000000..ed44e93bb333
--- /dev/null
+++ b/tests/smoke-appium/api-specs/json-rpc-coverage.spec.ts
@@ -0,0 +1,121 @@
+/**
+ * OpenRPC JSON-RPC coverage — iOS Appium only.
+ * Excluded from smoke tags unless APPIUM_RUN_API_SPECS=1 (`yarn test:api-specs`).
+ */
+import rpcCoverageTool from '@open-rpc/test-coverage';
+import JsonSchemaFakerRule from '@open-rpc/test-coverage/build/rules/json-schema-faker-rule';
+import ExamplesRule from '@open-rpc/test-coverage/build/rules/examples-rule';
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { getDappUrl } from '../../framework/fixtures/FixtureUtils.js';
+import { DappVariants } from '../../framework/Constants.js';
+import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  navigateToBrowserView,
+  waitForTestDappToLoad,
+} from '../../flows/browser.flow.js';
+import Browser from '../../page-objects/Browser/BrowserView.js';
+import {
+  clearTransportQueue,
+  createAppiumDriverTransport,
+} from './helpers/transport.js';
+import { startOpenRpcMockServer } from './helpers/mock-server.js';
+import ConfirmationsRejectRule from './helpers/ConfirmationsRejectionRule.js';
+import { CUSTOM_RPC_PROVIDER_MOCKS } from '../../api-mocking/mock-responses/custom-rpc-provider-mocks.js';
+import {
+  API_SPECS_CHAIN_ID,
+  getFilteredMethodsForNonConfirmationRules,
+  METHODS_WITH_CONFIRMATIONS,
+  prepareOpenRpcDocument,
+  SKIP_METHODS,
+} from './helpers/openrpc-document.js';
+
+appiumTest.describe('JSON-RPC OpenRPC coverage', () => {
+  appiumTest.describe.configure({ timeout: 45 * 60 * 1000 });
+
+  appiumTest(
+    'runs OpenRPC examples + confirmation rejections',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      appiumTest.skip(
+        currentDeviceDetails.platform !== 'ios',
+        'API specs run on iOS Appium only',
+      );
+
+      // Worker module state survives Playwright retries — start clean.
+      clearTransportQueue();
+
+      const openrpcDocument = await prepareOpenRpcDocument(API_SPECS_CHAIN_ID);
+      const mockServer = startOpenRpcMockServer(openrpcDocument);
+
+      try {
+        await withFixtures(
+          {
+            dapps: [
+              {
+                dappVariant: DappVariants.TEST_DAPP,
+              },
+            ],
+            fixture: new FixtureBuilder().withGanacheNetwork().build(),
+            disableLocalNodes: true,
+            restartDevice: true,
+            currentDeviceDetails,
+            // wallet_addEthereumChain OpenRPC example references Gnosis RPC.
+            testSpecificMock: CUSTOM_RPC_PROVIDER_MOCKS,
+          },
+          async () => {
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+            await navigateToBrowserView();
+            await Browser.navigateToTestDApp();
+            await waitForTestDappToLoad();
+
+            const pageUrl = getDappUrl(0);
+            const transport = createAppiumDriverTransport(pageUrl);
+            const filteredMethods =
+              getFilteredMethodsForNonConfirmationRules(openrpcDocument);
+
+            const results = await rpcCoverageTool({
+              openrpcDocument,
+              transport,
+              reporters: ['console-streaming'],
+              rules: [
+                new JsonSchemaFakerRule({
+                  only: [],
+                  skip: filteredMethods,
+                  numCalls: 1,
+                }),
+                new ExamplesRule({
+                  only: [],
+                  skip: filteredMethods,
+                }),
+                new ConfirmationsRejectRule({
+                  pageUrl,
+                  only: [...METHODS_WITH_CONFIRMATIONS],
+                }),
+              ],
+              skip: [...SKIP_METHODS],
+            });
+
+            const failing = results.filter((result) => !result.valid);
+            if (failing.length > 0) {
+              const summary = failing
+                .map(
+                  (result) =>
+                    `${result.methodName ?? 'unknown'}: ${
+                      result.reason ?? 'invalid'
+                    }`,
+                )
+                .join('\n');
+              throw new Error(
+                `OpenRPC coverage failures (${failing.length}):\n${summary}`,
+              );
+            }
+          },
+        );
+      } finally {
+        clearTransportQueue();
+        mockServer.stop();
+      }
+    },
+  );
+});
diff --git a/tests/smoke/confirmations/send/metricsValidationHelper.ts b/tests/smoke-appium/confirmations/send/metricsValidationHelper.ts
similarity index 100%
rename from tests/smoke/confirmations/send/metricsValidationHelper.ts
rename to tests/smoke-appium/confirmations/send/metricsValidationHelper.ts
diff --git a/tests/smoke/confirmations/send/send-erc20-token.spec.ts b/tests/smoke-appium/confirmations/send/send-erc20-token.spec.ts
similarity index 65%
rename from tests/smoke/confirmations/send/send-erc20-token.spec.ts
rename to tests/smoke-appium/confirmations/send/send-erc20-token.spec.ts
index e5cd706ef870..98dfd10b9c0e 100644
--- a/tests/smoke/confirmations/send/send-erc20-token.spec.ts
+++ b/tests/smoke-appium/confirmations/send/send-erc20-token.spec.ts
@@ -1,19 +1,20 @@
-/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
 import FixtureBuilder, {
   DEFAULT_FIXTURE_ACCOUNT_CHECKSUM,
-} from '../../../framework/fixtures/FixtureBuilder';
-import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions';
-import SendView from '../../../page-objects/Send/RedesignedSendView';
-import WalletView from '../../../page-objects/wallet/WalletView';
-import { DappVariants } from '../../../framework/Constants';
-import { SmokeConfirmations } from '../../../tags';
-import { AnvilPort } from '../../../framework/fixtures/FixtureUtils';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import { AnvilManager } from '../../../seeder/anvil-manager';
+} from '../../../framework/fixtures/FixtureBuilder.js';
+import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions.js';
+import SendView from '../../../page-objects/Send/RedesignedSendView.js';
+import WalletView from '../../../page-objects/wallet/WalletView.js';
+import { DappVariants } from '../../../framework/Constants.js';
+import { SmokeConfirmations } from '../../../tags.js';
+import { AnvilPort } from '../../../framework/fixtures/FixtureUtils.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import { LocalNodeType } from '../../../framework/types.js';
+import { AnvilManager } from '../../../seeder/anvil-manager.js';
 import { Mockttp } from 'mockttp';
-import { setupMockRequest } from '../../../api-mocking/helpers/mockHelpers';
-import { getDecodedProxiedURL } from '../../../smoke-appium/notifications/utils/helpers';
+import { setupMockRequest } from '../../../api-mocking/helpers/mockHelpers.js';
+import { getDecodedProxiedURL } from '../../notifications/utils/helpers.js';
 import type { AssetsControllerState } from '@metamask/assets-controller';
 
 const RECIPIENT = '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb';
@@ -272,7 +273,7 @@ async function setupAccountsApiMocks(mockServer: Mockttp): Promise<void> {
     eth_getBlockByNumber: {
       number: '0x1234567',
       hash: '0xabc123',
-      timestamp: '0x' + Math.floor(Date.now() / 1000).toString(16),
+      timestamp: '0x6830d400',
       gasLimit: '0x1c9c380',
       gasUsed: '0x5208',
       baseFeePerGas: '0x3B9ACA00',
@@ -397,161 +398,178 @@ async function setupAccountsApiMocks(mockServer: Mockttp): Promise<void> {
   }
 }
 
-describe(SmokeConfirmations('Send ERC20 asset'), () => {
-  it('should send USDC send maxto an address', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }) => {
-          const node = localNodes?.[0] as unknown as AnvilManager;
-          const rpcPort =
-            node instanceof AnvilManager
-              ? (node.getPort() ?? AnvilPort())
-              : undefined;
+appiumTest.describe(SmokeConfirmations('Send ERC20 asset'), () => {
+  appiumTest.describe.configure({ timeout: 2500000 });
+
+  appiumTest(
+    'sends USDC MAX to an address',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: ({ localNodes }) => {
+            const node = localNodes?.[0] as unknown as AnvilManager;
+            const rpcPort =
+              node instanceof AnvilManager
+                ? (node.getPort() ?? AnvilPort())
+                : undefined;
 
-          const fixture = new FixtureBuilder()
-            .withNetworkController({
-              chainId: LOCAL_CHAIN_ID,
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: 'Local RPC',
-              ticker: 'ETH',
-            })
-            .withTokens(
-              [
+            const fixture = new FixtureBuilder()
+              .withNetworkController({
+                chainId: LOCAL_CHAIN_ID,
+                rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
+                type: 'custom',
+                nickname: 'Local RPC',
+                ticker: 'ETH',
+              })
+              .withTokens(
+                [
+                  {
+                    address: USDC_ADDRESS,
+                    symbol: 'USDC',
+                    decimals: 6,
+                    name: 'USD Coin',
+                  },
+                ],
+                LOCAL_CHAIN_ID,
+                TEST_ACCOUNT,
+              )
+              .withTokenRates(LOCAL_CHAIN_ID, USDC_ADDRESS, 1)
+              .withTokensForAllPopularNetworks([
+                {
+                  address: '0x0000000000000000000000000000000000000000',
+                  symbol: 'ETH',
+                  decimals: 18,
+                  name: 'Ethereum',
+                },
                 {
-                  address: USDC_ADDRESS,
+                  address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
                   symbol: 'USDC',
                   decimals: 6,
                   name: 'USD Coin',
                 },
-              ],
-              LOCAL_CHAIN_ID,
-              TEST_ACCOUNT,
-            )
-            .withTokenRates(LOCAL_CHAIN_ID, USDC_ADDRESS, 1)
-            .withTokensForAllPopularNetworks([
-              {
-                address: '0x0000000000000000000000000000000000000000',
-                symbol: 'ETH',
-                decimals: 18,
-                name: 'Ethereum',
-              },
-              {
-                address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-                symbol: 'USDC',
-                decimals: 6,
-                name: 'USD Coin',
-              },
-              {
-                address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-                symbol: 'DAI',
-                decimals: 18,
-                name: 'Dai Stablecoin',
-              },
-            ])
-            .build();
+                {
+                  address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
+                  symbol: 'DAI',
+                  decimals: 18,
+                  name: 'Dai Stablecoin',
+                },
+              ])
+              .build();
 
-          fixture.state.engine.backgroundState.TokenBalancesController.tokenBalances =
-            {
-              ...fixture.state.engine.backgroundState.TokenBalancesController
-                .tokenBalances,
-              [TEST_ACCOUNT]: {
+            fixture.state.engine.backgroundState.TokenBalancesController.tokenBalances =
+              {
                 ...fixture.state.engine.backgroundState.TokenBalancesController
-                  .tokenBalances[TEST_ACCOUNT],
-                [LOCAL_CHAIN_ID]: {
-                  [USDC_ADDRESS]: '0x2540be400',
+                  .tokenBalances,
+                [TEST_ACCOUNT]: {
+                  ...fixture.state.engine.backgroundState
+                    .TokenBalancesController.tokenBalances[TEST_ACCOUNT],
+                  [LOCAL_CHAIN_ID]: {
+                    [USDC_ADDRESS]: '0x2540be400',
+                  },
                 },
-              },
-            };
+              };
 
-          const backgroundState = fixture.state.engine.backgroundState;
-          const selectedAccountId =
-            backgroundState.AccountsController.internalAccounts.selectedAccount;
-          const existingAssetsController = (backgroundState.AssetsController ??
-            {}) as Partial<AssetsControllerState>;
-          const now = Date.now();
+            const backgroundState = fixture.state.engine.backgroundState;
+            const selectedAccountId =
+              backgroundState.AccountsController.internalAccounts
+                .selectedAccount;
+            const existingAssetsController =
+              (backgroundState.AssetsController ??
+                {}) as Partial<AssetsControllerState>;
+            const now = Date.now();
 
-          backgroundState.AssetsController = {
-            ...existingAssetsController,
-            selectedCurrency: 'usd',
-            assetsInfo: {
-              ...existingAssetsController.assetsInfo,
-              [LOCAL_NATIVE_ASSET_ID]: {
-                type: 'native',
-                symbol: 'ETH',
-                name: 'Ethereum',
-                decimals: 18,
+            backgroundState.AssetsController = {
+              ...existingAssetsController,
+              selectedCurrency: 'usd',
+              assetsInfo: {
+                ...existingAssetsController.assetsInfo,
+                [LOCAL_NATIVE_ASSET_ID]: {
+                  type: 'native',
+                  symbol: 'ETH',
+                  name: 'Ethereum',
+                  decimals: 18,
+                },
+                [LOCAL_USDC_ASSET_ID]: {
+                  type: 'erc20',
+                  symbol: 'USDC',
+                  name: 'USD Coin',
+                  decimals: 6,
+                },
               },
-              [LOCAL_USDC_ASSET_ID]: {
-                type: 'erc20',
-                symbol: 'USDC',
-                name: 'USD Coin',
-                decimals: 6,
+              assetsBalance: {
+                ...existingAssetsController.assetsBalance,
+                [selectedAccountId]: {
+                  ...existingAssetsController.assetsBalance?.[
+                    selectedAccountId
+                  ],
+                  [LOCAL_NATIVE_ASSET_ID]: {
+                    amount: '10',
+                  },
+                  [LOCAL_USDC_ASSET_ID]: {
+                    amount: '10000',
+                  },
+                },
               },
-            },
-            assetsBalance: {
-              ...existingAssetsController.assetsBalance,
-              [selectedAccountId]: {
-                ...existingAssetsController.assetsBalance?.[selectedAccountId],
+              assetsPrice: {
+                ...existingAssetsController.assetsPrice,
                 [LOCAL_NATIVE_ASSET_ID]: {
-                  amount: '10',
+                  assetPriceType: 'fungible' as const,
+                  price: 1,
+                  usdPrice: 1,
+                  lastUpdated: now,
                 },
                 [LOCAL_USDC_ASSET_ID]: {
-                  amount: '10000',
+                  assetPriceType: 'fungible' as const,
+                  price: 1,
+                  usdPrice: 1,
+                  lastUpdated: now,
                 },
               },
-            },
-            assetsPrice: {
-              ...existingAssetsController.assetsPrice,
-              [LOCAL_NATIVE_ASSET_ID]: {
-                assetPriceType: 'fungible' as const,
-                price: 1,
-                usdPrice: 1,
-                lastUpdated: now,
+              customAssets: {
+                ...existingAssetsController.customAssets,
+                [selectedAccountId]: [
+                  ...new Set([
+                    ...(existingAssetsController.customAssets?.[
+                      selectedAccountId
+                    ] ?? []),
+                    LOCAL_USDC_ASSET_ID,
+                  ]),
+                ],
               },
-              [LOCAL_USDC_ASSET_ID]: {
-                assetPriceType: 'fungible' as const,
-                price: 1,
-                usdPrice: 1,
-                lastUpdated: now,
+            };
+
+            return fixture;
+          },
+          localNodeOptions: [
+            {
+              type: LocalNodeType.anvil,
+              options: {
+                chainId: 1337,
               },
             },
-            customAssets: {
-              ...existingAssetsController.customAssets,
-              [selectedAccountId]: [
-                ...new Set([
-                  ...(existingAssetsController.customAssets?.[
-                    selectedAccountId
-                  ] ?? []),
-                  LOCAL_USDC_ASSET_ID,
-                ]),
-              ],
-            },
-          };
-
-          return fixture;
+          ],
+          testSpecificMock: setupAccountsApiMocks,
+          restartDevice: true,
+          currentDeviceDetails,
         },
-        testSpecificMock: setupAccountsApiMocks,
-        restartDevice: true,
-      },
-      async () => {
-        await loginToApp();
-        await device.disableSynchronization();
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
 
-        // send Max USDC
-        await WalletView.tapWalletSendButton();
-        await SendView.selectERC20Token();
-        await SendView.pressAmountMaxButton();
-        await SendView.pressContinueButton();
-        await SendView.inputRecipientAddress(RECIPIENT);
-        await SendView.pressReviewButton();
-        await FooterActions.tapCancelButton();
-      },
-    );
-  });
+          // send Max USDC
+          await WalletView.tapWalletSendButton();
+          await SendView.selectERC20Token();
+          await SendView.pressAmountMaxButton();
+          await SendView.pressContinueButton();
+          await SendView.inputRecipientAddress(RECIPIENT);
+          await SendView.pressReviewButton();
+          await FooterActions.tapCancelButton();
+        },
+      );
+    },
+  );
 });
diff --git a/tests/smoke-appium/confirmations/send/send-native-token.spec.ts b/tests/smoke-appium/confirmations/send/send-native-token.spec.ts
new file mode 100644
index 000000000000..e721292f3344
--- /dev/null
+++ b/tests/smoke-appium/confirmations/send/send-native-token.spec.ts
@@ -0,0 +1,178 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import FixtureBuilder, {
+  DEFAULT_FIXTURE_ACCOUNT,
+} from '../../../framework/fixtures/FixtureBuilder.js';
+import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions.js';
+import SendView from '../../../page-objects/Send/RedesignedSendView.js';
+import TabBarComponent from '../../../page-objects/wallet/TabBarComponent.js';
+import WalletView from '../../../page-objects/wallet/WalletView.js';
+import { Assertions } from '../../../framework/index.js';
+import {
+  DappVariants,
+  LOCAL_NODE_RPC_URL,
+} from '../../../framework/Constants.js';
+import { SmokeConfirmations } from '../../../tags.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import { LocalNode, LocalNodeType } from '../../../framework/types.js';
+import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { Mockttp } from 'mockttp';
+import { setupMockRequest } from '../../../api-mocking/helpers/mockHelpers.js';
+import type { AssetsControllerState } from '@metamask/assets-controller';
+import { validateTransactionHashInTransactionFinalizedEvent } from './metricsValidationHelper.js';
+
+const RECIPIENT = '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb';
+const LOCAL_NATIVE_ASSET_ID = 'eip155:1337/slip44:60';
+
+function buildNativeSendFixture() {
+  const fixture = new FixtureBuilder()
+    .withNetworkController({
+      chainId: '0x539',
+      rpcUrl: LOCAL_NODE_RPC_URL,
+      type: 'custom',
+      nickname: 'Local RPC',
+      ticker: 'ETH',
+    })
+    .withMetaMetricsOptIn()
+    .withPreferencesController({})
+    .build();
+
+  const backgroundState = fixture.state.engine.backgroundState;
+  const selectedAccountId =
+    backgroundState.AccountsController.internalAccounts.selectedAccount;
+  const existingAssetsController = (backgroundState.AssetsController ??
+    {}) as Partial<AssetsControllerState>;
+  const now = Date.now();
+
+  backgroundState.AssetsController = {
+    ...existingAssetsController,
+    selectedCurrency: 'usd',
+    assetsInfo: {
+      ...existingAssetsController.assetsInfo,
+      [LOCAL_NATIVE_ASSET_ID]: {
+        type: 'native',
+        symbol: 'ETH',
+        name: 'Ethereum',
+        decimals: 18,
+      },
+    },
+    assetsBalance: {
+      ...existingAssetsController.assetsBalance,
+      [selectedAccountId]: {
+        ...existingAssetsController.assetsBalance?.[selectedAccountId],
+        [LOCAL_NATIVE_ASSET_ID]: {
+          amount: '100',
+        },
+      },
+    },
+    assetsPrice: {
+      ...existingAssetsController.assetsPrice,
+      [LOCAL_NATIVE_ASSET_ID]: {
+        assetPriceType: 'fungible' as const,
+        price: 1,
+        usdPrice: 1,
+        lastUpdated: now,
+      },
+    },
+    customAssets: {
+      ...existingAssetsController.customAssets,
+      [selectedAccountId]: [
+        ...new Set([
+          ...(existingAssetsController.customAssets?.[selectedAccountId] ?? []),
+          LOCAL_NATIVE_ASSET_ID,
+        ]),
+      ],
+    },
+  };
+
+  return fixture;
+}
+
+appiumTest.describe(SmokeConfirmations('Send native asset'), () => {
+  appiumTest.describe.configure({ timeout: 2500000 });
+
+  appiumTest(
+    'sends MAX balance ETH to an address',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: buildNativeSendFixture,
+          localNodeOptions: [
+            {
+              type: LocalNodeType.anvil,
+              options: {
+                chainId: 1337,
+                balance: 100,
+              },
+            },
+          ],
+          restartDevice: true,
+          testSpecificMock: async (mockServer: Mockttp) => {
+            await setupRemoteFeatureFlagsMock(mockServer);
+
+            await setupMockRequest(mockServer, {
+              requestMethod: 'PUT',
+              url: /https:\/\/authentication\.api\.cx\.metamask\.io\/api\/v2\/profile\/accounts/i,
+              response: {
+                message: 'OK',
+              },
+              responseCode: 200,
+            });
+
+            await setupMockRequest(mockServer, {
+              url: /accounts\.api\.cx\.metamask\.io\/v4\/multiaccount\/balances/,
+              response: {
+                balances: [
+                  {
+                    object: 'token',
+                    address: '0x0000000000000000000000000000000000000000',
+                    symbol: 'ETH',
+                    name: 'Ether',
+                    type: 'native',
+                    decimals: 18,
+                    chainId: 1337,
+                    balance: '100.000000000000000000',
+                    accountAddress: `eip155:1337:${DEFAULT_FIXTURE_ACCOUNT}`,
+                  },
+                ],
+                unprocessedNetworks: [],
+              },
+              requestMethod: 'GET',
+              responseCode: 200,
+            });
+          },
+          currentDeviceDetails,
+        },
+        async ({
+          localNodes,
+          mockServer,
+        }: {
+          localNodes?: LocalNode[];
+          mockServer?: Mockttp;
+        }) => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+          await WalletView.tapWalletSendButton();
+          await SendView.selectEthereumToken();
+          await SendView.pressAmountMaxButton();
+          await SendView.pressContinueButton();
+          await SendView.inputRecipientAddress(RECIPIENT);
+          await SendView.pressReviewButton();
+          await FooterActions.tapConfirmButton();
+          await TabBarComponent.tapActivity();
+          await Assertions.expectTextDisplayed('Confirmed');
+
+          await validateTransactionHashInTransactionFinalizedEvent(
+            localNodes,
+            mockServer,
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/confirmations/signatures/signatures-typed.spec.ts b/tests/smoke-appium/confirmations/signatures/signatures-typed.spec.ts
index b3761a4f6ccb..04d12e39f79d 100644
--- a/tests/smoke-appium/confirmations/signatures/signatures-typed.spec.ts
+++ b/tests/smoke-appium/confirmations/signatures/signatures-typed.spec.ts
@@ -34,9 +34,7 @@ const SIGNATURE_LIST = [
       }),
     requestType: () => RequestTypes.TypedSignRequest,
     additionAssertions: async () => {
-      await Assertions.expectElementToBeVisible(
-        () => RowComponents.NetworkAndOrigin,
-      );
+      await Assertions.expectElementToBeVisible(RowComponents.NetworkAndOrigin);
     },
   },
   {
@@ -47,7 +45,7 @@ const SIGNATURE_LIST = [
       }),
     requestType: () => RequestTypes.TypedSignRequest,
     additionAssertions: async () => {
-      await Assertions.expectElementToBeVisible(() => RowComponents.OriginInfo);
+      await Assertions.expectElementToBeVisible(RowComponents.OriginInfo);
     },
   },
   {
@@ -58,7 +56,7 @@ const SIGNATURE_LIST = [
       }),
     requestType: () => RequestTypes.TypedSignRequest,
     additionAssertions: async () => {
-      await Assertions.expectElementToBeVisible(() => RowComponents.OriginInfo);
+      await Assertions.expectElementToBeVisible(RowComponents.OriginInfo);
     },
   },
 ];
@@ -129,20 +127,18 @@ appiumTest.describe(SmokeConfirmations('Typed Signature Requests'), () => {
 
             // cancel request
             await testDappBtn();
-            await Assertions.expectElementToBeVisible(requestType);
+            await Assertions.expectElementToBeVisible(requestType());
             await FooterActions.tapCancelButton();
-            await Assertions.expectElementToNotBeVisible(requestType);
+            await Assertions.expectElementToNotBeVisible(requestType());
 
             await testDappBtn();
-            await Assertions.expectElementToBeVisible(requestType);
+            await Assertions.expectElementToBeVisible(requestType());
 
             // check different sections are visible
             await Assertions.expectElementToBeVisible(
-              () => RowComponents.AccountNetwork,
-            );
-            await Assertions.expectElementToBeVisible(
-              () => RowComponents.Message,
+              RowComponents.AccountNetwork,
             );
+            await Assertions.expectElementToBeVisible(RowComponents.Message);
 
             // any signature specific additional assertions
             if (additionAssertions) {
@@ -151,7 +147,7 @@ appiumTest.describe(SmokeConfirmations('Typed Signature Requests'), () => {
 
             // confirm request
             await FooterActions.tapConfirmButton();
-            await Assertions.expectElementToNotBeVisible(requestType);
+            await Assertions.expectElementToNotBeVisible(requestType());
           },
         );
       },
diff --git a/tests/smoke-appium/confirmations/signatures/signatures.spec.ts b/tests/smoke-appium/confirmations/signatures/signatures.spec.ts
index a36789b7bc71..0a128a3341dc 100644
--- a/tests/smoke-appium/confirmations/signatures/signatures.spec.ts
+++ b/tests/smoke-appium/confirmations/signatures/signatures.spec.ts
@@ -34,9 +34,7 @@ const SIGNATURE_LIST = [
       }),
     requestType: () => RequestTypes.PersonalSignRequest,
     additionAssertions: async () => {
-      await Assertions.expectElementToBeVisible(
-        () => RowComponents.NetworkAndOrigin,
-      );
+      await Assertions.expectElementToBeVisible(RowComponents.NetworkAndOrigin);
     },
   },
   {
@@ -48,7 +46,7 @@ const SIGNATURE_LIST = [
     requestType: () => RequestTypes.PersonalSignRequest,
     additionAssertions: async () => {
       await Assertions.expectElementToBeVisible(
-        () => RowComponents.SiweSigningAccountInfo,
+        RowComponents.SiweSigningAccountInfo,
       );
     },
   },
@@ -120,20 +118,18 @@ appiumTest.describe(SmokeConfirmations('Signature Requests'), () => {
 
             // cancel request
             await testDappBtn();
-            await Assertions.expectElementToBeVisible(requestType);
+            await Assertions.expectElementToBeVisible(requestType());
             await FooterActions.tapCancelButton();
-            await Assertions.expectElementToNotBeVisible(requestType);
+            await Assertions.expectElementToNotBeVisible(requestType());
 
             await testDappBtn();
-            await Assertions.expectElementToBeVisible(requestType);
+            await Assertions.expectElementToBeVisible(requestType());
 
             // check different sections are visible
             await Assertions.expectElementToBeVisible(
-              () => RowComponents.AccountNetwork,
-            );
-            await Assertions.expectElementToBeVisible(
-              () => RowComponents.Message,
+              RowComponents.AccountNetwork,
             );
+            await Assertions.expectElementToBeVisible(RowComponents.Message);
 
             // any signature specific additional assertions
             if (additionAssertions) {
@@ -142,7 +138,7 @@ appiumTest.describe(SmokeConfirmations('Signature Requests'), () => {
 
             // confirm request
             await FooterActions.tapConfirmButton();
-            await Assertions.expectElementToNotBeVisible(requestType);
+            await Assertions.expectElementToNotBeVisible(requestType());
           },
         );
       },
diff --git a/tests/smoke-appium/confirmations/transactions/7702/batch-transaction.spec.ts b/tests/smoke-appium/confirmations/transactions/7702/batch-transaction.spec.ts
new file mode 100644
index 000000000000..732042562818
--- /dev/null
+++ b/tests/smoke-appium/confirmations/transactions/7702/batch-transaction.spec.ts
@@ -0,0 +1,232 @@
+import { test as appiumTest } from '../../../../framework/fixtures/playwright/index.js';
+import { SmokeConfirmations } from '../../../../tags.js';
+import {
+  dismissPushNotificationExistingUserSheet,
+  loginToAppPlaywright,
+} from '../../../../flows/wallet.flow.js';
+import {
+  assertSmartAccountUpgradeActivity,
+  assertUpgradeConfirmationRows,
+  dismissSmartAccountScreensAndOpenFilteredActivity,
+  LOCAL_CHAIN_CAIP,
+  navigateToTestDappAndTap,
+  openSmartAccountSwitchForSelectedAccount,
+  SMART_ACCOUNT_UPGRADED_ACTIVITY,
+  SMART_ACCOUNT_UPGRADING_ACTIVITY,
+  switchToLocalNetworkFromNetworkManager,
+} from '../../../../flows/confirmations.flow.js';
+import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../../framework/Assertions.js';
+import Matchers from '../../../../framework/Matchers.js';
+import { withFixtures } from '../../../../framework/fixtures/FixtureHelper.js';
+import {
+  AnvilPort,
+  buildPermissions,
+  getDappUrlForFixture,
+} from '../../../../framework/fixtures/FixtureUtils.js';
+import Browser from '../../../../page-objects/Browser/BrowserView.js';
+import ConfirmationUITypes from '../../../../page-objects/Browser/Confirmations/ConfirmationUITypes.js';
+import FooterActions from '../../../../page-objects/Browser/Confirmations/FooterActions.js';
+import RowComponents from '../../../../page-objects/Browser/Confirmations/RowComponents.js';
+import ActivitiesView from '../../../../page-objects/Transactions/ActivitiesView.js';
+import TabBarComponent from '../../../../page-objects/wallet/TabBarComponent.js';
+import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../../api-mocking/mock-responses/simulations.js';
+import { TestDappSelectorsWebIDs } from '../../../../selectors/Browser/TestDapp.selectors.js';
+import { DappVariants } from '../../../../framework/Constants.js';
+import { setupMockRequest } from '../../../../api-mocking/helpers/mockHelpers.js';
+import { Mockttp } from 'mockttp';
+import { setupRemoteFeatureFlagsMock } from '../../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { confirmationFeatureFlags } from '../../../../api-mocking/mock-responses/feature-flags-mocks.js';
+import {
+  AnvilNodeOptions,
+  LocalNode,
+  LocalNodeType,
+} from '../../../../framework/types.js';
+import { AnvilManager, Hardfork } from '../../../../seeder/anvil-manager.js';
+
+const ANVIL_NODE_OPTIONS_WITH_7702: AnvilNodeOptions = {
+  hardfork: 'prague' as Hardfork,
+  // Seeder dump only — Detox twin pre-designates Account 1 (upgrade becomes downgrade).
+  loadState: './tests/seeder/network-states/7702/withDelegatorContracts.json',
+};
+
+function buildLocalRpcFixture({
+  localNodes,
+  withTestDappPermission = false,
+}: {
+  localNodes?: LocalNode[];
+  withTestDappPermission?: boolean;
+}) {
+  const node = localNodes?.[0] as unknown as AnvilManager;
+  const rpcPort =
+    node instanceof AnvilManager ? (node.getPort() ?? AnvilPort()) : undefined;
+
+  let builder = new FixtureBuilder().withNetworkController({
+    chainId: '0x539',
+    rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
+    type: 'custom',
+    nickname: 'Local RPC',
+    ticker: 'ETH',
+  });
+
+  if (withTestDappPermission) {
+    builder = builder.withPermissionControllerConnectedToTestDapp(
+      buildPermissions(['0x539']),
+    );
+  }
+
+  const fixture = builder.build();
+
+  if (withTestDappPermission) {
+    fixture.state.browser.tabs[0].url = getDappUrlForFixture(0);
+  }
+
+  return fixture;
+}
+
+const testSpecificMock = async (mockServer: Mockttp) => {
+  await setupMockRequest(mockServer, {
+    requestMethod: 'GET',
+    url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
+    response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
+    responseCode: 200,
+  });
+  await setupRemoteFeatureFlagsMock(mockServer, {
+    ...Object.assign({}, ...confirmationFeatureFlags),
+    tmcuActivityRedesignEnabled: true,
+  });
+};
+
+appiumTest.describe(SmokeConfirmations('7702 - smart account'), () => {
+  appiumTest.describe.configure({ timeout: 2500000 });
+
+  appiumTest(
+    'submits a wallet_sendCalls batch of two transactions',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: ({ localNodes }: { localNodes?: LocalNode[] }) =>
+            buildLocalRpcFixture({
+              localNodes,
+              withTestDappPermission: true,
+            }),
+          localNodeOptions: [
+            {
+              type: LocalNodeType.anvil,
+              options: ANVIL_NODE_OPTIONS_WITH_7702,
+            },
+          ],
+          restartDevice: true,
+          testSpecificMock,
+          currentDeviceDetails,
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+          await switchToLocalNetworkFromNetworkManager();
+          await navigateToTestDappAndTap(
+            TestDappSelectorsWebIDs.SEND_CALLS_BUTTON,
+            'Send calls (EIP-5792) button',
+          );
+
+          await Assertions.expectTextDisplayed('Includes 2 transactions', {
+            description: 'Batch includes 2 transactions',
+          });
+          await Assertions.expectElementToExist(
+            ConfirmationUITypes.ModalConfirmationContainer,
+            {
+              description: 'Modal confirmation container',
+            },
+          );
+          await assertUpgradeConfirmationRows();
+          await Assertions.expectElementToExist(
+            RowComponents.SimulationDetails,
+            {
+              description: 'Simulation Details',
+            },
+          );
+
+          await FooterActions.tapConfirmButton();
+          await FooterActions.waitForConfirmButtonGone();
+          await dismissPushNotificationExistingUserSheet();
+          await Assertions.expectElementToExist(Browser.browserScreenID, {
+            description: 'Browser screen after confirm',
+          });
+          await Browser.tapCloseBrowserButton();
+          await Assertions.expectElementToBeVisible(
+            TabBarComponent.tabBarWalletButton,
+            {
+              description: 'Wallet tab visible after leaving browser',
+            },
+          );
+          await TabBarComponent.tapActivity();
+          await ActivitiesView.filterByNetwork(LOCAL_CHAIN_CAIP);
+
+          await assertSmartAccountUpgradeActivity(
+            SMART_ACCOUNT_UPGRADED_ACTIVITY,
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'upgrades an account to a smart account',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: ({ localNodes }: { localNodes?: LocalNode[] }) =>
+            buildLocalRpcFixture({ localNodes }),
+          localNodeOptions: [
+            {
+              type: LocalNodeType.anvil,
+              options: ANVIL_NODE_OPTIONS_WITH_7702,
+            },
+          ],
+          restartDevice: true,
+          testSpecificMock,
+          currentDeviceDetails,
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+          await switchToLocalNetworkFromNetworkManager();
+          await openSmartAccountSwitchForSelectedAccount();
+
+          // iOS: assert hierarchy (isDisplayed flaky). Apostrophe-free substring
+          // — Appium buildTextXPath breaks on `'`.
+          await Assertions.expectElementToExist(
+            Matchers.getElementByText('Account update'),
+            {
+              description: 'Account update title',
+            },
+          );
+          await Assertions.expectElementToExist(
+            Matchers.getElementByText('switching to a smart account'),
+            {
+              description: 'Upgrade to smart account copy',
+            },
+          );
+          await Assertions.expectElementToExist(
+            ConfirmationUITypes.ModalConfirmationContainer,
+            {
+              description: 'Modal confirmation container',
+            },
+          );
+          await assertUpgradeConfirmationRows();
+
+          await dismissSmartAccountScreensAndOpenFilteredActivity();
+          // Upgrade tx never reached Anvil (empty txpool / no 0xef01) — pending only.
+          await assertSmartAccountUpgradeActivity(
+            SMART_ACCOUNT_UPGRADING_ACTIVITY,
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke/confirmations/transactions/7702/withDelegatorContracts.json b/tests/smoke-appium/confirmations/transactions/7702/withDelegatorContracts.json
similarity index 100%
rename from tests/smoke/confirmations/transactions/7702/withDelegatorContracts.json
rename to tests/smoke-appium/confirmations/transactions/7702/withDelegatorContracts.json
diff --git a/tests/smoke-appium/confirmations/transactions/contract-deployment.spec.ts b/tests/smoke-appium/confirmations/transactions/contract-deployment.spec.ts
new file mode 100644
index 000000000000..f80ba1613263
--- /dev/null
+++ b/tests/smoke-appium/confirmations/transactions/contract-deployment.spec.ts
@@ -0,0 +1,122 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { SmokeConfirmations } from '../../../tags.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import {
+  navigateToTestDappAndTap,
+  confirmCloseAndAssertActivity,
+} from '../../../flows/confirmations.flow.js';
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../framework/Assertions.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import {
+  buildPermissions,
+  AnvilPort,
+  getDappUrlForFixture,
+} from '../../../framework/fixtures/FixtureUtils.js';
+import RowComponents from '../../../page-objects/Browser/Confirmations/RowComponents.js';
+import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../api-mocking/mock-responses/simulations.js';
+import { TestDappSelectorsWebIDs } from '../../../selectors/Browser/TestDapp.selectors.js';
+import { DappVariants } from '../../../framework/Constants.js';
+import { setupMockRequest } from '../../../api-mocking/helpers/mockHelpers.js';
+import { Mockttp } from 'mockttp';
+import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { confirmationFeatureFlags } from '../../../api-mocking/mock-responses/feature-flags-mocks.js';
+import { LocalNode, LocalNodeType } from '../../../framework/types.js';
+import { AnvilManager } from '../../../seeder/anvil-manager.js';
+
+const CONTRACT_DEPLOYMENT_ACTIVITY = 'Contract deployment';
+
+function buildContractDeploymentFixture({
+  localNodes,
+}: {
+  localNodes?: LocalNode[];
+}) {
+  const node = localNodes?.[0] as unknown as AnvilManager;
+  const rpcPort =
+    node instanceof AnvilManager ? (node.getPort() ?? AnvilPort()) : undefined;
+
+  const fixture = new FixtureBuilder()
+    .withNetworkController({
+      chainId: '0x539',
+      rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
+      type: 'custom',
+      nickname: 'Local RPC',
+      ticker: 'ETH',
+    })
+    .withPermissionControllerConnectedToTestDapp(buildPermissions(['0x539']))
+    .build();
+
+  fixture.state.browser.tabs[0].url = getDappUrlForFixture(0);
+
+  return fixture;
+}
+
+const testSpecificMock = async (mockServer: Mockttp) => {
+  await setupMockRequest(mockServer, {
+    requestMethod: 'GET',
+    url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
+    response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
+    responseCode: 200,
+  });
+  await setupRemoteFeatureFlagsMock(
+    mockServer,
+    Object.assign({}, ...confirmationFeatureFlags),
+  );
+};
+
+appiumTest.describe(SmokeConfirmations('Contract Deployment'), () => {
+  appiumTest.describe.configure({ timeout: 2500000 });
+
+  appiumTest(
+    'deploys a contract',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: buildContractDeploymentFixture,
+          localNodeOptions: [
+            {
+              type: LocalNodeType.anvil,
+              options: {
+                chainId: 1337,
+              },
+            },
+          ],
+          restartDevice: true,
+          testSpecificMock,
+          currentDeviceDetails,
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+          await navigateToTestDappAndTap(
+            TestDappSelectorsWebIDs.DEPLOY_CONTRACT_BUTTON_ID,
+            'Deploy contract button',
+          );
+
+          await Assertions.expectElementToExist(RowComponents.AccountNetwork, {
+            description: 'Account Network',
+          });
+          await Assertions.expectElementToExist(
+            RowComponents.SimulationDetails,
+            {
+              description: 'Simulation Details',
+            },
+          );
+          await Assertions.expectElementToExist(RowComponents.GasFeesDetails, {
+            description: 'Gas Fees Details',
+          });
+          await Assertions.expectElementToExist(RowComponents.AdvancedDetails, {
+            description: 'Advanced Details',
+          });
+
+          await confirmCloseAndAssertActivity(CONTRACT_DEPLOYMENT_ACTIVITY);
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/confirmations/transactions/contract-interaction.spec.ts b/tests/smoke-appium/confirmations/transactions/contract-interaction.spec.ts
new file mode 100644
index 000000000000..c49935019283
--- /dev/null
+++ b/tests/smoke-appium/confirmations/transactions/contract-interaction.spec.ts
@@ -0,0 +1,135 @@
+import { SMART_CONTRACTS } from '../../../../app/util/test/smart-contracts.js';
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { SmokeConfirmations } from '../../../tags.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import {
+  navigateToContractAndTap,
+  confirmCloseAndAssertActivity,
+} from '../../../flows/confirmations.flow.js';
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../framework/Assertions.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import {
+  buildPermissions,
+  AnvilPort,
+  getDappUrlForFixture,
+} from '../../../framework/fixtures/FixtureUtils.js';
+import RowComponents from '../../../page-objects/Browser/Confirmations/RowComponents.js';
+import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../api-mocking/mock-responses/simulations.js';
+import { TestDappSelectorsWebIDs } from '../../../selectors/Browser/TestDapp.selectors.js';
+import { DappVariants } from '../../../framework/Constants.js';
+import { setupMockRequest } from '../../../api-mocking/helpers/mockHelpers.js';
+import { Mockttp } from 'mockttp';
+import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { confirmationFeatureFlags } from '../../../api-mocking/mock-responses/feature-flags-mocks.js';
+import { LocalNode, LocalNodeType } from '../../../framework/types.js';
+import { AnvilManager } from '../../../seeder/anvil-manager.js';
+
+const NFT_CONTRACT = SMART_CONTRACTS.NFTS;
+
+function buildContractInteractionFixture({
+  localNodes,
+}: {
+  localNodes?: LocalNode[];
+}) {
+  const node = localNodes?.[0] as unknown as AnvilManager;
+  const rpcPort =
+    node instanceof AnvilManager ? (node.getPort() ?? AnvilPort()) : undefined;
+
+  const fixture = new FixtureBuilder()
+    .withNetworkController({
+      chainId: '0x539',
+      rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
+      type: 'custom',
+      nickname: 'Local RPC',
+      ticker: 'ETH',
+    })
+    .withPermissionControllerConnectedToTestDapp(buildPermissions(['0x539']))
+    .build();
+
+  fixture.state.browser.tabs[0].url = getDappUrlForFixture(0);
+
+  return fixture;
+}
+
+const testSpecificMock = async (mockServer: Mockttp) => {
+  await setupMockRequest(mockServer, {
+    requestMethod: 'GET',
+    url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
+    response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
+    responseCode: 200,
+  });
+  await setupRemoteFeatureFlagsMock(
+    mockServer,
+    Object.assign({}, ...confirmationFeatureFlags),
+  );
+};
+
+appiumTest.describe(SmokeConfirmations('Contract Interaction'), () => {
+  appiumTest.describe.configure({ timeout: 2500000 });
+
+  appiumTest(
+    'submits transaction',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: buildContractInteractionFixture,
+          localNodeOptions: [
+            {
+              type: LocalNodeType.anvil,
+              options: {
+                chainId: 1337,
+              },
+            },
+          ],
+          restartDevice: true,
+          testSpecificMock,
+          smartContracts: [NFT_CONTRACT],
+          currentDeviceDetails,
+        },
+        async ({ contractRegistry }) => {
+          const nftsAddress =
+            await contractRegistry?.getContractAddress(NFT_CONTRACT);
+
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+          await navigateToContractAndTap(
+            nftsAddress as string,
+            TestDappSelectorsWebIDs.ERC_721_MINT_BUTTON_ID,
+            'ERC-721 mint button',
+          );
+
+          // Existence: BottomSheet children report isDisplayed=false on iOS.
+          await Assertions.expectElementToExist(RowComponents.AccountNetwork, {
+            description: 'Account Network',
+          });
+          await Assertions.expectElementToExist(
+            RowComponents.SimulationDetails,
+            {
+              description: 'Simulation Details',
+            },
+          );
+          await Assertions.expectElementToExist(
+            RowComponents.NetworkAndOrigin,
+            {
+              description: 'Network And Origin',
+            },
+          );
+          await Assertions.expectElementToExist(RowComponents.GasFeesDetails, {
+            description: 'Gas Fees Details',
+          });
+          await Assertions.expectElementToExist(RowComponents.AdvancedDetails, {
+            description: 'Advanced Details',
+          });
+
+          await confirmCloseAndAssertActivity();
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/confirmations/transactions/dapp-initiated-transfer.spec.ts b/tests/smoke-appium/confirmations/transactions/dapp-initiated-transfer.spec.ts
new file mode 100644
index 000000000000..05f22e7dd93e
--- /dev/null
+++ b/tests/smoke-appium/confirmations/transactions/dapp-initiated-transfer.spec.ts
@@ -0,0 +1,180 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { SmokeConfirmations } from '../../../tags.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import {
+  confirmCloseAndAssertActivity,
+  navigateToTestDappAndTap,
+} from '../../../flows/confirmations.flow.js';
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../framework/Assertions.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import {
+  AnvilPort,
+  buildPermissions,
+  getDappUrlForFixture,
+} from '../../../framework/fixtures/FixtureUtils.js';
+import RowComponents from '../../../page-objects/Browser/Confirmations/RowComponents.js';
+import {
+  SEND_ETH_SIMULATION_MOCK,
+  SIMULATION_ENABLED_NETWORKS_MOCK,
+} from '../../../api-mocking/mock-responses/simulations.js';
+import { TestDappSelectorsWebIDs } from '../../../selectors/Browser/TestDapp.selectors.js';
+import { DappVariants } from '../../../framework/Constants.js';
+import { Mockttp } from 'mockttp';
+import {
+  setupMockPostRequest,
+  setupMockRequest,
+} from '../../../api-mocking/helpers/mockHelpers.js';
+import {
+  SECURITY_ALERTS_BENIGN_RESPONSE,
+  SECURITY_ALERTS_REQUEST_BODY,
+  securityAlertsUrl,
+} from '../../../api-mocking/mock-responses/security-alerts-mock.js';
+import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { confirmationFeatureFlags } from '../../../api-mocking/mock-responses/feature-flags-mocks.js';
+import { LocalNode, LocalNodeType } from '../../../framework/types.js';
+import { AnvilManager } from '../../../seeder/anvil-manager.js';
+import { dappInitiatedTransferAnalyticsExpectations } from '../../../helpers/analytics/expectations/dapp-initiated-transfer.analytics.js';
+
+function buildDappInitiatedTransferFixture({
+  localNodes,
+}: {
+  localNodes?: LocalNode[];
+}) {
+  const node = localNodes?.[0] as unknown as AnvilManager;
+  const rpcPort =
+    node instanceof AnvilManager ? (node.getPort() ?? AnvilPort()) : undefined;
+
+  const fixture = new FixtureBuilder()
+    .withNetworkController({
+      chainId: '0x539',
+      rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
+      type: 'custom',
+      nickname: 'Local RPC',
+      ticker: 'ETH',
+    })
+    .withNetworkEnabledMap({
+      eip155: { '0x539': true },
+    })
+    .withMetaMetricsOptIn()
+    .withPermissionControllerConnectedToTestDapp(buildPermissions(['0x539']))
+    .build();
+
+  fixture.state.browser.tabs[0].url = getDappUrlForFixture(0);
+
+  return fixture;
+}
+
+const testSpecificMock = async (mockServer: Mockttp) => {
+  await setupMockPostRequest(
+    mockServer,
+    securityAlertsUrl('0x539'),
+    SECURITY_ALERTS_REQUEST_BODY,
+    SECURITY_ALERTS_BENIGN_RESPONSE,
+    {
+      statusCode: 201,
+      ignoreFields: [
+        'networkClientId',
+        'id',
+        'toNative',
+        'origin',
+        'params[0].to',
+        'params[0].gas',
+        'params[0].gasPrice',
+      ],
+    },
+  );
+
+  await setupMockRequest(mockServer, {
+    requestMethod: 'GET',
+    url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
+    response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
+    responseCode: 200,
+  });
+
+  const {
+    urlEndpoint: simulationEndpoint,
+    requestBody,
+    response: simulationResponse,
+    ignoreFields,
+  } = SEND_ETH_SIMULATION_MOCK;
+
+  await setupMockPostRequest(
+    mockServer,
+    simulationEndpoint,
+    requestBody,
+    simulationResponse,
+    {
+      statusCode: 200,
+      ignoreFields,
+    },
+  );
+  await setupRemoteFeatureFlagsMock(
+    mockServer,
+    Object.assign({}, ...confirmationFeatureFlags),
+  );
+};
+
+appiumTest.describe(SmokeConfirmations('DApp Initiated Transfer'), () => {
+  appiumTest.describe.configure({ timeout: 2500000 });
+
+  appiumTest(
+    'sends native asset and validates MetaMetrics transaction events',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: buildDappInitiatedTransferFixture,
+          localNodeOptions: [
+            {
+              type: LocalNodeType.anvil,
+              options: {
+                chainId: 1337,
+              },
+            },
+          ],
+          restartDevice: true,
+          testSpecificMock,
+          analyticsExpectations: dappInitiatedTransferAnalyticsExpectations,
+          currentDeviceDetails,
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+          await navigateToTestDappAndTap(
+            TestDappSelectorsWebIDs.SEND_EIP_1559_BUTTON_ID,
+            'Send EIP-1559 transaction button',
+          );
+
+          await Assertions.expectElementToExist(RowComponents.TokenHero, {
+            description: 'Token Hero',
+          });
+          await Assertions.expectTextDisplayed('0 ETH', {
+            description: 'Transaction amount',
+          });
+          await Assertions.expectElementToExist(RowComponents.FromTo, {
+            description: 'From To',
+          });
+          await Assertions.expectElementToExist(
+            RowComponents.SimulationDetails,
+            {
+              description: 'Simulation Details',
+            },
+          );
+          await Assertions.expectElementToExist(RowComponents.GasFeesDetails, {
+            description: 'Gas Fees Details',
+          });
+          await Assertions.expectElementToExist(RowComponents.AdvancedDetails, {
+            description: 'Advanced Details',
+          });
+
+          await confirmCloseAndAssertActivity();
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts b/tests/smoke-appium/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts
similarity index 50%
rename from tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts
rename to tests/smoke-appium/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts
index e2505bb7cbff..e3f1e363b4f3 100644
--- a/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts
+++ b/tests/smoke-appium/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts
@@ -1,45 +1,36 @@
-/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
 import FixtureBuilder, {
   DEFAULT_FIXTURE_ACCOUNT,
-} from '../../../framework/fixtures/FixtureBuilder';
-import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions';
-import SendView from '../../../page-objects/Send/RedesignedSendView';
-import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
-import WalletView from '../../../page-objects/wallet/WalletView';
+} from '../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../framework/Assertions.js';
+import { LocalNode, LocalNodeType } from '../../../framework/types.js';
+import { SmokeConfirmations } from '../../../tags.js';
+import { AnvilPort } from '../../../framework/fixtures/FixtureUtils.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
 import {
-  Assertions,
-  LocalNode,
-  LocalNodeType,
-  Utilities,
-} from '../../../framework';
-import { SmokeConfirmations } from '../../../tags';
-import { AnvilPort } from '../../../framework/fixtures/FixtureUtils';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import RowComponents from '../../../page-objects/Browser/Confirmations/RowComponents';
-import { AnvilManager, Hardfork } from '../../../seeder/anvil-manager';
+  confirmSponsoredNativeSendAndOpenActivity,
+  startRedesignedNativeSendFiveEthToReview,
+} from '../../../flows/confirmations.flow.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import { AnvilManager, Hardfork } from '../../../seeder/anvil-manager.js';
 import {
   setupMockRequest,
   setupMockPostRequest,
-} from '../../../api-mocking/helpers/mockHelpers';
-import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../api-mocking/mock-responses/simulations';
-import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { remoteFeatureEip7702 } from '../../../api-mocking/mock-responses/feature-flags-mocks';
+} from '../../../api-mocking/helpers/mockHelpers.js';
+import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../api-mocking/mock-responses/simulations.js';
+import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { remoteFeatureEip7702 } from '../../../api-mocking/mock-responses/feature-flags-mocks.js';
 import { Mockttp } from 'mockttp';
 import {
+  getLocalhostSentinelUrl,
   TRANSACTION_RELAY_STATUS_NETWORKS_MOCK,
   TRANSACTION_RELAY_SUBMIT_NETWORKS_MOCK,
-} from '../../../api-mocking/mock-responses/transaction-relay-mocks';
-import { RelayStatus } from '../../../../app/util/transactions/transaction-relay';
+} from '../../../api-mocking/mock-responses/transaction-relay-mocks.js';
+import { RelayStatus } from '../../../../app/util/transactions/transaction-relay.js';
 
 const TRANSACTION_UUID_MOCK = '1234-5678';
 const SENDER_ADDRESS_MOCK = '0x76cf1cdd1fcc252442b50d6e97207228aa4aefc3';
 const RECIPIENT_ADDRESS_MOCK = '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb';
-/** Match {@link gas-fee-tokens-eip-7702.spec.ts} and {@link transaction-relay-mocks} for proxy URL matching. */
-const LOCALHOST_SENTINEL_URL =
-  device.getPlatform() === 'android'
-    ? 'https://tx-sentinel-127.0.0.1.api.cx.metamask.io'
-    : 'https://tx-sentinel-localhost.api.cx.metamask.io';
 
 const SEND_ETH_TRANSACTION_MOCK = {
   data: '0x',
@@ -133,15 +124,14 @@ const setupCommonMocks = async (mockServer: Mockttp) => {
 
   await setupMockRequest(mockServer, {
     requestMethod: 'GET',
-    url: `${LOCALHOST_SENTINEL_URL}/network`,
+    url: `${getLocalhostSentinelUrl()}/network`,
     response: SIMULATION_ENABLED_NETWORKS_WITH_RELAY.response,
     responseCode: 200,
   });
 
-  // Mock infura_simulateTransactions (align body + ignoreFields with gas-fee-tokens-eip-7702.spec.ts)
   await setupMockPostRequest(
     mockServer,
-    LOCALHOST_SENTINEL_URL,
+    getLocalhostSentinelUrl(),
     SIMULATION_SPONSORED_REQUEST_BODY,
     SIMULATION_RESPONSE,
     {
@@ -201,127 +191,112 @@ const localNodeOptions = [
     options: {
       hardfork: 'prague' as Hardfork,
       loadState:
-        './tests/smoke/confirmations/transactions/7702/withDelegatorContracts.json',
+        './tests/smoke-appium/confirmations/transactions/7702/withDelegatorContracts.json',
     },
   },
 ];
 
-const performSendTransaction = async () => {
-  await loginToApp();
-  await device.disableSynchronization();
-  await WalletView.tapWalletSendButton();
-  await SendView.selectEthereumToken();
-  await SendView.pressAmountFiveButton();
-  await SendView.pressContinueButton();
-  await SendView.inputRecipientAddress(RECIPIENT_ADDRESS_MOCK);
-  await SendView.pressReviewButton();
-  await Assertions.expectElementToBeVisible(RowComponents.GasFeesDetails, {
-    description: 'gas fees row is present on review screen',
-    timeout: 30000,
-  });
-  await Assertions.expectElementToBeVisible(
-    RowComponents.NetworkFeePaidByMetaMask,
-    {
-      description:
-        'network fee shows MetaMask-sponsored gas after relay + simulation settle',
-      timeout: 60000,
-    },
-  );
-  await Utilities.waitForElementToBeVisible(FooterActions.confirmButton);
-  await Utilities.waitForElementToStopMoving(FooterActions.confirmButton, {
-    timeout: 5000,
-    interval: 500,
-    stableCount: 6,
-  });
-  await FooterActions.tapConfirmButton();
-  await TabBarComponent.tapActivity();
-};
-
-// Skipping due to https://consensys.slack.com/archives/C02U025CVU4/p1778589879443169
-describe.skip(
+// Skipped: Detox suite was disabled
+// (https://consensys.slack.com/archives/C02U025CVU4/p1778589879443169).
+// Un-skip after Appium validation on main-e2e.
+// Also covered by CV: eip-7702-sponsored-relay-api-failure.view.test.tsx
+appiumTest.describe.skip(
   SmokeConfirmations('Send native asset using EIP-7702 - Success Case'),
   () => {
-    beforeAll(async () => {
-      jest.setTimeout(2500000);
-    });
+    appiumTest.describe.configure({ timeout: 2500000 });
 
-    it('sends ETH sponsored', async () => {
-      await withFixtures(
-        {
-          fixture: createFixture,
-          restartDevice: true,
-          localNodeOptions,
-          testSpecificMock: async (mockServer: Mockttp) => {
-            await setupCommonMocks(mockServer);
+    appiumTest(
+      'sends ETH sponsored',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: createFixture,
+            restartDevice: true,
+            localNodeOptions,
+            currentDeviceDetails,
+            testSpecificMock: async (mockServer: Mockttp) => {
+              await setupCommonMocks(mockServer);
 
-            // Mock eth_sendRelayTransaction
-            await setupMockPostRequest(
-              mockServer,
-              LOCALHOST_SENTINEL_URL,
-              {
-                jsonrpc: '2.0',
-                method: 'eth_sendRelayTransaction',
-              },
-              TRANSACTION_RELAY_SUBMIT_NETWORKS_MOCK.response,
-              {
-                statusCode: 200,
-                ignoreFields: ['id', 'params'],
-                priority: 999,
-              },
-            );
+              await setupMockPostRequest(
+                mockServer,
+                getLocalhostSentinelUrl(),
+                {
+                  jsonrpc: '2.0',
+                  method: 'eth_sendRelayTransaction',
+                },
+                TRANSACTION_RELAY_SUBMIT_NETWORKS_MOCK.response,
+                {
+                  statusCode: 200,
+                  ignoreFields: ['id', 'params'],
+                  priority: 999,
+                },
+              );
 
-            // Status check mock
-            await setupMockRequest(mockServer, {
-              requestMethod: 'GET',
-              url: `${LOCALHOST_SENTINEL_URL}/smart-transactions/${TRANSACTION_UUID_MOCK}`,
-              response: {
-                transactions: [
-                  {
-                    hash: TRANSACTION_RELAY_STATUS_NETWORKS_MOCK.response
-                      .transactions[0].hash,
-                    status: RelayStatus.Success,
-                  },
-                ],
-              },
-              responseCode: 200,
+              await setupMockRequest(mockServer, {
+                requestMethod: 'GET',
+                url: `${getLocalhostSentinelUrl()}/smart-transactions/${TRANSACTION_UUID_MOCK}`,
+                response: {
+                  transactions: [
+                    {
+                      hash: TRANSACTION_RELAY_STATUS_NETWORKS_MOCK.response
+                        .transactions[0].hash,
+                      status: RelayStatus.Success,
+                    },
+                  ],
+                },
+                responseCode: 200,
+              });
+            },
+          },
+          async () => {
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+            await startRedesignedNativeSendFiveEthToReview(
+              RECIPIENT_ADDRESS_MOCK,
+            );
+            await confirmSponsoredNativeSendAndOpenActivity();
+            await Assertions.expectTextDisplayed('Confirmed', {
+              description: 'Activity status Confirmed',
             });
           },
-        },
-        async () => {
-          await performSendTransaction();
-          await Assertions.expectTextDisplayed('Confirmed');
-          await device.enableSynchronization();
-        },
-      );
-    });
+        );
+      },
+    );
   },
 );
 
-// Skipping due to https://consensys.slack.com/archives/C02U025CVU4/p1778589879443169
-describe.skip(
+// Skipped: Detox suite was disabled
+// (https://consensys.slack.com/archives/C02U025CVU4/p1778589879443169).
+// Un-skip after Appium validation on main-e2e.
+appiumTest.describe.skip(
   SmokeConfirmations('Send native asset using EIP-7702 - Failure Case'),
   () => {
-    beforeAll(async () => {
-      jest.setTimeout(2500000);
-    });
+    appiumTest.describe.configure({ timeout: 2500000 });
 
-    // Also implemented in cv tests (eip-7702-sponsored-relay-api-failure.view.test.tsx)
-    it('fails transaction if error occurs on API', async () => {
-      await withFixtures(
-        {
-          fixture: createFixture,
-          restartDevice: true,
-          localNodeOptions,
-          testSpecificMock: async (mockServer: Mockttp) => {
-            await setupCommonMocks(mockServer);
+    appiumTest(
+      'fails transaction if error occurs on API',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: createFixture,
+            restartDevice: true,
+            localNodeOptions,
+            currentDeviceDetails,
+            testSpecificMock: async (mockServer: Mockttp) => {
+              await setupCommonMocks(mockServer);
+            },
           },
-        },
-        async () => {
-          await performSendTransaction();
-          await Assertions.expectTextDisplayed('Failed');
-          await device.enableSynchronization();
-        },
-      );
-    });
+          async () => {
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+            await startRedesignedNativeSendFiveEthToReview(
+              RECIPIENT_ADDRESS_MOCK,
+            );
+            await confirmSponsoredNativeSendAndOpenActivity();
+            await Assertions.expectTextDisplayed('Failed', {
+              description: 'Activity status Failed after relay API error',
+            });
+          },
+        );
+      },
+    );
   },
 );
diff --git a/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts b/tests/smoke-appium/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts
similarity index 56%
rename from tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts
rename to tests/smoke-appium/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts
index 6d193e839c61..1ddceb648500 100644
--- a/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts
+++ b/tests/smoke-appium/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts
@@ -1,37 +1,34 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
 import FixtureBuilder, {
   DEFAULT_FIXTURE_ACCOUNT,
-} from '../../../framework/fixtures/FixtureBuilder';
-import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions';
-import SendView from '../../../page-objects/Send/RedesignedSendView';
-import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
-import WalletView from '../../../page-objects/wallet/WalletView';
-import {
-  Assertions,
-  LocalNode,
-  LocalNodeType,
-  Matchers,
-} from '../../../framework';
-import { SmokeConfirmations } from '../../../tags';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import RowComponents from '../../../page-objects/Browser/Confirmations/RowComponents';
-import { AnvilManager, Hardfork } from '../../../seeder/anvil-manager';
+} from '../../../framework/fixtures/FixtureBuilder.js';
+import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions.js';
+import TabBarComponent from '../../../page-objects/wallet/TabBarComponent.js';
+import Assertions from '../../../framework/Assertions.js';
+import Matchers from '../../../framework/Matchers.js';
+import { LocalNode, LocalNodeType } from '../../../framework/types.js';
+import { SmokeConfirmations } from '../../../tags.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import { startRedesignedNativeSendFiveEthToReview } from '../../../flows/confirmations.flow.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import RowComponents from '../../../page-objects/Browser/Confirmations/RowComponents.js';
+import { AnvilManager, Hardfork } from '../../../seeder/anvil-manager.js';
 import {
   setupMockPostRequest,
   setupMockRequest,
-} from '../../../api-mocking/helpers/mockHelpers';
-import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../api-mocking/mock-responses/simulations';
-import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { remoteFeatureEip7702 } from '../../../api-mocking/mock-responses/feature-flags-mocks';
+} from '../../../api-mocking/helpers/mockHelpers.js';
+import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../api-mocking/mock-responses/simulations.js';
+import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { remoteFeatureEip7702 } from '../../../api-mocking/mock-responses/feature-flags-mocks.js';
 import { Mockttp } from 'mockttp';
 import {
   TRANSACTION_RELAY_STATUS_NETWORKS_MOCK,
   TRANSACTION_RELAY_SUBMIT_NETWORKS_MOCK,
-} from '../../../api-mocking/mock-responses/transaction-relay-mocks';
-import { RelayStatus } from '../../../../app/util/transactions/transaction-relay';
-import TransactionConfirmView from '../../../page-objects/Send/TransactionConfirmView';
-import GasFeeTokenModal from '../../../page-objects/Confirmation/GasFeeTokenModal';
-import { AnvilPort } from '../../../framework/fixtures/FixtureUtils';
+} from '../../../api-mocking/mock-responses/transaction-relay-mocks.js';
+import { RelayStatus } from '../../../../app/util/transactions/transaction-relay.js';
+import TransactionConfirmView from '../../../page-objects/Send/TransactionConfirmView.js';
+import GasFeeTokenModal from '../../../page-objects/Confirmation/GasFeeTokenModal.js';
+import { AnvilPort } from '../../../framework/fixtures/FixtureUtils.js';
 
 const TRANSACTION_UUID_MOCK = '1234-5678';
 const SENDER_ADDRESS_MOCK = '0x76cf1cdd1fcc252442b50d6e97207228aa4aefc3';
@@ -141,13 +138,13 @@ const SIMULATION_GAS_STATION_MOCK = {
   },
 };
 
-// Skipping due to https://consensys.slack.com/archives/C02U025CVU4/p1778589879443169
-describe.skip(
+// Skipped: Detox suite was disabled
+// (https://consensys.slack.com/archives/C02U025CVU4/p1778589879443169).
+// Un-skip after Appium validation on main-e2e.
+appiumTest.describe.skip(
   SmokeConfirmations('Send native asset Gas Station using EIP-7702'),
   () => {
-    beforeAll(async () => {
-      jest.setTimeout(2500000);
-    });
+    appiumTest.describe.configure({ timeout: 2500000 });
 
     const setupCommonMocks = async (mockServer: Mockttp) => {
       await setupMockRequest(mockServer, {
@@ -225,124 +222,131 @@ describe.skip(
         options: {
           hardfork: 'prague' as Hardfork,
           loadState:
-            './tests/smoke/confirmations/transactions/7702/withDelegatorContracts.json',
+            './tests/smoke-appium/confirmations/transactions/7702/withDelegatorContracts.json',
         },
       },
     ];
 
-    it('Send ETH via EIP-7702 paying gas with USDC', async () => {
-      await withFixtures(
-        {
-          fixture: createFixture,
-          restartDevice: true,
-          localNodeOptions,
-          testSpecificMock: async (mockServer: Mockttp) => {
-            await setupCommonMocks(mockServer);
+    appiumTest(
+      'Send ETH via EIP-7702 paying gas with USDC',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: createFixture,
+            restartDevice: true,
+            localNodeOptions,
+            currentDeviceDetails,
+            testSpecificMock: async (mockServer: Mockttp) => {
+              await setupCommonMocks(mockServer);
 
-            // Mock eth_sendRelayTransaction
-            await setupMockPostRequest(
-              mockServer,
-              LOCALHOST_SENTINEL_URL,
-              {
-                jsonrpc: '2.0',
-                method: 'eth_sendRelayTransaction',
-              },
-              TRANSACTION_RELAY_SUBMIT_NETWORKS_MOCK.response,
-              {
-                statusCode: 200,
-                ignoreFields: ['id', 'params'],
-                priority: 999,
-              },
-            );
+              await setupMockPostRequest(
+                mockServer,
+                LOCALHOST_SENTINEL_URL,
+                {
+                  jsonrpc: '2.0',
+                  method: 'eth_sendRelayTransaction',
+                },
+                TRANSACTION_RELAY_SUBMIT_NETWORKS_MOCK.response,
+                {
+                  statusCode: 200,
+                  ignoreFields: ['id', 'params'],
+                  priority: 999,
+                },
+              );
 
-            // Status check mock
-            await setupMockRequest(mockServer, {
-              requestMethod: 'GET',
-              url: `${LOCALHOST_SENTINEL_URL}/smart-transactions/${TRANSACTION_UUID_MOCK}`,
-              response: {
-                transactions: [
-                  {
-                    hash: TRANSACTION_RELAY_STATUS_NETWORKS_MOCK.response
-                      .transactions[0].hash,
-                    status: RelayStatus.Success,
-                  },
-                ],
-              },
-              responseCode: 200,
-            });
+              await setupMockRequest(mockServer, {
+                requestMethod: 'GET',
+                url: `${LOCALHOST_SENTINEL_URL}/smart-transactions/${TRANSACTION_UUID_MOCK}`,
+                response: {
+                  transactions: [
+                    {
+                      hash: TRANSACTION_RELAY_STATUS_NETWORKS_MOCK.response
+                        .transactions[0].hash,
+                      status: RelayStatus.Success,
+                    },
+                  ],
+                },
+                responseCode: 200,
+              });
+            },
           },
-        },
-        async () => {
-          const usdcValues = {
-            fiatAmount: '$3.11',
-            tokenAmount: '1.23 USDC',
-            balance: 'Bal: $12.62 USD',
-          };
-          const daiValues = {
-            fiatAmount: '$8.10',
-            tokenAmount: '3.21 DAI',
-            balance: 'Bal: $25.25 USD',
-          };
-          await loginToApp();
-          await device.disableSynchronization();
-          await WalletView.tapWalletSendButton();
-          await SendView.selectEthereumToken();
-          await SendView.pressAmountFiveButton();
-          await SendView.pressContinueButton();
-          await SendView.inputRecipientAddress(RECIPIENT_ADDRESS_MOCK);
-          await SendView.pressReviewButton();
+          async () => {
+            const usdcValues = {
+              fiatAmount: '$3.11',
+              tokenAmount: '1.23 USDC',
+              balance: 'Bal: $12.62 USD',
+            };
+            const daiValues = {
+              fiatAmount: '$8.10',
+              tokenAmount: '3.21 DAI',
+              balance: 'Bal: $25.25 USD',
+            };
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+            await startRedesignedNativeSendFiveEthToReview(
+              RECIPIENT_ADDRESS_MOCK,
+            );
 
-          await Assertions.expectElementToBeVisible(
-            RowComponents.NetworkFeeGasFeeTokenArrow,
-            { description: 'Gas Fee Token Arrow' },
-          );
+            await Assertions.expectElementToBeVisible(
+              RowComponents.NetworkFeeGasFeeTokenArrow,
+              { description: 'Gas Fee Token Arrow' },
+            );
 
-          await TransactionConfirmView.tapGasFeeTokenPill();
+            await TransactionConfirmView.tapGasFeeTokenPill();
 
-          await Assertions.expectElementToBeVisible(
-            Matchers.getElementByText('Select a token'),
-            { description: 'Modal is visible' },
-          );
+            await Assertions.expectElementToBeVisible(
+              Matchers.getElementByText('Select a token'),
+              { description: 'Modal is visible' },
+            );
 
-          await GasFeeTokenModal.checkAmountFiat('DAI', daiValues.fiatAmount);
-          await GasFeeTokenModal.checkAmountToken('DAI', daiValues.tokenAmount);
-          await GasFeeTokenModal.checkBalance('DAI', daiValues.balance);
+            await GasFeeTokenModal.checkAmountFiat('DAI', daiValues.fiatAmount);
+            await GasFeeTokenModal.checkAmountToken(
+              'DAI',
+              daiValues.tokenAmount,
+            );
+            await GasFeeTokenModal.checkBalance('DAI', daiValues.balance);
 
-          await GasFeeTokenModal.checkAmountFiat('USDC', usdcValues.fiatAmount);
-          await GasFeeTokenModal.checkAmountToken(
-            'USDC',
-            usdcValues.tokenAmount,
-          );
-          await GasFeeTokenModal.checkBalance('USDC', usdcValues.balance);
-          await GasFeeTokenModal.tapToken('USDC');
+            await GasFeeTokenModal.checkAmountFiat(
+              'USDC',
+              usdcValues.fiatAmount,
+            );
+            await GasFeeTokenModal.checkAmountToken(
+              'USDC',
+              usdcValues.tokenAmount,
+            );
+            await GasFeeTokenModal.checkBalance('USDC', usdcValues.balance);
+            await GasFeeTokenModal.tapToken('USDC');
 
-          await Assertions.expectElementToNotBeVisible(
-            Matchers.getElementByText('Select a token'),
-            { description: 'Select a token modal closed', timeout: 10000 },
-          );
+            await Assertions.expectElementToNotBeVisible(
+              Matchers.getElementByText('Select a token'),
+              { description: 'Select a token modal closed', timeout: 10000 },
+            );
 
-          await Assertions.expectElementToHaveText(
-            RowComponents.NetworkFeeGasFeeTokenSymbol,
-            'USDC',
-            {
-              description: 'Gas fee token pill shows USDC',
-              timeout: 15000,
-            },
-          );
+            await Assertions.expectElementToHaveText(
+              RowComponents.NetworkFeeGasFeeTokenSymbol,
+              'USDC',
+              {
+                description: 'Gas fee token pill shows USDC',
+                timeout: 15000,
+              },
+            );
 
-          const symbolElementLabel =
-            await RowComponents.getNetworkFeeGasFeeTokenSymbolText();
+            const symbolElementLabel =
+              await RowComponents.getNetworkFeeGasFeeTokenSymbolText();
 
-          await Assertions.checkIfTextMatches(symbolElementLabel, 'USDC');
-          await Assertions.expectTextDisplayed(usdcValues.fiatAmount);
+            await Assertions.checkIfTextMatches(symbolElementLabel, 'USDC');
+            await Assertions.expectTextDisplayed(usdcValues.fiatAmount, {
+              description: 'USDC gas fee fiat amount on confirmation',
+            });
 
-          await FooterActions.tapConfirmButton();
-          await TabBarComponent.tapActivity();
+            await FooterActions.tapConfirmButton();
+            await TabBarComponent.tapActivity();
 
-          await Assertions.expectTextDisplayed('Confirmed');
-          await device.enableSynchronization();
-        },
-      );
-    });
+            await Assertions.expectTextDisplayed('Confirmed', {
+              description: 'Activity status Confirmed',
+            });
+          },
+        );
+      },
+    );
   },
 );
diff --git a/tests/smoke-appium/confirmations/transactions/per-dapp-selected-network.spec.ts b/tests/smoke-appium/confirmations/transactions/per-dapp-selected-network.spec.ts
new file mode 100644
index 000000000000..3ac48bfee67f
--- /dev/null
+++ b/tests/smoke-appium/confirmations/transactions/per-dapp-selected-network.spec.ts
@@ -0,0 +1,136 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import {
+  buildPermissions,
+  AnvilPort,
+} from '../../../framework/fixtures/FixtureUtils.js';
+import Browser from '../../../page-objects/Browser/BrowserView.js';
+import ConfirmationFooterActions from '../../../page-objects/Browser/Confirmations/FooterActions.js';
+import ConfirmationUITypes from '../../../page-objects/Browser/Confirmations/ConfirmationUITypes.js';
+import TestDApp from '../../../page-objects/Browser/TestDApp.js';
+import TabBarComponent from '../../../page-objects/wallet/TabBarComponent.js';
+import { SmokeConfirmations } from '../../../tags.js';
+import Assertions from '../../../framework/Assertions.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import { navigateToBrowserView } from '../../../flows/browser.flow.js';
+import {
+  changeNetworkFromNetworkManager,
+  selectCustomNetworkFromNetworkManager,
+} from '../../../flows/confirmations.flow.js';
+import { DappVariants } from '../../../framework/Constants.js';
+import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { confirmationFeatureFlags } from '../../../api-mocking/mock-responses/feature-flags-mocks.js';
+import { Mockttp } from 'mockttp';
+import { LocalNode } from '../../../framework/types.js';
+import { AnvilManager } from '../../../seeder/anvil-manager.js';
+
+const LOCAL_CHAIN_ID = '0x539';
+const LOCAL_CHAIN_NAME = 'Localhost';
+
+// Skipped: Detox suite was describe.skip. Un-skip after Appium validation on main-e2e.
+appiumTest.describe.skip(SmokeConfirmations('Dapp Network Switching'), () => {
+  appiumTest.describe.configure({ timeout: 2500000 });
+
+  const testSpecificMock = async (mockServer: Mockttp) => {
+    await setupRemoteFeatureFlagsMock(
+      mockServer,
+      Object.assign({}, ...confirmationFeatureFlags),
+    );
+  };
+
+  appiumTest(
+    'submits a transaction to a dapp-specific selected network',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
+            const node = localNodes?.[0] as unknown as AnvilManager;
+            const rpcPort =
+              node instanceof AnvilManager
+                ? (node.getPort() ?? AnvilPort())
+                : undefined;
+
+            return new FixtureBuilder()
+              .withNetworkController({
+                chainId: LOCAL_CHAIN_ID,
+                rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
+                type: 'custom',
+                nickname: LOCAL_CHAIN_NAME,
+                ticker: 'ETH',
+              })
+              .withPermissionControllerConnectedToTestDapp(
+                buildPermissions([LOCAL_CHAIN_ID]),
+              )
+              .build();
+          },
+          restartDevice: true,
+          testSpecificMock,
+          currentDeviceDetails,
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+          await navigateToBrowserView();
+          await Browser.navigateToTestDApp();
+
+          await TestDApp.verifyCurrentNetworkText('Chain id ' + LOCAL_CHAIN_ID);
+
+          await Browser.tapCloseBrowserButton();
+
+          await Assertions.expectElementToBeVisible(
+            TabBarComponent.tabBarWalletButton,
+            {
+              description: 'Tab bar should be visible after closing browser',
+            },
+          );
+
+          await changeNetworkFromNetworkManager('Ethereum Main Network');
+
+          await navigateToBrowserView();
+          await TestDApp.verifyCurrentNetworkText('Chain id ' + LOCAL_CHAIN_ID);
+
+          await TestDApp.tapSendEIP1559Button();
+
+          await Assertions.expectElementToBeVisible(
+            ConfirmationUITypes.ModalConfirmationContainer,
+            {
+              description: 'Dapp transaction confirmation modal',
+            },
+          );
+
+          await Assertions.expectTextDisplayed(LOCAL_CHAIN_NAME, {
+            description: 'Confirmation shows dapp-selected Localhost network',
+          });
+
+          await ConfirmationFooterActions.tapConfirmButton();
+
+          await Assertions.expectElementToBeVisible(Browser.browserScreenID, {
+            description:
+              'Browser screen should be visible after confirming transaction',
+          });
+
+          await Browser.tapCloseBrowserButton();
+
+          await Assertions.expectElementToBeVisible(
+            TabBarComponent.tabBarWalletButton,
+            {
+              description: 'Tab bar should be visible after closing browser',
+            },
+          );
+
+          await selectCustomNetworkFromNetworkManager(LOCAL_CHAIN_NAME);
+
+          await TabBarComponent.tapActivity();
+          await Assertions.expectTextDisplayed('Confirmed', {
+            description: 'Activity status Confirmed',
+          });
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/confirmations/transactions/token-approve/approve.spec.ts b/tests/smoke-appium/confirmations/transactions/token-approve/approve.spec.ts
new file mode 100644
index 000000000000..3b1053b3bdff
--- /dev/null
+++ b/tests/smoke-appium/confirmations/transactions/token-approve/approve.spec.ts
@@ -0,0 +1,215 @@
+import { SMART_CONTRACTS } from '../../../../../app/util/test/smart-contracts.js';
+import { test as appiumTest } from '../../../../framework/fixtures/playwright/index.js';
+import { SmokeConfirmations } from '../../../../tags.js';
+import { loginToAppPlaywright } from '../../../../flows/wallet.flow.js';
+import {
+  navigateToContractAndTap,
+  confirmCloseAndAssertActivity,
+} from '../../../../flows/confirmations.flow.js';
+import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../../framework/Assertions.js';
+import { withFixtures } from '../../../../framework/fixtures/FixtureHelper.js';
+import {
+  buildPermissions,
+  AnvilPort,
+  getDappUrlForFixture,
+} from '../../../../framework/fixtures/FixtureUtils.js';
+import RowComponents from '../../../../page-objects/Browser/Confirmations/RowComponents.js';
+import TokenApproveConfirmation from '../../../../page-objects/Confirmation/TokenApproveConfirmation.js';
+import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../../api-mocking/mock-responses/simulations.js';
+import { TestDappSelectorsWebIDs } from '../../../../selectors/Browser/TestDapp.selectors.js';
+import { DappVariants } from '../../../../framework/Constants.js';
+import { setupMockRequest } from '../../../../api-mocking/helpers/mockHelpers.js';
+import { Mockttp } from 'mockttp';
+import { setupRemoteFeatureFlagsMock } from '../../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { confirmationFeatureFlags } from '../../../../api-mocking/mock-responses/feature-flags-mocks.js';
+import { LocalNode, LocalNodeType } from '../../../../framework/types.js';
+import { AnvilManager } from '../../../../seeder/anvil-manager.js';
+
+const ERC_20_CONTRACT = SMART_CONTRACTS.HST;
+const ERC_721_CONTRACT = SMART_CONTRACTS.NFTS;
+const APPROVE_ACTIVITY = 'Approve';
+
+function buildApproveFixture({ localNodes }: { localNodes?: LocalNode[] }) {
+  const node = localNodes?.[0] as unknown as AnvilManager;
+  const rpcPort =
+    node instanceof AnvilManager ? (node.getPort() ?? AnvilPort()) : undefined;
+
+  const fixture = new FixtureBuilder()
+    .withNetworkController({
+      chainId: '0x539',
+      rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
+      type: 'custom',
+      nickname: 'Local RPC',
+      ticker: 'ETH',
+    })
+    .withPermissionControllerConnectedToTestDapp(buildPermissions(['0x539']))
+    .build();
+
+  fixture.state.browser.tabs[0].url = getDappUrlForFixture(0);
+
+  return fixture;
+}
+
+const testSpecificMock = async (mockServer: Mockttp) => {
+  await setupMockRequest(mockServer, {
+    requestMethod: 'GET',
+    url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
+    response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
+    responseCode: 200,
+  });
+  await setupRemoteFeatureFlagsMock(
+    mockServer,
+    Object.assign({}, ...confirmationFeatureFlags),
+  );
+};
+
+// Skipped: Android CI flake — CDP dapp click can succeed without opening
+// confirm-button (ERC-721 especially). Un-skip after sheet-open is stable.
+appiumTest.describe.skip(
+  SmokeConfirmations('Token Approve - approve method'),
+  () => {
+    appiumTest.describe.configure({ timeout: 2500000 });
+
+    appiumTest(
+      'creates an approve transaction confirmation for given ERC 20, changes the spending cap and submits it',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            dapps: [
+              {
+                dappVariant: DappVariants.TEST_DAPP,
+              },
+            ],
+            fixture: buildApproveFixture,
+            localNodeOptions: [
+              {
+                type: LocalNodeType.anvil,
+                options: {
+                  chainId: 1337,
+                },
+              },
+            ],
+            restartDevice: true,
+            testSpecificMock,
+            smartContracts: [ERC_20_CONTRACT],
+            currentDeviceDetails,
+          },
+          async ({ contractRegistry }) => {
+            const erc20Address =
+              await contractRegistry?.getContractAddress(ERC_20_CONTRACT);
+
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+            await navigateToContractAndTap(
+              erc20Address as string,
+              TestDappSelectorsWebIDs.APPROVE_ERC_20_TOKENS_BUTTON_ID,
+              'Approve ERC-20 button',
+            );
+
+            // Existence: BottomSheet children report isDisplayed=false on iOS.
+            await Assertions.expectElementToExist(
+              RowComponents.AccountNetwork,
+              {
+                description: 'Account Network',
+              },
+            );
+            await Assertions.expectElementToExist(RowComponents.ApproveRow, {
+              description: 'Approve Row',
+            });
+            await Assertions.expectElementToExist(
+              RowComponents.NetworkAndOrigin,
+              {
+                description: 'Network And Origin',
+              },
+            );
+            await Assertions.expectElementToExist(
+              RowComponents.GasFeesDetails,
+              {
+                description: 'Gas Fees Details',
+              },
+            );
+            await Assertions.expectElementToExist(
+              RowComponents.AdvancedDetails,
+              {
+                description: 'Advanced Details',
+              },
+            );
+
+            await Assertions.expectElementToHaveText(
+              TokenApproveConfirmation.SpendingCapValue,
+              '7',
+              {
+                description: 'Spending Cap Value',
+              },
+            );
+
+            await TokenApproveConfirmation.tapEditSpendingCapButton();
+            await TokenApproveConfirmation.inputSpendingCap('10');
+            await TokenApproveConfirmation.tapEditSpendingCapSaveButton();
+            await Assertions.expectElementToHaveText(
+              TokenApproveConfirmation.SpendingCapValue,
+              '10',
+              {
+                description: 'Updated Spending Cap Value',
+              },
+            );
+
+            await confirmCloseAndAssertActivity(APPROVE_ACTIVITY);
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'creates an approve transaction confirmation for ERC 721 and submits it',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            dapps: [
+              {
+                dappVariant: DappVariants.TEST_DAPP,
+              },
+            ],
+            fixture: buildApproveFixture,
+            localNodeOptions: [
+              {
+                type: LocalNodeType.anvil,
+                options: {
+                  chainId: 1337,
+                },
+              },
+            ],
+            restartDevice: true,
+            testSpecificMock,
+            smartContracts: [ERC_721_CONTRACT],
+            currentDeviceDetails,
+          },
+          async ({ contractRegistry }) => {
+            const erc721Address =
+              await contractRegistry?.getContractAddress(ERC_721_CONTRACT);
+
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+            await navigateToContractAndTap(
+              erc721Address as string,
+              TestDappSelectorsWebIDs.APPROVE_ERC_721_TOKEN_BUTTON_ID,
+              'Approve ERC-721 button',
+            );
+
+            // #1 means the token id for ERC 721
+            await Assertions.expectElementToHaveText(
+              TokenApproveConfirmation.SpendingCapValue,
+              '#1',
+              {
+                description: 'ERC-721 Spending Cap Value',
+              },
+            );
+
+            await confirmCloseAndAssertActivity(APPROVE_ACTIVITY);
+          },
+        );
+      },
+    );
+  },
+);
diff --git a/tests/smoke-appium/confirmations/transactions/token-approve/increase-allowance.spec.ts b/tests/smoke-appium/confirmations/transactions/token-approve/increase-allowance.spec.ts
new file mode 100644
index 000000000000..8eb4478bad1a
--- /dev/null
+++ b/tests/smoke-appium/confirmations/transactions/token-approve/increase-allowance.spec.ts
@@ -0,0 +1,167 @@
+import { SMART_CONTRACTS } from '../../../../../app/util/test/smart-contracts.js';
+import { test as appiumTest } from '../../../../framework/fixtures/playwright/index.js';
+import { SmokeConfirmations } from '../../../../tags.js';
+import { loginToAppPlaywright } from '../../../../flows/wallet.flow.js';
+import {
+  navigateToContractAndTap,
+  confirmCloseAndAssertActivity,
+} from '../../../../flows/confirmations.flow.js';
+import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../../framework/Assertions.js';
+import { withFixtures } from '../../../../framework/fixtures/FixtureHelper.js';
+import {
+  buildPermissions,
+  AnvilPort,
+  getDappUrlForFixture,
+} from '../../../../framework/fixtures/FixtureUtils.js';
+import RowComponents from '../../../../page-objects/Browser/Confirmations/RowComponents.js';
+import TokenApproveConfirmation from '../../../../page-objects/Confirmation/TokenApproveConfirmation.js';
+import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../../api-mocking/mock-responses/simulations.js';
+import { TestDappSelectorsWebIDs } from '../../../../selectors/Browser/TestDapp.selectors.js';
+import { DappVariants } from '../../../../framework/Constants.js';
+import { setupMockRequest } from '../../../../api-mocking/helpers/mockHelpers.js';
+import { Mockttp } from 'mockttp';
+import { setupRemoteFeatureFlagsMock } from '../../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { confirmationFeatureFlags } from '../../../../api-mocking/mock-responses/feature-flags-mocks.js';
+import { LocalNode, LocalNodeType } from '../../../../framework/types.js';
+import { AnvilManager } from '../../../../seeder/anvil-manager.js';
+
+const ERC_20_CONTRACT = SMART_CONTRACTS.HST;
+const INCREASE_ALLOWANCE_ACTIVITY = 'Increase allowance';
+
+function buildIncreaseAllowanceFixture({
+  localNodes,
+}: {
+  localNodes?: LocalNode[];
+}) {
+  const node = localNodes?.[0] as unknown as AnvilManager;
+  const rpcPort =
+    node instanceof AnvilManager ? (node.getPort() ?? AnvilPort()) : undefined;
+
+  const fixture = new FixtureBuilder()
+    .withNetworkController({
+      chainId: '0x539',
+      rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
+      type: 'custom',
+      nickname: 'Local RPC',
+      ticker: 'ETH',
+    })
+    .withPermissionControllerConnectedToTestDapp(buildPermissions(['0x539']))
+    .build();
+
+  fixture.state.browser.tabs[0].url = getDappUrlForFixture(0);
+
+  return fixture;
+}
+
+const testSpecificMock = async (mockServer: Mockttp) => {
+  await setupMockRequest(mockServer, {
+    requestMethod: 'GET',
+    url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
+    response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
+    responseCode: 200,
+  });
+  await setupRemoteFeatureFlagsMock(
+    mockServer,
+    Object.assign({}, ...confirmationFeatureFlags),
+  );
+};
+
+// Skipped with other token-approve suites pending Android confirm-sheet
+// stability after CDP click. Un-skip after Appium validation on main-e2e.
+appiumTest.describe.skip(
+  SmokeConfirmations('Token Approve - increaseAllowance method'),
+  () => {
+    appiumTest.describe.configure({ timeout: 2500000 });
+
+    appiumTest(
+      'creates an approve transaction confirmation for given ERC 20, changes the spending cap and submits it',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            dapps: [
+              {
+                dappVariant: DappVariants.TEST_DAPP,
+              },
+            ],
+            fixture: buildIncreaseAllowanceFixture,
+            localNodeOptions: [
+              {
+                type: LocalNodeType.anvil,
+                options: {
+                  chainId: 1337,
+                },
+              },
+            ],
+            restartDevice: true,
+            testSpecificMock,
+            smartContracts: [ERC_20_CONTRACT],
+            currentDeviceDetails,
+          },
+          async ({ contractRegistry }) => {
+            const erc20Address =
+              await contractRegistry?.getContractAddress(ERC_20_CONTRACT);
+
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+            await navigateToContractAndTap(
+              erc20Address as string,
+              TestDappSelectorsWebIDs.INCREASE_ALLOWANCE_BUTTON_ID,
+              'Increase allowance button',
+            );
+
+            // Existence: BottomSheet children report isDisplayed=false on iOS.
+            await Assertions.expectElementToExist(
+              RowComponents.AccountNetwork,
+              {
+                description: 'Account Network',
+              },
+            );
+            await Assertions.expectElementToExist(RowComponents.ApproveRow, {
+              description: 'Approve Row',
+            });
+            await Assertions.expectElementToExist(
+              RowComponents.NetworkAndOrigin,
+              {
+                description: 'Network And Origin',
+              },
+            );
+            await Assertions.expectElementToExist(
+              RowComponents.GasFeesDetails,
+              {
+                description: 'Gas Fees Details',
+              },
+            );
+            await Assertions.expectElementToExist(
+              RowComponents.AdvancedDetails,
+              {
+                description: 'Advanced Details',
+              },
+            );
+
+            await Assertions.expectElementToHaveText(
+              TokenApproveConfirmation.SpendingCapValue,
+              '1',
+              {
+                description: 'Spending Cap Value',
+              },
+            );
+
+            await TokenApproveConfirmation.tapEditSpendingCapButton();
+            await TokenApproveConfirmation.inputSpendingCap('5');
+            await TokenApproveConfirmation.tapEditSpendingCapSaveButton();
+            await Assertions.expectElementToHaveText(
+              TokenApproveConfirmation.SpendingCapValue,
+              '5',
+              {
+                description: 'Updated Spending Cap Value',
+              },
+            );
+
+            await confirmCloseAndAssertActivity(INCREASE_ALLOWANCE_ACTIVITY);
+          },
+        );
+      },
+    );
+  },
+);
diff --git a/tests/smoke-appium/confirmations/transactions/token-approve/set-approval-for-all.spec.ts b/tests/smoke-appium/confirmations/transactions/token-approve/set-approval-for-all.spec.ts
new file mode 100644
index 000000000000..d9163e906eb3
--- /dev/null
+++ b/tests/smoke-appium/confirmations/transactions/token-approve/set-approval-for-all.spec.ts
@@ -0,0 +1,258 @@
+import { SMART_CONTRACTS } from '../../../../../app/util/test/smart-contracts.js';
+import { test as appiumTest } from '../../../../framework/fixtures/playwright/index.js';
+import { SmokeConfirmations } from '../../../../tags.js';
+import { loginToAppPlaywright } from '../../../../flows/wallet.flow.js';
+import {
+  navigateToContractAndTap,
+  confirmCloseAndAssertActivity,
+} from '../../../../flows/confirmations.flow.js';
+import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../../framework/Assertions.js';
+import { withFixtures } from '../../../../framework/fixtures/FixtureHelper.js';
+import {
+  buildPermissions,
+  AnvilPort,
+  getDappUrlForFixture,
+} from '../../../../framework/fixtures/FixtureUtils.js';
+import RowComponents from '../../../../page-objects/Browser/Confirmations/RowComponents.js';
+import TokenApproveConfirmation from '../../../../page-objects/Confirmation/TokenApproveConfirmation.js';
+import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../../api-mocking/mock-responses/simulations.js';
+import { TestDappSelectorsWebIDs } from '../../../../selectors/Browser/TestDapp.selectors.js';
+import { DappVariants } from '../../../../framework/Constants.js';
+import { setupMockRequest } from '../../../../api-mocking/helpers/mockHelpers.js';
+import { Mockttp } from 'mockttp';
+import { setupRemoteFeatureFlagsMock } from '../../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { confirmationFeatureFlags } from '../../../../api-mocking/mock-responses/feature-flags-mocks.js';
+import { LocalNode, LocalNodeType } from '../../../../framework/types.js';
+import { AnvilManager } from '../../../../seeder/anvil-manager.js';
+
+const ERC_721_CONTRACT = SMART_CONTRACTS.NFTS;
+const ERC_1155_CONTRACT = SMART_CONTRACTS.ERC1155;
+const SET_APPROVAL_FOR_ALL_ACTIVITY = 'Set approval for all';
+
+function buildSetApprovalFixture({ localNodes }: { localNodes?: LocalNode[] }) {
+  const node = localNodes?.[0] as unknown as AnvilManager;
+  const rpcPort =
+    node instanceof AnvilManager ? (node.getPort() ?? AnvilPort()) : undefined;
+
+  const fixture = new FixtureBuilder()
+    .withNetworkController({
+      chainId: '0x539',
+      rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
+      type: 'custom',
+      nickname: 'Local RPC',
+      ticker: 'ETH',
+    })
+    .withPermissionControllerConnectedToTestDapp(buildPermissions(['0x539']))
+    .build();
+
+  fixture.state.browser.tabs[0].url = getDappUrlForFixture(0);
+
+  return fixture;
+}
+
+const testSpecificMock = async (mockServer: Mockttp) => {
+  await setupMockRequest(mockServer, {
+    requestMethod: 'GET',
+    url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
+    response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
+    responseCode: 200,
+  });
+  await setupRemoteFeatureFlagsMock(
+    mockServer,
+    Object.assign({}, ...confirmationFeatureFlags),
+  );
+};
+
+// Skipped: Android CI flake — CDP click succeeds but confirm-button never
+// appears (flaky/failed in CI). Un-skip after sheet-open is stable.
+appiumTest.describe.skip(
+  SmokeConfirmations('Token Approve - setApprovalForAll method'),
+  () => {
+    appiumTest.describe.configure({ timeout: 2500000 });
+
+    appiumTest(
+      'creates an approve transaction confirmation for given ERC721 and submits it',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            dapps: [
+              {
+                dappVariant: DappVariants.TEST_DAPP,
+              },
+            ],
+            fixture: buildSetApprovalFixture,
+            localNodeOptions: [
+              {
+                type: LocalNodeType.anvil,
+                options: {
+                  chainId: 1337,
+                },
+              },
+            ],
+            restartDevice: true,
+            testSpecificMock,
+            smartContracts: [ERC_721_CONTRACT],
+            currentDeviceDetails,
+          },
+          async ({ contractRegistry }) => {
+            const erc721Address =
+              await contractRegistry?.getContractAddress(ERC_721_CONTRACT);
+
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+            await navigateToContractAndTap(
+              erc721Address as string,
+              TestDappSelectorsWebIDs.SET_APPROVAL_FOR_ALL_NFT_BUTTON_ID,
+              'Set approval for all NFT button',
+            );
+
+            // Existence: BottomSheet children report isDisplayed=false on iOS.
+            await Assertions.expectElementToExist(
+              RowComponents.AccountNetwork,
+              {
+                description: 'Account Network',
+              },
+            );
+            await Assertions.expectElementToExist(RowComponents.ApproveRow, {
+              description: 'Approve Row',
+            });
+            await Assertions.expectElementToExist(
+              RowComponents.NetworkAndOrigin,
+              {
+                description: 'Network And Origin',
+              },
+            );
+            await Assertions.expectElementToExist(
+              RowComponents.GasFeesDetails,
+              {
+                description: 'Gas Fees Details',
+              },
+            );
+            await Assertions.expectElementToExist(
+              RowComponents.AdvancedDetails,
+              {
+                description: 'Advanced Details',
+              },
+            );
+
+            await Assertions.expectElementToHaveText(
+              TokenApproveConfirmation.SpendingCapValue,
+              'All',
+              {
+                description: 'Spending Cap Value',
+              },
+            );
+
+            await confirmCloseAndAssertActivity(SET_APPROVAL_FOR_ALL_ACTIVITY);
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'creates an approve transaction confirmation for given ERC1155 and submits it',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            dapps: [
+              {
+                dappVariant: DappVariants.TEST_DAPP,
+              },
+            ],
+            fixture: buildSetApprovalFixture,
+            localNodeOptions: [
+              {
+                type: LocalNodeType.anvil,
+                options: {
+                  chainId: 1337,
+                },
+              },
+            ],
+            restartDevice: true,
+            testSpecificMock,
+            smartContracts: [ERC_1155_CONTRACT],
+            currentDeviceDetails,
+          },
+          async ({ contractRegistry }) => {
+            const erc1155Address =
+              await contractRegistry?.getContractAddress(ERC_1155_CONTRACT);
+
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+            await navigateToContractAndTap(
+              erc1155Address as string,
+              TestDappSelectorsWebIDs.SET_APPROVAL_FOR_ALL_ERC1155_BUTTON_ID,
+              'Set approval for all ERC-1155 button',
+            );
+
+            await Assertions.expectElementToHaveText(
+              TokenApproveConfirmation.SpendingCapValue,
+              'All',
+              {
+                description: 'Spending Cap Value',
+              },
+            );
+
+            await confirmCloseAndAssertActivity(SET_APPROVAL_FOR_ALL_ACTIVITY);
+          },
+        );
+      },
+    );
+
+    appiumTest.describe('revoke mode', () => {
+      appiumTest(
+        'creates an approve transaction confirmation for ERC 721 and submits it',
+        async ({ driver: _driver, currentDeviceDetails }) => {
+          await withFixtures(
+            {
+              dapps: [
+                {
+                  dappVariant: DappVariants.TEST_DAPP,
+                },
+              ],
+              fixture: buildSetApprovalFixture,
+              localNodeOptions: [
+                {
+                  type: LocalNodeType.anvil,
+                  options: {
+                    chainId: 1337,
+                  },
+                },
+              ],
+              restartDevice: true,
+              testSpecificMock,
+              smartContracts: [ERC_721_CONTRACT],
+              currentDeviceDetails,
+            },
+            async ({ contractRegistry }) => {
+              const erc721Address =
+                await contractRegistry?.getContractAddress(ERC_721_CONTRACT);
+
+              await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+              await navigateToContractAndTap(
+                erc721Address as string,
+                TestDappSelectorsWebIDs.ERC_721_REVOKE_APPROVAL_BUTTON_ID,
+                'ERC-721 revoke approval button',
+              );
+
+              // All means all token permissions revoked
+              await Assertions.expectElementToHaveText(
+                TokenApproveConfirmation.SpendingCapValue,
+                'All',
+                {
+                  description: 'Revoke Spending Cap Value',
+                },
+              );
+
+              await confirmCloseAndAssertActivity(
+                SET_APPROVAL_FOR_ALL_ACTIVITY,
+              );
+            },
+          );
+        },
+      );
+    });
+  },
+);
diff --git a/tests/smoke-appium/confirmations/transactions/transaction-pay.spec.ts b/tests/smoke-appium/confirmations/transactions/transaction-pay.spec.ts
new file mode 100644
index 000000000000..739a57ef52d5
--- /dev/null
+++ b/tests/smoke-appium/confirmations/transactions/transaction-pay.spec.ts
@@ -0,0 +1,126 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
+import { SmokeConfirmations } from '../../../tags.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import {
+  remoteFeatureEip7702,
+  remoteFeatureFlagPredictEnabled,
+} from '../../../api-mocking/mock-responses/feature-flags-mocks.js';
+import { Mockttp } from 'mockttp';
+import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { POLYMARKET_COMPLETE_MOCKS } from '../../../api-mocking/mock-responses/polymarket/polymarket-mocks.js';
+import PredictAddFunds from '../../../page-objects/Predict/PredictAddFunds.js';
+import {
+  mockRelayQuote,
+  mockRelayStatus,
+} from '../../../api-mocking/mock-responses/transaction-pay.js';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import TransactionPayConfirmation from '../../../page-objects/Confirmation/TransactionPayConfirmation.js';
+import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions.js';
+import Gestures from '../../../framework/Gestures.js';
+import TransactionDetailsModal from '../../../page-objects/Transactions/TransactionDetailsModal.js';
+import TabBarComponent from '../../../page-objects/wallet/TabBarComponent.js';
+import WalletActionsBottomSheet from '../../../page-objects/wallet/WalletActionsBottomSheet.js';
+import ActivitiesView from '../../../page-objects/Transactions/ActivitiesView.js';
+import PredictMarketList from '../../../page-objects/Predict/PredictMarketList.js';
+
+// Skipped: Detox deposit case was it.skip pending Predict CLOB v2 activity
+// stability. Un-skip after Appium validation on main-e2e.
+appiumTest.describe.skip(SmokeConfirmations('Transaction Pay'), () => {
+  appiumTest.describe.configure({ timeout: 2500000 });
+
+  // TODO: Re-enable once Predict deposit activity is stable again after the
+  // CLOB v2 migration work.
+  appiumTest(
+    'deposits to predict balance',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder()
+            .withPolygon()
+            .withTokens(
+              [
+                {
+                  address: '0x2791bca1f2de4661ed88a30c99a7a9449aa84174',
+                  decimals: 6,
+                  name: 'USD Coin (PoS)',
+                  symbol: 'USDC.e',
+                },
+              ],
+              CHAIN_IDS.POLYGON,
+            )
+            .build(),
+          restartDevice: true,
+          testSpecificMock,
+          currentDeviceDetails,
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+
+          await TabBarComponent.tapActions();
+          await WalletActionsBottomSheet.tapPredictButton();
+          await PredictAddFunds.tapAddFunds();
+
+          await TransactionPayConfirmation.tapPayWithRow();
+          await TransactionPayConfirmation.tapPayWithToken('LineaETH');
+          await TransactionPayConfirmation.tapKeyboardAmount('1.23');
+          await TransactionPayConfirmation.tapKeyboardContinueButton();
+          await TransactionPayConfirmation.verifyTransactionFee('$4.17');
+          await TransactionPayConfirmation.verifyBridgeTime('< 1 min');
+          await TransactionPayConfirmation.verifyTotal('$5.40');
+          await FooterActions.tapConfirmButton();
+
+          await PredictMarketList.tapBackButton();
+          await TabBarComponent.tapActivity();
+          await Gestures.waitAndTap(ActivitiesView.predictDeposit, {
+            elemDescription: 'Predict Deposit transaction item',
+          });
+          await TransactionDetailsModal.verifyNetworkFee('$4.13');
+          await TransactionDetailsModal.verifyPaidWithSymbol('LineaETH');
+          await TransactionDetailsModal.verifyTotal('$5.40');
+          await TransactionDetailsModal.verifyTransactionFee('$0.04');
+          await TransactionDetailsModal.verifyStatus('Confirmed');
+        },
+      );
+    },
+  );
+});
+
+async function testSpecificMock(mockServer: Mockttp) {
+  await setupRemoteFeatureFlagsMock(mockServer, {
+    ...remoteFeatureFlagPredictEnabled(true),
+    ...remoteFeatureEip7702[1],
+  });
+
+  await POLYMARKET_COMPLETE_MOCKS(mockServer);
+  await mockRelayQuote(mockServer);
+  await mockRelayStatus(mockServer);
+  // Mock all token-by-address lookups on Polygon (chainId 137) to avoid
+  // unmocked live requests when TokensController fetches metadata for
+  // detected tokens (e.g. SNX) while the Polygon network is active.
+  await mockPolygonTokenByAddress(mockServer);
+}
+
+async function mockPolygonTokenByAddress(mockServer: Mockttp) {
+  await mockServer
+    .forGet('/proxy')
+    .matching((request) => {
+      const urlParam = new URL(request.url).searchParams.get('url') || '';
+      return urlParam.includes('token.api.cx.metamask.io/token/137');
+    })
+    .thenCallback((request) => {
+      const urlParam = new URL(request.url).searchParams.get('url') || '';
+      const tokenUrl = new URL(urlParam);
+      const address = tokenUrl.searchParams.get('address') ?? '';
+      return {
+        statusCode: 200,
+        json: {
+          address: address.toLowerCase(),
+          symbol: 'UNKNOWN',
+          decimals: 18,
+          name: 'Unknown Token',
+        },
+      };
+    });
+}
diff --git a/tests/smoke-appium/mm-connect/connection-evm-account.spec.ts b/tests/smoke-appium/mm-connect/connection-evm-account.spec.ts
index e2abdf4659ce..615617640d17 100644
--- a/tests/smoke-appium/mm-connect/connection-evm-account.spec.ts
+++ b/tests/smoke-appium/mm-connect/connection-evm-account.spec.ts
@@ -1,7 +1,11 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
 
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  ensureAccountGroupsFinishedLoading,
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import WalletView from '../../page-objects/wallet/WalletView.js';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp.js';
 import AndroidScreenHelpers from '../../page-objects/MMConnect/AndroidScreenHelpers.js';
@@ -21,8 +25,6 @@ import {
   setupAdbReverse,
   cleanupAdbReverse,
   waitForDappServerReady,
-  unlockIfLockScreenVisible,
-  ensureAccountGroupsFinishedLoading,
 } from './utils.js';
 import {
   launchMobileBrowser,
diff --git a/tests/smoke-appium/mm-connect/connection-evm-rejection.spec.ts b/tests/smoke-appium/mm-connect/connection-evm-rejection.spec.ts
index a18da01f0d40..0f78cef57f1d 100644
--- a/tests/smoke-appium/mm-connect/connection-evm-rejection.spec.ts
+++ b/tests/smoke-appium/mm-connect/connection-evm-rejection.spec.ts
@@ -1,7 +1,11 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
 
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  ensureAccountGroupsFinishedLoading,
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp.js';
 import AndroidScreenHelpers from '../../page-objects/MMConnect/AndroidScreenHelpers.js';
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal.js';
@@ -18,8 +22,6 @@ import {
   setupAdbReverse,
   cleanupAdbReverse,
   waitForDappServerReady,
-  unlockIfLockScreenVisible,
-  ensureAccountGroupsFinishedLoading,
 } from './utils.js';
 import {
   launchMobileBrowser,
diff --git a/tests/smoke-appium/mm-connect/connection-evm-session-timeout.spec.ts b/tests/smoke-appium/mm-connect/connection-evm-session-timeout.spec.ts
index a2568cb210e1..68a7c059671a 100644
--- a/tests/smoke-appium/mm-connect/connection-evm-session-timeout.spec.ts
+++ b/tests/smoke-appium/mm-connect/connection-evm-session-timeout.spec.ts
@@ -1,7 +1,11 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
 
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  ensureAccountGroupsFinishedLoading,
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp.js';
 import AndroidScreenHelpers from '../../page-objects/MMConnect/AndroidScreenHelpers.js';
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal.js';
@@ -18,8 +22,6 @@ import {
   setupAdbReverse,
   cleanupAdbReverse,
   waitForDappServerReady,
-  unlockIfLockScreenVisible,
-  ensureAccountGroupsFinishedLoading,
 } from './utils.js';
 import {
   launchMobileBrowser,
diff --git a/tests/smoke-appium/mm-connect/connection-evm-sign.spec.ts b/tests/smoke-appium/mm-connect/connection-evm-sign.spec.ts
index c017235fef11..e015e2d795a9 100644
--- a/tests/smoke-appium/mm-connect/connection-evm-sign.spec.ts
+++ b/tests/smoke-appium/mm-connect/connection-evm-sign.spec.ts
@@ -1,7 +1,11 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
 
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  ensureAccountGroupsFinishedLoading,
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp.js';
 import AndroidScreenHelpers from '../../page-objects/MMConnect/AndroidScreenHelpers.js';
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal.js';
@@ -19,8 +23,6 @@ import {
   setupAdbReverse,
   cleanupAdbReverse,
   waitForDappServerReady,
-  unlockIfLockScreenVisible,
-  ensureAccountGroupsFinishedLoading,
 } from './utils.js';
 import {
   launchMobileBrowser,
diff --git a/tests/smoke-appium/mm-connect/connection-multichain.spec.ts b/tests/smoke-appium/mm-connect/connection-multichain.spec.ts
index ed3f88ac4acc..1e6928f20446 100644
--- a/tests/smoke-appium/mm-connect/connection-multichain.spec.ts
+++ b/tests/smoke-appium/mm-connect/connection-multichain.spec.ts
@@ -1,6 +1,9 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
 import AndroidScreenHelpers from '../../page-objects/MMConnect/AndroidScreenHelpers.js';
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal.js';
@@ -13,7 +16,6 @@ import {
   setupAdbReverse,
   cleanupAdbReverse,
   waitForDappServerReady,
-  unlockIfLockScreenVisible,
 } from './utils.js';
 import {
   launchMobileBrowser,
@@ -34,7 +36,7 @@ const playgroundServer = new DappServer({
 const scopeCardTestId = (scope: string): string =>
   `${MMConnectDappTestIds.SCOPE_CARD}-${scope.toLowerCase().replace(/:/g, '-')}`;
 
-appiumTest.describe(SmokeMMConnect('Multichain browser connect'), () => {
+appiumTest.describe.skip(SmokeMMConnect('Multichain browser connect'), () => {
   appiumTest.beforeAll(async () => {
     playgroundServer.setServerPort(DAPP_PORT);
     await playgroundServer.start();
diff --git a/tests/smoke-appium/mm-connect/connection-multiclient-resilience.spec.ts b/tests/smoke-appium/mm-connect/connection-multiclient-resilience.spec.ts
index 974599941274..010ab405d250 100644
--- a/tests/smoke-appium/mm-connect/connection-multiclient-resilience.spec.ts
+++ b/tests/smoke-appium/mm-connect/connection-multiclient-resilience.spec.ts
@@ -1,7 +1,11 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
 
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  ensureAccountGroupsFinishedLoading,
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp.js';
 import AndroidScreenHelpers from '../../page-objects/MMConnect/AndroidScreenHelpers.js';
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal.js';
@@ -20,9 +24,7 @@ import {
   getDappUrlForBrowser,
   setupAdbReverse,
   cleanupAdbReverse,
-  ensureAccountGroupsFinishedLoading,
   waitForDappServerReady,
-  unlockIfLockScreenVisible,
 } from './utils.js';
 import {
   launchMobileBrowser,
diff --git a/tests/smoke-appium/mm-connect/connection-multiclient.spec.ts b/tests/smoke-appium/mm-connect/connection-multiclient.spec.ts
index 03fc2fb326a4..a477a7887e57 100644
--- a/tests/smoke-appium/mm-connect/connection-multiclient.spec.ts
+++ b/tests/smoke-appium/mm-connect/connection-multiclient.spec.ts
@@ -1,7 +1,11 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
 
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  ensureAccountGroupsFinishedLoading,
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp.js';
 import AndroidScreenHelpers from '../../page-objects/MMConnect/AndroidScreenHelpers.js';
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal.js';
@@ -20,9 +24,7 @@ import {
   getDappUrlForBrowser,
   setupAdbReverse,
   cleanupAdbReverse,
-  ensureAccountGroupsFinishedLoading,
   waitForDappServerReady,
-  unlockIfLockScreenVisible,
 } from './utils.js';
 import {
   launchMobileBrowser,
diff --git a/tests/smoke-appium/mm-connect/connection-wagmi-chains.spec.ts b/tests/smoke-appium/mm-connect/connection-wagmi-chains.spec.ts
index 208321c3b2f7..18a038c00f1e 100644
--- a/tests/smoke-appium/mm-connect/connection-wagmi-chains.spec.ts
+++ b/tests/smoke-appium/mm-connect/connection-wagmi-chains.spec.ts
@@ -1,7 +1,11 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
 
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  ensureAccountGroupsFinishedLoading,
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import WalletView from '../../page-objects/wallet/WalletView.js';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp.js';
 import AndroidScreenHelpers from '../../page-objects/MMConnect/AndroidScreenHelpers.js';
@@ -23,8 +27,6 @@ import {
   setupAdbReverse,
   cleanupAdbReverse,
   waitForDappServerReady,
-  unlockIfLockScreenVisible,
-  ensureAccountGroupsFinishedLoading,
 } from './utils.js';
 import {
   launchMobileBrowser,
diff --git a/tests/smoke-appium/mm-connect/connection-wagmi.spec.ts b/tests/smoke-appium/mm-connect/connection-wagmi.spec.ts
index 556b49e772e2..30de8447a290 100644
--- a/tests/smoke-appium/mm-connect/connection-wagmi.spec.ts
+++ b/tests/smoke-appium/mm-connect/connection-wagmi.spec.ts
@@ -1,7 +1,11 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
 
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  ensureAccountGroupsFinishedLoading,
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp.js';
 import AndroidScreenHelpers from '../../page-objects/MMConnect/AndroidScreenHelpers.js';
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal.js';
@@ -19,8 +23,6 @@ import {
   setupAdbReverse,
   cleanupAdbReverse,
   waitForDappServerReady,
-  unlockIfLockScreenVisible,
-  ensureAccountGroupsFinishedLoading,
 } from './utils.js';
 import {
   launchMobileBrowser,
diff --git a/tests/smoke-appium/mm-connect/legacy-evm-rn-connect.spec.ts b/tests/smoke-appium/mm-connect/legacy-evm-rn-connect.spec.ts
index 066a885de126..431431e9c193 100644
--- a/tests/smoke-appium/mm-connect/legacy-evm-rn-connect.spec.ts
+++ b/tests/smoke-appium/mm-connect/legacy-evm-rn-connect.spec.ts
@@ -1,14 +1,14 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
 
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import RNPlaygroundDapp from '../../page-objects/MMConnect/RNPlaygroundDapp.js';
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal.js';
 import SignModal from '../../page-objects/MMConnect/SignModal.js';
-import {
-  unlockIfLockScreenVisible,
-  ensurePlaygroundInstalled,
-} from './utils.js';
+import { ensurePlaygroundInstalled } from './utils.js';
 import { sleep } from '../../framework/index.js';
 
 /**
diff --git a/tests/smoke-appium/mm-connect/multichain-rn-evm.spec.ts b/tests/smoke-appium/mm-connect/multichain-rn-evm.spec.ts
index bf0d743c2e85..1a97a93f60d8 100644
--- a/tests/smoke-appium/mm-connect/multichain-rn-evm.spec.ts
+++ b/tests/smoke-appium/mm-connect/multichain-rn-evm.spec.ts
@@ -1,15 +1,15 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
 
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  ensureAccountGroupsFinishedLoading,
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import RNPlaygroundDapp from '../../page-objects/MMConnect/RNPlaygroundDapp.js';
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal.js';
 import SignModal from '../../page-objects/MMConnect/SignModal.js';
-import {
-  unlockIfLockScreenVisible,
-  ensurePlaygroundInstalled,
-  ensureAccountGroupsFinishedLoading,
-} from './utils.js';
+import { ensurePlaygroundInstalled } from './utils.js';
 import {
   PlaywrightAssertions,
   sleep,
diff --git a/tests/smoke-appium/mm-connect/multichain-rn-solana.spec.ts b/tests/smoke-appium/mm-connect/multichain-rn-solana.spec.ts
index 7ea8f4acc100..ff3f963b0fe9 100644
--- a/tests/smoke-appium/mm-connect/multichain-rn-solana.spec.ts
+++ b/tests/smoke-appium/mm-connect/multichain-rn-solana.spec.ts
@@ -1,15 +1,15 @@
 import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
 import { SmokeMMConnect } from '../../tags.js';
 
-import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import {
+  ensureAccountGroupsFinishedLoading,
+  loginToAppPlaywright,
+  unlockIfLockScreenVisible,
+} from '../../flows/wallet.flow.js';
 import RNPlaygroundDapp from '../../page-objects/MMConnect/RNPlaygroundDapp.js';
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal.js';
 import SnapSignModal from '../../page-objects/MMConnect/SnapSignModal.js';
-import {
-  unlockIfLockScreenVisible,
-  ensurePlaygroundInstalled,
-  ensureAccountGroupsFinishedLoading,
-} from './utils.js';
+import { ensurePlaygroundInstalled } from './utils.js';
 import {
   PlaywrightAssertions,
   sleep,
diff --git a/tests/smoke-appium/mm-connect/utils.ts b/tests/smoke-appium/mm-connect/utils.ts
index be45cf750cab..a891eca0606f 100644
--- a/tests/smoke-appium/mm-connect/utils.ts
+++ b/tests/smoke-appium/mm-connect/utils.ts
@@ -2,20 +2,9 @@
 import { execSync } from 'child_process';
 import path from 'path';
 import fs from 'fs';
-import WalletView from '../../page-objects/wallet/WalletView';
-import AccountListBottomSheet from '../../page-objects/wallet/AccountListBottomSheet';
-import {
-  PlaywrightGestures,
-  PlaywrightAssertions,
-  sleep,
-  createLogger,
-} from '../../framework';
-import { asPlaywrightElement } from '../../framework/EncapsulatedElement';
+import { sleep, createLogger } from '../../framework';
 import { PLAYGROUND_PACKAGE_ID } from '../../framework/Constants';
 import type { CurrentDeviceDetails } from '../../framework/fixtures/playwright';
-import { loginToAppPlaywright } from '../../flows/wallet.flow';
-
-export { unlockIfLockScreenVisible } from '../../page-objects/MMConnect/unlockHelpers';
 
 const logger = createLogger({
   name: 'MMConnectUtils',
@@ -130,36 +119,6 @@ function resolvePlaygroundApkPath(): string {
   );
 }
 
-/**
- * Wait for the wallet to be visible, then cycle the app twice to ensure all
- * account groups (including Solana) are created and syncing completes.
- * Must be called after login.
- */
-export async function ensureAccountGroupsFinishedLoading(
-  currentDeviceDetails: CurrentDeviceDetails,
-): Promise<void> {
-  await PlaywrightAssertions.expectElementToBeVisible(
-    asPlaywrightElement(WalletView.container),
-    { timeout: 15000 },
-  );
-  await PlaywrightGestures.terminateApp(currentDeviceDetails);
-  await PlaywrightGestures.activateApp(currentDeviceDetails);
-  await loginToAppPlaywright();
-  await PlaywrightAssertions.expectElementToBeVisible(
-    asPlaywrightElement(WalletView.container),
-    { timeout: 15000 },
-  );
-  await WalletView.tapIdenticon();
-  await AccountListBottomSheet.waitForAccountSyncToComplete();
-  await PlaywrightGestures.terminateApp(currentDeviceDetails);
-  await PlaywrightGestures.activateApp(currentDeviceDetails);
-  await loginToAppPlaywright();
-  await PlaywrightAssertions.expectElementToBeVisible(
-    asPlaywrightElement(WalletView.container),
-    { timeout: 15000 },
-  );
-}
-
 /**
  * Ensure the React Native playground release APK is installed on the
  * connected emulator. Uninstalls any existing version first, then installs
diff --git a/tests/smoke-appium/multichain/multichain-fixtures.ts b/tests/smoke-appium/multichain/multichain-fixtures.ts
new file mode 100644
index 000000000000..ad5169ad07c7
--- /dev/null
+++ b/tests/smoke-appium/multichain/multichain-fixtures.ts
@@ -0,0 +1,8 @@
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+
+export function createSessionFixture() {
+  return new FixtureBuilder()
+    .withAutoLockDisabled()
+    .withPopularNetworks()
+    .build();
+}
diff --git a/tests/smoke-appium/multichain/network-abstraction/permission-system-add-non-permitted.spec.ts b/tests/smoke-appium/multichain/network-abstraction/permission-system-add-non-permitted.spec.ts
new file mode 100644
index 000000000000..f16ed0752af8
--- /dev/null
+++ b/tests/smoke-appium/multichain/network-abstraction/permission-system-add-non-permitted.spec.ts
@@ -0,0 +1,67 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { SmokeNetworkAbstractions } from '../../../tags.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import {
+  navigateToBrowserView,
+  waitForTestDappToLoad,
+} from '../../../flows/browser.flow.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../framework/Assertions.js';
+import { DappVariants } from '../../../framework/Constants.js';
+import { CustomNetworks } from '../../../resources/networks.e2e.js';
+import Browser from '../../../page-objects/Browser/BrowserView.js';
+import TestDApp from '../../../page-objects/Browser/TestDApp.js';
+import ConnectBottomSheet from '../../../page-objects/Browser/ConnectBottomSheet.js';
+import ConnectedAccountsModal from '../../../page-objects/Browser/ConnectedAccountsModal.js';
+
+const SEPOLIA = CustomNetworks.Sepolia.providerConfig.nickname;
+
+appiumTest.describe(
+  SmokeNetworkAbstractions('Chain Permission System, non-permitted chain'),
+  () => {
+    appiumTest.describe.configure({ timeout: 300_000 });
+
+    appiumTest(
+      'requests permission when switching to non-permitted chain from dapp',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            dapps: [{ dappVariant: DappVariants.TEST_DAPP }],
+            fixture: new FixtureBuilder()
+              .withPermissionControllerConnectedToTestDapp()
+              .withChainPermission()
+              .withPopularNetworks()
+              .build(),
+            restartDevice: true,
+            currentDeviceDetails,
+          },
+          async () => {
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+            await navigateToBrowserView();
+
+            await Browser.navigateToTestDApp();
+            await waitForTestDappToLoad();
+
+            await TestDApp.tapOpenNetworkPicker();
+            // Exact match: "Sepolia" is a substring of "Linea Sepolia"
+            await TestDApp.tapNetworkByName(SEPOLIA, { exactMatch: true });
+
+            const expectedText = `Use your enabled networks, Requesting for ${SEPOLIA}`;
+            await Assertions.expectElementToHaveLabel(
+              ConnectedAccountsModal.navigateToEditNetworksPermissionsButton,
+              expectedText,
+              {
+                description: `edit networks permissions button should show "${expectedText}"`,
+              },
+            );
+            await Assertions.expectElementToBeVisible(
+              ConnectBottomSheet.connectButton,
+            );
+            await ConnectBottomSheet.tapConnectButton();
+          },
+        );
+      },
+    );
+  },
+);
diff --git a/tests/smoke-appium/multichain/network-abstraction/permission-system-chain-switch-grant.spec.ts b/tests/smoke-appium/multichain/network-abstraction/permission-system-chain-switch-grant.spec.ts
new file mode 100644
index 000000000000..8b32e2316a9a
--- /dev/null
+++ b/tests/smoke-appium/multichain/network-abstraction/permission-system-chain-switch-grant.spec.ts
@@ -0,0 +1,71 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { SmokeNetworkAbstractions } from '../../../tags.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import { navigateToBrowserView } from '../../../flows/browser.flow.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../framework/Assertions.js';
+import { DappVariants } from '../../../framework/Constants.js';
+import { CustomNetworks } from '../../../resources/networks.e2e.js';
+import { CUSTOM_RPC_PROVIDER_MOCKS } from '../../../api-mocking/mock-responses/custom-rpc-provider-mocks.js';
+import Browser from '../../../page-objects/Browser/BrowserView.js';
+import TestDApp from '../../../page-objects/Browser/TestDApp.js';
+import ConnectBottomSheet from '../../../page-objects/Browser/ConnectBottomSheet.js';
+import ConnectedAccountsModal from '../../../page-objects/Browser/ConnectedAccountsModal.js';
+import NetworkConnectMultiSelector from '../../../page-objects/Browser/NetworkConnectMultiSelector.js';
+import { NetworkNonPemittedBottomSheetSelectorsText } from '../../../../app/components/Views/NetworkConnect/NetworkNonPemittedBottomSheet.testIds.js';
+
+appiumTest.describe(SmokeNetworkAbstractions('Chain Permission System'), () => {
+  appiumTest.describe.configure({ timeout: 300_000 });
+
+  appiumTest.describe('When a dApp requests to switch to a new chain', () => {
+    appiumTest(
+      'grants permission to the new chain and switches to it when approved',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            dapps: [{ dappVariant: DappVariants.TEST_DAPP }],
+            fixture: new FixtureBuilder()
+              .withNetworkController(
+                CustomNetworks.ElysiumTestnet.providerConfig,
+              )
+              .withNetworkController(
+                CustomNetworks.EthereumMainCustom.providerConfig,
+              )
+              .build(),
+            restartDevice: true,
+            currentDeviceDetails,
+            testSpecificMock: CUSTOM_RPC_PROVIDER_MOCKS,
+          },
+          async () => {
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+            await navigateToBrowserView();
+
+            await Browser.navigateToTestDApp();
+            await TestDApp.tapDappConnectButton();
+            await ConnectedAccountsModal.tapPermissionsSummaryTab();
+            await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+            await NetworkConnectMultiSelector.selectNetworkChainPermission(
+              NetworkNonPemittedBottomSheetSelectorsText.ELYSIUM_TESTNET_NETWORK_NAME,
+            );
+            await NetworkConnectMultiSelector.tapUpdateButton();
+            await ConnectBottomSheet.tapConnectButton();
+
+            await Assertions.expectElementToBeVisible(Browser.addressBar);
+
+            await TestDApp.tapSwitchChainButton();
+            await ConnectBottomSheet.tapConnectButton();
+
+            await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
+            await ConnectedAccountsModal.tapPermissionsSummaryTab();
+
+            await Assertions.expectElementToHaveLabel(
+              ConnectedAccountsModal.networkPicker,
+              'l, E',
+            );
+          },
+        );
+      },
+    );
+  });
+});
diff --git a/tests/smoke-appium/multichain/network-abstraction/permission-system-remove.spec.ts b/tests/smoke-appium/multichain/network-abstraction/permission-system-remove.spec.ts
new file mode 100644
index 000000000000..0d8973ccc76f
--- /dev/null
+++ b/tests/smoke-appium/multichain/network-abstraction/permission-system-remove.spec.ts
@@ -0,0 +1,91 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { SmokeNetworkAbstractions } from '../../../tags.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import {
+  connectToTestDapp,
+  navigateToBrowserView,
+  waitForTestDappToLoad,
+} from '../../../flows/browser.flow.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../framework/Assertions.js';
+import Matchers from '../../../framework/Matchers.js';
+import { DappVariants } from '../../../framework/Constants.js';
+import { PopularNetworksList } from '../../../resources/networks.e2e.js';
+import Browser from '../../../page-objects/Browser/BrowserView.js';
+import ConnectedAccountsModal from '../../../page-objects/Browser/ConnectedAccountsModal.js';
+import NetworkListModal from '../../../page-objects/Network/NetworkListModal.js';
+import WalletView from '../../../page-objects/wallet/WalletView.js';
+import NetworkManager from '../../../page-objects/wallet/NetworkManager.js';
+import TabBarComponent from '../../../page-objects/wallet/TabBarComponent.js';
+import ToastModal from '../../../page-objects/wallet/ToastModal.js';
+import { NetworkNonPemittedBottomSheetSelectorsText } from '../../../../app/components/Views/NetworkConnect/NetworkNonPemittedBottomSheet.testIds.js';
+
+const OPTIMISM = PopularNetworksList.Optimism.providerConfig.nickname;
+
+appiumTest.describe(
+  SmokeNetworkAbstractions('Chain Permission Management'),
+  () => {
+    appiumTest.describe.configure({ timeout: 300_000 });
+
+    appiumTest(
+      'handles permission cleanup when removing a connected chain',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            dapps: [{ dappVariant: DappVariants.TEST_DAPP }],
+            fixture: new FixtureBuilder()
+              .withNetworkController(
+                PopularNetworksList.Optimism.providerConfig,
+              )
+              .build(),
+            restartDevice: true,
+            currentDeviceDetails,
+          },
+          async () => {
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+            await navigateToBrowserView();
+
+            // Connect to DApp (current network Optimism is permitted by default)
+            await connectToTestDapp();
+
+            await Browser.tapCloseBrowserButton();
+
+            await TabBarComponent.tapWallet();
+            await WalletView.tapOnNewTokensSection();
+            await WalletView.tapTokenNetworkFilter();
+
+            await NetworkListModal.changeNetworkTo(
+              NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME,
+            );
+            await WalletView.tapTokenNetworkFilter();
+
+            await NetworkListModal.tapNetworkRowMenuButton(OPTIMISM);
+            await NetworkListModal.tapDeleteButton();
+            await NetworkListModal.confirmDeleteNetwork();
+
+            await NetworkListModal.closeNetworkManager();
+            await ToastModal.waitForToastToDismiss();
+            await NetworkManager.navigateBackFromTokensFullView();
+
+            await navigateToBrowserView();
+            await Browser.navigateToTestDApp();
+            await waitForTestDappToLoad();
+
+            await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
+            await ConnectedAccountsModal.tapPermissionsSummaryTab();
+            await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+
+            await Assertions.expectElementToNotBeVisible(
+              Matchers.getElementByID(`${OPTIMISM}-selected`),
+              {
+                description:
+                  'Optimism should not remain a selected dapp chain permission after network delete',
+              },
+            );
+          },
+        );
+      },
+    );
+  },
+);
diff --git a/tests/smoke-appium/multichain/network-abstraction/permission-system-update-permissions.spec.ts b/tests/smoke-appium/multichain/network-abstraction/permission-system-update-permissions.spec.ts
new file mode 100644
index 000000000000..6b3ea23edc35
--- /dev/null
+++ b/tests/smoke-appium/multichain/network-abstraction/permission-system-update-permissions.spec.ts
@@ -0,0 +1,169 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { SmokeNetworkAbstractions } from '../../../tags.js';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import {
+  navigateToBrowserView,
+  waitForTestDappToLoad,
+} from '../../../flows/browser.flow.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../../framework/Assertions.js';
+import { DappVariants } from '../../../framework/Constants.js';
+import { CustomNetworks } from '../../../resources/networks.e2e.js';
+import { NetworkNonPemittedBottomSheetSelectorsText } from '../../../../app/components/Views/NetworkConnect/NetworkNonPemittedBottomSheet.testIds';
+import Browser from '../../../page-objects/Browser/BrowserView.js';
+import ConnectedAccountsModal from '../../../page-objects/Browser/ConnectedAccountsModal.js';
+import NetworkConnectMultiSelector from '../../../page-objects/Browser/NetworkConnectMultiSelector.js';
+import ToastModal from '../../../page-objects/wallet/ToastModal.js';
+import AccountListBottomSheet from '../../../page-objects/wallet/AccountListBottomSheet.js';
+
+appiumTest.describe(
+  SmokeNetworkAbstractions('Chain Permission Management'),
+  () => {
+    appiumTest.describe.configure({ timeout: 300_000 });
+
+    appiumTest(
+      'allows simultaneous granting and revoking of multiple chain permissions',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            dapps: [{ dappVariant: DappVariants.TEST_DAPP }],
+            fixture: new FixtureBuilder()
+              .withPermissionControllerConnectedToTestDapp()
+              .withChainPermission([
+                '0x1',
+                CustomNetworks.Sepolia.providerConfig.chainId as `0x${string}`,
+              ])
+              .build(),
+            restartDevice: true,
+            currentDeviceDetails,
+          },
+          async () => {
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+            await navigateToBrowserView();
+
+            await Browser.navigateToTestDApp();
+            await waitForTestDappToLoad();
+            await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
+
+            await ConnectedAccountsModal.tapPermissionsSummaryTab();
+            await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+
+            await NetworkConnectMultiSelector.selectNetworkChainPermission(
+              NetworkNonPemittedBottomSheetSelectorsText.SEPOLIA_NETWORK_NAME,
+            );
+            await NetworkConnectMultiSelector.selectNetworkChainPermission(
+              NetworkNonPemittedBottomSheetSelectorsText.LINEA_SEPOLIA_NETWORK_NAME,
+            );
+
+            await NetworkConnectMultiSelector.tapUpdateButton();
+
+            await ConnectedAccountsModal.tapPermissionsSummaryTab();
+            await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+
+            await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
+              NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME,
+            );
+            await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
+              NetworkNonPemittedBottomSheetSelectorsText.LINEA_SEPOLIA_NETWORK_NAME,
+            );
+            await NetworkConnectMultiSelector.isNetworkChainPermissionNotSelected(
+              NetworkNonPemittedBottomSheetSelectorsText.SEPOLIA_NETWORK_NAME,
+            );
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'manages permissions for multiple accounts and networks accurately',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            dapps: [{ dappVariant: DappVariants.TEST_DAPP }],
+            fixture: new FixtureBuilder()
+              .withPermissionControllerConnectedToTestDapp()
+              .build(),
+            restartDevice: true,
+            currentDeviceDetails,
+          },
+          async () => {
+            await loginToAppPlaywright({ scenarioType: 'e2e' });
+            await navigateToBrowserView();
+
+            await Browser.navigateToTestDApp();
+            await waitForTestDappToLoad();
+            await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
+            await Assertions.expectElementToNotBeVisible(
+              ToastModal.notificationTitle,
+            );
+            await Assertions.expectTextDisplayed('Account 1');
+            await Assertions.expectElementToBeVisible(
+              ConnectedAccountsModal.disconnectAllAccountsAndNetworksButton,
+            );
+
+            await ConnectedAccountsModal.tapAccountListBottomSheet();
+            await AccountListBottomSheet.tapAddAccountButtonV2();
+            await Assertions.expectTextDisplayed('Account 2');
+
+            await AccountListBottomSheet.tapAccountByNameV2('Account 2');
+            await AccountListBottomSheet.tapConnectAccountsButton();
+
+            await Assertions.expectTextDisplayed('Account 1');
+            await Assertions.expectTextDisplayed('Account 2');
+
+            await ConnectedAccountsModal.tapAccountListBottomSheet();
+            await AccountListBottomSheet.tapAddAccountButtonV2();
+            await Assertions.expectTextDisplayed('Account 3');
+
+            await AccountListBottomSheet.tapAccountByNameV2('Account 3');
+            await AccountListBottomSheet.tapConnectAccountsButton();
+
+            await Assertions.expectTextDisplayed('Account 1');
+            await Assertions.expectTextDisplayed('Account 2');
+            await Assertions.expectTextDisplayed('Account 3');
+
+            await ConnectedAccountsModal.tapPermissionsSummaryTab();
+            await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+
+            await Assertions.expectTextDisplayed(
+              NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME,
+            );
+
+            await NetworkConnectMultiSelector.selectNetworkChainPermission(
+              NetworkNonPemittedBottomSheetSelectorsText.SEPOLIA_NETWORK_NAME,
+            );
+            await NetworkConnectMultiSelector.selectNetworkChainPermission(
+              NetworkNonPemittedBottomSheetSelectorsText.LINEA_SEPOLIA_NETWORK_NAME,
+            );
+            await NetworkConnectMultiSelector.tapUpdateButton();
+
+            await ConnectedAccountsModal.tapPermissionsSummaryTab();
+            await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+
+            await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
+              NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME,
+            );
+            await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
+              NetworkNonPemittedBottomSheetSelectorsText.LINEA_SEPOLIA_NETWORK_NAME,
+            );
+            await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
+              NetworkNonPemittedBottomSheetSelectorsText.SEPOLIA_NETWORK_NAME,
+            );
+
+            await NetworkConnectMultiSelector.tapBackButton();
+
+            await ConnectedAccountsModal.tapDisconnectAllAccountsAndNetworksButton();
+            await ConnectedAccountsModal.tapConfirmDisconnectNetworksButton();
+
+            await Assertions.expectElementToBeVisible(Browser.addressBar);
+            await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
+            await Assertions.expectElementToNotBeVisible(
+              ConnectedAccountsModal.disconnectAllAccountsAndNetworksButton,
+            );
+          },
+        );
+      },
+    );
+  },
+);
diff --git a/tests/smoke-appium/multichain/network-expansion/btc-wallet-standard.spec.ts b/tests/smoke-appium/multichain/network-expansion/btc-wallet-standard.spec.ts
new file mode 100644
index 000000000000..604fe01ca2ed
--- /dev/null
+++ b/tests/smoke-appium/multichain/network-expansion/btc-wallet-standard.spec.ts
@@ -0,0 +1,122 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { SmokeNetworkExpansion } from '../../../tags.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
+import {
+  DappServer,
+  DappVariants,
+  TestDapps,
+} from '../../../framework/index.js';
+import {
+  setupAdbReverse,
+  cleanupAdbReverse,
+  waitForDappServerReady,
+} from '../../mm-connect/utils.js';
+import BitcoinTestDapp, {
+  BITCOIN_DAPP_PORT,
+} from '../../../page-objects/Browser/BitcoinTestDapp.js';
+import ToastModal from '../../../page-objects/wallet/ToastModal.js';
+
+// Truncated Bitcoin account address shown in the dapp header after connect
+const account1Short = 'bc1q...yump';
+
+// Expected deterministic BIP-340 Schnorr signature for the fixed test message
+const signedMessageStandard =
+  '271486823211510961053671593213121630193816218985222159577512714825421410039180175314517251232893341221418210218699217951999213157247101787166209162102702122391448617217326133312849199212551951866224105551902392399522115638752383224419341608718511954214130102';
+
+const bitcoinDappServer = new DappServer({
+  dappCounter: 0,
+  rootDirectory: TestDapps[DappVariants.BITCOIN_TEST_DAPP].dappPath,
+  dappVariant: DappVariants.BITCOIN_TEST_DAPP,
+});
+
+appiumTest.describe(SmokeNetworkExpansion('Bitcoin Wallet Standard'), () => {
+  appiumTest.describe.configure({ timeout: 300_000 });
+
+  appiumTest.beforeAll(async () => {
+    bitcoinDappServer.setServerPort(BITCOIN_DAPP_PORT);
+    await bitcoinDappServer.start();
+    await waitForDappServerReady(BITCOIN_DAPP_PORT);
+    setupAdbReverse(BITCOIN_DAPP_PORT);
+  });
+
+  appiumTest.afterAll(async () => {
+    cleanupAdbReverse(BITCOIN_DAPP_PORT);
+    await bitcoinDappServer.stop();
+  });
+
+  appiumTest(
+    'Connects and disconnects from Bitcoin test dapp',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder().build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await BitcoinTestDapp.setupAndNavigate();
+          await BitcoinTestDapp.connect();
+
+          await BitcoinTestDapp.verifyAccount(account1Short);
+          await BitcoinTestDapp.verifyConnectionStatus('Connected');
+
+          await BitcoinTestDapp.disconnect();
+
+          await BitcoinTestDapp.verifyConnectionStatus('Not connected');
+        },
+      );
+    },
+  );
+
+  // Locally the test passes always and the app shows connected within 1 sec.
+  // On CI it passes fine on iOS. But on Android it still sometimes fails the
+  // first attempt with: timed out after 30s, status still "Not connected".
+  appiumTest.skip(
+    'Stays connected after page refresh',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder().build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await BitcoinTestDapp.setupAndNavigate();
+          await BitcoinTestDapp.connect();
+          await ToastModal.waitForToastToDismiss();
+
+          await BitcoinTestDapp.verifyAccount(account1Short);
+          await BitcoinTestDapp.verifyConnectionStatus('Connected');
+
+          await BitcoinTestDapp.reload();
+
+          await BitcoinTestDapp.verifyAccount(account1Short);
+          await BitcoinTestDapp.verifyConnectionStatus('Connected');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'Signs a message',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder().build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await BitcoinTestDapp.setupAndNavigate();
+          await BitcoinTestDapp.connect();
+
+          await BitcoinTestDapp.signMessage();
+          await BitcoinTestDapp.confirmSignMessage();
+
+          await BitcoinTestDapp.verifySignedMessage(signedMessageStandard);
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/multichain/network-expansion/multiple-provider-connections.spec.ts b/tests/smoke-appium/multichain/network-expansion/multiple-provider-connections.spec.ts
new file mode 100644
index 000000000000..371bb4ddbd4b
--- /dev/null
+++ b/tests/smoke-appium/multichain/network-expansion/multiple-provider-connections.spec.ts
@@ -0,0 +1,171 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { SmokeNetworkExpansion } from '../../../tags.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import FixtureBuilder, {
+  DEFAULT_FIXTURE_ACCOUNT,
+  DEFAULT_FIXTURE_ACCOUNT_2,
+} from '../../../framework/fixtures/FixtureBuilder.js';
+import {
+  DappVariants,
+  PlaywrightAssertions,
+  asPlaywrightElement,
+} from '../../../framework/index.js';
+import {
+  Caip25CaveatType,
+  Caip25EndowmentPermissionName,
+} from '@metamask/chain-agnostic-permission';
+import {
+  loginToAppPlaywright,
+  dismissPushNotificationExistingUserSheet,
+} from '../../../flows/wallet.flow.js';
+import { navigateToBrowserView } from '../../../flows/browser.flow.js';
+import BrowserView from '../../../page-objects/Browser/BrowserView.js';
+import TestDApp from '../../../page-objects/Browser/TestDApp.js';
+import DappConnectionModal from '../../../page-objects/MMConnect/DappConnectionModal.js';
+import ChromeCdpHelpers from '../../../framework/ChromeCdpHelpers.js';
+import { NetworkNonPemittedBottomSheetSelectorsText } from '../../../../app/components/Views/NetworkConnect/NetworkNonPemittedBottomSheet.testIds.js';
+
+async function setupAndNavigateToTestDapp(): Promise<void> {
+  ChromeCdpHelpers.resetMetaMaskWebViewCache();
+  await loginToAppPlaywright({ scenarioType: 'e2e' });
+  await navigateToBrowserView();
+  await dismissPushNotificationExistingUserSheet();
+  await BrowserView.navigateToTestDApp();
+}
+
+appiumTest.describe(
+  SmokeNetworkExpansion('Multiple Standard Dapp Connections'),
+  () => {
+    appiumTest.describe.configure({ timeout: 300_000 });
+
+    appiumTest(
+      'Defaults account selection to already permitted account when wallet_requestPermissions is called with no accounts specified',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: new FixtureBuilder()
+              .withImportedHdKeyringAndTwoDefaultAccountsOneImportedHdAccountKeyringController()
+              .withPermissionControllerConnectedToTestDapp({
+                [Caip25EndowmentPermissionName]: {
+                  caveats: [
+                    {
+                      type: Caip25CaveatType,
+                      value: {
+                        optionalScopes: {
+                          'eip155:1': {
+                            accounts: [
+                              `eip155:1:${DEFAULT_FIXTURE_ACCOUNT_2.toLowerCase()}`,
+                            ],
+                          },
+                        },
+                        requiredScopes: {},
+                        sessionProperties: {},
+                        isMultichainOrigin: false,
+                      },
+                    },
+                  ],
+                },
+              })
+              .build(),
+            dapps: [{ dappVariant: DappVariants.TEST_DAPP }],
+            restartDevice: true,
+            currentDeviceDetails,
+          },
+          async () => {
+            await setupAndNavigateToTestDapp();
+
+            await TestDApp.requestPermissions();
+
+            // The account already permitted (Account 2) should be pre-selected
+            await PlaywrightAssertions.expectTextDisplayed('Account 2');
+
+            await DappConnectionModal.tapConnectButton({ timeout: 15_000 });
+
+            // Only the already-permitted EVM account should remain connected
+            await BrowserView.tapNetworkAvatarOrAccountButtonOnBrowser();
+            await PlaywrightAssertions.expectTextDisplayed('Account 2');
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'Retains Solana permissions when connecting through the EVM provider',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: new FixtureBuilder().build(),
+            dapps: [{ dappVariant: DappVariants.TEST_DAPP }],
+            restartDevice: true,
+            currentDeviceDetails,
+          },
+          async () => {
+            await setupAndNavigateToTestDapp();
+
+            await TestDApp.tapDappConnectButton();
+
+            // Account 1 should be the default selection
+            await PlaywrightAssertions.expectTextDisplayed('Account 1');
+
+            await DappConnectionModal.tapConnectButton({ timeout: 15_000 });
+
+            await BrowserView.tapNetworkAvatarOrAccountButtonOnBrowser();
+            await PlaywrightAssertions.expectTextDisplayed('Account 1');
+
+            // Navigate to the permissions summary and open the network editor
+            await DappConnectionModal.tapPermissionsTabButton();
+            await DappConnectionModal.tapEditNetworksButton();
+
+            // Both Solana and Ethereum Main Network should be visible as permitted
+            await PlaywrightAssertions.expectElementToBeVisible(
+              await asPlaywrightElement(
+                DappConnectionModal.getNetworkButton(
+                  NetworkNonPemittedBottomSheetSelectorsText.SOLANA_NETWORK_NAME,
+                ),
+              ),
+              { timeout: 10_000 },
+            );
+            await PlaywrightAssertions.expectElementToBeVisible(
+              await asPlaywrightElement(
+                DappConnectionModal.getNetworkButton(
+                  NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME,
+                ),
+              ),
+              { timeout: 10_000 },
+            );
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'Defaults account selection to already permitted Solana account and requested Ethereum account when wallet_requestPermissions is called with specific Ethereum account',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: new FixtureBuilder().build(),
+            dapps: [{ dappVariant: DappVariants.TEST_DAPP }],
+            restartDevice: true,
+            currentDeviceDetails,
+          },
+          async () => {
+            await setupAndNavigateToTestDapp();
+
+            await TestDApp.requestPermissions({
+              accounts: [DEFAULT_FIXTURE_ACCOUNT],
+            });
+
+            // Account 1 should be pre-selected
+            await PlaywrightAssertions.expectTextDisplayed('Account 1');
+
+            await DappConnectionModal.tapConnectButton({ timeout: 15_000 });
+
+            // EVM account should be connected
+            await BrowserView.tapNetworkAvatarOrAccountButtonOnBrowser();
+            await PlaywrightAssertions.expectTextDisplayed('Account 1');
+          },
+        );
+      },
+    );
+  },
+);
diff --git a/tests/smoke-appium/multichain/network-expansion/solana-wallet-standard.spec.ts b/tests/smoke-appium/multichain/network-expansion/solana-wallet-standard.spec.ts
new file mode 100644
index 000000000000..7684bbf7801c
--- /dev/null
+++ b/tests/smoke-appium/multichain/network-expansion/solana-wallet-standard.spec.ts
@@ -0,0 +1,220 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { SmokeNetworkExpansion } from '../../../tags.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
+import {
+  DappServer,
+  DappVariants,
+  TestDapps,
+} from '../../../framework/index.js';
+import {
+  setupAdbReverse,
+  cleanupAdbReverse,
+  waitForDappServerReady,
+} from '../../mm-connect/utils.js';
+import SolanaTestDApp, {
+  SOLANA_DAPP_PORT,
+} from '../../../page-objects/Browser/SolanaTestDApp.js';
+import TabBarComponent from '../../../page-objects/wallet/TabBarComponent.js';
+import PlaywrightMatchers from '../../../framework/PlaywrightMatchers.js';
+import PlaywrightGestures from '../../../framework/PlaywrightGestures.js';
+import { navigateToBrowserView } from '../../../flows/browser.flow.js';
+
+// Truncated Solana account addresses shown in the dapp header
+const account1Short = 'CEQ8...Yrrd';
+const account2Short = '9Wa2...Dj2U';
+
+const solanaDappServer = new DappServer({
+  dappCounter: 0,
+  rootDirectory: TestDapps[DappVariants.SOLANA_TEST_DAPP].dappPath,
+  dappVariant: DappVariants.SOLANA_TEST_DAPP,
+});
+
+appiumTest.describe(SmokeNetworkExpansion('Solana Wallet Standard'), () => {
+  appiumTest.describe.configure({ timeout: 300_000 });
+
+  appiumTest.beforeAll(async () => {
+    solanaDappServer.setServerPort(SOLANA_DAPP_PORT);
+    await solanaDappServer.start();
+    await waitForDappServerReady(SOLANA_DAPP_PORT);
+    setupAdbReverse(SOLANA_DAPP_PORT);
+  });
+
+  appiumTest.afterAll(async () => {
+    cleanupAdbReverse(SOLANA_DAPP_PORT);
+    await solanaDappServer.stop();
+  });
+
+  appiumTest(
+    'Connects and disconnects from Solana test dapp',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder().build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await SolanaTestDApp.setupAndNavigate();
+          await SolanaTestDApp.connect();
+
+          await SolanaTestDApp.verifyAccount(account1Short);
+          await SolanaTestDApp.verifyConnectionStatus('Connected');
+
+          await SolanaTestDApp.disconnect();
+
+          await SolanaTestDApp.verifyConnectionStatus('Not connected');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'Cancels connection and reconnects',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder().build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await SolanaTestDApp.setupAndNavigate();
+
+          // Start the connect flow but cancel in MetaMask's modal
+          await SolanaTestDApp.clickConnectButton();
+          await SolanaTestDApp.selectMetaMaskWallet();
+          await SolanaTestDApp.tapCancel();
+
+          await SolanaTestDApp.verifyConnectionStatus('Not connected');
+
+          // Full connect should now succeed
+          await SolanaTestDApp.connect();
+          await SolanaTestDApp.verifyAccount(account1Short);
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'Stays connected after page refresh',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder().build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await SolanaTestDApp.setupAndNavigate();
+          await SolanaTestDApp.connect();
+
+          await SolanaTestDApp.verifyAccount(account1Short);
+
+          await SolanaTestDApp.reload();
+
+          await SolanaTestDApp.verifyAccount(account1Short);
+          await SolanaTestDApp.verifyConnectionStatus('Connected');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'Triggers sign transaction confirmation and cancels (MMQA-586)',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder().build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await SolanaTestDApp.setupAndNavigate();
+          await SolanaTestDApp.connect();
+
+          await SolanaTestDApp.signTransaction();
+
+          // Verify the Snap confirmation appeared and cancel it.
+          // Sending the actual transaction is blocked until devnet is
+          // supported on mobile (https://github.com/MetaMask/metamask-mobile/issues/15002).
+          await SolanaTestDApp.tapCancelTransaction();
+        },
+      );
+    },
+  );
+
+  // Skipped: the default Appium fixture only has one Solana snap account in
+  // internalAccounts. A second Solana account (account2Short) needs to be added
+  // to both AccountsController.internalAccounts and the Snap Keyring in the fixture
+  // before this test can run. The Detox original was also it.skip for the same reason.
+  appiumTest.skip(
+    'Switches between 2 accounts and reflects in the dapp',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder().build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await SolanaTestDApp.setupAndNavigate();
+          await SolanaTestDApp.connectWithAllAccounts();
+
+          // After connecting all accounts, the dapp shows the second account as active
+          await SolanaTestDApp.verifyAccount(account2Short);
+
+          // Switch to a different account via the wallet tab
+          await TabBarComponent.tapWallet();
+          const accountLabelEl =
+            await PlaywrightMatchers.getElementById('account-label');
+          await PlaywrightGestures.waitAndTap(accountLabelEl, {
+            timeout: 10_000,
+          });
+          // The active account (account2) is listed first; index 1 is account1
+          const account1Cell = await PlaywrightMatchers.getElementById(
+            'cellbase-avatar-title',
+            { index: 1 },
+          );
+          await PlaywrightGestures.waitAndTap(account1Cell, {
+            timeout: 10_000,
+          });
+
+          await navigateToBrowserView();
+
+          // Dapp should now reflect the switched account
+          await SolanaTestDApp.verifyAccount(account1Short);
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'Signs a message',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder().build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await SolanaTestDApp.setupAndNavigate();
+          await SolanaTestDApp.connect();
+
+          await SolanaTestDApp.signMessage();
+          await SolanaTestDApp.confirmSignMessage();
+
+          const signedMessage = await SolanaTestDApp.getSignedMessage();
+          const expected =
+            'Kort1JYMAf3dmzKRx4WiYXW9gSfPHzxw0flAka25ymjB4d+UZpU/trFoSPk4DM7emT1c/e6Wk0bsRcLsj/h9BQ==';
+          if (signedMessage !== expected) {
+            throw new Error(
+              `Signed message mismatch.\nExpected: ${expected}\nActual:   ${signedMessage}`,
+            );
+          }
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/multichain/wallet-createSession.spec.ts b/tests/smoke-appium/multichain/wallet-createSession.spec.ts
new file mode 100644
index 000000000000..638658eb7620
--- /dev/null
+++ b/tests/smoke-appium/multichain/wallet-createSession.spec.ts
@@ -0,0 +1,198 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeMultiChainAPI } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { createSessionFixture } from './multichain-fixtures.js';
+import { DappServer, DappVariants, TestDapps } from '../../framework/index.js';
+import {
+  setupAdbReverse,
+  cleanupAdbReverse,
+  waitForDappServerReady,
+} from '../mm-connect/utils.js';
+import MultichainTestDApp, {
+  MULTICHAIN_DAPP_PORT,
+} from '../../page-objects/Browser/MultichainTestDApp.js';
+import MultichainUtilities from '../../helpers/multichain/MultichainUtilities.js';
+
+const multichainDappServer = new DappServer({
+  dappCounter: 0,
+  rootDirectory: TestDapps[DappVariants.MULTICHAIN_TEST_DAPP].dappPath,
+  dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
+});
+
+appiumTest.describe(SmokeMultiChainAPI('wallet_createSession'), () => {
+  appiumTest.describe.configure({ timeout: 300_000 });
+
+  appiumTest.beforeAll(async () => {
+    multichainDappServer.setServerPort(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.start();
+    await waitForDappServerReady(MULTICHAIN_DAPP_PORT);
+    setupAdbReverse(MULTICHAIN_DAPP_PORT);
+  });
+
+  appiumTest.afterAll(async () => {
+    cleanupAdbReverse(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.stop();
+  });
+
+  appiumTest(
+    'should create a session with Ethereum mainnet scope',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: createSessionFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await MultichainTestDApp.setupAndNavigateToTestDapp();
+          await MultichainTestDApp.createSessionWithNetworks(
+            MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM,
+          );
+          const sessionResult = await MultichainTestDApp.getSessionData();
+
+          const assertions = MultichainUtilities.generateSessionAssertions(
+            sessionResult,
+            MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM,
+          );
+
+          MultichainUtilities.logSessionDetails(
+            sessionResult,
+            'Single Ethereum Test',
+          );
+
+          if (!assertions.structureValid)
+            throw new Error('Invalid session structure');
+          if (!assertions.success) throw new Error('Session creation failed');
+          if (!assertions.chainsValid)
+            throw new Error(
+              `Chain validation failed. Missing chains: ${assertions.missingChains.join(', ')}`,
+            );
+          if (assertions.chainCount !== 1)
+            throw new Error(
+              `Expected 1 chain, but found ${assertions.chainCount}`,
+            );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'should create a session with multiple EVM chains',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: createSessionFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await MultichainTestDApp.setupAndNavigateToTestDapp();
+          await MultichainTestDApp.createSessionWithNetworks(
+            MultichainUtilities.NETWORK_COMBINATIONS.ETHEREUM_POLYGON,
+          );
+          const sessionResult = await MultichainTestDApp.getSessionData();
+
+          const assertions = MultichainUtilities.generateSessionAssertions(
+            sessionResult,
+            MultichainUtilities.NETWORK_COMBINATIONS.ETHEREUM_POLYGON,
+          );
+
+          MultichainUtilities.logSessionDetails(
+            sessionResult,
+            'Multi-chain Test',
+          );
+
+          if (!assertions.structureValid)
+            throw new Error('Invalid session structure');
+          if (!assertions.success) throw new Error('Session creation failed');
+          if (!assertions.chainsValid)
+            throw new Error(
+              `Chain validation failed. Missing chains: ${assertions.missingChains.join(', ')}`,
+            );
+          if (assertions.chainCount !== 2)
+            throw new Error(
+              `Expected 2 chains, but found ${assertions.chainCount}`,
+            );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'should create a session with all available EVM networks',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: createSessionFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await MultichainTestDApp.setupAndNavigateToTestDapp();
+          await MultichainTestDApp.createSessionWithNetworks(
+            MultichainUtilities.NETWORK_COMBINATIONS.ALL_MAJOR_EVM,
+          );
+          const sessionResult = await MultichainTestDApp.getSessionData();
+
+          const assertions = MultichainUtilities.generateSessionAssertions(
+            sessionResult,
+            MultichainUtilities.NETWORK_COMBINATIONS.ALL_MAJOR_EVM,
+          );
+
+          MultichainUtilities.logSessionDetails(
+            sessionResult,
+            'All Networks Test',
+          );
+
+          if (!assertions.structureValid)
+            throw new Error('Invalid session structure');
+          if (!assertions.success) throw new Error('Session creation failed');
+          if (
+            !assertions.foundChains.includes(
+              MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET,
+            )
+          )
+            throw new Error('Ethereum mainnet not found in session scopes');
+          if (assertions.chainCount <= 1)
+            throw new Error(
+              `Expected multiple chains, but found ${assertions.chainCount}`,
+            );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'should handle session creation with no networks selected',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: createSessionFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await MultichainTestDApp.setupAndNavigateToTestDapp();
+          await MultichainTestDApp.createSessionWithNetworks([]);
+
+          const sessionResult = { success: false, sessionScopes: {} };
+          const assertions = MultichainUtilities.generateSessionAssertions(
+            sessionResult,
+            [],
+          );
+          MultichainUtilities.logSessionDetails(
+            sessionResult,
+            'No Networks Test',
+          );
+
+          if (!assertions.structureValid)
+            throw new Error('Invalid session result type');
+          if (assertions.success || assertions.chainCount > 0)
+            throw new Error(
+              'Expected session creation to fail with no networks selected, but it succeeded',
+            );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/multichain/wallet-getSession.spec.ts b/tests/smoke-appium/multichain/wallet-getSession.spec.ts
new file mode 100644
index 000000000000..991cb7904329
--- /dev/null
+++ b/tests/smoke-appium/multichain/wallet-getSession.spec.ts
@@ -0,0 +1,230 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeMultiChainAPI } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { createSessionFixture } from './multichain-fixtures.js';
+import { DappServer, DappVariants, TestDapps } from '../../framework/index.js';
+import {
+  setupAdbReverse,
+  cleanupAdbReverse,
+  waitForDappServerReady,
+} from '../mm-connect/utils.js';
+import MultichainTestDApp, {
+  MULTICHAIN_DAPP_PORT,
+} from '../../page-objects/Browser/MultichainTestDApp.js';
+import MultichainUtilities from '../../helpers/multichain/MultichainUtilities.js';
+
+const multichainDappServer = new DappServer({
+  dappCounter: 0,
+  rootDirectory: TestDapps[DappVariants.MULTICHAIN_TEST_DAPP].dappPath,
+  dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
+});
+
+appiumTest.describe(SmokeMultiChainAPI('wallet_getSession'), () => {
+  appiumTest.describe.configure({ timeout: 300_000 });
+
+  appiumTest.beforeAll(async () => {
+    multichainDappServer.setServerPort(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.start();
+    await waitForDappServerReady(MULTICHAIN_DAPP_PORT);
+    setupAdbReverse(MULTICHAIN_DAPP_PORT);
+  });
+
+  appiumTest.afterAll(async () => {
+    cleanupAdbReverse(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.stop();
+  });
+
+  appiumTest(
+    'should successfully receive empty session scopes when there is no existing session',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: createSessionFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await MultichainTestDApp.setupAndNavigateToTestDapp();
+          await MultichainTestDApp.scrollToPageTop();
+          await MultichainTestDApp.useAutoConnectButton();
+          await MultichainTestDApp.tapGetSessionButton();
+
+          const sessionResult = await MultichainTestDApp.getSessionData();
+          const assertions = MultichainUtilities.generateSessionAssertions(
+            sessionResult,
+            [],
+          );
+
+          if (!assertions.structureValid)
+            throw new Error('Invalid session structure');
+
+          if (assertions.success && assertions.chainCount > 0)
+            throw new Error(
+              `Expected empty session scopes, but found ${assertions.chainCount} chains`,
+            );
+
+          if (
+            sessionResult.sessionScopes &&
+            Object.keys(sessionResult.sessionScopes).length > 0
+          )
+            throw new Error('Expected empty session scopes object');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'should return correct and consistent session scopes for selected chains',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: createSessionFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await MultichainTestDApp.setupAndNavigateToTestDapp();
+          const networksToTest =
+            MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
+
+          await MultichainTestDApp.createSessionWithNetworks(networksToTest);
+
+          await MultichainTestDApp.tapGetSessionButton();
+          const getSessionResult1 = await MultichainTestDApp.getSessionData();
+          await MultichainTestDApp.tapGetSessionButton();
+          const getSessionResult2 = await MultichainTestDApp.getSessionData();
+          await MultichainTestDApp.tapGetSessionButton();
+          const getSessionResult3 = await MultichainTestDApp.getSessionData();
+
+          const assertions1 = MultichainUtilities.generateSessionAssertions(
+            getSessionResult1,
+            networksToTest,
+          );
+          const assertions2 = MultichainUtilities.generateSessionAssertions(
+            getSessionResult2,
+            networksToTest,
+          );
+          const assertions3 = MultichainUtilities.generateSessionAssertions(
+            getSessionResult3,
+            networksToTest,
+          );
+
+          if (!assertions1.structureValid)
+            throw new Error('Invalid session structure');
+
+          if (
+            !assertions1.success ||
+            !assertions2.success ||
+            !assertions3.success
+          )
+            throw new Error('One or more getSession calls failed');
+
+          if (!assertions1.chainsValid) {
+            MultichainUtilities.logSessionDetails(
+              getSessionResult1,
+              'Failed Session Validation',
+            );
+            throw new Error(
+              `Chain validation failed. Missing chains: ${assertions1.missingChains.join(', ')}`,
+            );
+          }
+
+          if (assertions1.chainCount !== networksToTest.length)
+            throw new Error(
+              `Expected ${networksToTest.length} chain(s), but found ${assertions1.chainCount}`,
+            );
+
+          const expectedScope = MultichainUtilities.getEIP155Scope(
+            MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET,
+          );
+          if (!getSessionResult1.sessionScopes?.[expectedScope])
+            throw new Error(
+              `Expected session scope ${expectedScope} not found`,
+            );
+
+          const ethereumScope = getSessionResult1.sessionScopes[expectedScope];
+          if (!ethereumScope.accounts || ethereumScope.accounts.length === 0)
+            throw new Error('Expected session scope to have accounts');
+
+          const scopes1 = JSON.stringify(getSessionResult1.sessionScopes);
+          const scopes2 = JSON.stringify(getSessionResult2.sessionScopes);
+          const scopes3 = JSON.stringify(getSessionResult3.sessionScopes);
+
+          if (scopes1 !== scopes2 || scopes2 !== scopes3)
+            throw new Error('Session data inconsistent across multiple calls');
+
+          if (
+            assertions1.chainCount !== assertions2.chainCount ||
+            assertions2.chainCount !== assertions3.chainCount
+          )
+            throw new Error(
+              `Chain count inconsistent: ${assertions1.chainCount}, ${assertions2.chainCount}, ${assertions3.chainCount}`,
+            );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'should handle getSession after session has been modified',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: createSessionFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await MultichainTestDApp.setupAndNavigateToTestDapp();
+
+          const initialNetworks =
+            MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
+
+          await MultichainTestDApp.createSessionWithNetworks(initialNetworks);
+          await MultichainTestDApp.tapGetSessionButton();
+
+          const getSessionResult1 = await MultichainTestDApp.getSessionData();
+          const getAssertions1 = MultichainUtilities.generateSessionAssertions(
+            getSessionResult1,
+            initialNetworks,
+          );
+
+          if (!getAssertions1.success || getAssertions1.chainCount === 0)
+            throw new Error('Initial session validation failed');
+
+          const newNetworks = [
+            MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET,
+            MultichainUtilities.CHAIN_IDS.BSC,
+            MultichainUtilities.CHAIN_IDS.BASE,
+          ];
+
+          await MultichainTestDApp.createSessionWithNetworks(newNetworks);
+
+          const getSessionResult2 = await MultichainTestDApp.getSessionData();
+          const getAssertions2 = MultichainUtilities.generateSessionAssertions(
+            getSessionResult2,
+            newNetworks,
+          );
+
+          if (!getAssertions2.success)
+            throw new Error('New session creation failed');
+
+          if (!getAssertions2.chainsValid) {
+            MultichainUtilities.logSessionDetails(
+              getSessionResult2,
+              'Failed Session Validation',
+            );
+            throw new Error(
+              `Chain validation failed. Missing chains: ${getAssertions2.missingChains.join(', ')}`,
+            );
+          }
+
+          if (getAssertions2.chainCount !== newNetworks.length)
+            throw new Error(
+              `Expected ${newNetworks.length} chain(s), but found ${getAssertions2.chainCount}`,
+            );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/multichain/wallet-invokeMethod-eip5792.spec.ts b/tests/smoke-appium/multichain/wallet-invokeMethod-eip5792.spec.ts
new file mode 100644
index 000000000000..58b5ba3e7ff7
--- /dev/null
+++ b/tests/smoke-appium/multichain/wallet-invokeMethod-eip5792.spec.ts
@@ -0,0 +1,301 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeMultiChainAPI } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { DappServer, DappVariants, TestDapps } from '../../framework/index.js';
+import {
+  setupAdbReverse,
+  cleanupAdbReverse,
+  waitForDappServerReady,
+} from '../mm-connect/utils.js';
+import MultichainTestDApp, {
+  MULTICHAIN_DAPP_PORT,
+} from '../../page-objects/Browser/MultichainTestDApp.js';
+import MultichainUtilities from '../../helpers/multichain/MultichainUtilities.js';
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../framework/Assertions.js';
+import { LocalNodeType, AnvilNodeOptions } from '../../framework/types.js';
+import { Hardfork } from '../../seeder/anvil-manager.js';
+import { Mockttp } from 'mockttp';
+import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { remoteFeatureEip7702 } from '../../api-mocking/mock-responses/feature-flags-mocks.js';
+import { isHexString } from '@metamask/utils';
+
+const ANVIL_NODE_OPTIONS_WITH_GATOR: AnvilNodeOptions = {
+  hardfork: 'prague' as Hardfork,
+  loadState: './tests/seeder/network-states/7702/withDelegatorContracts.json',
+};
+
+const REMOTE_FEATURE_EIP_7702_MOCK = async (mockServer: Mockttp) => {
+  await setupRemoteFeatureFlagsMock(
+    mockServer,
+    Object.assign({}, ...remoteFeatureEip7702),
+  );
+};
+
+const multichainDappServer = new DappServer({
+  dappCounter: 0,
+  rootDirectory: TestDapps[DappVariants.MULTICHAIN_TEST_DAPP].dappPath,
+  dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
+});
+
+appiumTest.describe(SmokeMultiChainAPI('wallet_invokeMethod_eip5792'), () => {
+  appiumTest.describe.configure({ timeout: 300_000 });
+
+  appiumTest.beforeAll(async () => {
+    multichainDappServer.setServerPort(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.start();
+    await waitForDappServerReady(MULTICHAIN_DAPP_PORT);
+    setupAdbReverse(MULTICHAIN_DAPP_PORT);
+  });
+
+  appiumTest.afterAll(async () => {
+    cleanupAdbReverse(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.stop();
+  });
+
+  appiumTest.describe('Multiple method invocations', () => {
+    appiumTest(
+      'should handle multiple method calls in sequence',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: new FixtureBuilder().withPopularNetworks().build(),
+            restartDevice: true,
+            currentDeviceDetails,
+          },
+          async () => {
+            await MultichainTestDApp.setupAndNavigateToTestDapp(
+              '?autoMode=true',
+            );
+
+            const networksToTest =
+              MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
+            await MultichainTestDApp.createSessionWithNetworks(networksToTest);
+
+            const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
+            const methodsToTest = [
+              'eth_chainId',
+              'eth_getBalance',
+              'eth_gasPrice',
+            ];
+
+            for (const method of methodsToTest) {
+              const invoked = await MultichainTestDApp.invokeMethodOnChain(
+                chainId,
+                method,
+              );
+              if (!invoked) {
+                throw new Error(
+                  `Failed to invoke ${method} on chain ${chainId}`,
+                );
+              }
+
+              const resultText = await MultichainTestDApp.getInvokeMethodResult(
+                chainId,
+                method,
+                0,
+              );
+              if (!resultText) {
+                throw new Error(
+                  `Failed to get result for ${method} on chain ${chainId}`,
+                );
+              }
+
+              if (method === 'eth_chainId' && resultText !== '"0x1"') {
+                throw new Error(`${method}: expected "0x1", got ${resultText}`);
+              } else if (
+                (method === 'eth_getBalance' || method === 'eth_gasPrice') &&
+                !resultText.includes('"0x')
+              ) {
+                throw new Error(
+                  `${method}: expected hex string, got ${resultText}`,
+                );
+              }
+            }
+          },
+        );
+      },
+    );
+  });
+
+  appiumTest.describe('EIP-5792 methods', () => {
+    appiumTest(
+      'should be able to call: wallet_getCapabilities',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: new FixtureBuilder().withDefaultFixture().build(),
+            restartDevice: true,
+            currentDeviceDetails,
+            localNodeOptions: [
+              {
+                type: LocalNodeType.anvil,
+                options: ANVIL_NODE_OPTIONS_WITH_GATOR,
+              },
+            ],
+            testSpecificMock: REMOTE_FEATURE_EIP_7702_MOCK,
+          },
+          async () => {
+            await MultichainTestDApp.setupAndNavigateToTestDapp();
+
+            const chainId = MultichainUtilities.CHAIN_IDS.LOCALHOST;
+            await MultichainTestDApp.createSessionWithNetworks([chainId]);
+
+            const method = 'wallet_getCapabilities';
+            await MultichainTestDApp.invokeMethod(chainId, method);
+
+            const resultText = await MultichainTestDApp.getInvokeMethodResult(
+              chainId,
+              method,
+            );
+
+            const result = JSON.parse(resultText ?? '{}');
+            const expectedResult = {
+              '0x539': {
+                atomic: { status: 'ready' },
+              },
+            };
+
+            await Assertions.checkIfObjectsMatch(result, expectedResult);
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'should be able to call: wallet_sendCalls',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: new FixtureBuilder().withDefaultFixture().build(),
+            restartDevice: true,
+            currentDeviceDetails,
+            localNodeOptions: [
+              {
+                type: LocalNodeType.anvil,
+                options: ANVIL_NODE_OPTIONS_WITH_GATOR,
+              },
+            ],
+            testSpecificMock: REMOTE_FEATURE_EIP_7702_MOCK,
+          },
+          async () => {
+            await MultichainTestDApp.setupAndNavigateToTestDapp();
+
+            const chainId = MultichainUtilities.CHAIN_IDS.LOCALHOST;
+            await MultichainTestDApp.createSessionWithNetworks([chainId]);
+
+            const method = 'wallet_sendCalls';
+            await MultichainTestDApp.invokeMethod(chainId, method);
+
+            await MultichainTestDApp.tapConfirmButton();
+
+            const resultText = await MultichainTestDApp.getInvokeMethodResult(
+              chainId,
+              method,
+            );
+
+            const result = JSON.parse(resultText ?? '{}') as Record<
+              string,
+              unknown
+            >;
+
+            await Assertions.checkIfObjectHasKeysAndValidValues(result, {
+              id: isHexString,
+            });
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'should be able to call: wallet_getCallsStatus',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: new FixtureBuilder().withDefaultFixture().build(),
+            restartDevice: true,
+            currentDeviceDetails,
+            localNodeOptions: [
+              {
+                type: LocalNodeType.anvil,
+                options: ANVIL_NODE_OPTIONS_WITH_GATOR,
+              },
+            ],
+            testSpecificMock: REMOTE_FEATURE_EIP_7702_MOCK,
+          },
+          async () => {
+            await MultichainTestDApp.setupAndNavigateToTestDapp();
+
+            const chainId = MultichainUtilities.CHAIN_IDS.LOCALHOST;
+            await MultichainTestDApp.createSessionWithNetworks([chainId]);
+
+            // First obtain a batch ID from wallet_sendCalls
+            const sendCallsMethod = 'wallet_sendCalls';
+            await MultichainTestDApp.invokeMethod(chainId, sendCallsMethod);
+            await MultichainTestDApp.tapConfirmButton();
+
+            const sendCallsResultText =
+              await MultichainTestDApp.getInvokeMethodResult(
+                chainId,
+                sendCallsMethod,
+              );
+
+            const sendCallsResult = JSON.parse(
+              sendCallsResultText ?? '{}',
+            ) as Record<string, unknown>;
+            const batchId = sendCallsResult.id as string;
+
+            if (!batchId || !isHexString(batchId)) {
+              throw new Error(
+                `Invalid batch ID from wallet_sendCalls: ${batchId}`,
+              );
+            }
+
+            // Poll wallet_getCallsStatus until the transaction is confirmed
+            // (status 200 + receipts). Anvil mines asynchronously so the
+            // first call may return status 100 (pending) with no receipts.
+            const getStatusMethod = 'wallet_getCallsStatus';
+            const POLL_DEADLINE_MS = 30_000;
+            const deadline = Date.now() + POLL_DEADLINE_MS;
+            let resultIndex = 0;
+            let getStatusResult: Record<string, unknown> = {};
+
+            for (;;) {
+              await MultichainTestDApp.invokeMethod(chainId, getStatusMethod, [
+                batchId,
+              ]);
+              const text = await MultichainTestDApp.getInvokeMethodResult(
+                chainId,
+                getStatusMethod,
+                resultIndex,
+              );
+              resultIndex += 1;
+              getStatusResult = JSON.parse(text ?? '{}') as Record<
+                string,
+                unknown
+              >;
+
+              if (getStatusResult.status === 200 || Date.now() >= deadline) {
+                break;
+              }
+              await new Promise<void>((r) => setTimeout(r, 500));
+            }
+
+            await Assertions.checkIfObjectHasKeysAndValidValues(
+              getStatusResult,
+              {
+                version: (value: unknown) =>
+                  typeof value === 'string' && value.length > 0,
+                id: isHexString,
+                chainId: isHexString,
+                atomic: Boolean,
+                status: (value: unknown) => value === 200,
+                receipts: Array.isArray,
+              },
+            );
+          },
+        );
+      },
+    );
+  });
+});
diff --git a/tests/smoke-appium/multichain/wallet-invokeMethod.spec.ts b/tests/smoke-appium/multichain/wallet-invokeMethod.spec.ts
new file mode 100644
index 000000000000..4c2ba73d379d
--- /dev/null
+++ b/tests/smoke-appium/multichain/wallet-invokeMethod.spec.ts
@@ -0,0 +1,301 @@
+/**
+ * Appium port of wallet_invokeMethod Detox tests.
+ *
+ * Result elements (invoke-method-*-result-*) are <pre> tags — invisible to
+ * UiAutomator. They are read via direct CDP WebSocket in MultichainTestDApp.
+ */
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeMultiChainAPI } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { createSessionFixture } from './multichain-fixtures.js';
+import { DappServer, DappVariants, TestDapps } from '../../framework/index.js';
+import {
+  setupAdbReverse,
+  cleanupAdbReverse,
+  waitForDappServerReady,
+} from '../mm-connect/utils.js';
+import MultichainTestDApp, {
+  MULTICHAIN_DAPP_PORT,
+} from '../../page-objects/Browser/MultichainTestDApp.js';
+import MultichainUtilities from '../../helpers/multichain/MultichainUtilities.js';
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../framework/Assertions.js';
+
+const multichainDappServer = new DappServer({
+  dappCounter: 0,
+  rootDirectory: TestDapps[DappVariants.MULTICHAIN_TEST_DAPP].dappPath,
+  dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
+});
+
+appiumTest.describe(SmokeMultiChainAPI('wallet_invokeMethod'), () => {
+  appiumTest.describe.configure({ timeout: 300_000 });
+
+  appiumTest.beforeAll(async () => {
+    multichainDappServer.setServerPort(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.start();
+    await waitForDappServerReady(MULTICHAIN_DAPP_PORT);
+    setupAdbReverse(MULTICHAIN_DAPP_PORT);
+  });
+
+  appiumTest.afterAll(async () => {
+    cleanupAdbReverse(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.stop();
+  });
+
+  appiumTest.describe('Read operations', () => {
+    appiumTest(
+      'should match selected method to the expected output for eth_chainId',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: new FixtureBuilder().withPopularNetworks().build(),
+            restartDevice: true,
+            currentDeviceDetails,
+          },
+          async () => {
+            await MultichainTestDApp.setupAndNavigateToTestDapp(
+              '?autoMode=true',
+            );
+
+            const networksToTest =
+              MultichainUtilities.NETWORK_COMBINATIONS.ETHEREUM_POLYGON;
+            await MultichainTestDApp.createSessionWithNetworks(networksToTest);
+
+            const sessionData = await MultichainTestDApp.getSessionData();
+            const sessionAssertions =
+              MultichainUtilities.generateSessionAssertions(
+                sessionData,
+                networksToTest,
+              );
+            if (
+              !sessionAssertions.success ||
+              sessionAssertions.chainCount !== networksToTest.length
+            ) {
+              throw new Error(
+                `Session validation failed. Expected ${networksToTest.length} chains, got ${sessionAssertions.chainCount}`,
+              );
+            }
+
+            const method = 'eth_chainId';
+            const expectedResults: Record<string, string> = {
+              [MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET]: '"0x1"',
+              [MultichainUtilities.CHAIN_IDS.POLYGON]: '"0x89"',
+            };
+
+            for (const chainId of networksToTest) {
+              const invoked = await MultichainTestDApp.invokeMethodOnChain(
+                chainId,
+                method,
+              );
+              if (!invoked) {
+                throw new Error(
+                  `Failed to invoke ${method} on chain ${chainId}`,
+                );
+              }
+
+              const resultText = await MultichainTestDApp.getInvokeMethodResult(
+                chainId,
+                method,
+                0,
+              );
+              if (!resultText) {
+                throw new Error(
+                  `Failed to get result for ${method} on chain ${chainId}`,
+                );
+              }
+
+              if (resultText !== expectedResults[chainId]) {
+                throw new Error(
+                  `Chain ${chainId}: expected ${expectedResults[chainId]}, got ${resultText}`,
+                );
+              }
+            }
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'should successfully call eth_getBalance method and return balance',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: new FixtureBuilder().withPopularNetworks().build(),
+            restartDevice: true,
+            currentDeviceDetails,
+          },
+          async () => {
+            await MultichainTestDApp.setupAndNavigateToTestDapp(
+              '?autoMode=true',
+            );
+
+            const networksToTest =
+              MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
+            await MultichainTestDApp.createSessionWithNetworks(networksToTest);
+
+            const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
+            const method = 'eth_getBalance';
+
+            const invoked = await MultichainTestDApp.invokeMethodOnChain(
+              chainId,
+              method,
+            );
+            if (!invoked) {
+              throw new Error(`Failed to invoke ${method} on chain ${chainId}`);
+            }
+
+            const resultText = await MultichainTestDApp.getInvokeMethodResult(
+              chainId,
+              method,
+              0,
+            );
+            if (!resultText) {
+              throw new Error(
+                `Failed to get result for ${method} on chain ${chainId}`,
+              );
+            }
+
+            if (!resultText.includes('"0x')) {
+              throw new Error(
+                `eth_getBalance returned invalid result. Expected hex string, got: ${resultText}`,
+              );
+            }
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'should successfully call eth_gasPrice method and return gas price',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: new FixtureBuilder().withPopularNetworks().build(),
+            restartDevice: true,
+            currentDeviceDetails,
+          },
+          async () => {
+            await MultichainTestDApp.setupAndNavigateToTestDapp(
+              '?autoMode=true',
+            );
+
+            const networksToTest =
+              MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
+            await MultichainTestDApp.createSessionWithNetworks(networksToTest);
+
+            const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
+            const method = 'eth_gasPrice';
+
+            const invoked = await MultichainTestDApp.invokeMethodOnChain(
+              chainId,
+              method,
+            );
+            if (!invoked) {
+              throw new Error(`Failed to invoke ${method} on chain ${chainId}`);
+            }
+
+            const resultText = await MultichainTestDApp.getInvokeMethodResult(
+              chainId,
+              method,
+              0,
+            );
+            if (!resultText) {
+              throw new Error(
+                `Failed to get result for ${method} on chain ${chainId}`,
+              );
+            }
+
+            if (!resultText.includes('"0x')) {
+              throw new Error(
+                `eth_gasPrice returned invalid result. Expected hex string, got: ${resultText}`,
+              );
+            }
+          },
+        );
+      },
+    );
+  });
+
+  appiumTest.describe(
+    'Write operations: transaction methods with confirmation dialogs',
+    () => {
+      appiumTest(
+        'should trigger eth_sendTransaction confirmation dialog and reject transaction',
+        async ({ driver: _driver, currentDeviceDetails }) => {
+          await withFixtures(
+            {
+              fixture: createSessionFixture(),
+              restartDevice: true,
+              currentDeviceDetails,
+            },
+            async () => {
+              await MultichainTestDApp.setupAndNavigateToTestDapp(
+                '?autoMode=true',
+              );
+
+              const networksToTest =
+                MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
+              await MultichainTestDApp.createSessionWithNetworks(
+                networksToTest,
+              );
+
+              const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
+              const method = 'eth_sendTransaction';
+
+              const invoked = await MultichainTestDApp.invokeMethodOnChain(
+                chainId,
+                method,
+              );
+              await Assertions.checkIfTextMatches(
+                invoked ? 'true' : 'false',
+                'true',
+              );
+
+              await MultichainTestDApp.tapCancelButton();
+            },
+          );
+        },
+      );
+
+      appiumTest(
+        'should verify transaction methods require confirmation',
+        async ({ driver: _driver, currentDeviceDetails }) => {
+          await withFixtures(
+            {
+              fixture: createSessionFixture(),
+              restartDevice: true,
+              currentDeviceDetails,
+            },
+            async () => {
+              await MultichainTestDApp.setupAndNavigateToTestDapp(
+                '?autoMode=true',
+              );
+
+              const networksToTest =
+                MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
+              await MultichainTestDApp.createSessionWithNetworks(
+                networksToTest,
+              );
+
+              const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
+              const writeOperations = ['eth_sendTransaction', 'personal_sign'];
+
+              for (const method of writeOperations) {
+                const invoked = await MultichainTestDApp.invokeMethodOnChain(
+                  chainId,
+                  method,
+                );
+                await Assertions.checkIfTextMatches(
+                  invoked ? 'true' : 'false',
+                  'true',
+                );
+
+                await MultichainTestDApp.tapCancelButton();
+              }
+            },
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/multichain/wallet-notify.spec.ts b/tests/smoke-appium/multichain/wallet-notify.spec.ts
new file mode 100644
index 000000000000..625982376ace
--- /dev/null
+++ b/tests/smoke-appium/multichain/wallet-notify.spec.ts
@@ -0,0 +1,104 @@
+/**
+ * Appium port of wallet_notify Detox tests.
+ *
+ * Tests that the dapp can subscribe to blockchain events via eth_subscribe and
+ * receive notifications through the wallet_notify mechanism. Notification
+ * elements are <pre>/<details> tags read via direct CDP WebSocket.
+ *
+ * Note: Notification delivery depends on live Ethereum Mainnet activity.
+ * The test polls up to 15 seconds for a notification to arrive after subscribing.
+ */
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeMultiChainAPI } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { DappServer, DappVariants, TestDapps } from '../../framework/index.js';
+import {
+  setupAdbReverse,
+  cleanupAdbReverse,
+  waitForDappServerReady,
+} from '../mm-connect/utils.js';
+import MultichainTestDApp, {
+  MULTICHAIN_DAPP_PORT,
+} from '../../page-objects/Browser/MultichainTestDApp.js';
+import MultichainUtilities from '../../helpers/multichain/MultichainUtilities.js';
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../framework/Assertions.js';
+
+const multichainDappServer = new DappServer({
+  dappCounter: 0,
+  rootDirectory: TestDapps[DappVariants.MULTICHAIN_TEST_DAPP].dappPath,
+  dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
+});
+
+appiumTest.describe(SmokeMultiChainAPI('wallet_notify'), () => {
+  appiumTest.describe.configure({ timeout: 300_000 });
+
+  appiumTest.beforeAll(async () => {
+    multichainDappServer.setServerPort(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.start();
+    await waitForDappServerReady(MULTICHAIN_DAPP_PORT);
+    setupAdbReverse(MULTICHAIN_DAPP_PORT);
+  });
+
+  appiumTest.afterAll(async () => {
+    cleanupAdbReverse(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.stop();
+  });
+
+  appiumTest(
+    'should receive a notification through the Multichain API for the event subscribed to',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      // eth_subscribe notifications require live Ethereum Mainnet block events.
+      // The mock server intercepts the Infura WebSocket so blocks never arrive
+      // in emulator/CI. This test is quarantined until a mock block-event
+      // fixture is available.
+      appiumTest.skip(
+        true,
+        'Requires live Ethereum Mainnet block events — emulator never delivers them',
+      );
+
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder().withPopularNetworks().build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
+
+          const networksToTest =
+            MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
+          await MultichainTestDApp.createSessionWithNetworks(networksToTest);
+
+          const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
+
+          const initiallyEmpty =
+            await MultichainTestDApp.isNotificationContainerEmpty();
+
+          const subscribed =
+            await MultichainTestDApp.subscribeToChainEvents(chainId);
+
+          await Assertions.checkIfTextMatches(
+            subscribed ? 'true' : 'false',
+            'true',
+          );
+
+          console.log('Successfully subscribed to events');
+
+          const hasNotifications = await MultichainTestDApp.hasNotifications();
+
+          await Assertions.checkIfTextMatches(
+            hasNotifications ? 'true' : 'false',
+            'true',
+          );
+
+          if (hasNotifications && initiallyEmpty) {
+            console.log('Confirmed state change: empty → has notifications');
+          }
+
+          console.log('wallet_notify test passed');
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/multichain/wallet-revokeSession.spec.ts b/tests/smoke-appium/multichain/wallet-revokeSession.spec.ts
new file mode 100644
index 000000000000..569a2a65edcd
--- /dev/null
+++ b/tests/smoke-appium/multichain/wallet-revokeSession.spec.ts
@@ -0,0 +1,107 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeMultiChainAPI } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { createSessionFixture } from './multichain-fixtures.js';
+import { DappServer, DappVariants, TestDapps } from '../../framework/index.js';
+import {
+  setupAdbReverse,
+  cleanupAdbReverse,
+  waitForDappServerReady,
+} from '../mm-connect/utils.js';
+import MultichainTestDApp, {
+  MULTICHAIN_DAPP_PORT,
+} from '../../page-objects/Browser/MultichainTestDApp.js';
+import MultichainUtilities from '../../helpers/multichain/MultichainUtilities.js';
+
+const multichainDappServer = new DappServer({
+  dappCounter: 0,
+  rootDirectory: TestDapps[DappVariants.MULTICHAIN_TEST_DAPP].dappPath,
+  dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
+});
+
+appiumTest.describe(SmokeMultiChainAPI('wallet_revokeSession'), () => {
+  appiumTest.describe.configure({ timeout: 300_000 });
+
+  appiumTest.beforeAll(async () => {
+    multichainDappServer.setServerPort(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.start();
+    await waitForDappServerReady(MULTICHAIN_DAPP_PORT);
+    setupAdbReverse(MULTICHAIN_DAPP_PORT);
+  });
+
+  appiumTest.afterAll(async () => {
+    cleanupAdbReverse(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.stop();
+  });
+
+  appiumTest(
+    'should return empty object from wallet_getSession call after revoking session',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: createSessionFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await MultichainTestDApp.setupAndNavigateToTestDapp();
+
+          const networksToTest =
+            MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
+
+          await MultichainTestDApp.createSessionWithNetworks(networksToTest);
+          await MultichainTestDApp.tapGetSessionButton();
+
+          const sessionBeforeRevoke = await MultichainTestDApp.getSessionData();
+          const assertionsBeforeRevoke =
+            MultichainUtilities.generateSessionAssertions(
+              sessionBeforeRevoke,
+              networksToTest,
+            );
+
+          if (
+            !assertionsBeforeRevoke.success ||
+            assertionsBeforeRevoke.chainCount === 0
+          )
+            throw new Error(
+              'Session should have non-empty scopes before revoke',
+            );
+
+          await MultichainTestDApp.tapRevokeSessionButton();
+          await MultichainTestDApp.tapGetSessionButton();
+
+          const sessionAfterRevoke = await MultichainTestDApp.getSessionData();
+          const assertionsAfterRevoke =
+            MultichainUtilities.generateSessionAssertions(
+              sessionAfterRevoke,
+              [],
+            );
+
+          if (!assertionsAfterRevoke.structureValid)
+            throw new Error('Invalid session structure after revoke');
+
+          if (
+            assertionsAfterRevoke.success &&
+            assertionsAfterRevoke.chainCount > 0
+          ) {
+            MultichainUtilities.logSessionDetails(
+              sessionAfterRevoke,
+              'Unexpected Session After Revoke',
+            );
+            throw new Error(
+              `Expected empty session scopes after revoke, but found ${assertionsAfterRevoke.chainCount} chains`,
+            );
+          }
+
+          if (
+            sessionAfterRevoke.sessionScopes &&
+            Object.keys(sessionAfterRevoke.sessionScopes).length > 0
+          )
+            throw new Error(
+              'Expected empty session scopes object after revoke',
+            );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/multichain/wallet-sessionChanged.spec.ts b/tests/smoke-appium/multichain/wallet-sessionChanged.spec.ts
new file mode 100644
index 000000000000..90e9d94e2414
--- /dev/null
+++ b/tests/smoke-appium/multichain/wallet-sessionChanged.spec.ts
@@ -0,0 +1,114 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeMultiChainAPI } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { createSessionFixture } from './multichain-fixtures.js';
+import { DappServer, DappVariants, TestDapps } from '../../framework/index.js';
+import {
+  setupAdbReverse,
+  cleanupAdbReverse,
+  waitForDappServerReady,
+} from '../mm-connect/utils.js';
+import MultichainTestDApp, {
+  MULTICHAIN_DAPP_PORT,
+} from '../../page-objects/Browser/MultichainTestDApp.js';
+import MultichainUtilities from '../../helpers/multichain/MultichainUtilities.js';
+
+const multichainDappServer = new DappServer({
+  dappCounter: 0,
+  rootDirectory: TestDapps[DappVariants.MULTICHAIN_TEST_DAPP].dappPath,
+  dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
+});
+
+appiumTest.describe(SmokeMultiChainAPI('wallet_sessionChanged'), () => {
+  appiumTest.describe.configure({ timeout: 300_000 });
+
+  appiumTest.beforeAll(async () => {
+    multichainDappServer.setServerPort(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.start();
+    await waitForDappServerReady(MULTICHAIN_DAPP_PORT);
+    setupAdbReverse(MULTICHAIN_DAPP_PORT);
+  });
+
+  appiumTest.afterAll(async () => {
+    cleanupAdbReverse(MULTICHAIN_DAPP_PORT);
+    await multichainDappServer.stop();
+  });
+
+  appiumTest(
+    'should receive a wallet_sessionChanged event when creating a new session with different networks',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: createSessionFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
+
+          const modifiedNetworks = [
+            MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET,
+            MultichainUtilities.CHAIN_IDS.BASE,
+          ];
+
+          await MultichainTestDApp.createSessionWithNetworks(modifiedNetworks);
+
+          const baseScope = MultichainUtilities.getEIP155Scope(
+            MultichainUtilities.CHAIN_IDS.BASE,
+          );
+
+          const eventText =
+            await MultichainTestDApp.getSessionChangedEventData(0);
+
+          if (!eventText) throw new Error('Event text is null or empty');
+
+          const parsedEvent = JSON.parse(eventText);
+          const eventScopes = Object.keys(
+            parsedEvent.params?.sessionScopes || {},
+          );
+
+          if (!eventScopes.includes(baseScope))
+            throw new Error(
+              `Base scope ${baseScope} not found in sessionChanged event`,
+            );
+
+          const eip155Capabilities =
+            parsedEvent.params?.sessionProperties?.eip155Capabilities;
+
+          if (!eip155Capabilities)
+            throw new Error(
+              'eip155Capabilities missing from sessionProperties',
+            );
+
+          const capabilityAddresses = Object.keys(eip155Capabilities || {}).map(
+            (address) => address.toLowerCase(),
+          );
+
+          const permittedAddresses = [
+            ...new Set(
+              eventScopes
+                .filter((scope) => scope.startsWith('eip155:'))
+                .flatMap(
+                  (scope) =>
+                    parsedEvent.params?.sessionScopes?.[scope]?.accounts ?? [],
+                )
+                .map((account: string) =>
+                  account.split(':').slice(-1)[0].toLowerCase(),
+                ),
+            ),
+          ];
+
+          if (
+            permittedAddresses.length === 0 ||
+            !permittedAddresses.every((address) =>
+              capabilityAddresses.includes(address),
+            )
+          )
+            throw new Error(
+              'Not all permitted addresses found in eip155Capabilities',
+            );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/perps/perps-add-funds.spec.ts b/tests/smoke-appium/perps/perps-add-funds.spec.ts
new file mode 100644
index 000000000000..ac235a98ee17
--- /dev/null
+++ b/tests/smoke-appium/perps/perps-add-funds.spec.ts
@@ -0,0 +1,184 @@
+import { Mockttp } from 'mockttp';
+import { PerpsMarketBalanceActionsSelectorsIDs } from '../../../app/components/UI/Perps/Perps.testIds.js';
+import {
+  PERPS_ARBITRUM_MOCKS,
+  mockPerpsGeolocation,
+} from '../../api-mocking/mock-responses/perps-arbitrum-mocks.js';
+import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import Assertions from '../../framework/Assertions.js';
+import { RampsRegions, RampsRegionsEnum } from '../../framework/Constants.js';
+import Gestures from '../../framework/Gestures.js';
+import Matchers from '../../framework/Matchers.js';
+import Utilities from '../../framework/Utilities.js';
+import { asPlaywrightElement } from '../../framework/EncapsulatedElement.js';
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { LocalNodeType, TestSuiteParams } from '../../framework/types.js';
+import {
+  beginPerpsSmokeTestPlaywright,
+  PERPS_SMOKE_PERMISSIONS,
+} from '../../helpers/perps/perps-smoke-helpers.js';
+import PerpsE2EModifiers from '../../helpers/perps/perps-modifiers.js';
+import PerpsDepositView from '../../page-objects/Perps/PerpsDepositView.js';
+import PerpsHomeView from '../../page-objects/Perps/PerpsHomeView.js';
+import ToastModal from '../../page-objects/wallet/ToastModal.js';
+import WalletView from '../../page-objects/wallet/WalletView.js';
+import { Hardfork } from '../../seeder/anvil-manager.js';
+import { SmokePerps } from '../../tags.js';
+
+appiumTest.describe.skip(
+  SmokePerps('Perps - Add funds (has funds, not first time)'),
+  () => {
+    appiumTest(
+      'deposits $80 from Add funds and verifies updated balance',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: new FixtureBuilder()
+              .withPerpsProfile('no-positions')
+              .withPerpsFirstTimeUser(false)
+              .withAccountTreeController()
+              .withKeyringControllerOfMultipleAccounts()
+              .withNetworkController({
+                type: 'rpc',
+                chainId: '0xa4b1',
+                rpcUrl: 'https://arb1.arbitrum.io/rpc',
+                nickname: 'Arbitrum One',
+                ticker: 'ETH',
+              })
+              .withTokensForAllPopularNetworks([
+                {
+                  address: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
+                  symbol: 'USDC',
+                  decimals: 6,
+                  name: 'USD Coin',
+                  type: 'erc20',
+                },
+              ])
+              .withTokens(
+                [
+                  {
+                    address: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+                    symbol: 'USDC',
+                    decimals: 6,
+                    name: 'USD Coin',
+                    type: 'erc20',
+                  },
+                ],
+                '0xa4b1',
+                '0xbacec2e26c5c794de6e82a1a7e21b9c329fa8cf6',
+              )
+              .build(),
+            restartDevice: true,
+            currentDeviceDetails,
+            permissions: PERPS_SMOKE_PERMISSIONS,
+            testSpecificMock: async (mockServer: Mockttp) => {
+              await setupRemoteFeatureFlagsMock(mockServer, {});
+              await PERPS_ARBITRUM_MOCKS(mockServer);
+              await mockPerpsGeolocation(
+                mockServer,
+                RampsRegions[RampsRegionsEnum.SPAIN],
+              );
+            },
+            useCommandQueueServer: true,
+            localNodeOptions: [
+              {
+                type: LocalNodeType.anvil,
+                options: { hardfork: 'prague' as Hardfork },
+              },
+            ],
+          },
+          async ({ commandQueueServer }: TestSuiteParams) => {
+            if (!commandQueueServer) {
+              throw new Error('Command queue server not found');
+            }
+
+            await beginPerpsSmokeTestPlaywright();
+            await Assertions.expectElementToBeVisible(WalletView.container, {
+              description: 'Wallet view visible',
+            });
+
+            await WalletView.scrollAndTapPerpsSection();
+            await PerpsHomeView.tapExploreCryptoIfVisible();
+
+            const addFundsButton = Matchers.getElementByID(
+              PerpsMarketBalanceActionsSelectorsIDs.ADD_FUNDS_BUTTON,
+            );
+            const balanceValueElement = Matchers.getElementByID(
+              PerpsMarketBalanceActionsSelectorsIDs.BALANCE_VALUE,
+            );
+
+            await Utilities.executeWithRetry(
+              async () => {
+                const isAddFundsVisible = await Utilities.isElementVisible(
+                  addFundsButton,
+                  2000,
+                );
+                if (!isAddFundsVisible) {
+                  throw new Error('Perps Add funds CTA is not visible yet');
+                }
+              },
+              { interval: 1000, timeout: 20000 },
+            );
+
+            const initialBalanceText =
+              (await (
+                await asPlaywrightElement(balanceValueElement)
+              ).textContent()) || '0';
+            const initialBalance =
+              parseFloat(initialBalanceText.replace(/[^0-9.-]/g, '')) || 0;
+
+            await Utilities.executeWithRetry(
+              async () => {
+                await Gestures.waitAndTap(addFundsButton, {
+                  elemDescription: 'Perps Add Funds Button',
+                });
+                await Assertions.expectElementToBeVisible(
+                  PerpsDepositView.amountInput,
+                  {
+                    description:
+                      'Deposit amount input visible after tapping Add funds',
+                    timeout: 5000,
+                  },
+                );
+              },
+              { interval: 1000, timeout: 30000 },
+            );
+
+            await Assertions.expectElementToNotBeVisible(ToastModal.container, {
+              description: 'No toast visible before entering amount',
+              timeout: 10000,
+            });
+
+            await PerpsDepositView.expectLoaded();
+            await PerpsDepositView.focusAmount();
+            await PerpsDepositView.typeUSD('80');
+            await PerpsDepositView.tapContinue();
+            await Assertions.expectTextDisplayed('Transaction fee');
+            await PerpsDepositView.tapAddFunds();
+
+            await PerpsE2EModifiers.applyDepositUSDServer(
+              commandQueueServer,
+              '80',
+            );
+            await Utilities.executeWithRetry(
+              async () => {
+                const currentText =
+                  (await (
+                    await asPlaywrightElement(balanceValueElement)
+                  ).textContent()) || '0';
+                const current =
+                  parseFloat(currentText.replace(/[^0-9.-]/g, '')) || 0;
+                await Assertions.checkIfValueIsDefined(
+                  current === initialBalance + 80,
+                );
+              },
+              { interval: 1000, timeout: 60000 },
+            );
+          },
+        );
+      },
+    );
+  },
+);
diff --git a/tests/smoke-appium/perps/perps-limit-long-fill.spec.ts b/tests/smoke-appium/perps/perps-limit-long-fill.spec.ts
new file mode 100644
index 000000000000..b16ca9ffd9be
--- /dev/null
+++ b/tests/smoke-appium/perps/perps-limit-long-fill.spec.ts
@@ -0,0 +1,67 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokePerps } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { placeLimitOrderAtPreset } from '../../flows/perps.flow.js';
+import PerpsMarketDetailsView from '../../page-objects/Perps/PerpsMarketDetailsView.js';
+import PerpsE2EModifiers from '../../helpers/perps/perps-modifiers.js';
+import Utilities from '../../framework/Utilities.js';
+import { TestSuiteParams } from '../../framework/types.js';
+import {
+  beginPerpsSmokeTestPlaywright,
+  buildPerpsSmokeFixture,
+  PERPS_SMOKE_MARKET_SYMBOL,
+  PERPS_SMOKE_PERMISSIONS,
+  setupPerpsSmokeMocks,
+} from '../../helpers/perps/perps-smoke-helpers.js';
+
+appiumTest.describe(SmokePerps('Perps - ETH limit long fill'), () => {
+  appiumTest(
+    'creates ETH limit long at Mid, shows open order, then fills after -15%',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: buildPerpsSmokeFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+          permissions: PERPS_SMOKE_PERMISSIONS,
+          testSpecificMock: setupPerpsSmokeMocks,
+          useCommandQueueServer: true,
+        },
+        async ({ commandQueueServer }: TestSuiteParams) => {
+          if (!commandQueueServer) {
+            throw new Error('Command queue server not found');
+          }
+
+          await beginPerpsSmokeTestPlaywright();
+
+          await placeLimitOrderAtPreset(
+            PERPS_SMOKE_MARKET_SYMBOL,
+            'long',
+            'Mid',
+          );
+
+          await PerpsMarketDetailsView.expectCompactOpenOrderVisible({
+            direction: 'long',
+          });
+
+          await PerpsE2EModifiers.updateMarketPriceServer(
+            commandQueueServer,
+            PERPS_SMOKE_MARKET_SYMBOL,
+            '2125.00',
+          );
+
+          await Utilities.executeWithRetry(
+            async () => {
+              await PerpsMarketDetailsView.expectClosePositionButtonVisible();
+            },
+            {
+              interval: 1000,
+              timeout: 60000,
+              description: 'wait for limit long to fill into an open position',
+            },
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/perps/perps-position-liquidation.spec.ts b/tests/smoke-appium/perps/perps-position-liquidation.spec.ts
new file mode 100644
index 000000000000..a540e6f93241
--- /dev/null
+++ b/tests/smoke-appium/perps/perps-position-liquidation.spec.ts
@@ -0,0 +1,91 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokePerps } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import PerpsMarketDetailsView from '../../page-objects/Perps/PerpsMarketDetailsView.js';
+import PerpsE2EModifiers from '../../helpers/perps/perps-modifiers.js';
+import { TestSuiteParams, Utilities } from '../../framework/index.js';
+import CommandQueueServer from '../../framework/fixtures/CommandQueueServer.js';
+import { openPosition } from '../../flows/perps.flow.js';
+import {
+  beginPerpsSmokeTestPlaywright,
+  buildPerpsSmokeFixture,
+  PERPS_SMOKE_MARKET_SYMBOL,
+  PERPS_SMOKE_PERMISSIONS,
+  setupPerpsSmokeMocks,
+} from '../../helpers/perps/perps-smoke-helpers.js';
+
+const NON_LIQUIDATING_MARK_PRICE = '2400.00';
+const LIQUIDATING_MARK_PRICE = '1.00';
+
+const queueLiquidationCheckAtPrice = async (
+  commandQueueServer: CommandQueueServer,
+  symbol: string,
+  price: string,
+) => {
+  await PerpsE2EModifiers.updateMarketPriceServer(
+    commandQueueServer,
+    symbol,
+    price,
+  );
+  await PerpsE2EModifiers.triggerLiquidationServer(commandQueueServer, symbol);
+};
+
+const waitForCommandQueueToProcess = async (
+  commandQueueServer: CommandQueueServer,
+) => {
+  commandQueueServer.requestStateExport();
+  await commandQueueServer.getExportedState();
+};
+
+appiumTest.describe(SmokePerps('Perps Position Liquidation'), () => {
+  appiumTest(
+    'liquidates a long position when mark price moves below liquidation price',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: buildPerpsSmokeFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+          permissions: PERPS_SMOKE_PERMISSIONS,
+          testSpecificMock: setupPerpsSmokeMocks,
+          useCommandQueueServer: true,
+        },
+        async ({ commandQueueServer }: TestSuiteParams) => {
+          if (!commandQueueServer) {
+            throw new Error('Command queue server not found');
+          }
+
+          await beginPerpsSmokeTestPlaywright();
+
+          await openPosition(PERPS_SMOKE_MARKET_SYMBOL, 'long');
+
+          await queueLiquidationCheckAtPrice(
+            commandQueueServer,
+            PERPS_SMOKE_MARKET_SYMBOL,
+            NON_LIQUIDATING_MARK_PRICE,
+          );
+          await waitForCommandQueueToProcess(commandQueueServer);
+          await PerpsMarketDetailsView.expectClosePositionButtonVisible();
+
+          await queueLiquidationCheckAtPrice(
+            commandQueueServer,
+            PERPS_SMOKE_MARKET_SYMBOL,
+            LIQUIDATING_MARK_PRICE,
+          );
+
+          await Utilities.executeWithRetry(
+            async () => {
+              await PerpsMarketDetailsView.expectClosePositionButtonNotVisible();
+            },
+            {
+              interval: 1000,
+              timeout: 30000,
+              description:
+                'wait for Close position to disappear after liquidation',
+            },
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/perps/perps-position-stop-loss.spec.ts b/tests/smoke-appium/perps/perps-position-stop-loss.spec.ts
new file mode 100644
index 000000000000..fbe1e27a3342
--- /dev/null
+++ b/tests/smoke-appium/perps/perps-position-stop-loss.spec.ts
@@ -0,0 +1,67 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokePerps } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { navigateToPerpsOrderEntry } from '../../flows/perps.flow.js';
+import PerpsOrderView from '../../page-objects/Perps/PerpsOrderView.js';
+import PerpsMarketDetailsView from '../../page-objects/Perps/PerpsMarketDetailsView.js';
+import PerpsE2EModifiers from '../../helpers/perps/perps-modifiers.js';
+import { TestSuiteParams, Utilities } from '../../framework/index.js';
+import {
+  beginPerpsSmokeTestPlaywright,
+  buildPerpsSmokeFixture,
+  PERPS_SMOKE_MARKET_SYMBOL,
+  PERPS_SMOKE_PERMISSIONS,
+  setupPerpsSmokeMocks,
+} from '../../helpers/perps/perps-smoke-helpers.js';
+
+appiumTest.describe(SmokePerps('Perps Position Stop Loss'), () => {
+  appiumTest(
+    'opens a long with stop loss and closes when mark crosses the SL trigger',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: buildPerpsSmokeFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+          permissions: PERPS_SMOKE_PERMISSIONS,
+          testSpecificMock: setupPerpsSmokeMocks,
+          useCommandQueueServer: true,
+        },
+        async ({ commandQueueServer }: TestSuiteParams) => {
+          if (!commandQueueServer) {
+            throw new Error('Command queue server not found');
+          }
+
+          await beginPerpsSmokeTestPlaywright();
+
+          await navigateToPerpsOrderEntry(PERPS_SMOKE_MARKET_SYMBOL, 'long');
+
+          await PerpsOrderView.tapTakeProfitButton();
+          await PerpsOrderView.enterCustomStopLossTriggerPrice('2300');
+          await PerpsOrderView.tapPlaceOrderButton();
+
+          await PerpsMarketDetailsView.waitForScreenReady();
+          await PerpsMarketDetailsView.expectClosePositionButtonVisible();
+
+          await PerpsE2EModifiers.updateMarketPriceServer(
+            commandQueueServer,
+            PERPS_SMOKE_MARKET_SYMBOL,
+            '2250.00',
+          );
+
+          await Utilities.executeWithRetry(
+            async () => {
+              await PerpsMarketDetailsView.expectClosePositionButtonNotVisible();
+            },
+            {
+              interval: 1000,
+              timeout: 30000,
+              description:
+                'wait for Close position to disappear after stop loss trigger',
+            },
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/perps/perps-position.spec.ts b/tests/smoke-appium/perps/perps-position.spec.ts
new file mode 100644
index 000000000000..bea47ff55d10
--- /dev/null
+++ b/tests/smoke-appium/perps/perps-position.spec.ts
@@ -0,0 +1,59 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokePerps } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { navigateToPerpsOrderEntry } from '../../flows/perps.flow.js';
+import PerpsMarketDetailsView from '../../page-objects/Perps/PerpsMarketDetailsView.js';
+import PerpsOrderView from '../../page-objects/Perps/PerpsOrderView.js';
+import PerpsView from '../../page-objects/Perps/PerpsView.js';
+import Utilities from '../../framework/Utilities.js';
+import {
+  beginPerpsSmokeTestPlaywright,
+  buildPerpsSmokeFixture,
+  PERPS_SMOKE_MARKET_SYMBOL,
+  PERPS_SMOKE_PERMISSIONS,
+  setupPerpsSmokeMocks,
+} from '../../helpers/perps/perps-smoke-helpers.js';
+
+appiumTest.describe(SmokePerps('Perps Position'), () => {
+  appiumTest(
+    'opens a long position with custom profit and closes it',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: buildPerpsSmokeFixture(),
+          restartDevice: true,
+          currentDeviceDetails,
+          permissions: PERPS_SMOKE_PERMISSIONS,
+          testSpecificMock: setupPerpsSmokeMocks,
+        },
+        async () => {
+          await beginPerpsSmokeTestPlaywright();
+
+          await navigateToPerpsOrderEntry(PERPS_SMOKE_MARKET_SYMBOL, 'long');
+
+          await PerpsOrderView.tapTakeProfitButton();
+          await PerpsOrderView.enterCustomTakeProfitTriggerPrice('2800');
+          await PerpsOrderView.tapPlaceOrderButton();
+
+          await PerpsMarketDetailsView.waitForScreenReady();
+          await PerpsMarketDetailsView.expectClosePositionButtonVisible();
+
+          await PerpsView.tapClosePositionButton();
+          await PerpsView.tapClosePositionBottomSheetButton();
+
+          await Utilities.executeWithRetry(
+            async () => {
+              await PerpsMarketDetailsView.expectClosePositionButtonNotVisible();
+            },
+            {
+              interval: 1000,
+              timeout: 30000,
+              description:
+                'wait for Close position to disappear after manual close',
+            },
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/perps/perps-withdraw.spec.ts b/tests/smoke-appium/perps/perps-withdraw.spec.ts
new file mode 100644
index 000000000000..8543cf7623a3
--- /dev/null
+++ b/tests/smoke-appium/perps/perps-withdraw.spec.ts
@@ -0,0 +1,68 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokePerps } from '../../tags.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import { openPerpsWithdrawPayConfirmation } from '../../flows/perps.flow.js';
+import {
+  PERPS_ARBITRUM_MOCKS,
+  mockPerpsGeolocation,
+} from '../../api-mocking/mock-responses/perps-arbitrum-mocks.js';
+import { RampsRegions, RampsRegionsEnum } from '../../framework/Constants.js';
+import TransactionPayConfirmation from '../../page-objects/Confirmation/TransactionPayConfirmation.js';
+import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { Mockttp } from 'mockttp';
+import {
+  beginPerpsSmokeTestPlaywright,
+  buildPerpsSmokeFixture,
+  PERPS_SMOKE_PERMISSIONS,
+} from '../../helpers/perps/perps-smoke-helpers.js';
+
+const ENABLE_PERPS_WITHDRAW_ANY_TOKEN = {
+  confirmations_pay_post_quote: {
+    default: { enabled: true, tokens: {} },
+    overrides: {
+      perpsWithdraw: {
+        enabled: true,
+        tokens: {
+          '0xa4b1': [
+            '0x0000000000000000000000000000000000000000',
+            '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+          ],
+        },
+      },
+    },
+  },
+};
+
+const setupPerpsWithdrawMocks = async (mockServer: Mockttp) => {
+  await setupRemoteFeatureFlagsMock(
+    mockServer,
+    ENABLE_PERPS_WITHDRAW_ANY_TOKEN,
+  );
+  await PERPS_ARBITRUM_MOCKS(mockServer);
+  await mockPerpsGeolocation(mockServer, RampsRegions[RampsRegionsEnum.SPAIN]);
+};
+
+appiumTest.describe(
+  SmokePerps('Perps - Withdraw to any token (MetaMask Pay)'),
+  () => {
+    appiumTest(
+      'reaches the MetaMask Pay withdraw confirmation',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withFixtures(
+          {
+            fixture: buildPerpsSmokeFixture(),
+            restartDevice: true,
+            currentDeviceDetails,
+            permissions: PERPS_SMOKE_PERMISSIONS,
+            testSpecificMock: setupPerpsWithdrawMocks,
+          },
+          async () => {
+            await beginPerpsSmokeTestPlaywright();
+            await openPerpsWithdrawPayConfirmation();
+            await TransactionPayConfirmation.verifyAvailableBalanceVisible();
+          },
+        );
+      },
+    );
+  },
+);
diff --git a/tests/smoke-appium/seedless/apple-login-existing-user.spec.ts b/tests/smoke-appium/seedless/apple-login-existing-user.spec.ts
deleted file mode 100644
index e873e24ff7c0..000000000000
--- a/tests/smoke-appium/seedless/apple-login-existing-user.spec.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
-import { SmokeSeedlessOnboarding } from '../../tags.js';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
-import Assertions from '../../framework/Assertions.js';
-import OnboardingView from '../../page-objects/Onboarding/OnboardingView.js';
-import OnboardingSheet from '../../page-objects/Onboarding/OnboardingSheet.js';
-import SocialLoginView from '../../page-objects/Onboarding/SocialLoginView.js';
-import { setupAppleExistingUserOAuthMock } from './helpers/seedless-helpers.js';
-
-appiumTest.describe(
-  SmokeSeedlessOnboarding('Apple Login - Existing User'),
-  () => {
-    appiumTest(
-      'shows Account Already Exists screen for existing Apple user',
-      async ({ driver: _driver, currentDeviceDetails }) => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder({ onboarding: true }).build(),
-            restartDevice: true,
-            currentDeviceDetails,
-            testSpecificMock: setupAppleExistingUserOAuthMock,
-          },
-          async () => {
-            await Assertions.expectElementToBeVisible(
-              OnboardingView.container,
-              {
-                description: 'Onboarding screen should be visible',
-              },
-            );
-
-            await OnboardingView.tapCreateWallet();
-
-            await Assertions.expectElementToBeVisible(
-              OnboardingSheet.container,
-              {
-                description:
-                  'Onboarding sheet with social login options should appear',
-              },
-            );
-
-            await OnboardingSheet.tapAppleLoginButton();
-
-            await SocialLoginView.isAccountFoundScreenVisible();
-
-            await Assertions.expectElementToBeVisible(
-              SocialLoginView.accountFoundTitle,
-              {
-                description: 'Account found title should be visible',
-              },
-            );
-
-            await Assertions.expectElementToBeVisible(
-              SocialLoginView.accountFoundLoginButton,
-              {
-                description: 'Login button should be visible',
-              },
-            );
-
-            await Assertions.expectElementToBeVisible(
-              SocialLoginView.accountFoundDifferentMethodButton,
-              {
-                description:
-                  'Use different login method button should be visible',
-              },
-            );
-          },
-        );
-      },
-    );
-
-    appiumTest(
-      'can tap Login button on Account Already Exists screen',
-      async ({ driver: _driver, currentDeviceDetails }) => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder({ onboarding: true }).build(),
-            restartDevice: true,
-            currentDeviceDetails,
-            testSpecificMock: setupAppleExistingUserOAuthMock,
-          },
-          async () => {
-            await Assertions.expectElementToBeVisible(
-              OnboardingView.container,
-              {
-                description: 'Onboarding screen should be visible',
-              },
-            );
-
-            await OnboardingView.tapCreateWallet();
-
-            await Assertions.expectElementToBeVisible(
-              OnboardingSheet.container,
-              {
-                description: 'Onboarding sheet should appear',
-              },
-            );
-
-            await OnboardingSheet.tapAppleLoginButton();
-
-            await SocialLoginView.isAccountFoundScreenVisible();
-
-            await SocialLoginView.tapLoginButton();
-          },
-        );
-      },
-    );
-  },
-);
diff --git a/tests/smoke-appium/seedless/google-login-add-srp.spec.ts b/tests/smoke-appium/seedless/google-login-add-srp.spec.ts
deleted file mode 100644
index 8db847bfd616..000000000000
--- a/tests/smoke-appium/seedless/google-login-add-srp.spec.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
-import { SmokeSeedlessOnboarding } from '../../tags.js';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
-import Assertions from '../../framework/Assertions.js';
-import WalletView from '../../page-objects/wallet/WalletView.js';
-import AccountListBottomSheet from '../../page-objects/wallet/AccountListBottomSheet.js';
-import AddAccountBottomSheet from '../../page-objects/wallet/AddAccountBottomSheet.js';
-import ImportSrpView from '../../page-objects/importSrp/ImportSrpView.js';
-import { remoteFeatureMultichainAccountsAccountDetailsV2 } from '../../api-mocking/mock-responses/feature-flags-mocks.js';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
-import { IDENTITY_TEAM_SEED_PHRASE } from '../../smoke/identity/utils/constants.js';
-import type { Mockttp } from 'mockttp';
-import {
-  completeGoogleNewUserOnboarding,
-  setupGoogleNewUserOAuthMock,
-} from './helpers/seedless-helpers.js';
-
-const IMPORTED_ACCOUNT_NAME = 'Account 1';
-
-const googleNewUserWithFeatureFlagsMock = async (
-  mockServer: Mockttp,
-): Promise<void> => {
-  await setupGoogleNewUserOAuthMock(mockServer);
-  await setupRemoteFeatureFlagsMock(mockServer, {
-    ...remoteFeatureMultichainAccountsAccountDetailsV2(true),
-    predictGtmOnboardingModalEnabled: {
-      enabled: false,
-      minimumVersion: '7.60.0',
-    },
-  });
-};
-
-appiumTest.describe(
-  SmokeSeedlessOnboarding('Google Login - Add New SRP'),
-  () => {
-    appiumTest(
-      'creates wallet with Google login and adds a new SRP',
-      async ({ driver: _driver, currentDeviceDetails }) => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder({ onboarding: true }).build(),
-            restartDevice: true,
-            currentDeviceDetails,
-            testSpecificMock: googleNewUserWithFeatureFlagsMock,
-          },
-          async () => {
-            await completeGoogleNewUserOnboarding();
-
-            await WalletView.tapIdenticon();
-
-            await Assertions.expectElementToBeVisible(
-              AccountListBottomSheet.accountList,
-              {
-                description: 'Account list should be visible',
-              },
-            );
-
-            await AccountListBottomSheet.tapAddAccountButton();
-
-            await AddAccountBottomSheet.tapImportSrp();
-
-            await Assertions.expectElementToBeVisible(ImportSrpView.container, {
-              description: 'Import SRP screen should be visible',
-            });
-
-            await ImportSrpView.enterSrp(IDENTITY_TEAM_SEED_PHRASE);
-
-            await ImportSrpView.tapImportButton();
-
-            await Assertions.expectElementToHaveText(
-              WalletView.accountName,
-              IMPORTED_ACCOUNT_NAME,
-              {
-                description: `Expect selected account to be ${IMPORTED_ACCOUNT_NAME}`,
-              },
-            );
-          },
-        );
-      },
-    );
-  },
-);
diff --git a/tests/smoke-appium/seedless/google-login-existing-user.spec.ts b/tests/smoke-appium/seedless/google-login-existing-user.spec.ts
deleted file mode 100644
index a2e03965da04..000000000000
--- a/tests/smoke-appium/seedless/google-login-existing-user.spec.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
-import { SmokeSeedlessOnboarding } from '../../tags.js';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
-import Assertions from '../../framework/Assertions.js';
-import OnboardingView from '../../page-objects/Onboarding/OnboardingView.js';
-import OnboardingSheet from '../../page-objects/Onboarding/OnboardingSheet.js';
-import SocialLoginView from '../../page-objects/Onboarding/SocialLoginView.js';
-import { setupGoogleExistingUserOAuthMock } from './helpers/seedless-helpers.js';
-
-appiumTest.describe(
-  SmokeSeedlessOnboarding('Google Login - Existing User'),
-  () => {
-    appiumTest(
-      'shows Account Already Exists screen for existing Google user',
-      async ({ driver: _driver, currentDeviceDetails }) => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder({ onboarding: true }).build(),
-            restartDevice: true,
-            currentDeviceDetails,
-            testSpecificMock: setupGoogleExistingUserOAuthMock,
-          },
-          async () => {
-            await Assertions.expectElementToBeVisible(
-              OnboardingView.container,
-              {
-                description: 'Onboarding screen should be visible',
-              },
-            );
-
-            await OnboardingView.tapCreateWallet();
-
-            await Assertions.expectElementToBeVisible(
-              OnboardingSheet.container,
-              {
-                description:
-                  'Onboarding sheet with social login options should appear',
-              },
-            );
-
-            await OnboardingSheet.tapGoogleLoginButton();
-
-            await SocialLoginView.isAccountFoundScreenVisible();
-
-            await Assertions.expectElementToBeVisible(
-              SocialLoginView.accountFoundTitle,
-              {
-                description: 'Account found title should be visible',
-              },
-            );
-
-            await Assertions.expectElementToBeVisible(
-              SocialLoginView.accountFoundLoginButton,
-              {
-                description: 'Login button should be visible',
-              },
-            );
-
-            await Assertions.expectElementToBeVisible(
-              SocialLoginView.accountFoundDifferentMethodButton,
-              {
-                description:
-                  'Use different login method button should be visible',
-              },
-            );
-          },
-        );
-      },
-    );
-
-    appiumTest(
-      'can tap Login button on Account Already Exists screen',
-      async ({ driver: _driver, currentDeviceDetails }) => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder({ onboarding: true }).build(),
-            restartDevice: true,
-            currentDeviceDetails,
-            testSpecificMock: setupGoogleExistingUserOAuthMock,
-          },
-          async () => {
-            await Assertions.expectElementToBeVisible(
-              OnboardingView.container,
-              {
-                description: 'Onboarding screen should be visible',
-              },
-            );
-
-            await OnboardingView.tapCreateWallet();
-
-            await Assertions.expectElementToBeVisible(
-              OnboardingSheet.container,
-              {
-                description: 'Onboarding sheet should appear',
-              },
-            );
-
-            await OnboardingSheet.tapGoogleLoginButton();
-
-            await SocialLoginView.isAccountFoundScreenVisible();
-
-            await SocialLoginView.tapLoginButton();
-          },
-        );
-      },
-    );
-  },
-);
diff --git a/tests/smoke-appium/seedless/wallet-setup-completed-attribution.spec.ts b/tests/smoke-appium/seedless/wallet-setup-completed-attribution.spec.ts
deleted file mode 100644
index b1e790e0b671..000000000000
--- a/tests/smoke-appium/seedless/wallet-setup-completed-attribution.spec.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
-import { SmokeSeedlessOnboarding } from '../../tags.js';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
-import { onboardingEvents } from '../../helpers/analytics/helpers.js';
-import type { AnalyticsExpectations } from '../../framework/index.js';
-import { E2E_WALLET_SETUP_ATTRIBUTION_FIELDS } from '../../helpers/analytics/walletSetupAttributionE2eConstants.js';
-import {
-  completeAppleNewUserOnboarding,
-  completeGoogleNewUserOnboarding,
-  setupAppleNewUserOAuthMock,
-  setupGoogleNewUserOAuthMock,
-} from './helpers/seedless-helpers.js';
-
-function walletSetupCompletedOnlyExpectations(
-  accountType: string,
-): AnalyticsExpectations {
-  return {
-    eventNames: [onboardingEvents.WALLET_SETUP_COMPLETED],
-    events: [
-      {
-        name: onboardingEvents.WALLET_SETUP_COMPLETED,
-        matchProperties: {
-          wallet_setup_type: 'new',
-          new_wallet: true,
-          account_type: accountType,
-          ...E2E_WALLET_SETUP_ATTRIBUTION_FIELDS,
-        },
-      },
-    ],
-  };
-}
-
-appiumTest.describe(
-  SmokeSeedlessOnboarding(
-    'Wallet Setup Completed includes persisted attribution (Google + Apple)',
-  ),
-  () => {
-    appiumTest(
-      'Google new user flow attaches persisted acquisition on Wallet Setup Completed',
-      async ({ driver: _driver, currentDeviceDetails }) => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder({ onboarding: true })
-              .withWalletSetupAttributionForE2e(
-                E2E_WALLET_SETUP_ATTRIBUTION_FIELDS,
-              )
-              .build(),
-            restartDevice: true,
-            currentDeviceDetails,
-            testSpecificMock: setupGoogleNewUserOAuthMock,
-            analyticsExpectations:
-              walletSetupCompletedOnlyExpectations('metamask_google'),
-          },
-          async () => {
-            await completeGoogleNewUserOnboarding();
-          },
-        );
-      },
-    );
-
-    appiumTest(
-      'Apple new user flow attaches persisted acquisition on Wallet Setup Completed',
-      async ({ driver: _driver, currentDeviceDetails }) => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder({ onboarding: true })
-              .withWalletSetupAttributionForE2e(
-                E2E_WALLET_SETUP_ATTRIBUTION_FIELDS,
-              )
-              .build(),
-            restartDevice: true,
-            currentDeviceDetails,
-            testSpecificMock: setupAppleNewUserOAuthMock,
-            analyticsExpectations:
-              walletSetupCompletedOnlyExpectations('metamask_apple'),
-          },
-          async () => {
-            await completeAppleNewUserOnboarding();
-          },
-        );
-      },
-    );
-  },
-);
diff --git a/tests/smoke-appium/snaps/helpers/android-test-snaps-native.helpers.ts b/tests/smoke-appium/snaps/helpers/android-test-snaps-native.helpers.ts
index 3e260467d4e1..78023a609b2d 100644
--- a/tests/smoke-appium/snaps/helpers/android-test-snaps-native.helpers.ts
+++ b/tests/smoke-appium/snaps/helpers/android-test-snaps-native.helpers.ts
@@ -2,6 +2,12 @@ import { BrowserViewSelectorsIDs } from '../../../../app/components/Views/Browse
 import Assertions from '../../../framework/Assertions';
 import Matchers from '../../../framework/Matchers';
 import { createPlaywrightLogger } from '../../../framework/playwrightLogger';
+import {
+  TEST_SNAPS_ANDROID_SCROLL_LABELS,
+  testSnapsAndroidScrollOptions,
+} from '../../../selectors/Browser/TestSnaps.selectors';
+
+export { TEST_SNAPS_ANDROID_SCROLL_LABELS, testSnapsAndroidScrollOptions };
 
 const logger = createPlaywrightLogger('AndroidTestSnapsNative');
 
@@ -21,32 +27,6 @@ export async function logAndroidTestSnapsNativeBridgeOnce(): Promise<void> {
 /** Always visible at the top of the test-snaps page (unlike connect buttons further down). */
 export const ANDROID_TEST_SNAPS_LOAD_LABEL = 'Test Snaps';
 
-/**
- * Visible button labels for UiScrollable fallbacks when resource-id nodes are
- * virtualized off-screen in the WebView accessibility tree.
- */
-export const TEST_SNAPS_ANDROID_SCROLL_LABELS: Record<string, string> = {
-  connectbip32: 'Connect to BIP-32 Snap',
-  'connectclient-status': 'Connect to Client Status Snap',
-  connectcronjobs: 'Connect to Cronjobs Snap',
-  connectdialogs: 'Connect to Dialogs Snap',
-  connecterrors: 'Connect to Errors Snap',
-  'connectjson-rpc': 'Connect to JSON-RPC Snap',
-  'connectlifecycle-hooks': 'Connect to Lifecycle Hooks Snap',
-  connectpreferences: 'Connect to Preferences Snap',
-  connectwasm: 'Connect to WebAssembly Snap',
-  sendError: 'Send Test to Error Snap',
-  sendConfirmationButton: 'Confirmation',
-  sendClientStatusTest: 'Submit',
-  sendRpc: 'Invoke Snap',
-  sendWasmMessage: 'Calculate',
-  getPreferences: 'Submit',
-};
-
-export const testSnapsAndroidScrollOptions = {
-  scrollLabels: TEST_SNAPS_ANDROID_SCROLL_LABELS,
-};
-
 export async function waitForAndroidTestSnapsNativeLoad(): Promise<void> {
   await logAndroidTestSnapsNativeBridgeOnce();
   await Assertions.expectElementToBeVisible(
diff --git a/tests/smoke-appium/snaps/helpers/snap-smoke.helpers.ts b/tests/smoke-appium/snaps/helpers/snap-smoke.helpers.ts
index d2999b9e4976..072f8ee75956 100644
--- a/tests/smoke-appium/snaps/helpers/snap-smoke.helpers.ts
+++ b/tests/smoke-appium/snaps/helpers/snap-smoke.helpers.ts
@@ -6,28 +6,99 @@
  * can trigger the React Native developer menu — it can be dismissed manually
  * but is a nuisance and will flake automation.
  *
+ * Session reuse:
+ * - First test in a suite: `restartDevice: true` (default) + `loginAndOpenTestSnaps()`.
+ * - Follow-up tests: `restartDevice: false` and do **not** login again — the
+ * already-running app / Test Snaps page is preserved. Fixtures/mocks are not
+ * re-applied on follow-ups; wallet/snap state carries over.
+ *
  * Example:
  * ANDROID_APK_PATH=build/ci-main-e2e/app-prod-release.apk yarn appium-smoke:android tests/smoke-appium/snaps
  */
 import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.js';
 import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
 import type { CurrentDeviceDetails } from '../../../framework/fixtures/playwright/index.js';
+import type {
+  LocalNodeOptionsInput,
+  TestSuiteFunction,
+  WithFixturesOptions,
+} from '../../../framework/types.js';
+import WebView from '../../../framework/WebView.js';
+import { TEST_SNAPS_URL } from '../../../page-objects/Browser/TestSnaps.js';
+import {
+  TestSnapResultSelectorWebIDS,
+  testSnapsAndroidScrollOptions,
+} from '../../../selectors/Browser/TestSnaps.selectors.js';
+
+const TEST_SNAPS_WEBVIEW_OPTIONS = {
+  pageUrl: TEST_SNAPS_URL,
+  ...testSnapsAndroidScrollOptions,
+};
+
+/**
+ * Parses a Test Snaps result span that holds a JSON string.
+ * iOS/Detox typically return a JSON string (`"value"`); Android UiAutomator often
+ * returns the bare value without quotes.
+ */
+export function parseTestSnapStringResult(rawText: string): string {
+  const text = rawText.trim();
+  if (text.length === 0) {
+    throw new Error(`Expected a non-empty string result, got: ${rawText}`);
+  }
+
+  if (text.startsWith('"') && text.endsWith('"')) {
+    const parsed: unknown = JSON.parse(text);
+    if (typeof parsed !== 'string' || parsed.length === 0) {
+      throw new Error(`Expected a string result, got: ${rawText}`);
+    }
+    return parsed;
+  }
+
+  return text;
+}
+
+export async function readTestSnapStringResult(
+  selector: keyof typeof TestSnapResultSelectorWebIDS,
+): Promise<string> {
+  const resultText = await WebView.readTextById(
+    TestSnapResultSelectorWebIDS[selector],
+    TEST_SNAPS_WEBVIEW_OPTIONS,
+  );
+  return parseTestSnapStringResult(resultText);
+}
 
 interface SnapFixtureOptions {
   fixture?: ReturnType<FixtureBuilder['build']>;
+  analyticsExpectations?: WithFixturesOptions['analyticsExpectations'];
+  testSpecificMock?: WithFixturesOptions['testSpecificMock'];
+  localNodeOptions?: LocalNodeOptionsInput;
+  /**
+   * When true (default), clear app data, relaunch, and bootstrap fixtures.
+   * When false, keep the already-running Appium session / UI as-is.
+   */
+  restartDevice?: WithFixturesOptions['restartDevice'];
 }
 
 export async function withSnapsFixtures(
   currentDeviceDetails: CurrentDeviceDetails,
   options: SnapFixtureOptions,
-  testFn: () => Promise<void>,
+  testFn: TestSuiteFunction,
 ): Promise<void> {
-  const { fixture = new FixtureBuilder().build() } = options;
+  const {
+    fixture = new FixtureBuilder().build(),
+    analyticsExpectations,
+    testSpecificMock,
+    localNodeOptions,
+    restartDevice = true,
+  } = options;
 
   await withFixtures(
     {
       fixture,
-      restartDevice: true,
+      restartDevice,
+      analyticsExpectations,
+      testSpecificMock,
+      localNodeOptions,
       currentDeviceDetails,
     },
     testFn,
diff --git a/tests/smoke-appium/snaps/test-snap-background-events.spec.ts b/tests/smoke-appium/snaps/test-snap-background-events.spec.ts
new file mode 100644
index 000000000000..08b36f1bcc0a
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-background-events.spec.ts
@@ -0,0 +1,137 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import Assertions from '../../framework/Assertions.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import {
+  readTestSnapStringResult,
+  withSnapsFixtures,
+} from './helpers/snap-smoke.helpers.js';
+
+/** Far enough ahead that slow Android fill/tap cannot schedule a date in the past. */
+const BACKGROUND_EVENT_DATE_OFFSET_MS = 30_000;
+
+appiumTest.describe(SmokeSnaps('Background Events Snap Tests'), () => {
+  // Serial: later cases reuse the installed Snap / Appium session from the connect test.
+  // this will allow the test to fail fast
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'can connect to the background events Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectBackgroundEventsButton');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'schedules a background event with an ISO 8601 date string',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          const futureDate = new Date(
+            Date.now() + BACKGROUND_EVENT_DATE_OFFSET_MS,
+          ).toISOString();
+
+          await TestSnaps.fillMessage('backgroundEventDateInput', futureDate);
+          await TestSnaps.tapButton('scheduleBackgroundEventWithDateButton');
+
+          // Poll until the scheduled event fires (offset above + small buffer).
+          await Assertions.expectTextDisplayed(
+            'This dialog was triggered by a background event',
+            { timeout: BACKGROUND_EVENT_DATE_OFFSET_MS + 15_000 },
+          );
+          await TestSnaps.tapFooterButton();
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'schedules a background event with an ISO 8601 duration',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await TestSnaps.fillMessage('backgroundEventDurationInput', 'PT10S');
+          await TestSnaps.tapButton(
+            'scheduleBackgroundEventWithDurationButton',
+          );
+
+          await Assertions.expectTextDisplayed(
+            'This dialog was triggered by a background event',
+            // Duration above + small buffer.
+            { timeout: 25_000 },
+          );
+          await TestSnaps.tapFooterButton();
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'schedules, lists, and cancels a background event',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          // Intentionally scheduling an event for 1 hour into the future, so it
+          // doesn't actually fire during the test.
+          await TestSnaps.fillMessage('backgroundEventDurationInput', 'PT1H');
+          await TestSnaps.tapButton(
+            'scheduleBackgroundEventWithDurationButton',
+          );
+          await TestSnaps.checkResultSpanNotEmpty(
+            'scheduleBackgroundEventResultSpan',
+          );
+
+          await TestSnaps.tapButton('getBackgroundEventResultButton');
+          await TestSnaps.checkResultSpanIncludes(
+            'getBackgroundEventsResultSpan',
+            'fireDialog',
+          );
+
+          const eventId = await readTestSnapStringResult(
+            'scheduleBackgroundEventResultSpan',
+          );
+          await TestSnaps.fillMessage('cancelBackgroundEventInput', eventId);
+          await TestSnaps.blurActiveWebViewInput();
+          await TestSnaps.tapButton('cancelBackgroundEventButton');
+
+          await TestSnaps.tapButton('getBackgroundEventResultButton');
+          await TestSnaps.checkResultJson('getBackgroundEventsResultSpan', []);
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'shows an error when trying to schedule a background event in the past',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          const pastDate = new Date(Date.now() - 5_000).toISOString();
+
+          await TestSnaps.fillMessage('backgroundEventDateInput', pastDate);
+          await TestSnaps.tapButton('scheduleBackgroundEventWithDateButton');
+          await Assertions.expectTextDisplayed(
+            'Cannot schedule an event in the past.',
+          );
+          await TestSnaps.dismissAlert();
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-bip-32.spec.ts b/tests/smoke-appium/snaps/test-snap-bip-32.spec.ts
new file mode 100644
index 000000000000..91bea36f10dc
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-bip-32.spec.ts
@@ -0,0 +1,168 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import Assertions from '../../framework/Assertions.js';
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+const multiSrpFixture = new FixtureBuilder()
+  .withMultiSRPKeyringController()
+  .build();
+
+appiumTest.describe(SmokeSnaps('BIP-32 Snap Tests'), () => {
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'can connect to BIP-32 snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectBip32Button');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can get BIP-32 public key',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.tapButton('getPublicKeyBip32Button');
+          await TestSnaps.checkResultSpan(
+            'bip32PublicKeyResultSpan',
+            '"0x043e98d696ae15caef75fa8dd204a7c5c08d1272b2218ba3c20feeb4c691eec366606ece56791c361a2320e7fad8bcbb130f66d51c591fc39767ab2856e93f8dfb"',
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can sign BIP-32 message using secp256k1',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.fillMessage('messageSecp256k1Input', 'foo bar');
+          await TestSnaps.tapButton('signMessageBip32Secp256k1Button');
+          await Assertions.expectTextDisplayed('Signature request');
+          await TestSnaps.approveSignRequest();
+          await TestSnaps.checkResultSpan(
+            'bip32MessageResultSecp256k1Span',
+            '"0x3045022100b3ade2992ea3e5eb58c7550e9bddad356e9554233c8b099ebc3cb418e9301ae2022064746e15ae024808f0ba5d860e44dc4c97e65c8cba6f5ef9ea2e8c819930d2dc"',
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can sign BIP-32 message using ed25519',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.fillMessage('messageEd25519Input', 'foo bar');
+          await TestSnaps.tapButton('signMessageBip32ed25519Button');
+          await Assertions.expectTextDisplayed('Signature request');
+          await TestSnaps.approveSignRequest();
+          await TestSnaps.checkResultSpan(
+            'bip32MessageResultEd25519Span',
+            '"0xf3215b4d6c59aac7e01b4ceef530d1e2abf4857926b85a81aaae3894505699243768a887b7da4a8c2e0f25196196ba290b6531050db8dc15c252bdd508532a0a"',
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can sign BIP-32 message using ed25519Bip32',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.fillMessage('messageEd25519Bip32Input', 'foo bar');
+          await TestSnaps.tapButton('signMessageBip32ed25519Bip32Button');
+          await Assertions.expectTextDisplayed('Signature request');
+          await TestSnaps.approveSignRequest();
+          await TestSnaps.checkResultSpan(
+            'bip32MessageResultEd25519Bip32Span',
+            '"0xc279ee3e49f7e392a4e511136c39791e076f9be01d8648f3f1586ecf0f41def1739fa2978f90cfb2da4cf53ccb99405558cffcc4d190199b6949b03b1b8dae05"',
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can sign BIP-32 message using secp256k1 and SRP 1',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.selectInDropdown('bip32EntropyDropDown', 'SRP 1');
+          await TestSnaps.fillMessage('messageSecp256k1Input', 'bar baz');
+          await TestSnaps.tapButton('signMessageBip32Secp256k1Button');
+          await Assertions.expectTextDisplayed('Signature request');
+          await TestSnaps.approveSignRequest();
+          await TestSnaps.checkResultSpan(
+            'bip32MessageResultSecp256k1Span',
+            '"0x3045022100bd7301b5288fcc15e9c19bf548b666356230343a57f4ef0327a8e81f19ac562c022062698ed00a36e9ddd1563e1dc2e357d747bdfb233192ee1597cabb6c7210a6ba"',
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can sign BIP-32 message using secp256k1 and SRP 2',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.selectInDropdown('bip32EntropyDropDown', 'SRP 2');
+          await TestSnaps.fillMessage('messageSecp256k1Input', 'bar baz');
+          await TestSnaps.tapButton('signMessageBip32Secp256k1Button');
+          await Assertions.expectTextDisplayed('Signature request');
+          await TestSnaps.approveSignRequest();
+          await TestSnaps.checkResultSpan(
+            'bip32MessageResultSecp256k1Span',
+            '"0x3045022100ad81b36b28f5f5dd47f45a46b2e7cf42e501d2e9b5768627b0702c100f80eb3c02200a481cbbe22b47b4ea6cd923a7da22952f5b21a0dc52e841dcd08f7af8c74e05"',
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'fails when choosing the invalid entropy source',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.selectInDropdown('bip32EntropyDropDown', 'Invalid');
+          await TestSnaps.fillMessage('messageSecp256k1Input', 'bar baz');
+          await TestSnaps.tapButton('signMessageBip32Secp256k1Button');
+          await Assertions.expectTextDisplayed(
+            'Entropy source with ID "invalid" not found.',
+            { timeout: 30_000 },
+          );
+          await TestSnaps.dismissAlert();
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-bip-44.spec.ts b/tests/smoke-appium/snaps/test-snap-bip-44.spec.ts
new file mode 100644
index 000000000000..8a9d1f6803b7
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-bip-44.spec.ts
@@ -0,0 +1,125 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import Assertions from '../../framework/Assertions.js';
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+const multiSrpFixture = new FixtureBuilder()
+  .withMultiSRPKeyringController()
+  .build();
+
+appiumTest.describe(SmokeSnaps('BIP-44 Snap Tests'), () => {
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'can connect to BIP-44 snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectBip44Button');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can get BIP-44 public key',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.tapButton('getPublicKeyBip44Button');
+          await TestSnaps.checkResultSpan(
+            'bip44ResultSpan',
+            '"0x86debb44fb3a984d93f326131d4c1db0bc39644f1a67b673b3ab45941a1cea6a385981755185ac4594b6521e4d1e08d1"',
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can sign a BIP-44 message',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.fillMessage('messageBip44Input', '1234');
+          await TestSnaps.tapButton('signMessageBip44Button');
+          await TestSnaps.approveSignRequest();
+          await TestSnaps.checkResultSpan(
+            'bip44SignResultSpan',
+            '"0xa41ab87ca50606eefd47525ad90294bbe44c883f6bc53655f1b8a55aa8e1e35df216f31be62e52c7a1faa519420e20810162e07dedb0fde2a4d997ff7180a78232ecd8ce2d6f4ba42ccacad33c5e9e54a8c4d41506bdffb2bb4c368581d8b086"',
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can sign with entropy from SRP 1',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.selectInDropdown('bip44EntropyDropDown', 'SRP 1');
+          await TestSnaps.fillMessage('messageBip44Input', 'foo bar');
+          await TestSnaps.tapButton('signMessageBip44Button');
+          await TestSnaps.approveSignRequest();
+          await TestSnaps.checkResultSpan(
+            'bip44SignResultSpan',
+            '"0x978f82799b8f48cb78ac56153a34d360873c976fd5ec84f7a5291382dde52d6cb478cadd94153970e58e5205c054cdda0071be0551b729d79bd417f7b0fc2b0c51071ca4771c9b2d8238d7d982bc5ec9256645287402348ca0f89202fb1e0773"',
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can sign with entropy from SRP 2',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.selectInDropdown('bip44EntropyDropDown', 'SRP 2');
+          await TestSnaps.fillMessage('messageBip44Input', 'foo bar');
+          await TestSnaps.tapButton('signMessageBip44Button');
+          await TestSnaps.approveSignRequest();
+          await TestSnaps.checkResultSpan(
+            'bip44SignResultSpan',
+            '"0xa8fdc184ded6d9a1b16d2d4070470720e4a946c9899ceb5165c05f9a8c4b026e8f630d6bdb60151f9e84b3c415c4b46c11bc2571022c8391b07faedc0d8c258d532d34c33149c5fc29e17c310437dc47e8afb43b2c55bd47b1b09ea295f7dcb3"',
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'fails when choosing the invalid entropy source',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.selectInDropdown('bip44EntropyDropDown', 'Invalid');
+          await TestSnaps.fillMessage('messageBip44Input', 'foo bar');
+          await TestSnaps.tapButton('signMessageBip44Button');
+          await Assertions.expectTextDisplayed(
+            'Entropy source with ID "invalid" not found.',
+            { timeout: 30_000 },
+          );
+          await TestSnaps.dismissAlert();
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-client-status.spec.ts b/tests/smoke-appium/snaps/test-snap-client-status.spec.ts
index 88b893f353b5..ce2427be1ca6 100644
--- a/tests/smoke-appium/snaps/test-snap-client-status.spec.ts
+++ b/tests/smoke-appium/snaps/test-snap-client-status.spec.ts
@@ -8,23 +8,40 @@ import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
 
 // TODO: Re-introduce locked-client status when we can interact with snaps while locked
 // (the client must be unlocked to interact with the Snap).
-// `driver` must be requested so Playwright starts the Appium session fixture
-// (sets FrameworkDetector + globals), even when unused in the body.
 appiumTest.describe(SmokeSnaps('Client Status Snap Tests'), () => {
+  // Serial: later cases reuse the installed Snap / Appium session from the connect test.
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'connects to the Client Status Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectClientStatusSnapButton');
+        },
+      );
+    },
+  );
+
   appiumTest(
-    'connects to the Client Status Snap and returns the client status',
+    'returns the client status',
     async ({ driver: _driver, currentDeviceDetails }) => {
-      await withSnapsFixtures(currentDeviceDetails, {}, async () => {
-        await loginAndOpenTestSnaps();
-        await TestSnaps.installSnap('connectClientStatusSnapButton');
-        await TestSnaps.tapButton('sendClientStatusButton');
-        await TestSnaps.checkClientStatus({
-          locked: false,
-          active: true,
-          clientVersion: packageJson.version,
-          platformVersion: sdkPackageJson.version,
-        });
-      });
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await TestSnaps.tapButton('sendClientStatusButton');
+          await TestSnaps.checkClientStatus({
+            locked: false,
+            active: true,
+            clientVersion: packageJson.version,
+            platformVersion: sdkPackageJson.version,
+          });
+        },
+      );
     },
   );
 });
diff --git a/tests/smoke-appium/snaps/test-snap-dialog.spec.ts b/tests/smoke-appium/snaps/test-snap-dialog.spec.ts
new file mode 100644
index 000000000000..16b730e98871
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-dialog.spec.ts
@@ -0,0 +1,100 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import Assertions from '../../framework/Assertions.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+appiumTest.describe(SmokeSnaps('Dialog Snap Tests'), () => {
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'connects to the Dialog Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectDialogSnapButton');
+        },
+      );
+    },
+  );
+
+  appiumTest.describe('alert', () => {
+    appiumTest(
+      'shows an alert dialog',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withSnapsFixtures(
+          currentDeviceDetails,
+          { restartDevice: false },
+          async () => {
+            await TestSnaps.tapButton('sendAlertButton');
+            await Assertions.expectTextDisplayed(
+              'This is an alert dialog. It has a single button: "OK".',
+            );
+            await TestSnaps.tapOkButton();
+            await TestSnaps.checkResultSpan('dialogResultSpan', 'null');
+          },
+        );
+      },
+    );
+  });
+
+  appiumTest.describe('confirmation', () => {
+    appiumTest(
+      'shows a confirmation dialog',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withSnapsFixtures(
+          currentDeviceDetails,
+          { restartDevice: false },
+          async () => {
+            await TestSnaps.tapButton('sendConfirmationButton');
+            await Assertions.expectTextDisplayed('Confirmation Dialog');
+            await TestSnaps.tapApproveButton();
+            await TestSnaps.checkResultSpan('dialogResultSpan', 'true');
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'shows a confirmation dialog and cancels',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withSnapsFixtures(
+          currentDeviceDetails,
+          { restartDevice: false },
+          async () => {
+            await TestSnaps.tapButton('sendConfirmationButton');
+            await Assertions.expectTextDisplayed('Confirmation Dialog');
+            await TestSnaps.tapCancelButton();
+            await TestSnaps.checkResultSpan('dialogResultSpan', 'false');
+          },
+        );
+      },
+    );
+  });
+
+  appiumTest.describe('custom', () => {
+    appiumTest(
+      'shows a custom dialog',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withSnapsFixtures(
+          currentDeviceDetails,
+          { restartDevice: false },
+          async () => {
+            await TestSnaps.tapButton('sendCustomButton');
+            await Assertions.expectTextDisplayed('Custom Dialog');
+            await TestSnaps.fillCustomDialogInput('Hello, World!');
+            await TestSnaps.tapConfirmButton();
+            await TestSnaps.checkResultSpan(
+              'dialogResultSpan',
+              '"Hello, World!"',
+            );
+          },
+        );
+      },
+    );
+  });
+});
diff --git a/tests/smoke-appium/snaps/test-snap-ethereum-provider.spec.ts b/tests/smoke-appium/snaps/test-snap-ethereum-provider.spec.ts
new file mode 100644
index 000000000000..6f2c7434bff5
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-ethereum-provider.spec.ts
@@ -0,0 +1,104 @@
+import type { Mockttp } from 'mockttp';
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { confirmationFeatureFlags } from '../../api-mocking/mock-responses/feature-flags-mocks.js';
+import Assertions from '../../framework/Assertions.js';
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+import ConnectBottomSheet from '../../page-objects/Browser/ConnectBottomSheet.js';
+import RequestTypes from '../../page-objects/Browser/Confirmations/RequestTypes.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { mockGenesisBlocks } from '../../smoke/snaps/mocks.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+const multiSrpFixture = new FixtureBuilder()
+  .withMultiSRPKeyringController()
+  .build();
+
+appiumTest.describe(SmokeSnaps('Ethereum Provider Snap Tests'), () => {
+  appiumTest(
+    'can use the Ethereum provider',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        {
+          fixture: multiSrpFixture,
+          testSpecificMock: async (mockServer: Mockttp) => {
+            await setupRemoteFeatureFlagsMock(
+              mockServer,
+              Object.assign({}, ...confirmationFeatureFlags),
+            );
+            await mockGenesisBlocks(mockServer);
+          },
+        },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectEthereumProviderButton');
+
+          await TestSnaps.tapButton('getChainIdButton');
+          await TestSnaps.checkResultSpan(
+            'ethereumProviderResultSpan',
+            '"0x1"',
+          );
+
+          await TestSnaps.tapButton('getAccountsButton');
+          await Assertions.expectElementToBeVisible(
+            ConnectBottomSheet.connectButton,
+          );
+          await ConnectBottomSheet.tapConnectButton();
+          await TestSnaps.checkResultSpanIncludes(
+            'ethereumProviderResultSpan',
+            '"0x5cfe73b6021e818b776b421b1c4db2474086a7e1"',
+          );
+
+          // Test `personal_sign`.
+          await TestSnaps.fillMessage('personalSignMessageInput', 'foo');
+          await TestSnaps.tapButton('personalSignButton');
+          await Assertions.expectElementToBeVisible(
+            RequestTypes.PersonalSignRequest,
+          );
+          await TestSnaps.approveNativeConfirmation();
+          await TestSnaps.checkResultSpan(
+            'personalSignResultSpan',
+            '"0xf63c587cd42e7775e2e815a579f9744ea62944f263b3e69fad48535ba98a5ea107bc878088a99942733a59a89ef1d590eafdb467d59cf76564158d7e78351b751b"',
+          );
+
+          // Test `eth_signTypedData_v4`.
+          await TestSnaps.fillMessage('signTypedDataMessageInput', 'bar');
+          await TestSnaps.tapButton('signTypedDataButton');
+          await Assertions.expectElementToBeVisible(
+            RequestTypes.TypedSignRequest,
+          );
+          await TestSnaps.approveNativeConfirmation();
+          await TestSnaps.checkResultSpan(
+            'signTypedDataResultSpan',
+            '"0x7024dc071a7370eee444b2a3edc08d404dd03393694403cdca864653a7e8dd7c583419293d53602666cbe77faa8819fba04f8c57e95df2d4c0190968eece28021c"',
+          );
+
+          // Check other networks.
+          await TestSnaps.selectInDropdown('networkDropDown', 'Ethereum');
+          await TestSnaps.tapButton('getGenesisHashButton');
+          await TestSnaps.checkResultSpanIncludes(
+            'ethereumProviderResultSpan',
+            '"0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3"',
+          );
+
+          await TestSnaps.selectInDropdown('networkDropDown', 'Linea');
+          await TestSnaps.tapButton('getGenesisHashButton');
+          await TestSnaps.checkResultSpanIncludes(
+            'ethereumProviderResultSpan',
+            '"0xb6762a65689107b2326364aefc18f94cda413209fab35c00d4af51eaa20ffbc6"',
+          );
+
+          await TestSnaps.selectInDropdown('networkDropDown', 'Sepolia');
+          await TestSnaps.tapButton('getGenesisHashButton');
+          await TestSnaps.checkResultSpanIncludes(
+            'ethereumProviderResultSpan',
+            '"0x25a5cc106eea7138acab33231d7160d69cb777ee0c2c553fcddf5138993e6dd9"',
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-get-entropy.spec.ts b/tests/smoke-appium/snaps/test-snap-get-entropy.spec.ts
new file mode 100644
index 000000000000..7f989bb04472
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-get-entropy.spec.ts
@@ -0,0 +1,112 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import Assertions from '../../framework/Assertions.js';
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+const multiSrpFixture = new FixtureBuilder()
+  .withMultiSRPKeyringController()
+  .build();
+
+async function signEntropyMessageAndApprove(
+  message: string,
+  expectedResult: string,
+): Promise<void> {
+  await TestSnaps.fillMessage('entropyMessageInput', message);
+  await TestSnaps.tapButton('signEntropyMessageButton');
+  await Assertions.expectTextDisplayed('Signature request', {
+    description: 'Snap signature request should be visible',
+  });
+  await TestSnaps.approveSignRequest();
+  await TestSnaps.checkResultSpan('entropySignResultSpan', expectedResult);
+}
+
+appiumTest.describe(SmokeSnaps('Get Entropy Snap Tests'), () => {
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'connects to the Get Entropy Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectGetEntropyButton');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'signs a message with the Snap entropy',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await signEntropyMessageAndApprove(
+            '1234',
+            '"0x9341785782b512c86235612365f1076b16731ed9473beb4d0804c30b7fcc3a055aa7103b02dc64014d923220712dfbef023ddcf6327b313ea2dfd4d83dc5a53e1c5e7f4e10bce49830eded302294054df8a7a46e5b6cb3e50eec564ecba17941"',
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'signs messages with selected SRP entropy sources',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          const entropySources: [string, string][] = [
+            [
+              'SRP 1 (primary)',
+              '0xadd276f9d715223dcd20a595acb475f9b7353c451a57af64efb23633280c21aa172bd6689c27a0ac3c003ec4469b093207db956a6bf76689b3cc0b710c4187d5fcdca5f09c9594f146c9a39461e2f6cb03a446f4e62bd341a448ca9a33e96cf2',
+            ],
+            [
+              'SRP 2',
+              '0xa1dba3ddefabb56c5d6d37135fd07752662b5d720c005d619c0ff49eede2fe6f92a3e88e70ff4bb706b9ec2a076925ec159e3f6aa7170d51e428ccafe2353dd858da425c075912f0cd78c750942afef230393dff20d9fb58de14c56a5cd213b1',
+            ],
+          ];
+
+          for (const [entropySource, result] of entropySources) {
+            await TestSnaps.selectInDropdown(
+              'getEntropyDropDown',
+              entropySource,
+            );
+            await signEntropyMessageAndApprove('5678', `"${result}"`);
+          }
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'fails when choosing an invalid entropy source',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { fixture: multiSrpFixture, restartDevice: false },
+        async () => {
+          await TestSnaps.selectInDropdown('getEntropyDropDown', 'Invalid');
+          await TestSnaps.fillMessage('entropyMessageInput', 'foo bar');
+          await TestSnaps.tapButton('signEntropyMessageButton');
+          await TestSnaps.approveSignRequest();
+          // Assert on stable substrings due to Appium rendering variations
+          await Assertions.expectTextDisplayed('Entropy source with ID', {
+            timeout: 30_000,
+          });
+          await Assertions.expectTextDisplayed('not found', {
+            timeout: 30_000,
+          });
+          await TestSnaps.dismissAlert();
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-get-file.spec.ts b/tests/smoke-appium/snaps/test-snap-get-file.spec.ts
new file mode 100644
index 000000000000..d080eb30e2a7
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-get-file.spec.ts
@@ -0,0 +1,49 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+appiumTest.describe(SmokeSnaps('Get File Snap Tests'), () => {
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'can connect to the get File Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectGetFileButton');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'returns responses for different formats',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await TestSnaps.tapButton('sendGetFileTextButton');
+          await TestSnaps.checkResultJson('fileResultSpan', { foo: 'bar' });
+
+          await TestSnaps.tapButton('sendGetFileBase64Button');
+          await TestSnaps.checkResultSpan(
+            'fileResultSpan',
+            '"ewogICJmb28iOiAiYmFyIgp9Cg=="',
+          );
+
+          await TestSnaps.tapButton('sendGetFileHexButton');
+          await TestSnaps.checkResultSpan(
+            'fileResultSpan',
+            '"0x7b0a202022666f6f223a2022626172220a7d0a"',
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-image.spec.ts b/tests/smoke-appium/snaps/test-snap-image.spec.ts
new file mode 100644
index 000000000000..c4470c7e9f4a
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-image.spec.ts
@@ -0,0 +1,56 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import Assertions from '../../framework/Assertions.js';
+import Matchers from '../../framework/Matchers.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+appiumTest.describe(SmokeSnaps('Image Snap Tests'), () => {
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'can connect to the Image Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectImageButton');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can display SVGs',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await TestSnaps.tapButton('showSVGImage');
+          const dynamicSvg = Matchers.getElementByID('snaps-ui-image');
+          await Assertions.expectElementToBeVisible(dynamicSvg);
+          await TestSnaps.tapOkButton();
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can display PNGs',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await TestSnaps.tapButton('showPNGImage');
+          const dynamicPng = Matchers.getElementByID('snaps-ui-image');
+          await Assertions.expectElementToBeVisible(dynamicPng);
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-installed.spec.ts b/tests/smoke-appium/snaps/test-snap-installed.spec.ts
index 9f9db0b2eacf..03fd804a0597 100644
--- a/tests/smoke-appium/snaps/test-snap-installed.spec.ts
+++ b/tests/smoke-appium/snaps/test-snap-installed.spec.ts
@@ -5,18 +5,37 @@ import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
 import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
 
 appiumTest.describe(SmokeSnaps('Installed Snap Tests'), () => {
+  // Serial: later cases reuse the installed Snap / Appium session from the connect test.
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'connects to the snap and displays the installed snaps',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectErrorSnapButton');
+          await TestSnaps.checkInstalledSnaps(
+            'npm:@metamask/preinstalled-example-snap, npm:@metamask/error-example-snap',
+          );
+        },
+      );
+    },
+  );
+
   appiumTest(
-    'connects to the snap, displays installed snaps, and can throw an error',
+    'can throw an error',
     async ({ driver: _driver, currentDeviceDetails }) => {
-      await withSnapsFixtures(currentDeviceDetails, {}, async () => {
-        await loginAndOpenTestSnaps();
-        await TestSnaps.installSnap('connectErrorSnapButton');
-        await TestSnaps.checkInstalledSnaps(
-          'npm:@metamask/preinstalled-example-snap, npm:@metamask/error-example-snap',
-        );
-        await TestSnaps.tapButton('sendErrorButton');
-        await TestSnaps.checkResultSpan('errorResultSpan', '"Hello, world!"');
-      });
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await TestSnaps.tapButton('sendErrorButton');
+          await TestSnaps.checkResultSpan('errorResultSpan', '"Hello, world!"');
+        },
+      );
     },
   );
 });
diff --git a/tests/smoke-appium/snaps/test-snap-interactive-ui.spec.ts b/tests/smoke-appium/snaps/test-snap-interactive-ui.spec.ts
new file mode 100644
index 000000000000..2fd736180d4a
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-interactive-ui.spec.ts
@@ -0,0 +1,140 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import { DateTime } from 'luxon';
+import Assertions from '../../framework/Assertions.js';
+import Gestures from '../../framework/Gestures.js';
+import Matchers from '../../framework/Matchers.js';
+import Utilities from '../../framework/Utilities.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+import {
+  SNAP_UI_DATE_PICKER_INPUT_IDS,
+  SnapUIRendererSelectorIDs,
+} from '../../selectors/Browser/TestSnaps.selectors.js';
+import { PlatformDetector } from '../../framework/PlatformLocator.js';
+
+appiumTest.describe(SmokeSnaps('Interactive UI Snap Tests'), () => {
+  // Serial: later cases reuse the Snap / session from the connect test.
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'can connect to the Interactive UI Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectInteractiveButton');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'renders an interactive UI',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await TestSnaps.tapButton('createDialogButton');
+
+          // Capture when pickers mount — SnapUIDateTimePicker seeds
+          // internalValue with new Date() and submits that on OK if unchanged.
+          const dateTimePickerDate = DateTime.now();
+
+          await TestSnaps.fillInput('example-input', 'foo bar');
+          await TestSnaps.selectInNativeDropdown('snapUIDropdown', 'Option 2');
+          await TestSnaps.selectRadioButton('Option 1');
+          await TestSnaps.tapCheckbox();
+          await TestSnaps.selectInNativeDropdown('snapUISelector', 'Option 3');
+          await TestSnaps.selectDateInDateTimePicker();
+          await TestSnaps.selectDateInDatePicker();
+          await TestSnaps.selectTimeInTimePicker();
+          await TestSnaps.tapSubmitButton();
+
+          await Assertions.expectTextDisplayed('foo bar');
+          await Assertions.expectTextDisplayed('option2');
+          await Assertions.expectTextDisplayed('option1');
+          await Assertions.expectTextDisplayed('true');
+          await Assertions.expectTextDisplayed('option3');
+          await Assertions.expectTextDisplayed(
+            dateTimePickerDate.set({ second: 0, millisecond: 0 }).toISO(),
+          );
+          await Assertions.expectTextDisplayed(
+            dateTimePickerDate
+              .set({ hour: 0, minute: 0, second: 0, millisecond: 0 })
+              .toISO(),
+          );
+          await Assertions.expectTextDisplayed(
+            dateTimePickerDate.set({ second: 0, millisecond: 0 }).toISO(),
+          );
+
+          await TestSnaps.tapOkButton();
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'renders a disabled UI',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await TestSnaps.tapButton('createDialogDisabledButton');
+
+          const input = TestSnaps.getSnapUiInput('example-input');
+          // iOS TextField wrapper stays enabled=true — skip input checks there.
+          if (!PlatformDetector.isIOSAppium()) {
+            await Assertions.expectElementToBeVisible(input);
+            await Utilities.waitForElementToBeDisabled(input);
+          }
+
+          for (const testID of [
+            SnapUIRendererSelectorIDs.dropdown,
+            SnapUIRendererSelectorIDs.radioButton,
+            SnapUIRendererSelectorIDs.checkbox,
+            SnapUIRendererSelectorIDs.selector,
+          ]) {
+            await Utilities.waitForElementToBeDisabled(
+              TestSnaps.getSnapUiNativeElement(testID),
+            );
+          }
+
+          if (PlatformDetector.isAndroidAppium()) {
+            // Off-screen virtualization + disabled touchables leave *-input nodes.
+            await TestSnaps.revealSnapUiDatePickers();
+            for (const inputId of SNAP_UI_DATE_PICKER_INPUT_IDS) {
+              await Gestures.scrollToElement(
+                Matchers.getElementByID(inputId),
+                TestSnaps.snapUIRendererScrollView,
+                { elemDescription: `${inputId} (disabled)` },
+              );
+              await Utilities.waitForElementToBeDisabled(
+                Matchers.getElementByID(inputId),
+              );
+            }
+          } else {
+            for (const touchable of [
+              TestSnaps.dateTimePickerTouchable,
+              TestSnaps.datePickerTouchable,
+              TestSnaps.timePickerTouchable,
+            ]) {
+              await Utilities.waitForElementToBeDisabled(touchable);
+            }
+          }
+
+          await Utilities.waitForElementToBeDisabled(
+            Matchers.getElementByText('Submit'),
+          );
+
+          await TestSnaps.tapCancelButton();
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-jsx.spec.ts b/tests/smoke-appium/snaps/test-snap-jsx.spec.ts
new file mode 100644
index 000000000000..d13722a89ca4
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-jsx.spec.ts
@@ -0,0 +1,44 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import Assertions from '../../framework/Assertions.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+appiumTest.describe(SmokeSnaps('JSX Snap Tests'), () => {
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'can connect to the JSX Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectJsx');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'displays a modifiable JSX interface',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await TestSnaps.tapButton('displayJsxButton');
+          await Assertions.expectElementToBeVisible(
+            TestSnaps.jsxCountElement('0'),
+          );
+          await TestSnaps.tapJsxIncrementButton();
+          await Assertions.expectElementToBeVisible(
+            TestSnaps.jsxCountElement('1'),
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-manage-state.spec.ts b/tests/smoke-appium/snaps/test-snap-manage-state.spec.ts
new file mode 100644
index 000000000000..862e1421b2a5
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-manage-state.spec.ts
@@ -0,0 +1,153 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+appiumTest.describe(SmokeSnaps('Manage State Snap Tests'), () => {
+  // Merged set/get/clear per section; Android WebView scrolls are slow on CI/local.
+  appiumTest.describe.configure({ mode: 'serial', timeout: 300_000 });
+
+  appiumTest(
+    'connects to the State Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectStateButton');
+        },
+      );
+    },
+  );
+
+  appiumTest.describe('new state functions', () => {
+    appiumTest(
+      'encrypted state: sets, retrieves, and clears',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withSnapsFixtures(
+          currentDeviceDetails,
+          { restartDevice: false },
+          async () => {
+            await TestSnaps.fillMessage('dataStateInput', '"bar"');
+            await TestSnaps.fillMessage('setStateKeyInput', 'foo');
+            await TestSnaps.blurActiveWebViewInput();
+            await TestSnaps.tapButton('sendStateButton');
+            await TestSnaps.checkResultJson('encryptedStateResultSpan', {
+              foo: 'bar',
+            });
+
+            await TestSnaps.fillMessage('getStateInput', 'foo');
+            await TestSnaps.blurActiveWebViewInput();
+            await TestSnaps.tapButton('sendGetStateButton');
+            await TestSnaps.checkResultSpan('getStateResultSpan', '"bar"');
+
+            // Clear while still in the encrypted section — avoid a lone
+            // clear+assert after the viewport has moved elsewhere.
+            await TestSnaps.tapButton('clearStateButton');
+            await TestSnaps.checkResultSpan('encryptedStateResultSpan', 'null');
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'unencrypted state: sets, retrieves, and clears',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withSnapsFixtures(
+          currentDeviceDetails,
+          { restartDevice: false },
+          async () => {
+            await TestSnaps.fillMessage('dataUnencryptedStateInput', '"bar"');
+            await TestSnaps.fillMessage('setStateKeyUnencryptedInput', 'foo');
+            await TestSnaps.blurActiveWebViewInput();
+            await TestSnaps.tapButton('sendUnencryptedStateButton');
+            await TestSnaps.checkResultJson('unencryptedStateResultSpan', {
+              foo: 'bar',
+            });
+
+            await TestSnaps.fillMessage('getUnencryptedStateInput', 'foo');
+            await TestSnaps.blurActiveWebViewInput();
+            await TestSnaps.tapButton('sendGetUnencryptedStateButton');
+            await TestSnaps.checkResultSpan(
+              'getStateUnencryptedResultSpan',
+              '"bar"',
+            );
+
+            await TestSnaps.tapButton('clearStateUnencryptedButton');
+            await TestSnaps.checkResultSpan(
+              'unencryptedStateResultSpan',
+              'null',
+            );
+          },
+        );
+      },
+    );
+  });
+
+  appiumTest.describe('legacy state functions', () => {
+    appiumTest(
+      'encrypted state: sets, retrieves, and clears',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withSnapsFixtures(
+          currentDeviceDetails,
+          { restartDevice: false },
+          async () => {
+            await TestSnaps.fillMessage('dataManageStateInput', '23');
+            await TestSnaps.blurActiveWebViewInput();
+            await TestSnaps.tapButton('sendManageStateButton');
+            await TestSnaps.checkResultSpan(
+              'sendManageStateResultSpan',
+              'true',
+            );
+            await TestSnaps.checkResultJson('retrieveManageStateResultSpan', {
+              items: ['23'],
+            });
+
+            await TestSnaps.tapButton('clearManageStateButton');
+            await TestSnaps.checkResultSpan(
+              'clearManageStateResultSpan',
+              'true',
+            );
+            await TestSnaps.checkResultJson('retrieveManageStateResultSpan', {
+              items: [],
+            });
+          },
+        );
+      },
+    );
+
+    appiumTest(
+      'unencrypted state: sets, retrieves, and clears',
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withSnapsFixtures(
+          currentDeviceDetails,
+          { restartDevice: false },
+          async () => {
+            await TestSnaps.fillMessage(
+              'dataUnencryptedManageStateInput',
+              '23',
+            );
+            await TestSnaps.blurActiveWebViewInput();
+            await TestSnaps.tapButton('sendUnencryptedManageStateButton');
+            await TestSnaps.checkResultJson(
+              'retrieveManageStateUnencryptedResultSpan',
+              { items: ['23'] },
+            );
+
+            await TestSnaps.tapButton('clearUnencryptedManageStateButton');
+            await TestSnaps.checkResultSpan(
+              'clearUnencryptedManageStateResultSpan',
+              'true',
+            );
+            await TestSnaps.checkResultJson(
+              'retrieveManageStateUnencryptedResultSpan',
+              { items: [] },
+            );
+          },
+        );
+      },
+    );
+  });
+});
diff --git a/tests/smoke-appium/snaps/test-snap-management.spec.ts b/tests/smoke-appium/snaps/test-snap-management.spec.ts
new file mode 100644
index 000000000000..9f502d667586
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-management.spec.ts
@@ -0,0 +1,93 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import { Assertions } from '../../framework/index.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import SnapSettingsView from '../../page-objects/Settings/SnapSettingsView.js';
+import {
+  loginAndOpenTestSnaps,
+  navigateFromBrowserToSnapSettings,
+  navigateFromSnapSettingsToBrowser,
+} from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+appiumTest.describe(SmokeSnaps('Snap Management Tests'), () => {
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'can connect to the Dialog Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectDialogSnapButton');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can disable a Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await navigateFromBrowserToSnapSettings();
+          await SnapSettingsView.selectSnap('Dialog Example Snap');
+          await SnapSettingsView.toggleEnable();
+          await navigateFromSnapSettingsToBrowser();
+
+          await TestSnaps.tapButton('sendAlertButton');
+          // Android Appium often omits/escapes quotes in alert copy; assert stable substrings.
+          await Assertions.expectTextDisplayed('dialog-example-snap', {
+            timeout: 30_000,
+          });
+          await Assertions.expectTextDisplayed('disabled', {
+            timeout: 30_000,
+          });
+          await TestSnaps.dismissAlert();
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can enable a Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await navigateFromBrowserToSnapSettings();
+          await SnapSettingsView.selectSnap('Dialog Example Snap');
+          await SnapSettingsView.toggleEnable();
+          await navigateFromSnapSettingsToBrowser();
+
+          await TestSnaps.tapButton('sendAlertButton');
+          // Android Appium often omits/escapes quotes in alert copy; assert stable substrings.
+          await Assertions.expectTextDisplayed('This is an alert dialog');
+          await Assertions.expectTextDisplayed('single button');
+          await TestSnaps.tapOkButton();
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can remove a Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await navigateFromBrowserToSnapSettings();
+          await SnapSettingsView.selectSnap('Dialog Example Snap');
+          await SnapSettingsView.removeSnap();
+          await Assertions.expectTextNotDisplayed('Dialog Example Snap');
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-multichain-provider.spec.ts b/tests/smoke-appium/snaps/test-snap-multichain-provider.spec.ts
new file mode 100644
index 000000000000..4f425a59da0b
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-multichain-provider.spec.ts
@@ -0,0 +1,158 @@
+import type { Mockttp } from 'mockttp';
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper.js';
+import { confirmationFeatureFlags } from '../../api-mocking/mock-responses/feature-flags-mocks.js';
+import Assertions from '../../framework/Assertions.js';
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+import ConnectBottomSheet from '../../page-objects/Browser/ConnectBottomSheet.js';
+import RequestTypes from '../../page-objects/Browser/Confirmations/RequestTypes.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { mockGenesisBlocks } from '../../smoke/snaps/mocks.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+interface MultichainChain {
+  name: 'Ethereum' | 'Sepolia' | 'Solana';
+  chainId?: string;
+  genesisHash: string;
+  account: string;
+  signMessageSignature: string;
+  signTypedDataSignature?: string;
+}
+
+const CHAINS: MultichainChain[] = [
+  {
+    name: 'Ethereum',
+    chainId: '0x1',
+    genesisHash:
+      '0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3',
+    account: 'eip155:1:0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+    signMessageSignature:
+      '"0xf63c587cd42e7775e2e815a579f9744ea62944f263b3e69fad48535ba98a5ea107bc878088a99942733a59a89ef1d590eafdb467d59cf76564158d7e78351b751b"',
+    signTypedDataSignature:
+      '"0x7024dc071a7370eee444b2a3edc08d404dd03393694403cdca864653a7e8dd7c583419293d53602666cbe77faa8819fba04f8c57e95df2d4c0190968eece28021c"',
+  },
+  {
+    name: 'Sepolia',
+    chainId: '0xaa36a7',
+    genesisHash:
+      '0x25a5cc106eea7138acab33231d7160d69cb777ee0c2c553fcddf5138993e6dd9',
+    account: 'eip155:11155111:0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+    signMessageSignature:
+      '"0xf63c587cd42e7775e2e815a579f9744ea62944f263b3e69fad48535ba98a5ea107bc878088a99942733a59a89ef1d590eafdb467d59cf76564158d7e78351b751b"',
+    signTypedDataSignature:
+      '"0x35bb09b05a3f7e4a0965fbf35b48d9d51efa5f7d030bdf4c18f4ad958941d20213a3e0ef731c1ee7619248331f5c259829581da38e9112624c1f8639e954572d1c"',
+  },
+  {
+    name: 'Solana',
+    genesisHash: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+    account:
+      'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:4tE76eixEgyJDrdykdWJR1XBkzUk4cLMvqjR2xVJUxer',
+    signMessageSignature:
+      '"5RH4BJB99CvWqPhXAtUwLQGJePeeXFLQKbztFbiasAe4mEGmr4moV2g2XEEwWMSsZKQGiV1UHxVGuVMenXAcfKfi"',
+  },
+];
+
+const multiSrpFixture = new FixtureBuilder()
+  .withMultiSRPKeyringController()
+  .build();
+
+const multichainMocks = async (mockServer: Mockttp) => {
+  await setupRemoteFeatureFlagsMock(
+    mockServer,
+    Object.assign({}, ...confirmationFeatureFlags),
+  );
+  await mockGenesisBlocks(mockServer);
+};
+
+appiumTest.describe(SmokeSnaps('Multichain Provider Snap Tests'), () => {
+  // Long running test due to multiple steps within the test for each chain
+  appiumTest.describe.configure({ timeout: 300_000 });
+
+  for (const chain of CHAINS) {
+    appiumTest(
+      `can use the Multichain provider on ${chain.name}`,
+      async ({ driver: _driver, currentDeviceDetails }) => {
+        await withSnapsFixtures(
+          currentDeviceDetails,
+          {
+            fixture: multiSrpFixture,
+            testSpecificMock: multichainMocks,
+            restartDevice: true,
+          },
+          async () => {
+            await loginAndOpenTestSnaps();
+
+            await TestSnaps.installSnap('connectMultichainProviderButton');
+
+            await TestSnaps.tapButton('sendCreateSessionButton');
+            await Assertions.expectElementToBeVisible(
+              ConnectBottomSheet.connectButton,
+            );
+            await ConnectBottomSheet.tapConnectButton();
+
+            await TestSnaps.selectInDropdown(
+              'multichainNetworkDropdown',
+              chain.name,
+            );
+
+            if (chain.chainId) {
+              await TestSnaps.tapButton('sendMultichainChainIdButton');
+              await TestSnaps.checkResultSpanIncludes(
+                'multichainProviderResultSpan',
+                chain.chainId,
+              );
+            }
+
+            await TestSnaps.tapButton('sendMultichainGetGenesisHashButton');
+            await TestSnaps.checkResultSpanIncludes(
+              'multichainProviderResultSpan',
+              chain.genesisHash,
+            );
+
+            await TestSnaps.tapButton('sendMultichainAccountsButton');
+            await TestSnaps.checkResultSpanIncludes(
+              'multichainProviderResultSpan',
+              chain.account,
+            );
+
+            await TestSnaps.fillMessage(
+              'signMessageMultichainMessageInput',
+              'foo',
+            );
+            await TestSnaps.tapButton('signMessageMultichainButton');
+            if (chain.name === 'Solana') {
+              await TestSnaps.approveSolanaConfirmation();
+            } else {
+              await Assertions.expectElementToBeVisible(
+                RequestTypes.PersonalSignRequest,
+              );
+              await TestSnaps.approveNativeConfirmation();
+            }
+            await TestSnaps.checkResultSpan(
+              'signMessageMultichainResultSpan',
+              chain.signMessageSignature,
+            );
+
+            if (chain.signTypedDataSignature) {
+              await TestSnaps.fillMessage(
+                'signTypedDataMultichainMessageInput',
+                'bar',
+              );
+              await TestSnaps.tapButton('signTypedDataMultichainButton');
+              await Assertions.expectElementToBeVisible(
+                RequestTypes.TypedSignRequest,
+              );
+              await TestSnaps.approveNativeConfirmation();
+              await TestSnaps.checkResultSpan(
+                'signTypedDataMultichainResultSpan',
+                chain.signTypedDataSignature,
+              );
+            }
+          },
+        );
+      },
+    );
+  }
+});
diff --git a/tests/smoke-appium/snaps/test-snap-name-lookup.spec.ts b/tests/smoke-appium/snaps/test-snap-name-lookup.spec.ts
new file mode 100644
index 000000000000..e1b22d177233
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-name-lookup.spec.ts
@@ -0,0 +1,99 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import { Assertions, Gestures, Matchers } from '../../framework/index.js';
+import BrowserView from '../../page-objects/Browser/BrowserView.js';
+import RedesignedSendView from '../../page-objects/Send/RedesignedSendView.js';
+import TransactionConfirmView from '../../page-objects/Send/TransactionConfirmView.js';
+import NetworkListModal from '../../page-objects/Network/NetworkListModal.js';
+import TabBarComponent from '../../page-objects/wallet/TabBarComponent.js';
+import TokenOverview from '../../page-objects/wallet/TokenOverview.js';
+import WalletView from '../../page-objects/wallet/WalletView.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { getDecodedProxiedURL } from '../notifications/utils/helpers.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+const TOKEN = 'ETH';
+
+appiumTest.describe(SmokeSnaps('Name Lookup Snap Tests'), () => {
+  appiumTest(
+    'displays the resolved recipient address in the send flow',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        {
+          testSpecificMock: async (mockServer) => {
+            await mockServer
+              .forPost('/proxy')
+              .matching((request) => {
+                try {
+                  const url = getDecodedProxiedURL(request.url);
+                  return /compliance\.(dev-api|api|uat-api)\.cx\.metamask\.io\/v1\/wallet\/batch/.test(
+                    url,
+                  );
+                } catch {
+                  return false;
+                }
+              })
+              .asPriority(1001)
+              .thenCallback(async (request) => {
+                let addresses: string[] = [];
+                try {
+                  const text = await request.body.getText();
+                  if (text) {
+                    const parsed = JSON.parse(text) as unknown;
+                    if (Array.isArray(parsed)) {
+                      addresses = parsed.filter(
+                        (a): a is string => typeof a === 'string',
+                      );
+                    }
+                  }
+                } catch {
+                  /* ignore malformed body */
+                }
+                return {
+                  statusCode: 200,
+                  json: addresses.map((address) => ({
+                    address,
+                    blocked: false,
+                  })),
+                };
+              });
+          },
+        },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectNameLookupButton');
+
+          await BrowserView.tapCloseBrowserButton();
+          await TabBarComponent.tapHome();
+          await WalletView.tapOnNewTokensSection();
+          await WalletView.tapTokenNetworkFilter();
+          await NetworkListModal.tapOnCustomTab();
+          await NetworkListModal.changeNetworkTo('Localhost');
+
+          await WalletView.tapOnToken(TOKEN);
+          await TokenOverview.tapSendButton();
+
+          const domain = 'metamask.domain';
+          await RedesignedSendView.enterZeroAmount();
+          await RedesignedSendView.pressContinueButton();
+          await RedesignedSendView.inputRecipientAddress(domain);
+
+          await RedesignedSendView.pressReviewButton();
+          await TransactionConfirmView.tapAdvancedDetails();
+
+          await Gestures.waitAndTap(Matchers.getElementByText(domain, 0), {
+            elemDescription: 'Recipient address',
+            // There's an animation that can cause flakiness.
+            delay: 1000,
+          });
+
+          await Assertions.expectTextDisplayed(
+            '0xc0ffee254729296a45a3885639ac7e10f9d54979',
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-network-access.spec.ts b/tests/smoke-appium/snaps/test-snap-network-access.spec.ts
new file mode 100644
index 000000000000..73915e5bfd95
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-network-access.spec.ts
@@ -0,0 +1,60 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import { LocalNodeType } from '../../framework/types.js';
+import { getAnvilPortForTest } from '../../framework/fixtures/FixtureUtils.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { defaultOptions } from '../../seeder/anvil-manager.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+appiumTest.describe(SmokeSnaps('Network Access Snap Tests'), () => {
+  appiumTest(
+    'can use fetch and WebSockets',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        {
+          localNodeOptions: [
+            {
+              type: LocalNodeType.anvil,
+              options: {
+                ...defaultOptions,
+                blockTime: 2,
+              },
+            },
+          ],
+        },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectNetworkAccessButton');
+
+          // Use fetch
+          await TestSnaps.tapButton('sendNetworkAccessTestButton');
+          await TestSnaps.checkResultSpanIncludes(
+            'networkAccessResultSpan',
+            '"hello": "world"',
+          );
+
+          // Use WebSockets
+          const webSocketUrl = `ws://localhost:${getAnvilPortForTest()}`;
+          await TestSnaps.fillMessage('webSocketUrlInput', webSocketUrl);
+          await TestSnaps.tapButton('startWebSocket');
+
+          await TestSnaps.waitForWebSocketUpdate({
+            open: true,
+            origin: webSocketUrl,
+            blockNumber: 'number',
+          });
+
+          await TestSnaps.tapButton('stopWebSocket');
+
+          await TestSnaps.waitForWebSocketUpdate({
+            open: false,
+            origin: null,
+            blockNumber: null,
+          });
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/snaps/test-snap-preinstalled.spec.ts b/tests/smoke-appium/snaps/test-snap-preinstalled.spec.ts
new file mode 100644
index 000000000000..93cf1eb47588
--- /dev/null
+++ b/tests/smoke-appium/snaps/test-snap-preinstalled.spec.ts
@@ -0,0 +1,69 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeSnaps } from '../../tags.js';
+import FixtureBuilder from '../../framework/fixtures/FixtureBuilder.js';
+import Assertions from '../../framework/Assertions.js';
+import Utilities from '../../framework/Utilities.js';
+import TestSnaps from '../../page-objects/Browser/TestSnaps.js';
+import { testSnapPreinstalledAnalyticsExpectations } from '../../helpers/analytics/expectations/test-snap-preinstalled.analytics.js';
+import { getEventsPayloads } from '../../helpers/analytics/helpers.js';
+import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
+import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
+
+const preinstalledFixture = new FixtureBuilder().withMetaMetricsOptIn().build();
+const TEST_EVENT = 'Test Event';
+
+appiumTest.describe(SmokeSnaps('Preinstalled Snap Tests'), () => {
+  // TODO(Appium): displays the Snap settings page
+  // (Playwright has no test.todo; Detox used it.todo for this unfinished coverage.)
+
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'uses `initialConnections` to allow JSON-RPC and tracks an event in Segment with `snap_trackEvent`',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        {
+          fixture: preinstalledFixture,
+          analyticsExpectations: testSnapPreinstalledAnalyticsExpectations,
+          restartDevice: true,
+        },
+        async ({ mockServer }) => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.tapButton('showPreinstalledDialogButton');
+          await Assertions.expectTextDisplayed(
+            'This is a custom dialog. It has a custom footer and can be resolved to any value.',
+          );
+          await TestSnaps.tapCancelButton();
+          await TestSnaps.tapButton('trackEventButton');
+
+          await Utilities.waitUntil(
+            async () =>
+              (await getEventsPayloads(mockServer, [TEST_EVENT])).length > 0,
+            { timeout: 5_000, interval: 1_000 },
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'can access the messenger',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        {
+          fixture: preinstalledFixture,
+          restartDevice: false,
+        },
+        async () => {
+          await TestSnaps.tapButton('messengerCallButton');
+          await TestSnaps.checkResultSpan('preinstalledResultSpan', 'false');
+        },
+      );
+    },
+  );
+
+  // TODO(Appium): tracks an error in Sentry with `snap_trackError`
+  // TODO(Appium): starts and ends a performance trace in Sentry with `snap_startTrace` and `snap_endTrace`
+});
diff --git a/tests/smoke-appium/snaps/test-snap-wasm.spec.ts b/tests/smoke-appium/snaps/test-snap-wasm.spec.ts
index 4134cb85e7f9..9c3a957262e6 100644
--- a/tests/smoke-appium/snaps/test-snap-wasm.spec.ts
+++ b/tests/smoke-appium/snaps/test-snap-wasm.spec.ts
@@ -5,16 +5,35 @@ import { loginAndOpenTestSnaps } from '../../flows/snaps.flow.js';
 import { withSnapsFixtures } from './helpers/snap-smoke.helpers.js';
 
 appiumTest.describe(SmokeSnaps('WASM Snap Tests'), () => {
+  // Serial: later cases reuse the installed Snap / Appium session from the connect test.
+  appiumTest.describe.configure({ mode: 'serial', timeout: 150_000 });
+
+  appiumTest(
+    'can connect to the WASM Snap',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: true },
+        async () => {
+          await loginAndOpenTestSnaps();
+          await TestSnaps.installSnap('connectWasmButton');
+        },
+      );
+    },
+  );
+
   appiumTest(
-    'can connect to the WASM Snap and return a response for the given number',
+    'return a response for the given number',
     async ({ driver: _driver, currentDeviceDetails }) => {
-      await withSnapsFixtures(currentDeviceDetails, {}, async () => {
-        await loginAndOpenTestSnaps();
-        await TestSnaps.installSnap('connectWasmButton');
-        await TestSnaps.fillMessage('wasmInput', '23');
-        await TestSnaps.tapButton('sendWasmMessageButton');
-        await TestSnaps.checkResultSpan('wasmResultSpan', '28657');
-      });
+      await withSnapsFixtures(
+        currentDeviceDetails,
+        { restartDevice: false },
+        async () => {
+          await TestSnaps.fillMessage('wasmInput', '23');
+          await TestSnaps.tapButton('sendWasmMessageButton');
+          await TestSnaps.checkResultSpan('wasmResultSpan', '28657');
+        },
+      );
     },
   );
 });
diff --git a/tests/smoke-appium/trending/trending-feed.spec.ts b/tests/smoke-appium/trending/trending-feed.spec.ts
index bee5503dfbc0..34b913a26359 100644
--- a/tests/smoke-appium/trending/trending-feed.spec.ts
+++ b/tests/smoke-appium/trending/trending-feed.spec.ts
@@ -44,10 +44,6 @@ appiumTest.describe(
           enabled: false,
           minimumVersion: '0.0.0',
         },
-        predictWorldCup: {
-          enabled: false,
-          minimumVersion: '0.0.0',
-        },
       });
 
       await setupMockEvents(mockServer, TRENDING_API_MOCKS);
diff --git a/tests/smoke-appium/wallet/connections/evm-provider-events.spec.ts b/tests/smoke-appium/wallet/connections/evm-provider-events.spec.ts
new file mode 100644
index 000000000000..cd0b734f114d
--- /dev/null
+++ b/tests/smoke-appium/wallet/connections/evm-provider-events.spec.ts
@@ -0,0 +1,228 @@
+import { test as appiumTest } from '../../../framework/fixtures/playwright/index.js';
+import { SmokeWalletPlatform } from '../../../tags.js';
+import Assertions from '../../../framework/Assertions.js';
+import FixtureBuilder, {
+  DEFAULT_FIXTURE_ACCOUNT_2,
+  DEFAULT_FIXTURE_ACCOUNT_CHECKSUM,
+} from '../../../framework/fixtures/FixtureBuilder.js';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.js';
+import Browser from '../../../page-objects/Browser/BrowserView.js';
+import ConnectedAccountsModal from '../../../page-objects/Browser/ConnectedAccountsModal.js';
+import NetworkConnectMultiSelector from '../../../page-objects/Browser/NetworkConnectMultiSelector.js';
+import ConnectBottomSheet from '../../../page-objects/Browser/ConnectBottomSheet.js';
+import { NetworkNonPemittedBottomSheetSelectorsText } from '../../../../app/components/Views/NetworkConnect/NetworkNonPemittedBottomSheet.testIds';
+import { loginToAppPlaywright } from '../../../flows/wallet.flow.js';
+import {
+  navigateToBrowserView,
+  waitForTestDappToLoad,
+} from '../../../flows/browser.flow.js';
+import {
+  Caip25CaveatType,
+  Caip25EndowmentPermissionName,
+} from '@metamask/chain-agnostic-permission';
+import { DappVariants } from '../../../framework/Constants.js';
+import ToastModal from '../../../page-objects/wallet/ToastModal.js';
+import AccountListBottomSheet from '../../../page-objects/wallet/AccountListBottomSheet.js';
+import TabBarComponent from '../../../page-objects/wallet/TabBarComponent.js';
+import WalletView from '../../../page-objects/wallet/WalletView.js';
+
+/**
+ * Open the browser connected-accounts sheet and assert the active account
+ * (and optionally a permitted network) from native UI — avoids WebView DOM.
+ */
+async function assertConnectedAccountFromNativeUi(
+  accountName: string,
+  networkName?: string,
+): Promise<void> {
+  await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
+  await Assertions.expectTextDisplayed(accountName, {
+    description: `Connected accounts modal should show ${accountName}`,
+  });
+  await Assertions.expectElementToNotBeVisible(ToastModal.notificationTitle);
+
+  if (networkName) {
+    await ConnectedAccountsModal.tapPermissionsSummaryTab();
+    await Assertions.expectTextDisplayed(networkName, {
+      description: `Permissions should show network ${networkName}`,
+    });
+  }
+}
+
+appiumTest.describe(SmokeWalletPlatform('EVM Provider Events'), () => {
+  appiumTest.describe.configure({ timeout: 150000 });
+
+  appiumTest(
+    'notifies the connected account and chain on load of a permitted dapp',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: new FixtureBuilder()
+            .withImportedHdKeyringAndTwoDefaultAccountsOneImportedHdAccountKeyringController()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+          await navigateToBrowserView();
+          await Browser.navigateToTestDApp();
+          await waitForTestDappToLoad();
+
+          // Native UI reflects the permitted account (Account 1) and chain
+          // (Ethereum Main Network / 0x1) without reading the dapp WebView.
+          await assertConnectedAccountFromNativeUi(
+            'Account 1',
+            NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME,
+          );
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'notifies a dapp when the wallet switches to an account it has permission to access. ',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: new FixtureBuilder()
+            .withImportedHdKeyringAndTwoDefaultAccountsOneImportedHdAccountKeyringController()
+            .withPermissionControllerConnectedToTestDapp({
+              [Caip25EndowmentPermissionName]: {
+                caveats: [
+                  {
+                    type: Caip25CaveatType,
+                    value: {
+                      optionalScopes: {
+                        'eip155:1': {
+                          accounts: [
+                            `eip155:1:${DEFAULT_FIXTURE_ACCOUNT_CHECKSUM}`,
+                            `eip155:1:${DEFAULT_FIXTURE_ACCOUNT_2.toLowerCase()}`,
+                          ],
+                        },
+                      },
+                      requiredScopes: {},
+                      sessionProperties: {},
+                      isMultichainOrigin: false,
+                    },
+                  },
+                ],
+              },
+            })
+            .build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+          await navigateToBrowserView();
+          await Browser.navigateToTestDApp();
+          await waitForTestDappToLoad();
+
+          await assertConnectedAccountFromNativeUi('Account 1');
+          await Assertions.expectTextDisplayed('Account 2', {
+            description:
+              'Both permitted accounts should appear in the connected accounts modal',
+          });
+          await ConnectBottomSheet.tapCancelButton();
+          await Browser.tapCloseBrowserButton();
+          await Assertions.expectElementToBeVisible(
+            TabBarComponent.tabBarWalletButton,
+          );
+          await TabBarComponent.tapWallet();
+          await WalletView.tapIdenticon();
+          await AccountListBottomSheet.tapAccountByNameV2('Account 2');
+          await navigateToBrowserView();
+          await waitForTestDappToLoad();
+
+          // Active account is now Account 2 (native proxy for accountsChanged).
+          await assertConnectedAccountFromNativeUi('Account 2');
+          await ConnectBottomSheet.tapCancelButton();
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'notifies a permitted dapp of the new chain ID when the network changes',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp({
+              [Caip25EndowmentPermissionName]: {
+                caveats: [
+                  {
+                    type: Caip25CaveatType,
+                    value: {
+                      optionalScopes: {
+                        'eip155:1': {
+                          accounts: [
+                            `eip155:1:${DEFAULT_FIXTURE_ACCOUNT_CHECKSUM}`,
+                          ],
+                        },
+                        'eip155:1337': {
+                          accounts: [
+                            `eip155:1337:${DEFAULT_FIXTURE_ACCOUNT_CHECKSUM}`,
+                          ],
+                        },
+                      },
+                      requiredScopes: {},
+                      sessionProperties: {},
+                      isMultichainOrigin: false,
+                    },
+                  },
+                ],
+              },
+            })
+            .build(),
+          restartDevice: true,
+          currentDeviceDetails,
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+          await navigateToBrowserView();
+          await Browser.navigateToTestDApp();
+          await waitForTestDappToLoad();
+
+          // Two permitted chains surface as "2 networks connected" (Localhost +
+          // Ethereum), not the individual network names.
+          await assertConnectedAccountFromNativeUi(
+            'Account 1',
+            '2 networks connected',
+          );
+
+          await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
+          await NetworkConnectMultiSelector.selectNetworkChainPermission(
+            'Ethereum Main Network',
+          );
+          await NetworkConnectMultiSelector.tapUpdateButton();
+
+          // Remaining permitted chain is Localhost (0x539) — native proxy for
+          // chainChanged instead of reading #chainId from the WebView.
+          await ConnectedAccountsModal.tapPermissionsSummaryTab();
+          await Assertions.expectTextDisplayed('Localhost', {
+            description:
+              'After removing Ethereum Mainnet, Localhost should remain',
+          });
+          await ConnectBottomSheet.tapCancelButton();
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/wallet/helpers/musd-fixture.ts b/tests/smoke-appium/wallet/helpers/musd-fixture.ts
new file mode 100644
index 000000000000..7eb387ca8b88
--- /dev/null
+++ b/tests/smoke-appium/wallet/helpers/musd-fixture.ts
@@ -0,0 +1,228 @@
+import FixtureBuilder, {
+  type MusdFixtureOptions,
+  DEFAULT_FIXTURE_ACCOUNT_CHECKSUM,
+} from '../../../framework/fixtures/FixtureBuilder.js';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import { toChecksumHexAddress } from '@metamask/controller-utils';
+import { AnvilPort } from '../../../framework/fixtures/FixtureUtils.js';
+import { AnvilManager } from '../../../seeder/anvil-manager.js';
+import { USDC_MAINNET, MUSD_MAINNET } from '../../../constants/musd-mainnet.js';
+import type { Hex } from '@metamask/utils';
+import type { AssetsControllerState } from '@metamask/assets-controller';
+import { merge } from 'lodash';
+
+const USDC_DECIMALS = 6;
+const MUSD_DECIMALS = 6;
+const ETH_NATIVE_ADDRESS = '0x0000000000000000000000000000000000000000';
+const MAINNET_NATIVE_ASSET_ID = 'eip155:1/slip44:60';
+const USDC_ASSET_ID = `eip155:1/erc20:${USDC_MAINNET}`;
+const MUSD_ASSET_ID = `eip155:1/erc20:${MUSD_MAINNET}`;
+
+/**
+ * Minimal EVM bytecode that returns 10 000 USDC (10 000 000 000 raw) for any
+ * call, including `balanceOf(address)`. Deployed at the USDC contract address
+ * on Anvil to satisfy the TransactionPayController balance validation.
+ */
+const ERC20_STUB_BYTECODE =
+  '0x7f00000000000000000000000000000000000000000000000000000002540be40060005260206000f3';
+
+/**
+ * Same flags as setupMusdMocks — seeded in fixture to avoid first-paint race
+ * with the remote flag API mock (same pattern as lending-fixture).
+ * Classic mUSD conversion keeps Money Hub off so confirm returns to wallet.
+ */
+const MUSD_REMOTE_FEATURE_FLAGS = {
+  earnMoneyHubEnabled: { enabled: false, minimumVersion: '0.0.0' },
+  earnMusdConversionFlowEnabled: { enabled: true, minimumVersion: '0.0.0' },
+  earnMusdCtaEnabled: { enabled: true, minimumVersion: '0.0.0' },
+  earnMusdConversionTokenListItemCtaEnabled: {
+    enabled: true,
+    minimumVersion: '0.0.0',
+  },
+  earnMusdConversionAssetOverviewCtaEnabled: {
+    enabled: true,
+    minimumVersion: '0.0.0',
+  },
+  earnMusdConversionCtaTokens: { '*': ['USDC'] },
+  earnMusdConvertibleTokensAllowlist: { '*': ['USDC'] },
+  earnMusdConversionMinAssetBalanceRequired: 0.01,
+  earnMusdConversionGeoBlockedCountries: { blockedRegions: ['GB'] },
+};
+
+export type { MusdFixtureOptions };
+
+/**
+ * Builds a fixture for mUSD conversion E2E tests using FixtureBuilder:
+ * Mainnet, ETH/USDC/mUSD tokens, rates, balances, and mUSD eligibility state.
+ */
+export async function createMusdFixture(
+  node: AnvilManager,
+  options: MusdFixtureOptions,
+): Promise<ReturnType<FixtureBuilder['build']>> {
+  const rpcPort = node?.getPort?.() ?? AnvilPort();
+
+  if (node) {
+    await seedErc20Stub(node, USDC_MAINNET);
+    await node.setAccountBalance('10', DEFAULT_FIXTURE_ACCOUNT_CHECKSUM as Hex);
+  }
+
+  const usdcBalance = options.usdcBalance ?? 100;
+  const musdBalance = options.musdBalance ?? 10;
+
+  const baseTokens = [
+    {
+      address: toChecksumHexAddress(ETH_NATIVE_ADDRESS),
+      symbol: 'ETH',
+      decimals: 18,
+      name: 'Ethereum',
+    },
+    {
+      address: toChecksumHexAddress(USDC_MAINNET),
+      symbol: 'USDC',
+      decimals: USDC_DECIMALS,
+      name: 'USDCoin',
+    },
+    ...(options.hasMusdBalance
+      ? [
+          {
+            address: toChecksumHexAddress(MUSD_MAINNET),
+            symbol: 'MUSD',
+            decimals: MUSD_DECIMALS,
+            name: 'MUSD',
+          },
+        ]
+      : []),
+  ];
+
+  const fixture = new FixtureBuilder()
+    .withPopularNetworks()
+    .withNetworkController({
+      chainId: CHAIN_IDS.MAINNET,
+      rpcUrl: `http://localhost:${rpcPort}`,
+      type: 'custom',
+      nickname: 'Ethereum Mainnet',
+      ticker: 'ETH',
+    })
+    .withMetaMetricsOptIn()
+    .withTokensForAllPopularNetworks(baseTokens)
+    .withTokenRates(
+      CHAIN_IDS.MAINNET,
+      toChecksumHexAddress(ETH_NATIVE_ADDRESS),
+      3000.0,
+    )
+    .withTokenRates(CHAIN_IDS.MAINNET, toChecksumHexAddress(USDC_MAINNET), 1.0)
+    .withTokenRates(CHAIN_IDS.MAINNET, toChecksumHexAddress(MUSD_MAINNET), 1.0)
+    .withMusdConversion(options)
+    .build();
+
+  const backgroundState = fixture.state.engine.backgroundState;
+
+  // Seed feature flags directly so they're available on first render
+  // (API mock has a race condition with the initial paint — same as lending-fixture)
+  merge(backgroundState, {
+    RemoteFeatureFlagController: {
+      remoteFeatureFlags: MUSD_REMOTE_FEATURE_FLAGS,
+    },
+  });
+
+  // Homepage / TokensFullView read AssetsController; seed balances for first paint
+  const selectedAccountId =
+    backgroundState.AccountsController.internalAccounts.selectedAccount;
+  const existingAssetsController = (backgroundState.AssetsController ??
+    {}) as Partial<AssetsControllerState>;
+  const existingCustomAssets =
+    existingAssetsController.customAssets?.[selectedAccountId] ?? [];
+  const now = Date.now();
+
+  backgroundState.AssetsController = {
+    ...existingAssetsController,
+    selectedCurrency: 'usd',
+    assetsInfo: {
+      ...existingAssetsController.assetsInfo,
+      [MAINNET_NATIVE_ASSET_ID]: {
+        type: 'native',
+        symbol: 'ETH',
+        name: 'Ethereum',
+        decimals: 18,
+      },
+      [USDC_ASSET_ID]: {
+        type: 'erc20',
+        symbol: 'USDC',
+        name: 'USD Coin',
+        decimals: USDC_DECIMALS,
+      },
+      ...(options.hasMusdBalance
+        ? {
+            [MUSD_ASSET_ID]: {
+              type: 'erc20',
+              symbol: 'MUSD',
+              name: 'MUSD',
+              decimals: MUSD_DECIMALS,
+            },
+          }
+        : {}),
+    },
+    assetsBalance: {
+      ...existingAssetsController.assetsBalance,
+      [selectedAccountId]: {
+        ...existingAssetsController.assetsBalance?.[selectedAccountId],
+        [MAINNET_NATIVE_ASSET_ID]: { amount: '10' },
+        ...(options.hasUsdcBalance !== false
+          ? { [USDC_ASSET_ID]: { amount: String(usdcBalance) } }
+          : {}),
+        ...(options.hasMusdBalance
+          ? { [MUSD_ASSET_ID]: { amount: String(musdBalance) } }
+          : {}),
+      },
+    },
+    assetsPrice: {
+      ...existingAssetsController.assetsPrice,
+      [MAINNET_NATIVE_ASSET_ID]: {
+        assetPriceType: 'fungible' as const,
+        price: 3000,
+        usdPrice: 3000,
+        lastUpdated: now,
+      },
+      [USDC_ASSET_ID]: {
+        assetPriceType: 'fungible' as const,
+        price: 1,
+        usdPrice: 1,
+        lastUpdated: now,
+      },
+      ...(options.hasMusdBalance
+        ? {
+            [MUSD_ASSET_ID]: {
+              assetPriceType: 'fungible' as const,
+              price: 1,
+              usdPrice: 1,
+              lastUpdated: now,
+            },
+          }
+        : {}),
+    },
+    customAssets: {
+      ...existingAssetsController.customAssets,
+      [selectedAccountId]: [
+        ...new Set([
+          ...existingCustomAssets,
+          USDC_ASSET_ID,
+          ...(options.hasMusdBalance ? [MUSD_ASSET_ID] : []),
+        ]),
+      ],
+    },
+  };
+
+  return fixture;
+}
+
+async function seedErc20Stub(
+  node: AnvilManager,
+  tokenAddress: string,
+): Promise<void> {
+  const { testClient } = node.getProvider();
+
+  await testClient.setCode({
+    address: tokenAddress as `0x${string}`,
+    bytecode: ERC20_STUB_BYTECODE as `0x${string}`,
+  });
+}
diff --git a/tests/smoke-appium/wallet/incoming-transactions.spec.ts b/tests/smoke-appium/wallet/incoming-transactions.spec.ts
new file mode 100644
index 000000000000..3b21622ec43f
--- /dev/null
+++ b/tests/smoke-appium/wallet/incoming-transactions.spec.ts
@@ -0,0 +1,319 @@
+import { toChecksumHexAddress } from '@metamask/controller-utils';
+import { TransactionType } from '@metamask/transaction-controller';
+import { Mockttp } from 'mockttp';
+import { merge } from 'lodash';
+
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeWalletPlatform } from '../../tags.js';
+import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import Assertions from '../../framework/Assertions.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import FixtureBuilder, {
+  DEFAULT_FIXTURE_ACCOUNT,
+  DEFAULT_FIXTURE_ACCOUNT_2,
+  ENTROPY_WALLET_1_ID,
+} from '../../framework/fixtures/FixtureBuilder.js';
+import type {
+  AccountTreeControllerState,
+  Fixture,
+} from '../../framework/fixtures/types.js';
+import TabBarComponent from '../../page-objects/wallet/TabBarComponent.js';
+import ToastModal from '../../page-objects/wallet/ToastModal.js';
+import { MockApiEndpoint, TestSpecificMock } from '../../framework/types.js';
+import { setupMockRequest } from '../../api-mocking/helpers/mockHelpers.js';
+import UnifiedTransactionsView from '../../page-objects/Transactions/UnifiedTransactionsView.js';
+import NetworkManager from '../../page-objects/wallet/NetworkManager.js';
+
+// EVM-only account tree to prevent Solana snap from fetching live transactions
+const EVM_ONLY_ACCOUNT_TREE = {
+  accountTree: {
+    wallets: {
+      [ENTROPY_WALLET_1_ID]: {
+        id: ENTROPY_WALLET_1_ID,
+        type: 'Entropy',
+        metadata: { name: 'Secret Recovery Phrase 1' },
+        groups: {
+          [`${ENTROPY_WALLET_1_ID}/account-1`]: {
+            id: `${ENTROPY_WALLET_1_ID}/account-1`,
+            type: 'MultipleAccount',
+            accounts: ['4d7a5e0b-b261-4aed-8126-43972b0fa0a1'],
+            metadata: { name: 'Account 1' },
+          },
+        },
+      },
+    },
+    selectedAccountGroup: `${ENTROPY_WALLET_1_ID}/account-1`,
+  },
+};
+
+const TOKEN_SYMBOL_MOCK = 'ABC';
+const TOKEN_ADDRESS_MOCK = '0x123';
+
+const TRUSTED_INCOMING_SENDER_CHECKSUM = toChecksumHexAddress(
+  DEFAULT_FIXTURE_ACCOUNT_2,
+);
+
+const RESPONSE_STANDARD_MOCK = {
+  hash: '0x123456',
+  timestamp: new Date().toISOString(),
+  chainId: 1,
+  blockNumber: 1,
+  blockHash: '0x2',
+  gas: 1,
+  gasUsed: 1,
+  gasPrice: '1',
+  effectiveGasPrice: '1',
+  nonce: 1,
+  cumulativeGasUsed: 1,
+  methodId: null,
+  value: '1230000000000000000',
+  to: DEFAULT_FIXTURE_ACCOUNT,
+  from: TRUSTED_INCOMING_SENDER_CHECKSUM,
+  isError: false,
+  valueTransfers: [],
+};
+
+const RESPONSE_STANDARD_2_MOCK = {
+  ...RESPONSE_STANDARD_MOCK,
+  timestamp: new Date().toISOString(),
+  hash: '0x2',
+  value: '2340000000000000000',
+};
+
+const RESPONSE_TOKEN_TRANSFER_MOCK = {
+  ...RESPONSE_STANDARD_MOCK,
+  to: DEFAULT_FIXTURE_ACCOUNT,
+  valueTransfers: [
+    {
+      contractAddress: TOKEN_ADDRESS_MOCK,
+      decimal: 18,
+      symbol: TOKEN_SYMBOL_MOCK,
+      from: TRUSTED_INCOMING_SENDER_CHECKSUM,
+      to: DEFAULT_FIXTURE_ACCOUNT,
+      amount: '4560000000000000000',
+    },
+  ],
+};
+
+const RESPONSE_OUTGOING_TRANSACTION_MOCK = {
+  ...RESPONSE_STANDARD_MOCK,
+  to: TRUSTED_INCOMING_SENDER_CHECKSUM,
+  from: DEFAULT_FIXTURE_ACCOUNT,
+};
+
+function mockAccountsApi(
+  transactions: Record<string, unknown>[] = [],
+): MockApiEndpoint {
+  return {
+    urlEndpoint:
+      /^https:\/\/accounts\.api\.cx\.metamask\.io\/v4\/multiaccount\/transactions(\?.*)?$/,
+    response: {
+      data:
+        transactions.length > 0
+          ? transactions
+          : [RESPONSE_STANDARD_MOCK, RESPONSE_STANDARD_2_MOCK],
+      pageInfo: {
+        count: transactions.length || 2,
+        hasNextPage: false,
+      },
+    },
+    responseCode: 200,
+  };
+}
+
+function createAccountsTestSpecificMock(
+  transactions: Record<string, unknown>[] = [],
+): TestSpecificMock {
+  return async (mockServer: Mockttp) => {
+    const mock = mockAccountsApi(transactions);
+    await setupMockRequest(
+      mockServer,
+      {
+        requestMethod: 'GET',
+        url: mock.urlEndpoint,
+        response: mock.response,
+        responseCode: mock.responseCode,
+      },
+      1000,
+    );
+  };
+}
+
+/**
+ * Makes the sender address trusted via the address book so the incoming
+ * native transfer passes the poisoning filter.
+ *
+ * KeyringController / AccountsController merges don't work here because
+ * AccountsController reconciles against the vault on unlock (which only
+ * contains Account 1) and drops any extra accounts.  The address book is
+ * static persisted state that survives startup, and contact sync is
+ * disabled via UserStorageController flags.
+ */
+function mergeTrustedSenderForIncomingNative(fixture: Fixture): void {
+  merge(fixture.state.engine.backgroundState.UserStorageController, {
+    isBackupAndSyncEnabled: false,
+    isAccountSyncingEnabled: false,
+    isContactSyncingEnabled: false,
+  });
+
+  merge(fixture.state.engine.backgroundState.AddressBookController, {
+    addressBook: {
+      '0x1': {
+        [TRUSTED_INCOMING_SENDER_CHECKSUM]: {
+          address: TRUSTED_INCOMING_SENDER_CHECKSUM,
+          name: 'Account 2',
+          chainId: '0x1',
+        },
+      },
+    },
+  });
+}
+
+appiumTest.describe(SmokeWalletPlatform('Incoming Transactions'), () => {
+  appiumTest.describe.configure({ timeout: 250000 });
+
+  appiumTest(
+    'displays incoming native transfer from another own account',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      const fixture = new FixtureBuilder()
+        .withAccountTreeController(
+          EVM_ONLY_ACCOUNT_TREE as unknown as Partial<AccountTreeControllerState>,
+        )
+        .withNetworkEnabledMap({ eip155: { '0x1': true } })
+        .withPrivacyModePreferences(false)
+        .build();
+      mergeTrustedSenderForIncomingNative(fixture);
+
+      await withFixtures(
+        {
+          fixture,
+          restartDevice: true,
+          currentDeviceDetails,
+          testSpecificMock: createAccountsTestSpecificMock([
+            RESPONSE_STANDARD_MOCK,
+          ]),
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+          await NetworkManager.navigateToTokensFullView();
+          await NetworkManager.openNetworkManager();
+          await NetworkManager.tapSelectAllPopularNetworks();
+          await NetworkManager.navigateBackFromTokensFullView();
+
+          await TabBarComponent.tapActivity();
+          await UnifiedTransactionsView.swipeDown();
+          await Assertions.expectTextDisplayed('Received ETH');
+        },
+      );
+    },
+  );
+
+  // Skipped: Unified Activity drops Accounts API incoming ERC-20s in
+  // shouldSkipTransaction → isIncomingTokenTransfer
+  // (app/components/Views/UnifiedTransactionsView/helpers/transformations.ts).
+  // "Received ABC" never reaches the Activity list until that filter changes.
+  // Historical: https://github.com/MetaMask/metamask-mobile/issues/15730
+  appiumTest.skip(
+    'displays incoming token transfers',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder()
+            .withAccountTreeController(
+              EVM_ONLY_ACCOUNT_TREE as unknown as Partial<AccountTreeControllerState>,
+            )
+            .withNetworkEnabledMap({ eip155: { '0x1': true } })
+            .withTokens([
+              {
+                address: TOKEN_ADDRESS_MOCK,
+                decimals: 18,
+                symbol: TOKEN_SYMBOL_MOCK,
+              },
+            ])
+            .withPrivacyModePreferences(false)
+            .build(),
+          restartDevice: true,
+          currentDeviceDetails,
+          testSpecificMock: createAccountsTestSpecificMock([
+            RESPONSE_TOKEN_TRANSFER_MOCK,
+          ]),
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+          await TabBarComponent.tapActivity();
+          await UnifiedTransactionsView.swipeDown();
+          await Assertions.expectTextDisplayed('Received ABC');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'displays outgoing transactions',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder()
+            .withAccountTreeController(
+              EVM_ONLY_ACCOUNT_TREE as unknown as Partial<AccountTreeControllerState>,
+            )
+            .withNetworkEnabledMap({ eip155: { '0x1': true } })
+            .withPrivacyModePreferences(false)
+            .build(),
+          restartDevice: true,
+          currentDeviceDetails,
+          testSpecificMock: createAccountsTestSpecificMock([
+            RESPONSE_OUTGOING_TRANSACTION_MOCK,
+          ]),
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+          await NetworkManager.navigateToTokensFullView();
+          await NetworkManager.openNetworkManager();
+          await NetworkManager.tapSelectAllPopularNetworks();
+          await NetworkManager.navigateBackFromTokensFullView();
+
+          await TabBarComponent.tapActivity();
+          await UnifiedTransactionsView.swipeDown();
+          await Assertions.expectTextDisplayed('Sent ETH');
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'displays nothing if incoming transaction is a duplicate',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          fixture: new FixtureBuilder()
+            .withAccountTreeController(
+              EVM_ONLY_ACCOUNT_TREE as unknown as Partial<AccountTreeControllerState>,
+            )
+            .withNetworkEnabledMap({ eip155: { '0x1': true } })
+            .withTransactions([
+              {
+                hash: RESPONSE_STANDARD_MOCK.hash,
+                txParams: {
+                  from: RESPONSE_STANDARD_MOCK.from,
+                },
+                type: TransactionType.incoming,
+              },
+            ])
+            .build(),
+          restartDevice: true,
+          currentDeviceDetails,
+          testSpecificMock: createAccountsTestSpecificMock([
+            RESPONSE_STANDARD_MOCK,
+          ]),
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+          await TabBarComponent.tapActivity();
+          await UnifiedTransactionsView.swipeDown();
+          await Assertions.expectTextNotDisplayed('Received ETH');
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke-appium/wallet/musd-conversion-happy-path.spec.ts b/tests/smoke-appium/wallet/musd-conversion-happy-path.spec.ts
new file mode 100644
index 000000000000..61c106ba607a
--- /dev/null
+++ b/tests/smoke-appium/wallet/musd-conversion-happy-path.spec.ts
@@ -0,0 +1,182 @@
+import { test as appiumTest } from '../../framework/fixtures/playwright/index.js';
+import { SmokeWalletPlatform } from '../../tags.js';
+import WalletView from '../../page-objects/wallet/WalletView.js';
+import {
+  loginToAppPlaywright,
+  waitForWalletHomePlaywright,
+  dismissPushNotificationExistingUserSheet,
+} from '../../flows/wallet.flow.js';
+import Assertions from '../../framework/Assertions.js';
+import { resolveE2EWaitTimeoutMs } from '../../framework/Constants.js';
+import { withFixtures } from '../../framework/fixtures/FixtureHelper.js';
+import {
+  LocalNode,
+  LocalNodeType,
+  type WithFixturesOptions,
+} from '../../framework/types.js';
+import { AnvilManager } from '../../seeder/anvil-manager.js';
+import TransactionPayConfirmation from '../../page-objects/Confirmation/TransactionPayConfirmation.js';
+import FooterActions from '../../page-objects/Browser/Confirmations/FooterActions.js';
+import TabBarComponent from '../../page-objects/wallet/TabBarComponent.js';
+import ActivitiesView from '../../page-objects/Transactions/ActivitiesView.js';
+import NetworkManager from '../../page-objects/wallet/NetworkManager.js';
+import {
+  setupMusdMocks,
+  type MusdMockOptions,
+} from '../../api-mocking/mock-responses/musd/musd-mocks.js';
+import {
+  createMusdFixture,
+  type MusdFixtureOptions,
+} from './helpers/musd-fixture.js';
+
+/**
+ * Returns the shared withFixtures config for mUSD conversion tests.
+ * Only fixture options vary per scenario; localNodeOptions, restartDevice, and testSpecificMock are centralized here.
+ */
+function withMusdFixturesOptions(
+  fixtureOptions: MusdFixtureOptions,
+): WithFixturesOptions {
+  const mockOptions: MusdMockOptions = {
+    hasMusdBalance: fixtureOptions.hasMusdBalance,
+    musdBalance: fixtureOptions.musdBalance,
+  };
+
+  return {
+    fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
+      const node = localNodes?.[0] as unknown as AnvilManager;
+      return createMusdFixture(node, fixtureOptions);
+    },
+    localNodeOptions: [
+      {
+        type: LocalNodeType.anvil,
+        options: { chainId: 1 },
+      },
+    ],
+    restartDevice: true,
+    // Skip reload in cleanup to avoid native crash (SIGSEGV) when sync was disabled during test (same as snaps)
+    skipReactNativeReload: true,
+    testSpecificMock: (mockServer) => setupMusdMocks(mockServer, mockOptions),
+  };
+}
+
+appiumTest.describe(SmokeWalletPlatform('mUSD Conversion Happy Path'), () => {
+  appiumTest(
+    'converts USDC to mUSD successfully (First Time User)',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          ...withMusdFixturesOptions({
+            musdConversionEducationSeen: false,
+          }),
+          currentDeviceDetails,
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+          // iOS Appium: wallet-screen often exists with displayed=false; use readiness helper
+          await waitForWalletHomePlaywright(resolveE2EWaitTimeoutMs(30_000));
+
+          // Get mUSD primary CTA lives in TokensFullView (homepage Cash section removed)
+          await NetworkManager.navigateToTokensFullView();
+
+          // Verify primary Get mUSD CTA (above token list) and tap it
+          await Assertions.expectElementToBeVisible(
+            WalletView.musdAssetListConversionCta,
+            {
+              timeout: 30000,
+              description:
+                'mUSD asset-list conversion CTA should be visible in TokensFullView',
+            },
+          );
+          await WalletView.tapGetMusdButton();
+
+          // Verify education screen is shown (first time user) and tap Get Started
+          await Assertions.expectElementToBeVisible(
+            WalletView.getStartedButton,
+            {
+              timeout: 10000,
+              description:
+                'Education screen Get Started button should be visible',
+            },
+          );
+          await WalletView.tapGetStartedButton();
+
+          // Verify custom amount/confirmation screen is shown
+          await Assertions.expectElementToBeVisible(
+            TransactionPayConfirmation.payWithRow,
+            {
+              timeout: 10000,
+              description:
+                'Pay with row should be visible on confirmation screen',
+            },
+          );
+
+          // Enter amount ($12) and continue (avoid "0" key to prevent banner blocking)
+          await TransactionPayConfirmation.enterAmountAndContinue('12');
+
+          // Confirm the transaction (tap the convert/confirm button)
+          await FooterActions.tapConfirmButton();
+
+          // Push opt-in sheet can appear after confirm and block wallet readiness
+          await dismissPushNotificationExistingUserSheet();
+          await waitForWalletHomePlaywright(resolveE2EWaitTimeoutMs(30_000));
+
+          // Go to Activity and verify mUSD conversion is confirmed (same pattern as send-native-token: no swipeDown)
+          await TabBarComponent.tapActivity();
+          await ActivitiesView.verifyMusdConversionConfirmed(0);
+          // gets back to wallet to avoid waiting fora rpc updated in the activity view
+          await TabBarComponent.tapWallet();
+        },
+      );
+    },
+  );
+
+  appiumTest(
+    'converts USDC to mUSD from Asset Overview',
+    async ({ driver: _driver, currentDeviceDetails }) => {
+      await withFixtures(
+        {
+          ...withMusdFixturesOptions({
+            musdConversionEducationSeen: true,
+          }),
+          currentDeviceDetails,
+        },
+        async () => {
+          await loginToAppPlaywright({ scenarioType: 'e2e' });
+          await waitForWalletHomePlaywright(resolveE2EWaitTimeoutMs(30_000));
+          await NetworkManager.navigateToTokensFullView();
+
+          // Tap on USDC to go to Asset Overview, scroll to mUSD CTA (ensures loaded), then tap
+          // Appium token rows use getAssetTestId(symbol) → asset-USDC
+          await WalletView.tapOnToken('USDC');
+          await WalletView.scrollDownToAssetOverviewMusdCta();
+          await WalletView.tapAssetOverviewMusdCta();
+
+          // Verify confirmation screen (payToken/quote may load)
+          await Assertions.expectElementToBeVisible(
+            TransactionPayConfirmation.payWithRow,
+            {
+              timeout: 20000,
+              description:
+                'Pay with row should be visible on confirmation screen',
+            },
+          );
+
+          // Enter amount and continue (avoid "0" key - use 5)
+          await TransactionPayConfirmation.enterAmountAndContinue('5');
+
+          // Confirm the transaction
+          await FooterActions.tapConfirmButton();
+
+          await dismissPushNotificationExistingUserSheet();
+          await waitForWalletHomePlaywright(resolveE2EWaitTimeoutMs(30_000));
+
+          // Go to Activity and verify mUSD conversion is confirmed
+          await TabBarComponent.tapActivity();
+          await ActivitiesView.verifyMusdConversionConfirmed(0);
+          // gets back to wallet to avoid waiting fora rpc updated in the activity view
+          await TabBarComponent.tapWallet();
+        },
+      );
+    },
+  );
+});
diff --git a/tests/smoke/api-specs/ConfirmationsRejectionRule.js b/tests/smoke/api-specs/ConfirmationsRejectionRule.js
deleted file mode 100644
index f0f80db4ff87..000000000000
--- a/tests/smoke/api-specs/ConfirmationsRejectionRule.js
+++ /dev/null
@@ -1,208 +0,0 @@
-/// <reference path="../../../tests/types/detox.d.ts" />
-import { device } from 'detox';
-import { addToQueue } from './helpers';
-import paramsToObj from '@open-rpc/test-coverage/build/utils/params-to-obj';
-import TestHelpers from '../../helpers';
-import Matchers from '../../framework/Matchers';
-import Gestures from '../../framework/Gestures';
-import ConnectBottomSheet from '../../page-objects/Browser/ConnectBottomSheet';
-import AssetWatchBottomSheet from '../../page-objects/Transactions/AssetWatchBottomSheet';
-import SpamFilterModal from '../../page-objects/Browser/SpamFilterModal';
-import BrowserView from '../../page-objects/Browser/BrowserView';
-import ConnectedAccountsModal from '../../page-objects/Browser/ConnectedAccountsModal';
-
-// eslint-disable-next-line import-x/no-nodejs-modules
-import fs from 'fs';
-
-import Assertions from '../../framework/Assertions';
-import PermissionSummaryBottomSheet from '../../page-objects/Browser/PermissionSummaryBottomSheet';
-
-const getBase64FromPath = async (path) => {
-  const data = await fs.promises.readFile(path);
-  return data.toString('base64');
-};
-
-export default class ConfirmationsRejectRule {
-  constructor(options) {
-    this.driver = options.driver; // Pass element for detox instead of all the driver
-    this.only = options.only;
-    this.allCapsCancel = ['wallet_watchAsset'];
-    this.permissionConnectionSheet = ['wallet_revokePermissions'];
-    this.requiresEthAccountsPermission = [
-      'personal_sign',
-      'eth_signTypedData_v4',
-      'eth_getEncryptionPublicKey',
-      'wallet_revokePermissions',
-    ];
-  }
-
-  getTitle() {
-    return 'Confirmations Rejection Rule';
-  }
-
-  async beforeRequest(_, call) {
-    await new Promise((resolve, reject) => {
-      addToQueue({
-        name: 'beforeRequest',
-        resolve,
-        reject,
-        task: async () => {
-          if (this.requiresEthAccountsPermission.includes(call.methodName)) {
-            const requestPermissionsRequest = JSON.stringify({
-              jsonrpc: '2.0',
-              method: 'wallet_requestPermissions',
-              params: [{ eth_accounts: {} }],
-            });
-
-            await this.driver.runScript(`(el) => {
-                window.ethereum.request(${requestPermissionsRequest})
-              }`);
-
-            /**
-             *
-             * Screenshot Code Section
-             *
-             */
-
-            // Connect accounts modal
-            await ConnectBottomSheet.tapConnectButton();
-            await Assertions.checkIfNotVisible(
-              PermissionSummaryBottomSheet.container,
-            );
-            await TestHelpers.delay(3000);
-
-            try {
-              await Assertions.checkIfVisible(SpamFilterModal.title);
-              await SpamFilterModal.tapCloseButton();
-              await Assertions.checkIfNotVisible(SpamFilterModal.title);
-            } catch {
-              /* eslint-disable no-console */
-
-              console.log('The spam modal is not visible');
-            }
-          }
-
-          // we need this because mobile doesnt support just raw json signTypedData, it requires a stringified version
-          // it was fixed and should get it in @metamask/message-manager@7.0.1
-          if (call.methodName === 'eth_signTypedData_v4') {
-            call.params[1] = JSON.stringify(call.params[1]);
-          }
-        },
-      });
-    });
-  }
-
-  // get all the confirmation calls to make and expect to pass
-  // Need this now?
-  getCalls(_, method) {
-    const calls = [];
-    const isMethodAllowed = this.only ? this.only.includes(method.name) : true;
-    if (isMethodAllowed) {
-      if (method.examples) {
-        // pull the first example
-        const e = method.examples[0];
-        const ex = e;
-
-        if (!ex.result) {
-          return calls;
-        }
-        const p = ex.params.map((e) => e.value);
-        const params =
-          method.paramStructure === 'by-name'
-            ? paramsToObj(p, method.params)
-            : p;
-        calls.push({
-          title: `${this.getTitle()} - with example ${ex.name}`,
-          methodName: method.name,
-          params,
-          url: '',
-          resultSchema: method.result.schema,
-          expectedResult: ex.result.value,
-        });
-      } else {
-        // naively call the method with no params
-        calls.push({
-          title: `${method.name} > confirmation rejection`,
-          methodName: method.name,
-          params: [],
-          url: '',
-          resultSchema: method.result.schema,
-        });
-      }
-    }
-    return calls;
-  }
-
-  async afterRequest(_, call) {
-    await new Promise((resolve, reject) => {
-      addToQueue({
-        name: 'afterRequest',
-        resolve,
-        reject,
-        task: async () => {
-          await TestHelpers.delay(3000);
-          const imagePath = await device.takeScreenshot(
-            `afterRequest-${this.getTitle()}`,
-          );
-          const image = await getBase64FromPath(imagePath);
-          call.attachments = call.attachments || [];
-          call.attachments.push({
-            data: `data:image/png;base64,${image}`,
-            image,
-            type: 'image',
-          });
-          let cancelButton;
-          await TestHelpers.delay(3000);
-          if (this.allCapsCancel.includes(call.methodName)) {
-            await AssetWatchBottomSheet.tapCancelButton();
-          } else if (call.methodName === 'wallet_revokePermissions') {
-            await BrowserView.tapLocalHostDefaultAvatar();
-            await Assertions.checkIfNotVisible(ConnectedAccountsModal.title);
-          } else {
-            cancelButton = await Matchers.getElementByText('Cancel');
-            await Gestures.waitAndTap(cancelButton);
-          }
-        },
-      });
-    });
-
-    /**
-     *
-     * Screen shot code section
-     */
-  }
-
-  async afterResponse(_, call) {
-    await new Promise((resolve, reject) => {
-      addToQueue({
-        name: 'afterResponse',
-        resolve,
-        reject,
-        task: async () => {
-          // Revoke Permissions
-          if (this.requiresEthAccountsPermission.includes(call.methodName)) {
-            const revokePermissionRequest = JSON.stringify({
-              jsonrpc: '2.0',
-              method: 'wallet_revokePermissions',
-              params: [{ eth_accounts: {} }],
-            });
-
-            await this.driver.runScript(`(el) => {
-              window.ethereum.request(${revokePermissionRequest})
-            }`);
-          }
-        },
-      });
-    });
-  }
-
-  validateCall(call) {
-    if (call.error) {
-      call.valid = call.error.code === 4001;
-      if (!call.valid) {
-        call.reason = `Expected error code 4001, got ${call.error.code}`;
-      }
-    }
-    return call;
-  }
-}
diff --git a/tests/smoke/api-specs/helpers.js b/tests/smoke/api-specs/helpers.js
deleted file mode 100644
index c90b7e8d3ae9..000000000000
--- a/tests/smoke/api-specs/helpers.js
+++ /dev/null
@@ -1,103 +0,0 @@
-import TestHelpers from '../../helpers';
-import { v4 as uuid } from 'uuid';
-
-export const taskQueue = [];
-let isProcessing = false;
-
-export const processQueue = async () => {
-  if (isProcessing || taskQueue.length === 0) return;
-
-  isProcessing = true;
-  const { task, resolve, reject } = taskQueue.shift();
-  try {
-    const result = await task();
-    resolve(result);
-  } catch (error) {
-    reject(error);
-  } finally {
-    isProcessing = false;
-    await processQueue();
-  }
-};
-
-export const addToQueue = ({ task, resolve, reject, name }) => {
-  taskQueue.push({ task, resolve, reject, name });
-  return processQueue();
-};
-
-const pollResult = async (driver, generatedKey) => {
-  let result;
-  // eslint-disable-next-line no-loop-func
-  await new Promise((resolve, reject) => {
-    addToQueue({
-      name: 'pollResult',
-      task: async () => {
-        await TestHelpers.delay(500);
-        const text = await driver.runScript(
-          (el, g) => window[g],
-          [generatedKey],
-        );
-        if (typeof text === 'string') {
-          result = JSON.parse(text);
-        } else {
-          result = text;
-        }
-        if (result !== undefined) {
-          await driver.runScript(
-            (el, g) => {
-              delete window[g];
-            },
-            [generatedKey],
-          );
-        }
-        return result;
-      },
-      resolve,
-      reject,
-    });
-  });
-  if (result !== undefined) {
-    return result;
-  }
-  return pollResult(driver, generatedKey);
-};
-
-export const createDriverTransport = (driver) => (_, method, params) => {
-  const generatedKey = uuid();
-  return new Promise((resolve, reject) => {
-    const execute = async () => {
-      await addToQueue({
-        name: 'transport',
-        task: async () => {
-          await driver.runScript(
-            (el, m, p, g) => {
-              window.ethereum
-                .request({ method: m, params: p })
-                .then((res) => {
-                  window[g] = JSON.stringify({
-                    result: res,
-                  });
-                })
-                .catch((err) => {
-                  window[g] = JSON.stringify({
-                    error: {
-                      code: err.code,
-                      message: err.message,
-                      data: err.data,
-                    },
-                  });
-                });
-            },
-            [method, params, generatedKey],
-          );
-        },
-        resolve,
-        reject,
-      });
-    };
-    return execute();
-  }).then(async () => {
-    const result = await pollResult(driver, generatedKey);
-    return result;
-  });
-};
diff --git a/tests/smoke/api-specs/json-rpc-coverage.js b/tests/smoke/api-specs/json-rpc-coverage.js
deleted file mode 100644
index f30598b42c11..000000000000
--- a/tests/smoke/api-specs/json-rpc-coverage.js
+++ /dev/null
@@ -1,269 +0,0 @@
-'use strict';
-import { web } from 'detox';
-import detox from 'detox/internals';
-import rpcCoverageTool from '@open-rpc/test-coverage';
-import { parseOpenRPCDocument } from '@open-rpc/schema-utils-js';
-import JsonSchemaFakerRule from '@open-rpc/test-coverage/build/rules/json-schema-faker-rule';
-import HtmlReporter from '@open-rpc/test-coverage/build/reporters/html-reporter';
-
-import Browser from '../../page-objects/Browser/BrowserView';
-// eslint-disable-next-line import-x/no-commonjs
-const mockServer = require('@open-rpc/mock-server/build/index').default;
-import TabBarComponent from '../../page-objects/wallet/TabBarComponent';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import { loginToApp } from '../../flows/wallet.flow';
-
-import ExamplesRule from '@open-rpc/test-coverage/build/rules/examples-rule';
-import ConfirmationsRejectRule from './ConfirmationsRejectionRule';
-import { createDriverTransport } from './helpers';
-import { BrowserViewSelectorsIDs } from '../../../app/components/Views/BrowserTab/BrowserView.testIds';
-import { DappVariants } from '../../framework/Constants';
-import { setupMockRequest } from '../../api-mocking/helpers/mockHelpers';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { confirmationsRedesignedFeatureFlags } from '../../api-mocking/mock-responses/feature-flags-mocks';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-
-// API spec tests use a mock RPC server instead of Ganache (disableLocalNodes: true)
-// Fixed port is fine since tests don't run in parallel
-const port = 8545;
-const chainId = 1337;
-
-const main = async () => {
-  const openrpcDocument = await parseOpenRPCDocument(
-    'https://metamask.github.io/api-specs/0.10.8/openrpc.json',
-  );
-
-  const signTypedData4 = openrpcDocument.methods.find(
-    (m) => m.name === 'eth_signTypedData_v4',
-  );
-  const switchEthereumChain = openrpcDocument.methods.find(
-    (m) => m.name === 'wallet_switchEthereumChain',
-  );
-  switchEthereumChain.examples = [
-    {
-      name: 'wallet_switchEthereumChain',
-      description: 'Example of a wallet_switchEthereumChain request to sepolia',
-      params: [
-        {
-          name: 'SwitchEthereumChainParameter',
-          value: {
-            chainId: '0xaa36a7',
-          },
-        },
-      ],
-      result: {
-        name: 'wallet_switchEthereumChain',
-        value: null,
-      },
-    },
-  ];
-
-  const chainIdMethod = openrpcDocument.methods.find(
-    (m) => m.name === 'eth_chainId',
-  );
-
-  chainIdMethod.examples = [
-    {
-      name: 'chainIdExample',
-      description: 'Example of a chainId request',
-      params: [],
-      result: {
-        name: 'chainIdResult',
-        value: `0x${chainId.toString(16)}`,
-      },
-    },
-  ];
-
-  const blockNumber = openrpcDocument.methods.find(
-    (m) => m.name === 'eth_blockNumber',
-  );
-
-  blockNumber.examples = [
-    {
-      name: 'blockNumberExample',
-      description: 'Example of a blockNumber request',
-      params: [],
-      result: {
-        name: 'blockNumberResult',
-        value: '0x1',
-      },
-    },
-  ];
-
-  // just update address for signTypedData
-  signTypedData4.examples[0].params[0].value =
-    '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3';
-
-  signTypedData4.examples[0].params[1].value.domain.chainId = chainId;
-
-  const personalSign = openrpcDocument.methods.find(
-    (m) => m.name === 'personal_sign',
-  );
-
-  personalSign.examples = [
-    {
-      name: 'personalSignExample',
-      description: 'Example of a personalSign request',
-      params: [
-        {
-          name: 'data',
-          value: '0xdeadbeef',
-        },
-        {
-          name: 'address',
-          value: '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3',
-        },
-      ],
-      result: {
-        name: 'personalSignResult',
-        value: '0x1a8819e0c9bab700',
-      },
-    },
-  ];
-
-  const transaction =
-    openrpcDocument.components?.schemas?.TransactionInfo?.allOf?.[0];
-
-  if (transaction) {
-    delete transaction.unevaluatedProperties;
-  }
-  // net_version missing from execution-apis. see here: https://github.com/ethereum/execution-apis/issues/540
-  const netVersion = {
-    name: 'net_version',
-    params: [],
-    result: {
-      description: 'Returns the current network ID.',
-      name: 'net_version',
-      schema: {
-        type: 'string',
-      },
-    },
-    description: 'Returns the current network ID.',
-    examples: [
-      {
-        name: 'net_version',
-        description: 'Example of a net_version request',
-        params: [],
-        result: {
-          name: 'net_version',
-          description: 'The current network ID',
-          value: '0x1',
-        },
-      },
-    ],
-  };
-  // add net_version
-  openrpcDocument.methods.push(netVersion);
-
-  const server = mockServer(port, openrpcDocument);
-  server.start();
-
-  await withFixtures(
-    {
-      dapps: [
-        {
-          dappVariant: DappVariants.TEST_DAPP,
-        },
-      ],
-      fixture: new FixtureBuilder().withGanacheNetwork().build(),
-      disableLocalNodes: true,
-      restartDevice: true,
-    },
-    async () => {
-      await loginToApp();
-      await navigateToBrowserView();
-      await Browser.navigateToTestDApp();
-
-      const myWebView = web(by.id(BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID));
-      const webElement = await myWebView.element(by.web.tag('body'));
-      const transport = createDriverTransport(webElement);
-
-      const methodsWithConfirmations = [
-        'wallet_requestPermissions',
-        'eth_requestAccounts',
-        'wallet_watchAsset',
-        'personal_sign', // requires permissions for eth_accounts
-        'wallet_addEthereumChain',
-        'eth_signTypedData_v4', // requires permissions for eth_accounts
-        'wallet_switchEthereumChain',
-        'eth_getEncryptionPublicKey', // requires permissions for eth_accounts
-      ];
-
-      // replace this with pulling tags out of the api-spec
-      // tag: Confirmations
-      const filteredMethods = openrpcDocument.methods
-        .filter(
-          (m) =>
-            m.name.includes('snap') ||
-            m.name.includes('Snap') ||
-            m.name.toLowerCase().includes('account') ||
-            m.name.includes('crypt') ||
-            m.name.includes('blob') ||
-            m.name.includes('sendTransaction') ||
-            m.name.startsWith('wallet_scanQRCode') ||
-            m.name.includes('filter') ||
-            m.name.includes('Filter') ||
-            m.name.includes('getBlockReceipts') || // eth_getBlockReceipts not support
-            m.name.includes('maxPriorityFeePerGas') || // eth_maxPriorityFeePerGas not supported
-            methodsWithConfirmations.includes(m.name),
-        )
-        .map((m) => m.name);
-
-      const skip = [
-        'eth_coinbase',
-        'wallet_registerOnboarding',
-        'eth_getEncryptionPublicKey',
-        'wallet_watchAsset',
-        'personal_sign', // quarantined for now due to mysterious flakiness, resolution tracked here: https://github.com/MetaMask/MetaMask-planning/issues/5207
-        'eth_signTypedData_v4', // quarantined for now due to mysterious flakiness, resolution tracked here: https://github.com/MetaMask/MetaMask-planning/issues/5207
-      ];
-
-      const results = await rpcCoverageTool({
-        openrpcDocument,
-        transport,
-        reporters: [
-          'console-streaming',
-          new HtmlReporter({ autoOpen: !process.env.CI }),
-        ],
-        rules: [
-          new JsonSchemaFakerRule({
-            only: [],
-            skip: filteredMethods,
-            numCalls: 1,
-          }),
-          new ExamplesRule({
-            only: [],
-            skip: filteredMethods,
-          }),
-          new ConfirmationsRejectRule({
-            driver: webElement,
-            only: methodsWithConfirmations,
-          }),
-        ],
-        skip,
-      });
-      const failing = results.filter((r) => !r.valid);
-      await detox.cleanup();
-
-      // wait 1s to allow for cleanup
-      await new Promise((resolve, reject) => {
-        setTimeout(() => {
-          resolve();
-        }, 1000);
-      });
-      process.exit(failing.length > 0 ? 1 : 0);
-    },
-  );
-};
-
-const start = async () => {
-  await detox.init({ workerId: null });
-  await detox.installWorker({
-    global: this.global,
-    workerId: `w1`,
-  });
-  await main();
-};
-
-start();
diff --git a/tests/smoke/api-specs/run-api-spec-tests.js b/tests/smoke/api-specs/run-api-spec-tests.js
deleted file mode 100644
index cfdee8378fbb..000000000000
--- a/tests/smoke/api-specs/run-api-spec-tests.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* eslint-disable import-x/no-commonjs */
-require('@babel/register');
-
-// Configure ts-node with options that will properly handle .d.ts files
-require('ts-node').register({
-  transpileOnly: true,
-  compilerOptions: {
-    module: 'commonjs',
-    target: 'es2017',
-    allowJs: true,
-    esModuleInterop: true,
-    skipLibCheck: true,
-  },
-  files: true,
-});
-
-require('./json-rpc-coverage.js');
diff --git a/tests/smoke/confirmations/send/send-btc-token.spec.ts b/tests/smoke/confirmations/send/send-btc-token.spec.ts
deleted file mode 100644
index 0a27181f113a..000000000000
--- a/tests/smoke/confirmations/send/send-btc-token.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
-import { SmokeConfirmations } from '../../../tags';
-
-describe(SmokeConfirmations('Send Bitcoin'), () => {
-  // Moved to cv tests (send.non-evm.view.test.tsx)
-  it.skip('Send BTC', async () => {
-    // TODO: Update the test so if does a full e2e (define what should do). Keep this test to have something tested on e2e.
-    // https://consensyssoftware.atlassian.net/browse/MMQA-1794
-  });
-});
diff --git a/tests/smoke/confirmations/send/send-native-token.spec.ts b/tests/smoke/confirmations/send/send-native-token.spec.ts
deleted file mode 100644
index 50fc71b09e3b..000000000000
--- a/tests/smoke/confirmations/send/send-native-token.spec.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
-import FixtureBuilder, {
-  DEFAULT_FIXTURE_ACCOUNT,
-} from '../../../framework/fixtures/FixtureBuilder';
-import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions';
-import SendView from '../../../page-objects/Send/RedesignedSendView';
-import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
-import WalletView from '../../../page-objects/wallet/WalletView';
-import { Assertions } from '../../../framework';
-import { DappVariants, LOCAL_NODE_RPC_URL } from '../../../framework/Constants';
-import { SmokeConfirmations } from '../../../tags';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import { LocalNode } from '../../../framework/types';
-import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { Mockttp } from 'mockttp';
-import { setupMockRequest } from '../../../api-mocking/helpers/mockHelpers';
-import { validateTransactionHashInTransactionFinalizedEvent } from './metricsValidationHelper';
-
-const RECIPIENT = '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb';
-
-describe.skip(SmokeConfirmations('Send native asset'), () => {
-  // Moved partially to cv tests (send.view.test.tsx, EVM coverage)
-  it('should send MAX balance ETH to an address', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withNetworkController({
-            chainId: '0x539',
-            rpcUrl: LOCAL_NODE_RPC_URL,
-            type: 'custom',
-            nickname: 'Local RPC',
-            ticker: 'ETH',
-          })
-          .withMetaMetricsOptIn()
-          .withPreferencesController({})
-          .build(),
-        testSpecificMock: async (mockServer: Mockttp) => {
-          await setupRemoteFeatureFlagsMock(mockServer);
-
-          await setupMockRequest(mockServer, {
-            requestMethod: 'PUT',
-            url: /https:\/\/authentication\.api\.cx\.metamask\.io\/api\/v2\/profile\/accounts/i,
-            response: {
-              message: 'OK',
-            },
-            responseCode: 200,
-          });
-
-          await setupMockRequest(mockServer, {
-            url: /accounts\.api\.cx\.metamask\.io\/v4\/multiaccount\/balances/,
-            response: {
-              balances: [
-                {
-                  object: 'token',
-                  address: '0x0000000000000000000000000000000000000000',
-                  symbol: 'ETH',
-                  name: 'Ether',
-                  type: 'native',
-                  decimals: 18,
-                  chainId: 1337,
-                  balance: '10.000000000000000000',
-                  accountAddress: `eip155:1337:${DEFAULT_FIXTURE_ACCOUNT}`,
-                },
-              ],
-              unprocessedNetworks: [],
-            },
-            requestMethod: 'GET',
-            responseCode: 200,
-          });
-        },
-        restartDevice: true,
-      },
-      async ({
-        localNodes,
-        mockServer,
-      }: {
-        localNodes?: LocalNode[];
-        mockServer?: Mockttp;
-      }) => {
-        await loginToApp();
-        await device.disableSynchronization();
-        // send Max ETH
-        await WalletView.tapWalletSendButton();
-        await SendView.selectEthereumToken();
-        await SendView.pressAmountMaxButton();
-        await SendView.pressContinueButton();
-        await SendView.inputRecipientAddress(RECIPIENT);
-        await SendView.pressReviewButton();
-        await FooterActions.tapConfirmButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Confirmed');
-
-        // Validate txHash in Transaction Finalized Event.
-        // Makes the test fail if the txHash is not matching with the latest transaction on the local node.
-        await validateTransactionHashInTransactionFinalizedEvent(
-          localNodes,
-          mockServer,
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/confirmations/send/send-solana-token.spec.ts b/tests/smoke/confirmations/send/send-solana-token.spec.ts
deleted file mode 100644
index a82c031d744b..000000000000
--- a/tests/smoke/confirmations/send/send-solana-token.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
-
-import { SmokeConfirmations } from '../../../tags';
-
-describe(SmokeConfirmations('Send SOL token'), () => {
-  // Moved to cv tests (send.non-evm.view.test.tsx)
-
-  it.skip('should send solana to an address', async () => {
-    // TODO: Update the test so if does a full e2e (define what should do). Keep this test to have something tested on e2e.
-    // https://consensyssoftware.atlassian.net/browse/MMQA-1792
-  });
-});
diff --git a/tests/smoke/confirmations/send/send-tron-token.spec.ts b/tests/smoke/confirmations/send/send-tron-token.spec.ts
deleted file mode 100644
index e1dc4a23482e..000000000000
--- a/tests/smoke/confirmations/send/send-tron-token.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
-import { SmokeConfirmations } from '../../../tags';
-
-describe(SmokeConfirmations('Send TRX token'), () => {
-  // Moved to cv tests (send.non-evm.view.test.tsx)
-
-  it.skip('shows insufficient funds', async () => {
-    // TODO: Update the test so if does a full e2e (define what should do). Keep this test to have something tested on e2e.
-    // https://consensyssoftware.atlassian.net/browse/MMQA-1793
-  });
-});
diff --git a/tests/smoke/confirmations/transactions/7702/batch-transaction.spec.ts b/tests/smoke/confirmations/transactions/7702/batch-transaction.spec.ts
deleted file mode 100644
index 427e723676ab..000000000000
--- a/tests/smoke/confirmations/transactions/7702/batch-transaction.spec.ts
+++ /dev/null
@@ -1,265 +0,0 @@
-import AccountDetails from '../../../../page-objects/MultichainAccounts/AccountDetails';
-import AccountListBottomSheet from '../../../../page-objects/wallet/AccountListBottomSheet';
-import Assertions from '../../../../framework/Assertions';
-import BrowserView from '../../../../page-objects/Browser/BrowserView';
-import ConfirmationUITypes from '../../../../page-objects/Browser/Confirmations/ConfirmationUITypes';
-import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder';
-import FooterActions from '../../../../page-objects/Browser/Confirmations/FooterActions';
-import NetworkListModal from '../../../../page-objects/Network/NetworkListModal';
-import NetworkManager from '../../../../page-objects/wallet/NetworkManager';
-import RowComponents from '../../../../page-objects/Browser/Confirmations/RowComponents';
-import SwitchAccountModal from '../../../../page-objects/wallet/SwitchAccountModal';
-import TabBarComponent from '../../../../page-objects/wallet/TabBarComponent';
-import TestDApp from '../../../../page-objects/Browser/TestDApp';
-import WalletView from '../../../../page-objects/wallet/WalletView';
-import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../../api-mocking/mock-responses/simulations';
-import {
-  AnvilPort,
-  buildPermissions,
-} from '../../../../framework/fixtures/FixtureUtils';
-import { loginToApp } from '../../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../../flows/browser.flow';
-import { SmokeConfirmations } from '../../../../tags';
-import { withFixtures } from '../../../../framework/fixtures/FixtureHelper';
-import { DappVariants } from '../../../../framework/Constants';
-import {
-  AnvilNodeOptions,
-  LocalNode,
-  LocalNodeType,
-} from '../../../../framework';
-import { Mockttp } from 'mockttp';
-import { setupMockRequest } from '../../../../api-mocking/helpers/mockHelpers';
-import { confirmationFeatureFlags } from '../../../../api-mocking/mock-responses/feature-flags-mocks';
-import { setupRemoteFeatureFlagsMock } from '../../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { AnvilManager } from '../../../../seeder/anvil-manager';
-
-const LOCAL_CHAIN_NAME = 'Local RPC';
-
-const localNodeOptions = [
-  {
-    type: 'anvil',
-    options: {
-      hardfork: 'prague',
-      loadState:
-        './tests/smoke/confirmations/transactions/7702/withDelegatorContracts.json',
-    },
-  },
-];
-
-async function changeNetworkFromNetworkListModal() {
-  await NetworkManager.navigateToTokensFullView();
-  await NetworkManager.openNetworkManager();
-  await NetworkListModal.tapOnCustomTab();
-  await NetworkListModal.changeNetworkTo(LOCAL_CHAIN_NAME);
-  await NetworkManager.navigateBackFromTokensFullView();
-}
-
-async function checkConfirmationPage() {
-  await Assertions.expectElementToBeVisible(RowComponents.AccountNetwork);
-  await Assertions.expectElementToBeVisible(RowComponents.GasFeesDetails);
-  await Assertions.expectElementToBeVisible(RowComponents.AdvancedDetails);
-}
-
-async function tapSwitchAccountModal() {
-  await WalletView.tapIdenticon();
-  await AccountListBottomSheet.tapEditAccountActionsAtIndex(0);
-  await SwitchAccountModal.tapSmartAccountLink();
-  await SwitchAccountModal.tapSwitchAccountButton();
-}
-
-async function goBackToWalletPage() {
-  await SwitchAccountModal.tapSmartAccountBackButton();
-  await AccountDetails.tapBackButton();
-  try {
-    await AccountListBottomSheet.dismissAccountListModalV2();
-  } catch (error) {
-    // Modal might already be dismissed, continue with test
-    console.log('Modal already dismissed or not found, continuing...');
-  }
-}
-
-async function connectTestDappToLocalhost() {
-  await navigateToBrowserView();
-  await BrowserView.navigateToTestDApp();
-}
-
-/**
- * The test cases have been partially commented out and skipped.
- * Click event on switch account toggle is not working in the e2e tests.
- * Once that is fixed, the test cases can be uncommented and unskipped.
- */
-describe(SmokeConfirmations('7702 - smart account'), () => {
-  const testSpecificMock = async (mockServer: Mockttp) => {
-    await setupMockRequest(mockServer, {
-      requestMethod: 'GET',
-      url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
-      response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
-      responseCode: 200,
-    });
-    await setupRemoteFeatureFlagsMock(
-      mockServer,
-      Object.assign({}, ...confirmationFeatureFlags),
-    );
-  };
-  beforeAll(async () => {
-    jest.setTimeout(2500000);
-  });
-
-  it('submit sendCalls, upgrade, downgrade account', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-          const node = localNodes?.[0] as unknown as AnvilManager;
-          const rpcPort =
-            node instanceof AnvilManager
-              ? (node.getPort() ?? AnvilPort())
-              : undefined;
-
-          return new FixtureBuilder()
-            .withNetworkController({
-              chainId: '0x539',
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: 'Local RPC',
-              ticker: 'ETH',
-            })
-            .withPermissionControllerConnectedToTestDapp(
-              buildPermissions(['0x539']),
-            )
-            .build();
-        },
-        restartDevice: true,
-        localNodeOptions: [
-          {
-            type: LocalNodeType.anvil,
-            options: localNodeOptions[0].options as AnvilNodeOptions,
-          },
-        ],
-        testSpecificMock,
-      },
-      async () => {
-        await loginToApp();
-
-        // Submit send calls
-        await changeNetworkFromNetworkListModal();
-        await connectTestDappToLocalhost();
-
-        await TestDApp.tapSendCallsButton();
-
-        // Check all expected elements are visible
-        await Assertions.expectTextDisplayed('Includes 2 transactions');
-        await Assertions.expectElementToBeVisible(
-          ConfirmationUITypes.ModalConfirmationContainer,
-        );
-        await checkConfirmationPage();
-        await Assertions.expectElementToBeVisible(
-          RowComponents.SimulationDetails,
-        );
-
-        // Accept confirmation
-        await FooterActions.tapConfirmButton();
-
-        // Wait for browser screen to be visible after confirmation modal dismisses
-        await Assertions.expectElementToBeVisible(BrowserView.browserScreenID, {
-          description:
-            'Browser screen should be visible after confirming transaction',
-        });
-
-        // Close browser to reveal app tab bar, then check activity
-        await BrowserView.tapCloseBrowserButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Smart contract interaction');
-
-        // // open switch account modal to downgrade account
-        // await TabBarComponent.tapWallet();
-        // await tapSwitchAccountModal();
-
-        // // Check all expected elements are visible
-        // await Assertions.expectTextDisplayed('Account update');
-        // await Assertions.expectTextDisplayed(
-        //   "You're switching back to a standard account (EOA).",
-        // );
-        // await Assertions.expectElementToBeVisible(
-        //   ConfirmationUITypes.ModalConfirmationContainer,
-        // );
-        // await checkConfirmationPage();
-
-        // // Accept confirmation
-        // await FooterActions.tapConfirmButton();
-
-        // await goBackToWalletPage();
-        // // Check activity tab
-        // await TabBarComponent.tapActivity();
-        // await Assertions.expectTextDisplayed('Switch to standard account');
-      },
-    );
-  });
-
-  it.skip('upgrades an account', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-          const node = localNodes?.[0] as unknown as AnvilManager;
-          const rpcPort =
-            node instanceof AnvilManager
-              ? (node.getPort() ?? AnvilPort())
-              : undefined;
-
-          return new FixtureBuilder()
-            .withNetworkController({
-              chainId: '0x539',
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: 'Local RPC',
-              ticker: 'ETH',
-            })
-            .build();
-        },
-        restartDevice: true,
-        localNodeOptions: [
-          {
-            type: LocalNodeType.anvil,
-            options: localNodeOptions[0].options as AnvilNodeOptions,
-          },
-        ],
-        testSpecificMock,
-      },
-      async () => {
-        await loginToApp();
-
-        // Create confirmation to upgrade account
-        await changeNetworkFromNetworkListModal();
-        await tapSwitchAccountModal();
-
-        // Check all expected elements are visible
-        await Assertions.expectTextDisplayed('Account update');
-        await Assertions.expectTextDisplayed(
-          "You're switching to a smart account.",
-        );
-        await Assertions.expectElementToBeVisible(
-          ConfirmationUITypes.ModalConfirmationContainer,
-        );
-        await checkConfirmationPage();
-
-        // Accept confirmation
-        await FooterActions.tapConfirmButton();
-
-        await goBackToWalletPage();
-        // Close browser to reveal app tab bar, then check activity
-        await BrowserView.tapCloseBrowserButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Upgrade to smart account');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/confirmations/transactions/contract-deployment.spec.ts b/tests/smoke/confirmations/transactions/contract-deployment.spec.ts
deleted file mode 100644
index 6b6e7ddb70b3..000000000000
--- a/tests/smoke/confirmations/transactions/contract-deployment.spec.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { SmokeConfirmations } from '../../../tags';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../flows/browser.flow';
-import Browser from '../../../page-objects/Browser/BrowserView';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
-import ConfirmationUITypes from '../../../page-objects/Browser/Confirmations/ConfirmationUITypes';
-import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions';
-import Assertions from '../../../framework/Assertions';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import {
-  buildPermissions,
-  AnvilPort,
-} from '../../../framework/fixtures/FixtureUtils';
-import RowComponents from '../../../page-objects/Browser/Confirmations/RowComponents';
-import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../api-mocking/mock-responses/simulations';
-import TestDApp from '../../../page-objects/Browser/TestDApp';
-import { DappVariants } from '../../../framework/Constants';
-import { Mockttp } from 'mockttp';
-import { setupMockRequest } from '../../../api-mocking/helpers/mockHelpers';
-import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { confirmationFeatureFlags } from '../../../api-mocking/mock-responses/feature-flags-mocks';
-import { LocalNode } from '../../../framework/types';
-import { AnvilManager } from '../../../seeder/anvil-manager';
-import { Gestures } from '../../../framework';
-
-describe(SmokeConfirmations('Contract Deployment'), () => {
-  const testSpecificMock = async (mockServer: Mockttp) => {
-    await setupMockRequest(mockServer, {
-      requestMethod: 'GET',
-      url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
-      response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
-      responseCode: 200,
-    });
-    await setupRemoteFeatureFlagsMock(
-      mockServer,
-      Object.assign({}, ...confirmationFeatureFlags),
-    );
-  };
-
-  beforeAll(async () => {
-    jest.setTimeout(2500000);
-  });
-
-  it('deploys a contract', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-          const node = localNodes?.[0] as unknown as AnvilManager;
-          const rpcPort =
-            node instanceof AnvilManager
-              ? (node.getPort() ?? AnvilPort())
-              : undefined;
-
-          return new FixtureBuilder()
-            .withNetworkController({
-              chainId: '0x539',
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: 'Local RPC',
-              ticker: 'ETH',
-            })
-            .withPermissionControllerConnectedToTestDapp(
-              buildPermissions(['0x539']),
-            )
-            .build();
-        },
-        restartDevice: true,
-        testSpecificMock,
-      },
-      async () => {
-        await loginToApp();
-
-        await navigateToBrowserView();
-        await Browser.navigateToTestDApp();
-        await TestDApp.tapDeployContractButton();
-
-        // Check all expected elements are visible
-        await Assertions.expectElementToBeVisible(
-          ConfirmationUITypes.ModalConfirmationContainer,
-        );
-
-        await Assertions.expectElementToBeVisible(RowComponents.AccountNetwork);
-
-        // Scroll to reveal GasFeesDetails on Android due to taller From/To row
-        if (device.getPlatform() === 'android') {
-          await Gestures.swipe(RowComponents.SimulationDetails, 'up');
-        }
-
-        await Assertions.expectElementToBeVisible(
-          RowComponents.SimulationDetails,
-        );
-        await Assertions.expectElementToBeVisible(RowComponents.GasFeesDetails);
-        await Assertions.expectElementToBeVisible(
-          RowComponents.AdvancedDetails,
-        );
-
-        // Accept confirmation
-        await FooterActions.tapConfirmButton();
-
-        // Wait for browser screen to be visible after confirmation modal dismisses
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID, {
-          description:
-            'Browser screen should be visible after confirming transaction',
-        });
-
-        // Close browser to reveal app tab bar, then check activity
-        await Browser.tapCloseBrowserButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Contract deployment');
-        await Assertions.expectTextDisplayed('Confirmed');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/confirmations/transactions/contract-interaction.spec.ts b/tests/smoke/confirmations/transactions/contract-interaction.spec.ts
deleted file mode 100644
index 146f3bd74c4d..000000000000
--- a/tests/smoke/confirmations/transactions/contract-interaction.spec.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import { SMART_CONTRACTS } from '../../../../app/util/test/smart-contracts';
-import { SmokeConfirmations } from '../../../tags';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../flows/browser.flow';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
-import ConfirmationUITypes from '../../../page-objects/Browser/Confirmations/ConfirmationUITypes';
-import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions';
-import Assertions from '../../../framework/Assertions';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import {
-  buildPermissions,
-  AnvilPort,
-} from '../../../framework/fixtures/FixtureUtils';
-import RowComponents from '../../../page-objects/Browser/Confirmations/RowComponents';
-import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../api-mocking/mock-responses/simulations';
-import TestDApp from '../../../page-objects/Browser/TestDApp';
-import { DappVariants } from '../../../framework/Constants';
-import { Mockttp } from 'mockttp';
-import { setupMockRequest } from '../../../api-mocking/helpers/mockHelpers';
-import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { confirmationFeatureFlags } from '../../../api-mocking/mock-responses/feature-flags-mocks';
-import { LocalNode } from '../../../framework/types';
-import { AnvilManager } from '../../../seeder/anvil-manager';
-import Browser from '../../../page-objects/Browser/BrowserView';
-
-describe(SmokeConfirmations('Contract Interaction'), () => {
-  const NFT_CONTRACT = SMART_CONTRACTS.NFTS;
-
-  const testSpecificMock = async (mockServer: Mockttp) => {
-    await setupMockRequest(mockServer, {
-      requestMethod: 'GET',
-      url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
-      response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
-      responseCode: 200,
-    });
-    await setupRemoteFeatureFlagsMock(
-      mockServer,
-      Object.assign({}, ...confirmationFeatureFlags),
-    );
-  };
-  beforeAll(async () => {
-    jest.setTimeout(2500000);
-  });
-
-  it('submits transaction', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-          const node = localNodes?.[0] as unknown as AnvilManager;
-          const rpcPort =
-            node instanceof AnvilManager
-              ? (node.getPort() ?? AnvilPort())
-              : undefined;
-
-          return new FixtureBuilder()
-            .withNetworkController({
-              chainId: '0x539',
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: 'Local RPC',
-              ticker: 'ETH',
-            })
-            .withPermissionControllerConnectedToTestDapp(
-              buildPermissions(['0x539']),
-            )
-            .build();
-        },
-        restartDevice: true,
-        testSpecificMock,
-        smartContracts: [NFT_CONTRACT],
-      },
-      async ({ contractRegistry }) => {
-        const nftsAddress =
-          await contractRegistry?.getContractAddress(NFT_CONTRACT);
-        await loginToApp();
-
-        // Navigate to the browser screen
-        await navigateToBrowserView();
-        await TestDApp.navigateToTestDappWithContract({
-          contractAddress: nftsAddress,
-        });
-
-        await TestDApp.tapERC721MintButton();
-
-        // Check all expected elements are visible
-        await Assertions.expectElementToBeVisible(
-          ConfirmationUITypes.ModalConfirmationContainer,
-        );
-
-        await Assertions.expectElementToBeVisible(RowComponents.AccountNetwork);
-        await Assertions.expectElementToBeVisible(
-          RowComponents.SimulationDetails,
-        );
-        await Assertions.expectElementToBeVisible(
-          RowComponents.NetworkAndOrigin,
-        );
-        await Assertions.expectElementToBeVisible(RowComponents.GasFeesDetails);
-        await Assertions.expectElementToBeVisible(
-          RowComponents.AdvancedDetails,
-        );
-
-        // Accept confirmation
-        await FooterActions.tapConfirmButton();
-
-        // Wait for browser screen to be visible after confirmation modal dismisses
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID, {
-          description:
-            'Browser screen should be visible after confirming transaction',
-        });
-
-        // Close browser to reveal app tab bar, then check activity
-        await Browser.tapCloseBrowserButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Confirmed');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/confirmations/transactions/dapp-initiated-transfer.spec.ts b/tests/smoke/confirmations/transactions/dapp-initiated-transfer.spec.ts
deleted file mode 100644
index 52c52d1fe237..000000000000
--- a/tests/smoke/confirmations/transactions/dapp-initiated-transfer.spec.ts
+++ /dev/null
@@ -1,191 +0,0 @@
-import { SmokeConfirmations } from '../../../tags';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../flows/browser.flow';
-import Browser from '../../../page-objects/Browser/BrowserView';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
-import ConfirmationUITypes from '../../../page-objects/Browser/Confirmations/ConfirmationUITypes';
-import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions';
-import Assertions from '../../../framework/Assertions';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import { buildPermissions } from '../../../framework/fixtures/FixtureUtils';
-import RowComponents from '../../../page-objects/Browser/Confirmations/RowComponents';
-import {
-  SEND_ETH_SIMULATION_MOCK,
-  SIMULATION_ENABLED_NETWORKS_MOCK,
-} from '../../../api-mocking/mock-responses/simulations';
-import TestDApp from '../../../page-objects/Browser/TestDApp';
-import { DappVariants } from '../../../framework/Constants';
-import { Mockttp } from 'mockttp';
-import {
-  setupMockRequest,
-  setupMockPostRequest,
-} from '../../../api-mocking/helpers/mockHelpers';
-import Gestures from '../../../framework/Gestures';
-import {
-  SECURITY_ALERTS_BENIGN_RESPONSE,
-  SECURITY_ALERTS_REQUEST_BODY,
-  securityAlertsUrl,
-} from '../../../api-mocking/mock-responses/security-alerts-mock';
-import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { confirmationFeatureFlags } from '../../../api-mocking/mock-responses/feature-flags-mocks';
-import { DEFAULT_ANVIL_PORT } from '../../../seeder/anvil-manager';
-import { dappInitiatedTransferAnalyticsExpectations } from '../../../helpers/analytics/expectations/dapp-initiated-transfer.analytics';
-
-describe(SmokeConfirmations('DApp Initiated Transfer'), () => {
-  const testSpecificMock = async (mockServer: Mockttp) => {
-    await setupMockPostRequest(
-      mockServer,
-      securityAlertsUrl('0x539'),
-      SECURITY_ALERTS_REQUEST_BODY,
-      SECURITY_ALERTS_BENIGN_RESPONSE,
-      {
-        statusCode: 201,
-        ignoreFields: [
-          'networkClientId',
-          'id',
-          'toNative',
-          'origin',
-          'params[0].to',
-          'params[0].gas',
-          'params[0].gasPrice',
-        ],
-      },
-    );
-
-    await setupMockRequest(mockServer, {
-      requestMethod: 'GET',
-      url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
-      response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
-      responseCode: 200,
-    });
-
-    const {
-      urlEndpoint: simulationEndpoint,
-      requestBody,
-      response: simulationResponse,
-      ignoreFields,
-    } = SEND_ETH_SIMULATION_MOCK;
-
-    await setupMockPostRequest(
-      mockServer,
-      simulationEndpoint,
-      requestBody,
-      simulationResponse,
-      {
-        statusCode: 200,
-        ignoreFields,
-      },
-    );
-    await setupRemoteFeatureFlagsMock(
-      mockServer,
-      Object.assign({}, ...confirmationFeatureFlags),
-    );
-  };
-
-  beforeAll(async () => {
-    jest.setTimeout(2500000);
-  });
-
-  it('sends native asset and validates MetaMetrics transaction events', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withNetworkController({
-            chainId: '0x539',
-            rpcUrl: `http://localhost:${DEFAULT_ANVIL_PORT}`,
-            type: 'custom',
-            nickname: 'Local RPC',
-            ticker: 'ETH',
-          })
-          .withNetworkEnabledMap({
-            eip155: { '0x539': true },
-          })
-          .withMetaMetricsOptIn()
-          .withPermissionControllerConnectedToTestDapp(
-            buildPermissions(['0x539']),
-          )
-          .build(),
-        restartDevice: true,
-        testSpecificMock,
-        analyticsExpectations: dappInitiatedTransferAnalyticsExpectations,
-      },
-      async () => {
-        await loginToApp();
-
-        await navigateToBrowserView();
-        await Browser.navigateToTestDApp();
-        await Assertions.expectElementToBeVisible(TestDApp.testDappPageTitle, {
-          description: 'Test dapp page title should be visible',
-        });
-        await Assertions.expectElementToBeVisible(TestDApp.sendEIP1559Button, {
-          description: 'Send EIP1559 button should be visible',
-        });
-        await TestDApp.tapSendEIP1559Button();
-
-        await Assertions.expectElementToBeVisible(
-          ConfirmationUITypes.ModalConfirmationContainer,
-          {
-            description: 'Transaction confirmation modal should be visible',
-          },
-        );
-        await Assertions.expectElementToBeVisible(RowComponents.TokenHero, {
-          description: 'Token hero row should be visible',
-        });
-        await Assertions.expectTextDisplayed('0 ETH');
-        await Assertions.expectElementToBeVisible(RowComponents.FromTo);
-        await Assertions.expectElementToBeVisible(
-          RowComponents.SimulationDetails,
-        );
-
-        if (device.getPlatform() === 'android') {
-          await Gestures.swipe(RowComponents.SimulationDetails, 'up');
-        }
-
-        await Assertions.expectElementToBeVisible(RowComponents.GasFeesDetails);
-
-        if (device.getPlatform() === 'android') {
-          await Gestures.swipe(
-            ConfirmationUITypes.ModalConfirmationContainer,
-            'up',
-            {
-              elemDescription: 'Scroll transaction confirmation content',
-            },
-          );
-        }
-
-        await Assertions.expectElementToBeVisible(
-          RowComponents.SimulationDetails,
-          {
-            description: 'Simulation details row should be visible',
-            timeout: 30000,
-          },
-        );
-        await Assertions.expectElementToBeVisible(
-          RowComponents.GasFeesDetails,
-          {
-            description: 'Gas fees details row should be visible',
-            timeout: 30000,
-          },
-        );
-        await Assertions.expectElementToBeVisible(
-          RowComponents.AdvancedDetails,
-          {
-            description: 'Advanced details row should be visible',
-          },
-        );
-
-        await FooterActions.tapConfirmButton();
-
-        await Browser.tapCloseBrowserButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Confirmed');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/confirmations/transactions/per-dapp-selected-network.spec.ts b/tests/smoke/confirmations/transactions/per-dapp-selected-network.spec.ts
deleted file mode 100644
index d458bafd955d..000000000000
--- a/tests/smoke/confirmations/transactions/per-dapp-selected-network.spec.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import {
-  buildPermissions,
-  AnvilPort,
-} from '../../../framework/fixtures/FixtureUtils';
-import Browser from '../../../page-objects/Browser/BrowserView';
-import ConfirmationFooterActions from '../../../page-objects/Browser/Confirmations/FooterActions';
-import ConfirmationUITypes from '../../../page-objects/Browser/Confirmations/ConfirmationUITypes';
-import TestDApp from '../../../page-objects/Browser/TestDApp';
-import NetworkListModal from '../../../page-objects/Network/NetworkListModal';
-import NetworkManager from '../../../page-objects/wallet/NetworkManager';
-import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
-import { SmokeConfirmations } from '../../../tags.js';
-import Assertions from '../../../framework/Assertions';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../flows/browser.flow';
-import { DappVariants } from '../../../framework/Constants';
-import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { confirmationFeatureFlags } from '../../../api-mocking/mock-responses/feature-flags-mocks';
-import { Mockttp } from 'mockttp';
-import { LocalNode } from '../../../framework/types';
-import { AnvilManager } from '../../../seeder/anvil-manager';
-import WalletView from '../../../page-objects/wallet/WalletView';
-
-const LOCAL_CHAIN_ID = '0x539';
-const LOCAL_CHAIN_NAME = 'Localhost';
-
-async function changeNetworkFromNetworkListModal(networkName: string) {
-  await TabBarComponent.tapWallet();
-  await NetworkManager.navigateToTokensFullView();
-  await NetworkManager.openNetworkManager();
-  await NetworkListModal.changeNetworkTo(networkName);
-  await NetworkManager.navigateBackFromTokensFullView();
-}
-
-describe.skip(SmokeConfirmations('Dapp Network Switching'), () => {
-  const testSpecificMock = async (mockServer: Mockttp) => {
-    await setupRemoteFeatureFlagsMock(
-      mockServer,
-      Object.assign({}, ...confirmationFeatureFlags),
-    );
-  };
-
-  beforeAll(async () => {
-    jest.setTimeout(15000);
-  });
-
-  it('submits a transaction to a dapp-specific selected network', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-          const node = localNodes?.[0] as unknown as AnvilManager;
-          const rpcPort =
-            node instanceof AnvilManager
-              ? (node.getPort() ?? AnvilPort())
-              : undefined;
-
-          return new FixtureBuilder()
-            .withNetworkController({
-              chainId: LOCAL_CHAIN_ID,
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: LOCAL_CHAIN_NAME,
-              ticker: 'ETH',
-            })
-            .withPermissionControllerConnectedToTestDapp(
-              buildPermissions([LOCAL_CHAIN_ID]),
-            )
-            .build();
-        },
-        restartDevice: true,
-        testSpecificMock,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await Browser.navigateToTestDApp();
-
-        // Make sure the dapp is connected to the predefined network in configuration (LOCAL_CHAIN_ID)
-        // by checking chainId text in the test dapp
-        await TestDApp.verifyCurrentNetworkText('Chain id ' + LOCAL_CHAIN_ID);
-
-        // Close browser to reveal app tab bar before changing network
-        await Browser.tapCloseBrowserButton();
-
-        // Wait for browser screen to disappear and tab bar to be visible
-        await Assertions.expectElementToBeVisible(
-          TabBarComponent.tabBarWalletButton,
-          {
-            description: 'Tab bar should be visible after closing browser',
-          },
-        );
-
-        // Change the network to Ethereum Main Network in app
-        await changeNetworkFromNetworkListModal('Ethereum Main Network');
-
-        await navigateToBrowserView();
-        // Assert the dapp is still connected the previously selected network (LOCAL_CHAIN_ID)
-        await TestDApp.verifyCurrentNetworkText('Chain id ' + LOCAL_CHAIN_ID);
-
-        // Now do a transaction
-        await TestDApp.tapSendEIP1559Button();
-
-        // Wait for the confirmation modal to appear
-        await Assertions.expectElementToBeVisible(
-          ConfirmationUITypes.ModalConfirmationContainer,
-        );
-
-        // Assert the transaction is happening on the correct network
-        await Assertions.expectTextDisplayed(LOCAL_CHAIN_NAME);
-
-        // Accept confirmation
-        await ConfirmationFooterActions.tapConfirmButton();
-
-        // Wait for browser screen to be visible after confirmation modal dismisses
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID, {
-          description:
-            'Browser screen should be visible after confirming transaction',
-        });
-
-        // Close browser to reveal app tab bar before changing network
-        await Browser.tapCloseBrowserButton();
-
-        // Wait for browser screen to disappear and tab bar to be visible
-        await Assertions.expectElementToBeVisible(
-          TabBarComponent.tabBarWalletButton,
-          {
-            description: 'Tab bar should be visible after closing browser',
-          },
-        );
-
-        // Change the network to Localhost in app (custom network)
-        await TabBarComponent.tapWallet();
-        await NetworkManager.navigateToTokensFullView();
-        await NetworkManager.openNetworkManager();
-        await NetworkListModal.tapOnCustomTab();
-        await NetworkListModal.selectNetworkInCustomTab(LOCAL_CHAIN_NAME);
-
-        await NetworkManager.navigateBackFromTokensFullView();
-
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Confirmed');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/confirmations/transactions/token-approve/approve.spec.ts b/tests/smoke/confirmations/transactions/token-approve/approve.spec.ts
deleted file mode 100644
index c23efe09c107..000000000000
--- a/tests/smoke/confirmations/transactions/token-approve/approve.spec.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-import { SMART_CONTRACTS } from '../../../../../app/util/test/smart-contracts';
-import { SmokeConfirmations } from '../../../../tags';
-import { loginToApp } from '../../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../../flows/browser.flow';
-import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder';
-import TabBarComponent from '../../../../page-objects/wallet/TabBarComponent';
-import Browser from '../../../../page-objects/Browser/BrowserView';
-import ConfirmationUITypes from '../../../../page-objects/Browser/Confirmations/ConfirmationUITypes';
-import FooterActions from '../../../../page-objects/Browser/Confirmations/FooterActions';
-import Assertions from '../../../../framework/Assertions';
-import { withFixtures } from '../../../../framework/fixtures/FixtureHelper';
-import {
-  buildPermissions,
-  AnvilPort,
-} from '../../../../framework/fixtures/FixtureUtils';
-import RowComponents from '../../../../page-objects/Browser/Confirmations/RowComponents';
-import TokenApproveConfirmation from '../../../../page-objects/Confirmation/TokenApproveConfirmation';
-import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../../api-mocking/mock-responses/simulations';
-import TestDApp from '../../../../page-objects/Browser/TestDApp';
-import { DappVariants } from '../../../../framework/Constants';
-import { setupMockRequest } from '../../../../api-mocking/helpers/mockHelpers';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { confirmationFeatureFlags } from '../../../../api-mocking/mock-responses/feature-flags-mocks';
-import { LocalNode } from '../../../../framework/types';
-import { AnvilManager } from '../../../../seeder/anvil-manager';
-
-describe(SmokeConfirmations('Token Approve - approve method'), () => {
-  const ERC_20_CONTRACT = SMART_CONTRACTS.HST;
-  const ERC_721_CONTRACT = SMART_CONTRACTS.NFTS;
-
-  const testSpecificMock = async (mockServer: Mockttp) => {
-    await setupMockRequest(mockServer, {
-      requestMethod: 'GET',
-      url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
-      response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
-      responseCode: 200,
-    });
-    await setupRemoteFeatureFlagsMock(
-      mockServer,
-      Object.assign({}, ...confirmationFeatureFlags),
-    );
-  };
-
-  it('creates an approve transaction confirmation for given ERC 20, changes the spending cap and submits it', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-          const node = localNodes?.[0] as unknown as AnvilManager;
-          const rpcPort =
-            node instanceof AnvilManager
-              ? (node.getPort() ?? AnvilPort())
-              : undefined;
-
-          return new FixtureBuilder()
-            .withNetworkController({
-              chainId: '0x539',
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: 'Local RPC',
-              ticker: 'ETH',
-            })
-            .withPermissionControllerConnectedToTestDapp(
-              buildPermissions(['0x539']),
-            )
-            .build();
-        },
-        restartDevice: true,
-        testSpecificMock,
-        smartContracts: [ERC_20_CONTRACT],
-      },
-      async ({ contractRegistry }) => {
-        const erc20Address =
-          await contractRegistry?.getContractAddress(ERC_20_CONTRACT);
-
-        await loginToApp();
-
-        await navigateToBrowserView();
-        await TestDApp.navigateToTestDappWithContract({
-          contractAddress: erc20Address,
-        });
-
-        await TestDApp.tapApproveERC20TokensButton();
-
-        // Check confirmation modal is visible
-        await Assertions.expectElementToBeVisible(
-          ConfirmationUITypes.ModalConfirmationContainer,
-        );
-
-        // Check all expected row components are visible
-        await Assertions.expectElementToBeVisible(RowComponents.AccountNetwork);
-        await Assertions.expectElementToBeVisible(RowComponents.ApproveRow);
-        await Assertions.expectElementToBeVisible(
-          RowComponents.NetworkAndOrigin,
-        );
-        await Assertions.expectElementToBeVisible(RowComponents.GasFeesDetails);
-        await Assertions.expectElementToBeVisible(
-          RowComponents.AdvancedDetails,
-        );
-
-        // Check spending cap is visible and has the correct value
-        await Assertions.expectElementToHaveText(
-          TokenApproveConfirmation.SpendingCapValue,
-          '7',
-        );
-
-        // Change the spending cap to 10 and save it
-        await TokenApproveConfirmation.tapEditSpendingCapButton();
-        await TokenApproveConfirmation.inputSpendingCap('10');
-        await TokenApproveConfirmation.tapEditSpendingCapSaveButton();
-        await Assertions.expectElementToHaveText(
-          TokenApproveConfirmation.SpendingCapValue,
-          '10',
-        );
-
-        // Accept confirmation
-        await FooterActions.tapConfirmButton();
-
-        // Wait for browser screen to be visible after confirmation modal dismisses
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID, {
-          description:
-            'Browser screen should be visible after confirming transaction',
-        });
-
-        // Close browser to reveal app tab bar, then check activity
-        await Browser.tapCloseBrowserButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Approve');
-        await Assertions.expectTextDisplayed('Confirmed');
-      },
-    );
-  });
-
-  it('creates an approve transaction confirmation for ERC 721 and submits it', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-          const node = localNodes?.[0] as unknown as AnvilManager;
-          const rpcPort =
-            node instanceof AnvilManager
-              ? (node.getPort() ?? AnvilPort())
-              : undefined;
-
-          return new FixtureBuilder()
-            .withNetworkController({
-              chainId: '0x539',
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: 'Local RPC',
-              ticker: 'ETH',
-            })
-            .withPermissionControllerConnectedToTestDapp(
-              buildPermissions(['0x539']),
-            )
-            .build();
-        },
-        restartDevice: true,
-        testSpecificMock,
-        smartContracts: [ERC_721_CONTRACT],
-      },
-      async ({ contractRegistry }) => {
-        const erc721Address =
-          await contractRegistry?.getContractAddress(ERC_721_CONTRACT);
-
-        await loginToApp();
-
-        await navigateToBrowserView();
-        await TestDApp.navigateToTestDappWithContract({
-          contractAddress: erc721Address,
-        });
-
-        await TestDApp.tapApproveERC721TokenButton();
-
-        // Check confirmation modal is visible
-        await Assertions.expectElementToBeVisible(
-          ConfirmationUITypes.ModalConfirmationContainer,
-        );
-
-        // Check spending cap is visible and has the correct value
-        // #1 means the token id for ERC 721
-        await Assertions.expectElementToHaveText(
-          TokenApproveConfirmation.SpendingCapValue,
-          '#1',
-        );
-
-        // Accept confirmation
-        await FooterActions.tapConfirmButton();
-
-        // Wait for browser screen to be visible after confirmation modal dismisses
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID, {
-          description:
-            'Browser screen should be visible after confirming transaction',
-        });
-
-        // Close browser to reveal app tab bar, then check activity
-        await Browser.tapCloseBrowserButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Approve');
-        await Assertions.expectTextDisplayed('Confirmed');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/confirmations/transactions/token-approve/increase-allowance.spec.ts b/tests/smoke/confirmations/transactions/token-approve/increase-allowance.spec.ts
deleted file mode 100644
index 3058906a8142..000000000000
--- a/tests/smoke/confirmations/transactions/token-approve/increase-allowance.spec.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { SMART_CONTRACTS } from '../../../../../app/util/test/smart-contracts';
-import { SmokeConfirmations } from '../../../../tags';
-import { loginToApp } from '../../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../../flows/browser.flow';
-import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder';
-import TabBarComponent from '../../../../page-objects/wallet/TabBarComponent';
-import Browser from '../../../../page-objects/Browser/BrowserView';
-import ConfirmationUITypes from '../../../../page-objects/Browser/Confirmations/ConfirmationUITypes';
-import FooterActions from '../../../../page-objects/Browser/Confirmations/FooterActions';
-import Assertions from '../../../../framework/Assertions';
-import { withFixtures } from '../../../../framework/fixtures/FixtureHelper';
-import {
-  AnvilPort,
-  buildPermissions,
-} from '../../../../framework/fixtures/FixtureUtils';
-import RowComponents from '../../../../page-objects/Browser/Confirmations/RowComponents';
-import TokenApproveConfirmation from '../../../../page-objects/Confirmation/TokenApproveConfirmation';
-import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../../api-mocking/mock-responses/simulations';
-import TestDApp from '../../../../page-objects/Browser/TestDApp';
-import { DappVariants } from '../../../../framework/Constants';
-import { Mockttp } from 'mockttp';
-import { setupMockRequest } from '../../../../api-mocking/helpers/mockHelpers';
-import { confirmationFeatureFlags } from '../../../../api-mocking/mock-responses/feature-flags-mocks';
-import { setupRemoteFeatureFlagsMock } from '../../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { LocalNode } from '../../../../framework/types';
-import { AnvilManager } from '../../../../seeder/anvil-manager';
-
-describe(SmokeConfirmations('Token Approve - increaseAllowance method'), () => {
-  const ERC_20_CONTRACT = SMART_CONTRACTS.HST;
-
-  const testSpecificMock = async (mockServer: Mockttp) => {
-    await setupMockRequest(mockServer, {
-      requestMethod: 'GET',
-      url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
-      response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
-      responseCode: 200,
-    });
-    await setupRemoteFeatureFlagsMock(
-      mockServer,
-      Object.assign({}, ...confirmationFeatureFlags),
-    );
-  };
-
-  it('creates an approve transaction confirmation for given ERC 20, changes the spending cap and submits it', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-          const node = localNodes?.[0] as unknown as AnvilManager;
-          const rpcPort =
-            node instanceof AnvilManager
-              ? (node.getPort() ?? AnvilPort())
-              : undefined;
-
-          return new FixtureBuilder()
-            .withNetworkController({
-              chainId: '0x539',
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: 'Local RPC',
-              ticker: 'ETH',
-            })
-            .withPermissionControllerConnectedToTestDapp(
-              buildPermissions(['0x539']),
-            )
-            .build();
-        },
-        restartDevice: true,
-        testSpecificMock,
-        smartContracts: [ERC_20_CONTRACT],
-      },
-      async ({ contractRegistry }) => {
-        const erc20Address =
-          await contractRegistry?.getContractAddress(ERC_20_CONTRACT);
-
-        await loginToApp();
-
-        await navigateToBrowserView();
-        await TestDApp.navigateToTestDappWithContract({
-          contractAddress: erc20Address,
-        });
-
-        await TestDApp.tapIncreaseAllowanceButton();
-
-        // Check confirmation modal is visible
-        await Assertions.expectElementToBeVisible(
-          ConfirmationUITypes.ModalConfirmationContainer,
-        );
-
-        // Check all expected row components are visible
-        await Assertions.expectElementToBeVisible(RowComponents.AccountNetwork);
-        await Assertions.expectElementToBeVisible(RowComponents.ApproveRow);
-        await Assertions.expectElementToBeVisible(
-          RowComponents.NetworkAndOrigin,
-        );
-        await Assertions.expectElementToBeVisible(RowComponents.GasFeesDetails);
-        await Assertions.expectElementToBeVisible(
-          RowComponents.AdvancedDetails,
-        );
-
-        // Check spending cap is visible and has the correct value
-        await Assertions.expectElementToHaveText(
-          TokenApproveConfirmation.SpendingCapValue,
-          '1',
-        );
-
-        // Change the spending cap to 10 and save it
-        await TokenApproveConfirmation.tapEditSpendingCapButton();
-        await TokenApproveConfirmation.inputSpendingCap('5');
-        await TokenApproveConfirmation.tapEditSpendingCapSaveButton();
-        await Assertions.expectElementToHaveText(
-          TokenApproveConfirmation.SpendingCapValue,
-          '5',
-        );
-
-        // Accept confirmation
-        await FooterActions.tapConfirmButton();
-
-        // Wait for browser screen to be visible after confirmation modal dismisses
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID, {
-          description:
-            'Browser screen should be visible after confirming transaction',
-        });
-
-        // Close browser to reveal app tab bar, then check activity
-        await Browser.tapCloseBrowserButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Increase allowance');
-        await Assertions.expectTextDisplayed('Confirmed');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/confirmations/transactions/token-approve/set-approval-for-all.spec.ts b/tests/smoke/confirmations/transactions/token-approve/set-approval-for-all.spec.ts
deleted file mode 100644
index 73fe3e1d659f..000000000000
--- a/tests/smoke/confirmations/transactions/token-approve/set-approval-for-all.spec.ts
+++ /dev/null
@@ -1,295 +0,0 @@
-import { SMART_CONTRACTS } from '../../../../../app/util/test/smart-contracts';
-import { SmokeConfirmations } from '../../../../tags';
-import { loginToApp } from '../../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../../flows/browser.flow';
-import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder';
-import TabBarComponent from '../../../../page-objects/wallet/TabBarComponent';
-import Browser from '../../../../page-objects/Browser/BrowserView';
-import ConfirmationUITypes from '../../../../page-objects/Browser/Confirmations/ConfirmationUITypes';
-import FooterActions from '../../../../page-objects/Browser/Confirmations/FooterActions';
-import Assertions from '../../../../framework/Assertions';
-import { withFixtures } from '../../../../framework/fixtures/FixtureHelper';
-import {
-  AnvilPort,
-  buildPermissions,
-} from '../../../../framework/fixtures/FixtureUtils';
-import RowComponents from '../../../../page-objects/Browser/Confirmations/RowComponents';
-import TokenApproveConfirmation from '../../../../page-objects/Confirmation/TokenApproveConfirmation';
-import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../../api-mocking/mock-responses/simulations';
-import TestDApp from '../../../../page-objects/Browser/TestDApp';
-import { DappVariants } from '../../../../framework/Constants';
-import { setupMockRequest } from '../../../../api-mocking/helpers/mockHelpers';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { confirmationFeatureFlags } from '../../../../api-mocking/mock-responses/feature-flags-mocks';
-import { LocalNode } from '../../../../framework/types';
-import { AnvilManager } from '../../../../seeder/anvil-manager';
-
-describe(SmokeConfirmations('Token Approve - setApprovalForAll method'), () => {
-  const ERC_721_CONTRACT = SMART_CONTRACTS.NFTS;
-  const ERC_1155_CONTRACT = SMART_CONTRACTS.ERC1155;
-
-  const testSpecificMock = async (mockServer: Mockttp) => {
-    await setupMockRequest(mockServer, {
-      requestMethod: 'GET',
-      url: SIMULATION_ENABLED_NETWORKS_MOCK.urlEndpoint,
-      response: SIMULATION_ENABLED_NETWORKS_MOCK.response,
-      responseCode: 200,
-    });
-    await setupRemoteFeatureFlagsMock(
-      mockServer,
-      Object.assign({}, ...confirmationFeatureFlags),
-    );
-  };
-
-  it('creates an approve transaction confirmation for given ERC721 and submits it', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-          const node = localNodes?.[0] as unknown as AnvilManager;
-          const rpcPort =
-            node instanceof AnvilManager
-              ? (node.getPort() ?? AnvilPort())
-              : undefined;
-
-          return new FixtureBuilder()
-            .withNetworkController({
-              chainId: '0x539',
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: 'Local RPC',
-              ticker: 'ETH',
-            })
-            .withPermissionControllerConnectedToTestDapp(
-              buildPermissions(['0x539']),
-            )
-            .build();
-        },
-        restartDevice: true,
-        testSpecificMock,
-        smartContracts: [ERC_721_CONTRACT],
-      },
-      async ({ contractRegistry }) => {
-        const erc721Address =
-          await contractRegistry?.getContractAddress(ERC_721_CONTRACT);
-
-        await loginToApp();
-
-        await navigateToBrowserView();
-        await TestDApp.navigateToTestDappWithContract({
-          contractAddress: erc721Address,
-        });
-
-        await TestDApp.tapNFTSetApprovalForAllButton();
-
-        // Check confirmation modal is visible
-        await Assertions.expectElementToBeVisible(
-          ConfirmationUITypes.ModalConfirmationContainer,
-        );
-
-        // Check all expected row components are visible
-        await Assertions.expectElementToBeVisible(
-          RowComponents.AccountNetwork,
-          {
-            description: 'Account Network',
-          },
-        );
-        await Assertions.expectElementToBeVisible(RowComponents.ApproveRow, {
-          description: 'Approve Row',
-        });
-        await Assertions.expectElementToBeVisible(
-          RowComponents.NetworkAndOrigin,
-          {
-            description: 'Network And Origin',
-          },
-        );
-        await Assertions.expectElementToBeVisible(
-          RowComponents.GasFeesDetails,
-          {
-            description: 'Gas Fees Details',
-          },
-        );
-        await Assertions.expectElementToBeVisible(
-          RowComponents.AdvancedDetails,
-          {
-            description: 'Advanced Details',
-          },
-        );
-
-        // Check spending cap is visible and has the correct value
-        await Assertions.expectElementToHaveText(
-          TokenApproveConfirmation.SpendingCapValue,
-          'All',
-          {
-            description: 'Spending Cap Value',
-          },
-        );
-
-        // Accept confirmation
-        await FooterActions.tapConfirmButton();
-
-        // Wait for browser screen to be visible after confirmation modal dismisses
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID, {
-          description:
-            'Browser screen should be visible after confirming transaction',
-        });
-
-        // Close browser to reveal app tab bar, then check activity
-        await Browser.tapCloseBrowserButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Set approval for all');
-        await Assertions.expectTextDisplayed('Confirmed');
-      },
-    );
-  });
-
-  it('creates an approve transaction confirmation for given ERC1155 and submits it', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-          const node = localNodes?.[0] as unknown as AnvilManager;
-          const rpcPort =
-            node instanceof AnvilManager
-              ? (node.getPort() ?? AnvilPort())
-              : undefined;
-
-          return new FixtureBuilder()
-            .withNetworkController({
-              chainId: '0x539',
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: 'Local RPC',
-              ticker: 'ETH',
-            })
-            .withPermissionControllerConnectedToTestDapp(
-              buildPermissions(['0x539']),
-            )
-            .build();
-        },
-        restartDevice: true,
-        testSpecificMock,
-        smartContracts: [ERC_1155_CONTRACT],
-      },
-      async ({ contractRegistry }) => {
-        const erc1155Address =
-          await contractRegistry?.getContractAddress(ERC_1155_CONTRACT);
-
-        await loginToApp();
-
-        await navigateToBrowserView();
-        await TestDApp.navigateToTestDappWithContract({
-          contractAddress: erc1155Address,
-        });
-
-        await TestDApp.tapERC1155SetApprovalForAllButton();
-
-        // Check confirmation modal is visible
-        await Assertions.expectElementToBeVisible(
-          ConfirmationUITypes.ModalConfirmationContainer,
-        );
-
-        // Check spending cap is visible and has the correct value
-        await Assertions.expectElementToHaveText(
-          TokenApproveConfirmation.SpendingCapValue,
-          'All',
-        );
-
-        // Accept confirmation
-        await FooterActions.tapConfirmButton();
-
-        // Wait for browser screen to be visible after confirmation modal dismisses
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID, {
-          description:
-            'Browser screen should be visible after confirming transaction',
-        });
-
-        // Close browser to reveal app tab bar, then check activity
-        await Browser.tapCloseBrowserButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Set approval for all');
-        await Assertions.expectTextDisplayed('Confirmed');
-      },
-    );
-  });
-
-  describe('revoke mode', () => {
-    it('creates an approve transaction confirmation for ERC 721 and submits it', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.TEST_DAPP,
-            },
-          ],
-          fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-            const node = localNodes?.[0] as unknown as AnvilManager;
-            const rpcPort =
-              node instanceof AnvilManager
-                ? (node.getPort() ?? AnvilPort())
-                : undefined;
-
-            return new FixtureBuilder()
-              .withNetworkController({
-                chainId: '0x539',
-                rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-                type: 'custom',
-                nickname: 'Local RPC',
-                ticker: 'ETH',
-              })
-              .withPermissionControllerConnectedToTestDapp(
-                buildPermissions(['0x539']),
-              )
-              .build();
-          },
-          restartDevice: true,
-          testSpecificMock,
-          smartContracts: [ERC_721_CONTRACT],
-        },
-        async ({ contractRegistry }) => {
-          const erc721Address =
-            await contractRegistry?.getContractAddress(ERC_721_CONTRACT);
-
-          await loginToApp();
-
-          await navigateToBrowserView();
-          await TestDApp.navigateToTestDappWithContract({
-            contractAddress: erc721Address,
-          });
-
-          await TestDApp.tapERC721RevokeApprovalButton();
-
-          // Check confirmation modal is visible
-          await Assertions.expectElementToBeVisible(
-            ConfirmationUITypes.ModalConfirmationContainer,
-          );
-
-          // Check spending cap is visible and has the correct value
-          // All means, all token permissions revoked
-          await Assertions.expectElementToHaveText(
-            TokenApproveConfirmation.SpendingCapValue,
-            'All',
-          );
-
-          // Accept confirmation
-          await FooterActions.tapConfirmButton();
-
-          // Close browser to reveal app tab bar, then check activity
-          await Browser.tapCloseBrowserButton();
-          await TabBarComponent.tapActivity();
-          await Assertions.expectTextDisplayed('Set approval for all');
-          await Assertions.expectTextDisplayed('Confirmed');
-        },
-      );
-    });
-  });
-});
diff --git a/tests/smoke/confirmations/transactions/transaction-pay.spec.ts b/tests/smoke/confirmations/transactions/transaction-pay.spec.ts
deleted file mode 100644
index e92fd0ccb28e..000000000000
--- a/tests/smoke/confirmations/transactions/transaction-pay.spec.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { SmokeConfirmations } from '../../../tags';
-import { loginToApp } from '../../../flows/wallet.flow';
-import {
-  remoteFeatureEip7702,
-  remoteFeatureFlagPredictEnabled,
-} from '../../../api-mocking/mock-responses/feature-flags-mocks';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { POLYMARKET_COMPLETE_MOCKS } from '../../../api-mocking/mock-responses/polymarket/polymarket-mocks';
-import PredictAddFunds from '../../../page-objects/Predict/PredictAddFunds';
-import {
-  mockRelayQuote,
-  mockRelayStatus,
-} from '../../../api-mocking/mock-responses/transaction-pay';
-import { CHAIN_IDS } from '@metamask/transaction-controller';
-import TransactionPayConfirmation from '../../../page-objects/Confirmation/TransactionPayConfirmation';
-import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions';
-import { Gestures } from '../../../framework';
-import TransactionDetailsModal from '../../../page-objects/Transactions/TransactionDetailsModal';
-import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
-import WalletActionsBottomSheet from '../../../page-objects/wallet/WalletActionsBottomSheet';
-import ActivitiesView from '../../../page-objects/Transactions/ActivitiesView';
-import PredictMarketList from '../../../page-objects/Predict/PredictMarketList';
-
-describe(SmokeConfirmations('Transaction Pay'), () => {
-  // TODO: Re-enable once Predict deposit activity is stable again after the
-  // CLOB v2 migration work.
-  // eslint-disable-next-line jest/no-disabled-tests -- temporarily disabling a flaky Predict deposit activity assertion
-  it.skip('deposits to predict balance', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder()
-          .withPolygon()
-          .withTokens(
-            [
-              {
-                address: '0x2791bca1f2de4661ed88a30c99a7a9449aa84174',
-                decimals: 6,
-                name: 'USD Coin (PoS)',
-                symbol: 'USDC.e',
-              },
-            ],
-            CHAIN_IDS.POLYGON,
-          )
-          .build(),
-        restartDevice: true,
-        testSpecificMock,
-      },
-      async () => {
-        await loginToApp();
-
-        await TabBarComponent.tapActions();
-        await device.disableSynchronization();
-        await WalletActionsBottomSheet.tapPredictButton();
-        await PredictAddFunds.tapAddFunds();
-
-        await TransactionPayConfirmation.tapPayWithRow();
-        await TransactionPayConfirmation.tapPayWithToken('LineaETH');
-        await TransactionPayConfirmation.tapKeyboardAmount('1.23');
-        await TransactionPayConfirmation.tapKeyboardContinueButton();
-        await TransactionPayConfirmation.verifyTransactionFee('$4.17');
-        await TransactionPayConfirmation.verifyBridgeTime('< 1 min');
-        await TransactionPayConfirmation.verifyTotal('$5.40');
-        await FooterActions.tapConfirmButton();
-
-        await PredictMarketList.tapBackButton();
-        await TabBarComponent.tapActivity();
-        await Gestures.waitAndTap(ActivitiesView.predictDeposit, {
-          elemDescription: 'Predict Deposit transaction item',
-        });
-        await TransactionDetailsModal.verifyNetworkFee('$4.13');
-        await TransactionDetailsModal.verifyPaidWithSymbol('LineaETH');
-        await TransactionDetailsModal.verifyTotal('$5.40');
-        await TransactionDetailsModal.verifyTransactionFee('$0.04');
-        await TransactionDetailsModal.verifyStatus('Confirmed');
-      },
-    );
-  });
-});
-
-async function testSpecificMock(mockServer: Mockttp) {
-  await setupRemoteFeatureFlagsMock(mockServer, {
-    ...remoteFeatureFlagPredictEnabled(true),
-    ...remoteFeatureEip7702[1],
-  });
-
-  await POLYMARKET_COMPLETE_MOCKS(mockServer);
-  await mockRelayQuote(mockServer);
-  await mockRelayStatus(mockServer);
-  // Mock all token-by-address lookups on Polygon (chainId 137) to avoid
-  // unmocked live requests when TokensController fetches metadata for
-  // detected tokens (e.g. SNX) while the Polygon network is active.
-  await mockPolygonTokenByAddress(mockServer);
-}
-
-async function mockPolygonTokenByAddress(mockServer: Mockttp) {
-  await mockServer
-    .forGet('/proxy')
-    .matching((request) => {
-      const urlParam = new URL(request.url).searchParams.get('url') || '';
-      return urlParam.includes('token.api.cx.metamask.io/token/137');
-    })
-    .thenCallback((request) => {
-      const urlParam = new URL(request.url).searchParams.get('url') || '';
-      const tokenUrl = new URL(urlParam);
-      const address = tokenUrl.searchParams.get('address') ?? '';
-      return {
-        statusCode: 200,
-        json: {
-          address: address.toLowerCase(),
-          symbol: 'UNKNOWN',
-          decimals: 18,
-          name: 'Unknown Token',
-        },
-      };
-    });
-}
diff --git a/tests/smoke/multichain/btc-wallet-standard/connect.spec.ts b/tests/smoke/multichain/btc-wallet-standard/connect.spec.ts
deleted file mode 100644
index 5c2248abf4c1..000000000000
--- a/tests/smoke/multichain/btc-wallet-standard/connect.spec.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { SmokeNetworkExpansion } from '../../../tags';
-import BitcoinTestDapp from '../../../page-objects/Browser/BitcoinTestDapp';
-import {
-  account1Short,
-  connectBitcoinTestDapp,
-  navigateToBitcoinTestDApp,
-} from '../../../flows/bitcoin-connection.flow';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { DappVariants } from '../../../framework/Constants';
-
-describe(SmokeNetworkExpansion('Bitcoin Wallet Standard E2E - Connect'), () => {
-  beforeAll(async () => {
-    jest.setTimeout(150000);
-  });
-
-  it('Connects & disconnects from Bitcoin test dapp', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        dapps: [
-          {
-            dappVariant: DappVariants.BITCOIN_TEST_DAPP,
-          },
-        ],
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBitcoinTestDApp();
-
-        await connectBitcoinTestDapp();
-
-        // Check we're connected
-        await BitcoinTestDapp.verifyConnectedAccount(account1Short);
-        await BitcoinTestDapp.verifyConnectionStatus('Connected');
-
-        const header = BitcoinTestDapp.getHeader();
-        await header.disconnect();
-
-        await BitcoinTestDapp.verifyConnectionStatus('Not connected');
-      },
-    );
-  });
-
-  it('Stays connected after page refresh', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        dapps: [
-          {
-            dappVariant: DappVariants.BITCOIN_TEST_DAPP,
-          },
-        ],
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBitcoinTestDApp();
-
-        await connectBitcoinTestDapp();
-
-        await BitcoinTestDapp.verifyConnectedAccount(account1Short);
-        await BitcoinTestDapp.verifyConnectionStatus('Connected');
-
-        await BitcoinTestDapp.reloadBitcoinTestDApp();
-
-        await BitcoinTestDapp.verifyConnectedAccount(account1Short);
-        await BitcoinTestDapp.verifyConnectionStatus('Connected');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/multichain/btc-wallet-standard/signMessage.spec.ts b/tests/smoke/multichain/btc-wallet-standard/signMessage.spec.ts
deleted file mode 100644
index 2ff51b0011ea..000000000000
--- a/tests/smoke/multichain/btc-wallet-standard/signMessage.spec.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { SmokeNetworkExpansion } from '../../../tags';
-import BitcoinTestDapp from '../../../page-objects/Browser/BitcoinTestDapp';
-import {
-  signedMessageStandard,
-  connectBitcoinTestDapp,
-  navigateToBitcoinTestDApp,
-} from '../../../flows/bitcoin-connection.flow';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { DappVariants } from '../../../framework/Constants';
-
-describe(
-  SmokeNetworkExpansion('Bitcoin Wallet Standard E2E - Sign Message'),
-  () => {
-    beforeAll(async () => {
-      jest.setTimeout(150000);
-    });
-
-    it('Signs a message', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          restartDevice: true,
-          dapps: [
-            {
-              dappVariant: DappVariants.BITCOIN_TEST_DAPP,
-            },
-          ],
-        },
-        async () => {
-          await loginToApp();
-          await navigateToBitcoinTestDApp();
-
-          await connectBitcoinTestDapp();
-
-          await BitcoinTestDapp.signMessage();
-          await BitcoinTestDapp.confirmSignMessage();
-
-          await BitcoinTestDapp.verifySignedMessage(signedMessageStandard);
-        },
-      );
-    });
-  },
-);
diff --git a/tests/smoke/multichain/connections/multiple-provider-connections.spec.ts b/tests/smoke/multichain/connections/multiple-provider-connections.spec.ts
deleted file mode 100644
index 6c7717f4ef2a..000000000000
--- a/tests/smoke/multichain/connections/multiple-provider-connections.spec.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import { SmokeNetworkExpansion } from '../../../tags';
-import Assertions from '../../../framework/Assertions';
-import FixtureBuilder, {
-  DEFAULT_FIXTURE_ACCOUNT,
-  DEFAULT_FIXTURE_ACCOUNT_2,
-} from '../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import TestDApp from '../../../page-objects/Browser/TestDApp';
-import Browser from '../../../page-objects/Browser/BrowserView';
-import ConnectBottomSheet from '../../../page-objects/Browser/ConnectBottomSheet';
-import ConnectedAccountsModal from '../../../page-objects/Browser/ConnectedAccountsModal';
-import NetworkConnectMultiSelector from '../../../page-objects/Browser/NetworkConnectMultiSelector';
-import { NetworkNonPemittedBottomSheetSelectorsText } from '../../../../app/components/Views/NetworkConnect/NetworkNonPemittedBottomSheet.testIds';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../flows/browser.flow';
-import {
-  Caip25CaveatType,
-  Caip25EndowmentPermissionName,
-} from '@metamask/chain-agnostic-permission';
-import { DappVariants } from '../../../framework/Constants';
-import { createLogger } from '../../../framework/logger';
-import { requestPermissions } from '../../../helpers/multichain/connections/helpers';
-
-const logger = createLogger({
-  name: 'multiple-provider-connections.spec',
-});
-
-describe(SmokeNetworkExpansion('Multiple Standard Dapp Connections'), () => {
-  beforeAll(async () => {
-    jest.setTimeout(150000);
-  });
-
-  it('should default account selection to already permitted account when "wallet_requestPermissions" is called with no accounts specified', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withImportedHdKeyringAndTwoDefaultAccountsOneImportedHdAccountKeyringController()
-          .withPermissionControllerConnectedToTestDapp({
-            [Caip25EndowmentPermissionName]: {
-              caveats: [
-                {
-                  type: Caip25CaveatType,
-                  value: {
-                    optionalScopes: {
-                      'eip155:1': {
-                        accounts: [
-                          `eip155:1:${DEFAULT_FIXTURE_ACCOUNT_2.toLowerCase()}`,
-                        ],
-                      },
-                    },
-                    requiredScopes: {},
-                    sessionProperties: {},
-                    isMultichainOrigin: false,
-                  },
-                },
-              ],
-            },
-          })
-          .build(),
-        restartDevice: true,
-      },
-      async () => {
-        await loginToApp();
-
-        await navigateToBrowserView();
-        await Browser.navigateToTestDApp();
-
-        logger.debug('requesting permissions');
-        await requestPermissions();
-        logger.debug('permissions requested');
-
-        // Validate that the prompted account is the one that is already permitted
-        await Assertions.expectTextDisplayed('Account 2');
-
-        await ConnectBottomSheet.tapConnectButton();
-
-        // Validate only existing permitted EVM account is connected
-        await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-        await Assertions.expectTextDisplayed('Account 2');
-      },
-    );
-  });
-
-  it('should retain Solana permissions when connecting through the EVM provider', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        restartDevice: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await Browser.navigateToTestDApp();
-        await TestDApp.connect();
-
-        // Validate the prompted accounts
-        await Assertions.expectTextDisplayed('Account 1');
-
-        await ConnectBottomSheet.tapConnectButton();
-
-        await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-        await Assertions.expectTextDisplayed('Account 1');
-
-        // Navigate to the permissions summary tab
-        await ConnectedAccountsModal.tapPermissionsSummaryTab();
-
-        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-
-        // Validate Solana Chain Permissions still exists
-        await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
-          NetworkNonPemittedBottomSheetSelectorsText.SOLANA_NETWORK_NAME,
-        );
-
-        // Validate Ethereum Mainnet Permissions now exists
-        await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
-          NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME,
-        );
-      },
-    );
-  });
-
-  it('should default account selection to already permitted Solana account and requested Ethereum account when "wallet_requestPermissions" is called with specific Ethereum account', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        restartDevice: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await Browser.navigateToTestDApp();
-
-        await requestPermissions({
-          accounts: [DEFAULT_FIXTURE_ACCOUNT],
-        });
-
-        // Validate the prompted accounts
-        await Assertions.expectTextDisplayed('Account 1');
-
-        await ConnectBottomSheet.tapConnectButton();
-
-        // Validate both EVM and Solana accounts are connected
-        await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-        await Assertions.expectTextDisplayed('Account 1');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/multichain/permissions/accounts/permission-system-remove.failing.ts b/tests/smoke/multichain/permissions/accounts/permission-system-remove.failing.ts
deleted file mode 100644
index bf6122297d54..000000000000
--- a/tests/smoke/multichain/permissions/accounts/permission-system-remove.failing.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import TestHelpers from '../../../../helpers';
-import { SmokeNetworkAbstractions } from '../../../../tags';
-import Browser from '../../../../page-objects/Browser/BrowserView';
-import TabBarComponent from '../../../../page-objects/wallet/TabBarComponent';
-
-import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../../framework/fixtures/FixtureHelper';
-import { loginToApp } from '../../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../../flows/browser.flow';
-import Assertions from '../../../../framework/Assertions';
-
-import { PopularNetworksList } from '../../../../resources/networks.e2e';
-
-import WalletView from '../../../../page-objects/wallet/WalletView';
-import NetworkListModal from '../../../../page-objects/Network/NetworkListModal';
-import TestDApp from '../../../../page-objects/Browser/TestDApp';
-import ConnectBottomSheet from '../../../../page-objects/Browser/ConnectBottomSheet';
-import PermissionSummaryBottomSheet from '../../../../page-objects/Browser/PermissionSummaryBottomSheet';
-import NetworkConnectMultiSelector from '../../../../page-objects/Browser/NetworkConnectMultiSelector';
-import NetworkNonPemittedBottomSheet from '../../../../page-objects/Network/NetworkNonPemittedBottomSheet';
-import ConnectedAccountsModal from '../../../../page-objects/Browser/ConnectedAccountsModal';
-import { DappVariants } from '../../../../framework/Constants';
-
-// This test was migrated to the new framework but should be reworked to use withFixtures properly
-describe(SmokeNetworkAbstractions('Chain Permission Management'), () => {
-  beforeAll(async () => {
-    jest.setTimeout(150000);
-    await TestHelpers.reverseServerPort();
-  });
-
-  it('handles permission cleanup when removing a connected chain', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withNetworkController(PopularNetworksList.Polygon.providerConfig)
-          .build(),
-        restartDevice: true,
-      },
-      async () => {
-        // Setup: Navigate to browser and login
-        await loginToApp();
-        await navigateToBrowserView();
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID);
-
-        // Connect to DApp and configure network permissions
-        await Browser.navigateToTestDApp();
-        await TestDApp.connect();
-        await ConnectedAccountsModal.tapPermissionsSummaryTab();
-        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-        await NetworkNonPemittedBottomSheet.tapEthereumMainNetNetworkName();
-        await NetworkConnectMultiSelector.tapUpdateButton();
-        await ConnectBottomSheet.tapConnectButton();
-
-        // Remove network using network switcher
-        await TabBarComponent.tapWallet();
-        await WalletView.tapNetworksButtonOnNavBar();
-        await NetworkListModal.longPressOnNetwork(
-          PopularNetworksList.Polygon.providerConfig.nickname,
-        );
-        await NetworkListModal.deleteNetwork();
-        await NetworkListModal.tapDeleteButton();
-
-        // Verify permission cleanup
-        await navigateToBrowserView();
-        await Assertions.expectElementToBeVisible(
-          PermissionSummaryBottomSheet.addNetworkPermissionContainer,
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/multichain/permissions/accounts/permission-system-update-permissions.failing.ts b/tests/smoke/multichain/permissions/accounts/permission-system-update-permissions.failing.ts
deleted file mode 100644
index ae91bb2ed4a6..000000000000
--- a/tests/smoke/multichain/permissions/accounts/permission-system-update-permissions.failing.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import { SmokeNetworkAbstractions } from '../../../../tags';
-import Browser from '../../../../page-objects/Browser/BrowserView';
-import ConnectedAccountsModal from '../../../../page-objects/Browser/ConnectedAccountsModal';
-import { loginToApp } from '../../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../../flows/browser.flow';
-import Assertions from '../../../../framework/Assertions';
-import NetworkConnectMultiSelector from '../../../../page-objects/Browser/NetworkConnectMultiSelector';
-import NetworkNonPemittedBottomSheet from '../../../../page-objects/Network/NetworkNonPemittedBottomSheet';
-import { CustomNetworks } from '../../../../resources/networks.e2e';
-import PermissionSummaryBottomSheet from '../../../../page-objects/Browser/PermissionSummaryBottomSheet';
-import { NetworkNonPemittedBottomSheetSelectorsText } from '../../../../../app/components/Views/NetworkConnect/NetworkNonPemittedBottomSheet.testIds';
-import NetworkListModal from '../../../../page-objects/Network/NetworkListModal';
-import ToastModal from '../../../../page-objects/wallet/ToastModal';
-import AccountListBottomSheet from '../../../../page-objects/wallet/AccountListBottomSheet';
-import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../../framework/fixtures/FixtureHelper';
-import { DappVariants } from '../../../../framework/Constants';
-import { logger } from '../../../../framework/logger';
-
-const accountOneText = 'Account 1';
-const accountTwoText = 'Account 2';
-const accountThreeText = 'Account 3';
-
-describe(SmokeNetworkAbstractions('Chain Permission Management'), () => {
-  beforeAll(async () => {
-    jest.setTimeout(150000);
-  });
-
-  it('allows simultaneous granting and revoking of multiple chain permissions', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withChainPermission([
-            '0x1',
-            CustomNetworks.Sepolia.providerConfig.chainId as `0x${string}`,
-          ]) // Initialize with Ethereum mainnet and Sepolia
-          .build(),
-        restartDevice: true,
-      },
-      async () => {
-        logger.debug('Starting test');
-        await loginToApp();
-        logger.debug('Logged in');
-        await navigateToBrowserView();
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID);
-
-        await Browser.navigateToTestDApp();
-        await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-
-        // Navigate to chain permissions
-        await ConnectedAccountsModal.tapManagePermissionsButton();
-        await ConnectedAccountsModal.tapPermissionsSummaryTab();
-        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-
-        // Uncheck Sepolia and check Linea Sepolia
-        await NetworkNonPemittedBottomSheet.tapSepoliaNetworkName();
-        await NetworkNonPemittedBottomSheet.tapLineaSepoliaNetworkName();
-
-        // Update permissions
-        await NetworkConnectMultiSelector.tapUpdateButton();
-
-        // Verify changes were saved by checking chain permissions again
-        await ConnectedAccountsModal.tapPermissionsSummaryTab();
-        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-
-        await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
-          NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME,
-        );
-        await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
-          NetworkNonPemittedBottomSheetSelectorsText.LINEA_SEPOLIA_NETWORK_NAME,
-        );
-
-        await NetworkConnectMultiSelector.isNetworkChainPermissionNotSelected(
-          NetworkNonPemittedBottomSheetSelectorsText.SEPOLIA_NETWORK_NAME,
-        );
-      },
-    );
-  });
-
-  it('should manage permissions for multiple accounts and networks accurately', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        restartDevice: true,
-      },
-      async () => {
-        //should navigate to browser
-        await loginToApp();
-        await navigateToBrowserView();
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID);
-
-        // navigate to test dapp and verify that the connected accounts modal is visible
-        await Browser.navigateToTestDApp();
-        await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-        await Assertions.expectElementToBeVisible(ConnectedAccountsModal.title);
-
-        await Assertions.expectElementToNotBeVisible(
-          ToastModal.notificationTitle,
-        );
-
-        // validate that one account is connected
-        await ConnectedAccountsModal.tapManagePermissionsButton();
-        await Assertions.expectTextDisplayed(accountOneText);
-        await PermissionSummaryBottomSheet.tapBackButton();
-
-        // connect more accounts through the "connect more accounts" button
-        await ConnectedAccountsModal.tapConnectMoreAccountsButton();
-        await AccountListBottomSheet.tapAddAccountButtonV2();
-        await Assertions.expectTextDisplayed(accountTwoText);
-
-        await AccountListBottomSheet.tapAccountIndex(0);
-        await AccountListBottomSheet.tapConnectAccountsButton();
-
-        // should add accounts from an alternative path by clicking "Edit Accounts" in the bottom sheet
-        await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-
-        // validate 2 accounts are connected
-        await Assertions.expectTextDisplayed(accountOneText);
-        await Assertions.expectTextDisplayed(accountTwoText);
-
-        // create the third account
-        await ConnectedAccountsModal.tapManagePermissionsButton();
-        await ConnectedAccountsModal.tapAccountListBottomSheet();
-        await AccountListBottomSheet.tapAddAccountButtonV2();
-
-        // connect the third account
-        await AccountListBottomSheet.tapAccountIndex(0); // only the third account is not connected.
-        await AccountListBottomSheet.tapConnectAccountsButton();
-
-        await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-
-        // validate 3 accounts are connected
-        await Assertions.expectTextDisplayed(accountOneText);
-        await Assertions.expectTextDisplayed(accountTwoText);
-        await Assertions.expectTextDisplayed(accountThreeText);
-
-        // navigate to the permissions summary tab
-        await ConnectedAccountsModal.tapManagePermissionsButton();
-        await ConnectedAccountsModal.tapPermissionsSummaryTab();
-        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-
-        // validate that only 1 network is connected
-        await Assertions.expectTextDisplayed(
-          NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME,
-        );
-
-        // append Sepolia and Linea Sepolia to the list of networks
-        await NetworkNonPemittedBottomSheet.tapSepoliaNetworkName();
-        await NetworkNonPemittedBottomSheet.tapLineaSepoliaNetworkName();
-
-        // Update permissions
-        await NetworkConnectMultiSelector.tapUpdateButton();
-
-        // Verify changes were saved by checking chain permissions again
-        await ConnectedAccountsModal.tapPermissionsSummaryTab();
-        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-
-        await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
-          NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME,
-        );
-        await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
-          NetworkNonPemittedBottomSheetSelectorsText.LINEA_SEPOLIA_NETWORK_NAME,
-        );
-        await NetworkConnectMultiSelector.isNetworkChainPermissionSelected(
-          NetworkNonPemittedBottomSheetSelectorsText.SEPOLIA_NETWORK_NAME,
-        );
-
-        // Navigate back because no changes were made
-        await NetworkConnectMultiSelector.tapBackButton();
-
-        // disconnect all accounts and networks
-        await ConnectedAccountsModal.tapDisconnectAllAccountsAndNetworksButton();
-        await ConnectedAccountsModal.tapConfirmDisconnectNetworksButton();
-
-        await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-        await Assertions.expectElementToNotBeVisible(
-          ConnectedAccountsModal.title,
-        );
-        await Assertions.expectElementToBeVisible(
-          NetworkListModal.networkScroll,
-        );
-        await NetworkListModal.swipeToDismissModal();
-        await Assertions.expectElementToNotBeVisible(
-          NetworkListModal.networkScroll,
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/multichain/permissions/chains/permission-system-add-non-permitted.failing.js b/tests/smoke/multichain/permissions/chains/permission-system-add-non-permitted.failing.js
deleted file mode 100644
index 79995dbbe981..000000000000
--- a/tests/smoke/multichain/permissions/chains/permission-system-add-non-permitted.failing.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import { SmokeNetworkExpansion } from '../../../../tags';
-import { loginToApp } from '../../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../../flows/browser.flow';
-import Assertions from '../../../../framework/Assertions';
-import TestHelpers from '../../../../helpers';
-import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../../framework/fixtures/FixtureHelper';
-import { CustomNetworks } from '../../../../resources/networks.e2e';
-import Browser from '../../../../page-objects/Browser/BrowserView';
-import { NetworkNonPemittedBottomSheetSelectorsText } from '../../../../../app/components/Views/NetworkConnect/NetworkNonPemittedBottomSheet.testIds';
-import ConnectedAccountsModal from '../../../../page-objects/Browser/ConnectedAccountsModal';
-import NetworkConnectMultiSelector from '../../../../page-objects/Browser/NetworkConnectMultiSelector';
-import { DappVariants } from '../../../../framework/Constants';
-import TestDApp from '../../../../page-objects/Browser/TestDApp';
-import ConnectBottomSheet from '../../../../page-objects/Browser/ConnectBottomSheet';
-
-const SEPOLIA = CustomNetworks.Sepolia.providerConfig.nickname;
-const ETHEREUM_MAIN_NET_NETWORK_NAME =
-  NetworkNonPemittedBottomSheetSelectorsText.ETHEREUM_MAIN_NET_NETWORK_NAME;
-
-describe(
-  SmokeNetworkExpansion('Chain Permission System, non-permitted chain, '),
-  () => {
-    beforeAll(async () => {
-      await TestHelpers.reverseServerPort();
-    });
-
-    beforeEach(() => {
-      jest.setTimeout(150000);
-    });
-
-    it('should request permission when switching to non-permitted chain from dapp', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder()
-            .withPermissionControllerConnectedToTestDapp()
-            .withChainPermission()
-            .withPopularNetworks()
-            .build(),
-          restartDevice: true,
-        },
-        async () => {
-          await loginToApp();
-
-          // Switch to non-permitted network on dapp
-          await navigateToBrowserView();
-          await Browser.navigateToTestDApp();
-          await TestDApp.tapOpenNetworkPicker();
-          await TestDApp.tapNetworkByName(SEPOLIA);
-          const expectedText = `Use your enabled networks Requesting for ${SEPOLIA}`;
-          await Assertions.expectElementToHaveLabel(
-            ConnectedAccountsModal.navigateToEditNetworksPermissionsButton,
-            expectedText,
-            {
-              description: `edit networks permissions button should show "${expectedText}"`,
-            },
-          );
-          await Assertions.expectElementToBeVisible(
-            ConnectBottomSheet.connectButton,
-          );
-          await ConnectBottomSheet.tapConnectButton();
-        },
-      );
-    });
-
-    it('should allow adding new chain permission through edit permissions', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder()
-            .withPermissionControllerConnectedToTestDapp()
-            .withChainPermission()
-            .build(),
-          restartDevice: true,
-        },
-        async () => {
-          await loginToApp();
-
-          // Add network permission
-          await navigateToBrowserView();
-          await Browser.navigateToTestDApp();
-
-          // Verify the permission was added by checking that disconnecting both networks shows disconnect all button
-          await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-          await ConnectedAccountsModal.tapManagePermissionsButton();
-          await ConnectedAccountsModal.tapPermissionsSummaryTab();
-          await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-          await NetworkConnectMultiSelector.selectNetworkChainPermission(
-            SEPOLIA,
-          );
-          await NetworkConnectMultiSelector.tapUpdateButton();
-          await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-          await NetworkConnectMultiSelector.selectNetworkChainPermission(
-            ETHEREUM_MAIN_NET_NETWORK_NAME,
-          );
-          await NetworkConnectMultiSelector.selectNetworkChainPermission(
-            SEPOLIA,
-          );
-          await Assertions.expectElementToBeVisible(
-            ConnectedAccountsModal.disconnectNetworksButton,
-          );
-        },
-      );
-    });
-  },
-);
diff --git a/tests/smoke/multichain/permissions/chains/permission-system-dapp-chain-switch-grant.spec.ts b/tests/smoke/multichain/permissions/chains/permission-system-dapp-chain-switch-grant.spec.ts
deleted file mode 100644
index dd3e09be2ac3..000000000000
--- a/tests/smoke/multichain/permissions/chains/permission-system-dapp-chain-switch-grant.spec.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../../framework/fixtures/FixtureHelper';
-import Browser from '../../../../page-objects/Browser/BrowserView';
-import ConnectBottomSheet from '../../../../page-objects/Browser/ConnectBottomSheet';
-import TestDApp from '../../../../page-objects/Browser/TestDApp';
-import { CustomNetworks } from '../../../../resources/networks.e2e';
-import { SmokeNetworkAbstractions } from '../../../../tags';
-import Assertions from '../../../../framework/Assertions';
-import { loginToApp } from '../../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../../flows/browser.flow';
-import ConnectedAccountsModal from '../../../../page-objects/Browser/ConnectedAccountsModal';
-import NetworkConnectMultiSelector from '../../../../page-objects/Browser/NetworkConnectMultiSelector';
-import NetworkNonPemittedBottomSheet from '../../../../page-objects/Network/NetworkNonPemittedBottomSheet';
-import { DappVariants } from '../../../../framework/Constants';
-import { CUSTOM_RPC_PROVIDER_MOCKS } from '../../../../api-mocking/mock-responses/custom-rpc-provider-mocks';
-
-describe(SmokeNetworkAbstractions('Chain Permission System'), () => {
-  beforeAll(async () => {
-    jest.setTimeout(150000);
-  });
-
-  describe('When a dApp requests to switch to a new chain', () => {
-    it('grants permission to the new chain and switches to it when approved', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder()
-            .withNetworkController(CustomNetworks.ElysiumTestnet.providerConfig)
-            .withNetworkController(
-              CustomNetworks.EthereumMainCustom.providerConfig,
-            )
-            .build(),
-          restartDevice: true,
-          testSpecificMock: CUSTOM_RPC_PROVIDER_MOCKS,
-        },
-        async () => {
-          // Setup: Login and navigate to browser
-          await loginToApp();
-          await navigateToBrowserView();
-          await Assertions.expectElementToBeVisible(Browser.browserScreenID);
-
-          // Connect to test dApp
-          await Browser.navigateToTestDApp();
-
-          await TestDApp.connect();
-          await ConnectedAccountsModal.tapPermissionsSummaryTab();
-          await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-          await NetworkNonPemittedBottomSheet.tapElysiumTestnetNetworkName();
-          await NetworkConnectMultiSelector.tapUpdateButton();
-          await ConnectBottomSheet.tapConnectButton();
-
-          // Verify browser is still visible after modal closes
-          await Assertions.expectElementToBeVisible(Browser.browserScreenID);
-
-          // Grant permission and switch to new chain
-          await TestDApp.switchChainFromTestDapp();
-          await ConnectBottomSheet.tapConnectButton();
-
-          // Verify network switch was successful
-          await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-
-          // Navigate back to second Dapp and verify chain permissions
-          await ConnectedAccountsModal.tapPermissionsSummaryTab();
-
-          const networkPicker = ConnectedAccountsModal.networkPicker;
-          // The picker view auto-aggregates the AvatarToken letter ("l") and
-          // the network Badge letter ("E") into one a11y label. iOS's
-          // UIAccessibility joins those with ", " (not a single space), so the
-          // expected label is "l, E".
-          await Assertions.expectElementToHaveLabel(networkPicker, 'l, E');
-        },
-      );
-    });
-  });
-});
diff --git a/tests/smoke/multichain/permissions/chains/permission-system-initial-connection.spec.ts b/tests/smoke/multichain/permissions/chains/permission-system-initial-connection.spec.ts
deleted file mode 100644
index 2b35cf340bbe..000000000000
--- a/tests/smoke/multichain/permissions/chains/permission-system-initial-connection.spec.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { SmokeNetworkExpansion } from '../../../../tags';
-import Browser from '../../../../page-objects/Browser/BrowserView';
-import TestDApp from '../../../../page-objects/Browser/TestDApp';
-import ConnectedAccountsModal from '../../../../page-objects/Browser/ConnectedAccountsModal';
-import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../../framework/fixtures/FixtureHelper';
-import { loginToApp } from '../../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../../flows/browser.flow';
-import Assertions from '../../../../framework/Assertions';
-import ConnectBottomSheet from '../../../../page-objects/Browser/ConnectBottomSheet';
-import NetworkNonPemittedBottomSheet from '../../../../page-objects/Network/NetworkNonPemittedBottomSheet';
-import NetworkConnectMultiSelector from '../../../../page-objects/Browser/NetworkConnectMultiSelector';
-import { DappVariants } from '../../../../framework/Constants';
-
-describe(SmokeNetworkExpansion('Chain Permission Management'), () => {
-  beforeAll(async () => {
-    jest.setTimeout(150000);
-  });
-
-  it('grants default permissions to single account and chain on first connect', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID);
-
-        await Browser.navigateToTestDApp();
-        await TestDApp.connect();
-        await ConnectBottomSheet.tapConnectButton();
-
-        await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-        await Assertions.expectElementToBeVisible(
-          ConnectedAccountsModal.disconnectAllAccountsAndNetworksButton,
-        );
-      },
-    );
-  });
-
-  it('allows user to modify permitted chains before completing connection', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-      },
-      async () => {
-        // Initial setup: Login and navigate to test dapp
-        await loginToApp();
-        await navigateToBrowserView();
-        await Assertions.expectElementToBeVisible(Browser.browserScreenID);
-        await Browser.navigateToTestDApp();
-        // First permission modification: Add Linea Sepolia
-        await TestDApp.connect();
-        await ConnectedAccountsModal.tapPermissionsSummaryTab();
-        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-
-        await ConnectedAccountsModal.tapSelectAllNetworksButton();
-        await ConnectedAccountsModal.tapDeselectAllNetworksButton();
-        await NetworkNonPemittedBottomSheet.tapEthereumMainNetNetworkName();
-        await NetworkNonPemittedBottomSheet.tapLineaSepoliaNetworkName();
-        await NetworkConnectMultiSelector.tapUpdateButton();
-
-        // Second permission modification: Replace Linea Sepolia with Sepolia
-        await ConnectedAccountsModal.tapPermissionsSummaryTab();
-        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-        await NetworkNonPemittedBottomSheet.tapLineaSepoliaNetworkName(); // uncheck Linea Sepolia
-        await NetworkNonPemittedBottomSheet.tapSepoliaNetworkName(); // check Sepolia
-        await NetworkConnectMultiSelector.tapUpdateButton();
-
-        // Complete initial connection
-        await ConnectBottomSheet.tapConnectButton();
-
-        // Open network permissions menu
-        await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-        await Assertions.expectElementToBeVisible(
-          ConnectedAccountsModal.disconnectAllAccountsAndNetworksButton,
-        );
-        await ConnectedAccountsModal.tapPermissionsSummaryTab();
-        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-
-        // Verify final permissions state
-        // - Should have only Ethereum Mainnet and Sepolia selected
-        // - Deselecting both should show the disconnect all button
-        await ConnectedAccountsModal.tapSelectAllNetworksButton();
-        await ConnectedAccountsModal.tapDeselectAllNetworksButton();
-
-        await Assertions.expectElementToBeVisible(
-          ConnectedAccountsModal.disconnectNetworksButton,
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/multichain/solana-wallet-standard/connect.spec.ts b/tests/smoke/multichain/solana-wallet-standard/connect.spec.ts
deleted file mode 100644
index 55a919adaa3f..000000000000
--- a/tests/smoke/multichain/solana-wallet-standard/connect.spec.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-import { SmokeNetworkExpansion } from '../../../tags';
-import Assertions from '../../../framework/Assertions';
-import SolanaTestDApp from '../../../page-objects/Browser/SolanaTestDApp';
-import {
-  account1Short,
-  account2Short,
-  connectSolanaTestDapp,
-  navigateToSolanaTestDApp,
-} from '../../../flows/solana-connection.flow';
-import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
-import WalletView from '../../../page-objects/wallet/WalletView';
-import AccountListBottomSheet from '../../../page-objects/wallet/AccountListBottomSheet';
-import { Utilities } from '../../../framework';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../flows/browser.flow';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { DappVariants } from '../../../framework/Constants';
-
-describe(SmokeNetworkExpansion('Solana Wallet Standard E2E - Connect'), () => {
-  beforeAll(async () => {
-    jest.setTimeout(150000);
-  });
-
-  it('Should connect & disconnect from Solana test dapp', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        dapps: [
-          {
-            dappVariant: DappVariants.SOLANA_TEST_DAPP,
-          },
-        ],
-      },
-      async () => {
-        await loginToApp();
-        await navigateToSolanaTestDApp();
-
-        await connectSolanaTestDapp();
-
-        const header = SolanaTestDApp.getHeader();
-
-        // Check we're connected
-        const account = await header.getAccount();
-        await Assertions.checkIfTextMatches(account, account1Short);
-        const connectionStatus = await header.getConnectionStatus();
-        await Assertions.checkIfTextMatches(connectionStatus, 'Connected');
-
-        await header.disconnect();
-
-        // Check we're disconnected
-        const connectionStatusAfterDisconnect =
-          await header.getConnectionStatus();
-        await Assertions.checkIfTextMatches(
-          connectionStatusAfterDisconnect,
-          'Not connected',
-        );
-      },
-    );
-  });
-
-  it('Should be able to cancel connection and connect again', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        dapps: [
-          {
-            dappVariant: DappVariants.SOLANA_TEST_DAPP,
-          },
-        ],
-      },
-      async () => {
-        await loginToApp();
-        await navigateToSolanaTestDApp();
-
-        const header = SolanaTestDApp.getHeader();
-        await header.connect();
-        await header.selectMetaMask();
-
-        await SolanaTestDApp.tapCancelButton();
-
-        const connectionStatus = await header.getConnectionStatus();
-        await Assertions.checkIfTextMatches(connectionStatus, 'Not connected');
-
-        await connectSolanaTestDapp();
-
-        const account = await header.getAccount();
-        await Assertions.checkIfTextMatches(account, account1Short);
-      },
-    );
-  });
-
-  // Skipping individual test for now, as it's flaky
-  it.skip('Switching between 2 accounts should reflect in the dapp', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        dapps: [
-          {
-            dappVariant: DappVariants.SOLANA_TEST_DAPP,
-          },
-        ],
-      },
-      async () => {
-        await loginToApp();
-        await navigateToSolanaTestDApp();
-        await connectSolanaTestDapp({ selectAllAccounts: true });
-
-        const header = SolanaTestDApp.getHeader();
-        const account = await header.getAccount();
-        await Assertions.checkIfTextMatches(account, account2Short);
-
-        await TabBarComponent.tapWallet();
-        await WalletView.tapCurrentMainWalletAccountActions();
-
-        await AccountListBottomSheet.tapToSelectActiveAccountAtIndex(1);
-        await navigateToBrowserView();
-
-        const accountAfterSwitch = await header.getAccount();
-        await Assertions.checkIfTextMatches(accountAfterSwitch, account1Short);
-      },
-    );
-  });
-
-  it('Should stay connected after page refresh', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        dapps: [
-          {
-            dappVariant: DappVariants.SOLANA_TEST_DAPP,
-          },
-        ],
-      },
-      async () => {
-        await loginToApp();
-        await navigateToSolanaTestDApp();
-
-        await connectSolanaTestDapp();
-
-        // Should be connected
-        const header = SolanaTestDApp.getHeader();
-        const account = await header.getAccount();
-        await Assertions.checkIfTextMatches(account, account1Short);
-
-        // Refresh the page
-        await SolanaTestDApp.reloadSolanaTestDApp();
-
-        await Utilities.executeWithRetry(
-          async () => {
-            // Should still be connected after refresh
-            const headerAfterRefresh = SolanaTestDApp.getHeader();
-            const accountAfterRefresh = await headerAfterRefresh.getAccount();
-            await Assertions.checkIfTextMatches(
-              accountAfterRefresh,
-              account1Short,
-            );
-          },
-          {
-            timeout: 10000,
-            interval: 1500,
-          },
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/multichain/solana-wallet-standard/signMessage.spec.ts b/tests/smoke/multichain/solana-wallet-standard/signMessage.spec.ts
deleted file mode 100644
index 90cdd4a62e2e..000000000000
--- a/tests/smoke/multichain/solana-wallet-standard/signMessage.spec.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { SmokeNetworkExpansion } from '../../../tags';
-import SolanaTestDApp from '../../../page-objects/Browser/SolanaTestDApp';
-import {
-  connectSolanaTestDapp,
-  navigateToSolanaTestDApp,
-} from '../../../flows/solana-connection.flow';
-import Assertions from '../../../framework/Assertions';
-import { logger } from '../../../framework/logger';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { DappVariants } from '../../../framework/Constants';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-
-// Skipping due to https://consensys.slack.com/archives/C02U025CVU4/p1778748720677019
-describe.skip(
-  SmokeNetworkExpansion('Solana Wallet Standard E2E - Sign Message'),
-  () => {
-    beforeAll(async () => {
-      jest.setTimeout(150000);
-    });
-
-    it('Should sign a message', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          restartDevice: true,
-          dapps: [
-            {
-              dappVariant: DappVariants.SOLANA_TEST_DAPP,
-            },
-          ],
-        },
-        async () => {
-          await loginToApp();
-
-          // Detox sync waits for the main run loop to idle; browser + WebView + snap modal
-          // often keep work pending on the main queue (see "app is busy" in CI). Disable sync
-          // for the whole dapp flow, not only the confirmation tap.
-          await device.disableSynchronization();
-          try {
-            await navigateToSolanaTestDApp();
-
-            await connectSolanaTestDapp();
-
-            const signMessageTest = SolanaTestDApp.getSignMessageTest();
-            await signMessageTest.signMessage();
-            await SolanaTestDApp.confirmSignMessage();
-
-            const signedMessage = await signMessageTest.getSignedMessage();
-            logger.debug(`signedMessage: ${signedMessage}`);
-            await Assertions.checkIfTextMatches(
-              signedMessage,
-              'Kort1JYMAf3dmzKRx4WiYXW9gSfPHzxw0flAka25ymjB4d+UZpU/trFoSPk4DM7emT1c/e6Wk0bsRcLsj/h9BQ==',
-            );
-          } finally {
-            await device.enableSynchronization();
-          }
-        },
-      );
-    });
-  },
-);
diff --git a/tests/smoke/multichain/solana-wallet-standard/transferSol.spec.ts b/tests/smoke/multichain/solana-wallet-standard/transferSol.spec.ts
deleted file mode 100644
index e7c070796b9e..000000000000
--- a/tests/smoke/multichain/solana-wallet-standard/transferSol.spec.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { SmokeNetworkExpansion } from '../../../tags';
-import SolanaTestDApp from '../../../page-objects/Browser/SolanaTestDApp';
-import {
-  connectSolanaTestDapp,
-  navigateToSolanaTestDApp,
-} from '../../../flows/solana-connection.flow';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { DappVariants } from '../../../framework/Constants';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import Assertions from '../../../framework/Assertions';
-
-describe(
-  SmokeNetworkExpansion('Solana Wallet Standard E2E - Transfer SOL'),
-  () => {
-    beforeAll(async () => {
-      jest.setTimeout(150000);
-    });
-
-    it('Should sign a transaction', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          restartDevice: true,
-          dapps: [
-            {
-              dappVariant: DappVariants.SOLANA_TEST_DAPP,
-            },
-          ],
-        },
-        async () => {
-          await loginToApp();
-          await navigateToSolanaTestDApp();
-          await connectSolanaTestDapp();
-
-          await device.disableSynchronization(); // Synchronization is preventing from reading the MetaMask bottom sheet
-
-          const sendSolTest = SolanaTestDApp.getSendSolTest();
-          await sendSolTest.signTransaction();
-
-          // TODO: Actually sign the transaction (blocked by https://consensyssoftware.atlassian.net/browse/MMQA-586)
-          await SolanaTestDApp.tapCancelButton();
-        },
-      );
-    });
-
-    // TODO: Enable when devnet is supported on mobile (https://github.com/MetaMask/metamask-mobile/issues/15002)
-    it.skip('Should send a transaction', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          restartDevice: true,
-          dapps: [
-            {
-              dappVariant: DappVariants.SOLANA_TEST_DAPP,
-            },
-          ],
-        },
-        async () => {
-          await loginToApp();
-          await navigateToSolanaTestDApp();
-          await connectSolanaTestDapp();
-
-          await device.disableSynchronization(); // Synchronization is preventing from reading the MetaMask bottom sheet
-
-          const sendSolTest = SolanaTestDApp.getSendSolTest();
-          await sendSolTest.sendTransaction();
-
-          await Assertions.expectTextDisplayed('Transaction request');
-
-          await SolanaTestDApp.tapCancelButton();
-        },
-      );
-    });
-  },
-);
diff --git a/tests/smoke/multichain/wallet-createSession.spec.ts b/tests/smoke/multichain/wallet-createSession.spec.ts
deleted file mode 100644
index 220059204676..000000000000
--- a/tests/smoke/multichain/wallet-createSession.spec.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * E2E tests for wallet_createSession API
- * Tests creating sessions with different scope combinations and verifying permissions
- */
-import { DappVariants } from '../../framework/Constants';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import MultichainTestDApp from '../../page-objects/Browser/MultichainTestDApp';
-import { SmokeMultiChainAPI } from '../../tags';
-import MultichainUtilities from '../../helpers/multichain/MultichainUtilities';
-
-describe(SmokeMultiChainAPI('wallet_createSession'), () => {
-  it('should create a session with Ethereum mainnet scope', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder().withPopularNetworks().build(),
-        restartDevice: true,
-      },
-      async () => {
-        await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-        await MultichainTestDApp.createSessionWithNetworks(
-          MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM,
-        );
-
-        const sessionResult = await MultichainTestDApp.getSessionData();
-
-        const assertions = MultichainUtilities.generateSessionAssertions(
-          sessionResult,
-          MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM,
-        );
-
-        MultichainUtilities.logSessionDetails(
-          sessionResult,
-          'Single Ethereum Test',
-        );
-
-        // Validate all assertions - same logic as before
-        if (!assertions.structureValid) {
-          throw new Error('Invalid session structure');
-        }
-        if (!assertions.success) {
-          throw new Error('Session creation failed');
-        }
-        if (!assertions.chainsValid) {
-          throw new Error(
-            `Chain validation failed. Missing chains: ${assertions.missingChains.join(
-              ', ',
-            )}`,
-          );
-        }
-        if (assertions.chainCount !== 1) {
-          throw new Error(
-            `Expected 1 chain, but found ${assertions.chainCount}`,
-          );
-        }
-      },
-    );
-  });
-
-  it('should create a session with multiple EVM chains', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder().withPopularNetworks().build(),
-        restartDevice: true,
-      },
-      async () => {
-        await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-        await MultichainTestDApp.createSessionWithNetworks(
-          MultichainUtilities.NETWORK_COMBINATIONS.ETHEREUM_POLYGON,
-        );
-
-        const sessionResult = await MultichainTestDApp.getSessionData();
-
-        const assertions = MultichainUtilities.generateSessionAssertions(
-          sessionResult,
-          MultichainUtilities.NETWORK_COMBINATIONS.ETHEREUM_POLYGON,
-        );
-
-        MultichainUtilities.logSessionDetails(
-          sessionResult,
-          'Multi-chain Test',
-        );
-
-        // Validate all assertions - same logic as before
-        if (!assertions.structureValid) {
-          throw new Error('Invalid session structure');
-        }
-        if (!assertions.success) {
-          throw new Error('Session creation failed');
-        }
-        if (!assertions.chainsValid) {
-          throw new Error(
-            `Chain validation failed. Missing chains: ${assertions.missingChains.join(
-              ', ',
-            )}`,
-          );
-        }
-        if (assertions.chainCount !== 2) {
-          throw new Error(
-            `Expected 2 chains, but found ${assertions.chainCount}`,
-          );
-        }
-      },
-    );
-  });
-
-  it('should create a session with all available EVM networks', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder().withPopularNetworks().build(),
-        restartDevice: true,
-      },
-      async () => {
-        await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-        await MultichainTestDApp.createSessionWithNetworks(
-          MultichainUtilities.NETWORK_COMBINATIONS.ALL_MAJOR_EVM,
-        );
-
-        // Wait for session creation and get the data separately
-        const sessionResult = await MultichainTestDApp.getSessionData();
-
-        const assertions = MultichainUtilities.generateSessionAssertions(
-          sessionResult,
-          MultichainUtilities.NETWORK_COMBINATIONS.ALL_MAJOR_EVM,
-        );
-
-        MultichainUtilities.logSessionDetails(
-          sessionResult,
-          'All Networks Test',
-        );
-
-        // Validate all assertions - same logic as before
-        if (!assertions.structureValid) {
-          throw new Error('Invalid session structure');
-        }
-        if (!assertions.success) {
-          throw new Error('Session creation failed');
-        }
-        if (
-          !assertions.foundChains.includes(
-            MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET,
-          )
-        ) {
-          throw new Error('Ethereum mainnet not found in session scopes');
-        }
-        if (assertions.chainCount <= 1) {
-          throw new Error(
-            `Expected multiple chains, but found ${assertions.chainCount}`,
-          );
-        }
-      },
-    );
-  });
-
-  it('should handle session creation with no networks selected', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder().withPopularNetworks().build(),
-        restartDevice: true,
-      },
-      async () => {
-        await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-        await MultichainTestDApp.createSessionWithNetworks([]);
-
-        // Create a mock empty result for consistency
-        const sessionResult = { success: false, sessionScopes: {} };
-
-        const assertions = MultichainUtilities.generateSessionAssertions(
-          sessionResult,
-          [],
-        );
-        MultichainUtilities.logSessionDetails(
-          sessionResult,
-          'No Networks Test',
-        );
-
-        if (!assertions.structureValid) {
-          throw new Error('Invalid session result type');
-        }
-
-        // When no networks are selected, session creation should fail
-        if (assertions.success || assertions.chainCount > 0) {
-          throw new Error(
-            'Expected session creation to fail with no networks selected, but it succeeded',
-          );
-        }
-      },
-    );
-  });
-});
diff --git a/tests/smoke/multichain/wallet-getSession.spec.ts b/tests/smoke/multichain/wallet-getSession.spec.ts
deleted file mode 100644
index a43eb525fac1..000000000000
--- a/tests/smoke/multichain/wallet-getSession.spec.ts
+++ /dev/null
@@ -1,247 +0,0 @@
-/**
- * E2E tests for wallet_getSession API
- * Tests getting session information in different scenarios
- */
-import { SmokeMultiChainAPI } from '../../tags';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import MultichainTestDApp from '../../page-objects/Browser/MultichainTestDApp';
-import MultichainUtilities from '../../helpers/multichain/MultichainUtilities';
-import { DappVariants } from '../../framework/Constants';
-
-describe(SmokeMultiChainAPI('wallet_getSession'), () => {
-  it('should successfully receive empty session scopes when there is no existing session', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder().withPopularNetworks().build(),
-        restartDevice: true,
-      },
-      async () => {
-        await MultichainTestDApp.setupAndNavigateToTestDapp();
-
-        await MultichainTestDApp.scrollToPageTop();
-        const connected = await MultichainTestDApp.useAutoConnectButton();
-        if (!connected) {
-          throw new Error('Failed to connect to dapp');
-        }
-
-        const sessionResult = await MultichainTestDApp.getSessionData();
-        const assertions = MultichainUtilities.generateSessionAssertions(
-          sessionResult,
-          [],
-        );
-
-        if (!assertions.structureValid) {
-          throw new Error('Invalid session structure');
-        }
-
-        // When there's no existing session, we expect to receive an empty session (success=false or chainCount=0)
-        if (assertions.success && assertions.chainCount > 0) {
-          throw new Error(
-            `Expected empty session scopes, but found ${assertions.chainCount} chains`,
-          );
-        }
-
-        if (
-          sessionResult.sessionScopes &&
-          Object.keys(sessionResult.sessionScopes).length > 0
-        ) {
-          throw new Error('Expected empty session scopes object');
-        }
-      },
-    );
-  });
-
-  it('should return correct and consistent session scopes for selected chains', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withPopularNetworks()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        restartDevice: true,
-      },
-      async () => {
-        await MultichainTestDApp.setupAndNavigateToTestDapp();
-        const networksToTest =
-          MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
-
-        await MultichainTestDApp.scrollToPageTop();
-        const connected = await MultichainTestDApp.useAutoConnectButton();
-        if (!connected) {
-          throw new Error('Failed to connect to dapp');
-        }
-        await MultichainTestDApp.tapGetSessionButton();
-
-        const getSessionResult1 = await MultichainTestDApp.getSessionData();
-        const getSessionResult2 = await MultichainTestDApp.getSessionData();
-        const getSessionResult3 = await MultichainTestDApp.getSessionData();
-
-        const assertions1 = MultichainUtilities.generateSessionAssertions(
-          getSessionResult1,
-          networksToTest,
-        );
-        const assertions2 = MultichainUtilities.generateSessionAssertions(
-          getSessionResult2,
-          networksToTest,
-        );
-        const assertions3 = MultichainUtilities.generateSessionAssertions(
-          getSessionResult3,
-          networksToTest,
-        );
-
-        if (!assertions1.structureValid) {
-          throw new Error('Invalid session structure');
-        }
-
-        if (
-          !assertions1.success ||
-          !assertions2.success ||
-          !assertions3.success
-        ) {
-          throw new Error('One or more getSession calls failed');
-        }
-
-        if (!assertions1.chainsValid) {
-          MultichainUtilities.logSessionDetails(
-            getSessionResult1,
-            'Failed Session Validation',
-          );
-          throw new Error(
-            `Chain validation failed. Missing chains: ${assertions1.missingChains.join(', ')}`,
-          );
-        }
-
-        if (assertions1.chainCount !== networksToTest.length) {
-          throw new Error(
-            `Expected ${networksToTest.length} chain(s), but found ${assertions1.chainCount}`,
-          );
-        }
-
-        const expectedScope = MultichainUtilities.getEIP155Scope(
-          MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET,
-        );
-        if (!getSessionResult1.sessionScopes?.[expectedScope]) {
-          throw new Error(`Expected session scope ${expectedScope} not found`);
-        }
-
-        const ethereumScope = getSessionResult1.sessionScopes[expectedScope];
-        if (!ethereumScope.accounts || ethereumScope.accounts.length === 0) {
-          throw new Error('Expected session scope to have accounts');
-        }
-
-        const scopes1 = JSON.stringify(getSessionResult1.sessionScopes);
-        const scopes2 = JSON.stringify(getSessionResult2.sessionScopes);
-        const scopes3 = JSON.stringify(getSessionResult3.sessionScopes);
-
-        if (scopes1 !== scopes2 || scopes2 !== scopes3) {
-          throw new Error('Session data inconsistent across multiple calls');
-        }
-
-        if (
-          assertions1.chainCount !== assertions2.chainCount ||
-          assertions2.chainCount !== assertions3.chainCount
-        ) {
-          throw new Error(
-            `Chain count inconsistent: ${assertions1.chainCount}, ${assertions2.chainCount}, ${assertions3.chainCount}`,
-          );
-        }
-      },
-    );
-  });
-
-  it('should handle getSession after session has been modified', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withPopularNetworks()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        restartDevice: true,
-      },
-      async () => {
-        await MultichainTestDApp.setupAndNavigateToTestDapp();
-
-        const initialNetworks =
-          MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
-
-        await MultichainTestDApp.scrollToPageTop();
-        const connected = await MultichainTestDApp.useAutoConnectButton();
-        if (!connected) {
-          throw new Error('Failed to connect to dapp');
-        }
-        await MultichainTestDApp.tapGetSessionButton();
-
-        const getSessionResult1 = await MultichainTestDApp.getSessionData();
-        const getAssertions1 = MultichainUtilities.generateSessionAssertions(
-          getSessionResult1,
-          initialNetworks,
-        );
-
-        if (!getAssertions1.success || getAssertions1.chainCount === 0) {
-          throw new Error('Initial session validation failed');
-        }
-
-        const initialChainCount = getAssertions1.chainCount;
-        console.log(`Initial session has ${initialChainCount} chain(s)`);
-
-        const newNetworks = [
-          MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET,
-          MultichainUtilities.CHAIN_IDS.BSC,
-          MultichainUtilities.CHAIN_IDS.BASE,
-        ];
-
-        await MultichainTestDApp.createSessionWithNetworks(newNetworks);
-
-        const getSessionResult2 = await MultichainTestDApp.getSessionData();
-        const getAssertions2 = MultichainUtilities.generateSessionAssertions(
-          getSessionResult2,
-          newNetworks,
-        );
-
-        if (!getAssertions2.success) {
-          throw new Error('New session creation failed');
-        }
-
-        if (!getAssertions2.chainsValid) {
-          MultichainUtilities.logSessionDetails(
-            getSessionResult2,
-            'Failed Session Validation',
-          );
-          throw new Error(
-            `Chain validation failed. Missing chains: ${getAssertions2.missingChains.join(
-              ', ',
-            )}`,
-          );
-        }
-
-        if (getAssertions2.chainCount !== newNetworks.length) {
-          throw new Error(
-            `Expected ${newNetworks.length} chain(s), but found ${getAssertions2.chainCount}`,
-          );
-        }
-
-        console.log(
-          `Modified session has ${
-            getAssertions2.chainCount
-          } chain(s): ${getAssertions2.foundChains.join(', ')}`,
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/multichain/wallet-invokeMethod.failing.ts b/tests/smoke/multichain/wallet-invokeMethod.failing.ts
deleted file mode 100644
index 93415809c9e8..000000000000
--- a/tests/smoke/multichain/wallet-invokeMethod.failing.ts
+++ /dev/null
@@ -1,593 +0,0 @@
-/**
- * E2E tests for wallet_invokeMethod API
- * Tests invoking RPC methods on specific chains, including read/write operations
- * Adapted from MetaMask extension multichain tests
- *
- * Uses native Detox selectors for reliable WebView interaction
- *
- * RESULT VERIFICATION:
- * The tests attempt to extract and log actual RPC results using runScript().
- * While Detox WebView limitations mean this doesn't always work reliably,
- * when it does work, we verify:
- * - eth_chainId returns "0x1" for Ethereum mainnet
- * - eth_getBalance returns a hex string balance (e.g., "0x...")
- * - eth_gasPrice returns a hex string gas price (e.g., "0x...")
- *
- * Even when result reading fails, the tests verify that:
- * 1. The method invocation button works
- * 2. Result elements are created in the DOM
- * 3. Results appear in the expected format (truncated vs non-truncated)
- */
-import { SmokeMultiChainAPI } from '../../tags';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import MultichainTestDApp from '../../page-objects/Browser/MultichainTestDApp';
-import { BrowserViewSelectorsIDs } from '../../../app/components/Views/BrowserTab/BrowserView.testIds';
-import MultichainUtilities from '../../helpers/multichain/MultichainUtilities';
-import Assertions from '../../framework/Assertions';
-import { MULTICHAIN_TEST_TIMEOUTS } from '../../selectors/Browser/MultichainTestDapp.selectors';
-import { waitFor } from 'detox';
-import FooterActions from '../../page-objects/Browser/Confirmations/FooterActions';
-import { isHexString } from '@metamask/utils';
-import { DappVariants } from '../../framework/Constants';
-import { LocalNodeType } from '../../framework';
-import { AnvilNodeOptions } from '../../framework/types';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { remoteFeatureEip7702 } from '../../api-mocking/mock-responses/feature-flags-mocks';
-
-const ANVIL_NODE_OPTIONS_WITH_GATOR = [
-  {
-    type: 'anvil',
-    options: {
-      hardfork: 'prague',
-      loadState:
-        './tests/seeder/network-states/7702/withDelegatorContracts.json',
-    },
-  },
-];
-const REMOTE_FEATURE_EIP_7702_MOCK = async (mockServer: Mockttp) => {
-  await setupRemoteFeatureFlagsMock(
-    mockServer,
-    Object.assign({}, ...remoteFeatureEip7702),
-  );
-};
-
-describe(SmokeMultiChainAPI('wallet_invokeMethod'), () => {
-  describe('Read operations: calling different methods on each connected scope', () => {
-    it('should match selected method to the expected output for eth_chainId', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder().withPopularNetworks().build(),
-          restartDevice: true,
-        },
-        async () => {
-          await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-          // Test with multiple networks to verify different chain IDs
-          const networksToTest =
-            MultichainUtilities.NETWORK_COMBINATIONS.ETHEREUM_POLYGON;
-
-          await MultichainTestDApp.createSessionWithNetworks(networksToTest);
-
-          // Verify session has both chains
-          const sessionData = await MultichainTestDApp.getSessionData();
-          const sessionAssertions =
-            MultichainUtilities.generateSessionAssertions(
-              sessionData,
-              networksToTest,
-            );
-          if (
-            !sessionAssertions.success ||
-            sessionAssertions.chainCount !== networksToTest.length
-          ) {
-            throw new Error(
-              `Session validation failed. Expected ${networksToTest.length} chains, got ${sessionAssertions.chainCount}`,
-            );
-          }
-
-          const method = 'eth_chainId';
-
-          // Expected chain IDs in hex format
-          const expectedResults = {
-            [MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET]: '"0x1"', // Ethereum = 1
-            [MultichainUtilities.CHAIN_IDS.POLYGON]: '"0x89"', // Polygon = 137
-          };
-
-          // Test each connected chain
-          for (const chainId of networksToTest) {
-            // Invoke the method on this chain
-            const invoked = await MultichainTestDApp.invokeMethodOnChain(
-              chainId,
-              method,
-            );
-
-            if (!invoked) {
-              throw new Error(`Failed to invoke ${method} on chain ${chainId}`);
-            }
-
-            // Get the result - use index 0 since we're only invoking once per chain
-            // The index is for multiple invocations of the same method on the same chain
-            const resultIndex = 0; // Always 0 for first invocation
-
-            const resultText = await MultichainTestDApp.getInvokeMethodResult(
-              chainId,
-              method,
-              resultIndex,
-            );
-
-            if (!resultText) {
-              console.log(
-                `Looking for element ID: invoke-method-eip155-${chainId}-${method}-result-${resultIndex}`,
-              );
-              throw new Error(
-                `Failed to get result for ${method} on chain ${chainId}. Element not found.`,
-              );
-            }
-
-            const matches = resultText === expectedResults[chainId];
-
-            if (!matches) {
-              console.log(`Result text: ${resultText}`);
-              console.log(`Expected: ${expectedResults[chainId]}`);
-              throw new Error(
-                `Chain ${chainId} returned incorrect result. Expected: ${expectedResults[chainId]}, Got: ${resultText}`,
-              );
-            }
-          }
-        },
-      );
-    });
-
-    it('should successfully call eth_getBalance method and return balance', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder().withPopularNetworks().build(),
-          restartDevice: true,
-        },
-        async () => {
-          await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-          const networksToTest =
-            MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
-          await MultichainTestDApp.createSessionWithNetworks(networksToTest);
-
-          const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
-          const method = 'eth_getBalance';
-
-          // Invoke the method
-          const invoked = await MultichainTestDApp.invokeMethodOnChain(
-            chainId,
-            method,
-          );
-
-          if (!invoked) {
-            throw new Error(`Failed to invoke ${method} on chain ${chainId}`);
-          }
-
-          // Get the result
-          const resultText = await MultichainTestDApp.getInvokeMethodResult(
-            chainId,
-            method,
-            0,
-          );
-
-          if (!resultText) {
-            throw new Error(
-              `Failed to get result for ${method} on chain ${chainId}. Element not found.`,
-            );
-          }
-
-          // Verify it's a valid hex string (should start with "0x)
-          if (!resultText.includes('"0x')) {
-            console.log(`eth_getBalance result: ${resultText}`);
-            throw new Error(
-              `eth_getBalance returned invalid result. Expected hex string, got: ${resultText}`,
-            );
-          }
-        },
-      );
-    });
-
-    it('should successfully call eth_gasPrice method and return gas price', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder().withPopularNetworks().build(),
-          restartDevice: true,
-        },
-        async () => {
-          await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-          const networksToTest =
-            MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
-          await MultichainTestDApp.createSessionWithNetworks(networksToTest);
-
-          const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
-          const method = 'eth_gasPrice';
-
-          // Invoke the method
-          const invoked = await MultichainTestDApp.invokeMethodOnChain(
-            chainId,
-            method,
-          );
-
-          if (!invoked) {
-            throw new Error(`Failed to invoke ${method} on chain ${chainId}`);
-          }
-
-          // Get the result
-          const resultText = await MultichainTestDApp.getInvokeMethodResult(
-            chainId,
-            method,
-            0,
-          );
-
-          if (!resultText) {
-            throw new Error(
-              `Failed to get result for ${method} on chain ${chainId}. Element not found.`,
-            );
-          }
-
-          // Verify it's a valid hex string (should start with "0x)
-          if (!resultText.includes('"0x')) {
-            console.log(`eth_gasPrice result: ${resultText}`);
-            throw new Error(
-              `eth_gasPrice returned invalid result. Expected hex string, got: ${resultText}`,
-            );
-          }
-        },
-      );
-    });
-  });
-
-  describe('Write operations: transaction methods with confirmation dialogs', () => {
-    it('should trigger eth_sendTransaction confirmation dialog and reject transaction', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder().withPopularNetworks().build(),
-          restartDevice: true,
-        },
-        async () => {
-          await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-          const networksToTest =
-            MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
-          await MultichainTestDApp.createSessionWithNetworks(networksToTest);
-
-          const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
-          const method = 'eth_sendTransaction';
-
-          // Invoke the method
-          const invoked = await MultichainTestDApp.invokeMethodOnChain(
-            chainId,
-            method,
-          );
-          await Assertions.checkIfTextMatches(
-            invoked ? 'true' : 'false',
-            'true',
-          );
-
-          // Wait for and cancel the confirmation dialog
-          const cancelButton = element(by.text('Cancel'));
-          await waitFor(cancelButton)
-            .toBeVisible()
-            .withTimeout(MULTICHAIN_TEST_TIMEOUTS.NAVIGATION);
-          await cancelButton.tap();
-          await waitFor(
-            element(by.id(BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID)),
-          )
-            .toBeVisible()
-            .withTimeout(MULTICHAIN_TEST_TIMEOUTS.ELEMENT_VISIBILITY);
-        },
-      );
-    });
-
-    it('should verify transaction methods require confirmation', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder().withPopularNetworks().build(),
-          restartDevice: true,
-        },
-        async () => {
-          await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-          const networksToTest =
-            MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
-          await MultichainTestDApp.createSessionWithNetworks(networksToTest);
-
-          const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
-          const writeOperations = ['eth_sendTransaction', 'personal_sign'];
-
-          for (const method of writeOperations) {
-            // Invoke the method
-            const invoked = await MultichainTestDApp.invokeMethodOnChain(
-              chainId,
-              method,
-            );
-            await Assertions.checkIfTextMatches(
-              invoked ? 'true' : 'false',
-              'true',
-            );
-
-            // Both eth_sendTransaction and personal_sign use Cancel button
-            const cancelButton = element(by.text('Cancel'));
-            await waitFor(cancelButton)
-              .toBeVisible()
-              .withTimeout(MULTICHAIN_TEST_TIMEOUTS.NAVIGATION);
-            await cancelButton.tap();
-
-            await waitFor(
-              element(by.id(BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID)),
-            )
-              .toBeVisible()
-              .withTimeout(MULTICHAIN_TEST_TIMEOUTS.ELEMENT_VISIBILITY);
-          }
-        },
-      );
-    });
-  });
-
-  describe('Multiple method invocations', () => {
-    it('should handle multiple method calls in sequence', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder().withPopularNetworks().build(),
-          restartDevice: true,
-        },
-        async () => {
-          await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-          const networksToTest =
-            MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
-          await MultichainTestDApp.createSessionWithNetworks(networksToTest);
-
-          const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
-          const methodsToTest = [
-            'eth_chainId',
-            'eth_getBalance',
-            'eth_gasPrice',
-          ];
-
-          for (const method of methodsToTest) {
-            // Invoke the method
-            const invoked = await MultichainTestDApp.invokeMethodOnChain(
-              chainId,
-              method,
-            );
-
-            if (!invoked) {
-              throw new Error(`Failed to invoke ${method} on chain ${chainId}`);
-            }
-
-            // Get the result
-            const resultText = await MultichainTestDApp.getInvokeMethodResult(
-              chainId,
-              method,
-              0,
-            );
-
-            if (!resultText) {
-              throw new Error(
-                `Failed to get result for ${method} on chain ${chainId}. Element not found.`,
-              );
-            }
-
-            // Verify the result based on method type
-            if (method === 'eth_chainId' && resultText !== '"0x1"') {
-              console.log(`${method} result: ${resultText}`);
-              throw new Error(
-                `${method} returned incorrect result. Expected: "0x1", Got: ${resultText}`,
-              );
-            } else if (
-              (method === 'eth_getBalance' || method === 'eth_gasPrice') &&
-              !resultText.includes('"0x')
-            ) {
-              console.log(`${method} result: ${resultText}`);
-              throw new Error(
-                `${method} returned invalid result. Expected hex string, got: ${resultText}`,
-              );
-            }
-          }
-        },
-      );
-    });
-  });
-
-  describe('EIP-5792 methods', () => {
-    it('should be able to call: wallet_getCapabilties', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder().withDefaultFixture().build(),
-          restartDevice: true,
-          localNodeOptions: [
-            {
-              type: LocalNodeType.anvil,
-              options: ANVIL_NODE_OPTIONS_WITH_GATOR[0]
-                .options as AnvilNodeOptions,
-            },
-          ],
-          testSpecificMock: REMOTE_FEATURE_EIP_7702_MOCK,
-        },
-        async () => {
-          await MultichainTestDApp.setupAndNavigateToTestDapp();
-
-          const chainId = MultichainUtilities.CHAIN_IDS.LOCALHOST;
-          await MultichainTestDApp.createSessionWithNetworks([chainId]);
-
-          const method = 'wallet_getCapabilities';
-
-          await MultichainTestDApp.invokeMethod(chainId, method);
-
-          const resultText = await MultichainTestDApp.getInvokeMethodResult(
-            chainId,
-            method,
-          );
-
-          const result = JSON.parse(resultText ?? '{}');
-
-          const expectedResult = {
-            '0x539': {
-              atomic: { status: 'ready' },
-            },
-          };
-
-          await Assertions.checkIfObjectsMatch(result, expectedResult);
-        },
-      );
-    });
-
-    it('should be able to call: wallet_sendCalls', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder().withDefaultFixture().build(),
-          restartDevice: true,
-          localNodeOptions: [
-            {
-              type: LocalNodeType.anvil,
-              options: ANVIL_NODE_OPTIONS_WITH_GATOR[0]
-                .options as AnvilNodeOptions,
-            },
-          ],
-          testSpecificMock: REMOTE_FEATURE_EIP_7702_MOCK,
-        },
-        async () => {
-          await MultichainTestDApp.setupAndNavigateToTestDapp();
-
-          const chainId = MultichainUtilities.CHAIN_IDS.LOCALHOST;
-          await MultichainTestDApp.createSessionWithNetworks([chainId]);
-
-          const method = 'wallet_sendCalls';
-
-          await MultichainTestDApp.invokeMethod(chainId, method);
-
-          await FooterActions.tapConfirmButton();
-
-          const resultText = await MultichainTestDApp.getInvokeMethodResult(
-            chainId,
-            method,
-          );
-
-          const result = JSON.parse(resultText ?? '{}');
-
-          Assertions.checkIfObjectHasKeysAndValidValues(result, {
-            id: isHexString,
-          });
-        },
-      );
-    });
-
-    it('should be able to call: wallet_getCallsStatus', async () => {
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder().withDefaultFixture().build(),
-          restartDevice: true,
-          localNodeOptions: [
-            {
-              type: LocalNodeType.anvil,
-              options: ANVIL_NODE_OPTIONS_WITH_GATOR[0]
-                .options as AnvilNodeOptions,
-            },
-          ],
-          testSpecificMock: REMOTE_FEATURE_EIP_7702_MOCK,
-        },
-        async () => {
-          await MultichainTestDApp.setupAndNavigateToTestDapp();
-
-          const chainId = MultichainUtilities.CHAIN_IDS.LOCALHOST;
-          await MultichainTestDApp.createSessionWithNetworks([chainId]);
-
-          // First call wallet_sendCalls to get a batch ID
-          const sendCallsMethod = 'wallet_sendCalls';
-          await MultichainTestDApp.invokeMethod(chainId, sendCallsMethod);
-
-          await FooterActions.tapConfirmButton();
-
-          const sendCallsResultText =
-            await MultichainTestDApp.getInvokeMethodResult(
-              chainId,
-              sendCallsMethod,
-            );
-
-          const sendCallsResult = JSON.parse(sendCallsResultText ?? '{}');
-          const batchId = sendCallsResult.id;
-
-          if (!batchId || !isHexString(batchId)) {
-            throw new Error(
-              `Invalid batch ID from wallet_sendCalls: ${batchId}`,
-            );
-          }
-
-          // Now call wallet_getCallsStatus with the batch ID
-          const getStatusMethod = 'wallet_getCallsStatus';
-
-          await MultichainTestDApp.invokeMethod(chainId, getStatusMethod, [
-            batchId,
-          ]);
-
-          const getStatusResultText =
-            await MultichainTestDApp.getInvokeMethodResult(
-              chainId,
-              getStatusMethod,
-            );
-
-          const getStatusResult = JSON.parse(getStatusResultText ?? '{}');
-
-          Assertions.checkIfObjectHasKeysAndValidValues(getStatusResult, {
-            version: (value: unknown) =>
-              typeof value === 'string' && value.length > 0,
-            id: isHexString,
-            chainId: isHexString,
-            atomic: Boolean,
-            status: (value: unknown) => value === 200,
-            receipts: Array.isArray,
-          });
-        },
-      );
-    });
-  });
-});
diff --git a/tests/smoke/multichain/wallet-notify.failing.ts b/tests/smoke/multichain/wallet-notify.failing.ts
deleted file mode 100644
index 3e8d58470266..000000000000
--- a/tests/smoke/multichain/wallet-notify.failing.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * E2E tests for wallet_notify API
- * Tests receiving notifications for subscribed events on specific chains
- *
- * TEST FLOW:
- * 1. Create a session with MetaMask Mobile
- * 2. Subscribe to blockchain events using eth_subscribe
- * 3. Verify the subscription returns a valid ID (hex string)
- * 4. Wait for and verify that notifications are delivered to the dapp
- *
- * WHAT WE'RE TESTING:
- * - wallet_notify allows dapps to receive real-time blockchain event notifications
- * - eth_subscribe creates a subscription and returns a subscription ID
- * - The wallet delivers notifications which appear as "wallet-notify-details-X" elements
- *
- * DETOX WEBVIEW LIMITATIONS AND METHODOLOGY:
- * ==========================================
- * Detox has significant limitations when working with webviews:
- * 1. Cannot use by.web.text() or by.web.attr() - only by.web.id() and by.web.className() work
- * 2. Cannot get innerHTML or text content directly from elements
- * 3. Elements might exist in DOM but not be "visible" according to Detox visibility rules
- *
- * Our methodology to work around these limitations:
- * 1. Use element IDs exclusively for selection (added id="wallet-notify-empty" to the dapp)
- * 2. Use scrollToView() to bring elements into viewport
- * 3. Use tap() to verify elements are interactive even if not "visible"
- * 4. Infer state by checking presence/absence of specific elements
- * 5. Check for state changes (empty → has notifications) to prove functionality
- */
-import { SmokeMultiChainAPI } from '../../tags';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import MultichainTestDApp from '../../page-objects/Browser/MultichainTestDApp';
-import MultichainUtilities from '../../helpers/multichain/MultichainUtilities';
-import Assertions from '../../framework/Assertions';
-import { DappVariants } from '../../framework/Constants';
-
-describe(SmokeMultiChainAPI('wallet_notify'), () => {
-  beforeEach(() => {
-    jest.setTimeout(150000);
-  });
-
-  it('should receive a notification through the Multichain API for the event subscribed to', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder().withPopularNetworks().build(),
-        restartDevice: true,
-      },
-      async () => {
-        await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-        const networksToTest =
-          MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
-        await MultichainTestDApp.createSessionWithNetworks(networksToTest);
-
-        const chainId = MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET;
-
-        // Check initial notification state
-        const initiallyEmpty =
-          await MultichainTestDApp.isNotificationContainerEmpty();
-
-        // Subscribe to events
-        const subscribed =
-          await MultichainTestDApp.subscribeToChainEvents(chainId);
-
-        // Verify subscription was successful
-        await Assertions.checkIfTextMatches(
-          subscribed ? 'true' : 'false',
-          'true',
-        );
-
-        console.log('✅ Successfully subscribed to events');
-
-        // Wait for notifications to arrive
-        // Check if we have notifications now
-        const hasNotifications = await MultichainTestDApp.hasNotifications();
-
-        // Verify notifications were delivered
-        await Assertions.checkIfTextMatches(
-          hasNotifications ? 'true' : 'false',
-          'true',
-        );
-
-        if (hasNotifications && initiallyEmpty) {
-          console.log('✅ Confirmed state change: empty → has notifications');
-        }
-
-        console.log('✅ wallet_notify test passed');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/multichain/wallet-revokeSession.spec.ts b/tests/smoke/multichain/wallet-revokeSession.spec.ts
deleted file mode 100644
index 9f22d66dff87..000000000000
--- a/tests/smoke/multichain/wallet-revokeSession.spec.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * E2E tests for wallet_revokeSession API
- * Tests revoking sessions and verifying the session state afterwards
- */
-import { SmokeMultiChainAPI } from '../../tags';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import MultichainTestDApp from '../../page-objects/Browser/MultichainTestDApp';
-import MultichainUtilities from '../../helpers/multichain/MultichainUtilities';
-import { DappVariants } from '../../framework/Constants';
-
-describe(SmokeMultiChainAPI('wallet_revokeSession'), () => {
-  beforeEach(() => {
-    jest.setTimeout(150000);
-  });
-
-  it('should return empty object from wallet_getSession call after revoking session', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withPopularNetworks()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        restartDevice: true,
-      },
-      async () => {
-        await MultichainTestDApp.setupAndNavigateToTestDapp();
-
-        const networksToTest =
-          MultichainUtilities.NETWORK_COMBINATIONS.SINGLE_ETHEREUM;
-
-        await MultichainTestDApp.scrollToPageTop();
-        const connected = await MultichainTestDApp.useAutoConnectButton();
-        if (!connected) {
-          throw new Error('Failed to connect to dapp');
-        }
-        await MultichainTestDApp.tapGetSessionButton();
-
-        // Verify session exists before revoke
-        const sessionBeforeRevoke = await MultichainTestDApp.getSessionData();
-        const assertionsBeforeRevoke =
-          MultichainUtilities.generateSessionAssertions(
-            sessionBeforeRevoke,
-            networksToTest,
-          );
-
-        if (
-          !assertionsBeforeRevoke.success ||
-          assertionsBeforeRevoke.chainCount === 0
-        ) {
-          throw new Error('Session should have non-empty scopes before revoke');
-        }
-
-        // Revoke the session
-        await MultichainTestDApp.tapRevokeSessionButton();
-
-        // Get session data after revoke - should be empty
-        const sessionAfterRevoke = await MultichainTestDApp.getSessionData();
-
-        // Validate the session is now empty
-        const assertionsAfterRevoke =
-          MultichainUtilities.generateSessionAssertions(sessionAfterRevoke, []);
-
-        if (!assertionsAfterRevoke.structureValid) {
-          throw new Error('Invalid session structure after revoke');
-        }
-
-        // After revoke, we should either get success=false or success=true with empty scopes
-        if (assertionsAfterRevoke.success) {
-          // If successful, should have empty session scopes
-          if (assertionsAfterRevoke.chainCount > 0) {
-            MultichainUtilities.logSessionDetails(
-              sessionAfterRevoke,
-              'Unexpected Session After Revoke',
-            );
-            throw new Error(
-              `Expected empty session scopes after revoke, but found ${assertionsAfterRevoke.chainCount} chains`,
-            );
-          }
-        }
-
-        // Verify sessionScopes is empty object
-        if (
-          sessionAfterRevoke.sessionScopes &&
-          Object.keys(sessionAfterRevoke.sessionScopes).length > 0
-        ) {
-          throw new Error('Expected empty session scopes object after revoke');
-        }
-      },
-    );
-  });
-});
diff --git a/tests/smoke/multichain/wallet-sessionChanged.spec.ts b/tests/smoke/multichain/wallet-sessionChanged.spec.ts
deleted file mode 100644
index 13cba2cac975..000000000000
--- a/tests/smoke/multichain/wallet-sessionChanged.spec.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * E2E tests for wallet_sessionChanged API
- * Tests that sessionChanged event is fired when networks are added to the session
- */
-import { SmokeMultiChainAPI } from '../../tags';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import MultichainTestDApp from '../../page-objects/Browser/MultichainTestDApp';
-import MultichainUtilities from '../../helpers/multichain/MultichainUtilities';
-import Assertions from '../../framework/Assertions';
-import { DappVariants } from '../../framework/Constants';
-
-describe(SmokeMultiChainAPI('wallet_sessionChanged'), () => {
-  beforeEach(() => {
-    jest.setTimeout(150000);
-  });
-
-  it('should receive a wallet_sessionChanged event when creating a new session with different networks', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.MULTICHAIN_TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withPopularNetworks()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        restartDevice: true,
-      },
-      async () => {
-        await MultichainTestDApp.setupAndNavigateToTestDapp('?autoMode=true');
-
-        // Modify the fixture-seeded session to include Base, triggering sessionChanged
-        const modifiedNetworks = [
-          MultichainUtilities.CHAIN_IDS.ETHEREUM_MAINNET,
-          MultichainUtilities.CHAIN_IDS.BASE,
-        ];
-
-        await MultichainTestDApp.createSessionWithNetworks(modifiedNetworks);
-
-        // Check the most recent sessionChanged event at index 0
-        const baseScope = MultichainUtilities.getEIP155Scope(
-          MultichainUtilities.CHAIN_IDS.BASE,
-        );
-
-        const eventText =
-          await MultichainTestDApp.getSessionChangedEventData(0);
-
-        // Verify event text exists
-        await Assertions.checkIfValueIsDefined(eventText);
-
-        if (!eventText) {
-          throw new Error('Event text is null or empty');
-        }
-
-        const parsedEvent = JSON.parse(eventText);
-        const eventScopes = Object.keys(
-          parsedEvent.params?.sessionScopes || {},
-        );
-
-        // Verify Base network is included in the event
-        const baseScopeIncluded = eventScopes.includes(baseScope);
-        await Assertions.checkIfTextMatches(
-          baseScopeIncluded ? 'true' : 'false',
-          'true',
-        );
-
-        // Verify eip155 capabilities are published in sessionProperties so
-        // dapp-side caches can resolve wallet_getCapabilities locally.
-        const eip155Capabilities =
-          parsedEvent.params?.sessionProperties?.eip155Capabilities;
-        await Assertions.checkIfValueIsDefined(eip155Capabilities);
-
-        // Capabilities must be keyed by the session's permitted EVM
-        // address(es): assert every eip155 account in the session scopes has
-        // a corresponding capabilities entry (case-insensitive).
-        const capabilityAddresses = Object.keys(eip155Capabilities || {}).map(
-          (address) => address.toLowerCase(),
-        );
-        const permittedAddresses = [
-          ...new Set(
-            eventScopes
-              .filter((scope) => scope.startsWith('eip155:'))
-              .flatMap(
-                (scope) =>
-                  parsedEvent.params?.sessionScopes?.[scope]?.accounts ?? [],
-              )
-              .map((account: string) =>
-                account.split(':').slice(-1)[0].toLowerCase(),
-              ),
-          ),
-        ];
-        await Assertions.checkIfTextMatches(
-          permittedAddresses.length > 0 &&
-            permittedAddresses.every((address) =>
-              capabilityAddresses.includes(address),
-            )
-            ? 'true'
-            : 'false',
-          'true',
-        );
-
-        console.log(
-          '✅ wallet_sessionChanged test passed - event triggered correctly',
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/performance/account-list/dismiss-account-list.spec.ts b/tests/smoke/performance/account-list/dismiss-account-list.spec.ts
deleted file mode 100644
index fc871d54f08a..000000000000
--- a/tests/smoke/performance/account-list/dismiss-account-list.spec.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import { loginToApp } from '../../../flows/wallet.flow';
-import { SmokePerformance } from '../../../tags';
-import WalletView from '../../../page-objects/wallet/WalletView';
-import AccountListBottomSheet from '../../../page-objects/wallet/AccountListBottomSheet';
-import Assertions from '../../../framework/Assertions';
-import TestHelpers from '../../../helpers';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import type {
-  UserKeyringState,
-  UserSnapState,
-  UserPermissionState,
-} from '../../../framework/fixtures/types';
-import { toChecksumAddress } from 'ethereumjs-util';
-import {
-  CORE_USER_STATE,
-  POWER_USER_STATE,
-} from '../../../framework/fixtures/constants';
-import {
-  PerformanceTestReporter,
-  createUserProfileTests,
-  type TestResult,
-} from '../../../reporters/DetoxPerformanceTestReporter';
-
-describe(SmokePerformance('Switching Accounts to Dismiss Load Testing'), () => {
-  const reporter = new PerformanceTestReporter(
-    'Switching Accounts to Dismiss Load Testing',
-  );
-
-  const userStates = [
-    { name: 'CORE_USER', state: CORE_USER_STATE },
-    { name: 'POWER_USER', state: POWER_USER_STATE },
-  ];
-
-  function registerPerformanceTests() {
-    createUserProfileTests(
-      'benchmark switching accounts from the account list',
-      async (_userState) => {
-        // Baseline test with minimal tokens for comparison
-        const minimalTokens = [
-          {
-            address: toChecksumAddress(
-              `0x1111111111111111111111111111111111111111`,
-            ),
-            symbol: 'MIN1',
-            decimals: 18,
-            name: 'Minimal Token 1',
-          },
-          {
-            address: toChecksumAddress(
-              `0x2222222222222222222222222222222222222222`,
-            ),
-            symbol: 'MIN2',
-            decimals: 18,
-            name: 'Minimal Token 2',
-          },
-        ];
-        const isAndroid = device.getPlatform() === 'android';
-
-        const PERFORMANCE_THRESHOLDS = isAndroid
-          ? {
-              DISMISS_ACCOUNT_LIST: 4000, // 4 seconds max for Android
-            }
-          : {
-              DISMISS_ACCOUNT_LIST: 4000, // 4 seconds max for iOS
-            };
-
-        let result: Partial<TestResult> = {};
-
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder()
-              .withUserProfileKeyRing(_userState as UserKeyringState)
-              .withUserProfileSnapUnencryptedState(_userState as UserSnapState)
-              .withUserProfileSnapPermissions(_userState as UserPermissionState)
-              .withTokens(minimalTokens)
-              .build(),
-            restartDevice: true,
-          },
-          async () => {
-            await loginToApp();
-
-            await WalletView.tapIdenticon();
-            await Assertions.expectElementToBeVisible(
-              AccountListBottomSheet.accountList,
-            );
-
-            console.log('Account list became visible');
-            const startTime = Date.now();
-            await AccountListBottomSheet.tapAccountByName('Account 3');
-
-            await Assertions.expectElementToNotBeVisible(
-              AccountListBottomSheet.accountList,
-            );
-            const endTime = Date.now();
-            console.log('Account list is not visible');
-
-            const dismissTime = endTime - startTime;
-
-            // Baseline should be very fast
-            if (dismissTime > PERFORMANCE_THRESHOLDS.DISMISS_ACCOUNT_LIST) {
-              console.warn(
-                `Baseline test failed: Account dismissal took ${dismissTime}ms, which exceeded the maximum acceptable time (${PERFORMANCE_THRESHOLDS.DISMISS_ACCOUNT_LIST}ms)`,
-              );
-            }
-
-            console.log('Account dismissal test completed!');
-            console.log(
-              '📊 Performance metrics: No navigation/render time measured for this test type',
-            );
-
-            result = {
-              totalTime: dismissTime,
-              thresholds: {
-                totalTime: PERFORMANCE_THRESHOLDS.DISMISS_ACCOUNT_LIST,
-              },
-            };
-          },
-        );
-
-        return result;
-      },
-      userStates,
-      reporter,
-    );
-  }
-
-  registerPerformanceTests();
-
-  beforeAll(async () => {
-    jest.setTimeout(300000);
-    await TestHelpers.reverseServerPort();
-    reporter.initializeSuite();
-  });
-
-  afterAll(async () => {
-    reporter.finalizeSuite();
-  });
-});
diff --git a/tests/smoke/performance/account-list/render-account-list.spec.ts b/tests/smoke/performance/account-list/render-account-list.spec.ts
deleted file mode 100644
index d5bb16c27e72..000000000000
--- a/tests/smoke/performance/account-list/render-account-list.spec.ts
+++ /dev/null
@@ -1,306 +0,0 @@
-import { loginToApp } from '../../../flows/wallet.flow';
-import { SmokePerformance } from '../../../tags';
-import WalletView from '../../../page-objects/wallet/WalletView';
-import AccountListBottomSheet from '../../../page-objects/wallet/AccountListBottomSheet';
-import Assertions from '../../../framework/Assertions';
-import TestHelpers from '../../../helpers';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import type {
-  UserKeyringState,
-  UserSnapState,
-  UserPermissionState,
-} from '../../../framework/fixtures/types';
-import { toChecksumAddress } from 'ethereumjs-util';
-import {
-  CORE_USER_STATE,
-  POWER_USER_STATE,
-} from '../../../framework/fixtures/constants';
-import {
-  PerformanceTestReporter,
-  PerformanceTestError,
-  createUserProfileTests,
-  type TestResult,
-} from '../../../reporters/DetoxPerformanceTestReporter';
-
-describe(SmokePerformance('Account List Load Testing'), () => {
-  const reporter = new PerformanceTestReporter('Account List Load Testing');
-
-  const userStates = [
-    { name: 'CORE_USER', state: CORE_USER_STATE },
-    { name: 'POWER_USER', state: POWER_USER_STATE },
-  ];
-
-  function registerPerformanceTests() {
-    createUserProfileTests(
-      'render account list efficiently with multiple accounts and networks',
-      async (userState) => {
-        const isAndroid = device.getPlatform() === 'android';
-        const PERFORMANCE_THRESHOLDS = isAndroid
-          ? {
-              TOTAL_TIME: 5900, // 5.9 seconds max for Android
-            }
-          : {
-              TOTAL_TIME: 4000, // 4 seconds max for iOS
-            };
-
-        console.log(
-          `Running performance test on ${device.getPlatform().toUpperCase()}`,
-        );
-        console.log(
-          `Thresholds - Total: ${PERFORMANCE_THRESHOLDS.TOTAL_TIME}ms`,
-        );
-
-        let result: Partial<TestResult> = {};
-
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder()
-              .withPopularNetworks()
-              .withUserProfileKeyRing(userState as UserKeyringState)
-              .withUserProfileSnapUnencryptedState(userState as UserSnapState)
-              .withUserProfileSnapPermissions(userState as UserPermissionState)
-              .build(),
-            restartDevice: true,
-          },
-          async () => {
-            await loginToApp();
-
-            await Assertions.expectElementToBeVisible(WalletView.container);
-            // Measure time to navigate to account list
-            const startTime = Date.now();
-
-            await WalletView.tapIdenticon();
-
-            // Check if account list is visible
-            await Assertions.expectElementToBeVisible(
-              AccountListBottomSheet.accountList,
-            );
-
-            await Assertions.expectTextDisplayed('Account 1');
-
-            const endTime = Date.now();
-            const totalTime = endTime - startTime;
-
-            // Log performance metrics
-            console.warn('\n🎯 PERFORMANCE RESULTS');
-            console.warn(`📱 Platform: ${device.getPlatform().toUpperCase()}`);
-            console.warn(`⏱️  Total Time: ${totalTime}ms`);
-            console.warn('='.repeat(50));
-
-            result = {
-              totalTime,
-              thresholds: {
-                totalTime: PERFORMANCE_THRESHOLDS.TOTAL_TIME,
-              },
-            };
-
-            // Performance assertions with warnings
-            if (totalTime > PERFORMANCE_THRESHOLDS.TOTAL_TIME) {
-              throw new PerformanceTestError(
-                `Performance test failed: Total time (${totalTime}ms) exceeded maximum acceptable time (${PERFORMANCE_THRESHOLDS.TOTAL_TIME}ms)`,
-                result,
-              );
-            }
-
-            console.log('✅ Performance test passed!');
-
-            await AccountListBottomSheet.swipeToDismissAccountsModal();
-          },
-        );
-
-        return result;
-      },
-      userStates,
-      reporter,
-    );
-
-    createUserProfileTests(
-      'handle account list performance with heavy token load',
-      async (userState) => {
-        // Create a large number of test tokens to stress test the system
-        const heavyTokenLoad = [];
-        for (let i = 1; i <= 10; i++) {
-          // 50 tokens for stress testing
-          heavyTokenLoad.push({
-            address: toChecksumAddress(
-              `0xabcd${i.toString().padStart(36, '0')}`,
-            ),
-            symbol: `HEAVY${i}`,
-            decimals: 18,
-            name: `Heavy Load Token ${i}`,
-          });
-        }
-        const isAndroid = device.getPlatform() === 'android';
-        const HEAVY_LOAD_THRESHOLDS = isAndroid
-          ? {
-              TOTAL_TIME: 4200, // 4.2 seconds max for Android
-            }
-          : {
-              TOTAL_TIME: 9200, // Temporarily increased for iOS to 9.2 seconds to unblock CI and avoid skipping the test
-            };
-
-        let result: Partial<TestResult> = {};
-
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder()
-              .withUserProfileKeyRing(userState as UserKeyringState)
-              .withUserProfileSnapUnencryptedState(userState as UserSnapState)
-              .withUserProfileSnapPermissions(userState as UserPermissionState)
-              .withPopularNetworks()
-              .withTokensForAllPopularNetworks(
-                heavyTokenLoad,
-                userState as UserKeyringState,
-              )
-              .build(),
-            restartDevice: true,
-          },
-          async () => {
-            await loginToApp();
-
-            console.log('Starting heavy load test with 50 tokens');
-
-            const startTime = Date.now();
-            await WalletView.tapIdenticon();
-            await Assertions.expectElementToBeVisible(
-              AccountListBottomSheet.accountList,
-            );
-
-            await Assertions.expectTextDisplayed('Account 1');
-
-            const endTime = Date.now();
-            const totalTime = endTime - startTime;
-
-            console.log('========== HEAVY LOAD TEST RESULTS ==========');
-            console.warn(`⏱️  Total Time: ${totalTime}ms`);
-            console.log(
-              '=====================================================================',
-            );
-
-            result = {
-              totalTime,
-              thresholds: {
-                totalTime: HEAVY_LOAD_THRESHOLDS.TOTAL_TIME,
-              },
-            };
-
-            if (totalTime > HEAVY_LOAD_THRESHOLDS.TOTAL_TIME) {
-              throw new PerformanceTestError(
-                `Heavy load test failed: Total time (${totalTime}ms) exceeded maximum acceptable time (${HEAVY_LOAD_THRESHOLDS.TOTAL_TIME}ms)`,
-                result,
-              );
-            }
-
-            console.log('✅ Heavy load test passed!');
-          },
-        );
-
-        return result;
-      },
-      userStates,
-      reporter,
-    );
-
-    createUserProfileTests(
-      'benchmark account list with minimal load',
-      async (_userState) => {
-        const isAndroid = device.getPlatform() === 'android';
-        const BASELINE_THRESHOLDS = isAndroid
-          ? {
-              TOTAL_TIME: 3800, // 3.8 seconds max for Android
-            }
-          : {
-              TOTAL_TIME: 6000, // Temporarily increased for iOS to 6.0 seconds to unblock CI and avoid skipping the test
-            };
-        // Baseline test with minimal tokens for comparison
-        const minimalTokens = [
-          {
-            address: toChecksumAddress(
-              `0x1111111111111111111111111111111111111111`,
-            ),
-            symbol: 'MIN1',
-            decimals: 18,
-            name: 'Minimal Token 1',
-          },
-          {
-            address: toChecksumAddress(
-              `0x2222222222222222222222222222222222222222`,
-            ),
-            symbol: 'MIN2',
-            decimals: 18,
-            name: 'Minimal Token 2',
-          },
-        ];
-
-        let result: Partial<TestResult> = {};
-
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder()
-              .withUserProfileKeyRing(_userState as UserKeyringState)
-              .withUserProfileSnapUnencryptedState(_userState as UserSnapState)
-              .withUserProfileSnapPermissions(_userState as UserPermissionState)
-              .withTokens(minimalTokens)
-              .build(),
-            restartDevice: true,
-          },
-          async () => {
-            await loginToApp();
-
-            console.log('Starting baseline test with minimal load...');
-
-            const startTime = Date.now();
-            await WalletView.tapIdenticon();
-            await Assertions.expectElementToBeVisible(
-              AccountListBottomSheet.accountList,
-            );
-
-            await Assertions.expectTextDisplayed('Account 1');
-
-            const endTime = Date.now();
-            const totalTime = endTime - startTime;
-
-            console.log('========== BASELINE TEST RESULTS ==========');
-            console.warn(`⏱️  Total Time: ${totalTime}ms`);
-            console.log('==========================================');
-
-            result = {
-              totalTime,
-              thresholds: {
-                totalTime: BASELINE_THRESHOLDS.TOTAL_TIME,
-              },
-            };
-
-            // Baseline should be very fast
-            if (totalTime > BASELINE_THRESHOLDS.TOTAL_TIME) {
-              throw new PerformanceTestError(
-                `Baseline test failed: Total time (${totalTime}ms) exceeded maximum acceptable time (${BASELINE_THRESHOLDS.TOTAL_TIME}ms)`,
-                result,
-              );
-            }
-
-            console.log('✅ Minimal load test passed!');
-            await AccountListBottomSheet.swipeToDismissAccountsModal();
-          },
-        );
-
-        return result;
-      },
-      userStates,
-      reporter,
-    );
-  }
-
-  registerPerformanceTests();
-
-  beforeAll(async () => {
-    jest.setTimeout(300000);
-    await TestHelpers.reverseServerPort();
-    reporter.initializeSuite();
-  });
-
-  afterAll(async () => {
-    reporter.finalizeSuite();
-  });
-});
diff --git a/tests/smoke/performance/network-list/dismiss-network-list.spec.ts b/tests/smoke/performance/network-list/dismiss-network-list.spec.ts
deleted file mode 100644
index 65b3ff2228e6..000000000000
--- a/tests/smoke/performance/network-list/dismiss-network-list.spec.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { loginToApp } from '../../../flows/wallet.flow';
-import { SmokePerformance } from '../../../tags';
-import WalletView from '../../../page-objects/wallet/WalletView';
-import Assertions from '../../../framework/Assertions';
-import TestHelpers from '../../../helpers';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import type {
-  UserKeyringState,
-  UserSnapState,
-  UserPermissionState,
-} from '../../../framework/fixtures/types';
-import NetworkManager from '../../../page-objects/wallet/NetworkManager';
-import {
-  CORE_USER_STATE,
-  POWER_USER_STATE,
-} from '../../../framework/fixtures/constants';
-import {
-  PerformanceTestReporter,
-  createUserProfileTests,
-  type TestResult,
-} from '../../../reporters/DetoxPerformanceTestReporter';
-import { NetworkToCaipChainId } from '../../../../app/components/UI/NetworkMultiSelector/NetworkMultiSelector.constants';
-
-describe(SmokePerformance('Network List Load Testing'), () => {
-  const reporter = new PerformanceTestReporter('Network List Load Testing');
-
-  const userStates = [
-    { name: 'CORE_USER', state: CORE_USER_STATE },
-    { name: 'POWER_USER', state: POWER_USER_STATE },
-  ];
-
-  function registerPerformanceTests() {
-    createUserProfileTests(
-      'benchmark switching networks from the network list',
-      async (userState) => {
-        // Baseline test with minimal tokens for comparison
-        const minimalTokens = [
-          {
-            address: '0x1111111111111111111111111111111111111111',
-            symbol: 'MIN1',
-            decimals: 18,
-            name: 'Minimal Token 1',
-          },
-          {
-            address: '0x2222222222222222222222222222222222222222',
-            symbol: 'MIN2',
-            decimals: 18,
-            name: 'Minimal Token 2',
-          },
-        ];
-
-        const isAndroid = device.getPlatform() === 'android';
-
-        const PERFORMANCE_THRESHOLDS = isAndroid
-          ? {
-              DISMISS_NETWORK_LIST: 2500, // 2.5 seconds max for Android
-            }
-          : {
-              DISMISS_NETWORK_LIST: 1500, // 1.5 seconds max for iOS
-            };
-
-        let result: Partial<TestResult> = {};
-
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder()
-              .withTokens(minimalTokens)
-              .withPopularNetworks()
-              .withUserProfileKeyRing(userState as UserKeyringState)
-              .withUserProfileSnapUnencryptedState(userState as UserSnapState)
-              .withUserProfileSnapPermissions(userState as UserPermissionState)
-              .build(),
-            restartDevice: true,
-          },
-          async () => {
-            await loginToApp();
-
-            console.log('Starting network switching test...');
-
-            await WalletView.tapTokenNetworkFilter();
-            await Assertions.expectElementToBeVisible(
-              NetworkManager.popularNetworksContainer,
-            );
-            console.log('Network list became visible');
-
-            const startTime = Date.now();
-            await NetworkManager.tapNetwork(NetworkToCaipChainId.POLYGON);
-            await Assertions.expectElementToNotBeVisible(
-              NetworkManager.popularNetworksContainer,
-            );
-            const endTime = Date.now();
-            console.log('Network switched and list is not visible');
-
-            const timeToDismissNetworkList = endTime - startTime;
-
-            result = {
-              totalTime: timeToDismissNetworkList,
-              thresholds: {
-                totalTime: PERFORMANCE_THRESHOLDS.DISMISS_NETWORK_LIST,
-              },
-            };
-
-            // Baseline should be very fast
-            if (
-              timeToDismissNetworkList >
-              PERFORMANCE_THRESHOLDS.DISMISS_NETWORK_LIST
-            ) {
-              console.warn(
-                `Network switching test failed: Total time (${timeToDismissNetworkList}ms) exceeded maximum acceptable time (${PERFORMANCE_THRESHOLDS.DISMISS_NETWORK_LIST}ms)`,
-                result,
-              );
-            }
-
-            console.log('Network switching test completed!');
-          },
-        );
-
-        return result;
-      },
-      userStates,
-      reporter,
-    );
-  }
-
-  registerPerformanceTests();
-
-  beforeAll(async () => {
-    jest.setTimeout(300000);
-    await TestHelpers.reverseServerPort();
-    reporter.initializeSuite();
-  });
-
-  afterAll(async () => {
-    reporter.finalizeSuite();
-  });
-});
diff --git a/tests/smoke/performance/network-list/render-network-list.spec.ts b/tests/smoke/performance/network-list/render-network-list.spec.ts
deleted file mode 100644
index 959ac6a5ac09..000000000000
--- a/tests/smoke/performance/network-list/render-network-list.spec.ts
+++ /dev/null
@@ -1,296 +0,0 @@
-import { loginToApp } from '../../../flows/wallet.flow';
-import { SmokePerformance } from '../../../tags';
-import WalletView from '../../../page-objects/wallet/WalletView';
-import Assertions from '../../../framework/Assertions';
-import TestHelpers from '../../../helpers';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import type {
-  UserKeyringState,
-  UserSnapState,
-  UserPermissionState,
-} from '../../../framework/fixtures/types';
-import NetworkManager from '../../../page-objects/wallet/NetworkManager';
-import { toChecksumAddress } from 'ethereumjs-util';
-import {
-  CORE_USER_STATE,
-  POWER_USER_STATE,
-} from '../../../framework/fixtures/constants';
-import {
-  PerformanceTestReporter,
-  createUserProfileTests,
-  type TestResult,
-} from '../../../reporters/DetoxPerformanceTestReporter';
-
-describe(SmokePerformance('Network List Load Testing'), () => {
-  const reporter = new PerformanceTestReporter('Network List Load Testing');
-
-  const userStates = [
-    { name: 'POWER_USER', state: POWER_USER_STATE },
-    { name: 'CORE_USER', state: CORE_USER_STATE },
-    // { name: 'CASUAL_USER', state: CASUAL_USER_STATE },
-  ];
-
-  function registerPerformanceTests() {
-    createUserProfileTests(
-      'render network list efficiently with multiple accounts and all popular networks',
-      async (userState) => {
-        // Platform-specific performance thresholds (in milliseconds)
-        const isAndroid = device.getPlatform() === 'android';
-        const PERFORMANCE_THRESHOLDS = isAndroid
-          ? {
-              TOTAL_TIME: 17500, // 17.5 seconds max for Android
-            }
-          : {
-              TOTAL_TIME: 6500, // 6.5 seconds max for iOS
-            };
-
-        console.log(
-          `Running performance test on ${device.getPlatform().toUpperCase()}`,
-        );
-        console.log(
-          `Thresholds - Total time: ${PERFORMANCE_THRESHOLDS.TOTAL_TIME}ms`,
-        );
-
-        let result: Partial<TestResult> = {};
-
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder()
-              .withPopularNetworks()
-              .withUserProfileKeyRing(userState as UserKeyringState)
-              .withUserProfileSnapUnencryptedState(userState as UserSnapState)
-              .withUserProfileSnapPermissions(userState as UserPermissionState)
-              .build(),
-            restartDevice: true,
-          },
-          async () => {
-            await loginToApp();
-
-            await Assertions.expectElementToBeVisible(WalletView.container);
-            // Measure time to navigate to account list
-            const starTime = Date.now();
-
-            await WalletView.tapTokenNetworkFilter();
-
-            // Re-enable sync and check if network list is visible
-            await Assertions.expectElementToBeVisible(
-              NetworkManager.popularNetworksContainer,
-            );
-            console.log('Network list became visible');
-
-            await Assertions.expectTextDisplayed('Linea Main Network');
-
-            const totalTime = Date.now() - starTime;
-
-            // Log performance metrics
-            console.log(
-              '========== NETWORK LIST LOAD TESTING RESULTS ==========',
-            );
-            console.log(`Platform: ${device.getPlatform().toUpperCase()}`);
-            console.log(`Total time: ${totalTime}ms`);
-
-            console.log(
-              '======================================================',
-            );
-
-            result = {
-              totalTime,
-              thresholds: {
-                totalTime: PERFORMANCE_THRESHOLDS.TOTAL_TIME,
-              },
-            };
-
-            if (totalTime > PERFORMANCE_THRESHOLDS.TOTAL_TIME) {
-              console.warn(
-                `Performance test failed: Total time (${totalTime}ms) exceeded maximum acceptable time (${PERFORMANCE_THRESHOLDS.TOTAL_TIME}ms)`,
-                result,
-              );
-            }
-
-            console.log('Performance test passed!');
-          },
-        );
-
-        return result;
-      },
-      userStates,
-      reporter,
-    );
-
-    createUserProfileTests(
-      'handle network list performance with heavy token load on all popular networks',
-      async (userState) => {
-        // Create a large number of test tokens to stress test the system
-        const heavyTokenLoad = [];
-        for (let i = 1; i <= 10; i++) {
-          // 50 tokens for stress testing
-          heavyTokenLoad.push({
-            address: toChecksumAddress(
-              `0xabcd${i.toString().padStart(36, '0')}`,
-            ),
-            symbol: `HEAVY${i}`,
-            decimals: 18,
-            name: `Heavy Load Token ${i}`,
-          });
-        }
-
-        const isAndroid = device.getPlatform() === 'android';
-
-        const HEAVY_LOAD_THRESHOLDS = isAndroid
-          ? {
-              TOTAL_TIME: 8000, // 8 seconds max for Android
-            }
-          : {
-              TOTAL_TIME: 8000, // 8 seconds max for iOS
-            };
-
-        let result: Partial<TestResult> = {};
-
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder()
-              .withPopularNetworks()
-              .withUserProfileKeyRing(userState as UserKeyringState)
-              .withUserProfileSnapUnencryptedState(userState as UserSnapState)
-              .withUserProfileSnapPermissions(userState as UserPermissionState)
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              .withTokensForAllPopularNetworks(heavyTokenLoad, userState as any)
-              .build(),
-            restartDevice: true,
-          },
-          async () => {
-            await loginToApp();
-
-            console.log(
-              'Starting heavy load test with 50 tokens + all popular networks...',
-            );
-
-            const startTime = Date.now();
-            await WalletView.tapTokenNetworkFilter();
-
-            const endTime = Date.now();
-            await Assertions.expectElementToBeVisible(
-              NetworkManager.popularNetworksContainer,
-            );
-
-            const totalTime = endTime - startTime;
-
-            console.log('========== HEAVY LOAD TEST RESULTS ==========');
-            console.log(`Results will be in the generated json file`);
-            console.log('=============================================');
-
-            // Quality gate for heavy load
-            if (totalTime > HEAVY_LOAD_THRESHOLDS.TOTAL_TIME) {
-              console.warn(
-                `Heavy load test failed: Total time (${totalTime}ms) exceeded maximum acceptable time (${HEAVY_LOAD_THRESHOLDS.TOTAL_TIME}ms)`,
-              );
-            }
-            result = {
-              totalTime,
-              thresholds: {
-                totalTime: HEAVY_LOAD_THRESHOLDS.TOTAL_TIME,
-              },
-            };
-          },
-        );
-
-        return result;
-      },
-      userStates,
-      reporter,
-    );
-
-    createUserProfileTests(
-      'benchmark network list with minimal load',
-      async (userState) => {
-        // Baseline test with minimal tokens for comparison
-        const minimalTokens = [
-          {
-            address: '0x1111111111111111111111111111111111111111',
-            symbol: 'MIN1',
-            decimals: 18,
-            name: 'Minimal Token 1',
-          },
-          {
-            address: '0x2222222222222222222222222222222222222222',
-            symbol: 'MIN2',
-            decimals: 18,
-            name: 'Minimal Token 2',
-          },
-        ];
-        const isAndroid = device.getPlatform() === 'android';
-
-        const PERFORMANCE_THRESHOLDS = isAndroid
-          ? {
-              RENDER_NETWORK_LIST: 2500, // 2.5 seconds max for Android
-            }
-          : {
-              RENDER_NETWORK_LIST: 1500, // 1.5 seconds max for iOS
-            };
-        let result: Partial<TestResult> = {};
-
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder()
-              .withTokens(minimalTokens)
-              .withPopularNetworks()
-              .withUserProfileKeyRing(userState as UserKeyringState)
-              .withUserProfileSnapUnencryptedState(userState as UserSnapState)
-              .withUserProfileSnapPermissions(userState as UserPermissionState)
-              .build(),
-            restartDevice: true,
-          },
-          async () => {
-            await loginToApp();
-
-            console.log('Starting baseline test with minimal load...');
-
-            await WalletView.tapTokenNetworkFilter();
-
-            const startTime = Date.now();
-            await Assertions.expectElementToBeVisible(
-              NetworkManager.popularNetworksContainer,
-            );
-            const endTime = Date.now();
-
-            const totalTime = endTime - startTime;
-
-            result = {
-              totalTime,
-              thresholds: {
-                totalTime: PERFORMANCE_THRESHOLDS.RENDER_NETWORK_LIST,
-              },
-            };
-
-            // Baseline should be very fast
-            if (totalTime > PERFORMANCE_THRESHOLDS.RENDER_NETWORK_LIST) {
-              console.warn(
-                `Baseline test failed: Total time (${totalTime}ms) exceeded maximum acceptable time (${PERFORMANCE_THRESHOLDS.RENDER_NETWORK_LIST}ms)`,
-                result,
-              );
-            }
-
-            console.log('Baseline test completed!');
-          },
-        );
-
-        return result;
-      },
-      userStates,
-      reporter,
-    );
-  }
-
-  registerPerformanceTests();
-
-  beforeAll(async () => {
-    jest.setTimeout(300000); // 5 minutes timeout for load testing
-    await TestHelpers.reverseServerPort();
-    reporter.initializeSuite();
-  });
-
-  afterAll(async () => {
-    reporter.finalizeSuite();
-  });
-});
diff --git a/tests/smoke/performance/quality-gates.md b/tests/smoke/performance/quality-gates.md
deleted file mode 100644
index a109a497df8e..000000000000
--- a/tests/smoke/performance/quality-gates.md
+++ /dev/null
@@ -1,181 +0,0 @@
-# 🎯 Performance Quality Gates
-
-This document outlines the performance thresholds (quality gates) for MetaMask Mobile's critical user flows. These thresholds ensure optimal user experience across different platforms and scenarios.
-
-## 📱 Platform Overview
-
-- **Android**: Generally has higher thresholds due to platform constraints
-- **iOS**: Lower thresholds leveraging platform optimizations
-- **Quality Gates**: Hard limits that cause test failures if exceeded
-
-## 📊 Test Reporting
-
-Performance tests automatically generate detailed reports using the `PerformanceTestReporter` utility:
-
-- **JSON Reports**: Structured performance data for analysis
-- **Test Results**: Include timing metrics, thresholds, and pass/fail status
-- **User Profile Testing**: Tests run across different user states (CORE_USER, POWER_USER)
-
----
-
-## 🏠 Account List Performance Tests
-
-### Test: `render account list efficiently with multiple accounts and networks`
-
-**Configuration**: Multiple accounts, popular networks, profile syncing enabled
-
-| Platform    | Total Max Time | Notes               |
-| ----------- | -------------- | ------------------- |
-| **Android** | 5900ms         | 5.9 seconds maximum |
-| **iOS**     | 4000ms         | 4 seconds maximum   |
-
----
-
-### Test: `handle account list performance with heavy token load`
-
-**Configuration**: Multiple accounts, popular networks, 10 tokens for stress testing
-
-| Platform    | Total Max Time | Notes               |
-| ----------- | -------------- | ------------------- |
-| **Android** | 4200ms         | 4.2 seconds maximum |
-| **iOS**     | 4200ms         | 4.2 seconds maximum |
-
----
-
-### Test: `benchmark account list with minimal load`
-
-**Configuration**: Minimal accounts, default network, 2 tokens (baseline measurement)
-
-| Platform    | Total Max Time | Notes               |
-| ----------- | -------------- | ------------------- |
-| **Android** | 3800ms         | 3.8 seconds maximum |
-| **iOS**     | 3800ms         | 3.8 seconds maximum |
-
----
-
-### Test: `benchmark switching accounts from the account list`
-
-**Configuration**: Account switching/dismissal performance
-
-| Platform    | Dismissal Max Time | Notes             |
-| ----------- | ------------------ | ----------------- |
-| **Android** | 5,000ms            | 5 seconds maximum |
-| **iOS**     | 4,000ms            | 4 seconds maximum |
-
----
-
-## 🌐 Network List Performance Tests
-
-### Test: `render network list efficiently with multiple accounts and all popular networks`
-
-**Configuration**: Multiple accounts, all popular networks
-
-| Platform    | Total Max Time | Notes                |
-| ----------- | -------------- | -------------------- |
-| **Android** | 17,500ms       | 17.5 seconds maximum |
-| **iOS**     | 6,500ms        | 6.5 seconds maximum  |
-
----
-
-### Test: `handle network list performance with heavy token load on all popular networks`
-
-**Configuration**: Multiple accounts, popular networks, 10 tokens for stress testing
-
-| Platform    | Total Max Time | Notes                |
-| ----------- | -------------- | -------------------- |
-| **Android** | 17,500ms       | 17.5 seconds maximum |
-| **iOS**     | 6,500ms        | 6.5 seconds maximum  |
-
----
-
-### Test: `benchmark network list with minimal load`
-
-**Configuration**: Minimal tokens, popular networks (baseline measurement)
-
-| Platform    | Render Max Time | Notes               |
-| ----------- | --------------- | ------------------- |
-| **Android** | 2,500ms         | 2.5 seconds maximum |
-| **iOS**     | 1,500ms         | 1.5 seconds maximum |
-
----
-
-### Test: `benchmark switching networks from the network list`
-
-**Configuration**: Network switching/dismissal performance
-
-| Platform    | Dismissal Max Time | Notes               |
-| ----------- | ------------------ | ------------------- |
-| **Android** | 2,500ms            | 2.5 seconds maximum |
-| **iOS**     | 1,500ms            | 1.5 seconds maximum |
-
----
-
-## 📊 Test Summary
-
-### Account List Tests (4 tests)
-
-- ✅ **Standard Load**: Multiple accounts, popular networks
-- ✅ **Heavy Load**: Multiple accounts, 10 tokens, popular networks
-- ✅ **Baseline Test**: Minimal accounts, 2 tokens, default network
-- ✅ **Dismissal Test**: Account switching performance
-
-### Network List Tests (4 tests)
-
-- ✅ **Standard Load**: Multiple accounts, popular networks
-- ✅ **Heavy Load**: Multiple accounts, 10 tokens, popular networks
-- ✅ **Baseline Test**: Minimal tokens, popular networks
-- ✅ **Dismissal Test**: Network switching performance
-
-**Total**: 8 performance tests across critical user flows
-
----
-
-## 🚨 Quality Gate Rules
-
-### Failure Criteria
-
-Tests fail immediately when total time exceeds the maximum acceptable time for any scenario.
-
-### Performance Patterns
-
-- **Heavy Token Load**: Increases render times but maintains same thresholds as standard load
-- **Platform Differences**: iOS consistently performs better than Android
-- **Baseline Tests**: Should complete quickly but have generous thresholds for stability
-- **Dismissal Tests**: Focus on UI responsiveness during state transitions
-
-### User Profile Testing
-
-Tests run across different user states with varying account complexity:
-
-#### User Profile Definitions
-
-- **CASUAL_USER**: 2 EVM accounts from 1 SRP _(currently not used in tests)_
-- **CORE_USER**: 5 EVM accounts and 5 Solana accounts from 1 SRP
-- **POWER_USER**: 15 EVM accounts from 2 SRPs + 5 Solana accounts
-
-#### Current Test Coverage
-
-- **CORE_USER**: Standard user configuration for baseline performance
-- **POWER_USER**: Enhanced user configuration with maximum account complexity
-
----
-
-## 📈 Reporting Features
-
-### Automated Reports
-
-- **JSON Output**: Structured performance data for CI/CD integration
-- **Test Metrics**: Total time measurements and performance thresholds
-- **Threshold Tracking**: Pass/fail status with actual vs. expected performance
-- **User Profile Results**: Separate results for different user configurations
-
-### Report Usage
-
-Performance reports can be used for:
-
-- Continuous integration quality gates
-- Performance regression detection
-- Platform-specific optimization insights
-- User experience benchmarking
-
----
diff --git a/tests/smoke/perps/perps-add-funds.spec.ts b/tests/smoke/perps/perps-add-funds.spec.ts
deleted file mode 100644
index 08b60f80b527..000000000000
--- a/tests/smoke/perps/perps-add-funds.spec.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { LocalNodeType, TestSuiteParams } from '../../framework/types';
-import { Hardfork } from '../../seeder/anvil-manager';
-import { SmokePerps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import {
-  PERPS_ARBITRUM_MOCKS,
-  mockPerpsGeolocation,
-} from '../../api-mocking/mock-responses/perps-arbitrum-mocks';
-import { RampsRegions, RampsRegionsEnum } from '../../framework/Constants';
-import Assertions from '../../framework/Assertions';
-import Matchers from '../../framework/Matchers';
-import Gestures from '../../framework/Gestures';
-import WalletView from '../../page-objects/wallet/WalletView';
-import PerpsDepositView from '../../page-objects/Perps/PerpsDepositView';
-import PerpsHomeView from '../../page-objects/Perps/PerpsHomeView';
-import PerpsE2EModifiers from '../../helpers/perps/perps-modifiers';
-import ToastModal from '../../page-objects/wallet/ToastModal';
-import Utilities from '../../framework/Utilities';
-import { createLogger, LogLevel } from '../../framework/logger';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { PerpsMarketBalanceActionsSelectorsIDs } from '../../../app/components/UI/Perps/Perps.testIds';
-
-const logger = createLogger({
-  name: 'PerpsAddFundsSpec',
-  level: LogLevel.INFO,
-});
-
-describe.skip(
-  SmokePerps('Perps - Add funds (has funds, not first time)'),
-  () => {
-    beforeEach(async () => {
-      jest.setTimeout(150000);
-    });
-
-    it('deposits $80 from Add funds and verifies updated balance', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder()
-            .withPerpsProfile('no-positions')
-            .withPerpsFirstTimeUser(false)
-            .withAccountTreeController()
-            .withKeyringControllerOfMultipleAccounts()
-            .withNetworkController({
-              type: 'rpc',
-              chainId: '0xa4b1',
-              rpcUrl: 'https://arb1.arbitrum.io/rpc',
-              nickname: 'Arbitrum One',
-              ticker: 'ETH',
-            })
-            .withTokensForAllPopularNetworks([
-              {
-                address: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
-                symbol: 'USDC',
-                decimals: 6,
-                name: 'USD Coin',
-                type: 'erc20',
-              },
-            ])
-            .withTokens(
-              [
-                {
-                  address: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                  symbol: 'USDC',
-                  decimals: 6,
-                  name: 'USD Coin',
-                  type: 'erc20',
-                },
-              ],
-              '0xa4b1',
-              '0xbacec2e26c5c794de6e82a1a7e21b9c329fa8cf6',
-            )
-            .build(),
-          restartDevice: true,
-          testSpecificMock: async (mockServer: Mockttp) => {
-            await setupRemoteFeatureFlagsMock(mockServer, {});
-            await PERPS_ARBITRUM_MOCKS(mockServer);
-            await mockPerpsGeolocation(
-              mockServer,
-              RampsRegions[RampsRegionsEnum.SPAIN],
-            );
-          },
-          useCommandQueueServer: true,
-          localNodeOptions: [
-            {
-              type: LocalNodeType.anvil,
-              options: { hardfork: 'prague' as Hardfork },
-            },
-          ],
-        },
-        async ({ commandQueueServer }: TestSuiteParams) => {
-          if (!commandQueueServer) {
-            throw new Error('Command queue server not found');
-          }
-          await loginToApp();
-          await device.disableSynchronization();
-          await Assertions.expectElementToBeVisible(
-            WalletView.container as DetoxElement,
-            {
-              description: 'Wallet view visible',
-            },
-          );
-
-          // Go to Perps tab
-          await WalletView.scrollAndTapPerpsSection();
-          await PerpsHomeView.tapExploreCryptoIfVisible();
-
-          const addFundsButton = Matchers.getElementByID(
-            PerpsMarketBalanceActionsSelectorsIDs.ADD_FUNDS_BUTTON,
-          );
-          const balanceValueElement = Matchers.getElementByID(
-            PerpsMarketBalanceActionsSelectorsIDs.BALANCE_VALUE,
-          );
-
-          // Wait until Perps balance actions are fully rendered (skeleton can persist briefly).
-          await Utilities.executeWithRetry(
-            async () => {
-              const isAddFundsVisible = await Utilities.isElementVisible(
-                addFundsButton,
-                2000,
-              );
-              if (!isAddFundsVisible) {
-                throw new Error('Perps Add funds CTA is not visible yet');
-              }
-            },
-            { interval: 1000, timeout: 20000 },
-          );
-
-          // Read initial balance text for later comparison
-          const balanceAttrs = await (
-            (await balanceValueElement) as IndexableNativeElement
-          ).getAttributes();
-          const initialBalanceText =
-            (
-              balanceAttrs as {
-                text?: string;
-                label?: string;
-                value?: string;
-              }
-            ).text || '0';
-          const initialBalance =
-            parseFloat(initialBalanceText.replace(/[^0-9.-]/g, '')) || 0;
-
-          // Open Add Funds from balance menu and verify deposit screen is reached.
-          // In this flow the first tap can happen while Perps is still settling.
-          await Utilities.executeWithRetry(
-            async () => {
-              await Gestures.waitAndTap(addFundsButton, {
-                elemDescription: 'Perps Add Funds Button',
-              });
-              await Assertions.expectElementToBeVisible(
-                PerpsDepositView.amountInput as DetoxElement,
-                {
-                  description:
-                    'Deposit amount input visible after tapping Add funds',
-                  timeout: 5000,
-                },
-              );
-            },
-            { interval: 1000, timeout: 30000 },
-          );
-
-          // If a network-added toast appears, wait for it to disappear before interacting
-          await Assertions.expectElementToNotBeVisible(
-            ToastModal.container as DetoxElement,
-            {
-              description: 'No toast visible before entering amount',
-              timeout: 10000,
-            },
-          );
-
-          // Ensure deposit UI visible
-          await PerpsDepositView.expectLoaded();
-
-          // Focus and type 80 using keypad helpers
-          await PerpsDepositView.focusAmount();
-          await PerpsDepositView.typeUSD('80');
-
-          // Continue and Confirm
-          await PerpsDepositView.tapContinue();
-          // Verify review screen shows quote
-          await Assertions.expectTextDisplayed('Transaction fee');
-          await PerpsDepositView.tapAddFunds();
-
-          await PerpsE2EModifiers.applyDepositUSDServer(
-            commandQueueServer,
-            '80',
-          );
-          logger.info('🔥 E2E Mock: Deposit applied');
-          await Utilities.executeWithRetry(
-            async () => {
-              const currentAttrs = await (
-                (await balanceValueElement) as IndexableNativeElement
-              ).getAttributes();
-              const currentText =
-                (
-                  currentAttrs as {
-                    text?: string;
-                    label?: string;
-                    value?: string;
-                  }
-                ).text || '0';
-              const current =
-                parseFloat(currentText.replace(/[^0-9.-]/g, '')) || 0;
-              await Assertions.checkIfValueIsDefined(
-                current === initialBalance + 80,
-              );
-            },
-            { interval: 1000, timeout: 60000 },
-          );
-        },
-      );
-    });
-  },
-);
diff --git a/tests/smoke/perps/perps-limit-long-fill.spec.ts b/tests/smoke/perps/perps-limit-long-fill.spec.ts
deleted file mode 100644
index e43d57762d00..000000000000
--- a/tests/smoke/perps/perps-limit-long-fill.spec.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { SmokePerps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import {
-  PERPS_ARBITRUM_MOCKS,
-  mockPerpsGeolocation,
-} from '../../api-mocking/mock-responses/perps-arbitrum-mocks';
-import { placeLimitOrderAtPreset } from '../../flows/perps.flow';
-import PerpsMarketDetailsView from '../../page-objects/Perps/PerpsMarketDetailsView';
-import Utilities from '../../framework/Utilities';
-import { RampsRegions, RampsRegionsEnum } from '../../framework/Constants';
-import PerpsE2EModifiers from '../../helpers/perps/perps-modifiers';
-import { TestSuiteParams } from '../../framework/types';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-
-describe(SmokePerps('Perps - ETH limit long fill'), () => {
-  it('creates ETH limit long at Mid, shows open order, then fills after -15%', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder()
-          .withPerpsProfile('no-positions')
-          .withPerpsFirstTimeUser(false)
-          .withAccountTreeController()
-          .withNetworkController({
-            type: 'rpc',
-            chainId: '0xa4b1',
-            rpcUrl: 'https://arb1.arbitrum.io/rpc',
-            nickname: 'Arbitrum One',
-            ticker: 'ETH',
-          })
-          .withTokensForAllPopularNetworks([
-            {
-              address: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
-              symbol: 'USDC',
-              decimals: 6,
-              name: 'USD Coin',
-              type: 'erc20',
-            },
-          ])
-          .build(),
-        restartDevice: true,
-        permissions: { notifications: 'YES' },
-        testSpecificMock: async (mockServer: Mockttp) => {
-          await setupRemoteFeatureFlagsMock(mockServer, {});
-          await PERPS_ARBITRUM_MOCKS(mockServer);
-          await mockPerpsGeolocation(
-            mockServer,
-            RampsRegions[RampsRegionsEnum.SPAIN],
-          );
-        },
-        useCommandQueueServer: true,
-      },
-      async ({ commandQueueServer }: TestSuiteParams) => {
-        if (!commandQueueServer) {
-          throw new Error('Command queue server not found');
-        }
-        await loginToApp();
-
-        await device.disableSynchronization();
-
-        await placeLimitOrderAtPreset('ETH', 'long', 'Mid');
-
-        await PerpsMarketDetailsView.expectCompactOpenOrderVisible({
-          direction: 'long',
-        });
-
-        await PerpsE2EModifiers.updateMarketPriceServer(
-          commandQueueServer,
-          'ETH',
-          '2125.00',
-        );
-
-        await Utilities.executeWithRetry(
-          async () => {
-            await PerpsMarketDetailsView.expectClosePositionButtonVisible();
-          },
-          {
-            interval: 1000,
-            timeout: 60000,
-            description: 'wait for limit long to fill into an open position',
-          },
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/perps/perps-position-liquidation.spec.ts b/tests/smoke/perps/perps-position-liquidation.spec.ts
deleted file mode 100644
index e8025a2b942b..000000000000
--- a/tests/smoke/perps/perps-position-liquidation.spec.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-import { loginToApp } from '../../flows/wallet.flow';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import { SmokePerps } from '../../tags';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import {
-  PERPS_ARBITRUM_MOCKS,
-  mockPerpsGeolocation,
-} from '../../api-mocking/mock-responses/perps-arbitrum-mocks';
-import PerpsMarketDetailsView from '../../page-objects/Perps/PerpsMarketDetailsView';
-import PerpsE2EModifiers from '../../helpers/perps/perps-modifiers';
-import {
-  createLogger,
-  LogLevel,
-  Utilities,
-  type TestSuiteParams,
-} from '../../framework';
-import { RampsRegions, RampsRegionsEnum } from '../../framework/Constants';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import CommandQueueServer from '../../framework/fixtures/CommandQueueServer';
-import {
-  openPosition,
-  type PerpsPositionDirection,
-} from '../../flows/perps.flow';
-
-const logger = createLogger({
-  name: 'PerpsPositionLiquidationSpec',
-  level: LogLevel.INFO,
-});
-
-const MARKET_SYMBOL = 'ETH';
-const POSITION_DIRECTION: PerpsPositionDirection = 'long';
-const MARK_PRICE_BY_DIRECTION: Record<
-  PerpsPositionDirection,
-  {
-    nonLiquidating: string;
-    liquidating: string;
-    liquidatingPriceDirection: 'below' | 'above';
-  }
-> = {
-  long: {
-    nonLiquidating: '2400.00',
-    liquidating: '1.00',
-    liquidatingPriceDirection: 'below',
-  },
-  short: {
-    nonLiquidating: '2600.00',
-    liquidating: '100000.00',
-    liquidatingPriceDirection: 'above',
-  },
-};
-
-const setupPerpsMocks = async (mockServer: Mockttp) => {
-  await setupRemoteFeatureFlagsMock(mockServer, {});
-  await PERPS_ARBITRUM_MOCKS(mockServer);
-  await mockPerpsGeolocation(mockServer, RampsRegions[RampsRegionsEnum.SPAIN]);
-};
-
-const buildPerpsFixture = () =>
-  new FixtureBuilder()
-    .withPerpsProfile('no-positions')
-    .withPerpsFirstTimeUser(false)
-    .withAccountTreeController()
-    .withNetworkController({
-      type: 'rpc',
-      chainId: '0xa4b1',
-      rpcUrl: 'https://arb1.arbitrum.io/rpc',
-      nickname: 'Arbitrum One',
-      ticker: 'ETH',
-    })
-    .withTokensForAllPopularNetworks([
-      {
-        address: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
-        symbol: 'USDC',
-        decimals: 6,
-        name: 'USD Coin',
-        type: 'erc20',
-      },
-    ])
-    .build();
-
-const expectPositionClosedAfterLiquidation = async () => {
-  await Utilities.executeWithRetry(
-    async () => {
-      await PerpsMarketDetailsView.expectClosePositionButtonNotVisible();
-    },
-    {
-      interval: 1000,
-      timeout: 30000,
-      description: 'wait for Close position to disappear after liquidation',
-    },
-  );
-};
-
-const queueLiquidationCheckAtPrice = async (
-  commandQueueServer: CommandQueueServer,
-  symbol: string,
-  price: string,
-) => {
-  await PerpsE2EModifiers.updateMarketPriceServer(
-    commandQueueServer,
-    symbol,
-    price,
-  );
-  await PerpsE2EModifiers.triggerLiquidationServer(commandQueueServer, symbol);
-};
-
-const waitForCommandQueueToProcess = async (
-  commandQueueServer: CommandQueueServer,
-) => {
-  commandQueueServer.requestStateExport();
-  await commandQueueServer.getExportedState();
-};
-
-describe(SmokePerps('Perps Position Liquidation'), () => {
-  it(`liquidates a ${POSITION_DIRECTION} position when mark price moves ${MARK_PRICE_BY_DIRECTION[POSITION_DIRECTION].liquidatingPriceDirection} liquidation price`, async () => {
-    await withFixtures(
-      {
-        fixture: buildPerpsFixture(),
-        restartDevice: true,
-        permissions: { notifications: 'YES' },
-        testSpecificMock: setupPerpsMocks,
-        useCommandQueueServer: true,
-      },
-      async ({ commandQueueServer }: TestSuiteParams) => {
-        if (!commandQueueServer) {
-          throw new Error('Command queue server not found');
-        }
-
-        logger.info('Using E2E mock balance - no wallet import needed');
-        logger.info(`Opening ${MARKET_SYMBOL} ${POSITION_DIRECTION} position`);
-
-        await loginToApp();
-        await device.disableSynchronization();
-
-        await openPosition(MARKET_SYMBOL, POSITION_DIRECTION);
-
-        logger.info(
-          `Pushing ${MARKET_SYMBOL} mark price that should keep ${POSITION_DIRECTION} open`,
-        );
-
-        await queueLiquidationCheckAtPrice(
-          commandQueueServer,
-          MARKET_SYMBOL,
-          MARK_PRICE_BY_DIRECTION[POSITION_DIRECTION].nonLiquidating,
-        );
-        await waitForCommandQueueToProcess(commandQueueServer);
-
-        logger.info(
-          `Verifying ${MARKET_SYMBOL} ${POSITION_DIRECTION} remains open after non-liquidating price change`,
-        );
-        await PerpsMarketDetailsView.expectClosePositionButtonVisible();
-
-        logger.info(
-          `Pushing ${MARKET_SYMBOL} mark price ${MARK_PRICE_BY_DIRECTION[POSITION_DIRECTION].liquidatingPriceDirection} liquidation price to liquidate ${POSITION_DIRECTION}`,
-        );
-
-        await queueLiquidationCheckAtPrice(
-          commandQueueServer,
-          MARKET_SYMBOL,
-          MARK_PRICE_BY_DIRECTION[POSITION_DIRECTION].liquidating,
-        );
-
-        logger.info(
-          `Verifying ${MARKET_SYMBOL} ${POSITION_DIRECTION} is closed after liquidation`,
-        );
-        await expectPositionClosedAfterLiquidation();
-      },
-    );
-  });
-});
diff --git a/tests/smoke/perps/perps-position-stop-loss.spec.ts b/tests/smoke/perps/perps-position-stop-loss.spec.ts
deleted file mode 100644
index 85d4566869eb..000000000000
--- a/tests/smoke/perps/perps-position-stop-loss.spec.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { loginToApp } from '../../flows/wallet.flow';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import { SmokePerps } from '../../tags';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { navigateToPerpsOrderEntry } from '../../flows/perps.flow';
-import {
-  PERPS_ARBITRUM_MOCKS,
-  mockPerpsGeolocation,
-} from '../../api-mocking/mock-responses/perps-arbitrum-mocks';
-import PerpsMarketDetailsView from '../../page-objects/Perps/PerpsMarketDetailsView';
-import PerpsOrderView from '../../page-objects/Perps/PerpsOrderView';
-import PerpsE2EModifiers from '../../helpers/perps/perps-modifiers';
-import {
-  createLogger,
-  LogLevel,
-  Utilities,
-  type TestSuiteParams,
-} from '../../framework';
-import { RampsRegions, RampsRegionsEnum } from '../../framework/Constants';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-
-const logger = createLogger({
-  name: 'PerpsPositionStopLossSpec',
-  level: LogLevel.INFO,
-});
-
-describe(SmokePerps('Perps Position Stop Loss'), () => {
-  it('opens a long with stop loss and closes when mark crosses the SL trigger', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder()
-          .withPerpsProfile('no-positions')
-          .withPerpsFirstTimeUser(false)
-          .withAccountTreeController()
-          .withNetworkController({
-            type: 'rpc',
-            chainId: '0xa4b1',
-            rpcUrl: 'https://arb1.arbitrum.io/rpc',
-            nickname: 'Arbitrum One',
-            ticker: 'ETH',
-          })
-          .withTokensForAllPopularNetworks([
-            {
-              address: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
-              symbol: 'USDC',
-              decimals: 6,
-              name: 'USD Coin',
-              type: 'erc20',
-            },
-          ])
-          .build(),
-        restartDevice: true,
-        permissions: { notifications: 'YES' },
-        testSpecificMock: async (mockServer: Mockttp) => {
-          await setupRemoteFeatureFlagsMock(mockServer, {});
-          await PERPS_ARBITRUM_MOCKS(mockServer);
-          await mockPerpsGeolocation(
-            mockServer,
-            RampsRegions[RampsRegionsEnum.SPAIN],
-          );
-        },
-        useCommandQueueServer: true,
-      },
-      async ({ commandQueueServer }: TestSuiteParams) => {
-        if (!commandQueueServer) {
-          throw new Error('Command queue server not found');
-        }
-
-        logger.info('💰 Using E2E mock balance - no wallet import needed');
-        await loginToApp();
-        await device.disableSynchronization();
-
-        await navigateToPerpsOrderEntry('ETH', 'long');
-
-        await PerpsOrderView.tapTakeProfitButton();
-        // Default ETH mock mark ~2500; SL below entry for a long
-        await PerpsOrderView.enterCustomStopLossTriggerPrice('2300');
-
-        await PerpsOrderView.tapPlaceOrderButton();
-
-        await PerpsMarketDetailsView.waitForScreenReady();
-        await PerpsMarketDetailsView.expectClosePositionButtonVisible();
-
-        logger.info('📈 E2E Mock: Long opened with stop loss trigger at 2300');
-
-        await PerpsE2EModifiers.updateMarketPriceServer(
-          commandQueueServer,
-          'ETH',
-          '2250.00',
-        );
-
-        logger.info(
-          '📉 E2E Mock: Mark pushed below SL — position should close via trigger',
-        );
-
-        // Assert on market details (same screen as above): Close position was shown when the long
-        // existed; after SL the mock removes the position — do not use Perps tab row + fixed "3x"
-        // (mock uses params.leverage || 1; UI default is usually 3x but is not guaranteed here).
-        await Utilities.executeWithRetry(
-          async () => {
-            await PerpsMarketDetailsView.expectClosePositionButtonNotVisible();
-          },
-          {
-            interval: 1000,
-            timeout: 30000,
-            description:
-              'wait for Close position to disappear after stop loss trigger',
-          },
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/perps/perps-position.spec.ts b/tests/smoke/perps/perps-position.spec.ts
deleted file mode 100644
index 8941e7bed161..000000000000
--- a/tests/smoke/perps/perps-position.spec.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { loginToApp } from '../../flows/wallet.flow';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import { SmokePerps } from '../../tags';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { navigateToPerpsOrderEntry } from '../../flows/perps.flow';
-import {
-  PERPS_ARBITRUM_MOCKS,
-  mockPerpsGeolocation,
-} from '../../api-mocking/mock-responses/perps-arbitrum-mocks';
-import { RampsRegions, RampsRegionsEnum } from '../../framework/Constants';
-import PerpsMarketDetailsView from '../../page-objects/Perps/PerpsMarketDetailsView';
-import PerpsOrderView from '../../page-objects/Perps/PerpsOrderView';
-import PerpsView from '../../page-objects/Perps/PerpsView';
-import { createLogger, LogLevel } from '../../framework';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-
-// E2E environment setup - mocks auto-configure via hasTestOverrides flag
-
-const logger = createLogger({
-  name: 'PerpsPositionSpec',
-  level: LogLevel.INFO,
-});
-
-describe(SmokePerps('Perps Position'), () => {
-  it('opens a long position with custom profit and closes it', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder()
-          .withPerpsProfile('no-positions')
-          .withPerpsFirstTimeUser(false)
-          .withAccountTreeController()
-          .withNetworkController({
-            type: 'rpc',
-            chainId: '0xa4b1',
-            rpcUrl: 'https://arb1.arbitrum.io/rpc',
-            nickname: 'Arbitrum One',
-            ticker: 'ETH',
-          })
-          .withTokensForAllPopularNetworks([
-            {
-              address: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
-              symbol: 'USDC',
-              decimals: 6,
-              name: 'USD Coin',
-              type: 'erc20',
-            },
-          ])
-          .build(),
-        restartDevice: true,
-        permissions: { notifications: 'YES' },
-        testSpecificMock: async (mockServer: Mockttp) => {
-          await setupRemoteFeatureFlagsMock(mockServer, {});
-          await PERPS_ARBITRUM_MOCKS(mockServer);
-          await mockPerpsGeolocation(
-            mockServer,
-            RampsRegions[RampsRegionsEnum.SPAIN],
-          );
-        },
-      },
-      async () => {
-        logger.info('💰 Using E2E mock balance - no wallet import needed');
-        logger.info('🎯 Mock account: $10,000 total, $8,000 available');
-        await loginToApp();
-        // Keep consistency with other passing Perps smoke flows where
-        // streaming/network activity can block Detox idling.
-        await device.disableSynchronization();
-
-        await navigateToPerpsOrderEntry('ETH', 'long');
-
-        // Custom TP trigger above mock ETH mark (~2500) for a long
-        await PerpsOrderView.tapTakeProfitButton();
-        await PerpsOrderView.enterCustomTakeProfitTriggerPrice('2800');
-        await PerpsOrderView.tapPlaceOrderButton();
-
-        // Wait for screen ready and assert Close Position availability
-        await PerpsMarketDetailsView.waitForScreenReady();
-        await PerpsMarketDetailsView.expectClosePositionButtonVisible();
-
-        await PerpsView.tapClosePositionButton();
-
-        logger.info('📉 E2E Mock: Preparing to close position');
-
-        await PerpsView.tapClosePositionBottomSheetButton();
-
-        logger.info('🎉 E2E Mock: Position closed successfully');
-        logger.info('💰 E2E Mock: Balance updated with P&L');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/perps/perps-withdraw.spec.ts b/tests/smoke/perps/perps-withdraw.spec.ts
deleted file mode 100644
index f1f49f46fc71..000000000000
--- a/tests/smoke/perps/perps-withdraw.spec.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { SmokePerps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { openPerpsWithdrawPayConfirmation } from '../../flows/perps.flow';
-import {
-  PERPS_ARBITRUM_MOCKS,
-  mockPerpsGeolocation,
-} from '../../api-mocking/mock-responses/perps-arbitrum-mocks';
-import { RampsRegions, RampsRegionsEnum } from '../../framework/Constants';
-import Assertions from '../../framework/Assertions';
-import WalletView from '../../page-objects/wallet/WalletView';
-import TransactionPayConfirmation from '../../page-objects/Confirmation/TransactionPayConfirmation';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { createLogger, LogLevel } from '../../framework/logger';
-import { Mockttp } from 'mockttp';
-
-const logger = createLogger({
-  name: 'PerpsWithdrawSpec',
-  level: LogLevel.INFO,
-});
-
-// Enables the Perps "withdraw to any token" (MetaMask Pay) flow. When this flag
-// is on, the Perps Withdraw button routes to the shared CustomAmount
-// confirmation instead of the legacy PerpsWithdrawView. The E2E remote-flag mock
-// serves the unresolved LaunchDarkly config, so we provide the flat
-// { default, overrides } shape that selectPayQuoteConfig reads directly.
-const ENABLE_PERPS_WITHDRAW_ANY_TOKEN = {
-  confirmations_pay_post_quote: {
-    default: { enabled: true, tokens: {} },
-    overrides: {
-      perpsWithdraw: {
-        enabled: true,
-        tokens: {
-          '0xa4b1': [
-            '0x0000000000000000000000000000000000000000',
-            '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-          ],
-        },
-      },
-    },
-  },
-};
-
-describe(SmokePerps('Perps - Withdraw to any token (MetaMask Pay)'), () => {
-  beforeEach(() => {
-    jest.setTimeout(150000);
-  });
-
-  it('reaches the MetaMask Pay withdraw confirmation', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder()
-          .withPerpsProfile('no-positions')
-          .withPerpsFirstTimeUser(false)
-          .withAccountTreeController()
-          .withNetworkController({
-            type: 'rpc',
-            chainId: '0xa4b1',
-            rpcUrl: 'https://arb1.arbitrum.io/rpc',
-            nickname: 'Arbitrum One',
-            ticker: 'ETH',
-          })
-          .withTokensForAllPopularNetworks([
-            {
-              address: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
-              symbol: 'USDC',
-              decimals: 6,
-              name: 'USD Coin',
-              type: 'erc20',
-            },
-          ])
-          .withPopularNetworks()
-          .build(),
-        restartDevice: true,
-        permissions: { notifications: 'YES' },
-        testSpecificMock: async (mockServer: Mockttp) => {
-          await setupRemoteFeatureFlagsMock(
-            mockServer,
-            ENABLE_PERPS_WITHDRAW_ANY_TOKEN,
-          );
-          await PERPS_ARBITRUM_MOCKS(mockServer);
-          await mockPerpsGeolocation(
-            mockServer,
-            RampsRegions[RampsRegionsEnum.SPAIN],
-          );
-        },
-      },
-      async () => {
-        logger.info(
-          '💰 Using E2E mock balance: $10,000 total, $8,000 available',
-        );
-        await loginToApp();
-        await device.disableSynchronization();
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          description: 'Wallet view visible',
-        });
-
-        // Open Perps and tap Withdraw until the MetaMask Pay custom-amount
-        // confirmation is reached — proving the new withdraw-to-any-token flow,
-        // not the legacy PerpsWithdrawView.
-        await openPerpsWithdrawPayConfirmation();
-
-        // New-flow marker absent from the legacy PerpsWithdrawView: the available
-        // Perps balance row rendered on the shared CustomAmount confirmation.
-        await TransactionPayConfirmation.verifyAvailableBalanceVisible();
-
-        logger.info(
-          '🎉 E2E Mock: Perps withdraw-to-any-token confirmation reached',
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-background-events.spec.ts b/tests/smoke/snaps/test-snap-background-events.spec.ts
deleted file mode 100644
index aef5322eacc6..000000000000
--- a/tests/smoke/snaps/test-snap-background-events.spec.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import Assertions from '../../framework/Assertions';
-import Matchers from '../../framework/Matchers';
-import { BrowserViewSelectorsIDs } from '../../../app/components/Views/BrowserTab/BrowserView.testIds';
-import { TestSnapResultSelectorWebIDS } from '../../selectors/Browser/TestSnaps.selectors';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Background Events Snap Tests'), () => {
-  it('can connect to the background events Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectBackgroundEventsButton');
-      },
-    );
-  });
-
-  it('it schedules a background event with an ISO 8601 date string', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        const futureDate = new Date(Date.now() + 5_000).toISOString();
-
-        await TestSnaps.fillMessage('backgroundEventDateInput', futureDate);
-        await TestSnaps.tapButton('scheduleBackgroundEventWithDateButton');
-        await TestSnaps.checkResultSpanNotEmpty(
-          'scheduleBackgroundEventResultSpan',
-        );
-
-        await Assertions.expectTextDisplayed(
-          'This dialog was triggered by a background event',
-        );
-        await TestSnaps.tapFooterButton();
-      },
-    );
-  });
-
-  it('schedules a background event with an ISO 8601 duration', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.fillMessage('backgroundEventDurationInput', 'PT5S');
-        await TestSnaps.tapButton('scheduleBackgroundEventWithDurationButton');
-        await TestSnaps.checkResultSpanNotEmpty(
-          'scheduleBackgroundEventResultSpan',
-        );
-
-        await Assertions.expectTextDisplayed(
-          'This dialog was triggered by a background event',
-        );
-        await TestSnaps.tapFooterButton();
-      },
-    );
-  });
-
-  it('schedules, lists, and cancels a background event', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        // Intentionally scheduling an event for 1 hour into the future, so it
-        // doesn't actually fire during the test.
-        await TestSnaps.fillMessage('backgroundEventDurationInput', 'PT1H');
-        await TestSnaps.tapButton('scheduleBackgroundEventWithDurationButton');
-        await TestSnaps.checkResultSpanNotEmpty(
-          'scheduleBackgroundEventResultSpan',
-        );
-
-        await TestSnaps.tapButton('getBackgroundEventResultButton');
-        await TestSnaps.checkResultSpanIncludes(
-          'getBackgroundEventsResultSpan',
-          'fireDialog',
-        );
-
-        const resultElement = await Matchers.getElementByWebID(
-          BrowserViewSelectorsIDs.BROWSER_WEBVIEW_ID,
-          TestSnapResultSelectorWebIDS.scheduleBackgroundEventResultSpan,
-        );
-
-        const id = JSON.parse(await resultElement.getText());
-        await TestSnaps.fillMessage('cancelBackgroundEventInput', id);
-        await TestSnaps.tapButton('cancelBackgroundEventButton');
-
-        await TestSnaps.tapButton('getBackgroundEventResultButton');
-        await TestSnaps.checkResultJson('getBackgroundEventsResultSpan', []);
-      },
-    );
-  });
-
-  it('shows an error when trying to schedule a background event in the past', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        const pastDate = new Date(Date.now() - 5_000).toISOString();
-
-        await TestSnaps.fillMessage('backgroundEventDateInput', pastDate);
-        await TestSnaps.tapButton('scheduleBackgroundEventWithDateButton');
-        await Assertions.expectTextDisplayed(
-          'Cannot schedule an event in the past.',
-          { timeout: 30000 },
-        );
-        await TestSnaps.dismissAlert();
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-bip-32.spec.ts b/tests/smoke/snaps/test-snap-bip-32.spec.ts
deleted file mode 100644
index b244d7cb201c..000000000000
--- a/tests/smoke/snaps/test-snap-bip-32.spec.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import Assertions from '../../framework/Assertions';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('BIP-32 Snap Tests'), () => {
-  it('can connect to BIP-32 snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectBip32Button');
-      },
-    );
-  });
-
-  it('can get BIP-32 public key', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.tapButton('getPublicKeyBip32Button');
-        await TestSnaps.checkResultSpan(
-          'bip32PublicKeyResultSpan',
-          '"0x043e98d696ae15caef75fa8dd204a7c5c08d1272b2218ba3c20feeb4c691eec366606ece56791c361a2320e7fad8bcbb130f66d51c591fc39767ab2856e93f8dfb"',
-        );
-      },
-    );
-  });
-
-  it('can sign BIP-32 message using secp256k1', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.fillMessage('messageSecp256k1Input', 'foo bar');
-        await TestSnaps.tapButton('signMessageBip32Secp256k1Button');
-        await Assertions.checkIfTextIsDisplayed('Signature request');
-        await TestSnaps.approveSignRequest();
-        await TestSnaps.checkResultSpan(
-          'bip32MessageResultSecp256k1Span',
-          '"0x3045022100b3ade2992ea3e5eb58c7550e9bddad356e9554233c8b099ebc3cb418e9301ae2022064746e15ae024808f0ba5d860e44dc4c97e65c8cba6f5ef9ea2e8c819930d2dc"',
-        );
-      },
-    );
-  });
-
-  it('can sign BIP-32 message using ed25519', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.fillMessage('messageEd25519Input', 'foo bar');
-        await TestSnaps.tapButton('signMessageBip32ed25519Button');
-        await Assertions.checkIfTextIsDisplayed('Signature request');
-        await TestSnaps.approveSignRequest();
-        await TestSnaps.checkResultSpan(
-          'bip32MessageResultEd25519Span',
-          '"0xf3215b4d6c59aac7e01b4ceef530d1e2abf4857926b85a81aaae3894505699243768a887b7da4a8c2e0f25196196ba290b6531050db8dc15c252bdd508532a0a"',
-        );
-      },
-    );
-  });
-
-  it('can sign BIP-32 message using ed25519Bip32', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.fillMessage('messageEd25519Bip32Input', 'foo bar');
-        await TestSnaps.tapButton('signMessageBip32ed25519Bip32Button');
-        await Assertions.checkIfTextIsDisplayed('Signature request');
-        await TestSnaps.approveSignRequest();
-        await TestSnaps.checkResultSpan(
-          'bip32MessageResultEd25519Bip32Span',
-          '"0xc279ee3e49f7e392a4e511136c39791e076f9be01d8648f3f1586ecf0f41def1739fa2978f90cfb2da4cf53ccb99405558cffcc4d190199b6949b03b1b8dae05"',
-        );
-      },
-    );
-  });
-
-  it('can sign BIP-32 message using secp256k1 and SRP 1', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.selectInDropdown('bip32EntropyDropDown', 'SRP 1');
-        await TestSnaps.fillMessage('messageSecp256k1Input', 'bar baz');
-        await TestSnaps.tapButton('signMessageBip32Secp256k1Button');
-        await Assertions.checkIfTextIsDisplayed('Signature request');
-        await TestSnaps.approveSignRequest();
-        await TestSnaps.checkResultSpan(
-          'bip32MessageResultSecp256k1Span',
-          '"0x3045022100bd7301b5288fcc15e9c19bf548b666356230343a57f4ef0327a8e81f19ac562c022062698ed00a36e9ddd1563e1dc2e357d747bdfb233192ee1597cabb6c7210a6ba"',
-        );
-      },
-    );
-  });
-
-  it('can sign BIP-32 message using secp256k1 and SRP 2', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.selectInDropdown('bip32EntropyDropDown', 'SRP 2');
-        await TestSnaps.fillMessage('messageSecp256k1Input', 'bar baz');
-        await TestSnaps.tapButton('signMessageBip32Secp256k1Button');
-        await Assertions.checkIfTextIsDisplayed('Signature request');
-        await TestSnaps.approveSignRequest();
-        await TestSnaps.checkResultSpan(
-          'bip32MessageResultSecp256k1Span',
-          '"0x3045022100ad81b36b28f5f5dd47f45a46b2e7cf42e501d2e9b5768627b0702c100f80eb3c02200a481cbbe22b47b4ea6cd923a7da22952f5b21a0dc52e841dcd08f7af8c74e05"',
-        );
-      },
-    );
-  });
-
-  it('fails when choosing the invalid entropy source', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.selectInDropdown('bip32EntropyDropDown', 'Invalid');
-        await TestSnaps.fillMessage('messageSecp256k1Input', 'bar baz');
-        await TestSnaps.tapButton('signMessageBip32Secp256k1Button');
-        await Assertions.expectTextDisplayed(
-          'Entropy source with ID "invalid" not found.',
-          { timeout: 30000 },
-        );
-        await TestSnaps.dismissAlert();
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-bip-44.spec.ts b/tests/smoke/snaps/test-snap-bip-44.spec.ts
deleted file mode 100644
index fe5bb154a0bd..000000000000
--- a/tests/smoke/snaps/test-snap-bip-44.spec.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import Assertions from '../../framework/Assertions';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('BIP-44 Snap Tests'), () => {
-  it('can connect to BIP-44 snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectBip44Button');
-      },
-    );
-  });
-
-  it('can get BIP-44 public key', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.tapButton('getPublicKeyBip44Button');
-        await TestSnaps.checkResultSpan(
-          'bip44ResultSpan',
-          '"0x86debb44fb3a984d93f326131d4c1db0bc39644f1a67b673b3ab45941a1cea6a385981755185ac4594b6521e4d1e08d1"',
-        );
-      },
-    );
-  });
-
-  it('can sign a BIP-44 message', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.fillMessage('messageBip44Input', '1234');
-        await TestSnaps.tapButton('signMessageBip44Button');
-        await TestSnaps.approveSignRequest();
-        await TestSnaps.checkResultSpan(
-          'bip44SignResultSpan',
-          '"0xa41ab87ca50606eefd47525ad90294bbe44c883f6bc53655f1b8a55aa8e1e35df216f31be62e52c7a1faa519420e20810162e07dedb0fde2a4d997ff7180a78232ecd8ce2d6f4ba42ccacad33c5e9e54a8c4d41506bdffb2bb4c368581d8b086"',
-        );
-      },
-    );
-  });
-
-  it('can sign with entropy from SRP 1', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.selectInDropdown('bip44EntropyDropDown', 'SRP 1');
-        await TestSnaps.fillMessage('messageBip44Input', 'foo bar');
-        await TestSnaps.tapButton('signMessageBip44Button');
-        await TestSnaps.approveSignRequest();
-        await TestSnaps.checkResultSpan(
-          'bip44SignResultSpan',
-          '"0x978f82799b8f48cb78ac56153a34d360873c976fd5ec84f7a5291382dde52d6cb478cadd94153970e58e5205c054cdda0071be0551b729d79bd417f7b0fc2b0c51071ca4771c9b2d8238d7d982bc5ec9256645287402348ca0f89202fb1e0773"',
-        );
-      },
-    );
-  });
-
-  it('can sign with entropy from SRP 2', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.selectInDropdown('bip44EntropyDropDown', 'SRP 2');
-        await TestSnaps.fillMessage('messageBip44Input', 'foo bar');
-        await TestSnaps.tapButton('signMessageBip44Button');
-        await TestSnaps.approveSignRequest();
-        await TestSnaps.checkResultSpan(
-          'bip44SignResultSpan',
-          '"0xa8fdc184ded6d9a1b16d2d4070470720e4a946c9899ceb5165c05f9a8c4b026e8f630d6bdb60151f9e84b3c415c4b46c11bc2571022c8391b07faedc0d8c258d532d34c33149c5fc29e17c310437dc47e8afb43b2c55bd47b1b09ea295f7dcb3"',
-        );
-      },
-    );
-  });
-
-  it('fails when choosing the invalid entropy source', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.selectInDropdown('bip44EntropyDropDown', 'Invalid');
-        await TestSnaps.fillMessage('messageBip44Input', 'foo bar');
-        await TestSnaps.tapButton('signMessageBip44Button');
-        await Assertions.expectTextDisplayed(
-          'Entropy source with ID "invalid" not found.',
-          { timeout: 30000 },
-        );
-        await TestSnaps.dismissAlert();
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-dialog.spec.ts b/tests/smoke/snaps/test-snap-dialog.spec.ts
deleted file mode 100644
index 57caef21c53d..000000000000
--- a/tests/smoke/snaps/test-snap-dialog.spec.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import Assertions from '../../framework/Assertions';
-import Gestures from '../../framework/Gestures';
-import { Matchers } from '../../framework';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Dialog Snap Tests'), () => {
-  it('connects to the Dialog Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectDialogSnapButton');
-      },
-    );
-  });
-
-  describe('alert', () => {
-    it('shows an alert dialog', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          skipReactNativeReload: true,
-          disableSynchronization: true,
-        },
-        async () => {
-          await TestSnaps.tapButton('sendAlertButton');
-          await Assertions.expectTextDisplayed(
-            'This is an alert dialog. It has a single button: "OK".',
-          );
-
-          await TestSnaps.tapOkButton();
-          await TestSnaps.checkResultSpan('dialogResultSpan', 'null');
-        },
-      );
-    });
-  });
-
-  describe('confirmation', () => {
-    it('shows a confirmation dialog', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          skipReactNativeReload: true,
-          disableSynchronization: true,
-        },
-        async () => {
-          await TestSnaps.tapButton('sendConfirmationButton');
-          await Assertions.expectTextDisplayed('Confirmation Dialog');
-
-          await TestSnaps.tapApproveButton();
-          await TestSnaps.checkResultSpan('dialogResultSpan', 'true');
-        },
-      );
-    });
-
-    it('shows a confirmation dialog and cancels', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          skipReactNativeReload: true,
-          disableSynchronization: true,
-        },
-        async () => {
-          await TestSnaps.tapButton('sendConfirmationButton');
-          await Assertions.expectTextDisplayed('Confirmation Dialog');
-
-          await TestSnaps.tapCancelButton();
-          await TestSnaps.checkResultSpan('dialogResultSpan', 'false');
-        },
-      );
-    });
-  });
-
-  describe('custom', () => {
-    it('shows a custom dialog', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          skipReactNativeReload: true,
-          disableSynchronization: true,
-        },
-        async () => {
-          await TestSnaps.tapButton('sendCustomButton');
-          await Assertions.expectTextDisplayed('Custom Dialog');
-
-          const input = Matchers.getElementByID('custom-input-snap-ui-input');
-          await Gestures.typeTextAndHideKeyboard(input, 'Hello, World!');
-
-          await TestSnaps.tapConfirmButton();
-          await TestSnaps.checkResultSpan(
-            'dialogResultSpan',
-            '"Hello, World!"',
-          );
-        },
-      );
-    });
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-ethereum-provider.spec.ts b/tests/smoke/snaps/test-snap-ethereum-provider.spec.ts
deleted file mode 100644
index d09da55b93fc..000000000000
--- a/tests/smoke/snaps/test-snap-ethereum-provider.spec.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import Assertions from '../../framework/Assertions';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import ConnectBottomSheet from '../../page-objects/Browser/ConnectBottomSheet';
-import RequestTypes from '../../page-objects/Browser/Confirmations/RequestTypes';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { confirmationFeatureFlags } from '../../api-mocking/mock-responses/feature-flags-mocks';
-import { mockGenesisBlocks } from './mocks';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Ethereum Provider Snap Tests'), () => {
-  it('can use the Ethereum provider', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-        testSpecificMock: async (mockServer: Mockttp) => {
-          await setupRemoteFeatureFlagsMock(
-            mockServer,
-            Object.assign({}, ...confirmationFeatureFlags),
-          );
-          await mockGenesisBlocks(mockServer);
-        },
-      },
-      async () => {
-        await loginToApp();
-
-        // Navigate to test snaps URL once for all tests
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectEthereumProviderButton');
-
-        await TestSnaps.tapButton('getChainIdButton');
-        await TestSnaps.checkResultSpan('ethereumProviderResultSpan', '"0x1"');
-
-        await TestSnaps.tapButton('getAccountsButton');
-        await Assertions.expectElementToBeVisible(
-          ConnectBottomSheet.connectButton,
-        );
-        await ConnectBottomSheet.tapConnectButton();
-        await TestSnaps.checkResultSpanIncludes(
-          'ethereumProviderResultSpan',
-          '"0x5cfe73b6021e818b776b421b1c4db2474086a7e1"',
-        );
-
-        // Test `personal_sign`.
-        await TestSnaps.fillMessage('personalSignMessageInput', 'foo');
-        await TestSnaps.tapButton('personalSignButton');
-        await Assertions.expectElementToBeVisible(
-          RequestTypes.PersonalSignRequest,
-        );
-        await TestSnaps.approveNativeConfirmation();
-        await TestSnaps.checkResultSpan(
-          'personalSignResultSpan',
-          '"0xf63c587cd42e7775e2e815a579f9744ea62944f263b3e69fad48535ba98a5ea107bc878088a99942733a59a89ef1d590eafdb467d59cf76564158d7e78351b751b"',
-        );
-
-        // Test `eth_signTypedData_v4`.
-        await TestSnaps.fillMessage('signTypedDataMessageInput', 'bar');
-        await TestSnaps.tapButton('signTypedDataButton');
-        await Assertions.expectElementToBeVisible(
-          RequestTypes.TypedSignRequest,
-        );
-        await TestSnaps.approveNativeConfirmation();
-        await TestSnaps.checkResultSpan(
-          'signTypedDataResultSpan',
-          '"0x7024dc071a7370eee444b2a3edc08d404dd03393694403cdca864653a7e8dd7c583419293d53602666cbe77faa8819fba04f8c57e95df2d4c0190968eece28021c"',
-        );
-
-        // Check other networks.
-        await TestSnaps.selectInDropdown('networkDropDown', 'Ethereum');
-        await TestSnaps.tapButton('getGenesisHashButton');
-        await TestSnaps.checkResultSpanIncludes(
-          'ethereumProviderResultSpan',
-          '"0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3"',
-        );
-
-        await TestSnaps.selectInDropdown('networkDropDown', 'Linea');
-        await TestSnaps.tapButton('getGenesisHashButton');
-        await TestSnaps.checkResultSpanIncludes(
-          'ethereumProviderResultSpan',
-          '"0xb6762a65689107b2326364aefc18f94cda413209fab35c00d4af51eaa20ffbc6"',
-        );
-
-        await TestSnaps.selectInDropdown('networkDropDown', 'Sepolia');
-        await TestSnaps.tapButton('getGenesisHashButton');
-        await TestSnaps.checkResultSpanIncludes(
-          'ethereumProviderResultSpan',
-          '"0x25a5cc106eea7138acab33231d7160d69cb777ee0c2c553fcddf5138993e6dd9"',
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-get-entropy.spec.ts b/tests/smoke/snaps/test-snap-get-entropy.spec.ts
deleted file mode 100644
index 6ee0b2a23ec2..000000000000
--- a/tests/smoke/snaps/test-snap-get-entropy.spec.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import Assertions from '../../framework/Assertions';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Get Entropy Snap Tests'), () => {
-  it('connects to the Get Entropy Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectGetEntropyButton');
-      },
-    );
-  });
-
-  it('signs a message with the Snap entropy', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.fillMessage('entropyMessageInput', '1234');
-        await TestSnaps.tapButton('signEntropyMessageButton');
-        await Assertions.expectTextDisplayed('Signature request', {
-          description: 'Snap signature request should be visible',
-        });
-        await TestSnaps.approveSignRequest();
-        await TestSnaps.checkResultSpan(
-          'entropySignResultSpan',
-          '"0x9341785782b512c86235612365f1076b16731ed9473beb4d0804c30b7fcc3a055aa7103b02dc64014d923220712dfbef023ddcf6327b313ea2dfd4d83dc5a53e1c5e7f4e10bce49830eded302294054df8a7a46e5b6cb3e50eec564ecba17941"',
-        );
-      },
-    );
-  });
-
-  it.each([
-    [
-      'SRP 1 (primary)',
-      '0xadd276f9d715223dcd20a595acb475f9b7353c451a57af64efb23633280c21aa172bd6689c27a0ac3c003ec4469b093207db956a6bf76689b3cc0b710c4187d5fcdca5f09c9594f146c9a39461e2f6cb03a446f4e62bd341a448ca9a33e96cf2',
-    ],
-    [
-      'SRP 2',
-      '0xa1dba3ddefabb56c5d6d37135fd07752662b5d720c005d619c0ff49eede2fe6f92a3e88e70ff4bb706b9ec2a076925ec159e3f6aa7170d51e428ccafe2353dd858da425c075912f0cd78c750942afef230393dff20d9fb58de14c56a5cd213b1',
-    ],
-  ])(
-    'signs a message with the Snap entropy from %s',
-    async (entropySource, result) => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-          skipReactNativeReload: true,
-          disableSynchronization: true,
-        },
-        async () => {
-          await TestSnaps.selectInDropdown('getEntropyDropDown', entropySource);
-          await TestSnaps.fillMessage('entropyMessageInput', '5678');
-          await TestSnaps.tapButton('signEntropyMessageButton');
-          await Assertions.expectTextDisplayed('Signature request', {
-            description: 'Snap signature request should be visible',
-          });
-          await TestSnaps.approveSignRequest();
-          await TestSnaps.checkResultSpan(
-            'entropySignResultSpan',
-            `"${result}"`,
-          );
-        },
-      );
-    },
-  );
-
-  it('fails when choosing an invalid entropy source', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.selectInDropdown('getEntropyDropDown', 'Invalid');
-        await TestSnaps.fillMessage('entropyMessageInput', 'foo bar');
-        await TestSnaps.tapButton('signEntropyMessageButton');
-        await TestSnaps.approveSignRequest();
-        await Assertions.expectTextDisplayed(
-          'Entropy source with ID "invalid" not found.',
-          { timeout: 30000 },
-        );
-        await TestSnaps.dismissAlert();
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-get-file.spec.ts b/tests/smoke/snaps/test-snap-get-file.spec.ts
deleted file mode 100644
index 81d73a5043fb..000000000000
--- a/tests/smoke/snaps/test-snap-get-file.spec.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Get File Snap Tests'), () => {
-  it('can connect to the get File Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectGetFileButton');
-      },
-    );
-  });
-
-  it('returns responses for different formats', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.tapButton('sendGetFileTextButton');
-        await TestSnaps.checkResultJson('fileResultSpan', { foo: 'bar' });
-
-        await TestSnaps.tapButton('sendGetFileBase64Button');
-        await TestSnaps.checkResultSpan(
-          'fileResultSpan',
-          '"ewogICJmb28iOiAiYmFyIgp9Cg=="',
-        );
-
-        await TestSnaps.tapButton('sendGetFileHexButton');
-        await TestSnaps.checkResultSpan(
-          'fileResultSpan',
-          '"0x7b0a202022666f6f223a2022626172220a7d0a"',
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-image.spec.ts b/tests/smoke/snaps/test-snap-image.spec.ts
deleted file mode 100644
index d4db368b542e..000000000000
--- a/tests/smoke/snaps/test-snap-image.spec.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import { Assertions, Matchers } from '../../framework';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Image Snap Tests'), () => {
-  it('can connect to the Image Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectImageButton');
-      },
-    );
-  });
-
-  it('can display SVGs', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.tapButton('showSVGImage');
-
-        const dynamicSvg = Matchers.getElementByID('snaps-ui-image');
-        await Assertions.expectElementToBeVisible(dynamicSvg);
-
-        await TestSnaps.tapOkButton();
-      },
-    );
-  });
-
-  it('can display PNGs', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.tapButton('showPNGImage');
-
-        const dynamicPng = Matchers.getElementByID('snaps-ui-image');
-        await Assertions.expectElementToBeVisible(dynamicPng);
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-interactive-ui.spec.ts b/tests/smoke/snaps/test-snap-interactive-ui.spec.ts
deleted file mode 100644
index d50347462579..000000000000
--- a/tests/smoke/snaps/test-snap-interactive-ui.spec.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import { Assertions } from '../../framework';
-import Matchers from '../../framework/Matchers';
-import { DateTime } from 'luxon';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Interactive UI Snap Tests'), () => {
-  it('can connect to the Interactive UI Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectInteractiveButton');
-      },
-    );
-  });
-
-  it('renders an interactive UI', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.tapButton('createDialogButton');
-
-        // Create the expected date when the pickers are mounted.
-        // This is needed to compare later with the values submitted by the snap.
-        const dateTimePickerDate = DateTime.now();
-
-        await TestSnaps.fillInput('example-input', 'foo bar');
-        await TestSnaps.selectInNativeDropdown('snapUIDropdown', 'Option 2');
-        await TestSnaps.selectRadioButton('Option 1');
-        await TestSnaps.tapCheckbox();
-        await TestSnaps.selectInNativeDropdown('snapUISelector', 'Option 3');
-        await TestSnaps.selectDateInDateTimePicker();
-        await TestSnaps.selectDateInDatePicker();
-        await TestSnaps.selectTimeInTimePicker();
-        await TestSnaps.tapSubmitButton();
-
-        await Assertions.expectTextDisplayed('foo bar');
-        await Assertions.expectTextDisplayed('option2');
-        await Assertions.expectTextDisplayed('option1');
-        await Assertions.expectTextDisplayed('true');
-        await Assertions.expectTextDisplayed('option3');
-        await Assertions.expectTextDisplayed(
-          dateTimePickerDate.set({ second: 0, millisecond: 0 }).toISO(),
-        );
-        await Assertions.expectTextDisplayed(
-          dateTimePickerDate
-            .set({ hour: 0, minute: 0, second: 0, millisecond: 0 })
-            .toISO(),
-        );
-        await Assertions.expectTextDisplayed(
-          dateTimePickerDate.set({ second: 0, millisecond: 0 }).toISO(),
-        );
-
-        await TestSnaps.tapOkButton();
-      },
-    );
-  });
-
-  it('renders a disabled UI', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.tapButton('createDialogDisabledButton');
-
-        const input = Matchers.getElementByID('example-input-snap-ui-input');
-        await Assertions.expectElementToBeVisible(input);
-
-        await Assertions.checkIfDisabled(input);
-        await Assertions.checkIfDisabled(
-          Matchers.getElementByID('snap-ui-renderer__dropdown'),
-        );
-        await Assertions.checkIfDisabled(
-          Matchers.getElementByID('snap-ui-renderer__radio'),
-        );
-        await Assertions.checkIfDisabled(
-          Matchers.getElementByID('snap-ui-renderer__checkbox'),
-        );
-        await Assertions.checkIfDisabled(
-          Matchers.getElementByID('snap-ui-renderer__selector'),
-        );
-
-        await Assertions.checkIfDisabled(TestSnaps.dateTimePickerTouchable);
-        await Assertions.checkIfDisabled(TestSnaps.datePickerTouchable);
-        await Assertions.checkIfDisabled(TestSnaps.timePickerTouchable);
-
-        await Assertions.checkIfDisabled(Matchers.getElementByText('Submit'));
-
-        await TestSnaps.tapCancelButton();
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-jsx.spec.ts b/tests/smoke/snaps/test-snap-jsx.spec.ts
deleted file mode 100644
index b831098ec81b..000000000000
--- a/tests/smoke/snaps/test-snap-jsx.spec.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import { Assertions, Gestures, Matchers } from '../../framework';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('JSX Snap Tests'), () => {
-  it('can connect to the JSX Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectJsx');
-      },
-    );
-  });
-
-  it('displays a modifiable JSX interface', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.tapButton('displayJsxButton');
-
-        await Assertions.expectTextDisplayed('0');
-
-        const dynamicButton = Matchers.getElementByText('Increment');
-        await Gestures.tap(dynamicButton);
-
-        await Assertions.expectTextDisplayed('1');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-manage-state.spec.ts b/tests/smoke/snaps/test-snap-manage-state.spec.ts
deleted file mode 100644
index 1fd372d7fcaa..000000000000
--- a/tests/smoke/snaps/test-snap-manage-state.spec.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Manage State Snap Tests'), () => {
-  it('connects to the State Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectStateButton');
-      },
-    );
-  });
-
-  describe('new state functions', () => {
-    describe('encrypted state', () => {
-      it('sets and retrieves state', async () => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder().build(),
-            skipReactNativeReload: true,
-            disableSynchronization: true,
-          },
-          async () => {
-            await TestSnaps.fillMessage('dataStateInput', '"bar"');
-            await TestSnaps.fillMessage('setStateKeyInput', 'foo');
-            await TestSnaps.tapButton('sendStateButton');
-            await TestSnaps.checkResultJson('encryptedStateResultSpan', {
-              foo: 'bar',
-            });
-
-            await TestSnaps.fillMessage('getStateInput', 'foo');
-            await TestSnaps.tapButton('sendGetStateButton');
-            await TestSnaps.checkResultSpan('getStateResultSpan', '"bar"');
-          },
-        );
-      });
-
-      it('clears the state', async () => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder().build(),
-            skipReactNativeReload: true,
-            disableSynchronization: true,
-          },
-          async () => {
-            await TestSnaps.tapButton('clearStateButton');
-            await TestSnaps.checkResultSpan('encryptedStateResultSpan', 'null');
-          },
-        );
-      });
-    });
-
-    describe('unencrypted state', () => {
-      it('sets and retrieves unencrypted state', async () => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder().build(),
-            skipReactNativeReload: true,
-            disableSynchronization: true,
-          },
-          async () => {
-            await TestSnaps.fillMessage('dataUnencryptedStateInput', '"bar"');
-            await TestSnaps.fillMessage('setStateKeyUnencryptedInput', 'foo');
-            await TestSnaps.tapButton('sendUnencryptedStateButton');
-            await TestSnaps.checkResultJson('unencryptedStateResultSpan', {
-              foo: 'bar',
-            });
-
-            await TestSnaps.fillMessage('getUnencryptedStateInput', 'foo');
-            await TestSnaps.tapButton('sendGetUnencryptedStateButton');
-            await TestSnaps.checkResultSpan(
-              'getStateUnencryptedResultSpan',
-              '"bar"',
-            );
-          },
-        );
-      });
-
-      it('clears the unencrypted state', async () => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder().build(),
-            skipReactNativeReload: true,
-            disableSynchronization: true,
-          },
-          async () => {
-            await TestSnaps.tapButton('clearStateUnencryptedButton');
-            await TestSnaps.checkResultSpan(
-              'unencryptedStateResultSpan',
-              'null',
-            );
-          },
-        );
-      });
-    });
-  });
-
-  describe('legacy state functions', () => {
-    describe('encrypted state', () => {
-      it('sets and retrieves state', async () => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder().build(),
-            skipReactNativeReload: true,
-            disableSynchronization: true,
-          },
-          async () => {
-            await TestSnaps.fillMessage('dataManageStateInput', '23');
-            await TestSnaps.tapButton('sendManageStateButton');
-            await TestSnaps.checkResultSpan(
-              'sendManageStateResultSpan',
-              'true',
-            );
-            await TestSnaps.checkResultJson('retrieveManageStateResultSpan', {
-              items: ['23'],
-            });
-          },
-        );
-      });
-
-      it('clears the state', async () => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder().build(),
-            skipReactNativeReload: true,
-            disableSynchronization: true,
-          },
-          async () => {
-            await TestSnaps.tapButton('clearManageStateButton');
-            await TestSnaps.checkResultSpan(
-              'clearManageStateResultSpan',
-              'true',
-            );
-            await TestSnaps.checkResultJson('retrieveManageStateResultSpan', {
-              items: [],
-            });
-          },
-        );
-      });
-    });
-
-    describe('unencrypted state', () => {
-      it('sets and retrieves unencrypted state', async () => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder().build(),
-            skipReactNativeReload: true,
-            disableSynchronization: true,
-          },
-          async () => {
-            await TestSnaps.fillMessage(
-              'dataUnencryptedManageStateInput',
-              '23',
-            );
-            await TestSnaps.tapButton('sendUnencryptedManageStateButton');
-            await TestSnaps.checkResultJson(
-              'retrieveManageStateUnencryptedResultSpan',
-              { items: ['23'] },
-            );
-          },
-        );
-      });
-
-      it('clears the unencrypted state', async () => {
-        await withFixtures(
-          {
-            fixture: new FixtureBuilder().build(),
-            skipReactNativeReload: true,
-            disableSynchronization: true,
-          },
-          async () => {
-            await TestSnaps.tapButton('clearUnencryptedManageStateButton');
-            await TestSnaps.checkResultSpan(
-              'clearUnencryptedManageStateResultSpan',
-              'true',
-            );
-            await TestSnaps.checkResultJson(
-              'retrieveManageStateUnencryptedResultSpan',
-              { items: [] },
-            );
-          },
-        );
-      });
-    });
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-management.spec.ts b/tests/smoke/snaps/test-snap-management.spec.ts
deleted file mode 100644
index 23f974c0deec..000000000000
--- a/tests/smoke/snaps/test-snap-management.spec.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TabBarComponent from '../../page-objects/wallet/TabBarComponent';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import SettingsView from '../../page-objects/Settings/SettingsView';
-import SnapSettingsView from '../../page-objects/Settings/SnapSettingsView';
-import { Assertions } from '../../framework';
-import BrowserView from '../../page-objects/Browser/BrowserView';
-import AccountMenu from '../../page-objects/AccountMenu/AccountMenu';
-import WalletView from '../../page-objects/wallet/WalletView';
-
-/**
- * Navigate from the browser to Snap Settings.
- * With disableSynchronization the tab bar may not be immediately available
- * after closing the browser, so we navigate step-by-step with explicit waits.
- */
-async function navigateFromBrowserToSnapSettings() {
-  await BrowserView.tapCloseBrowserButton();
-  await TabBarComponent.tapWallet();
-  await WalletView.tapHamburgerMenu();
-  await Assertions.expectElementToBeVisible(AccountMenu.container, {
-    timeout: 10000,
-    description: 'Account menu should be visible',
-  });
-  await AccountMenu.tapSettings();
-  await Assertions.expectElementToBeVisible(SettingsView.title, {
-    timeout: 10000,
-    description: 'Settings view title should be visible',
-  });
-  await SettingsView.tapSnaps();
-}
-
-/**
- * Navigate from Snap settings to the browser
- */
-async function navigateFromSnapSettingsToBrowser() {
-  await SnapSettingsView.tapBackButton();
-  await SnapSettingsView.tapListBackButton();
-
-  await Assertions.expectElementToBeVisible(SettingsView.title, {
-    timeout: 10000,
-    description: 'Settings view should be visible',
-  });
-  await SettingsView.tapBackButton();
-  await Assertions.expectElementToBeVisible(AccountMenu.container, {
-    timeout: 10000,
-    description: 'Account menu should be visible',
-  });
-  await AccountMenu.tapBack();
-
-  await navigateToBrowserView();
-}
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Snap Management Tests'), () => {
-  it('can connect to the Dialog Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectDialogSnapButton');
-      },
-    );
-  });
-
-  it('can disable a Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await navigateFromBrowserToSnapSettings();
-
-        await SnapSettingsView.selectSnap('Dialog Example Snap');
-        await SnapSettingsView.toggleEnable();
-
-        await navigateFromSnapSettingsToBrowser();
-
-        await TestSnaps.tapButton('sendAlertButton');
-
-        await Assertions.expectTextDisplayed(
-          `Snap "npm:@metamask/dialog-example-snap" is disabled.`,
-        );
-        await TestSnaps.dismissAlert();
-      },
-    );
-  });
-
-  it('can enable a Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await navigateFromBrowserToSnapSettings();
-
-        await SnapSettingsView.selectSnap('Dialog Example Snap');
-        await SnapSettingsView.toggleEnable();
-
-        await navigateFromSnapSettingsToBrowser();
-
-        await TestSnaps.tapButton('sendAlertButton');
-
-        await Assertions.expectTextDisplayed(
-          'This is an alert dialog. It has a single button: "OK".',
-        );
-
-        await TestSnaps.tapOkButton();
-      },
-    );
-  });
-
-  it('can remove a Snap', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await navigateFromBrowserToSnapSettings();
-
-        await SnapSettingsView.selectSnap('Dialog Example Snap');
-        await SnapSettingsView.removeSnap();
-
-        await Assertions.expectTextNotDisplayed('Dialog Example Snap');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-multichain-provider.spec.ts b/tests/smoke/snaps/test-snap-multichain-provider.spec.ts
deleted file mode 100644
index 319afc3fd648..000000000000
--- a/tests/smoke/snaps/test-snap-multichain-provider.spec.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import Assertions from '../../framework/Assertions';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import ConnectBottomSheet from '../../page-objects/Browser/ConnectBottomSheet';
-import RequestTypes from '../../page-objects/Browser/Confirmations/RequestTypes';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { confirmationFeatureFlags } from '../../api-mocking/mock-responses/feature-flags-mocks';
-import { mockGenesisBlocks } from './mocks';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Multichain Provider Snap Tests'), () => {
-  it('can use the Multichain provider', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMultiSRPKeyringController().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-        testSpecificMock: async (mockServer: Mockttp) => {
-          await setupRemoteFeatureFlagsMock(
-            mockServer,
-            Object.assign({}, ...confirmationFeatureFlags),
-          );
-          await mockGenesisBlocks(mockServer);
-        },
-      },
-      async () => {
-        await loginToApp();
-
-        // Navigate to test snaps URL once for all tests
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectMultichainProviderButton');
-
-        await TestSnaps.tapButton('sendCreateSessionButton');
-
-        await Assertions.expectElementToBeVisible(
-          ConnectBottomSheet.connectButton,
-        );
-        await ConnectBottomSheet.tapConnectButton();
-
-        const chains = [
-          {
-            name: 'Ethereum' as const,
-            chainId: '0x1',
-            genesisHash:
-              '0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3',
-            account: 'eip155:1:0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-            signMessageSignature:
-              '"0xf63c587cd42e7775e2e815a579f9744ea62944f263b3e69fad48535ba98a5ea107bc878088a99942733a59a89ef1d590eafdb467d59cf76564158d7e78351b751b"',
-            signTypedDataSignature:
-              '"0x7024dc071a7370eee444b2a3edc08d404dd03393694403cdca864653a7e8dd7c583419293d53602666cbe77faa8819fba04f8c57e95df2d4c0190968eece28021c"',
-          },
-          {
-            name: 'Sepolia' as const,
-            chainId: '0xaa36a7',
-            genesisHash:
-              '0x25a5cc106eea7138acab33231d7160d69cb777ee0c2c553fcddf5138993e6dd9',
-            account:
-              'eip155:11155111:0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-            signMessageSignature:
-              '"0xf63c587cd42e7775e2e815a579f9744ea62944f263b3e69fad48535ba98a5ea107bc878088a99942733a59a89ef1d590eafdb467d59cf76564158d7e78351b751b"',
-            signTypedDataSignature:
-              '"0x35bb09b05a3f7e4a0965fbf35b48d9d51efa5f7d030bdf4c18f4ad958941d20213a3e0ef731c1ee7619248331f5c259829581da38e9112624c1f8639e954572d1c"',
-          },
-          {
-            name: 'Solana' as const,
-            genesisHash: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
-            account:
-              'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:4tE76eixEgyJDrdykdWJR1XBkzUk4cLMvqjR2xVJUxer',
-            signMessageSignature:
-              '"5RH4BJB99CvWqPhXAtUwLQGJePeeXFLQKbztFbiasAe4mEGmr4moV2g2XEEwWMSsZKQGiV1UHxVGuVMenXAcfKfi"',
-          },
-        ];
-
-        for (const chain of chains) {
-          await TestSnaps.selectInDropdown(
-            'multichainNetworkDropdown',
-            chain.name,
-          );
-
-          if (chain.chainId) {
-            // Test getting chain ID.
-            await TestSnaps.tapButton('sendMultichainChainIdButton');
-            await TestSnaps.checkResultSpanIncludes(
-              'multichainProviderResultSpan',
-              chain.chainId,
-            );
-          }
-
-          // Test getting genesis hash.
-          await TestSnaps.tapButton('sendMultichainGetGenesisHashButton');
-          await TestSnaps.checkResultSpanIncludes(
-            'multichainProviderResultSpan',
-            chain.genesisHash,
-          );
-
-          // Test getting accounts.
-          await TestSnaps.tapButton('sendMultichainAccountsButton');
-          await TestSnaps.checkResultSpanIncludes(
-            'multichainProviderResultSpan',
-            chain.account,
-          );
-
-          // Test signing messages.
-          await TestSnaps.fillMessage(
-            'signMessageMultichainMessageInput',
-            'foo',
-          );
-          await TestSnaps.tapButton('signMessageMultichainButton');
-          if (chain.name === 'Solana') {
-            await TestSnaps.approveSolanaConfirmation();
-          } else {
-            await TestSnaps.approveNativeConfirmation();
-          }
-          await TestSnaps.checkResultSpan(
-            'signMessageMultichainResultSpan',
-            chain.signMessageSignature,
-          );
-
-          if (chain.signTypedDataSignature) {
-            // Test signing typed data.
-            await TestSnaps.fillMessage(
-              'signTypedDataMultichainMessageInput',
-              'bar',
-            );
-            await TestSnaps.tapButton('signTypedDataMultichainButton');
-
-            await Assertions.expectElementToBeVisible(
-              RequestTypes.TypedSignRequest,
-            );
-            await TestSnaps.approveNativeConfirmation();
-
-            await TestSnaps.checkResultSpan(
-              'signTypedDataMultichainResultSpan',
-              chain.signTypedDataSignature,
-            );
-          }
-        }
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-name-lookup.spec.ts b/tests/smoke/snaps/test-snap-name-lookup.spec.ts
deleted file mode 100644
index 4bcf124ece4c..000000000000
--- a/tests/smoke/snaps/test-snap-name-lookup.spec.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import TabBarComponent from '../../page-objects/wallet/TabBarComponent';
-import WalletView from '../../page-objects/wallet/WalletView';
-import RedesignedSendView from '../../page-objects/Send/RedesignedSendView';
-import { Assertions, Gestures, Matchers } from '../../framework';
-import BrowserView from '../../page-objects/Browser/BrowserView';
-import TransactionConfirmView from '../../page-objects/Send/TransactionConfirmView';
-import TokenOverview from '../../page-objects/wallet/TokenOverview';
-import NetworkListModal from '../../page-objects/Network/NetworkListModal';
-import { getDecodedProxiedURL } from '../../smoke-appium/notifications/utils/helpers';
-
-jest.setTimeout(150_000);
-
-const TOKEN = 'Ethereum';
-
-describe(SmokeSnaps('Name Lookup Snap Tests'), () => {
-  it('displays the resolved recipient address in the send flow', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-        testSpecificMock: async (mockServer) => {
-          await mockServer
-            .forPost('/proxy')
-            .matching((request) => {
-              try {
-                const url = getDecodedProxiedURL(request.url);
-                return /compliance\.(dev-api|api|uat-api)\.cx\.metamask\.io\/v1\/wallet\/batch/.test(
-                  url,
-                );
-              } catch {
-                return false;
-              }
-            })
-            .asPriority(1001)
-            .thenCallback(async (request) => {
-              let addresses: string[] = [];
-              try {
-                const text = await request.body.getText();
-                if (text) {
-                  const parsed = JSON.parse(text) as unknown;
-                  if (Array.isArray(parsed)) {
-                    addresses = parsed.filter(
-                      (a): a is string => typeof a === 'string',
-                    );
-                  }
-                }
-              } catch {
-                /* ignore malformed body */
-              }
-              return {
-                statusCode: 200,
-                json: addresses.map((address) => ({
-                  address,
-                  blocked: false,
-                })),
-              };
-            });
-        },
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectNameLookupButton');
-
-        await BrowserView.tapCloseBrowserButton();
-        await TabBarComponent.tapHome();
-        await device.disableSynchronization();
-        await WalletView.tapOnNewTokensSection();
-        await WalletView.tapTokenNetworkFilter();
-        await NetworkListModal.tapOnCustomTab();
-        await NetworkListModal.changeNetworkTo('Localhost');
-
-        await WalletView.tapOnToken(TOKEN);
-        await TokenOverview.tapSendButton();
-
-        const domain = 'metamask.domain';
-        await RedesignedSendView.enterZeroAmount();
-        await RedesignedSendView.pressContinueButton();
-
-        // Manually replacing the test to avoid flakiness from the '\n' input
-        // added to the end of the text to hide the keyboard
-        await Gestures.replaceText(
-          RedesignedSendView.recipientAddressInput,
-          domain,
-          {
-            elemDescription: 'Enter recipient address',
-          },
-        );
-
-        await RedesignedSendView.pressReviewButton();
-        await TransactionConfirmView.tapAdvancedDetails();
-
-        await Gestures.waitAndTap(
-          Matchers.getElementByText(
-            domain,
-            device.getPlatform() === 'ios' ? 1 : 0,
-          ),
-          {
-            elemDescription: 'Recipient address',
-            delay: 1000, // There's a animation that can cause flakiness
-          },
-        );
-
-        await Assertions.expectTextDisplayed(
-          '0xc0ffee254729296a45a3885639ac7e10f9d54979',
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-network-access.spec.ts b/tests/smoke/snaps/test-snap-network-access.spec.ts
deleted file mode 100644
index e6fb95b598d4..000000000000
--- a/tests/smoke/snaps/test-snap-network-access.spec.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import { getAnvilPortForTest } from '../../framework/fixtures/FixtureUtils';
-import { LocalNodeType } from '../../framework';
-import { defaultOptions } from '../../seeder/anvil-manager';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Network Access Snap Tests'), () => {
-  it('can use fetch and WebSockets', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-        localNodeOptions: [
-          {
-            type: LocalNodeType.anvil,
-            options: {
-              ...defaultOptions,
-              blockTime: 2,
-            },
-          },
-        ],
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-
-        await TestSnaps.installSnap('connectNetworkAccessButton');
-
-        // Use fetch
-        await TestSnaps.tapButton('sendNetworkAccessTestButton');
-        await TestSnaps.checkResultSpanIncludes(
-          'networkAccessResultSpan',
-          '"hello": "world"',
-        );
-
-        // Use WebSockets
-        const webSocketUrl = `ws://localhost:${getAnvilPortForTest()}`;
-        await TestSnaps.fillMessage('webSocketUrlInput', webSocketUrl);
-        await TestSnaps.tapButton('startWebSocket');
-
-        await TestSnaps.waitForWebSocketUpdate({
-          open: true,
-          origin: webSocketUrl,
-          blockNumber: 'number',
-        });
-
-        await TestSnaps.tapButton('stopWebSocket');
-
-        await TestSnaps.waitForWebSocketUpdate({
-          open: false,
-          origin: null,
-          blockNumber: null,
-        });
-      },
-    );
-  });
-});
diff --git a/tests/smoke/snaps/test-snap-preinstalled.spec.ts b/tests/smoke/snaps/test-snap-preinstalled.spec.ts
deleted file mode 100644
index 8b3c31bec48d..000000000000
--- a/tests/smoke/snaps/test-snap-preinstalled.spec.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { SmokeSnaps } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../flows/browser.flow';
-import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import TestSnaps from '../../page-objects/Browser/TestSnaps';
-import Assertions from '../../framework/Assertions';
-import TestHelpers from '../../helpers';
-import { testSnapPreinstalledAnalyticsExpectations } from '../../helpers/analytics/expectations/test-snap-preinstalled.analytics';
-
-jest.setTimeout(150_000);
-
-describe(SmokeSnaps('Preinstalled Snap Tests'), () => {
-  it.todo('displays the Snap settings page');
-
-  /**
-   * We're combining the 2 tests as currently we don't have a way to share the mockServer instance between the 2 tests.
-   */
-  it('uses `initialConnections` to allow JSON-RPC and tracks an event in Segment with `snap_trackEvent`', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMetaMetricsOptIn().build(),
-        restartDevice: true,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-        analyticsExpectations: testSnapPreinstalledAnalyticsExpectations,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await TestSnaps.navigateToTestSnap();
-        await TestSnaps.tapButton('showPreinstalledDialogButton');
-
-        await Assertions.expectTextDisplayed(
-          'This is a custom dialog. It has a custom footer and can be resolved to any value.',
-        );
-
-        await TestSnaps.tapCancelButton();
-
-        await TestSnaps.tapButton('trackEventButton');
-        await TestHelpers.delay(1000);
-      },
-    );
-  });
-
-  it('can access the messenger', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withMetaMetricsOptIn().build(),
-        restartDevice: false,
-        skipReactNativeReload: true,
-        disableSynchronization: true,
-      },
-      async () => {
-        await TestSnaps.tapButton('messengerCallButton');
-
-        await TestSnaps.checkResultSpan('preinstalledResultSpan', 'false');
-      },
-    );
-  });
-
-  it.todo('tracks an error in Sentry with `snap_trackError`');
-
-  it.todo(
-    'starts and ends a performance trace in Sentry with `snap_startTrace` and `snap_endTrace`',
-  );
-});
diff --git a/tests/smoke/wallet/connections/evm-provider-events.spec.ts b/tests/smoke/wallet/connections/evm-provider-events.spec.ts
deleted file mode 100644
index 22f187579371..000000000000
--- a/tests/smoke/wallet/connections/evm-provider-events.spec.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-import { SmokeWalletPlatform } from '../../../tags';
-import Assertions from '../../../framework/Assertions';
-import FixtureBuilder, {
-  DEFAULT_FIXTURE_ACCOUNT_2,
-  DEFAULT_FIXTURE_ACCOUNT_CHECKSUM,
-} from '../../../framework/fixtures/FixtureBuilder';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import TestDApp from '../../../page-objects/Browser/TestDApp';
-import Browser from '../../../page-objects/Browser/BrowserView';
-import ConnectedAccountsModal from '../../../page-objects/Browser/ConnectedAccountsModal';
-import NetworkConnectMultiSelector from '../../../page-objects/Browser/NetworkConnectMultiSelector';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../flows/browser.flow';
-import {
-  Caip25CaveatType,
-  Caip25EndowmentPermissionName,
-} from '@metamask/chain-agnostic-permission';
-import { DappVariants } from '../../../framework/Constants';
-import ToastModal from '../../../page-objects/wallet/ToastModal';
-import AccountListBottomSheet from '../../../page-objects/wallet/AccountListBottomSheet';
-import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
-import WalletView from '../../../page-objects/wallet/WalletView';
-
-describe(SmokeWalletPlatform('EVM Provider Events'), () => {
-  beforeAll(async () => {
-    jest.setTimeout(150000);
-  });
-
-  it('should notify the connected account and chain on load of a permitted dapp', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withImportedHdKeyringAndTwoDefaultAccountsOneImportedHdAccountKeyringController()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        restartDevice: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await Browser.navigateToTestDApp();
-
-        const connectedAccounts = await TestDApp.getConnectedAccounts();
-        if (connectedAccounts !== DEFAULT_FIXTURE_ACCOUNT_CHECKSUM) {
-          throw new Error('connected accounts did not match');
-        }
-
-        const connectedChainId = await TestDApp.getConnectedChainId();
-        if (connectedChainId !== '0x1') {
-          throw new Error('connected chain ID did not match');
-        }
-      },
-    );
-  });
-
-  it('notifies a dapp when the wallet switches to an account it has permission to access. ', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withImportedHdKeyringAndTwoDefaultAccountsOneImportedHdAccountKeyringController()
-          .withPermissionControllerConnectedToTestDapp({
-            [Caip25EndowmentPermissionName]: {
-              caveats: [
-                {
-                  type: Caip25CaveatType,
-                  value: {
-                    optionalScopes: {
-                      'eip155:1': {
-                        accounts: [
-                          `eip155:1:${DEFAULT_FIXTURE_ACCOUNT_CHECKSUM}`,
-                          `eip155:1:${DEFAULT_FIXTURE_ACCOUNT_2.toLowerCase()}`,
-                        ],
-                      },
-                    },
-                    requiredScopes: {},
-                    sessionProperties: {},
-                    isMultichainOrigin: false,
-                  },
-                },
-              ],
-            },
-          })
-          .build(),
-        restartDevice: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await Browser.navigateToTestDApp();
-
-        const connectedAccountsBefore = await TestDApp.getConnectedAccounts();
-        if (
-          connectedAccountsBefore !==
-          [DEFAULT_FIXTURE_ACCOUNT_CHECKSUM, DEFAULT_FIXTURE_ACCOUNT_2].join(
-            ',',
-          )
-        ) {
-          throw new Error(
-            'connected accounts did not match expected starting state',
-          );
-        }
-
-        await Browser.tapCloseBrowserButton();
-        await Assertions.expectElementToBeVisible(
-          TabBarComponent.tabBarWalletButton,
-        );
-        await TabBarComponent.tapWallet();
-        await WalletView.tapIdenticon();
-        await AccountListBottomSheet.tapAccountByNameV2('Account 2');
-        await navigateToBrowserView();
-
-        const connectedAccountsAfter = await TestDApp.getConnectedAccounts();
-        if (
-          connectedAccountsAfter !==
-          [DEFAULT_FIXTURE_ACCOUNT_2, DEFAULT_FIXTURE_ACCOUNT_CHECKSUM].join(
-            ',',
-          )
-        ) {
-          throw new Error(
-            'connected accounts did not match expected end state',
-          );
-        }
-      },
-    );
-  });
-
-  it('notifies a permitted dapp of the new chain ID when the network changes', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp({
-            [Caip25EndowmentPermissionName]: {
-              caveats: [
-                {
-                  type: Caip25CaveatType,
-                  value: {
-                    optionalScopes: {
-                      'eip155:1': {
-                        accounts: [
-                          `eip155:1:${DEFAULT_FIXTURE_ACCOUNT_CHECKSUM}`,
-                        ],
-                      },
-                      'eip155:1337': {
-                        accounts: [
-                          `eip155:1337:${DEFAULT_FIXTURE_ACCOUNT_CHECKSUM}`,
-                        ],
-                      },
-                    },
-                    requiredScopes: {},
-                    sessionProperties: {},
-                    isMultichainOrigin: false,
-                  },
-                },
-              ],
-            },
-          })
-          .build(),
-        restartDevice: true,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await Browser.navigateToTestDApp();
-
-        const connectedChainIdBefore = await TestDApp.getConnectedChainId();
-        if (connectedChainIdBefore !== '0x1') {
-          throw new Error(
-            'selected chainId did not match expected starting state',
-          );
-        }
-
-        await Browser.tapNetworkAvatarOrAccountButtonOnBrowser();
-        await Assertions.expectTextDisplayed('Account 1');
-        await Assertions.expectElementToNotBeVisible(
-          ToastModal.notificationTitle,
-        );
-
-        await ConnectedAccountsModal.tapPermissionsSummaryTab();
-        await ConnectedAccountsModal.tapNavigateToEditNetworksPermissionsButton();
-        await NetworkConnectMultiSelector.selectNetworkChainPermission(
-          'Ethereum Main Network',
-        );
-        await NetworkConnectMultiSelector.tapUpdateButton();
-
-        const connectedChainIdAfter = await TestDApp.getConnectedChainId();
-        if (connectedChainIdAfter !== '0x539') {
-          throw new Error('selected chainId did not match expected end state');
-        }
-      },
-    );
-  });
-});
diff --git a/tests/smoke/wallet/helpers/musd-fixture.ts b/tests/smoke/wallet/helpers/musd-fixture.ts
deleted file mode 100644
index a1cb9f112a7e..000000000000
--- a/tests/smoke/wallet/helpers/musd-fixture.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import FixtureBuilder, {
-  type MusdFixtureOptions,
-  DEFAULT_FIXTURE_ACCOUNT_CHECKSUM,
-} from '../../../framework/fixtures/FixtureBuilder';
-import { CHAIN_IDS } from '@metamask/transaction-controller';
-import { toChecksumHexAddress } from '@metamask/controller-utils';
-import { AnvilPort } from '../../../framework/fixtures/FixtureUtils';
-import { AnvilManager } from '../../../seeder/anvil-manager';
-import { USDC_MAINNET, MUSD_MAINNET } from '../../../constants/musd-mainnet';
-import type { Hex } from '@metamask/utils';
-
-const USDC_DECIMALS = 6;
-const MUSD_DECIMALS = 6;
-const ETH_NATIVE_ADDRESS = '0x0000000000000000000000000000000000000000';
-
-/**
- * Minimal EVM bytecode that returns 10 000 USDC (10 000 000 000 raw) for any
- * call, including `balanceOf(address)`. Deployed at the USDC contract address
- * on Anvil to satisfy the TransactionPayController balance validation.
- */
-const ERC20_STUB_BYTECODE =
-  '0x7f00000000000000000000000000000000000000000000000000000002540be40060005260206000f3';
-
-export type { MusdFixtureOptions };
-
-/**
- * Builds a fixture for mUSD conversion E2E tests using FixtureBuilder:
- * Mainnet, ETH/USDC/mUSD tokens, rates, balances, and mUSD eligibility state.
- */
-export async function createMusdFixture(
-  node: AnvilManager,
-  options: MusdFixtureOptions,
-): Promise<ReturnType<FixtureBuilder['build']>> {
-  const rpcPort = node?.getPort?.() ?? AnvilPort();
-
-  if (node) {
-    await seedErc20Stub(node, USDC_MAINNET);
-    await node.setAccountBalance('10', DEFAULT_FIXTURE_ACCOUNT_CHECKSUM as Hex);
-  }
-
-  const baseTokens = [
-    {
-      address: toChecksumHexAddress(ETH_NATIVE_ADDRESS),
-      symbol: 'ETH',
-      decimals: 18,
-      name: 'Ethereum',
-    },
-    {
-      address: toChecksumHexAddress(USDC_MAINNET),
-      symbol: 'USDC',
-      decimals: USDC_DECIMALS,
-      name: 'USDCoin',
-    },
-    ...(options.hasMusdBalance
-      ? [
-          {
-            address: toChecksumHexAddress(MUSD_MAINNET),
-            symbol: 'MUSD',
-            decimals: MUSD_DECIMALS,
-            name: 'MUSD',
-          },
-        ]
-      : []),
-  ];
-
-  return new FixtureBuilder()
-    .withPopularNetworks()
-    .withNetworkController({
-      chainId: CHAIN_IDS.MAINNET,
-      rpcUrl: `http://localhost:${rpcPort}`,
-      type: 'custom',
-      nickname: 'Ethereum Mainnet',
-      ticker: 'ETH',
-    })
-    .withMetaMetricsOptIn()
-    .withTokensForAllPopularNetworks(baseTokens)
-    .withTokenRates(
-      CHAIN_IDS.MAINNET,
-      toChecksumHexAddress(ETH_NATIVE_ADDRESS),
-      3000.0,
-    )
-    .withTokenRates(CHAIN_IDS.MAINNET, toChecksumHexAddress(USDC_MAINNET), 1.0)
-    .withTokenRates(CHAIN_IDS.MAINNET, toChecksumHexAddress(MUSD_MAINNET), 1.0)
-    .withMusdConversion(options)
-    .build();
-}
-
-async function seedErc20Stub(
-  node: AnvilManager,
-  tokenAddress: string,
-): Promise<void> {
-  const { testClient } = node.getProvider();
-
-  await testClient.setCode({
-    address: tokenAddress as `0x${string}`,
-    bytecode: ERC20_STUB_BYTECODE as `0x${string}`,
-  });
-}
diff --git a/tests/smoke/wallet/incoming-transactions.spec.ts b/tests/smoke/wallet/incoming-transactions.spec.ts
deleted file mode 100644
index 28bd9f8eb6af..000000000000
--- a/tests/smoke/wallet/incoming-transactions.spec.ts
+++ /dev/null
@@ -1,355 +0,0 @@
-import { toChecksumHexAddress } from '@metamask/controller-utils';
-import { TransactionType } from '@metamask/transaction-controller';
-import { Mockttp } from 'mockttp';
-import { merge } from 'lodash';
-
-import { SmokeWalletPlatform } from '../../tags';
-import { loginToApp } from '../../flows/wallet.flow';
-import Assertions from '../../framework/Assertions';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import FixtureBuilder, {
-  DEFAULT_FIXTURE_ACCOUNT,
-  DEFAULT_FIXTURE_ACCOUNT_2,
-  ENTROPY_WALLET_1_ID,
-} from '../../framework/fixtures/FixtureBuilder';
-import type {
-  AccountTreeControllerState,
-  Fixture,
-} from '../../framework/fixtures/types';
-import TabBarComponent from '../../page-objects/wallet/TabBarComponent';
-import ToastModal from '../../page-objects/wallet/ToastModal';
-import { MockApiEndpoint, TestSpecificMock } from '../../framework/types';
-import { setupMockRequest } from '../../api-mocking/helpers/mockHelpers';
-import UnifiedTransactionsView from '../../page-objects/Transactions/UnifiedTransactionsView';
-import NetworkManager from '../../page-objects/wallet/NetworkManager';
-
-// EVM-only account tree to prevent Solana snap from fetching live transactions
-const EVM_ONLY_ACCOUNT_TREE = {
-  accountTree: {
-    wallets: {
-      [ENTROPY_WALLET_1_ID]: {
-        id: ENTROPY_WALLET_1_ID,
-        type: 'Entropy',
-        metadata: { name: 'Secret Recovery Phrase 1' },
-        groups: {
-          [`${ENTROPY_WALLET_1_ID}/account-1`]: {
-            id: `${ENTROPY_WALLET_1_ID}/account-1`,
-            type: 'MultipleAccount',
-            accounts: ['4d7a5e0b-b261-4aed-8126-43972b0fa0a1'],
-            metadata: { name: 'Account 1' },
-          },
-        },
-      },
-    },
-    selectedAccountGroup: `${ENTROPY_WALLET_1_ID}/account-1`,
-  },
-};
-
-const TOKEN_SYMBOL_MOCK = 'ABC';
-const TOKEN_ADDRESS_MOCK = '0x123';
-
-const TRUSTED_INCOMING_SENDER_CHECKSUM = toChecksumHexAddress(
-  DEFAULT_FIXTURE_ACCOUNT_2,
-);
-
-const RESPONSE_STANDARD_MOCK = {
-  hash: '0x123456',
-  timestamp: new Date().toISOString(),
-  chainId: 1,
-  blockNumber: 1,
-  blockHash: '0x2',
-  gas: 1,
-  gasUsed: 1,
-  gasPrice: '1',
-  effectiveGasPrice: '1',
-  nonce: 1,
-  cumulativeGasUsed: 1,
-  methodId: null,
-  value: '1230000000000000000',
-  to: DEFAULT_FIXTURE_ACCOUNT,
-  from: TRUSTED_INCOMING_SENDER_CHECKSUM,
-  isError: false,
-  valueTransfers: [],
-};
-
-const RESPONSE_STANDARD_2_MOCK = {
-  ...RESPONSE_STANDARD_MOCK,
-  timestamp: new Date().toISOString(),
-  hash: '0x2',
-  value: '2340000000000000000',
-};
-
-const RESPONSE_TOKEN_TRANSFER_MOCK = {
-  ...RESPONSE_STANDARD_MOCK,
-  to: DEFAULT_FIXTURE_ACCOUNT,
-  valueTransfers: [
-    {
-      contractAddress: TOKEN_ADDRESS_MOCK,
-      decimal: 18,
-      symbol: TOKEN_SYMBOL_MOCK,
-      from: TRUSTED_INCOMING_SENDER_CHECKSUM,
-      to: DEFAULT_FIXTURE_ACCOUNT,
-      amount: '4560000000000000000',
-    },
-  ],
-};
-
-const RESPONSE_OUTGOING_TRANSACTION_MOCK = {
-  ...RESPONSE_STANDARD_MOCK,
-  to: TRUSTED_INCOMING_SENDER_CHECKSUM,
-  from: DEFAULT_FIXTURE_ACCOUNT,
-};
-
-function mockAccountsApi(
-  transactions: Record<string, unknown>[] = [],
-): MockApiEndpoint {
-  return {
-    urlEndpoint:
-      /^https:\/\/accounts\.api\.cx\.metamask\.io\/v4\/multiaccount\/transactions(\?.*)?$/,
-    response: {
-      data:
-        transactions.length > 0
-          ? transactions
-          : [RESPONSE_STANDARD_MOCK, RESPONSE_STANDARD_2_MOCK],
-      pageInfo: {
-        count: transactions.length || 2,
-        hasNextPage: false,
-      },
-    },
-    responseCode: 200,
-  };
-}
-
-function createAccountsTestSpecificMock(
-  transactions: Record<string, unknown>[] = [],
-): TestSpecificMock {
-  return async (mockServer: Mockttp) => {
-    const mock = mockAccountsApi(transactions);
-    await setupMockRequest(
-      mockServer,
-      {
-        requestMethod: 'GET',
-        url: mock.urlEndpoint,
-        response: mock.response,
-        responseCode: mock.responseCode,
-      },
-      1000,
-    );
-  };
-}
-
-/**
- * Makes the sender address trusted via the address book so the incoming
- * native transfer passes the poisoning filter.
- *
- * KeyringController / AccountsController merges don't work here because
- * AccountsController reconciles against the vault on unlock (which only
- * contains Account 1) and drops any extra accounts.  The address book is
- * static persisted state that survives startup, and contact sync is
- * disabled via UserStorageController flags.
- */
-function mergeTrustedSenderForIncomingNative(fixture: Fixture): void {
-  merge(fixture.state.engine.backgroundState.UserStorageController, {
-    isBackupAndSyncEnabled: false,
-    isAccountSyncingEnabled: false,
-    isContactSyncingEnabled: false,
-  });
-
-  merge(fixture.state.engine.backgroundState.AddressBookController, {
-    addressBook: {
-      '0x1': {
-        [TRUSTED_INCOMING_SENDER_CHECKSUM]: {
-          address: TRUSTED_INCOMING_SENDER_CHECKSUM,
-          name: 'Account 2',
-          chainId: '0x1',
-        },
-      },
-    },
-  });
-}
-
-describe(SmokeWalletPlatform('Incoming Transactions'), () => {
-  beforeAll(async () => {
-    jest.setTimeout(2500000);
-  });
-
-  it('displays incoming native transfer from another own account', async () => {
-    const fixture = new FixtureBuilder()
-      .withAccountTreeController(
-        EVM_ONLY_ACCOUNT_TREE as unknown as Partial<AccountTreeControllerState>,
-      )
-      .withNetworkEnabledMap({ eip155: { '0x1': true } })
-      .withPrivacyModePreferences(false)
-      .build();
-    mergeTrustedSenderForIncomingNative(fixture);
-
-    await withFixtures(
-      {
-        fixture,
-        restartDevice: true,
-        testSpecificMock: createAccountsTestSpecificMock([
-          RESPONSE_STANDARD_MOCK,
-        ]),
-      },
-      async () => {
-        await loginToApp();
-        await NetworkManager.navigateToTokensFullView();
-        await NetworkManager.openNetworkManager();
-        await NetworkManager.tapSelectAllPopularNetworks();
-        await NetworkManager.navigateBackFromTokensFullView();
-
-        await TabBarComponent.tapActivity();
-        await UnifiedTransactionsView.swipeDown();
-        await Assertions.expectTextDisplayed('Received ETH');
-      },
-    );
-  });
-
-  // TODO: Fix this test and remove the skip
-  // More info: https://github.com/MetaMask/metamask-mobile/issues/15730
-  it.skip('displays incoming token transfers', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder()
-          .withAccountTreeController(
-            EVM_ONLY_ACCOUNT_TREE as unknown as Partial<AccountTreeControllerState>,
-          )
-          .withNetworkEnabledMap({ eip155: { '0x1': true } })
-          .withTokens([
-            {
-              address: TOKEN_ADDRESS_MOCK,
-              decimals: 18,
-              symbol: TOKEN_SYMBOL_MOCK,
-            },
-          ])
-          .withPrivacyModePreferences(false)
-          .build(),
-        restartDevice: true,
-        testSpecificMock: createAccountsTestSpecificMock([
-          RESPONSE_TOKEN_TRANSFER_MOCK,
-        ]),
-      },
-      async () => {
-        await loginToApp();
-        await TabBarComponent.tapActivity();
-        await UnifiedTransactionsView.swipeDown();
-        await Assertions.expectTextDisplayed('Received ABC');
-      },
-    );
-  });
-
-  it('displays outgoing transactions', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder()
-          .withAccountTreeController(
-            EVM_ONLY_ACCOUNT_TREE as unknown as Partial<AccountTreeControllerState>,
-          )
-          .withNetworkEnabledMap({ eip155: { '0x1': true } })
-          .withPrivacyModePreferences(false)
-          .build(),
-        restartDevice: true,
-        testSpecificMock: createAccountsTestSpecificMock([
-          RESPONSE_OUTGOING_TRANSACTION_MOCK,
-        ]),
-      },
-      async () => {
-        await loginToApp();
-        await NetworkManager.navigateToTokensFullView();
-        await NetworkManager.openNetworkManager();
-        await NetworkManager.tapSelectAllPopularNetworks();
-        await NetworkManager.navigateBackFromTokensFullView();
-
-        await TabBarComponent.tapActivity();
-        await UnifiedTransactionsView.swipeDown();
-        await Assertions.expectTextDisplayed('Sent ETH');
-      },
-    );
-  });
-
-  it.skip('displays nothing if privacyMode is enabled', async () => {
-    const fixture = new FixtureBuilder()
-      .withAccountTreeController(
-        EVM_ONLY_ACCOUNT_TREE as unknown as Partial<AccountTreeControllerState>,
-      )
-      .withNetworkEnabledMap({ eip155: { '0x1': true } })
-      .withPrivacyModePreferences(true)
-      .build();
-    mergeTrustedSenderForIncomingNative(fixture);
-
-    await withFixtures(
-      {
-        fixture,
-        restartDevice: true,
-        testSpecificMock: createAccountsTestSpecificMock(),
-      },
-      async () => {
-        await loginToApp();
-        await NetworkManager.navigateToTokensFullView();
-        await NetworkManager.openNetworkManager();
-        await NetworkManager.tapSelectAllPopularNetworks();
-        await NetworkManager.navigateBackFromTokensFullView();
-
-        await TabBarComponent.tapActivity();
-        await UnifiedTransactionsView.swipeDown();
-        await Assertions.expectTextNotDisplayed('Received ETH');
-      },
-    );
-  });
-
-  it.skip('displays nothing if incoming transaction is a duplicate', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder()
-          .withAccountTreeController(
-            EVM_ONLY_ACCOUNT_TREE as unknown as Partial<AccountTreeControllerState>,
-          )
-          .withNetworkEnabledMap({ eip155: { '0x1': true } })
-          .withTransactions([
-            {
-              hash: RESPONSE_STANDARD_MOCK.hash,
-              txParams: {
-                from: RESPONSE_STANDARD_MOCK.from,
-              },
-              type: TransactionType.incoming,
-            },
-          ])
-          .build(),
-        restartDevice: true,
-        testSpecificMock: createAccountsTestSpecificMock([
-          RESPONSE_STANDARD_MOCK,
-        ]),
-      },
-      async () => {
-        await loginToApp();
-        await TabBarComponent.tapActivity();
-        await UnifiedTransactionsView.swipeDown();
-        await Assertions.expectTextNotDisplayed('Received ETH');
-      },
-    );
-  });
-
-  it.skip('displays notification', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder()
-          .withAccountTreeController(
-            EVM_ONLY_ACCOUNT_TREE as unknown as Partial<AccountTreeControllerState>,
-          )
-          .withNetworkEnabledMap({ eip155: { '0x1': true } })
-          .build(),
-        restartDevice: true,
-        testSpecificMock: createAccountsTestSpecificMock(),
-      },
-      async () => {
-        await loginToApp();
-        await TabBarComponent.tapActivity();
-        await UnifiedTransactionsView.swipeDown();
-        await Assertions.expectElementToHaveText(
-          ToastModal.notificationTitle,
-          'You received 1.23 ETH',
-        );
-      },
-    );
-  });
-});
diff --git a/tests/smoke/wallet/musd-conversion-happy-path.spec.ts b/tests/smoke/wallet/musd-conversion-happy-path.spec.ts
deleted file mode 100644
index 1f77b11e15b2..000000000000
--- a/tests/smoke/wallet/musd-conversion-happy-path.spec.ts
+++ /dev/null
@@ -1,241 +0,0 @@
-import { SmokeWalletPlatform } from '../../tags';
-import WalletView from '../../page-objects/wallet/WalletView';
-import { loginToApp } from '../../flows/wallet.flow';
-import Assertions from '../../framework/Assertions';
-import { withFixtures } from '../../framework/fixtures/FixtureHelper';
-import {
-  LocalNode,
-  LocalNodeType,
-  type WithFixturesOptions,
-} from '../../framework/types';
-import { AnvilManager } from '../../seeder/anvil-manager';
-import TransactionPayConfirmation from '../../page-objects/Confirmation/TransactionPayConfirmation';
-import FooterActions from '../../page-objects/Browser/Confirmations/FooterActions';
-import TabBarComponent from '../../page-objects/wallet/TabBarComponent';
-import ActivitiesView from '../../page-objects/Transactions/ActivitiesView';
-import {
-  setupMusdMocks,
-  type MusdMockOptions,
-} from '../../api-mocking/mock-responses/musd/musd-mocks';
-import {
-  createMusdFixture,
-  type MusdFixtureOptions,
-} from './helpers/musd-fixture';
-
-/**
- * Returns the shared withFixtures config for mUSD conversion tests.
- * Only fixture options vary per scenario; localNodeOptions, restartDevice, and testSpecificMock are centralized here.
- */
-function withMusdFixturesOptions(
-  fixtureOptions: MusdFixtureOptions,
-): WithFixturesOptions {
-  const mockOptions: MusdMockOptions = {
-    hasMusdBalance: fixtureOptions.hasMusdBalance,
-    musdBalance: fixtureOptions.musdBalance,
-  };
-
-  return {
-    fixture: ({ localNodes }: { localNodes?: LocalNode[] }) => {
-      const node = localNodes?.[0] as unknown as AnvilManager;
-      return createMusdFixture(node, fixtureOptions);
-    },
-    localNodeOptions: [
-      {
-        type: LocalNodeType.anvil,
-        options: { chainId: 1 },
-      },
-    ],
-    restartDevice: true,
-    // Skip reload in cleanup to avoid native crash (SIGSEGV) when sync was disabled during test (same as snaps)
-    skipReactNativeReload: true,
-    testSpecificMock: (mockServer) => setupMusdMocks(mockServer, mockOptions),
-  };
-}
-
-describe.skip(SmokeWalletPlatform('mUSD Conversion Happy Path'), () => {
-  beforeAll(async () => {
-    jest.setTimeout(150000);
-    // Do not launch app here: launch happens inside withFixtures (restartDevice: true)
-    // so that setupMusdMocks and fixture are ready first. Launching in beforeAll causes
-    // NetworkIdlingResource timeout on Android CI because the app hits real/slow APIs
-    // before mocks are available.
-  });
-
-  it('converts USDC to mUSD successfully (First Time User)', async () => {
-    await withFixtures(
-      withMusdFixturesOptions({
-        musdConversionEducationSeen: false,
-      }),
-      async () => {
-        await loginToApp();
-
-        // Verify wallet is visible
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          description: 'Wallet view should be visible',
-        });
-
-        // Verify mUSD CTA is visible and tap Get mUSD
-        await Assertions.expectElementToBeVisible(
-          WalletView.cashGetMusdContainer,
-          {
-            timeout: 30000,
-            description: 'Cash section Get mUSD container should be visible',
-          },
-        );
-        await WalletView.tapGetMusdButton();
-        await device.disableSynchronization();
-
-        // Verify education screen is shown (first time user) and tap Get Started
-        await Assertions.expectElementToBeVisible(WalletView.getStartedButton, {
-          timeout: 10000,
-          description: 'Education screen Get Started button should be visible',
-        });
-        await WalletView.tapGetStartedButton();
-
-        // Verify custom amount/confirmation screen is shown
-        await Assertions.expectElementToBeVisible(
-          TransactionPayConfirmation.payWithRow,
-          {
-            timeout: 10000,
-            description:
-              'Pay with row should be visible on confirmation screen',
-          },
-        );
-
-        // Enter amount ($12) and continue (avoid "0" key to prevent banner blocking)
-        await TransactionPayConfirmation.enterAmountAndContinue('12');
-
-        // The total row is hidden for mUSD conversions (sponsored design); the
-        // confirm button's waitAndTap below is sufficient to wait for the
-        // confirmation screen to finish loading.
-        // Confirm the transaction (tap the convert/confirm button)
-        await FooterActions.tapConfirmButton();
-
-        // Verify we're back in the wallet after confirmation (ignore processing/completed banners - flaky)
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          timeout: 30000,
-          description: 'Wallet view should be visible after conversion',
-        });
-
-        // Go to Activity and verify mUSD conversion is confirmed (same pattern as send-native-token: no swipeDown)
-        await TabBarComponent.tapActivity();
-        await ActivitiesView.verifyMusdConversionConfirmed(0);
-        // gets back to wallet to avoid waiting fora rpc updated in the activity view
-        await TabBarComponent.tapWallet();
-      },
-    );
-  });
-
-  it('converts USDC to mUSD from Token List (Returning User)', async () => {
-    await withFixtures(
-      withMusdFixturesOptions({
-        musdConversionEducationSeen: true,
-        hasMusdBalance: true,
-        musdBalance: 100,
-      }),
-      async () => {
-        await device.disableSynchronization();
-        await loginToApp();
-
-        // Verify wallet is visible
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          description: 'Wallet view should be visible',
-        });
-
-        await WalletView.scrollToToken('USDCoin');
-        await Assertions.expectElementToBeVisible(
-          WalletView.tokenListItemConvertToMusdCta,
-          {
-            timeout: 10000,
-            description:
-              'Token list item mUSD CTA (Get X% mUSD bonus) should be visible on USDC row',
-          },
-        );
-        await WalletView.tapTokenListItemConvertToMusdCta();
-
-        // Education skipped (musdConversionEducationSeen: true) - confirmation screen shown (payToken/quote may load)
-        await Assertions.expectElementToBeVisible(
-          TransactionPayConfirmation.payWithRow,
-          {
-            timeout: 20000,
-            description:
-              'Pay with row should be visible on confirmation screen',
-          },
-        );
-
-        // Enter amount and continue (avoid "0" key - use 5)
-        await TransactionPayConfirmation.enterAmountAndContinue('5');
-
-        // Confirm the transaction
-        await FooterActions.tapConfirmButton();
-
-        // Verify we're back in the wallet after confirmation
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          timeout: 30000,
-          description:
-            'Wallet view should be visible after transaction confirmation',
-        });
-
-        // Go to Activity and verify mUSD conversion is confirmed
-        await TabBarComponent.tapActivity();
-        await ActivitiesView.verifyMusdConversionConfirmed(0);
-        // gets back to wallet to avoid waiting fora rpc updated in the activity view
-        await TabBarComponent.tapWallet();
-      },
-    );
-  });
-
-  it('converts USDC to mUSD from Asset Overview', async () => {
-    await withFixtures(
-      withMusdFixturesOptions({
-        musdConversionEducationSeen: true,
-      }),
-      async () => {
-        await device.disableSynchronization();
-        await loginToApp();
-
-        // Verify wallet is visible
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          description: 'Wallet view should be visible',
-        });
-
-        // Tap on USDC to go to Asset Overview, scroll to mUSD CTA (ensures loaded), then tap
-        await WalletView.tapOnToken('USDCoin');
-        await WalletView.scrollDownToAssetOverviewMusdCta();
-        await WalletView.tapAssetOverviewMusdCta();
-
-        // Verify confirmation screen (payToken/quote may load)
-        await Assertions.expectElementToBeVisible(
-          TransactionPayConfirmation.payWithRow,
-          {
-            timeout: 20000,
-            description:
-              'Pay with row should be visible on confirmation screen',
-          },
-        );
-
-        // Enter amount and continue (avoid "0" key - use 5)
-        await TransactionPayConfirmation.enterAmountAndContinue('5');
-
-        // The total row is hidden for mUSD conversions (sponsored design); the
-        // confirm button's waitAndTap below is sufficient to wait for the
-        // confirmation screen to finish loading.
-        // Confirm the transaction
-        await FooterActions.tapConfirmButton();
-
-        // Verify we're back in the wallet after confirmation
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          timeout: 30000,
-          description:
-            'Wallet view should be visible after transaction confirmation',
-        });
-
-        // Go to Activity and verify mUSD conversion is confirmed
-        await TabBarComponent.tapActivity();
-        await ActivitiesView.verifyMusdConversionConfirmed(0);
-        // gets back to wallet to avoid waiting fora rpc updated in the activity view
-        await TabBarComponent.tapWallet();
-      },
-    );
-  });
-});
diff --git a/tests/tags.js b/tests/tags.js
index 9a92a69174df..a367809bdef8 100644
--- a/tests/tags.js
+++ b/tests/tags.js
@@ -65,7 +65,7 @@ const smokeTags = {
   smokeSeedlessOnboarding: {
     tag: 'SmokeSeedlessOnboarding:',
     description:
-      'Tests seedless onboarding with social login providers (Google and Apple) and post-onboard flows. Covers new user wallet creation via Google and Apple OAuth, existing user detection with the Account Already Exists screen, SeedlessOnboardingController mock integration, OAuth token exchange, and the onboarding lifecycle including password creation, MetaMetrics opt-in, and wallet home arrival. Also covers importing an additional SRP after Google seedless onboarding, Wallet Setup Completed attribution analytics for Google and Apple, QR sync SRP (new-user and existing-user mobile ↔ extension), and lock/unlock and reset-wallet after Google social login (may be skipped when flaky). Specs live in tests/smoke-appium/seedless/. When changes touch OAuth, SeedlessOnboardingController, social login UI, Account Already Exists, the onboarding sheet, Add Device / QR sync, post-seedless SRP import, onboarding attribution analytics, or seedless lock/reset, select this tag. Related to SmokeWalletPlatform for wallet lifecycle and SmokeAccounts for account sync / multi-SRP after social login.',
+      'Tests seedless onboarding with social login providers (Google and Apple) and post-onboard device flows. Covers new user wallet creation via Google and Apple OAuth (password creation, MetaMetrics opt-in, wallet home). Also covers QR sync SRP (new-user and existing-user mobile ↔ extension), and lock/unlock and reset-wallet after Google social login (may be skipped when flaky). Specs live in tests/smoke-appium/seedless/. Account Already Exists UI, Wallet Setup Completed attribution props, and Import SRP screen validation are covered by component-view / unit tests — do not re-add those as Appium-only coverage. When changes touch OAuth, SeedlessOnboardingController, social login UI, the onboarding sheet, Add Device / QR sync, or seedless lock/reset, select this tag. Related to SmokeWalletPlatform for wallet lifecycle, SmokeAccounts for multi-SRP import, and wallet analytics smokes for Wallet Setup Completed attribution.',
   },
   smokeBrowser: {
     tag: 'SmokeBrowser:',
@@ -89,7 +89,6 @@ const flaskTags = {};
 // Other tags to run on demand or for specific purposes.
 const otherTags = {
   sampleFeature: 'SampleFeature:',
-  performance: 'Performance:',
   fixtureValidation: 'FixtureValidation:',
 };
 
@@ -99,13 +98,8 @@ const tagDescribe = (tagPrefix) => (testName) => `${tagPrefix} ${testName}`;
 /** smokeAccounts → SmokeAccounts */
 const smokeExportName = (key) => `Smoke${key.slice('smoke'.length)}`;
 
-/** sampleFeature → SampleFeature; performance → SmokePerformance (tag stays "Performance:") */
-const otherExportName = (key) => {
-  if (key === 'performance') {
-    return 'SmokePerformance';
-  }
-  return key.charAt(0).toUpperCase() + key.slice(1);
-};
+/** sampleFeature → SampleFeature */
+const otherExportName = (key) => key.charAt(0).toUpperCase() + key.slice(1);
 
 /** @param {Record<string, { tag: string, description: string }>} tags */
 const createSmokeDescribeFunctions = (tags) =>
@@ -143,7 +137,7 @@ const {
   SmokeMMConnect,
 } = createSmokeDescribeFunctions(smokeTags);
 
-const { SampleFeature, SmokePerformance, FixtureValidation } =
+const { SampleFeature, FixtureValidation } =
   createOtherDescribeFunctions(otherTags);
 
 export {
@@ -165,6 +159,5 @@ export {
   SmokeMMConnect,
   SampleFeature,
   SmokeSnaps,
-  SmokePerformance,
   FixtureValidation,
 };
diff --git a/tsconfig.json b/tsconfig.json
index d77260de655b..26bbf15bd053 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -75,7 +75,9 @@
     "node_modules/expect-webdriverio",
     "node_modules/expect-webdriverio/jest",
     "tests/**/*",
-    "scripts/**/*"
+    "scripts/**/*",
+    "tests/llm-workflow/**/*",
+    "mm-client-cli.config.ts"
   ],
   "exclude": [
     "node_modules",
diff --git a/yarn.lock b/yarn.lock
index 18a20a1d148d..5ced00f2ddac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5894,6 +5894,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@hono/node-server@npm:^1.19.9":
+  version: 1.19.14
+  resolution: "@hono/node-server@npm:1.19.14"
+  peerDependencies:
+    hono: ^4
+  checksum: 10/618dd95feeb3fd11ec8502e088879cd86529523788de19602edebd16892dd61899e73564d6e3d00875cc5a49488a908ddb2aa425d28f9cdeb7f22cfecabf022c
+  languageName: node
+  linkType: hard
+
 "@httptoolkit/httpolyglot@npm:^2.2.1":
   version: 2.2.1
   resolution: "@httptoolkit/httpolyglot@npm:2.2.1"
@@ -8055,6 +8064,64 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/assets-controllers@npm:^111.0.0":
+  version: 111.0.0
+  resolution: "@metamask/assets-controllers@npm:111.0.0"
+  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:^7.6.0"
+    "@metamask/accounts-controller": "npm:^39.0.6"
+    "@metamask/approval-controller": "npm:^9.0.2"
+    "@metamask/base-controller": "npm:^9.1.0"
+    "@metamask/contract-metadata": "npm:^2.4.0"
+    "@metamask/controller-utils": "npm:^12.3.0"
+    "@metamask/core-backend": "npm:^8.1.1"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/keyring-api": "npm:^24.0.0"
+    "@metamask/keyring-controller": "npm:^27.1.0"
+    "@metamask/messenger": "npm:^2.0.0"
+    "@metamask/metamask-eth-abis": "npm:^3.1.1"
+    "@metamask/multichain-account-service": "npm:^13.0.0"
+    "@metamask/network-controller": "npm:^35.0.1"
+    "@metamask/network-enablement-controller": "npm:^6.0.2"
+    "@metamask/permission-controller": "npm:^13.1.1"
+    "@metamask/phishing-controller": "npm:^17.3.1"
+    "@metamask/polling-controller": "npm:^16.0.9"
+    "@metamask/preferences-controller": "npm:^23.1.0"
+    "@metamask/profile-sync-controller": "npm:^29.0.0"
+    "@metamask/remote-feature-flag-controller": "npm:^5.0.0"
+    "@metamask/rpc-errors": "npm:^7.0.2"
+    "@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.2"
+    "@metamask/transaction-controller": "npm:^69.5.0"
+    "@metamask/utils": "npm:^11.11.0"
+    "@tanstack/query-core": "npm:^5.62.16"
+    "@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/83b93888c085dffdee6de326cd01d1769fbc6f36b0dfaf15a07cb7a080ac28ca534df4e1b2109687a22d3f4ee72597a3936a29bfc8c06d7be72e32e16747089e
+  languageName: node
+  linkType: hard
+
 "@metamask/auth-network-utils@npm:^0.3.0":
   version: 0.3.1
   resolution: "@metamask/auth-network-utils@npm:0.3.1"
@@ -8293,6 +8360,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/client-mcp-core@npm:^0.8.0":
+  version: 0.8.0
+  resolution: "@metamask/client-mcp-core@npm:0.8.0"
+  dependencies:
+    "@metamask/device-mcp": "npm:^0.3.2"
+    cosmiconfig: "npm:^9.0.0"
+    express: "npm:^5.2.1"
+    zod: "npm:^4.4.3"
+  peerDependencies:
+    "@playwright/test": ^1.49.0
+    playwright: ^1.49.0
+  bin:
+    mm: ./dist/cli/mm.cjs
+  checksum: 10/ce9c8f1faa49c65b5fc41ae5d9187839e460481df5e60b99cb7a673e8305401a88d51a323c414f157367cd8563eab9ebdd1fa3ac8030231624003dd690b61c63
+  languageName: node
+  linkType: hard
+
 "@metamask/client-utils@npm:^1.2.1":
   version: 1.2.1
   resolution: "@metamask/client-utils@npm:1.2.1"
@@ -8340,20 +8424,20 @@ __metadata:
   linkType: hard
 
 "@metamask/config-registry-controller@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@metamask/config-registry-controller@npm:2.0.0"
+  version: 2.0.1
+  resolution: "@metamask/config-registry-controller@npm:2.0.1"
   dependencies:
     "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/controller-utils": "npm:^12.3.0"
     "@metamask/keyring-controller": "npm:^27.1.0"
     "@metamask/messenger": "npm:^2.0.0"
     "@metamask/polling-controller": "npm:^16.0.9"
-    "@metamask/profile-sync-controller": "npm:^28.3.0"
+    "@metamask/profile-sync-controller": "npm:^29.0.0"
     "@metamask/remote-feature-flag-controller": "npm:^5.0.0"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.11.0"
     reselect: "npm:^5.1.1"
-  checksum: 10/ad2c4759ac143655b025a0b7c448992873bed05242b01c88fec5c00b3d8e5161cff21474021600ebca36e5ae221691d39d5c3a1e77619a72042bb49967a8855d
+  checksum: 10/416311abbfe4b7be997a508106391449cc28a5d4ee7cd599ff1ce0911ea6ba52adbbef7eb10236f8ffbbb67998ddb6d186c28497fd3d8aabe69b50007f55268b
   languageName: node
   linkType: hard
 
@@ -8513,11 +8597,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/design-system-react-native@npm:^0.38.1":
-  version: 0.38.1
-  resolution: "@metamask/design-system-react-native@npm:0.38.1"
+"@metamask/design-system-react-native@npm:^0.39.0":
+  version: 0.39.0
+  resolution: "@metamask/design-system-react-native@npm:0.39.0"
   dependencies:
-    "@metamask/design-system-shared": "npm:^0.31.0"
+    "@metamask/design-system-shared": "npm:^0.32.0"
     react-native-jazzicon: "npm:^0.1.2"
   peerDependencies:
     "@metamask/design-system-twrnc-preset": ^0.8.0
@@ -8530,18 +8614,18 @@ __metadata:
     react-native-reanimated: ">=4.2.0"
     react-native-safe-area-context: ">=5.0.0"
     react-native-worklets: ">=0.7.4"
-  checksum: 10/494a94756a0e6da4d64665c99cd88b8ee17bf8a88d2910fdd95d110315387a78099c22c2a15ca6b9728633edcc7a3f4f02fba751b60732583701e1d652197f0c
+  checksum: 10/664ba221283a7a09824aa857578d1a98670f266d154a6a87d1884594555b314d299feb0c5c3a00137faafa9f878e9a308b870b6c876aa90ee76b72cdcfdffeca
   languageName: node
   linkType: hard
 
-"@metamask/design-system-shared@npm:^0.31.0":
-  version: 0.31.0
-  resolution: "@metamask/design-system-shared@npm:0.31.0"
+"@metamask/design-system-shared@npm:^0.32.0":
+  version: 0.32.0
+  resolution: "@metamask/design-system-shared@npm:0.32.0"
   dependencies:
     "@metamask/utils": "npm:^11.11.0"
   peerDependencies:
     react: ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: 10/87e65ed36ea3ccb1f0cf7e0bced4ee1b0d7e42573f7989e0524b2aeb125eed74db401d54c518b499b2cbd5785aa50e304d5cb24282f89b4b9a18b0fc3c2a1039
+  checksum: 10/17efdeb0787713dc00e0c9598d570648f93f90b325e1c37c7107a939a8ccb56d27d196c52997b5d8db1e2a888b3c9072a394885741ef033a11eba1c43aabc462
   languageName: node
   linkType: hard
 
@@ -8564,6 +8648,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/device-mcp@npm:^0.3.0, @metamask/device-mcp@npm:^0.3.2":
+  version: 0.3.2
+  resolution: "@metamask/device-mcp@npm:0.3.2"
+  dependencies:
+    "@modelcontextprotocol/sdk": "npm:^1.12.1"
+    zod: "npm:^4.4.3"
+  bin:
+    device-mcp: ./dist/cli/device-mcp.mjs
+  checksum: 10/62bd0e0f4138f66c161b827dca5fa076b8d14237764c8ee62f9ccda4711ac495f1508802bbdaf5b28c9afec7118c3ff6b1c59969be0b4e3957709d1d591d36c2
+  languageName: node
+  linkType: hard
+
 "@metamask/earn-controller@npm:^12.1.0":
   version: 12.1.0
   resolution: "@metamask/earn-controller@npm:12.1.0"
@@ -9420,6 +9516,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/money-account-utils@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@metamask/money-account-utils@npm:1.0.0"
+  dependencies:
+    "@metamask/transaction-controller": "npm:^69.3.0"
+    "@metamask/utils": "npm:^11.11.0"
+  checksum: 10/bb85219266b451115260263b291c0408ec60060ee1b54f52c48f9220c6077fe492e25347754c1c392ef5d4ecd9b5ddf65de4c1d3bf93966e15d275f2c3364265
+  languageName: node
+  linkType: hard
+
 "@metamask/multichain-account-service@npm:^13.0.0":
   version: 13.0.0
   resolution: "@metamask/multichain-account-service@npm:13.0.0"
@@ -9740,15 +9846,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/perps-controller@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "@metamask/perps-controller@npm:10.0.0"
+"@metamask/perps-controller@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "@metamask/perps-controller@npm:11.0.0"
   dependencies:
     "@metamask/abi-utils": "npm:^2.0.3"
     "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/controller-utils": "npm:^12.3.0"
     "@metamask/messenger": "npm:^2.0.0"
-    "@metamask/superstruct": "npm:^3.1.0"
+    "@metamask/superstruct": "npm:^3.4.1"
     "@metamask/utils": "npm:^11.11.0"
     "@myx-trade/sdk": "npm:^0.1.265"
     "@nktkas/hyperliquid": "npm:^0.33.1"
@@ -9758,7 +9864,7 @@ __metadata:
   dependenciesMeta:
     "@myx-trade/sdk":
       optional: true
-  checksum: 10/b67cc2265ff05320ceebaeba56a8e6941d0d35982b9ee70e4f86c6812bed39ba8c38c21c74b8a697ddde23483625e6f170d172d9b28f157fd5f663f426068caa
+  checksum: 10/939d34a777283025a34b80d4d4a5c8b38dbc224c2a027eaa077c8f0232e8047d5652e3db0f6cf28f6a117b768ea06501c8a59985118336644210609791a197b8
   languageName: node
   linkType: hard
 
@@ -9780,7 +9886,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/polling-controller@npm:^16.0.4, @metamask/polling-controller@npm:^16.0.6, @metamask/polling-controller@npm:^16.0.7, @metamask/polling-controller@npm:^16.0.8, @metamask/polling-controller@npm:^16.0.9":
+"@metamask/polling-controller@npm:^16.0.4, @metamask/polling-controller@npm:^16.0.6, @metamask/polling-controller@npm:^16.0.8, @metamask/polling-controller@npm:^16.0.9":
   version: 16.0.9
   resolution: "@metamask/polling-controller@npm:16.0.9"
   dependencies:
@@ -9821,26 +9927,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/profile-metrics-controller@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@metamask/profile-metrics-controller@npm:4.0.1"
+"@metamask/profile-metrics-controller@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@metamask/profile-metrics-controller@npm:4.0.3"
   dependencies:
-    "@metamask/accounts-controller": "npm:^39.0.3"
+    "@metamask/accounts-controller": "npm:^39.0.6"
     "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/controller-utils": "npm:^12.3.0"
     "@metamask/keyring-controller": "npm:^27.1.0"
-    "@metamask/messenger": "npm:^1.2.0"
-    "@metamask/polling-controller": "npm:^16.0.7"
-    "@metamask/profile-sync-controller": "npm:^28.2.0"
+    "@metamask/messenger": "npm:^2.0.0"
+    "@metamask/polling-controller": "npm:^16.0.9"
+    "@metamask/profile-sync-controller": "npm:^29.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/transaction-controller": "npm:^68.2.0"
+    "@metamask/transaction-controller": "npm:^69.4.0"
     "@metamask/utils": "npm:^11.11.0"
     async-mutex: "npm:^0.5.0"
     uuid: "npm:^8.3.2"
-  checksum: 10/0fbc167e619e07af7df36f213e8f6fc9678dbf6ff57b41daf00a8a7b95ceb712a273496732a66d17f516856d7aeff7730b552c3819f60059ab6492e5d812699d
+  checksum: 10/3523322a19a7ae07989269a7ba85ea686278e43c93d60ca75fcee0ea48467c23c8305d5af4c80c1b218653024341dd977d544c4fa942831d51f0cda9ab9039bb
   languageName: node
   linkType: hard
 
@@ -9935,16 +10041,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/ramps-controller@npm:^18.0.0":
-  version: 18.0.1
-  resolution: "@metamask/ramps-controller@npm:18.0.1"
+"@metamask/ramps-controller@npm:^19.0.0":
+  version: 19.0.0
+  resolution: "@metamask/ramps-controller@npm:19.0.0"
   dependencies:
     "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/controller-utils": "npm:^12.3.0"
     "@metamask/messenger": "npm:^2.0.0"
     "@metamask/profile-sync-controller": "npm:^28.3.0"
     "@metamask/remote-feature-flag-controller": "npm:^5.0.0"
-  checksum: 10/49e4cbb05994d4ad5994bb88a20817722bf2c7361edeed1b46d45e7bf7e7db94c81338a7590e3845721272f26bab7af4e6a2df16c39248daf06140fa5ccc9a7f
+  checksum: 10/332c9f58fbc77ef53dbebb9488d65d1195d8c5afe43758a4f65e1cb36383bf181f9c9557a492fe740ce9ca198b35ae8b90d68cb5d152626a04349ca3502bf180
   languageName: node
   linkType: hard
 
@@ -10189,7 +10295,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/seedless-onboarding-controller@npm:^10.1.0, @metamask/seedless-onboarding-controller@npm:^10.1.1":
+"@metamask/seedless-onboarding-controller@npm:10.1.1":
   version: 10.1.1
   resolution: "@metamask/seedless-onboarding-controller@npm:10.1.1"
   dependencies:
@@ -10662,6 +10768,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/tooling-insight@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@metamask/tooling-insight@npm:1.0.0"
+  bin:
+    metamask-daily-anonymizer: ./dist/daily-anonymizer.mjs
+  checksum: 10/bfed6e2f0cb169ffb1f4e61c2b4be0cc71583174f47908c69aa348714631af4a7d62fe5df0c08db34a11659bca69efbac72442e0320beb4772efed50b967616c
+  languageName: node
+  linkType: hard
+
 "@metamask/toprf-secure-backup@npm:^1.1.0":
   version: 1.1.0
   resolution: "@metamask/toprf-secure-backup@npm:1.1.0"
@@ -10841,6 +10956,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@modelcontextprotocol/sdk@npm:^1.12.1":
+  version: 1.29.0
+  resolution: "@modelcontextprotocol/sdk@npm:1.29.0"
+  dependencies:
+    "@hono/node-server": "npm:^1.19.9"
+    ajv: "npm:^8.17.1"
+    ajv-formats: "npm:^3.0.1"
+    content-type: "npm:^1.0.5"
+    cors: "npm:^2.8.5"
+    cross-spawn: "npm:^7.0.5"
+    eventsource: "npm:^3.0.2"
+    eventsource-parser: "npm:^3.0.0"
+    express: "npm:^5.2.1"
+    express-rate-limit: "npm:^8.2.1"
+    hono: "npm:^4.11.4"
+    jose: "npm:^6.1.3"
+    json-schema-typed: "npm:^8.0.2"
+    pkce-challenge: "npm:^5.0.0"
+    raw-body: "npm:^3.0.0"
+    zod: "npm:^3.25 || ^4.0"
+    zod-to-json-schema: "npm:^3.25.1"
+  peerDependencies:
+    "@cfworker/json-schema": ^4.1.1
+    zod: ^3.25 || ^4.0
+  peerDependenciesMeta:
+    "@cfworker/json-schema":
+      optional: true
+    zod:
+      optional: false
+  checksum: 10/ff551b97e06b661f95fec8fd34e112c446e69894a84a9979cdac369fb5de27f0a1a5c1f4e2a1f270cc60f93e54c28a8059a94ca51c3d528d2670ade874b244f9
+  languageName: node
+  linkType: hard
+
 "@msgpack/msgpack@npm:3.1.2":
   version: 3.1.2
   resolution: "@msgpack/msgpack@npm:3.1.2"
@@ -22034,7 +22182,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv-formats@npm:3.0.1":
+"ajv-formats@npm:3.0.1, ajv-formats@npm:^3.0.1":
   version: 3.0.1
   resolution: "ajv-formats@npm:3.0.1"
   dependencies:
@@ -22116,15 +22264,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.0.0, ajv@npm:^8.11.0, ajv@npm:^8.6.3, ajv@npm:^8.9.0":
-  version: 8.18.0
-  resolution: "ajv@npm:8.18.0"
+"ajv@npm:^8.0.0, ajv@npm:^8.11.0, ajv@npm:^8.17.1, ajv@npm:^8.6.3, ajv@npm:^8.9.0":
+  version: 8.20.0
+  resolution: "ajv@npm:8.20.0"
   dependencies:
     fast-deep-equal: "npm:^3.1.3"
     fast-uri: "npm:^3.0.1"
     json-schema-traverse: "npm:^1.0.0"
     require-from-string: "npm:^2.0.2"
-  checksum: 10/bfed9de827a2b27c6d4084324eda76a4e32bdde27410b3e9b81d06e6f8f5c78370fc6b93fe1d869f1939ff1d7c4ae8896960995acb8425e3e9288c8884247c48
+  checksum: 10/5ce59c0537f4c2aca9a758b412659ec70acb4d5dde971c10ecf21d2e3d799f99acdb4a08e1f5fb2e067c8542930398aae793bb996bb07d3feb81dae22fe2ada9
   languageName: node
   linkType: hard
 
@@ -24019,7 +24167,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:^2.2.0":
+"body-parser@npm:^2.2.0, body-parser@npm:^2.2.1":
   version: 2.3.0
   resolution: "body-parser@npm:2.3.0"
   dependencies:
@@ -26010,7 +26158,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:7.0.6, cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.6":
+"cross-spawn@npm:7.0.6, cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.5, cross-spawn@npm:^7.0.6":
   version: 7.0.6
   resolution: "cross-spawn@npm:7.0.6"
   dependencies:
@@ -29304,6 +29452,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eventsource-parser@npm:^3.0.0, eventsource-parser@npm:^3.0.1":
+  version: 3.1.0
+  resolution: "eventsource-parser@npm:3.1.0"
+  checksum: 10/6aa03b4d6e3450935690fd9cca6e47b9877287c9419dba9705b85a73e741c7dfbc22b4ebeca25adf05c9549e33c4491e3ca71f80ddfac585e469b7da91f76e20
+  languageName: node
+  linkType: hard
+
 "eventsource@npm:^2.0.2":
   version: 2.0.2
   resolution: "eventsource@npm:2.0.2"
@@ -29311,6 +29466,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eventsource@npm:^3.0.2":
+  version: 3.0.7
+  resolution: "eventsource@npm:3.0.7"
+  dependencies:
+    eventsource-parser: "npm:^3.0.1"
+  checksum: 10/e034915bc97068d1d38617951afd798e6776d6a3a78e36a7569c235b177c7afc2625c9fe82656f7341ab72c7eeecb3fd507b7f88e9328f2448872ff9c4742bb6
+  languageName: node
+  linkType: hard
+
 "evp_bytestokey@npm:^1.0.0, evp_bytestokey@npm:^1.0.3":
   version: 1.0.3
   resolution: "evp_bytestokey@npm:1.0.3"
@@ -29878,6 +30042,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"express-rate-limit@npm:^8.2.1":
+  version: 8.5.2
+  resolution: "express-rate-limit@npm:8.5.2"
+  dependencies:
+    ip-address: "npm:^10.2.0"
+  peerDependencies:
+    express: ">= 4.11"
+  checksum: 10/de2aa4582d3b1b1d242fdb8dba7b3b1c64e3a58dfa7a40d370681c175a61321fb550c6b190d755f47cefdf28f35eaad6c99ea196f99caec8caaffc2462fea1ae
+  languageName: node
+  linkType: hard
+
 "express@npm:4.21.2":
   version: 4.21.2
   resolution: "express@npm:4.21.2"
@@ -29991,6 +30166,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"express@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "express@npm:5.2.1"
+  dependencies:
+    accepts: "npm:^2.0.0"
+    body-parser: "npm:^2.2.1"
+    content-disposition: "npm:^1.0.0"
+    content-type: "npm:^1.0.5"
+    cookie: "npm:^0.7.1"
+    cookie-signature: "npm:^1.2.1"
+    debug: "npm:^4.4.0"
+    depd: "npm:^2.0.0"
+    encodeurl: "npm:^2.0.0"
+    escape-html: "npm:^1.0.3"
+    etag: "npm:^1.8.1"
+    finalhandler: "npm:^2.1.0"
+    fresh: "npm:^2.0.0"
+    http-errors: "npm:^2.0.0"
+    merge-descriptors: "npm:^2.0.0"
+    mime-types: "npm:^3.0.0"
+    on-finished: "npm:^2.4.1"
+    once: "npm:^1.4.0"
+    parseurl: "npm:^1.3.3"
+    proxy-addr: "npm:^2.0.7"
+    qs: "npm:^6.14.0"
+    range-parser: "npm:^1.2.1"
+    router: "npm:^2.2.0"
+    send: "npm:^1.1.0"
+    serve-static: "npm:^2.2.0"
+    statuses: "npm:^2.0.1"
+    type-is: "npm:^2.0.1"
+    vary: "npm:^1.1.2"
+  checksum: 10/4aa545d89702ac83f645c77abda1b57bcabe288f0b380fb5580fac4e323ea0eb533005c8e666b4e19152fb16d4abf11ba87b22aa9a10857a0485cd86b94639bd
+  languageName: node
+  linkType: hard
+
 "extension-port-stream@npm:^4.1.0":
   version: 4.2.0
   resolution: "extension-port-stream@npm:4.2.0"
@@ -31931,6 +32142,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hono@npm:^4.11.4":
+  version: 4.12.26
+  resolution: "hono@npm:4.12.26"
+  checksum: 10/ae8c37718215c57814a8f244e594b49a461bce35e9ed3b50573a0c37ce86d196d448867447df6e940071e66888288749f780cdd8e59d8bd69d7e5aba6d105f7d
+  languageName: node
+  linkType: hard
+
 "hosted-git-info@npm:8.0.2":
   version: 8.0.2
   resolution: "hosted-git-info@npm:8.0.2"
@@ -32653,6 +32871,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ip-address@npm:^10.2.0":
+  version: 10.2.0
+  resolution: "ip-address@npm:10.2.0"
+  checksum: 10/12fec399e1af5753ac322e47a6d81a50d3a528b3abb17c09525b2a2edcaedcca628c40520706f7037bc4d8e951b0296c47e7b86d0a8e6e2335c8f0ba4afcfac1
+  languageName: node
+  linkType: hard
+
 "ip-address@npm:^9.0.5":
   version: 9.0.5
   resolution: "ip-address@npm:9.0.5"
@@ -34162,6 +34387,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jose@npm:^6.1.3":
+  version: 6.2.3
+  resolution: "jose@npm:6.2.3"
+  checksum: 10/876974613c5ee988d43b65a34c96ce440dbf7706a2f07f465b8874af16ee532102e224459a7068d2c6ef044affe49690667d23ca12770c279804baec95a09608
+  languageName: node
+  linkType: hard
+
 "jotai@npm:^2.0.2":
   version: 2.4.2
   resolution: "jotai@npm:2.4.2"
@@ -34455,6 +34687,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json-schema-typed@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "json-schema-typed@npm:8.0.2"
+  checksum: 10/fa866d1fe91e3a94aa4fe007861475cd03dcaf47b719861cab171ef2f8598478007c634d29ae45de94ee34ddff4e13414c63ea5ff06c5b868b613142c699d511
+  languageName: node
+  linkType: hard
+
 "json-schema@npm:^0.4.0":
   version: 0.4.0
   resolution: "json-schema@npm:0.4.0"
@@ -35960,7 +36199,7 @@ __metadata:
     "@metamask/app-metadata-controller": "npm:^2.0.0"
     "@metamask/approval-controller": "npm:^9.0.0"
     "@metamask/assets-controller": "npm:^11.3.0"
-    "@metamask/assets-controllers": "npm:^110.0.1"
+    "@metamask/assets-controllers": "npm:^111.0.0"
     "@metamask/authenticated-user-storage": "npm:^3.0.1"
     "@metamask/auto-changelog": "npm:^5.3.0"
     "@metamask/base-controller": "npm:^9.0.1"
@@ -35974,6 +36213,7 @@ __metadata:
     "@metamask/chain-agnostic-permission": "npm:^1.7.0"
     "@metamask/chomp-api-service": "npm:^4.0.0"
     "@metamask/client-controller": "npm:^1.0.1"
+    "@metamask/client-mcp-core": "npm:^0.8.0"
     "@metamask/client-utils": "npm:^1.2.1"
     "@metamask/compliance-controller": "npm:2.1.0"
     "@metamask/config-registry-controller": "npm:^0.3.1"
@@ -35982,9 +36222,10 @@ __metadata:
     "@metamask/core-backend": "npm:^8.0.0"
     "@metamask/delegation-controller": "npm:^3.0.2"
     "@metamask/delegation-deployments": "npm:^1.0.0"
-    "@metamask/design-system-react-native": "npm:^0.38.1"
+    "@metamask/design-system-react-native": "npm:^0.39.0"
     "@metamask/design-system-twrnc-preset": "npm:^0.8.0"
     "@metamask/design-tokens": "npm:^8.7.0"
+    "@metamask/device-mcp": "npm:^0.3.0"
     "@metamask/earn-controller": "npm:^12.1.0"
     "@metamask/eip-5792-middleware": "npm:^3.0.4"
     "@metamask/eip1193-permission-middleware": "npm:^1.0.2"
@@ -36030,6 +36271,7 @@ __metadata:
     "@metamask/money-account-balance-service": "npm:^2.4.0"
     "@metamask/money-account-controller": "npm:^0.2.0"
     "@metamask/money-account-upgrade-controller": "npm:^3.0.0"
+    "@metamask/money-account-utils": "npm:^1.0.0"
     "@metamask/multichain-account-service": "npm:^13.0.0"
     "@metamask/multichain-api-client": "npm:^0.11.0"
     "@metamask/multichain-api-middleware": "npm:^4.0.1"
@@ -36041,15 +36283,15 @@ __metadata:
     "@metamask/notification-services-controller": "npm:^26.0.0"
     "@metamask/object-multiplex": "npm:^1.1.0"
     "@metamask/permission-controller": "npm:^13.1.1"
-    "@metamask/perps-controller": "npm:^10.0.0"
-    "@metamask/phishing-controller": "npm:^17.3.0"
+    "@metamask/perps-controller": "npm:^11.0.0"
+    "@metamask/phishing-controller": "npm:^17.3.1"
     "@metamask/post-message-stream": "npm:^10.0.0"
     "@metamask/preferences-controller": "npm:^23.0.0"
     "@metamask/preinstalled-example-snap": "npm:^0.8.1"
-    "@metamask/profile-metrics-controller": "npm:^4.0.1"
-    "@metamask/profile-sync-controller": "npm:^28.3.0"
+    "@metamask/profile-metrics-controller": "npm:^4.0.3"
+    "@metamask/profile-sync-controller": "npm:^29.0.0"
     "@metamask/providers": "npm:^18.3.1"
-    "@metamask/ramps-controller": "npm:^18.0.0"
+    "@metamask/ramps-controller": "npm:^19.0.0"
     "@metamask/react-data-query": "npm:^0.2.2"
     "@metamask/react-native-acm": "patch:@metamask/react-native-acm@npm%3A1.2.0#~/.yarn/patches/@metamask-react-native-acm-npm-1.2.0-944bf863eb.patch"
     "@metamask/react-native-actionsheet": "npm:2.4.2"
@@ -36062,7 +36304,7 @@ __metadata:
     "@metamask/sample-controllers": "npm:^3.0.0"
     "@metamask/scure-bip39": "npm:^2.1.0"
     "@metamask/sdk-communication-layer": "npm:0.33.1"
-    "@metamask/seedless-onboarding-controller": "npm:^10.1.0"
+    "@metamask/seedless-onboarding-controller": "npm:^10.1.1"
     "@metamask/selected-network-controller": "npm:^26.1.4"
     "@metamask/sentinel-api-service": "npm:^1.0.0"
     "@metamask/signature-controller": "npm:^39.2.0"
@@ -36086,6 +36328,7 @@ __metadata:
     "@metamask/test-dapp-bitcoin": "npm:^0.2.0"
     "@metamask/test-dapp-multichain": "npm:^0.17.1"
     "@metamask/test-dapp-solana": "npm:^0.3.0"
+    "@metamask/tooling-insight": "npm:^1.0.0"
     "@metamask/transaction-controller": "npm:^69.5.0"
     "@metamask/transaction-pay-controller": "npm:^26.2.2"
     "@metamask/tron-wallet-snap": "npm:^1.33.1"
@@ -36098,6 +36341,7 @@ __metadata:
     "@noble/hashes": "npm:1.8.0"
     "@notifee/react-native": "npm:^9.1.8"
     "@octokit/rest": "npm:^21.0.0"
+    "@open-rpc/meta-schema": "npm:^1.14.9"
     "@open-rpc/mock-server": "npm:^1.7.5"
     "@open-rpc/schema-utils-js": "npm:^1.16.2"
     "@open-rpc/test-coverage": "npm:^2.2.2"
@@ -39210,6 +39454,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pkce-challenge@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "pkce-challenge@npm:5.0.1"
+  checksum: 10/51d11f68d5a78617cfb2e9c2706dadcc2cbe55ffb55b21d42a6ed848ac5159db2657bf6c966a5a414119aa839ceb64240afea35e9e1c06946b57606ed0b43789
+  languageName: node
+  linkType: hard
+
 "pkg-dir@npm:4.2.0, pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0":
   version: 4.2.0
   resolution: "pkg-dir@npm:4.2.0"
@@ -48191,6 +48442,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"zod-to-json-schema@npm:^3.25.1":
+  version: 3.25.2
+  resolution: "zod-to-json-schema@npm:3.25.2"
+  peerDependencies:
+    zod: ^3.25.28 || ^4
+  checksum: 10/7035328654113f1a0b8e4c2d34a06f918c93650ef8a50d4fb30ad8f22e47d5762c163af9c82494756b34776bae3c41c26cfc6945105b0eee7dceb528cc07e665
+  languageName: node
+  linkType: hard
+
 "zod-validation-error@npm:^3.0.3":
   version: 3.4.1
   resolution: "zod-validation-error@npm:3.4.1"
@@ -48223,7 +48483,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod@npm:^3.25.0 || ^4.0.0":
+"zod@npm:^3.25 || ^4.0, zod@npm:^3.25.0 || ^4.0.0, zod@npm:^4.4.3":
   version: 4.4.3
   resolution: "zod@npm:4.4.3"
   checksum: 10/804b9a42aa8f35f2b3c5a8dff906291cb749115f83ee2afe3576d70b5b5c53c965365c7f4967690647a9c54af9838ff232a85ff9577a0a36c44b68bc6cdefe36